From ed3727682766a6c745718addda5a9d351daabea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 24 Apr 2021 10:54:43 +0200
Subject: [PATCH 001/330] gnumake: use sh instead of /bin/sh by default

---
 .../gnumake/0001-No-impure-bin-sh.patch       | 35 ++++++++++++++++
 .../gnumake/0002-remove-impure-dirs.patch     | 40 +++++++++++++++++++
 .../tools/build-managers/gnumake/default.nix  |  5 ++-
 .../build-managers/gnumake/impure-dirs.patch  | 25 ------------
 4 files changed, 79 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/gnumake/0001-No-impure-bin-sh.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch
 delete mode 100644 pkgs/development/tools/build-managers/gnumake/impure-dirs.patch

diff --git a/pkgs/development/tools/build-managers/gnumake/0001-No-impure-bin-sh.patch b/pkgs/development/tools/build-managers/gnumake/0001-No-impure-bin-sh.patch
new file mode 100644
index 000000000000..58ee2d6fe09b
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/0001-No-impure-bin-sh.patch
@@ -0,0 +1,35 @@
+From e00a5257a6ca5fedbf68b09eee7df3502971a057 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
+Date: Sat, 24 Apr 2021 10:11:40 +0200
+Subject: [PATCH 1/2] No impure bin sh
+
+default_shell is used to populuate default shell used to execute jobs.
+Unless SHELL is set to a different value this would be /bin/sh.
+Our stdenv provides sh in form of bash anyway. Having this value not
+hard-coded has some advantages:
+
+- It would ensure that on all systems it uses sh from its PATH rather
+  than /bin/sh, which helps as different systems might have different
+  shells there (bash vs. dash)
+- In the past I had issues with LD_PRELOAD with BEAR, where /bin/sh
+  used a different glibc than BEAR which came from my development shell.
+---
+ src/job.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/job.c b/src/job.c
+index ae1f18b..6b4ddb3 100644
+--- a/src/job.c
++++ b/src/job.c
+@@ -77,7 +77,7 @@ char * vms_strsignal (int status);
+ 
+ #else
+ 
+-const char *default_shell = "/bin/sh";
++const char *default_shell = "sh";
+ int batch_mode_shell = 0;
+ 
+ #endif
+-- 
+2.31.1
+
diff --git a/pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch
new file mode 100644
index 000000000000..e62aee7d9993
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch
@@ -0,0 +1,40 @@
+From 795d63d3c8b5c0dbb7e544954f75507b371b7228 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
+Date: Sat, 24 Apr 2021 10:20:16 +0200
+Subject: [PATCH 2/2] remove impure dirs
+
+---
+ src/read.c   | 3 ---
+ src/remake.c | 2 --
+ 2 files changed, 5 deletions(-)
+
+diff --git a/src/read.c b/src/read.c
+index fa197fb..defacfb 100644
+--- a/src/read.c
++++ b/src/read.c
+@@ -109,9 +109,6 @@ static const char *default_include_directories[] =
+ #endif
+     INCLUDEDIR,
+ #ifndef _AMIGA
+-    "/usr/gnu/include",
+-    "/usr/local/include",
+-    "/usr/include",
+ #endif
+     0
+   };
+diff --git a/src/remake.c b/src/remake.c
+index fb237c5..94bff7d 100644
+--- a/src/remake.c
++++ b/src/remake.c
+@@ -1601,8 +1601,6 @@ library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr)
+   static const char *dirs[] =
+     {
+ #ifndef _AMIGA
+-      "/lib",
+-      "/usr/lib",
+ #endif
+ #if defined(WINDOWS32) && !defined(LIBDIR)
+ /*
+-- 
+2.31.1
+
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index fb9dab54049a..0d2806026b82 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -14,11 +14,14 @@ stdenv.mkDerivation {
     sha256 = "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0";
   };
 
+  # to update apply these patches with `git am *.patch` to https://git.savannah.gnu.org/git/make.git
   patches = [
+    # Replaces /bin/sh with sh, see patch file for reasoning
+    ./0001-No-impure-bin-sh.patch
     # Purity: don't look for library dependencies (of the form `-lfoo') in /lib
     # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for
     # included Makefiles, don't look in /usr/include and friends.
-    ./impure-dirs.patch
+    ./0002-remove-impure-dirs.patch
   ];
 
   nativeBuildInputs = lib.optionals guileSupport [ pkg-config ];
diff --git a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch
deleted file mode 100644
index 6c7d9d2463c3..000000000000
--- a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur a/src/read.c b/src/read.c
---- a/src/read.c
-+++ b/src/read.c
-@@ -109,9 +109,6 @@
- #endif
-     INCLUDEDIR,
- #ifndef _AMIGA
--    "/usr/gnu/include",
--    "/usr/local/include",
--    "/usr/include",
- #endif
-     0
-   };
-diff -Naur a/src/remake.c b/src/remake.c
---- a/src/remake.c
-+++ b/src/remake.c
-@@ -1601,8 +1601,6 @@
-   static const char *dirs[] =
-     {
- #ifndef _AMIGA
--      "/lib",
--      "/usr/lib",
- #endif
- #if defined(WINDOWS32) && !defined(LIBDIR)
- /*

From 05c517698dcf6a989e364863cf5e7f6f548dd50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Fri, 14 May 2021 18:36:36 +0200
Subject: [PATCH 002/330] bluez: Disable kernel dependent test-mesh-crypto

I'm having trouble building bluez on a CentOS 7.9 builder.
Turns out that the test-mesh-crypto test depends on the following Linux
kernel configuration items:
CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC]
and will fail if run wih an incompatible kernel with the following error
message:

    ...
    IVindex              = 12345678
    NetworkNonce         = 00800000011201000012345678
                           00800000011201000012345678 => PASS
    PrivacyRandom        = 000000000012345678b5e5bfdacbaf6c
                           000000000012345678fffd034b50057e => FAIL
    FAIL unit/test-mesh-crypto (exit status: 1)

I found the same bug reported on Gentoo https://bugs.gentoo.org/704190.
Their fix is to only run the test if the kernel options are available,
which we don't want to do for build reproducibility.
Instead we just want to skip the test unconditionally. As it's simpler
to completely override the test instead of patching the build system, we
opt for doing just that.
---
 pkgs/os-specific/linux/bluez/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index 2e342fbc0392..96b9e5937b3f 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -48,6 +48,11 @@ in stdenv.mkDerivation rec {
     substituteInPlace tools/hid2hci.rules \
       --replace /sbin/udevadm ${systemd}/bin/udevadm \
       --replace "hid2hci " "$out/lib/udev/hid2hci "
+    # Disable some tests:
+    # - test-mesh-crypto depends on the following kernel settings:
+    #   CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC]
+    if [[ ! -f unit/test-mesh-crypto.c ]]; then echo "unit/test-mesh-crypto.c no longer exists"; false; fi
+    echo 'int main() { return 77; }' > unit/test-mesh-crypto.c
   '';
 
   configureFlags = [

From 78a3c6aa8a597023b78cd506579e26730b65858b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 May 2021 20:42:34 +0200
Subject: [PATCH 003/330] postgresql: enable pie

---
 pkgs/servers/sql/postgresql/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 63446a684b25..b536bee8f1e8 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -33,6 +33,8 @@ let
       inherit sha256;
     };
 
+    hardeningEnable = [ "pie" ];
+
     outputs = [ "out" "lib" "doc" "man" ];
     setOutputFlags = false; # $out retains configureFlags :-/
 

From f28679ed29c662990d191287993541041b79dea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Mon, 24 May 2021 07:00:06 +0100
Subject: [PATCH 004/330] Update pkgs/servers/sql/postgresql/default.nix

Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
---
 pkgs/servers/sql/postgresql/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index b536bee8f1e8..67f9a93487ac 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -33,7 +33,7 @@ let
       inherit sha256;
     };
 
-    hardeningEnable = [ "pie" ];
+    hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ];
 
     outputs = [ "out" "lib" "doc" "man" ];
     setOutputFlags = false; # $out retains configureFlags :-/

From 0e81850754fdc276165adc5ca51737da986b667d Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Tue, 25 May 2021 21:30:50 +0200
Subject: [PATCH 005/330] atk: clean up cross-compilation logic

---
 pkgs/development/libraries/atk/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 38c557316982..08e6e5b0e41b 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,6 +1,5 @@
 { lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
 , fixDarwinDylibNames, gobject-introspection, gnome
-, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
 }:
 
 let
@@ -18,9 +17,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ meson ninja pkg-config gettext glib ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
-    ++ lib.optional withIntrospection gobject-introspection;
+  nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [
     # Required by atk.pc
@@ -34,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dintrospection=${lib.boolToString withIntrospection}"
+    "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
   ];
 
   doCheck = true;

From 6ded8b9cd41636e03b0c0ee566b877653496d557 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 May 2021 10:29:11 +0000
Subject: [PATCH 006/330] cryptsetup: 2.3.5 -> 2.3.6

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

diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index ad700c097722..e7304e196798 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cryptsetup";
-  version = "2.3.5";
+  version = "2.3.6";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/cryptsetup/v2.3/${pname}-${version}.tar.xz";
-    sha256 = "sha256-ztmUb0RNEyU22vkvyKykJ3Y4o8LZbiBUCyuuTTb9cME=";
+    sha256 = "sha256-spa3oh6ldsKxgGEcyxnQauyN3a7ffHBLDGqBIQwlY18=";
   };
 
   # Disable 4 test cases that fail in a sandbox

From e5e91af069e8f0e2f9e21ab59f0c2f38c3aafe79 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jun 2021 02:53:39 +0000
Subject: [PATCH 007/330] gsl: 2.6 -> 2.7

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

diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 2dc47a93be3c..fc5f689e0d90 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "gsl-2.6";
+  name = "gsl-2.7";
 
   src = fetchurl {
     url = "mirror://gnu/gsl/${name}.tar.gz";
-    sha256 = "1a460zj9xmbgvcymkdhqh313c4l29mn9cffbi5vf33x3qygk70mp";
+    sha256 = "sha256-77vzeF2g5TA4vnkHUAYotGYVLbw8FzqH3hteui4jYCs=";
   };
 
   preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then ''

From 73de228e716e3e8cd1a5829149206a105be8824b Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Tue, 15 Jun 2021 16:49:25 +0200
Subject: [PATCH 008/330] perl: 5.32.1 -> 5.34.0

- perl534: init at 5.34.0
- perl: perl532 -> perl534
- perlPackages: perl532Packages -> perl534Packages
- perl530: remove
- remove obsolete patches
---
 .../interpreters/perl/aarch64-darwin.patch    |  46 ----
 .../development/interpreters/perl/default.nix |  24 +-
 .../interpreters/perl/no-sys-dirs-5.29.patch  | 251 ------------------
 pkgs/top-level/all-packages.nix               |   8 +-
 4 files changed, 14 insertions(+), 315 deletions(-)
 delete mode 100644 pkgs/development/interpreters/perl/aarch64-darwin.patch
 delete mode 100644 pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch

diff --git a/pkgs/development/interpreters/perl/aarch64-darwin.patch b/pkgs/development/interpreters/perl/aarch64-darwin.patch
deleted file mode 100644
index b700c8ca6e0d..000000000000
--- a/pkgs/development/interpreters/perl/aarch64-darwin.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index 0a91bc083c0..fdfbdd4a3b9 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -301,7 +301,7 @@ case "$osvers" in  # Note: osvers is the kernel version, not the 10.x
-    # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
-    # capturing its value and adding it to the flags.
-     case "$MACOSX_DEPLOYMENT_TARGET" in
--    10.*)
-+    [1-9][0-9].*)
-       add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
-       add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
-       ;;
-@@ -313,7 +313,7 @@ case "$osvers" in  # Note: osvers is the kernel version, not the 10.x
- 
- *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
- ***
--*** Please either set it to 10.something, or to empty.
-+*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
- 
- EOM
-       exit 1
-@@ -327,7 +327,7 @@ EOM
-     # "ProductVersion:    10.11"     "10.11"
-         prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
-     case "$prodvers" in
--    10.*)
-+    [1-9][0-9].*)
-       add_macosx_version_min ccflags $prodvers
-       add_macosx_version_min ldflags $prodvers
-       ;;
-@@ -342,11 +342,10 @@ EOM
-       exit 1
-     esac
- 
--    # The X in 10.X
--    prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
-+    darwin_major=$(echo $osvers|awk -F. '{print $1}')
- 
--    # macOS (10.12) deprecated syscall().
--    if [ "$prodvers_minor" -ge 12 ]; then
-+    # macOS 10.12 (darwin 16.0.0) deprecated syscall().
-+    if [ "$darwin_major" -ge 16 ]; then
-         d_syscall='undef'
-         # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
-         case "$MACOSX_DEPLOYMENT_TARGET" in
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 5c75894c4f7e..3b39974c16b1 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -37,15 +37,11 @@ let
     patches =
       [
         # Do not look in /usr etc. for dependencies.
-        (if (versionOlder version "5.31.1") then ./no-sys-dirs-5.29.patch
-         else ./no-sys-dirs-5.31.patch)
+        ./no-sys-dirs-5.31.patch
       ]
       ++ optional stdenv.isSunOS ./ld-shared.patch
       ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
-      ++ optional crossCompiling ./MakeMaker-cross.patch
-      # Backporting https://github.com/Perl/perl5/pull/17946, can be
-      # removed if there's ever a 5.30.x release with it included.
-      ++ optional (versionOlder version "5.32.1") ./aarch64-darwin.patch;
+      ++ optional crossCompiling ./MakeMaker-cross.patch;
 
     # This is not done for native builds because pwd may need to come from
     # bootstrap tools when building bootstrap perl.
@@ -196,14 +192,6 @@ let
     setupHook = ./setup-hook-cross.sh;
   });
 in {
-  # Maint version
-  perl530 = common {
-    perl = pkgs.perl530;
-    buildPerl = buildPackages.perl530;
-    version = "5.30.3";
-    sha256 = "0vs0wwwlw47sswxaflkk4hw0y45cmc7arxx788kwpbminy5lrq1j";
-  };
-
   # Maint version
   perl532 = common {
     perl = pkgs.perl532;
@@ -212,6 +200,14 @@ in {
     sha256 = "0b7brakq9xs4vavhg391as50nbhzryc7fy5i65r81bnq3j897dh3";
   };
 
+  # Maint version
+  perl534 = common {
+    perl = pkgs.perl534;
+    buildPerl = buildPackages.perl534;
+    version = "5.34.0";
+    sha256 = "16mywn5afpv1mczv9dlc1w84rbgjgrr0pyr4c0hhb2wnif0zq7jm";
+  };
+
   # the latest Devel version
   perldevel = common {
     perl = pkgs.perldevel;
diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch
deleted file mode 100644
index 0ccf6254b782..000000000000
--- a/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
---- perl-5.20.0-orig/Configure	2014-05-26 15:34:18.000000000 +0200
-+++ perl-5.20.0/Configure	2014-06-25 10:43:35.368285986 +0200
-@@ -106,15 +106,7 @@
- fi
- 
- : Proper PATH setting
--paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
--paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
--paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
--paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
--paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
--paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
--paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
--paths="$paths /sbin /usr/sbin /usr/libexec"
--paths="$paths /system/gnu_library/bin"
-+paths=''
- 
- for p in $paths
- do
-@@ -1337,8 +1329,7 @@
- archname=''
- : Possible local include directories to search.
- : Set locincpth to "" in a hint file to defeat local include searches.
--locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
--locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
-+locincpth=""
- :
- : no include file wanted by default
- inclwanted=''
-@@ -1349,17 +1340,12 @@
- 
- libnames=''
- : change the next line if compiling for Xenix/286 on Xenix/386
--xlibpth='/usr/lib/386 /lib/386'
-+xlibpth=''
- : Possible local library directories to search.
--loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
--loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
-+loclibpth=""
- 
- : general looking path for locating libraries
--glibpth="/lib /usr/lib $xlibpth"
--glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
--test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
--test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
--test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
-+glibpth=""
- 
- : Private path used by Configure to find libraries.  Its value
- : is prepended to libpth. This variable takes care of special
-@@ -1391,8 +1377,6 @@
- libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
--glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
--glibpth="/usr/shlib $glibpth"
- : Do not use vfork unless overridden by a hint file.
- usevfork=false
- 
-@@ -2446,7 +2430,6 @@
- zip
- "
- pth=`echo $PATH | sed -e "s/$p_/ /g"`
--pth="$pth $sysroot/lib $sysroot/usr/lib"
- for file in $loclist; do
- 	eval xxx=\$$file
- 	case "$xxx" in
-@@ -4936,7 +4919,7 @@
- : Set private lib path
- case "$plibpth" in
- '') if ./mips; then
--	plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib"
-+	plibpth="$incpath/usr/lib"
-     fi;;
- esac
- case "$libpth" in
-@@ -8600,13 +8583,8 @@
- echo " "
- case "$sysman" in
- '')
--	syspath='/usr/share/man/man1 /usr/man/man1'
--	syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
--	syspath="$syspath /usr/man/u_man/man1"
--	syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
--	syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
--	syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
--	sysman=`./loc . /usr/man/man1 $syspath`
-+	syspath=''
-+	sysman=''
- 	;;
- esac
- if $test -d "$sysman"; then
-@@ -19900,9 +19878,10 @@
- case "$full_ar" in
- '') full_ar=$ar ;;
- esac
-+full_ar=ar
- 
- : Store the full pathname to the sed program for use in the C program
--full_sed=$sed
-+full_sed=sed
- 
- : see what type gids are declared as in the kernel
- echo " "
-Only in perl-5.20.0/: Configure.orig
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL
---- perl-5.20.0-orig/ext/Errno/Errno_pm.PL	2014-05-26 15:34:20.000000000 +0200
-+++ perl-5.20.0/ext/Errno/Errno_pm.PL	2014-06-25 10:31:24.317970047 +0200
-@@ -134,12 +126,7 @@
- 	if ($dep =~ /(\S+errno\.h)/) {
- 	     $file{$1} = 1;
- 	}
--    } elsif ($^O eq 'linux' &&
--	      $Config{gccversion} ne '' && 
--	      $Config{gccversion} !~ /intel/i &&
--	      # might be using, say, Intel's icc
--	      $linux_errno_h
--	     ) {
-+    } elsif (0) {
-	$file{$linux_errno_h} = 1;
-     } elsif ($^O eq 'haiku') {
-	# hidden in a special place
-Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh
---- perl-5.20.0-orig/hints/freebsd.sh	2014-01-31 22:55:51.000000000 +0100
-+++ perl-5.20.0/hints/freebsd.sh	2014-06-25 10:25:53.263964680 +0200
-@@ -119,21 +119,21 @@
-         objformat=`/usr/bin/objformat`
-         if [ x$objformat = xaout ]; then
-             if [ -e /usr/lib/aout ]; then
--                libpth="/usr/lib/aout /usr/local/lib /usr/lib"
--                glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
-+                libpth=""
-+                glibpth=""
-             fi
-             lddlflags='-Bshareable'
-         else
--            libpth="/usr/lib /usr/local/lib"
--            glibpth="/usr/lib /usr/local/lib"
-+            libpth=""
-+            glibpth=""
-             ldflags="-Wl,-E "
-             lddlflags="-shared "
-         fi
-         cccdlflags='-DPIC -fPIC'
-         ;;
- *)
--       libpth="/usr/lib /usr/local/lib"
--       glibpth="/usr/lib /usr/local/lib"
-+       libpth=""
-+       glibpth=""
-        ldflags="-Wl,-E "
-         lddlflags="-shared "
-         cccdlflags='-DPIC -fPIC'
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh
---- perl-5.20.0-orig/hints/linux.sh	2014-05-26 15:34:20.000000000 +0200
-+++ perl-5.20.0/hints/linux.sh	2014-06-25 10:33:47.354883843 +0200
-@@ -150,25 +150,6 @@
-     ;;
- esac
- 
--# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
--# (such as -lm) in /lib or /usr/lib.  So we have to ask gcc to tell us
--# where to look.  We don't want gcc's own libraries, however, so we
--# filter those out.
--# This could be conditional on Unbuntu, but other distributions may
--# follow suit, and this scheme seems to work even on rather old gcc's.
--# This unconditionally uses gcc because even if the user is using another
--# compiler, we still need to find the math library and friends, and I don't
--# know how other compilers will cope with that situation.
--# Morever, if the user has their own gcc earlier in $PATH than the system gcc,
--# we don't want its libraries. So we try to prefer the system gcc
--# Still, as an escape hatch, allow Configure command line overrides to
--# plibpth to bypass this check.
--if [ -x /usr/bin/gcc ] ; then
--    gcc=/usr/bin/gcc
--else
--    gcc=gcc
--fi
--
- case "$plibpth" in
- '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |
- 	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
-@@ -178,32 +159,6 @@
-     ;;
- esac
- 
--case "$libc" in
--'')
--# If you have glibc, then report the version for ./myconfig bug reporting.
--# (Configure doesn't need to know the specific version since it just uses
--# gcc to load the library for all tests.)
--# We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
--# are insufficiently precise to distinguish things like
--# libc-2.0.6 and libc-2.0.7.
--    for p in $plibpth
--    do
--        for trylib in libc.so.6 libc.so
--        do
--            if $test -e $p/$trylib; then
--                libc=`ls -l $p/$trylib | awk '{print $NF}'`
--                if $test "X$libc" != X; then
--                    break
--                fi
--            fi
--        done
--        if $test "X$libc" != X; then
--            break
--        fi
--    done
--    ;;
--esac
--
- if ${sh:-/bin/sh} -c exit; then
-   echo ''
-   echo 'You appear to have a working bash.  Good.'
-@@ -367,33 +322,6 @@
- 	;;
- esac
- 
--# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than
--# true libraries. The scripts cause binding against static
--# version of -lgdbm which is a bad idea. So if we have 'nm'
--# make sure it can read the file
--# NI-S 2003/08/07
--case "$nm" in
--    '') ;;
--    *)
--    for p in $plibpth
--    do
--        if $test -r $p/libndbm.so; then
--            if $nm $p/libndbm.so >/dev/null 2>&1 ; then
--                echo 'Your shared -lndbm seems to be a real library.'
--                _libndbm_real=1
--                break
--            fi
--        fi
--    done
--    if $test "X$_libndbm_real" = X; then
--        echo 'Your shared -lndbm is not a real library.'
--        set `echo X "$libswanted "| sed -e 's/ ndbm / /'`
--        shift
--        libswanted="$*"
--    fi
--    ;;
--esac
--
- # Linux on Synology.
- if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then
-     # Tested on Synology DS213 and DS413
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3fdaf72ec88..ec5c0b3c6e22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18932,14 +18932,14 @@ in
   ### DEVELOPMENT / PERL MODULES
 
   perlInterpreters = callPackages ../development/interpreters/perl {};
-  inherit (perlInterpreters) perl530 perl532 perldevel;
+  inherit (perlInterpreters) perl532 perl534 perldevel;
 
-  perl530Packages = recurseIntoAttrs perl530.pkgs;
   perl532Packages = recurseIntoAttrs perl532.pkgs;
+  perl534Packages = recurseIntoAttrs perl534.pkgs;
   perldevelPackages = perldevel.pkgs;
 
-  perl = perl532;
-  perlPackages = perl532Packages;
+  perl = perl534;
+  perlPackages = perl534Packages;
 
   ack = perlPackages.ack;
 

From 2a1fcf89fc242f9e9b4df58c3f9fec082add8583 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Tue, 15 Jun 2021 17:34:25 +0200
Subject: [PATCH 009/330] unit: add perl534 as default, remove perl530

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

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index cb5fafd17cf7..f3238cc4bda9 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -4,8 +4,8 @@
 , withPython3 ? true, python3, ncurses
 , withPHP74 ? false, php74
 , withPHP80 ? true, php80
-, withPerl530 ? false, perl530
-, withPerl532 ? true, perl532
+, withPerl532 ? false, perl532
+, withPerl534 ? true, perl534
 , withPerldevel ? false, perldevel
 , withRuby_2_6 ? true, ruby_2_6
 , withRuby_2_7 ? false, ruby_2_7
@@ -47,8 +47,8 @@ in stdenv.mkDerivation rec {
     ++ optionals withPython3 [ python3 ncurses ]
     ++ optional withPHP74 php74-unit
     ++ optional withPHP80 php80-unit
-    ++ optional withPerl530 perl530
     ++ optional withPerl532 perl532
+    ++ optional withPerl534 perl534
     ++ optional withPerldevel perldevel
     ++ optional withRuby_2_6 ruby_2_6
     ++ optional withRuby_2_7 ruby_2_7
@@ -72,8 +72,8 @@ in stdenv.mkDerivation rec {
     ${optionalString withPython3    "./configure python --module=python3  --config=python3-config  --lib-path=${python3}/lib"}
     ${optionalString withPHP74      "./configure php    --module=php74    --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"}
     ${optionalString withPHP80      "./configure php    --module=php80    --config=${php80-unit.unwrapped.dev}/bin/php-config --lib-path=${php80-unit}/lib"}
-    ${optionalString withPerl530    "./configure perl   --module=perl530  --perl=${perl530}/bin/perl"}
     ${optionalString withPerl532    "./configure perl   --module=perl532  --perl=${perl532}/bin/perl"}
+    ${optionalString withPerl534    "./configure perl   --module=perl534  --perl=${perl534}/bin/perl"}
     ${optionalString withPerldevel  "./configure perl   --module=perldev  --perl=${perldevel}/bin/perl"}
     ${optionalString withRuby_2_6   "./configure ruby   --module=ruby26   --ruby=${ruby_2_6}/bin/ruby"}
     ${optionalString withRuby_2_7   "./configure ruby   --module=ruby27   --ruby=${ruby_2_7}/bin/ruby"}

From ae566c2097fad4e934e6b7a95f4685ccb6e9a182 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Thu, 17 Jun 2021 17:18:15 -0700
Subject: [PATCH 010/330] SDL: fix hashes

SDL migrated from hg.libsdl.org to github.com and transparently
redirects the patch urls, but the patch contents are not identical due
to the mercurial -> git migration.
---
 pkgs/development/libraries/SDL/default.nix    | 20 +++++++++----------
 .../libraries/SDL_image/default.nix           |  5 +++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index bf76bc1e8570..8da3d8233dbb 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -73,18 +73,18 @@ stdenv.mkDerivation rec {
     })
     # Fix drops of keyboard events for SDL_EnableUNICODE
     (fetchpatch {
-      url = "http://hg.libsdl.org/SDL/raw-rev/0aade9c0203f";
-      sha256 = "1y9izncjlqvk1mkz1pkl9lrk9s452cmg2izjjlqqrhbn8279xy50";
+      url = "https://github.com/libsdl-org/SDL-1.2/commit/0332e2bb18dc68d6892c3b653b2547afe323854b.patch";
+      sha256 = "0g458iv6pp9sikdch6ms8svz60lf5ks2q5wgid8s9rydhk98lpp5";
     })
     # Ignore insane joystick axis events
     (fetchpatch {
-      url = "http://hg.libsdl.org/SDL/raw-rev/95abff7adcc2";
-      sha256 = "0i8x0kx0pw12ld5bfxhyzs466y3c0n9dscw1ijhq1b96r72xyhqq";
+      url = "https://github.com/libsdl-org/SDL-1.2/commit/ab99cc82b0a898ad528d46fa128b649a220a94f4.patch";
+      sha256 = "1b3473sawfdbkkxaqf1hg0vn37yk8hf655jhnjwdk296z4gclazh";
     })
     # https://bugzilla.libsdl.org/show_bug.cgi?id=1769
     (fetchpatch {
-      url = "http://hg.libsdl.org/SDL/raw-rev/91ad7b43317a";
-      sha256 = "15g537vbl2my4mfrjxfkcx9ri6bk2gjvaqj650rjdxwk2nkdkn4b";
+      url = "https://github.com/libsdl-org/SDL-1.2/commit/5d79977ec7a6b58afa6e4817035aaaba186f7e9f.patch";
+      sha256 = "1k7y57b1zy5afib1g7w3in36n8cswbcrzdbrjpn5cb105rnb9vmp";
     })
     # Workaround X11 bug to allow changing gamma
     # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
@@ -96,12 +96,12 @@ stdenv.mkDerivation rec {
     # Fix a build failure on OS X Mavericks
     # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085
     (fetchpatch {
-      url = "http://hg.libsdl.org/SDL/raw-rev/e9466ead70e5";
-      sha256 = "0mpwdi09h89df2wxqw87m1rdz7pr46k0w6alk691k8kwv970z6pl";
+      url = "https://github.com/libsdl-org/SDL-1.2/commit/19039324be71738d8990e91b9ba341b2ea068445.patch";
+      sha256 = "0ckwling2ad27c9vxgp97ndjd098d6zbrydza8b9l77k8airj98c";
     })
     (fetchpatch {
-      url = "http://hg.libsdl.org/SDL/raw-rev/bbfb41c13a87";
-      sha256 = "1336g7waaf1c8yhkz11xbs500h8bmvabh4h437ax8l1xdwcppfxv";
+      url = "https://github.com/libsdl-org/SDL-1.2/commit/7933032ad4d57c24f2230db29f67eb7d21bb5654.patch";
+      sha256 = "1by16firaxyr0hjvn35whsgcmq6bl0nwhnpjf75grjzsw9qvwyia";
     })
   ];
 
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index fe97f0167439..d6424575a764 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
   patches = [
     (fetchpatch {
       name = "CVE-2017-2887";
-      url = "https://hg.libsdl.org/SDL_image/raw-diff/318484db0705/IMG_xcf.c";
-      sha256 = "140dyszz9hkpgwjdiwp1b7jdd8f8l5d862xdaf3ml4cimga1h5kv";
+      url = "https://github.com/libsdl-org/SDL_image/commit/e7723676825cd2b2ffef3316ec1879d7726618f2.patch";
+      includes = [ "IMG_xcf.c" ];
+      sha256 = "174ka2r95i29nlshzgp6x5vc68v7pi8lhzf33and2b1ms49g4jb7";
     })
   ];
 

From e82d082bc605cb0c08350c44b1c50fda19997afa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 23 Jun 2021 04:28:10 +0200
Subject: [PATCH 011/330] python3Packages.sqlalchemy: 1.4.18 -> 1.4.19

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

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 605334adf0c5..eac1f9b49355 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  version = "1.4.18";
+  version = "1.4.19";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0k3yfarfa0hcc0bza6nccy685gnmq6gikynqayrvddx6y7si0lnj";
+    sha256 = "1qjwxqmsw34iw07nl1vzghj5m5inr2bs414lg9yf9drkrwys39c9";
   };
 
   propagatedBuildInputs = [

From 8cde2b8d379789626f5d77b06347c2f8635911de Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 23 Jun 2021 23:57:42 +0200
Subject: [PATCH 012/330] mariadb-connector-c: 3.1.12 -> 3.1.13

https://mariadb.com/kb/en/mariadb-connector-c-3113-release-notes/
---
 pkgs/servers/sql/mariadb/connector-c/3_1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix
index 477d6113b7a4..40a00313639b 100644
--- a/pkgs/servers/sql/mariadb/connector-c/3_1.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/3_1.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./. (args // {
-  version = "3.1.12";
-  sha256 = "0qzyahr8x9l1xz0l79wz3iahxz7648n1azc5yr7kx0dl113y2nig";
+  version = "3.1.13";
+  sha256 = "0xb8fiissblxb319y5ifqqp86zblwis789ipb753pcb4zpnsaw82";
 })

From c016be18c5982d7db08d9a8b69f0327031ccf785 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 23 Jun 2021 23:58:09 +0200
Subject: [PATCH 013/330] mariadb: 10.5.10 -> 10.5.11

https://mariadb.com/kb/en/mariadb-10511-release-notes/
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index db588b3abe01..59b55d620287 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -22,14 +22,14 @@ mariadb = server // {
 };
 
 common = rec { # attributes common to both builds
-  version = "10.5.10";
+  version = "10.5.11";
 
   src = fetchurl {
     urls = [
       "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
       "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
     ];
-    sha256 = "1fxsq2xgcb8j81z043bifpmxblj6nb3wqjm9rgsnpwmazkwk5zx5";
+    sha256 = "0yn4bhqciy6jyig31rmkjc588l03k4bj3194yf9y6373bxh5643n";
     name   = "mariadb-${version}.tar.gz";
   };
 

From e92814a3f1c838eed86dfd85c226c8c0294c236e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 25 Jun 2021 14:19:29 +0200
Subject: [PATCH 014/330] gpgme: 1.15.1 -> 1.16.0

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

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 326e5da0812c..4f95b2dc0983 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -13,11 +13,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gpgme";
-  version = "1.15.1";
+  version = "1.16.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2";
-    sha256 = "1bg13l5s8x9p1v0jyv29n84bay27pflindpzjsc9gj7i4wdkrg7f";
+    sha256 = "1l4yw9fqc1blvx1sq1jnfvp1jijla3ca2jw90p4x9m8hvfpc933c";
   };
 
   patches = [

From 5c22826cdae159fbb220dccbd20eeae04664142e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 25 Jun 2021 14:27:09 +0200
Subject: [PATCH 015/330] gpgme: remove myself as maintainer

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

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 4f95b2dc0983..ccf03ccabdcf 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -85,6 +85,6 @@ stdenv.mkDerivation rec {
     '';
     license = with licenses; [ lgpl21Plus gpl3Plus ];
     platforms = platforms.unix;
-    maintainers = with maintainers; [ primeos ];
+    maintainers = with maintainers; [ ];
   };
 }

From 4fa69858d951409426c5b080fbdaf342fe790877 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 28 Jun 2021 03:08:21 +0200
Subject: [PATCH 016/330] cpython: fix permissions on venv activation scripts

Previously these ended up without u+w permissions which meant they could
not be regenerated, which was hugely annoying when these venvs were for
example created and recreated in a nix-shell.
---
 .../interpreters/python/cpython/default.nix         |  4 ++++
 .../python/cpython/virtualenv-permissions.patch     | 13 +++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/cpython/virtualenv-permissions.patch

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index b8132cea4fc7..6abdd3f2cc8e 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -190,6 +190,10 @@ in with passthru; stdenv.mkDerivation {
     # (since it will do a futile invocation of gcc (!) to find
     # libuuid, slowing down program startup a lot).
     (./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch")
+    # Make sure that the virtualenv activation scripts are
+    # owner-writable, so venvs can be recreated without permission
+    # errors.
+    ./virtualenv-permissions.patch
   ] ++ optionals mimetypesSupport [
     # Make the mimetypes module refer to the right file
     ./mimetypes.patch
diff --git a/pkgs/development/interpreters/python/cpython/virtualenv-permissions.patch b/pkgs/development/interpreters/python/cpython/virtualenv-permissions.patch
new file mode 100644
index 000000000000..c686f21bfbbe
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/virtualenv-permissions.patch
@@ -0,0 +1,13 @@
+diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
+index caa7285..ad666ac 100644
+--- a/Lib/venv/__init__.py
++++ b/Lib/venv/__init__.py
+@@ -379,7 +379,7 @@ class EnvBuilder:
+                 if data is not None:
+                     with open(dstfile, 'wb') as f:
+                         f.write(data)
+-                    shutil.copymode(srcfile, dstfile)
++                    os.chmod(dstfile, 0o644)
+ 
+ 
+ def create(env_dir, system_site_packages=False, clear=False,

From 5aecb4202dd2361957e0e77236ba4e82613b38d9 Mon Sep 17 00:00:00 2001
From: Rahul Rameshbabu <robotrahul123@gmail.com>
Date: Sat, 12 Jun 2021 09:04:31 -0700
Subject: [PATCH 017/330] polkit: 0.118 -> 0.119

The 0.119 release of polkit integrates the following changes, so the
patches implemented to incorporate these changes are no longer needed.

    * https://gitlab.freedesktop.org/polkit/polkit/-/commit/273357a39520423b2074e7d664f83922ad047176
    * https://gitlab.freedesktop.org/polkit/polkit/-/blob/0.119/src/polkit/polkitsystembusname.c#L438-440

Fixes: CVE-2021-3560 without a patch
---
 pkgs/development/libraries/polkit/default.nix | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index bc7f7e80d9c2..a8b012a20998 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -20,28 +20,14 @@ in
 
 stdenv.mkDerivation rec {
   pname = "polkit";
-  version = "0.118";
+  version = "0.119";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.gz";
-    sha256 = "0swmg37jsxsxfsd2b3qm0l3zxr9ldvhpjw8lsgq3j8q7wy2fjm3d";
+    sha256 = "0p0zzmr0kh3mpmqya4q27y4h9b920zp5ya0i8909ahp9hvdrymy8";
   };
 
-  patches = [
-    # Don't use etc/dbus-1/system.d
-    # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/11
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5dd4e22efd05d55833c4634b56e473812b5acbf2.patch";
-      sha256 = "17lv7xj5ksa27iv4zpm4zwd4iy8zbwjj4ximslfq3sasiz9kxhlp";
-    })
-    (fetchpatch {
-      # https://www.openwall.com/lists/oss-security/2021/06/03/1
-      # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/79
-      name = "CVE-2021-3560.patch";
-      url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch";
-      sha256 = "157ddsizgr290jsb8fpafrc37gc1qw5pdvl351vnn3pzhqs7n6f4";
-    })
-  ] ++ lib.optionals stdenv.hostPlatform.isMusl [
+  patches = 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.
@@ -110,18 +96,22 @@ stdenv.mkDerivation rec {
   inherit doCheck;
   checkInputs = [ dbus ];
   checkPhase = ''
+    runHook preCheck
+
     # unfortunately this test needs python-dbusmock, but python-dbusmock needs polkit,
     # leading to a circular dependency
     substituteInPlace test/Makefile --replace polkitbackend ""
 
     # tests need access to the system bus
     dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check'
+
+    runHook postCheck
   '';
 
   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;
+    license = licenses.lgpl2Plus;
     platforms = platforms.unix;
     maintainers = teams.freedesktop.members ++ (with maintainers; [ ]);
   };

From 2acfbeeb82a39c635a66a69f63e616e9bc850d04 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jun 2021 06:11:52 +0000
Subject: [PATCH 018/330] jackett: 0.18.364 -> 0.18.372

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

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 5bb43ae316c1..341c91304817 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jackett";
-  version = "0.18.364";
+  version = "0.18.372";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "sha256-QcwrgW07tP0PxA6UWqMf7VT0Y8uBZFJY9Uz7seorEfs=";
+    sha256 = "sha256-GkAKYxa5F0N9jg9TZrwt3hjkhybZTKU2Ia/gIxBRGuo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 3898eb189762f5e83ed4b617c58711ceae29e9fa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 17 Jun 2021 05:00:44 +0200
Subject: [PATCH 019/330] python38: 3.8.9 -> 3.8.10

---
 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 30134a056284..1830ce301b60 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -122,10 +122,10 @@ with pkgs;
       sourceVersion = {
         major = "3";
         minor = "8";
-        patch = "9";
+        patch = "10";
         suffix = "";
       };
-      sha256 = "XjkfPsRdopVEGcqwvq79i+OIlepc4zV3w+wUlAxLlXI=";
+      sha256 = "1n8rjb3jn0j8dvi1qn94rxayc9rh982d8wgkrjy41n1x15k4mwka";
     };
   };
 

From 7ca18ab93f802dead800d76e3913eda1a8bbc705 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 17 Jun 2021 05:01:07 +0200
Subject: [PATCH 020/330] python39: 3.9.4 -> 3.9.5

---
 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 1830ce301b60..414a1870a3c4 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -181,10 +181,10 @@ in {
     sourceVersion = {
       major = "3";
       minor = "9";
-      patch = "4";
+      patch = "5";
       suffix = "";
     };
-    sha256 = "Sw5mRKdvjfhkriSsUApRu/aL0Jj2oXPifTthzcqaoTQ=";
+    sha256 = "10vdf46q5ldnzkprm8pldvr5a9hrdpxjv7mpzgdw6vj3cl318nhc";
     inherit (darwin) configd;
     inherit passthruFun;
   };

From bb696403b0334d1fd3dee195751f99f9e2b0270f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 17 Jun 2021 05:01:49 +0200
Subject: [PATCH 021/330] python310: 3.10.0a5 -> 3.10.0b3

---
 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 414a1870a3c4..507ad8d36cf3 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -195,9 +195,9 @@ in {
       major = "3";
       minor = "10";
       patch = "0";
-      suffix = "a5";
+      suffix = "b3";
     };
-    sha256 = "BBjlfnA24hnx5rYwOyHnEfZM/Q/dsIlNjxnzev/8XU0=";
+    sha256 = "05fc4mp2ysb372bzkwbn1b1z01bfldnaqig6rxmif58hs3aawrr2";
     inherit (darwin) configd;
     inherit passthruFun;
   };

From bf884a789e87a6d5b69900161584352f29780c2d Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 20 Jun 2021 21:32:00 +0200
Subject: [PATCH 022/330] openspecfun: use fetchFromGitHub and pname&version

---
 .../science/math/openspecfun/default.nix          | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix
index a341264d9894..cb72fbd2ca48 100644
--- a/pkgs/development/libraries/science/math/openspecfun/default.nix
+++ b/pkgs/development/libraries/science/math/openspecfun/default.nix
@@ -1,10 +1,13 @@
-{ lib, stdenv, fetchurl, gfortran }:
+{ lib, stdenv, fetchFromGitHub, gfortran }:
 
-stdenv.mkDerivation {
-  name = "openspecfun-0.5.3";
-  src = fetchurl {
-    url = "https://github.com/JuliaLang/openspecfun/archive/v0.5.3.tar.gz";
-    sha256 = "1rs1bv8jq751fv9vq79890wqf9xlbjc7lvz3ighzyfczbyjcf18m";
+stdenv.mkDerivation rec {
+  pname = "openspecfun";
+  version = "0.5.3";
+  src = fetchFromGitHub {
+    owner = "JuliaLang";
+    repo = "openspecfun";
+    rev = "v${version}";
+    sha256 = "0pfw6l3ch7isz403llx7inxlvavqh01jh1hb9dpidi86sjjx9kfh";
   };
 
   makeFlags = [ "prefix=$(out)" ];

From 7585fae73030f43b267b9a3c30c84f1524241524 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 20 Jun 2021 21:33:58 +0200
Subject: [PATCH 023/330] qoauth: use fetchFromGitHub and pname&version

---
 pkgs/development/libraries/qoauth/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index 2b0be6f0b3dd..2c62ea27d19b 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/pkgs/development/libraries/qoauth/default.nix
@@ -1,12 +1,15 @@
-{ lib, stdenv, fetchurl, qtbase, qmake, qca-qt5 }:
+{ lib, stdenv, fetchFromGitHub, qtbase, qmake, qca-qt5 }:
 
-stdenv.mkDerivation {
-  name = "qoauth-2.0.0";
+stdenv.mkDerivation rec {
+  pname = "qoauth";
+  version = "2.0.0";
 
-  src = fetchurl {
-    url = "https://github.com/ayoy/qoauth/archive/v2.0.0.tar.gz";
-    name = "qoauth-2.0.0.tar.gz";
-    sha256 = "a28005986410d333e03d077679cdf6c504ec5a33342867dc0f9fb0b74285e333";
+  src = fetchFromGitHub {
+    owner = "ayoy";
+    repo = "qoauth";
+    rev = "v${version}";
+    name = "qoauth-${version}.tar.gz";
+    sha256 = "1b2jdqs526ac635yb2whm049spcsk7almnnr6r5b4yqhq922anw3";
   };
 
   postPatch = ''

From 4cf94742880abe6a4b7dfd8b94dcea66b68d9cf8 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 22 Jun 2021 15:17:44 +0200
Subject: [PATCH 024/330] gtkimageview: fix url and use pname&version

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

diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix
index 438f7feab6ce..1e910e3bcf40 100644
--- a/pkgs/development/libraries/gtkimageview/default.nix
+++ b/pkgs/development/libraries/gtkimageview/default.nix
@@ -1,11 +1,12 @@
 { fetchurl, lib, stdenv, pkg-config, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "gtkimageview-1.6.4";
+  pname = "gtkimageview";
+  version = "1.6.4";
 
   src = fetchurl {
-    url = "http://trac.bjourne.webfactional.com/chrome/common/releases/${name}.tar.gz";
-    sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37";
+    url = "https://sources.archlinux.org/other/packages/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "1wj63af9j9p5i067lpwi9lxvwalamakrmklvl983kvi7s4w1ss2c";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 3196682098e710a6bb6f1984a070459473fcad4c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 22 Jun 2021 15:20:29 +0200
Subject: [PATCH 025/330] liblqr: switch source to github and use pname&version

http://liblqr.wikidot.com/forum/t-905211/code-hosting-moved-to-github
---
 pkgs/development/libraries/liblqr-1/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix
index b871dbdb19d2..aa6cd0fd57d8 100644
--- a/pkgs/development/libraries/liblqr-1/default.nix
+++ b/pkgs/development/libraries/liblqr-1/default.nix
@@ -1,11 +1,14 @@
-{ lib, stdenv, fetchurl, pkg-config, glib }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
-  name = "liblqr-1-0.4.2";
+  pname = "liblqr-1";
+  version = "0.4.2";
 
-  src = fetchurl {
-    url = "${meta.homepage}/local--files/en:download-page/${name}.tar.bz2";
-    sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp";
+  src = fetchFromGitHub {
+    owner = "carlobaldassi";
+    repo = "liblqr";
+    rev = "v${version}";
+    sha256 = "10mrl5k3l2hxjhz4w93n50xwywp6y890rw2vsjcgai8627x5f1df";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 7a945d8e45c0453acc4ba37f771be070aabb18df Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 20 Jun 2021 15:49:41 +0200
Subject: [PATCH 026/330] ilixi: use github sources and use pname&version

---
 pkgs/development/libraries/ilixi/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix
index b6f1c0ac78a5..385baaaf10df 100644
--- a/pkgs/development/libraries/ilixi/default.nix
+++ b/pkgs/development/libraries/ilixi/default.nix
@@ -1,14 +1,17 @@
-{ lib, stdenv, fetchurl, pkg-config, directfb, libsigcxx, libxml2, fontconfig }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, directfb, libsigcxx, libxml2, fontconfig }:
 
 # TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen,
 # Reflex, Wnn, NLS
 
 stdenv.mkDerivation rec {
-  name = "ilixi-1.0.0";
+  pname = "ilixi";
+  version = "1.0.0";
 
-  src = fetchurl {
-    url = "http://www.directfb.org/downloads/Libs/${name}.tar.gz";
-    sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v";
+  src = fetchFromGitHub {
+    owner = "ilixi";
+    repo = "ilixi";
+    rev = version;
+    sha256 = "05h862r9mhis26v8yf967n86qf8y1gdgfzhbqfsr6pjw1k3v3wdr";
   };
 
   nativeBuildInputs = [ pkg-config ];

From fd25c03e09548c3f232e22310dccc61a2b356825 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 20 Jun 2021 15:53:42 +0200
Subject: [PATCH 027/330] eventlog: 0.2.12->0.2.13

---
 pkgs/development/libraries/eventlog/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix
index ca460aa71f6b..e9aecfe4a729 100644
--- a/pkgs/development/libraries/eventlog/default.nix
+++ b/pkgs/development/libraries/eventlog/default.nix
@@ -1,11 +1,14 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "eventlog-0.2.12";
+stdenv.mkDerivation rec {
+  pname = "eventlog";
+  version = "0.2.13";
 
-  src = fetchurl {
-    url = "http://www.balabit.com/downloads/files/eventlog/0.2/eventlog_0.2.12.tar.gz";
-    sha256 = "494dac8e01dc5ce323df2ad554d94874938dab51aa025987677b2bc6906a9c66";
+  src = fetchFromGitHub {
+    owner = "balabit";
+    repo = "eventlog";
+    rev = "a5c19163ba131f79452c6dfe4e31c2b4ce4be741";
+    sha256 = "0a2za3hs7wzy14z7mfgldy1r9xdlqv97yli9wlm8xldr0amsx869";
   };
 
   meta = {

From c9d456ad6050f0d25ce73488b15243b40affa8a3 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 20 Jun 2021 15:54:31 +0200
Subject: [PATCH 028/330] proglodyte-wasm: remove

unmaintained since 5 years with zero github stars
---
 .../interpreters/proglodyte-wasm/default.nix  | 61 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 63 deletions(-)
 delete mode 100644 pkgs/development/interpreters/proglodyte-wasm/default.nix

diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix
deleted file mode 100644
index 2d4acbd398ea..000000000000
--- a/pkgs/development/interpreters/proglodyte-wasm/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }:
-
-let
-  sexpr_wasm_prototype = stdenv.mkDerivation {
-    name = "sexpr_wasm_prototype";
-    src = fetchFromGitHub {
-      owner = "WebAssembly";
-      repo = "sexpr-wasm-prototype";
-      rev = "1347a367c34876bfe92562f244a8c8b770372479";
-      sha256 = "1v1mph5fp1rffhvh8bbx937gpjqjrdgm7yhffdxzdn4pih9d0grn";
-    };
-
-    configurePhase = ''
-      # set this to nonempty string to disable default cmake configure
-    '';
-
-    nativeBuildInputs = [ cmake ];
-    buildInputs = [ clang python ];
-
-    buildPhase = "make clang-debug-no-tests";
-
-    hardeningDisable = [ "format" ];
-
-    installPhase = ''
-      mkdir -p $out/bin
-      cp out/clang/Debug/no-tests/sexpr-wasm $out/bin
-    '';
-  };
-
-in
-
-stdenv.mkDerivation {
-  name = "wasm-0.0.1";
-
-  src = fetchFromGitHub {
-    owner = "proglodyte";
-    repo = "wasm";
-    rev = "650188eecaaf4b64f12b341986b4e89e5fdb3bbe";
-    sha256 = "1f5mdl0l2448lx7h36b4bdr541a4q1wapn1kdwrd4z7s94n7a5gq";
-  };
-
-  configurePhase = ''
-    sed -i -e "s|sudo ||g" Makefile
-  '';
-
-  installPhase = ''
-    export DESTDIR=$out
-    export MKTEMPDIR=${coreutils}/bin
-    export D8DIR=${v8}/bin
-    export SWDIR=${sexpr_wasm_prototype}/bin
-    make install
-  '';
-
-  meta = with lib; {
-    description = "wasm runs WebAssembly from the command line";
-    maintainers = with maintainers; [ proglodyte ];
-    platforms = platforms.linux;
-    license = licenses.asl20;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88f2d2548ee0..f4b8aaf19167 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12715,8 +12715,6 @@ in
 
   wasm3 = callPackage ../development/interpreters/wasm3 { };
 
-  proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { };
-
 
   ### DEVELOPMENT / MISC
 

From 1e9b4f583408329bcc638bfa84ae3b6454d1eafb Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 20 Jun 2021 15:59:21 +0200
Subject: [PATCH 029/330] tidyp: use fetchFromGitHub and pname&version

---
 pkgs/development/libraries/tidyp/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix
index f4c24a126e5b..c676f8f0174d 100644
--- a/pkgs/development/libraries/tidyp/default.nix
+++ b/pkgs/development/libraries/tidyp/default.nix
@@ -1,11 +1,14 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "tidyp-1.04";
+  pname = "tidyp";
+  version = "1.04";
 
-  src = fetchurl {
-    url = "https://github.com/downloads/petdance/tidyp/${name}.tar.gz";
-    sha256 = "0f5ky0ih4vap9c6j312jn73vn8m2bj69pl2yd3a5nmv35k9zmc10";
+  src = fetchFromGitHub {
+    owner = "petdance";
+    repo = "tidyp";
+    rev = version;
+    sha256 = "0jslskziwzk4hb6i640fvpnbv2zxrvim6pdx2gwx5wyc64aviskc";
   };
 
   hardeningDisable = [ "format" ];

From f2e47305ea26eb6636f0ae0c55637da685898355 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 20 Jun 2021 16:02:46 +0200
Subject: [PATCH 030/330] wildmidi: 0.4.3 -> 0.4.4 and use fetchFromGitHub and
 pname&version

---
 pkgs/development/libraries/wildmidi/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix
index 81c1b51e6589..7983806a3090 100644
--- a/pkgs/development/libraries/wildmidi/default.nix
+++ b/pkgs/development/libraries/wildmidi/default.nix
@@ -1,11 +1,14 @@
-{ lib, stdenv, fetchurl, cmake, alsa-lib, freepats }:
+{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, freepats }:
 
 stdenv.mkDerivation rec {
-  name = "wildmidi-0.4.3";
+  pname = "wildmidi";
+  version = "0.4.4";
 
-  src = fetchurl {
-    url = "https://github.com/Mindwerks/wildmidi/archive/${name}.tar.gz";
-    sha256 = "1igkxv4axnqap59d8pjgqj94x0khn3fdd2hq6wdvkd2v8nb5m3j9";
+  src = fetchFromGitHub {
+    owner = "Mindwerks";
+    repo = "wildmidi";
+    rev = "${pname}-${version}";
+    sha256 = "08fbbsvw6pkwwqarjwcvdp8mq4zn5sgahf025hynwc6rvf4sp167";
   };
 
   nativeBuildInputs = [ cmake ];

From 567fb837599f1f51d4dd981c2ebf8ea9f2f19f5d Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 20 Jun 2021 16:12:08 +0200
Subject: [PATCH 031/330] yajl: use fetchFromGitHub and pname&version

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

diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix
index df47168c79b7..645329f83cdb 100644
--- a/pkgs/development/libraries/yajl/default.nix
+++ b/pkgs/development/libraries/yajl/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "yajl-2.1.0";
+  pname = "yajl";
+  version = "2.1.0";
 
-  src = fetchurl {
-    url = "https://github.com/lloyd/yajl/tarball/2.1.0";
-    name = "${name}.tar.gz";
-    sha256 = "0f6yrjc05aa26wfi7lqn2gslm19m6rm81b30ksllpkappvh162ji";
+  src = fetchFromGitHub {
+    owner = "lloyd";
+    repo = "yajl";
+    rev = version;
+    sha256 = "00yj06drb6izcxfxfqlhimlrb089kka0w0x8k27pyzyiq7qzcvml";
   };
 
   nativeBuildInputs = [ cmake ];

From c1416deae1c0c085a3c7bd7e3c916a6c9dcf4f3e Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 20 Jun 2021 16:14:51 +0200
Subject: [PATCH 032/330] postiats-utilities: use fetchFromGitHub and
 pname&version

---
 .../tools/postiats-utilities/default.nix          | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/development/tools/postiats-utilities/default.nix
index b9ca9ae57814..6d4db28f37e0 100644
--- a/pkgs/development/tools/postiats-utilities/default.nix
+++ b/pkgs/development/tools/postiats-utilities/default.nix
@@ -1,10 +1,13 @@
-{ lib, stdenv, fetchurl, python3, python3Packages }:
+{ lib, stdenv, fetchFromGitHub, python3, python3Packages }:
 
-stdenv.mkDerivation {
-  name = "postiats-utilities-2.0.1";
-  src = fetchurl {
-    url = "https://github.com/Hibou57/PostiATS-Utilities/archive/v2.0.1.tar.gz";
-    sha256 = "12jlzqigmaa9m37x0nq5v3gq8v61m73i5kzdnsm06chf0przpaix";
+stdenv.mkDerivation rec {
+  pname = "postiats-utilities";
+  version = "2.0.1";
+  src = fetchFromGitHub {
+    owner = "Hibou57";
+    repo = "PostiATS-Utilities";
+    rev = "v${version}";
+    sha256 = "1238zp6sh60rdqbzff0w5c36w2z1jr44qnv43qidmcp19zvr7jd5";
   };
 
   meta = with lib; {

From 3c12e95ad18367c92865bd13aef68c402fa76036 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 20 Jun 2021 16:15:21 +0200
Subject: [PATCH 033/330] development: /s/name/pname&version/

---
 pkgs/development/interpreters/hugs/default.nix          | 8 ++++----
 pkgs/development/interpreters/rascal/default.nix        | 5 +++--
 pkgs/development/libraries/NSPlist/default.nix          | 3 ++-
 pkgs/development/libraries/apr-util/default.nix         | 5 +++--
 pkgs/development/libraries/apr/default.nix              | 5 +++--
 pkgs/development/libraries/cloog/default.nix            | 5 +++--
 pkgs/development/libraries/dotnetfx35/default.nix       | 7 ++++---
 pkgs/development/libraries/dotnetfx40/default.nix       | 7 ++++---
 pkgs/development/libraries/enet/default.nix             | 5 +++--
 pkgs/development/libraries/eventlog/default.nix         | 2 +-
 pkgs/development/libraries/farstream/default.nix        | 5 +++--
 pkgs/development/libraries/fastpbkdf2/default.nix       | 7 ++++---
 pkgs/development/libraries/freetts/default.nix          | 7 ++++---
 pkgs/development/libraries/funambol/default.nix         | 7 ++++---
 pkgs/development/libraries/garmintools/default.nix      | 7 ++++---
 pkgs/development/libraries/gsl/default.nix              | 5 +++--
 pkgs/development/libraries/gtkspell/default.nix         | 7 ++++---
 pkgs/development/libraries/id3lib/default.nix           | 7 ++++---
 pkgs/development/libraries/jansson/default.nix          | 5 +++--
 pkgs/development/libraries/libHX/default.nix            | 5 +++--
 pkgs/development/libraries/libantlr3c/default.nix       | 7 ++++---
 pkgs/development/libraries/libcddb/default.nix          | 5 +++--
 pkgs/development/libraries/libcdr/default.nix           | 5 +++--
 pkgs/development/libraries/libcredis/default.nix        | 7 ++++---
 pkgs/development/libraries/libdaemon/default.nix        | 5 +++--
 pkgs/development/libraries/libelf/default.nix           | 5 +++--
 pkgs/development/libraries/libexttextcat/default.nix    | 5 +++--
 pkgs/development/libraries/libffi/default.nix           | 5 +++--
 pkgs/development/libraries/libfishsound/default.nix     | 5 +++--
 pkgs/development/libraries/libkate/default.nix          | 5 +++--
 pkgs/development/libraries/liblo/default.nix            | 5 +++--
 pkgs/development/libraries/libmnl/default.nix           | 5 +++--
 pkgs/development/libraries/libmp3splt/default.nix       | 5 +++--
 pkgs/development/libraries/libmrss/default.nix          | 7 ++++---
 pkgs/development/libraries/libnatspec/default.nix       | 9 +++++----
 pkgs/development/libraries/liboping/default.nix         | 5 +++--
 pkgs/development/libraries/libowfat/default.nix         | 5 +++--
 pkgs/development/libraries/libsamplerate/default.nix    | 5 +++--
 pkgs/development/libraries/libserialport/default.nix    | 5 +++--
 pkgs/development/libraries/libsodium/default.nix        | 5 +++--
 pkgs/development/libraries/libspectre/default.nix       | 5 +++--
 pkgs/development/libraries/libspectrum/default.nix      | 5 +++--
 pkgs/development/libraries/libstroke/default.nix        | 7 ++++---
 pkgs/development/libraries/libtheora/default.nix        | 5 +++--
 pkgs/development/libraries/libu2f-server/default.nix    | 5 +++--
 pkgs/development/libraries/libvisual/default.nix        | 5 +++--
 pkgs/development/libraries/libvorbis/default.nix        | 5 +++--
 pkgs/development/libraries/libxmi/default.nix           | 7 ++++---
 pkgs/development/libraries/libykneomgr/default.nix      | 5 +++--
 pkgs/development/libraries/libyubikey/default.nix       | 5 +++--
 pkgs/development/libraries/lirc/default.nix             | 5 +++--
 pkgs/development/libraries/log4cpp/default.nix          | 5 +++--
 pkgs/development/libraries/lzo/default.nix              | 5 +++--
 pkgs/development/libraries/matio/default.nix            | 5 +++--
 pkgs/development/libraries/msilbc/default.nix           | 5 +++--
 pkgs/development/libraries/mtdev/default.nix            | 5 +++--
 pkgs/development/libraries/qmlbox2d/default.nix         | 3 ++-
 pkgs/development/libraries/qtwebkit-plugins/default.nix | 3 ++-
 pkgs/development/libraries/qwt/default.nix              | 7 ++++---
 pkgs/development/libraries/readosm/default.nix          | 5 +++--
 pkgs/development/libraries/schroedinger/default.nix     | 7 ++++---
 pkgs/development/libraries/shhopt/default.nix           | 5 +++--
 pkgs/development/libraries/snack/default.nix            | 7 ++++---
 pkgs/development/libraries/speexdsp/default.nix         | 5 +++--
 pkgs/development/libraries/stlport/default.nix          | 5 +++--
 pkgs/development/libraries/taglib-extras/default.nix    | 5 +++--
 pkgs/development/libraries/tclap/default.nix            | 5 +++--
 pkgs/development/libraries/tokyo-cabinet/default.nix    | 5 +++--
 pkgs/development/libraries/wtk/default.nix              | 7 ++++---
 pkgs/development/libraries/xmlrpc-c/default.nix         | 5 +++--
 pkgs/development/misc/avr8-burn-omat/default.nix        | 7 ++++---
 pkgs/development/tools/build-managers/jam/default.nix   | 5 +++--
 pkgs/development/tools/build-managers/mk/default.nix    | 7 ++++---
 pkgs/development/tools/build-managers/redo/default.nix  | 5 +++--
 pkgs/development/tools/mdk/default.nix                  | 7 ++++---
 pkgs/development/tools/profiling/oprofile/default.nix   | 5 +++--
 pkgs/development/tools/sigrok-cli/default.nix           | 5 +++--
 pkgs/development/tools/tradcpp/default.nix              | 7 ++++---
 pkgs/development/tools/winpdb/default.nix               | 5 +++--
 79 files changed, 256 insertions(+), 179 deletions(-)

diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix
index 6af489473c9c..b903ab425c6d 100644
--- a/pkgs/development/interpreters/hugs/default.nix
+++ b/pkgs/development/interpreters/hugs/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, bison }:
 
-stdenv.mkDerivation {
-
-  name = "hugs98-200609";
+stdenv.mkDerivation rec {
+  pname = "hugs98";
+  version = "2006-09";
 
   src = fetchurl {
-    url = "http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz";
+    url = "https://www.haskell.org/hugs/downloads/${version}/hugs98-Sep2006.tar.gz";
     sha256 = "1dj65c39zpy6qqvvrwns2hzj6ipnd4ih655xj7kgyk2nfdvd5x1w";
   };
 
diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix
index 8b49a743b4a9..6ba92a041eb5 100644
--- a/pkgs/development/interpreters/rascal/default.nix
+++ b/pkgs/development/interpreters/rascal/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, makeWrapper, jdk }:
 
 stdenv.mkDerivation rec {
-  name = "rascal-0.6.2";
+  pname = "rascal";
+  version = "0.6.2";
 
   src = fetchurl {
-    url = "https://update.rascal-mpl.org/console/${name}.jar";
+    url = "https://update.rascal-mpl.org/console/${pname}-${version}.jar";
     sha256 = "1z4mwdbdc3r24haljnxng8znlfg2ihm9bf9zq8apd9a32ipcw4i6";
   };
 
diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix
index 1b8ae939ecaa..680e86dd64ef 100644
--- a/pkgs/development/libraries/NSPlist/default.nix
+++ b/pkgs/development/libraries/NSPlist/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation {
-  name = "NSPlist-713decf";
+  pname = "NSPlist";
+  version = "unstable-2017-04-11";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 51e9271b7d7c..bd00a612d4ee 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -13,10 +13,11 @@ assert ldapSupport -> openldap != null;
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "apr-util-1.6.1";
+  pname = "apr-util";
+  version = "1.6.1";
 
   src = fetchurl {
-    url = "mirror://apache/apr/${name}.tar.bz2";
+    url = "mirror://apache/apr/${pname}-${version}.tar.bz2";
     sha256 = "0nq3s1yn13vplgl6qfm09f7n0wm08malff9s59bqf9nid9xjzqfk";
   };
 
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 03b6c9777dfd..dd88cf7b1d49 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "apr-1.7.0";
+  pname = "apr";
+  version = "1.7.0";
 
   src = fetchurl {
-    url = "mirror://apache/apr/${name}.tar.bz2";
+    url = "mirror://apache/apr/${pname}-${version}.tar.bz2";
     sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2";
   };
 
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index 54df2df9d4d2..02a91050e7ba 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, gmp, isl }:
 
 stdenv.mkDerivation rec {
-  name = "cloog-0.18.4";
+  pname = "cloog";
+  version = "0.18.4";
 
   src = fetchurl {
-    url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz";
+    url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${pname}-${version}.tar.gz";
     sha256 = "03km1aqaiy3sbqc2f046ms9x0mlmacxlvs5rxsvjj8nf20vxynij";
   };
 
diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/development/libraries/dotnetfx35/default.nix
index 68569b516a9b..a3045949c6ca 100644
--- a/pkgs/development/libraries/dotnetfx35/default.nix
+++ b/pkgs/development/libraries/dotnetfx35/default.nix
@@ -4,9 +4,10 @@ let
   windir = "/cygdrive/c/WINDOWS";
 in
 {
-  pkg = stdenv.mkDerivation {
-    name = "dotnetfx-3.5";
-    src = "${windir}/Microsoft.NET/Framework/v3.5";
+  pkg = stdenv.mkDerivation rec {
+    pname = "dotnetfx";
+    version = "3.5";
+    src = "${windir}/Microsoft.NET/Framework/v${version}";
     buildCommand = ''
       mkdir -p $out/bin
       ln -s $src/MSBuild.exe $out/bin
diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/development/libraries/dotnetfx40/default.nix
index 1ffc10cfc605..379be1bdc26d 100644
--- a/pkgs/development/libraries/dotnetfx40/default.nix
+++ b/pkgs/development/libraries/dotnetfx40/default.nix
@@ -4,9 +4,10 @@ let
   windir = "/cygdrive/c/WINDOWS";
 in
 {
-  pkg = stdenv.mkDerivation {
-    name = "dotnetfx-4.0";
-    src = "${windir}/Microsoft.NET/Framework/v4.0.30319";
+  pkg = stdenv.mkDerivation rec {
+    pname = "dotnetfx";
+    version = "4.0.30319";
+    src = "${windir}/Microsoft.NET/Framework/v${version}";
     buildCommand = ''
       mkdir -p $out/bin
       ln -s $src/MSBuild.exe $out/bin
diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index ef252ad19f6d..53aec96fe705 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "enet-1.3.17";
+  pname = "enet";
+  version = "1.3.17";
 
   src = fetchurl {
-    url = "http://enet.bespin.org/download/${name}.tar.gz";
+    url = "http://enet.bespin.org/download/${pname}-${version}.tar.gz";
     sha256 = "1p6f9mby86af6cs7pv6h48032ip9g32c05cb7d9mimam8lchz3x3";
   };
 
diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix
index e9aecfe4a729..c26b1d1a923e 100644
--- a/pkgs/development/libraries/eventlog/default.nix
+++ b/pkgs/development/libraries/eventlog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "eventlog";
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index b046b7aef737..e26ebef0c518 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -14,12 +14,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "farstream-0.2.8";
+  pname = "farstream";
+  version = "0.2.8";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
+    url = "https://www.freedesktop.org/software/farstream/releases/farstream/${pname}-${version}.tar.gz";
     sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb";
   };
 
diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix
index ac90001fc397..723edd6f29d4 100644
--- a/pkgs/development/libraries/fastpbkdf2/default.nix
+++ b/pkgs/development/libraries/fastpbkdf2/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitHub, openssl }:
 
-stdenv.mkDerivation {
-  name = "fastpbkdf2-1.0.0";
+stdenv.mkDerivation rec {
+  pname = "fastpbkdf2";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "ctz";
     repo = "fastpbkdf2";
-    rev = "v1.0.0";
+    rev = "v${version}";
     sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2";
   };
 
diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/development/libraries/freetts/default.nix
index dc5f43860305..06535c087dc6 100644
--- a/pkgs/development/libraries/freetts/default.nix
+++ b/pkgs/development/libraries/freetts/default.nix
@@ -1,9 +1,10 @@
 {stdenv, fetchurl, apacheAnt, unzip, sharutils, lib, jdk}:
 
-stdenv.mkDerivation {
-  name = "freetts-1.2.2";
+stdenv.mkDerivation rec {
+  pname = "freetts";
+  version = "1.2.2";
   src = fetchurl {
-    url = "mirror://sourceforge/freetts/freetts-1.2.2-src.zip";
+    url = "mirror://sourceforge/freetts/${pname}-${version}-src.zip";
     sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7";
   };
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix
index 377aa45cf5ec..e5ad34a56bb6 100644
--- a/pkgs/development/libraries/funambol/default.nix
+++ b/pkgs/development/libraries/funambol/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }:
 
-stdenv.mkDerivation {
-  name = "funambol-client-cpp-9.0.0";
+stdenv.mkDerivation rec {
+  pname = "funambol-client-cpp";
+  version = "9.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/funambol/funambol-client-sdk-9.0.0.zip";
+    url = "mirror://sourceforge/funambol/funambol-client-sdk-${version}.zip";
     sha256 = "1667gahz30i5r8kbv7w415z0hbgm6f6pln1137l5skapi1if6r73";
   };
 
diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix
index 424e3751f407..7ad5bc879261 100644
--- a/pkgs/development/libraries/garmintools/default.nix
+++ b/pkgs/development/libraries/garmintools/default.nix
@@ -1,8 +1,9 @@
 { lib, stdenv, fetchurl, libusb-compat-0_1 }:
-stdenv.mkDerivation {
-  name = "garmintools-0.10";
+stdenv.mkDerivation rec {
+  pname = "garmintools";
+  version = "0.10";
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/garmintools-0.10.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/${pname}-${version}.tar.gz";
     sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz";
   };
   buildInputs = [ libusb-compat-0_1 ];
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index fc5f689e0d90..dec2125974d7 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "gsl-2.7";
+  pname = "gsl";
+  version = "2.7";
 
   src = fetchurl {
-    url = "mirror://gnu/gsl/${name}.tar.gz";
+    url = "mirror://gnu/gsl/${pname}-${version}.tar.gz";
     sha256 = "sha256-77vzeF2g5TA4vnkHUAYotGYVLbw8FzqH3hteui4jYCs=";
   };
 
diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix
index 78d9956d30a2..aca6ccdcccbc 100644
--- a/pkgs/development/libraries/gtkspell/default.nix
+++ b/pkgs/development/libraries/gtkspell/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}:
 
-stdenv.mkDerivation {
-  name = "gtkspell-2.0.16";
+stdenv.mkDerivation rec {
+  pname = "gtkspell";
+  version = "2.0.16";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz";
+    url = "mirror://sourceforge/gtkspell/${pname}-${version}.tar.gz";
     sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg";
   };
 
diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
index 31fc4fd6ba33..141be2092a50 100644
--- a/pkgs/development/libraries/id3lib/default.nix
+++ b/pkgs/development/libraries/id3lib/default.nix
@@ -1,7 +1,8 @@
 {lib, stdenv, fetchurl, zlib}:
 
-stdenv.mkDerivation {
-  name = "id3lib-3.8.3";
+stdenv.mkDerivation rec {
+  pname = "id3lib";
+  version = "3.8.3";
 
   patches = [
     ./id3lib-3.8.3-gcc43-1.patch
@@ -11,7 +12,7 @@ stdenv.mkDerivation {
   buildInputs = [ zlib ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz";
+    url = "mirror://sourceforge/id3lib/${pname}-${version}.tar.gz";
     sha256 = "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97";
   };
 
diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix
index 85451511d7e4..21a697f1e3ab 100644
--- a/pkgs/development/libraries/jansson/default.nix
+++ b/pkgs/development/libraries/jansson/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "jansson-2.13.1";
+  pname = "jansson";
+  version = "2.13.1";
 
   src = fetchurl {
-    url = "http://www.digip.org/jansson/releases/${name}.tar.gz";
+    url = "https://digip.org/jansson/releases/${pname}-${version}.tar.gz";
     sha256 = "0ks7gbs0j8p4dmmi2sq129mxy5gfg0z6220i1jk020mi2zd7gwzl";
   };
 
diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix
index c059b9d412aa..8761ac1e5ef8 100644
--- a/pkgs/development/libraries/libHX/default.nix
+++ b/pkgs/development/libraries/libHX/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "libHX-3.22";
+  pname = "libHX";
+  version = "3.22";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libhx/libHX/3.22/${name}.tar.xz";
+    url = "mirror://sourceforge/libhx/libHX/${version}/${pname}-${version}.tar.xz";
     sha256 = "18w39j528lyg2026dr11f2xxxphy91cg870nx182wbd8cjlqf86c";
   };
 
diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix
index 6cbf1d204376..aac75fcc2257 100644
--- a/pkgs/development/libraries/libantlr3c/default.nix
+++ b/pkgs/development/libraries/libantlr3c/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "libantlr3c-3.4";
+stdenv.mkDerivation rec {
+  pname = "libantlr3c";
+  version = "3.4";
   src = fetchurl {
-    url = "https://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz";
+    url = "https://www.antlr3.org/download/C/libantlr3c-${version}.tar.gz";
     sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa";
   };
 
diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix
index c1b28e22e103..bf20211ee60a 100644
--- a/pkgs/development/libraries/libcddb/default.nix
+++ b/pkgs/development/libraries/libcddb/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "libcddb-1.3.2";
+  pname = "libcddb";
+  version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libcddb/${name}.tar.bz2";
+    url = "mirror://sourceforge/libcddb/${pname}-${version}.tar.bz2";
     sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim";
   };
 
diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index b987c3dbb25a..a8208820dff4 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, fetchpatch, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }:
 
 stdenv.mkDerivation rec {
-  name = "libcdr-0.1.6";
+  pname = "libcdr";
+  version = "0.1.6";
 
   src = fetchurl {
-    url = "https://dev-www.libreoffice.org/src/${name}.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.xz";
     sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81";
   };
 
diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix
index 247d341bce97..e0224d865d55 100644
--- a/pkgs/development/libraries/libcredis/default.nix
+++ b/pkgs/development/libraries/libcredis/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "libcredis-0.2.3";
+stdenv.mkDerivation rec {
+  pname = "libcredis";
+  version = "0.2.3";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/credis/credis-0.2.3.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/credis/credis-${version}.tar.gz";
     sha256 = "1l3hlw9rrc11qggbg9a2303p3bhxxx2vqkmlk8avsrbqw15r1ayr";
   };
 
diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix
index eeb034ed0678..51df45809789 100644
--- a/pkgs/development/libraries/libdaemon/default.nix
+++ b/pkgs/development/libraries/libdaemon/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "libdaemon-0.14";
+  pname = "libdaemon";
+  version = "0.14";
 
   src = fetchurl {
-    url = "${meta.homepage}/${name}.tar.gz";
+    url = "http://0pointer.de/lennart/projects/libdaemon/${pname}-${version}.tar.gz";
     sha256 = "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx";
   };
 
diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix
index 2b8cd51ba5f6..be328c54c088 100644
--- a/pkgs/development/libraries/libelf/default.nix
+++ b/pkgs/development/libraries/libelf/default.nix
@@ -8,10 +8,11 @@
 # files.
 
 stdenv.mkDerivation rec {
-  name = "libelf-0.8.13";
+  pname = "libelf";
+  version = "0.8.13";
 
   src = fetchurl {
-    url = "https://fossies.org/linux/misc/old/${name}.tar.gz";
+    url = "https://fossies.org/linux/misc/old/${pname}-${version}.tar.gz";
     sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr";
   };
 
diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix
index 8e5cc8685da9..8efdb1bee02d 100644
--- a/pkgs/development/libraries/libexttextcat/default.nix
+++ b/pkgs/development/libraries/libexttextcat/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libexttextcat-3.4.5";
+  pname = "libexttextcat";
+  version = "3.4.5";
 
   src = fetchurl {
-    url = "https://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libexttextcat/${pname}-${version}.tar.xz";
     sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k";
   };
 
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 29b76e34d652..48611dffb069 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -9,10 +9,11 @@
 # files.
 
 stdenv.mkDerivation rec {
-  name = "libffi-3.3";
+  pname = "libffi";
+  version = "3.3";
 
   src = fetchurl {
-    url = "https://sourceware.org/pub/libffi/${name}.tar.gz";
+    url = "https://sourceware.org/pub/libffi/${pname}-${version}.tar.gz";
     sha256 = "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj";
   };
 
diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix
index 72dc29867115..bf578b969eff 100644
--- a/pkgs/development/libraries/libfishsound/default.nix
+++ b/pkgs/development/libraries/libfishsound/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libvorbis, speex, flac, pkg-config }:
 
 stdenv.mkDerivation rec {
-  name = "libfishsound-1.0.0";
+  pname = "libfishsound";
+  version = "1.0.0";
 
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/libfishsound/${name}.tar.gz";
+    url = "https://downloads.xiph.org/releases/libfishsound/${pname}-${version}.tar.gz";
     sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf";
   };
 
diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix
index 2135cc37d91e..d2ef623bf157 100644
--- a/pkgs/development/libraries/libkate/default.nix
+++ b/pkgs/development/libraries/libkate/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libogg, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "libkate-0.4.1";
+  pname = "libkate";
+  version = "0.4.1";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/${pname}-${version}.tar.gz";
     sha256 = "0s3vr2nxfxlf1k75iqpp4l78yf4gil3f0v778kvlngbchvaq23n4";
   };
 
diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix
index 5f5b23cdc3a1..1a9ce7c331a0 100644
--- a/pkgs/development/libraries/liblo/default.nix
+++ b/pkgs/development/libraries/liblo/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "liblo-0.31";
+  pname = "liblo";
+  version = "0.31";
 
   src = fetchurl {
-    url = "mirror://sourceforge/liblo/liblo/0.31/${name}.tar.gz";
+    url = "mirror://sourceforge/liblo/liblo/${version}/${pname}-${version}.tar.gz";
     sha256 = "0l67rkdhfa8cffa0nynql3lh2xlbn1454h6qxhjddp1029p48krb";
   };
 
diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix
index 4e99258a3e80..a8ec4c5f3b95 100644
--- a/pkgs/development/libraries/libmnl/default.nix
+++ b/pkgs/development/libraries/libmnl/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libmnl-1.0.4";
+  pname = "libmnl";
+  version = "1.0.4";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/libmnl/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libmnl/files/${pname}-${version}.tar.bz2";
     sha256 = "108zampspaalv44zn0ar9h386dlfixpd149bnxa5hsi8kxlqj7qp";
   };
 
diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix
index 58da7560e137..0e813375b9a2 100644
--- a/pkgs/development/libraries/libmp3splt/default.nix
+++ b/pkgs/development/libraries/libmp3splt/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libtool, libmad, libid3tag }:
 
 stdenv.mkDerivation rec {
-  name = "libmp3splt-0.9.2";
+  pname = "libmp3splt";
+  version = "0.9.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mp3splt/${name}.tar.gz";
+    url = "mirror://sourceforge/mp3splt/${pname}-${version}.tar.gz";
     sha256 = "1p1mn2hsmj5cp40fnc8g1yfvk72p8pjxi866gjdkgjsqrr7xdvih";
   };
 
diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix
index df3460970d17..43d829b98342 100644
--- a/pkgs/development/libraries/libmrss/default.nix
+++ b/pkgs/development/libraries/libmrss/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, curl, libnxml, pkg-config}:
 
-stdenv.mkDerivation {
-  name = "libmrss-0.19.2";
+stdenv.mkDerivation rec {
+  pname = "libmrss";
+  version = "0.19.2";
 
   src = fetchurl {
-    url = "https://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz";
+    url = "https://www.autistici.org/bakunin/libmrss/libmrss-${version}.tar.gz";
     sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507";
   };
 
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix
index 17e43ec29d94..9a0b90e16a41 100644
--- a/pkgs/development/libraries/libnatspec/default.nix
+++ b/pkgs/development/libraries/libnatspec/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, autoreconfHook, popt, libiconv }:
 
-stdenv.mkDerivation (rec {
-  name = "libnatspec-0.3.0";
+stdenv.mkDerivation rec {
+  pname = "libnatspec";
+  version = "0.3.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/natspec/${name}.tar.bz2";
+    url = "mirror://sourceforge/natspec/${pname}-${version}.tar.bz2";
     sha256 = "0wffxjlc8svilwmrcg3crddpfrpv35mzzjgchf8ygqsvwbrbb3b7";
   };
 
@@ -20,4 +21,4 @@ stdenv.mkDerivation (rec {
   };
 } // lib.optionalAttrs (!stdenv.isLinux) {
   propagatedBuildInputs = [ libiconv ];
-})
+}
diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix
index c309c70e3d3b..932133e01921 100644
--- a/pkgs/development/libraries/liboping/default.nix
+++ b/pkgs/development/libraries/liboping/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, ncurses ? null, perl ? null, lib }:
 
 stdenv.mkDerivation rec {
-  name = "liboping-1.10.0";
+  pname = "liboping";
+  version = "1.10.0";
 
   src = fetchurl {
-    url = "http://verplant.org/liboping/files/${name}.tar.bz2";
+    url = "https://noping.cc/files/${pname}-${version}.tar.bz2";
     sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b";
   };
 
diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix
index 14270a36ec5d..9db1354677d6 100644
--- a/pkgs/development/libraries/libowfat/default.nix
+++ b/pkgs/development/libraries/libowfat/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libowfat-0.32";
+  pname = "libowfat";
+  version = "0.32";
 
   src = fetchurl {
-    url = "https://www.fefe.de/libowfat/${name}.tar.xz";
+    url = "https://www.fefe.de/libowfat/${pname}-${version}.tar.xz";
     sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl";
   };
 
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index 5cf872c3fc39..5f0863bc49c8 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -4,10 +4,11 @@ let
   inherit (lib) optionals optionalString;
 
 in stdenv.mkDerivation rec {
-  name = "libsamplerate-0.1.9";
+  pname = "libsamplerate";
+  version = "0.1.9";
 
   src = fetchurl {
-    url = "http://www.mega-nerd.com/SRC/${name}.tar.gz";
+    url = "http://www.mega-nerd.com/SRC/${pname}-${version}.tar.gz";
     sha256 = "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha";
   };
 
diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix
index 0a2adc4126f1..79f46ffca1f8 100644
--- a/pkgs/development/libraries/libserialport/default.nix
+++ b/pkgs/development/libraries/libserialport/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, udev, darwin }:
 
 stdenv.mkDerivation rec {
-  name = "libserialport-0.1.1";
+  pname = "libserialport";
+  version = "0.1.1";
 
   src = fetchurl {
-    url = "https://sigrok.org/download/source/libserialport/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/libserialport/${pname}-${version}.tar.gz";
     sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja";
   };
 
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 64ae1713fd45..ba8bc3f334e6 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.18";
+  pname = "libsodium";
+  version = "1.0.18";
 
   src = fetchurl {
-    url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
+    url = "https://download.libsodium.org/libsodium/releases/${pname}-${version}.tar.gz";
     sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g";
   };
 
diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix
index 465aa941f396..81e661a94214 100644
--- a/pkgs/development/libraries/libspectre/default.nix
+++ b/pkgs/development/libraries/libspectre/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, pkg-config, ghostscript, cairo }:
 
 stdenv.mkDerivation rec {
-  name = "libspectre-0.2.7";
+  pname = "libspectre";
+  version = "0.2.7";
 
   src = fetchurl {
-    url = "https://libspectre.freedesktop.org/releases/${name}.tar.gz";
+    url = "https://libspectre.freedesktop.org/releases/${pname}-${version}.tar.gz";
     sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8";
   };
 
diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix
index 09aa03e6f67f..c373f7c24ff3 100644
--- a/pkgs/development/libraries/libspectrum/default.nix
+++ b/pkgs/development/libraries/libspectrum/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perl, pkg-config, audiofile, bzip2, glib, libgcrypt, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libspectrum-1.5.0";
+  pname = "libspectrum";
+  version = "1.5.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/fuse-emulator/${name}.tar.gz";
+    url = "mirror://sourceforge/fuse-emulator/${pname}-${version}.tar.gz";
     sha256 = "sha256-o1PLRumxooEGHYFjU+oBDQpv545qF6oLe3QnHKXkrPw=";
   };
 
diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix
index 76f5b6b4b8c6..697616f01f30 100644
--- a/pkgs/development/libraries/libstroke/default.nix
+++ b/pkgs/development/libraries/libstroke/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, automake, autoconf, xlibsWrapper}:
 
-stdenv.mkDerivation {
-  name = "libstroke-0.5.1";
+stdenv.mkDerivation rec {
+  pname = "libstroke";
+  version = "0.5.1";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/libstroke-0.5.1.tar.gz";
+    url = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/${pname}-${version}.tar.gz";
     sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d";
   };
 
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index 8f0c4d818f4c..1e88218aa0d4 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, libogg, libvorbis, pkg-config, autoreconfHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "libtheora-1.1.1";
+  pname = "libtheora";
+  version = "1.1.1";
 
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/theora/${name}.tar.gz";
+    url = "https://downloads.xiph.org/releases/theora/${pname}-${version}.tar.gz";
     sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0";
   };
 
diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix
index 7f596978cf06..aac71bda3698 100644
--- a/pkgs/development/libraries/libu2f-server/default.nix
+++ b/pkgs/development/libraries/libu2f-server/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, fetchpatch, pkg-config, json_c, openssl, check, file, help2man, which, gengetopt }:
 
 stdenv.mkDerivation rec {
-  name = "libu2f-server-1.1.0";
+  pname = "libu2f-server";
+  version = "1.1.0";
   src = fetchurl {
-    url = "https://developers.yubico.com/libu2f-server/Releases/${name}.tar.xz";
+    url = "https://developers.yubico.com/libu2f-server/Releases/${pname}-${version}.tar.xz";
     sha256 = "0xx296nmmqa57w0v5p2kasl5zr1ms2gh6qi4lhv6xvzbmjp3rkcd";
   };
 
diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix
index 7a996d3b8079..3e61ee8a6a13 100644
--- a/pkgs/development/libraries/libvisual/default.nix
+++ b/pkgs/development/libraries/libvisual/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
-  name = "libvisual-0.4.0";
+  pname = "libvisual";
+  version = "0.4.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libvisual/${name}.tar.gz";
+    url = "mirror://sourceforge/libvisual/${pname}-${version}.tar.gz";
     sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b";
   };
 
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 9fd3fc59ab39..281c7744a339 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libogg, pkg-config }:
 
 stdenv.mkDerivation rec {
-  name = "libvorbis-1.3.7";
+  pname = "libvorbis";
+  version = "1.3.7";
 
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz";
+    url = "http://downloads.xiph.org/releases/vorbis/${pname}-${version}.tar.xz";
     sha256 = "0jwmf87x5sdis64rbv0l87mdpah1rbilkkxszipbzg128f9w8g5k";
   };
 
diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix
index b9a2b6de3cc3..2d2a0089c443 100644
--- a/pkgs/development/libraries/libxmi/default.nix
+++ b/pkgs/development/libraries/libxmi/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libtool }:
 
-stdenv.mkDerivation {
-  name = "libxmi-1.2";
+stdenv.mkDerivation rec {
+  pname = "libxmi";
+  version = "1.2";
 
   src = fetchurl {
-    url = "mirror://gnu/libxmi/libxmi-1.2.tar.gz";
+    url = "mirror://gnu/libxmi/${pname}-${version}.tar.gz";
     sha256 = "03d4ikh29l38rl1wavb0icw7m5pp7yilnv7bb2k8qij1dinsymlx";
   };
 
diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix
index a7d35950f034..7f314410667f 100644
--- a/pkgs/development/libraries/libykneomgr/default.nix
+++ b/pkgs/development/libraries/libykneomgr/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, pcsclite, libzip, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "libykneomgr-0.1.8";
+  pname = "libykneomgr";
+  version = "0.1.8";
 
   src = fetchurl {
-    url = "https://developers.yubico.com/libykneomgr/Releases/${name}.tar.gz";
+    url = "https://developers.yubico.com/libykneomgr/Releases/${pname}-${version}.tar.gz";
     sha256 = "12gqblz400kr11m1fdr1vvwr85lgy5v55zy0cf782whpk8lyyj97";
   };
 
diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix
index b3aa2b57bdf8..3b05be00d905 100644
--- a/pkgs/development/libraries/libyubikey/default.nix
+++ b/pkgs/development/libraries/libyubikey/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libyubikey-1.13";
+  pname = "libyubikey";
+  version = "1.13";
 
   src = fetchurl {
-    url = "https://developers.yubico.com/yubico-c/Releases/${name}.tar.gz";
+    url = "https://developers.yubico.com/yubico-c/Releases/${pname}-${version}.tar.gz";
     sha256 = "009l3k2zyn06dbrlja2d4p2vfnzjhlcqxi88v02mlrnb17mx1v84";
   };
 
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index b93cc96bde02..4544fd08aa50 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -2,10 +2,11 @@
   alsa-lib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }:
 
 stdenv.mkDerivation rec {
-  name = "lirc-0.10.1";
+  pname = "lirc";
+  version = "0.10.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lirc/${name}.tar.bz2";
+    url = "mirror://sourceforge/lirc/${pname}-${version}.tar.bz2";
     sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb";
   };
 
diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix
index d4b703a2bda7..f7a10d9c31d3 100644
--- a/pkgs/development/libraries/log4cpp/default.nix
+++ b/pkgs/development/libraries/log4cpp/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "log4cpp-1.1.3";
+  pname = "log4cpp";
+  version = "1.1.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/log4cpp/${name}.tar.gz";
+    url = "mirror://sourceforge/log4cpp/${pname}-${version}.tar.gz";
     sha256 = "07gmr3jyaf2239n9sp6h7hwdz1pv7b7aka8n06gmr2fnlmaymfrc";
   };
 
diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index 8ea933f0e3ab..f5b0111a1a78 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "lzo-2.10";
+  pname = "lzo";
+  version = "2.10";
 
   src = fetchurl {
-    url = "${meta.homepage}/download/${name}.tar.gz";
+    url = "https://www.oberhumer.com/opensource/lzo/download/${pname}-${version}.tar.gz";
     sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60";
   };
 
diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix
index 3b0e811097e7..e3b3f288cb5d 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/pkgs/development/libraries/matio/default.nix
@@ -1,8 +1,9 @@
 { lib, stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "matio-1.5.21";
+  pname = "matio";
+  version = "1.5.21";
   src = fetchurl {
-    url = "mirror://sourceforge/matio/${name}.tar.gz";
+    url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz";
     sha256 = "sha256-IYCRd+VYOefJTa2nRO5Vwd6n11fdqriWBXdtUBIvsGU=";
   };
 
diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix
index cdcc0548abbc..b5eaee26aa03 100644
--- a/pkgs/development/libraries/msilbc/default.nix
+++ b/pkgs/development/libraries/msilbc/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, ilbc, mediastreamer, pkg-config }:
 
 stdenv.mkDerivation rec {
-  name = "msilbc-2.1.2";
+  pname = "msilbc";
+  version = "2.1.2";
 
   src = fetchurl {
-    url = "mirror://savannah/linphone/plugins/sources/${name}.tar.gz";
+    url = "mirror://savannah/linphone/plugins/sources/${pname}-${version}.tar.gz";
     sha256 = "07j02y994ybh274fp7ydjvi76h34y2c34ndwjpjfcwwr03b48cfp";
   };
 
diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix
index 7873608e5891..4a510762f7f0 100644
--- a/pkgs/development/libraries/mtdev/default.nix
+++ b/pkgs/development/libraries/mtdev/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mtdev-1.1.6";
+  pname = "mtdev";
+  version = "1.1.6";
 
   src = fetchurl {
-    url = "http://bitmath.org/code/mtdev/${name}.tar.bz2";
+    url = "https://bitmath.org/code/mtdev/${pname}-${version}.tar.bz2";
     sha256 = "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm";
   };
 
diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix
index f5257ad0e8ef..fe0616b7d7a9 100644
--- a/pkgs/development/libraries/qmlbox2d/default.nix
+++ b/pkgs/development/libraries/qmlbox2d/default.nix
@@ -1,6 +1,7 @@
 {lib, stdenv, qtdeclarative, fetchFromGitHub, qmake }:
 stdenv.mkDerivation {
-  name = "qml-box2d-2018-04-06";
+  pname = "qml-box2d";
+  version = "unstable-2018-04-06";
   src = fetchFromGitHub {
     owner = "qml-box2d";
     repo = "qml-box2d";
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix
index 5bc30db059e7..dd6a7606f6e2 100644
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }:
 
 stdenv.mkDerivation {
-  name = "qtwebkit-plugins-2017-01-25";
+  pname = "qtwebkit-plugins";
+  version = "unstable-2017-01-25";
 
   src = fetchFromGitHub {
     owner = "QupZilla";
diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix
index e158fe348856..a5dcfedb8491 100644
--- a/pkgs/development/libraries/qwt/default.nix
+++ b/pkgs/development/libraries/qwt/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
-  name = "qwt-5.2.3";
+  pname = "qwt";
+  version = "5.2.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qwt/${name}.tar.bz2";
+    url = "mirror://sourceforge/qwt/${pname}-${version}.tar.bz2";
     sha256 = "1dqa096mm6n3bidfq2b67nmdsvsw4ndzzd1qhl6hn8skcwqazzip";
   };
 
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure = ''
-    qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${name}"
+    qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${pname}-${version}"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix
index 760546fc471c..f177dc768a69 100644
--- a/pkgs/development/libraries/readosm/default.nix
+++ b/pkgs/development/libraries/readosm/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, expat, zlib, geos, libspatialite }:
 
 stdenv.mkDerivation rec {
-  name = "readosm-1.1.0a";
+  pname = "readosm";
+  version = "1.1.0a";
 
   src = fetchurl {
-    url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz";
+    url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${pname}-${version}.tar.gz";
     sha256 = "0igif2bxf4dr82glxz9gyx5mmni0r2dsnx9p9k6pxv3c4lfhaz6v";
   };
 
diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix
index 7706366dd6da..2b49bfeb498e 100644
--- a/pkgs/development/libraries/schroedinger/default.nix
+++ b/pkgs/development/libraries/schroedinger/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, orc, pkg-config, fetchpatch, autoreconfHook }:
 
-stdenv.mkDerivation {
-  name = "schroedinger-1.0.11";
+stdenv.mkDerivation rec {
+  pname = "schroedinger";
+  version = "1.0.11";
 
   src = fetchurl {
-    url = "https://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz";
+    url = "https://download.videolan.org/contrib/${pname}-${version}.tar.gz";
     sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy";
   };
 
diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix
index 0657b13e5579..664d4f3330a0 100644
--- a/pkgs/development/libraries/shhopt/default.nix
+++ b/pkgs/development/libraries/shhopt/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "shhopt-1.1.7";
+  pname = "shhopt";
+  version = "1.1.7";
 
   src = fetchurl {
-    url = "https://shh.thathost.com/pub-unix/files/${name}.tar.gz";
+    url = "https://shh.thathost.com/pub-unix/files/${pname}-${version}.tar.gz";
     sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds";
   };
 
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index 41d776c68698..8750bdf2ac6c 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -2,11 +2,12 @@
 
 { lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:
 
-stdenv.mkDerivation {
-  name = "snack-2.2.10";
+stdenv.mkDerivation rec {
+  pname = "snack";
+  version = "2.2.10";
 
   src = fetchurl {
-    url = "https://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz";
+    url = "https://www.speech.kth.se/snack/dist/${pname}${version}.tar.gz";
     sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb";
   };
 
diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix
index f87d79ca6e48..643a83c47005 100644
--- a/pkgs/development/libraries/speexdsp/default.nix
+++ b/pkgs/development/libraries/speexdsp/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw }:
 
 stdenv.mkDerivation rec {
-  name = "speexdsp-1.2.0";
+  pname = "speexdsp";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
+    url = "https://downloads.xiph.org/releases/speex/${pname}-${version}.tar.gz";
     sha256 = "0wa7sqpk3x61zz99m7lwkgr6yv62ml6lfgs5xja65vlvdzy44838";
   };
 
diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix
index 5af77d90053f..75004b87ee72 100644
--- a/pkgs/development/libraries/stlport/default.nix
+++ b/pkgs/development/libraries/stlport/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "STLport-5.2.1";
+  pname = "STLport";
+  version = "5.2.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/stlport/${name}.tar.bz2";
+    url = "mirror://sourceforge/stlport/${pname}-${version}.tar.bz2";
     sha256 = "1jbgak1m1qk7d4gyn1p2grbws2icsf7grbs3dh44ai9ck1xh0nvm";
   };
 
diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix
index 95afae065efe..acb52cc53dbf 100644
--- a/pkgs/development/libraries/taglib-extras/default.nix
+++ b/pkgs/development/libraries/taglib-extras/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, cmake, taglib, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "taglib-extras-1.0.1";
+  pname = "taglib-extras";
+  version = "1.0.1";
   src = fetchurl {
-    url = "http://ftp.rz.uni-wuerzburg.de/pub/unix/kde/taglib-extras/1.0.1/src/${name}.tar.gz";
+    url = "https://ftp.rz.uni-wuerzburg.de/pub/unix/kde/taglib-extras/${version}/src/${pname}-${version}.tar.gz";
     sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y";
   };
   buildInputs = [ taglib ];
diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix
index feb3825b3d4e..8cd9900b65bf 100644
--- a/pkgs/development/libraries/tclap/default.nix
+++ b/pkgs/development/libraries/tclap/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tclap-1.2.3";
+  pname = "tclap";
+  version = "1.2.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tclap/${name}.tar.gz";
+    url = "mirror://sourceforge/tclap/${pname}-${version}.tar.gz";
     sha256 = "sha256-GefbUoFUDxVDSHcLw6dIRXX09Umu+OAKq8yUs5X3c8k=";
   };
 
diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix
index 22d3266b93a6..4b3c8a363eb4 100644
--- a/pkgs/development/libraries/tokyo-cabinet/default.nix
+++ b/pkgs/development/libraries/tokyo-cabinet/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "tokyocabinet-1.4.48";
+  pname = "tokyocabinet";
+  version = "1.4.48";
 
   src = fetchurl {
-    url = "http://fallabs.com/tokyocabinet/${name}.tar.gz";
+    url = "https://dbmx.net/tokyocabinet/${pname}-${version}.tar.gz";
     sha256 = "140zvr0n8kvsl0fbn2qn3f2kh3yynfwnizn4dgbj47m975yg80x0";
   };
 
diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix
index 0bded9d92ddd..94dea0edae1d 100644
--- a/pkgs/development/libraries/wtk/default.nix
+++ b/pkgs/development/libraries/wtk/default.nix
@@ -3,11 +3,12 @@
 assert stdenv.hostPlatform.system == "i686-linux";
 
 stdenv.mkDerivation rec {
-  name = "sun-java-wtk-2.5.2_01";
+  pname = "sun-java-wtk";
+  version = "2.5.2_01";
 
   src = requireFile {
-    url = meta.homepage;
-    name = "sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh";
+    url = "http://java.sun.com/products/sjwtoolkit/download.html";
+    name = "sun_java_wireless_toolkit-${version}-linuxi486.bin.sh";
     sha256 = "1cjb9c27847wv0hq3j645ckn4di4vsfvp29fr4zmdqsnvk4ahvj1";
   };
 
diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix
index 3bcc40b5da32..2cb64fe6eb24 100644
--- a/pkgs/development/libraries/xmlrpc-c/default.nix
+++ b/pkgs/development/libraries/xmlrpc-c/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, curl, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "xmlrpc-c-1.51.07";
+  pname = "xmlrpc-c";
+  version = "1.51.07";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xmlrpc-c/${name}.tgz";
+    url = "mirror://sourceforge/xmlrpc-c/${pname}-${version}.tgz";
     sha256 = "sha256-hNIK4z+SdYL4IdYcC5GUrvvx15JFkKE/qdpa4WmK3tk=";
   };
 
diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix
index 3364fe796e72..4b5793dc1332 100644
--- a/pkgs/development/misc/avr8-burn-omat/default.nix
+++ b/pkgs/development/misc/avr8-burn-omat/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, unzip, runtimeShell }:
 
-stdenv.mkDerivation {
-  name = "avr8-burn-omat-2.1.2";
+stdenv.mkDerivation rec {
+  pname = "avr8-burn-omat";
+  version = "2.1.2";
 
   src = fetchurl {
-    url = "http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_2_1_2.zip";
+    url = "http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_${lib.replaceStrings ["."] ["_"] version}.zip";
     sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln";
   };
 
diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix
index 859497345ff6..8db882711fc2 100644
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/pkgs/development/tools/build-managers/jam/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, bison }:
 
 stdenv.mkDerivation rec {
-  name = "jam-2.6.1";
+  pname = "jam";
+  version = "2.6.1";
 
   src = fetchurl {
-    url = "https://swarm.workshop.perforce.com/projects/perforce_software-jam/download/main/${name}.tar";
+    url = "https://swarm.workshop.perforce.com/projects/perforce_software-jam/download/main/${pname}-${version}.tar";
     sha256 = "19xkvkpycxfsncxvin6yqrql3x3z9ypc1j8kzls5k659q4kv5rmc";
   };
 
diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix
index 1eaa51a5de0b..afc0b6f1ec01 100644
--- a/pkgs/development/tools/build-managers/mk/default.nix
+++ b/pkgs/development/tools/build-managers/mk/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "mk-2006-01-31";
+stdenv.mkDerivation rec {
+  pname = "mk";
+  version = "unstable-2006-01-31";
   src = fetchurl {
-    url = "http://tarballs.nixos.org/mk-20060131.tar.gz";
+    url = "http://tarballs.nixos.org/${pname}-20060131.tar.gz";
     sha256 = "0za8dp1211bdp4584xb59liqpww7w1ql0cmlv34p9y928nibcxsr";
   };
   builder = ./builder.sh;
diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix
index 48fbffc39406..f16e91d3bfb1 100644
--- a/pkgs/development/tools/build-managers/redo/default.nix
+++ b/pkgs/development/tools/build-managers/redo/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "redo-1.4";
+  pname = "redo";
+  version = "1.4";
   src = fetchurl {
-    url = "https://jdebp.eu./Repository/freebsd/${name}.tar.gz";
+    url = "https://jdebp.eu./Repository/freebsd/${pname}-${version}.tar.gz";
     sha256 = "1c8gr5h77v4fw78zkhbm9z9adqs3kd7xvxwnmci2zvlf4bqqk4jv";
   };
 
diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix
index 6db4395a14f5..df55c44f5649 100644
--- a/pkgs/development/tools/mdk/default.nix
+++ b/pkgs/development/tools/mdk/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, intltool, pkg-config, glib }:
 
-stdenv.mkDerivation {
-  name = "gnu-mdk-1.3.0";
+stdenv.mkDerivation rec {
+  pname = "gnu-mdk";
+  version = "1.3.0";
   src = fetchurl {
-    url = "https://ftp.gnu.org/gnu/mdk/v1.3.0/mdk-1.3.0.tar.gz";
+    url = "mirror://ftp.gnu.org/gnu/mdk/v${version}/mdk-${version}.tar.gz";
     sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb";
   };
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix
index 6cd3ea800278..08f89d482ddd 100644
--- a/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/pkgs/development/tools/profiling/oprofile/default.nix
@@ -8,10 +8,11 @@
 assert withGUI -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "oprofile-1.4.0";
+  pname = "oprofile";
+  version = "1.4.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/oprofile/${name}.tar.gz";
+    url = "mirror://sourceforge/oprofile/${pname}-${version}.tar.gz";
     sha256 = "04m46ni0ryk4sqmzd6mahwzp7iwhwqzfbmfi42fki261sycnz83v";
   };
 
diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix
index b4173c7aebb0..7935d10effcb 100644
--- a/pkgs/development/tools/sigrok-cli/default.nix
+++ b/pkgs/development/tools/sigrok-cli/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, libsigrok, libsigrokdecode }:
 
 stdenv.mkDerivation rec {
-  name = "sigrok-cli-0.7.1";
+  pname = "sigrok-cli";
+  version = "0.7.1";
 
   src = fetchurl {
-    url = "https://sigrok.org/download/source/sigrok-cli/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz";
     sha256 = "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m";
   };
 
diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix
index dc7156febe98..c184cee91ca5 100644
--- a/pkgs/development/tools/tradcpp/default.nix
+++ b/pkgs/development/tools/tradcpp/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, autoconf }:
 
-stdenv.mkDerivation {
-  name = "tradcpp-0.5.2";
+stdenv.mkDerivation rec {
+  pname = "tradcpp";
+  version = "0.5.2";
 
   src = fetchurl {
-    url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz";
+    url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/${pname}-${version}.tar.gz";
     sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc";
   };
 
diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix
index b5e0701c136e..352dc83f9abd 100644
--- a/pkgs/development/tools/winpdb/default.nix
+++ b/pkgs/development/tools/winpdb/default.nix
@@ -1,11 +1,12 @@
 { lib, fetchurl, pythonPackages, makeDesktopItem }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "winpdb-1.4.8";
+  pname = "winpdb";
+  version = "1.4.8";
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://winpdb.googlecode.com/files/${name}.tar.gz";
+    url = "https://winpdb.googlecode.com/files/${pname}-${version}.tar.gz";
     sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs";
   };
 

From 936168eee567d5dcc73b4d3442fbc7a5c5293803 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 15 Jun 2021 12:31:26 +0200
Subject: [PATCH 034/330] flashtool: remove

Because the download is down for copyright reasons and the site looks very fishy and very similar to the ones used to distribute content illegally.
---
 pkgs/development/mobile/flashtool/default.nix | 62 -------------------
 pkgs/top-level/all-packages.nix               |  4 --
 2 files changed, 66 deletions(-)
 delete mode 100644 pkgs/development/mobile/flashtool/default.nix

diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix
deleted file mode 100644
index e00ff3acce02..000000000000
--- a/pkgs/development/mobile/flashtool/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ stdenv, lib, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }:
-
-# TODO:
-#
-#   The FlashTool and FlashToolConsole scripts are messy and should probably we
-#   replaced entirely. All these scripts do is try to guess the environment in
-#   which to run the Java binary (and they guess wrong on NixOS).
-#
-#   The FlashTool scripts run 'chmod' on the binaries installed in the Nix
-#   store. These commands fail, naturally, because the Nix story is (hopefully)
-#   mounted read-only. This doesn't matter, though, because the build
-#   instructions fix the executable bits already.
-
-stdenv.mkDerivation rec {
-  name = "flashtool-0.9.14.0";
-
-  src = requireFile {
-    url = "http://dfiles.eu/files/n8c1c3pgc";
-    name = "flashtool-0.9.14.0-linux.tar.7z";
-    sha256 = "0mfjdjj7clz2dhkg7lzy1m8hk8ngla7zgcryf51aki1gnpbb2zc1";
-  };
-
-  buildInputs = [ p7zip jre ];
-
-  unpackPhase = ''
-    7z e ${src}
-    tar xf ${name}-linux.tar
-    sourceRoot=FlashTool
-  '';
-
-  buildPhase = ''
-    ln -s ${platform-tools}/libexec/android-sdk/platform-tools/adb x10flasher_lib/adb.linux
-    ln -s ${platform-tools}/libexec/android-sdk/platform-tools/fastboot x10flasher_lib/fastboot.linux
-    ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so
-
-    chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86
-    ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux
-
-    ln -s swt32.jar x10flasher_lib/swtlin/swt.jar
-
-    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=${lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \
-      FlashTool FlashToolConsole
-  '';
-
-  installPhase = ''
-    mkdir -p $out
-    mv * $out/
-  '';
-
-  meta = with lib; {
-    homepage = "http://www.flashtool.net/";
-    description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra";
-    license = licenses.unfreeRedistributableFirmware;
-    platforms = [ "i686-linux" ];
-    hydraPlatforms = platforms.none;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e616c611939..0e5c1b759c67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4767,10 +4767,6 @@ in
 
   flamerobin = callPackage ../applications/misc/flamerobin { };
 
-  flashtool = pkgsi686Linux.callPackage ../development/mobile/flashtool {
-    inherit (androidenv.androidPkgs_9_0) platform-tools;
-  };
-
   flashrom = callPackage ../tools/misc/flashrom { };
 
   flent = python3Packages.callPackage ../applications/networking/flent { };

From ad3dacc432306ccd86141ca4a3efd817ae301caf Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 15 Jun 2021 12:41:47 +0200
Subject: [PATCH 035/330] tracefilesim: replace fetchgit with fetchFromGitHub

---
 .../tools/analysis/garcosim/tracefilesim/default.nix       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
index 3f97485cbfa4..6fc19b3ae246 100644
--- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
+++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
@@ -1,11 +1,12 @@
-{ lib, stdenv, fetchgit }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
 
   name = "tracefilesim-2015-11-07";
 
-  src = fetchgit {
-    url = "https://github.com/GarCoSim/TraceFileSim.git";
+  src = fetchFromGitHub {
+    owner = "GarCoSim";
+    repo = "TraceFileSim";
     rev = "368aa6b1d6560e7ecbd16fca47000c8f528f3da2";
     sha256 = "156m92k38ap4bzidbr8dzl065rni8lrib71ih88myk9z5y1x5nxm";
   };

From 2444eaed5641cca77c37b66f2fc6b8eb45957d46 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 15 Jun 2021 12:42:35 +0200
Subject: [PATCH 036/330] drush: use fetchFromGitHub

---
 pkgs/development/tools/misc/drush/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix
index 70e7f42c5c22..2700e56b392b 100644
--- a/pkgs/development/tools/misc/drush/default.nix
+++ b/pkgs/development/tools/misc/drush/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, php, which, makeWrapper, bash, coreutils, ncurses }:
+{ lib, stdenv, fetchurl, fetchFromGitHub, php, which, makeWrapper, bash, coreutils, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "drush-6.1.0";
@@ -11,8 +11,10 @@ stdenv.mkDerivation rec {
     platforms   = platforms.all;
   };
 
-  src = fetchurl {
-    url    = "https://github.com/drush-ops/drush/archive/6.1.0.tar.gz";
+  src = fetchFromGitHub {
+    owner = "drush-ops";
+    repo  = pname;
+    rev = version;
     sha256 = "1jgnc4jjyapyn04iczvcz92ic0vq8d1w8xi55ismqyy5cxhqj6bp";
   };
 

From 2588c8d4cdb2c470d335b2a4c5dd55445e51e91e Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 15 Jun 2021 18:39:24 +0200
Subject: [PATCH 037/330] wiggle: use fetchFromGitHub with pname and version

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

diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix
index 6d1622c5b864..2da789fdc603 100644
--- a/pkgs/development/tools/wiggle/default.nix
+++ b/pkgs/development/tools/wiggle/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, ncurses, groff }:
 
 stdenv.mkDerivation rec {
-  name = "wiggle";
+  pname = "wiggle";
   version = "1.3";
 
   src = fetchFromGitHub {
     owner = "neilbrown";
     repo = "wiggle";
     rev = "v${version}";
-    sha256 = "sha256-rlHhYzP81lfblZvtZ1lhiq4iQ6WRpBYukoGqpVP+NKI=";
+    sha256 = "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf";
   };
 
   buildInputs = [ ncurses groff ];

From 1e7f88a5235ccef5f05670bd4f7f176d697c1951 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 20 Jun 2021 12:31:52 +0200
Subject: [PATCH 038/330] camlp5: replace fetchzip with fetchFromGitHub

---
 pkgs/development/tools/ocaml/camlp5/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index fc79cafdc42a..e94e98d8f723 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -1,15 +1,18 @@
-{ lib, stdenv, fetchzip, ocaml, perl }:
+{ lib, stdenv, fetchFromGitHub, ocaml, perl }:
 
 if lib.versionOlder ocaml.version "4.02"
 then throw "camlp5 is not available for OCaml ${ocaml.version}"
 else
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
 
-  name = "camlp5-7.14";
+  pname = "camlp5";
+  version = "7.14";
 
-  src = fetchzip {
-    url = "https://github.com/camlp5/camlp5/archive/rel714.tar.gz";
+  src = fetchFromGitHub {
+    owner = "camlp5";
+    repo = "camlp5";
+    rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}";
     sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w";
   };
 

From 6f04cd0e6967bc2a426b209fa700b3a3dbb1dbc3 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 20 Jun 2021 12:34:30 +0200
Subject: [PATCH 039/330] application/development: /s/name/pname&version/

---
 pkgs/applications/audio/aacgain/default.nix   |  5 ++--
 .../applications/audio/cdparanoia/default.nix |  5 ++--
 pkgs/applications/audio/crip/default.nix      |  5 ++--
 pkgs/applications/audio/dirt/default.nix      |  3 ++-
 pkgs/applications/audio/gmu/default.nix       |  5 ++--
 pkgs/applications/audio/jack-rack/default.nix |  5 ++--
 pkgs/applications/audio/jackmeter/default.nix |  5 ++--
 pkgs/applications/audio/mikmod/default.nix    |  5 ++--
 pkgs/applications/audio/mp3gain/default.nix   |  7 +++---
 pkgs/applications/audio/mp3info/default.nix   |  5 ++--
 pkgs/applications/audio/mpg123/default.nix    |  5 ++--
 pkgs/applications/audio/nootka/default.nix    |  5 ++--
 .../applications/audio/opus-tools/default.nix |  6 +++--
 pkgs/applications/audio/qmmp/default.nix      |  5 ++--
 pkgs/applications/audio/tony/default.nix      |  5 ++--
 pkgs/applications/audio/transcode/default.nix |  5 ++--
 pkgs/applications/audio/xmp/default.nix       |  5 ++--
 .../audio/zita-ajbridge/default.nix           |  5 ++--
 pkgs/applications/audio/zita-at1/default.nix  |  5 ++--
 .../build-support/icon-conv-tools/default.nix |  3 ++-
 pkgs/build-support/libredirect/default.nix    |  5 ++--
 .../python-modules/gprof2dot/default.nix      |  7 +++---
 .../tools/analysis/emma/default.nix           |  7 +++---
 .../tools/analysis/findbugs/default.nix       |  5 ++--
 .../garcosim/tracefilegen/default.nix         |  7 +++---
 .../garcosim/tracefilesim/default.nix         |  3 ++-
 .../tools/analysis/makefile2graph/default.nix |  5 ++--
 .../tools/analysis/smatch/default.nix         |  4 +--
 .../tools/analysis/sparse/default.nix         |  5 ++--
 .../tools/analysis/splint/default.nix         |  5 ++--
 .../tools/analysis/swarm/default.nix          |  5 ++--
 .../tools/analysis/valgrind/default.nix       |  5 ++--
 .../tools/analysis/valkyrie/default.nix       |  5 ++--
 pkgs/development/tools/cdecl/default.nix      |  7 +++---
 pkgs/development/tools/chefdk/default.nix     |  3 ++-
 .../tools/lattice-diamond/default.nix         | 25 ++++++++++---------
 .../tools/libsigrokdecode/default.nix         |  5 ++--
 .../tools/misc/autobuild/default.nix          |  5 ++--
 .../tools/misc/avrdude/default.nix            |  5 ++--
 .../tools/misc/babeltrace/default.nix         |  5 ++--
 pkgs/development/tools/misc/bossa/default.nix |  3 ++-
 .../tools/misc/cbrowser/default.nix           | 11 ++++----
 pkgs/development/tools/misc/cflow/default.nix |  5 ++--
 .../tools/misc/chrpath/default.nix            |  7 +++---
 pkgs/development/tools/misc/cppi/default.nix  |  5 ++--
 .../development/tools/misc/cscope/default.nix |  5 ++--
 .../development/tools/misc/dbench/default.nix |  7 +++---
 pkgs/development/tools/misc/ddd/default.nix   |  5 ++--
 .../tools/misc/dejagnu/default.nix            |  5 ++--
 .../tools/misc/doclifter/default.nix          |  7 +++---
 pkgs/development/tools/misc/drush/default.nix |  3 ++-
 .../tools/misc/eggdbus/default.nix            |  5 ++--
 pkgs/development/tools/misc/gnum4/default.nix |  7 +++---
 pkgs/development/tools/misc/gperf/default.nix |  5 ++--
 .../tools/misc/gtkdialog/default.nix          |  7 +++---
 .../tools/misc/gtkperf/default.nix            |  7 +++---
 .../tools/misc/help2man/default.nix           |  5 ++--
 .../tools/misc/icon-naming-utils/default.nix  |  5 ++--
 .../development/tools/misc/indent/default.nix |  5 ++--
 .../tools/misc/itstool/default.nix            |  5 ++--
 .../tools/misc/jscoverage/default.nix         |  5 ++--
 .../tools/misc/libtool/default.nix            |  5 ++--
 .../development/tools/misc/ltrace/default.nix |  7 +++---
 pkgs/development/tools/misc/lttv/default.nix  |  5 ++--
 pkgs/development/tools/misc/rman/default.nix  |  7 +++---
 .../tools/misc/sloccount/default.nix          |  5 ++--
 .../tools/misc/srecord/default.nix            |  5 ++--
 .../tools/misc/stm32flash/default.nix         |  5 ++--
 pkgs/development/tools/misc/uisp/default.nix  |  7 +++---
 pkgs/development/tools/neoload/default.nix    |  9 ++++---
 .../tools/ocaml/ocamlify/default.nix          |  7 +++---
 .../tools/ocaml/ocamlscript/default.nix       |  7 +++---
 .../development/tools/parsing/peg/default.nix |  5 ++--
 pkgs/development/tools/phantomjs/default.nix  |  9 ++++---
 pkgs/development/tools/pydb/default.nix       |  7 +++---
 pkgs/development/tools/quilt/default.nix      |  5 ++--
 pkgs/development/tools/sslmate/default.nix    |  5 ++--
 .../development/tools/sunxi-tools/default.nix |  5 ++--
 pkgs/development/tools/xib2nib/default.nix    |  3 ++-
 79 files changed, 264 insertions(+), 185 deletions(-)

diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix
index 0f9b511d4553..517a53a5fecc 100644
--- a/pkgs/applications/audio/aacgain/default.nix
+++ b/pkgs/applications/audio/aacgain/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitLab, fetchpatch }:
 
-stdenv.mkDerivation {
-  name = "aacgain-1.9.0";
+stdenv.mkDerivation rec {
+  pname = "aacgain";
+  version = "1.9.0";
 
   src = fetchFromGitLab {
     owner = "mulx";
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index 11c141e9c552..36686655f369 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, gnu-config, IOKit, Carbon }:
 
 stdenv.mkDerivation rec {
-  name = "cdparanoia-III-10.2";
+  pname = "cdparanoia-III";
+  version = "10.2";
 
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz";
+    url = "https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${version}.src.tgz";
     sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80";
   };
 
diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix
index c61f838bc3a1..d635dce83f4e 100644
--- a/pkgs/applications/audio/crip/default.nix
+++ b/pkgs/applications/audio/crip/default.nix
@@ -19,9 +19,10 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "crip-3.9";
+  pname = "crip";
+  version = "3.9";
   src = fetchurl {
-    url = "http://bach.dynet.com/crip/src/${name}.tar.gz";
+    url = "http://bach.dynet.com/${pname}/src/${pname}-${version}.tar.gz";
     sha256 = "0pk9152wll6fmkj1pki3fz3ijlf06jyk32v31yarwvdkwrk7s9xz";
   };
 
diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
index 333c1d08b3aa..a456d62e6f69 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:
 
 stdenv.mkDerivation {
-  name = "dirt-2018-01-01";
+  pname = "dirt";
+  version = "unstable-2018-01-01";
   src = fetchFromGitHub {
     repo = "Dirt";
     owner = "tidalcycles";
diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix
index 3e2087162f55..b2b9f5e34750 100644
--- a/pkgs/applications/audio/gmu/default.nix
+++ b/pkgs/applications/audio/gmu/default.nix
@@ -5,10 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gmu-0.10.1";
+  pname = "gmu";
+  version = "0.10.1";
 
   src = fetchurl {
-    url = "http://wejp.k.vu/files/${name}.tar.gz";
+    url = "https://wej.k.vu/files/${pname}-${version}.tar.gz";
     sha256 = "03x0mc0xw2if0bpf0a15yprcyx1xccki039zvl2099dagwk6xskv";
   };
 
diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix
index 520b55e96da5..25ee53d3f435 100644
--- a/pkgs/applications/audio/jack-rack/default.nix
+++ b/pkgs/applications/audio/jack-rack/default.nix
@@ -1,8 +1,9 @@
 { lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsa-lib, libxml2, lrdf }:
 stdenv.mkDerivation rec {
-  name = "jack-rack-1.4.7";
+  pname = "jack-rack";
+  version = "1.4.7";
   src = fetchurl {
-    url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
   };
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix
index 2b4d413526a6..95fc88a86964 100644
--- a/pkgs/applications/audio/jackmeter/default.nix
+++ b/pkgs/applications/audio/jackmeter/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libjack2, pkg-config }:
 
 stdenv.mkDerivation rec {
-  name = "jackmeter-0.4";
+  pname = "jackmeter";
+  version = "0.4";
 
   src = fetchurl {
-    url = "https://www.aelius.com/njh/jackmeter/${name}.tar.gz";
+    url = "https://www.aelius.com/njh/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
   };
 
diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix
index 4d39616c99d4..4cc0fec2e2f6 100644
--- a/pkgs/applications/audio/mikmod/default.nix
+++ b/pkgs/applications/audio/mikmod/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libmikmod, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "mikmod-3.2.8";
+  pname = "mikmod";
+  version = "3.2.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mikmod/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1k54p8pn3jinha0f2i23ad15pf1pamibzcxjrbzjbklpcz1ipc6v";
   };
 
diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix
index bf0a347d14bd..ba2a757e090c 100644
--- a/pkgs/applications/audio/mp3gain/default.nix
+++ b/pkgs/applications/audio/mp3gain/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, fetchpatch, unzip, mpg123 }:
 
-stdenv.mkDerivation {
-  name = "mp3gain-1.6.2";
+stdenv.mkDerivation rec {
+  pname = "mp3gain";
+  version = "1.6.2";
   src = fetchurl {
-    url = "mirror://sourceforge/mp3gain/mp3gain-1_6_2-src.zip";
+    url = "mirror://sourceforge/${pname}/${pname}-${lib.replaceStrings ["."] ["_"] version}-src.zip";
     sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w";
   };
 
diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix
index d67b4da5eb2b..86c1f87f5227 100644
--- a/pkgs/applications/audio/mp3info/default.nix
+++ b/pkgs/applications/audio/mp3info/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, ncurses, pkg-config, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "mp3info-0.8.5a";
+  pname = "mp3info";
+  version = "0.8.5a";
 
   src = fetchurl {
-    url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/${name}.tgz";
+    url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/${pname}/${pname}-${version}.tgz";
     sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04";
   };
 
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 8f9489befc59..44788467d8f6 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -7,10 +7,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mpg123-1.26.5";
+  pname = "mpg123";
+  version = "1.26.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "sha256-UCqX4Nk1vn432YczgCHY8wG641wohPKoPVnEtSRm7wY=";
   };
 
diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix
index 8b2284f9b30a..59d58df8c8dc 100644
--- a/pkgs/applications/audio/nootka/default.nix
+++ b/pkgs/applications/audio/nootka/default.nix
@@ -3,10 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nootka-1.4.7";
+  pname = "nootka";
+  version = "1.4.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nootka/${name}-source.tar.bz2";
+    url = "mirror://sourceforge/nootka/${pname}-${version}-source.tar.bz2";
     sha256 = "1y9wlwri74v2z9dwbcfjs7xri54yra24vpwq19xi2lfv1nbs518x";
   };
 
diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix
index 8ca75eecde19..6c602ef1d03e 100644
--- a/pkgs/applications/audio/opus-tools/default.nix
+++ b/pkgs/applications/audio/opus-tools/default.nix
@@ -1,9 +1,11 @@
 {lib, stdenv, fetchurl, libogg, libao, pkg-config, flac, opusfile, libopusenc}:
 
 stdenv.mkDerivation rec {
-  name = "opus-tools-0.2";
+  pname = "opus-tools";
+  version = "0.2";
+
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
+    url = "https://downloads.xiph.org/releases/opus/${pname}-${version}.tar.gz";
     sha256 = "11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl";
   };
 
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 25d7857c3539..460b97479c6c 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,10 +29,11 @@
 # handle that.
 
 mkDerivation rec {
-  name = "qmmp-1.4.4";
+  pname = "qmmp";
+  version = "1.4.4";
 
   src = fetchurl {
-    url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
+    url = "https://qmmp.ylsoftware.com/files/${pname}-${version}.tar.bz2";
     sha256 = "sha256-sZRZVhCf2ceETuV4AULA0kVkuIMn3C+aYdKThqvPnVQ=";
   };
 
diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix
index aa18a5e397e4..15c973a46fc8 100644
--- a/pkgs/applications/audio/tony/default.nix
+++ b/pkgs/applications/audio/tony/default.nix
@@ -5,10 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tony-2.1.1";
+  pname = "tony";
+  version = "2.1.1";
 
   src = fetchurl {
-    url = "https://code.soundsoftware.ac.uk/attachments/download/2616/${name}.tar.gz";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/2616/${pname}-${version}.tar.gz";
     sha256 = "03g2bmlj08lmgvh54dyd635xccjn730g4wwlhpvsw04bffz8b7fp";
   };
 
diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix
index ff10ff13e194..7a7ec1e41880 100644
--- a/pkgs/applications/audio/transcode/default.nix
+++ b/pkgs/applications/audio/transcode/default.nix
@@ -2,9 +2,10 @@
 , lzo, libdvdread, pkg-config, x264, libmpeg2, xvidcore }:
 
 stdenv.mkDerivation rec {
-  name = "transcode-1.1.7";
+  pname = "transcode";
+  version = "1.1.7";
   src = fetchurl {
-    url = "https://bitbucket.org/france/transcode-tcforge/downloads/${name}.tar.bz2";
+    url = "https://bitbucket.org/france/transcode-tcforge/downloads/${pname}-${version}.tar.bz2";
     sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92";
   };
 
diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix
index 6158f33713a0..5f99555d376c 100644
--- a/pkgs/applications/audio/xmp/default.nix
+++ b/pkgs/applications/audio/xmp/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }:
 
 stdenv.mkDerivation rec {
-  name = "xmp-4.1.0";
+  pname = "xmp";
+  version = "4.1.0";
 
   meta = with lib; {
     description = "Extended module player";
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.gz";
     sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x";
   };
 
diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/applications/audio/zita-ajbridge/default.nix
index db6fc7d33812..873a294540dd 100644
--- a/pkgs/applications/audio/zita-ajbridge/default.nix
+++ b/pkgs/applications/audio/zita-ajbridge/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, alsa-lib, libjack2, zita-alsa-pcmi, zita-resampler }:
 
 stdenv.mkDerivation rec {
-  name = "zita-ajbridge-0.8.4";
+  pname = "zita-ajbridge";
+  version = "0.8.4";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "0g5v0l0zmqh049mhv62n8s5bpm0yrlby7mkxxhs5qwadp8v4w9mw";
   };
 
diff --git a/pkgs/applications/audio/zita-at1/default.nix b/pkgs/applications/audio/zita-at1/default.nix
index 7a66ed42b053..8a629e145c40 100644
--- a/pkgs/applications/audio/zita-at1/default.nix
+++ b/pkgs/applications/audio/zita-at1/default.nix
@@ -4,10 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "zita-at1-0.6.2";
+  pname = "zita-at1";
+  version = "0.6.2";
 
   src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
     sha256 = "0mxfn61zvhlq3r1mqipyqzjbanrfdkk8x4nxbz8nlbdk0bf3vfqr";
   };
 
diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/build-support/icon-conv-tools/default.nix
index 79d3838e6884..442f1f2235fa 100644
--- a/pkgs/build-support/icon-conv-tools/default.nix
+++ b/pkgs/build-support/icon-conv-tools/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, icoutils }:
 
 stdenv.mkDerivation {
-  name = "icon-conv-tools-0.0.0";
+  pname = "icon-conv-tools";
+  version = "0.0.0";
 
   src = ./bin;
 
diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix
index 70da5bf5b5fb..4678d35442f6 100644
--- a/pkgs/build-support/libredirect/default.nix
+++ b/pkgs/build-support/libredirect/default.nix
@@ -1,7 +1,8 @@
 { stdenv, lib, coreutils }:
 
-stdenv.mkDerivation {
-  name = "libredirect-0";
+stdenv.mkDerivation rec {
+  pname = "libredirect";
+  version = "0";
 
   unpackPhase = ''
     cp ${./libredirect.c} libredirect.c
diff --git a/pkgs/development/python-modules/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix
index 28609919098f..3170d199cf55 100644
--- a/pkgs/development/python-modules/gprof2dot/default.nix
+++ b/pkgs/development/python-modules/gprof2dot/default.nix
@@ -1,12 +1,13 @@
 { lib, fetchFromGitHub, buildPythonApplication, python, graphviz }:
 
-buildPythonApplication {
-  name = "gprof2dot-2019-11-30";
+buildPythonApplication rec {
+  pname = "gprof2dot";
+  version = "2019.11.30";
 
   src = fetchFromGitHub {
     owner = "jrfonseca";
     repo = "gprof2dot";
-    rev = "2019.11.30";
+    rev = version;
     sha256 = "1nw4cfwimd0djarw4wc756q095xir78js8flmycg6g7sl3l6p27s";
   };
 
diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix
index a1e88d8ebfb8..43970497bb48 100644
--- a/pkgs/development/tools/analysis/emma/default.nix
+++ b/pkgs/development/tools/analysis/emma/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, unzip}:
 
-stdenv.mkDerivation {
-  name = "emma-2.0.5312";
+stdenv.mkDerivation rec {
+  pname = "emma";
+  version = "2.0.5312";
 
   src = fetchurl {
-    url = "mirror://sourceforge/emma/emma-2.0.5312.zip";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.zip";
     sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj";
   };
 
diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix
index 265f62904530..e07d98998efe 100644
--- a/pkgs/development/tools/analysis/findbugs/default.nix
+++ b/pkgs/development/tools/analysis/findbugs/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "findbugs-3.0.1";
+  pname = "findbugs";
+  version = "3.0.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/findbugs/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "06b46fz4nid7qvm36r66zw01fr87y4jyz21ixw27b8hkqah0s3p8";
   };
 
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
index 8984a395818b..f7f5e84c012b 100644
--- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
+++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
@@ -2,7 +2,8 @@
 
 stdenv.mkDerivation rec {
 
-  name = "tracefilegen-2017-05-13";
+  pname = "tracefilegen";
+  version = "unstable-2017-05-13";
 
   src = fetchFromGitHub {
     owner = "GarCoSim";
@@ -17,8 +18,8 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     install -Dm755 TraceFileGen $out/bin/TraceFileGen
-    mkdir -p $out/share/doc/${name}/
-    cp -ar $src/Documentation/html $out/share/doc/${name}/.
+    mkdir -p $out/share/doc/${pname}-${version}/
+    cp -ar $src/Documentation/html $out/share/doc/${pname}-${version}/.
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
index 6fc19b3ae246..a76b6b9239e1 100644
--- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
+++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
@@ -2,7 +2,8 @@
 
 stdenv.mkDerivation {
 
-  name = "tracefilesim-2015-11-07";
+  pname = "tracefilesim";
+  version = "unstable-2015-11-07";
 
   src = fetchFromGitHub {
     owner = "GarCoSim";
diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix
index 1f9e2ba3c562..5c286e629547 100644
--- a/pkgs/development/tools/analysis/makefile2graph/default.nix
+++ b/pkgs/development/tools/analysis/makefile2graph/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }:
 
-stdenv.mkDerivation {
-  name = "makefile2graph-2018-01-03";
+stdenv.mkDerivation rec {
+  pname = "makefile2graph";
+  version = "unstable-2018-01-03";
 
   src = fetchFromGitHub {
     owner = "lindenb";
diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix
index 2780c8552fc0..82a32504d73a 100644
--- a/pkgs/development/tools/analysis/smatch/default.nix
+++ b/pkgs/development/tools/analysis/smatch/default.nix
@@ -4,12 +4,12 @@
 , llvm, libxml2
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "smatch";
   version = "20120924";
 
   src = fetchgit {
-    url = "git://repo.or.cz/smatch.git";
+    url = "git://repo.or.cz/${pname}.git";
     rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9";
     sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy";
   };
diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix
index e0d9840472b4..66b457f9902a 100644
--- a/pkgs/development/tools/analysis/sparse/default.nix
+++ b/pkgs/development/tools/analysis/sparse/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, pkg-config, libxml2, llvm }:
 
 stdenv.mkDerivation rec {
-  name = "sparse-0.5.0";
+  pname = "sparse";
+  version = "0.5.0";
 
   src = fetchurl {
-    url = "mirror://kernel/software/devel/sparse/dist/${name}.tar.xz";
+    url = "mirror://kernel/software/devel/sparse/dist/${pname}-${version}.tar.xz";
     sha256 = "1mc86jc5xdrdmv17nqj2cam2yqygnj6ar1iqkwsx2y37ij8wy7wj";
   };
 
diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix
index 581ff56bb614..954342550eac 100644
--- a/pkgs/development/tools/analysis/splint/default.nix
+++ b/pkgs/development/tools/analysis/splint/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, flex }:
 
 stdenv.mkDerivation rec {
-  name = "splint-3.1.2";
+  pname = "splint";
+  version = "3.1.2";
 
   src = fetchurl {
-    url = "http://www.splint.org/downloads/${name}.src.tgz";
+    url = "https://www.splint.org/downloads/${pname}-${version}.src.tgz";
     sha256 = "02pv8kscsrkrzip9r08pfs9xs98q74c52mlxzbii6cv6vx1vd3f7";
   };
 
diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix
index e4ebb85f27f4..cc67ce8123c8 100644
--- a/pkgs/development/tools/analysis/swarm/default.nix
+++ b/pkgs/development/tools/analysis/swarm/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation {
-  name = "swarm-2019-03-11";
+stdenv.mkDerivation rec {
+  pname = "swarm";
+  version = "unstable-2019-03-11";
 
   src = fetchFromGitHub {
     owner = "nimble-code";
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index d99bbe1cae4b..5a787d9c3f85 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }:
 
 stdenv.mkDerivation rec {
-  name = "valgrind-3.16.1";
+  pname = "valgrind";
+  version = "3.16.1";
 
   src = fetchurl {
-    url = "https://sourceware.org/pub/valgrind/${name}.tar.bz2";
+    url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "1jik19rcd34ip8a5c9nv5wfj8k8maqb8cyclr4xhznq2gcpkl7y9";
   };
 
diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix
index 10b9f7291a22..fd24362bab17 100644
--- a/pkgs/development/tools/analysis/valkyrie/default.nix
+++ b/pkgs/development/tools/analysis/valkyrie/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
-  name = "valkyrie-2.0.0";
+  pname = "valkyrie";
+  version = "2.0.0";
 
   src = fetchurl {
-    url = "http://valgrind.org/downloads/${name}.tar.bz2";
+    url = "https://valgrind.org/downloads/${pname}-${version}.tar.bz2";
     sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7";
   };
 
diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix
index bc44741cffee..7eefc4fc92d0 100644
--- a/pkgs/development/tools/cdecl/default.nix
+++ b/pkgs/development/tools/cdecl/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, bison, flex, readline, ncurses, gnused}:
 
-stdenv.mkDerivation {
-  name = "cdecl-2.5";
+stdenv.mkDerivation rec {
+  pname = "cdecl";
+  version = "2.5";
   src = fetchurl {
-    url = "https://www.cdecl.org/files/cdecl-blocks-2.5.tar.gz";
+    url = "https://www.cdecl.org/files/${pname}-blocks-${version}.tar.gz";
     sha256 = "1b7k0ra30hh8mg8fqv0f0yzkaac6lfg6n376drgbpxg4wwml1rly";
   };
 
diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index 6a1470e10749..9e0e40b69f4b 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -1,7 +1,8 @@
 { lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }:
 
 bundlerEnv {
-  name = "chef-dk-4.13.3";
+  pname = "chef-dk";
+  version = "4.13.3";
 
   inherit ruby;
   gemdir = ./.;
diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix
index 4c94ff1e6e27..ce3525420613 100644
--- a/pkgs/development/tools/lattice-diamond/default.nix
+++ b/pkgs/development/tools/lattice-diamond/default.nix
@@ -1,8 +1,9 @@
-{ lib, 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 {
-  name = "diamond-3.10";
+  pname = "diamond";
+  version = "3.10";
 
   nativeBuildInputs = [ rpmextract patchelf makeWrapper file ];
 
@@ -15,17 +16,17 @@ stdenv.mkDerivation {
   buildCommand = ''
     origprefix=usr/local/diamond/3.10_x64
     prefix=diamond
-    
+
     echo "Unpacking $src..."
     rpmextract $src
-    
+
     # Move $pwd/usr/local/diamond/VERS to $out/diamond, cd.
     mkdir -p $out/$prefix
     rmdir $out/$prefix
     mv $origprefix $out/$prefix
-    
+
     cd $out
-    
+
     # Extract all tarballs.
     for tb in \
         cae_library/cae_library.tar.gz \
@@ -36,13 +37,13 @@ stdenv.mkDerivation {
         bin/bin.tar.gz \
         examples/examples.tar.gz \
         data/data.tar.gz ; do
-    
+
         echo "Extracting tarball $prefix/$tb"
         cd $out/$prefix/$(dirname $tb)
         tar xf $(basename $tb)
         rm $(basename $tb)
     done
-    
+
     # Patch shebangs in start scripts .
     cd $out/$prefix/bin/lin64
     for tool in \
@@ -60,11 +61,11 @@ stdenv.mkDerivation {
         ipexpress \
         fileutility \
         diamond ; do
-        
+
         echo "Patching script $prefix/bin/lin64/$tool..."
         patchShebangs $tool
     done
-    
+
     # Patch executable ELFs.
     for path in bin/lin64 ispfpga/bin/lin64; do
         cd $out/$prefix/$path
@@ -82,10 +83,10 @@ stdenv.mkDerivation {
                 $f
         done
     done
-    
+
     # Remove 32-bit libz.
     rm $out/$prefix/bin/lin64/libz.{so,so.1}
-    
+
     # Make wrappers (should these target more than the 'diamond' tool?).
     # The purpose of these is just to call the target program using its
     # absolute path - otherwise, it will crash.
diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix
index cb3b30405962..7c8ad17c5a08 100644
--- a/pkgs/development/tools/libsigrokdecode/default.nix
+++ b/pkgs/development/tools/libsigrokdecode/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }:
 
 stdenv.mkDerivation rec {
-  name = "libsigrokdecode-0.5.3";
+  pname = "libsigrokdecode";
+  version = "0.5.3";
 
   src = fetchurl {
-    url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265";
   };
 
diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix
index 186608cde3f1..b6970beb8734 100644
--- a/pkgs/development/tools/misc/autobuild/default.nix
+++ b/pkgs/development/tools/misc/autobuild/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, makeWrapper, perl, openssh, rsync }:
 
 stdenv.mkDerivation rec {
-  name = "autobuild-5.3";
+  pname = "autobuild";
+  version = "5.3";
 
   src = fetchurl {
-    url = "http://savannah.spinellicreations.com/autobuild/${name}.tar.gz";
+    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0gv7g61ja9q9zg1m30k4snqwwy1kq7b4df6sb7d2qra7kbdq8af1";
   };
 
diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index 9cfd93800103..db2ffce50cec 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -6,10 +6,11 @@
 assert docSupport -> texLive != null && texinfo != null && texi2html != null;
 
 stdenv.mkDerivation rec {
-  name = "avrdude-6.3";
+  pname = "avrdude";
+  version = "6.3";
 
   src = fetchurl {
-    url = "mirror://savannah/avrdude/${name}.tar.gz";
+    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
     sha256 = "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg";
   };
 
diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix
index 26c484017d2b..3dc424f106bf 100644
--- a/pkgs/development/tools/misc/babeltrace/default.nix
+++ b/pkgs/development/tools/misc/babeltrace/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }:
 
 stdenv.mkDerivation rec {
-  name = "babeltrace-1.5.8";
+  pname = "babeltrace";
+  version = "1.5.8";
 
   src = fetchurl {
-    url = "https://www.efficios.com/files/babeltrace/${name}.tar.bz2";
+    url = "https://www.efficios.com/files/babeltrace/${pname}-${version}.tar.bz2";
     sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz";
   };
 
diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix
index 74073722857f..4e35ff35f660 100644
--- a/pkgs/development/tools/misc/bossa/default.nix
+++ b/pkgs/development/tools/misc/bossa/default.nix
@@ -14,7 +14,8 @@ let
 
 in
 stdenv.mkDerivation {
-  name = "bossa-1.8";
+  pname = "bossa";
+  version = "1.8";
 
   src = fetchgit {
     url = "https://github.com/shumatech/BOSSA";
diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix
index 62aa0ab5decf..a8f6e32f1e08 100644
--- a/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/pkgs/development/tools/misc/cbrowser/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, tk, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "cbrowser-0.8";
+  pname = "cbrowser";
+  version = "0.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cbrowser/cbrowser-0.8.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1050mirjab23qsnq3lp3a9vwcbavmh9kznzjm7dr5vkx8b7ffcji";
   };
 
@@ -14,10 +15,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ tk ];
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/${name}
-    cp -R * $out/share/${name}/
+    mkdir -p $out/bin $out/share/${pname}-${version}
+    cp -R * $out/share/${pname}-${version}/
 
-    makeWrapper $out/share/${name}/cbrowser $out/bin/cbrowser \
+    makeWrapper $out/share/${pname}-${version}/cbrowser $out/bin/cbrowser \
       --prefix PATH : ${tk}/bin
   '';
 
diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix
index b9e75d7cb2a3..92a812d5a212 100644
--- a/pkgs/development/tools/misc/cflow/default.nix
+++ b/pkgs/development/tools/misc/cflow/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, gettext, emacs }:
 
 stdenv.mkDerivation rec {
-  name = "cflow-1.6";
+  pname = "cflow";
+  version = "1.6";
 
   src = fetchurl {
-    url = "mirror://gnu/cflow/${name}.tar.bz2";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "1mzd3yf0dfv8h2av5vsxxlhpk21nw064h91b2kgfrdz92r0pnj1l";
   };
 
diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix
index ff804f897d1e..97da80cc7339 100644
--- a/pkgs/development/tools/misc/chrpath/default.nix
+++ b/pkgs/development/tools/misc/chrpath/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "chrpath-0.16";
+stdenv.mkDerivation rec {
+  pname = "chrpath";
+  version = "0.16";
 
   src = fetchurl {
-    url = "https://alioth-archive.debian.org/releases/chrpath/chrpath/0.16/chrpath-0.16.tar.gz";
+    url = "https://alioth-archive.debian.org/releases/${pname}/${pname}/${version}/${pname}-${version}.tar.gz";
     sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv";
   };
 
diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix
index 9fe5ed966724..b0dcfc6aa5ca 100644
--- a/pkgs/development/tools/misc/cppi/default.nix
+++ b/pkgs/development/tools/misc/cppi/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "cppi-1.18";
+  pname = "cppi";
+  version = "1.18";
 
   src = fetchurl {
-    url = "mirror://gnu/cppi/${name}.tar.xz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
     sha256 = "1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j";
   };
 
diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix
index 7eb38e385e8f..c79a2d252012 100644
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/pkgs/development/tools/misc/cscope/default.nix
@@ -3,10 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cscope-15.9";
+  pname = "cscope";
+  version = "15.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cscope/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0ngiv4aj3rr35k3q3wjx0y19gh7i1ydqa0cqip6sjwd8fph5ll65";
   };
 
diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix
index 9565eaa36262..78b743ef9f1b 100644
--- a/pkgs/development/tools/misc/dbench/default.nix
+++ b/pkgs/development/tools/misc/dbench/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }:
 
-stdenv.mkDerivation {
-  name = "dbench-2013-01-01";
+stdenv.mkDerivation rec {
+  pname = "dbench";
+  version = "2013-01-01";
 
   src = fetchgit {
-    url = "git://git.samba.org/sahlberg/dbench.git";
+    url = "git://git.samba.org/sahlberg/${pname}.git";
     rev = "65b19870ed8d25bff14cafa1c30beb33f1fb6597";
     sha256 = "16lcbwmmx8z5i73k3dnf54yffrpx7ql3y9k3cpkss9dcyxb1p83i";
   };
diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix
index 74eb9fcb2936..ca50deb504d3 100644
--- a/pkgs/development/tools/misc/ddd/default.nix
+++ b/pkgs/development/tools/misc/ddd/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, motif, ncurses, libX11, libXt}:
 
 stdenv.mkDerivation rec {
-  name = "ddd-3.3.12";
+  pname = "ddd";
+  version = "3.3.12";
   src = fetchurl {
-    url = "mirror://gnu/ddd/${name}.tar.gz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis";
   };
   buildInputs = [motif ncurses libX11 libXt];
diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index 612514345785..d335916bfe6a 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, expect, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "dejagnu-1.6.2";
+  pname = "dejagnu";
+  version = "1.6.2";
 
   src = fetchurl {
-    url = "mirror://gnu/dejagnu/${name}.tar.gz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd";
   };
 
diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix
index 0692d84b4544..22de87b95c37 100644
--- a/pkgs/development/tools/misc/doclifter/default.nix
+++ b/pkgs/development/tools/misc/doclifter/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, python3}:
 
-stdenv.mkDerivation {
-  name = "doclifter-2.19";
+stdenv.mkDerivation rec {
+  pname = "doclifter";
+  version = "2.19";
   src = fetchurl {
-    url = "http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz";
+    url = "http://www.catb.org/~esr/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2";
   };
   buildInputs = [ python3 ];
diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix
index 2700e56b392b..9a521bfd2743 100644
--- a/pkgs/development/tools/misc/drush/default.nix
+++ b/pkgs/development/tools/misc/drush/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, php, which, makeWrapper, bash, coreutils, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "drush-6.1.0";
+  pname = "drush";
+  version = "6.1.0";
 
   meta = with lib; {
     description = "Command-line shell and Unix scripting interface for Drupal";
diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix
index 5a5267510d7d..c5ede8488511 100644
--- a/pkgs/development/tools/misc/eggdbus/default.nix
+++ b/pkgs/development/tools/misc/eggdbus/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }:
 
 stdenv.mkDerivation rec {
-  name = "eggdbus-0.6";
+  pname = "eggdbus";
+  version = "0.6";
 
   src = fetchurl {
-    url = "https://hal.freedesktop.org/releases/${name}.tar.gz";
+    url = "https://hal.freedesktop.org/releases/${pname}-${version}.tar.gz";
     sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4";
   };
 
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 512989a14462..d0b5911b71d9 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -5,11 +5,12 @@
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-stdenv.mkDerivation {
-  name = "gnum4-1.4.18";
+stdenv.mkDerivation rec {
+  pname = "gnum4";
+  version = "1.4.18";
 
   src = fetchurl {
-    url = "mirror://gnu/m4/m4-1.4.18.tar.bz2";
+    url = "mirror://gnu/m4/m4-${version}.tar.bz2";
     sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36";
   };
 
diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix
index e998f09683ae..71b0bbd0b0d6 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/pkgs/development/tools/misc/gperf/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "gperf-3.1";
+  pname = "gperf";
+  version = "3.1";
 
   src = fetchurl {
-    url = "mirror://gnu/gperf/${name}.tar.gz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1qispg6i508rq8pkajh26cznwimbnj06wq9sd85vg95v8nwld1aq";
   };
 
diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix
index 6651bbb03845..9e6d846e80a4 100644
--- a/pkgs/development/tools/misc/gtkdialog/default.nix
+++ b/pkgs/development/tools/misc/gtkdialog/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, gtk2, pkg-config }:
 
-stdenv.mkDerivation {
-  name = "gtkdialog-0.8.3";
+stdenv.mkDerivation rec {
+  pname = "gtkdialog";
+  version = "0.8.3";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gtkdialog/gtkdialog-0.8.3.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${pname}/${pname}-${version}.tar.gz";
     sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e";
   };
 
diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix
index 4b7f7985a673..ff5fe7bcba40 100644
--- a/pkgs/development/tools/misc/gtkperf/default.nix
+++ b/pkgs/development/tools/misc/gtkperf/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, gtk2, pkg-config, libintl }:
 
-stdenv.mkDerivation {
-  name = "gtkperf-0.40.0";
+stdenv.mkDerivation rec {
+  pname = "gtkperf";
+  version = "0.40.0";
   src = fetchurl {
-    url = "mirror://sourceforge//gtkperf/gtkperf_0.40.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}_${lib.versions.majorMinor version}.tar.gz";
     sha256 = "0yxj3ap3yfi76vqg6xjvgc16nfi9arm9kp87s35ywf10fd73814p";
   };
 
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 4a205268c269..d4d6dc41657d 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -6,10 +6,11 @@
 # files.
 
 stdenv.mkDerivation rec {
-  name = "help2man-1.48.1";
+  pname = "help2man";
+  version = "1.48.1";
 
   src = fetchurl {
-    url = "mirror://gnu/help2man/${name}.tar.xz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
     sha256 = "sha256-3op0dAvQWGRlZ7kqtOzeudqfGgfMfE9gejwU3TjRB5k=";
   };
 
diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix
index 478c0a61f865..930327a880db 100644
--- a/pkgs/development/tools/misc/icon-naming-utils/default.nix
+++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, perl, librsvg}:
 
 stdenv.mkDerivation rec {
-  name = "icon-naming-utils-0.8.90";
+  pname = "icon-naming-utils";
+  version = "0.8.90";
 
   src = fetchurl {
-    url = "http://tango.freedesktop.org/releases/${name}.tar.gz";
+    url = "http://tango.freedesktop.org/releases/${pname}-${version}.tar.gz";
     sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4";
   };
 
diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix
index 8c5ec6af1c7f..1f5236456dbc 100644
--- a/pkgs/development/tools/misc/indent/default.nix
+++ b/pkgs/development/tools/misc/indent/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "indent-2.2.12";
+  pname = "indent";
+  version = "2.2.12";
 
   src = fetchurl {
-    url = "mirror://gnu/indent/${name}.tar.gz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
     sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7";
   };
 
diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix
index 55e62a2dcaee..01a0fab369e2 100644
--- a/pkgs/development/tools/misc/itstool/default.nix
+++ b/pkgs/development/tools/misc/itstool/default.nix
@@ -1,10 +1,11 @@
 { stdenv, lib, fetchurl, python3 }:
 
 stdenv.mkDerivation rec {
-  name = "itstool-2.0.6";
+  pname = "itstool";
+  version = "2.0.6";
 
   src = fetchurl {
-    url = "http://files.itstool.org/itstool/${name}.tar.bz2";
+    url = "http://files.itstool.org/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2";
   };
 
diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix
index dbcb8d52f1b7..83dbfb93c86d 100644
--- a/pkgs/development/tools/misc/jscoverage/default.nix
+++ b/pkgs/development/tools/misc/jscoverage/default.nix
@@ -1,10 +1,11 @@
 { autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, zip }:
 
 stdenv.mkDerivation rec {
-  name = "jscoverage-0.5.1";
+  pname = "jscoverage";
+  version = "0.5.1";
 
   src = fetchurl {
-    url = "https://siliconforks.com/jscoverage/download/${name}.tar.bz2";
+    url = "https://siliconforks.com/${pname}/download/${pname}-${version}.tar.bz2";
     sha256 = "c45f051cec18c10352f15f9844f47e37e8d121d5fd16680e2dd0f3b4420eb7f4";
   };
 
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
index 2b0089e89f64..1cd195a3132d 100644
--- a/pkgs/development/tools/misc/libtool/default.nix
+++ b/pkgs/development/tools/misc/libtool/default.nix
@@ -6,10 +6,11 @@
 # files.
 
 stdenv.mkDerivation rec {
-  name = "libtool-1.5.26";
+  pname = "libtool";
+  version = "1.5.26";
 
   src = fetchurl {
-    url = "mirror://gnu/libtool/${name}.tar.gz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
     sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w";
   };
 
diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix
index e1d9ae6b5513..ce176aac4a65 100644
--- a/pkgs/development/tools/misc/ltrace/default.nix
+++ b/pkgs/development/tools/misc/ltrace/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, elfutils, libunwind }:
 
-stdenv.mkDerivation {
-  name = "ltrace-0.7.3";
+stdenv.mkDerivation rec {
+  pname = "ltrace";
+  version = "0.7.3";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2";
+    url = "mirror://debian/pool/main/l/${pname}/${pname}_${version}.orig.tar.bz2";
     sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf";
   };
 
diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix
index a196c5f45288..1e89be8a0c22 100644
--- a/pkgs/development/tools/misc/lttv/default.nix
+++ b/pkgs/development/tools/misc/lttv/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }:
 
 stdenv.mkDerivation rec {
-  name = "lttv-1.5";
+  pname = "lttv";
+  version = "1.5";
 
   src = fetchurl {
-    url = "https://lttng.org/files/packages/${name}.tar.bz2";
+    url = "https://lttng.org/files/packages/${pname}-${version}.tar.bz2";
     sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1";
   };
 
diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix
index bf71b619e5aa..99f3d8c13e74 100644
--- a/pkgs/development/tools/misc/rman/default.nix
+++ b/pkgs/development/tools/misc/rman/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "rman-3.2";
+stdenv.mkDerivation rec {
+  pname = "rman";
+  version = "3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/polyglotman/3.2/rman-3.2.tar.gz";
+    url = "mirror://sourceforge/polyglotman/${version}/${pname}-${version}.tar.gz";
     sha256 = "0prdld6nbkdlkcgc2r1zp13h2fh8r0mlwxx423dnc695ddlk18b8";
   };
 
diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix
index 2fd984902875..fc619612a48b 100644
--- a/pkgs/development/tools/misc/sloccount/default.nix
+++ b/pkgs/development/tools/misc/sloccount/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, perl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "sloccount-2.26";
+  pname = "sloccount";
+  version = "2.26";
 
   src = fetchurl {
-    url = "https://www.dwheeler.com/sloccount/${name}.tar.gz";
+    url = "https://www.dwheeler.com/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs";
   };
 
diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix
index a18dcd85255a..d986ef052433 100644
--- a/pkgs/development/tools/misc/srecord/default.nix
+++ b/pkgs/development/tools/misc/srecord/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }:
 
 stdenv.mkDerivation rec {
-  name = "srecord-1.64";
+  pname = "srecord";
+  version = "1.64";
 
   src = fetchurl {
-    url = "mirror://sourceforge/srecord/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1qk75q0k5vzmm3932q9hqz2gp8n9rrdfjacsswxc02656f3l3929";
   };
 
diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix
index 8b9646713e88..bc33d417f885 100644
--- a/pkgs/development/tools/misc/stm32flash/default.nix
+++ b/pkgs/development/tools/misc/stm32flash/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "stm32flash-0.5";
+  pname = "stm32flash";
+  version = "0.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/stm32flash/${name}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp";
   };
 
diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix
index 1fb255073ed8..986a560ff6e8 100644
--- a/pkgs/development/tools/misc/uisp/default.nix
+++ b/pkgs/development/tools/misc/uisp/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "uisp-20050207";
+stdenv.mkDerivation rec {
+  pname = "uisp";
+  version = "20050207";
 
   src = fetchurl {
-    url = "http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz";
+    url = "https://savannah.nongnu.org/download/uisp/uisp-${version}.tar.gz";
     sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw";
   };
 
diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix
index 63452728b91e..0fcb121e4603 100644
--- a/pkgs/development/tools/neoload/default.nix
+++ b/pkgs/development/tools/neoload/default.nix
@@ -30,15 +30,16 @@ let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = ''
       sys.symlinkDir=INSTALLDIR/bin
     ''; };
 
-in stdenv.mkDerivation {
-  name = "neoload-4.1.4";
+in stdenv.mkDerivation rec {
+  pname = "neoload";
+  version = "4.1.4";
 
   src = fetchurl (
     if stdenv.hostPlatform.system == "x86_64-linux" then
-      { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x64.sh";
+      { url = "http://neoload.installers.neotys.com/documents/download/${pname}/v${lib.versions.majorMinor version}/${pname}_${lib.replaceStrings ["."] ["_"] version}_linux_x64.sh";
         sha256 = "199jcf5a0nwfm8wfld2rcjgq64g91vvz2bkmki8dxfzf1yasifcd"; }
     else
-      { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x86.sh";
+      { url = "http://neoload.installers.neotys.com/documents/download/${pname}/v${lib.versions.majorMinor version}/${pname}_${lib.replaceStrings ["."] ["_"] version}_linux_x86.sh";
         sha256 = "1z66jiwcxixsqqwa0f4q8m2p5kna4knq6lic8y8l74dgv25mw912"; } );
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix
index a43903c34d38..b40c8b42546b 100644
--- a/pkgs/development/tools/ocaml/ocamlify/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlify/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
 
-stdenv.mkDerivation {
-  name = "ocamlify-0.0.2";
+stdenv.mkDerivation rec {
+  pname = "ocamlify";
+  version = "0.0.2";
 
   src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/1209/ocamlify-0.0.2.tar.gz";
+    url = "https://forge.ocamlcore.org/frs/download.php/1209/${pname}-${version}.tar.gz";
     sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii";
   };
 
diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix
index 4518e7a22e41..82a495b733b5 100644
--- a/pkgs/development/tools/ocaml/ocamlscript/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix
@@ -1,8 +1,9 @@
 {lib, stdenv, fetchurl, ocaml, findlib, camlp4}:
-stdenv.mkDerivation {
-  name = "ocamlscript-2.0.3";
+stdenv.mkDerivation rec {
+  pname = "ocamlscript";
+  version = "2.0.3";
   src = fetchurl {
-    url = "http://mjambon.com/releases/ocamlscript/ocamlscript-2.0.3.tar.gz";
+    url = "https://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1v1i24gijxwris8w4hi95r9swld6dm7jbry0zp72767a3g5ivlrd";
   };
 
diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix
index a7ffeb697459..d53eec12e806 100644
--- a/pkgs/development/tools/parsing/peg/default.nix
+++ b/pkgs/development/tools/parsing/peg/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "peg-0.1.18";
+  pname = "peg";
+  version = "0.1.18";
 
   src = fetchurl {
-    url = "${meta.homepage}/${name}.tar.gz";
+    url = "${meta.homepage}/${pname}-${version}.tar.gz";
     sha256 = "114h1y4k8fwcq9m0hfk33dsp7ah8zxzjjzlk71x4iirzczfkn690";
   };
 
diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix
index 4cd49b884ce6..5b7e77ee0b5d 100644
--- a/pkgs/development/tools/phantomjs/default.nix
+++ b/pkgs/development/tools/phantomjs/default.nix
@@ -5,7 +5,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "phantomjs-1.9.8";
+  pname = "phantomjs";
+  version = "1.9.8";
 
   # I chose to use the binary build for now.
   # The source version is quite nasty to compile
@@ -14,18 +15,18 @@ stdenv.mkDerivation rec {
 
   src = if stdenv.hostPlatform.system == "i686-linux" then
           fetchurl {
-            url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-i686.tar.bz2";
+            url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-linux-i686.tar.bz2";
             sha256 = "11fzmssz9pqf3arh4f36w06sl2nyz8l9h8iyxyd7w5aqnq5la0j1";
           }
         else
           if stdenv.hostPlatform.system == "x86_64-linux" then
             fetchurl {
-              url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2";
+              url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-linux-x86_64.tar.bz2";
               sha256 = "0fhnqxxsxhy125fmif1lwgnlhfx908spy7fx9mng4w72320n5nd1";
             }
           else # x86_64-darwin
             fetchurl {
-              url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-macosx.zip";
+              url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-macosx.zip";
               sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg";
             };
 
diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix
index eaaa057dc0a2..5380bb686085 100644
--- a/pkgs/development/tools/pydb/default.nix
+++ b/pkgs/development/tools/pydb/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, python2, emacs }:
 
-stdenv.mkDerivation {
-  name = "pydb-1.26";
+stdenv.mkDerivation rec {
+  pname = "pydb";
+  version = "1.26";
 
   src = fetchurl {
-    url =  "mirror://sourceforge/sourceforge/bashdb/pydb-1.26.tar.bz2";
+    url =  "mirror://sourceforge/sourceforge/bashdb/${pname}-${version}.tar.bz2";
     sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1";
   };
 
diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix
index 94b5e5a6dcc2..8dafe88005de 100644
--- a/pkgs/development/tools/quilt/default.nix
+++ b/pkgs/development/tools/quilt/default.nix
@@ -2,10 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "quilt-0.66";
+  pname = "quilt";
+  version = "0.66";
 
   src = fetchurl {
-    url = "mirror://savannah/quilt/${name}.tar.gz";
+    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
     sha256 = "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri";
   };
 
diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix
index ef04725e562f..ede6364fa067 100644
--- a/pkgs/development/tools/sslmate/default.nix
+++ b/pkgs/development/tools/sslmate/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perlPackages, makeWrapper, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "sslmate-1.7.1";
+  pname = "sslmate";
+  version = "1.7.1";
 
   src = fetchurl {
-    url = "https://packages.sslmate.com/other/${name}.tar.gz";
+    url = "https://packages.sslmate.com/other/${pname}-${version}.tar.gz";
     sha256 = "1i56za41cfqlml9g787xqqs0r8jifd3y7ks9nf4k2dhhi4rijkj5";
   };
 
diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix
index ae9c7c833928..422969d2c66c 100644
--- a/pkgs/development/tools/sunxi-tools/default.nix
+++ b/pkgs/development/tools/sunxi-tools/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, libusb1, zlib }:
 
-stdenv.mkDerivation {
-  name = "sunxi-tools-20181113";
+stdenv.mkDerivation rec {
+  pname = "sunxi-tools";
+  version = "unstable-2018-11-13";
 
   src = fetchFromGitHub {
     owner = "linux-sunxi";
diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix
index 67900dda1406..b579e3674334 100644
--- a/pkgs/development/tools/xib2nib/default.nix
+++ b/pkgs/development/tools/xib2nib/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }:
 
 stdenv.mkDerivation {
-  name = "xib2nib-730e177";
+  pname = "xib2nib";
+  version = "unstable-2017-04-12";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";

From 52e944823244527175ff4ac342c2fae640a07504 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jun 2021 14:05:58 +0000
Subject: [PATCH 040/330] dua: 2.13.1 -> 2.14.1

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

diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix
index 20288bf3f5e7..d097beca9114 100644
--- a/pkgs/tools/misc/dua/default.nix
+++ b/pkgs/tools/misc/dua/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dua";
-  version = "2.13.1";
+  version = "2.14.1";
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
 
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     owner = "Byron";
     repo = "dua-cli";
     rev = "v${version}";
-    sha256 = "sha256-6xSRsLM1DD1xMjOGzHMDVLibrJlu9lN9OoSV7B/WMT0=";
+    sha256 = "sha256-46azJ7q0Ix/8wdg01hYQ2V2E4tBD/NDdHpexnFBD5so=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     extraPostFetch = ''
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoSha256 = "sha256-udz1EtPchEHxkvvVFnkwSOpFz4XEBGOXRz8qWREyzvc=";
+  cargoSha256 = "sha256-hCf6Ih2bJrMX2ntWbIrX3Dk8wI5tio+OcN4WNWuU7j4=";
 
   doCheck = false;
 

From a671b18644739e2c74a454a206b96be89b5779e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 6 Jun 2021 03:10:18 +0000
Subject: [PATCH 041/330] at-spi2-core: 2.40.1 -> 2.40.2

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

diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 4e85c7a92a64..515c60c985a7 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "at-spi2-core";
-  version = "2.40.1";
+  version = "2.40.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0miqn8531czy9ffpxnsxsnk12w3d6sqjda3qyix8kns2xsjf6rlz";
+    sha256 = "RNwXr5Q7D9GWxhweA7bBZpYDhcrpbMtelb3v/7aEn5g=";
   };
 
   outputs = [ "out" "dev" ];

From 66c36f0eb71746f23c9682c664d43b69f27bcaff Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 29 Jun 2021 15:05:23 +0200
Subject: [PATCH 042/330] python3Packages.greenlet, enable tests, fix license

---
 .../python-modules/greenlet/default.nix          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix
index 8762d62e59b9..4d829f3d6473 100644
--- a/pkgs/development/python-modules/greenlet/default.nix
+++ b/pkgs/development/python-modules/greenlet/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , six
 , isPyPy
+, python
 }:
 
 
@@ -16,11 +17,18 @@ buildPythonPackage rec {
     sha256 = "c87df8ae3f01ffb4483c796fe1b15232ce2b219f0b18126948616224d3f658ee";
   };
 
-  propagatedBuildInputs = [ six ];
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m unittest discover -v greenlet.tests
+    runHook postCheck
+  '';
 
-  meta = {
-    homepage = "https://pypi.python.org/pypi/greenlet";
+  meta = with lib; {
+    homepage = "https://github.com/python-greenlet/greenlet";
     description = "Module for lightweight in-process concurrent programming";
-    license = lib.licenses.lgpl2;
+    license = with licenses; [
+      psfl  # src/greenlet/slp_platformselect.h & files in src/greenlet/platform/ directory
+      mit
+    ];
   };
 }

From e6b9c1cd624dc1ef07d7d071e22c84ee14799f15 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 29 Jun 2021 15:29:29 +0200
Subject: [PATCH 043/330] python3Packages.sqlalchemy: 1.4.19 -> 1.4.20

https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_1_4_20
---
 pkgs/development/python-modules/sqlalchemy/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index eac1f9b49355..6c576f0b85e9 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  version = "1.4.19";
+  version = "1.4.20";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qjwxqmsw34iw07nl1vzghj5m5inr2bs414lg9yf9drkrwys39c9";
+    sha256 = "1l5miq1nzvg51yqw3pnaq17dgibhgx2m0il2ha79gwpyd8k3mviq";
   };
 
   propagatedBuildInputs = [
@@ -36,8 +36,6 @@ buildPythonPackage rec {
     sed -e 's:--max-worker-restart=5::g' -i setup.cfg
   '';
 
-  dontUseSetuptoolsCheck = true;
-
   # disable mem-usage tests on mac, has trouble serializing pickle files
   disabledTests = lib.optionals stdenv.isDarwin [
     "MemUsageWBackendTest"

From 5418e2f017cfbb82ae1d24c064dc5d374e43a582 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jun 2021 22:23:57 +0000
Subject: [PATCH 044/330] iproute2: 5.12.0 -> 5.13.0

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

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 638983d6c17e..ea3c4d36958f 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "5.12.0";
+  version = "5.13.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-nSaNuYo27ioOP/O5Ky7/9m/BE4pR5Am972qzz+FfMm8=";
+    sha256 = "sha256-cqLlN3TKyeZfe2F97rsgWfh+iWDW6XE+TXiM6pZvGzY=";
   };
 
   preConfigure = ''

From 60793627351c0432d369b5ff77956871cbb2d413 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jun 2021 07:39:12 +0000
Subject: [PATCH 045/330] alsa-lib: 1.2.5 -> 1.2.5.1

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

diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix
index 7d2615824a68..a23502714827 100644
--- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "alsa-lib";
-  version = "1.2.5";
+  version = "1.2.5.1";
 
   src = fetchurl {
     url = "mirror://alsa/lib/${pname}-${version}.tar.bz2";
-    sha256 = "067ga0l6zr782kw8jdsqvbb20pcgnl0vkpnnz2n36fq8ii58k4lh";
+    sha256 = "sha256-YoQh2VDOyvI03j+JnVIMCmkjMTyWStdR/6wIHfMxQ44=";
   };
 
   patches = [

From 02d1c6307feea1600cdeee18cf0e4384bd659d42 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 30 Jun 2021 08:31:06 +0000
Subject: [PATCH 046/330] alsa-ucm-conf: 1.2.5 -> 1.2.5.1

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

diff --git a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix
index d87f3eebb845..0666f3f47939 100644
--- a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix
+++ b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "alsa-ucm-conf-${version}";
-  version = "1.2.5";
+  version = "1.2.5.1";
 
   src = fetchurl {
     url = "mirror://alsa/lib/${name}.tar.bz2";
-    sha256 = "sha256-CTrj2Fpeb9LNHMJ/7aQA1xkTgvuLXl4jSXKGyHwVB6U=";
+    sha256 = "sha256-WEGkRBZty/R523UTA9vDVW9oUIWsfgDwyed1VnYZXZc=";
   };
 
   dontBuild = true;

From 58a2d4b666bee0cb4be84f2efca942b1ffee916f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 22 Jun 2021 15:21:29 +0200
Subject: [PATCH 047/330] development: /s/name/pname&version/

---
 pkgs/development/libraries/AntTweakBar/default.nix     |  7 ++++---
 pkgs/development/libraries/PlistCpp/default.nix        |  3 ++-
 pkgs/development/libraries/agg/default.nix             |  5 +++--
 pkgs/development/libraries/amrnb/default.nix           |  5 +++--
 pkgs/development/libraries/appstream-glib/default.nix  |  5 +++--
 pkgs/development/libraries/argp-standalone/default.nix |  7 ++++---
 pkgs/development/libraries/attr/default.nix            |  5 +++--
 pkgs/development/libraries/boolstuff/default.nix       | 10 ++++------
 pkgs/development/libraries/buddy/default.nix           |  5 +++--
 pkgs/development/libraries/chmlib/default.nix          |  3 ++-
 pkgs/development/libraries/cloog-ppl/default.nix       |  5 +++--
 pkgs/development/libraries/flann/default.nix           |  7 ++++---
 pkgs/development/libraries/glew/default.nix            |  5 +++--
 pkgs/development/libraries/gnet/default.nix            |  7 ++++---
 pkgs/development/libraries/gsasl/default.nix           |  5 +++--
 pkgs/development/libraries/hawknl/default.nix          |  7 ++++---
 pkgs/development/libraries/imlib/default.nix           |  7 ++++---
 pkgs/development/libraries/jbigkit/default.nix         |  5 +++--
 pkgs/development/libraries/judy/default.nix            |  7 ++++---
 pkgs/development/libraries/lcms2/default.nix           |  5 +++--
 pkgs/development/libraries/lesstif/default.nix         |  5 +++--
 pkgs/development/libraries/levmar/default.nix          |  5 +++--
 pkgs/development/libraries/libasyncns/default.nix      |  5 +++--
 pkgs/development/libraries/libaudclient/default.nix    |  4 ++--
 pkgs/development/libraries/libavc1394/default.nix      |  5 +++--
 .../development/libraries/libblocksruntime/default.nix |  3 ++-
 pkgs/development/libraries/libdbi/default.nix          |  5 +++--
 pkgs/development/libraries/libdivsufsort/default.nix   |  7 ++++---
 pkgs/development/libraries/libestr/default.nix         |  5 +++--
 pkgs/development/libraries/libf2c/default.nix          |  3 ++-
 pkgs/development/libraries/libfpx/default.nix          |  5 +++--
 pkgs/development/libraries/libftdi/default.nix         |  5 +++--
 pkgs/development/libraries/libgssglue/default.nix      |  5 +++--
 pkgs/development/libraries/libhangul/default.nix       |  7 ++++---
 pkgs/development/libraries/libibmad/default.nix        |  5 +++--
 pkgs/development/libraries/libibumad/default.nix       |  5 +++--
 pkgs/development/libraries/libiodbc/default.nix        |  5 +++--
 pkgs/development/libraries/libiptcdata/default.nix     |  5 +++--
 pkgs/development/libraries/liblastfmSF/default.nix     |  7 ++++---
 pkgs/development/libraries/libltc/default.nix          |  7 ++++---
 pkgs/development/libraries/libmcrypt/default.nix       |  7 ++++---
 pkgs/development/libraries/libmemcached/default.nix    |  7 ++++---
 pkgs/development/libraries/libmng/default.nix          |  5 +++--
 pkgs/development/libraries/libmongo-client/default.nix |  5 +++--
 pkgs/development/libraries/libmpcdec/default.nix       |  7 ++++---
 pkgs/development/libraries/libmusicbrainz/default.nix  |  5 +++--
 pkgs/development/libraries/liboauth/default.nix        |  5 +++--
 pkgs/development/libraries/liboggz/default.nix         |  5 +++--
 pkgs/development/libraries/libraw1394/default.nix      |  5 +++--
 pkgs/development/libraries/libresample/default.nix     |  7 ++++---
 pkgs/development/libraries/librevisa/default.nix       |  5 +++--
 pkgs/development/libraries/libs3/default.nix           |  3 ++-
 pkgs/development/libraries/libshout/default.nix        |  5 +++--
 pkgs/development/libraries/libstatgrab/default.nix     |  5 +++--
 pkgs/development/libraries/libvirt-glib/default.nix    |  5 +++--
 pkgs/development/libraries/libvterm/default.nix        |  5 +++--
 pkgs/development/libraries/libwpg/default.nix          |  5 +++--
 pkgs/development/libraries/libx86/src-for-default.nix  |  6 ++----
 pkgs/development/libraries/libxmp/default.nix          |  5 +++--
 pkgs/development/libraries/mysocketw/default.nix       |  7 ++++---
 .../development/libraries/nvidia-video-sdk/default.nix |  7 ++++---
 pkgs/development/libraries/plib/default.nix            |  5 +++--
 pkgs/development/libraries/portaudio/default.nix       |  7 ++++---
 pkgs/development/libraries/psqlodbc/default.nix        |  5 +++--
 pkgs/development/libraries/sbc/default.nix             |  5 +++--
 .../libraries/science/biology/EBTKS/default.nix        |  2 +-
 .../libraries/science/math/liblbfgs/default.nix        |  7 ++++---
 .../libraries/science/math/metis/default.nix           |  7 ++++---
 pkgs/development/libraries/scmccid/default.nix         |  9 +++++----
 pkgs/development/libraries/slib/default.nix            |  5 +++--
 pkgs/development/libraries/soprano/default.nix         |  5 +++--
 pkgs/development/libraries/tre/default.nix             |  5 +++--
 pkgs/development/libraries/ucommon/default.nix         |  5 +++--
 pkgs/development/libraries/vcdimager/default.nix       |  5 +++--
 pkgs/development/libraries/vxl/default.nix             |  3 ++-
 pkgs/development/libraries/xbase/default.nix           |  7 ++++---
 76 files changed, 242 insertions(+), 174 deletions(-)

diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix
index d46c7a6bcd85..4c67c927e57f 100644
--- a/pkgs/development/libraries/AntTweakBar/default.nix
+++ b/pkgs/development/libraries/AntTweakBar/default.nix
@@ -1,13 +1,14 @@
 { lib, stdenv, fetchurl, unzip, xorg, libGLU, libGL }:
 
-stdenv.mkDerivation {
-  name = "AntTweakBar-1.16";
+stdenv.mkDerivation rec {
+  pname = "AntTweakBar";
+  version = "1.16";
 
   nativeBuildInputs = [ unzip ];
   buildInputs = [ xorg.libX11 libGLU libGL ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip";
+    url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_${lib.replaceStrings ["."] [""] version}.zip";
     sha256 = "0z3frxpzf54cjs07m6kg09p7nljhr7140f4pznwi7srwq4cvgkpv";
   };
 
diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix
index f7c47805748e..c2d5e6dceac7 100644
--- a/pkgs/development/libraries/PlistCpp/default.nix
+++ b/pkgs/development/libraries/PlistCpp/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }:
 
 stdenv.mkDerivation {
-  name = "PlistCpp-11615d";
+  pname = "PlistCpp";
+  version = "unstable-11615d";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";
diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix
index 89585d908da4..39e27c909b50 100644
--- a/pkgs/development/libraries/agg/default.nix
+++ b/pkgs/development/libraries/agg/default.nix
@@ -2,9 +2,10 @@
 , freetype, SDL, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "agg-2.5";
+  pname = "agg";
+  version = "2.5";
   src = fetchurl {
-    url = "http://www.antigrain.com/${name}.tar.gz";
+    url = "https://www.antigrain.com/${pname}-${version}.tar.gz";
     sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb";
   };
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix
index 2316961e3994..4e325932b5e8 100644
--- a/pkgs/development/libraries/amrnb/default.nix
+++ b/pkgs/development/libraries/amrnb/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
-  name = "amrnb-11.0.0.0";
+  pname = "amrnb";
+  version = "11.0.0.0";
   srcAmr = fetchurl {
-    url = "http://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip";
+    url = "https://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip";
     sha256 = "1wf8ih0hk7w20vdlnw7jb7w73v15hbxgbvmq4wq7h2ghn0j8ppr3";
   };
 
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 64c0b031e47d..558ea51eb049 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -23,7 +23,8 @@
 , pngquant
 }:
 stdenv.mkDerivation rec {
-  name = "appstream-glib-0.7.18";
+  pname = "appstream-glib";
+  version = "0.7.18";
 
   outputs = [ "out" "dev" "man" "installedTests" ];
   outputBin = "dev";
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "appstream-glib";
-    rev = lib.replaceStrings [ "." "-" ] [ "_" "_" ] name;
+    rev = "${lib.replaceStrings ["-"] ["_"] pname}-${lib.replaceStrings ["."] ["_"] version}";
     sha256 = "12s7d3nqjs1fldnppbg2mkjg4280f3h8yzj3q1hiz3chh1w0vjbx";
   };
 
diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix
index 33b253718a7f..a1e1babbe5e8 100644
--- a/pkgs/development/libraries/argp-standalone/default.nix
+++ b/pkgs/development/libraries/argp-standalone/default.nix
@@ -19,11 +19,12 @@ let
     sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw";
   };
 in
-stdenv.mkDerivation {
-  name = "argp-standalone-1.3";
+stdenv.mkDerivation rec {
+  pname = "argp-standalone";
+  version = "1.3";
 
   src = fetchurl {
-    url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-1.3.tar.gz";
+    url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-${version}.tar.gz";
     sha256 = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be";
   };
 
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index b7c9287b68bc..3ff021222faa 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -6,10 +6,11 @@
 # files.
 
 stdenv.mkDerivation rec {
-  name = "attr-2.4.48";
+  pname = "attr";
+  version = "2.4.48";
 
   src = fetchurl {
-    url = "mirror://savannah/attr/${name}.tar.gz";
+    url = "mirror://savannah/attr/${pname}-${version}.tar.gz";
     sha256 = "1rr4adzwax4bzr2c00f06zcsljv5y6p9wymz1g89ww7cb2rp5bay";
   };
 
diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix
index 79232107cdd2..9b1840256ade 100644
--- a/pkgs/development/libraries/boolstuff/default.nix
+++ b/pkgs/development/libraries/boolstuff/default.nix
@@ -1,12 +1,10 @@
 { lib, stdenv, fetchurl, pkg-config }:
-
-let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in
-
 stdenv.mkDerivation rec {
-  name = "boolstuff-0.1.16";
+  pname = "boolstuff";
+  version = "0.1.16";
 
   src = fetchurl {
-    url = "${baseurl}/${name}.tar.gz";
+    url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz";
     sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0";
   };
 
@@ -14,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Library for operations on boolean expression binary trees";
-    homepage = "${baseurl}/boolstuff.html";
+    homepage = "https://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html";
     license = "GPL";
     maintainers = [ lib.maintainers.marcweber ];
     platforms = lib.platforms.all;
diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix
index a333a69ffa1b..d6ab4fe0dfe5 100644
--- a/pkgs/development/libraries/buddy/default.nix
+++ b/pkgs/development/libraries/buddy/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, bison }:
 
 stdenv.mkDerivation rec {
-  name = "buddy-2.4";
+  pname = "buddy";
+  version = "2.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/buddy/${name}.tar.gz";
+    url = "mirror://sourceforge/buddy/${pname}-${version}.tar.gz";
     sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk";
   };
 
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index 6e21984eb1da..bc609d7bbf17 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "chmlib-0.40a";
+  pname = "chmlib";
+  version = "0.40a";
 
   src = fetchFromGitHub {
     owner = "jedwing";
diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix
index b2bd2adde43a..65d6a392ffdb 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/pkgs/development/libraries/cloog-ppl/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, ppl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "cloog-ppl-0.15.11";
+  pname = "cloog-ppl";
+  version = "0.15.11";
 
   src = fetchurl {
-    url = "mirror://gcc/infrastructure/${name}.tar.gz";
+    url = "mirror://gcc/infrastructure/${pname}-${version}.tar.gz";
     sha256 = "0psdm0bn5gx60glfh955x5b3b23zqrd92idmjr0b00dlnb839mkw";
   };
 
diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix
index 913393804249..f906b3f3a89f 100644
--- a/pkgs/development/libraries/flann/default.nix
+++ b/pkgs/development/libraries/flann/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }:
 
-stdenv.mkDerivation {
-  name = "flann-1.9.1";
+stdenv.mkDerivation rec {
+  pname = "flann";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "mariusmuja";
     repo = "flann";
-    rev = "1.9.1";
+    rev = version;
     sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
   };
 
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index 660276530aa8..53c9b5a30dc9 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -5,10 +5,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "glew-2.2.0";
+  pname = "glew";
+  version = "2.2.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/glew/${name}.tgz";
+    url = "mirror://sourceforge/glew/${pname}-${version}.tgz";
     sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l";
   };
 
diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix
index 8f35407f9ddd..debf3eb59264 100644
--- a/pkgs/development/libraries/gnet/default.nix
+++ b/pkgs/development/libraries/gnet/default.nix
@@ -1,11 +1,12 @@
 {lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }:
 
-stdenv.mkDerivation {
-  name = "gnet-2.0.8";
+stdenv.mkDerivation rec {
+  pname = "gnet";
+  version = "2.0.8";
   src = fetchFromGitHub {
     owner = "GNOME";
     repo = "gnet";
-    rev = "GNET_2_0_8";
+    rev = "GNET_${lib.replaceStrings ["."] ["_"] version}";
     sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87";
   };
 
diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index fc2edc187129..5dcc24cc8bc2 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, libidn, libkrb5 }:
 
 stdenv.mkDerivation rec {
-  name = "gsasl-1.10.0";
+  pname = "gsasl";
+  version = "1.10.0";
 
   src = fetchurl {
-    url = "mirror://gnu/gsasl/${name}.tar.gz";
+    url = "mirror://gnu/gsasl/${pname}-${version}.tar.gz";
     sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM=";
   };
 
diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix
index aacdf0ee933e..6d60d62fcce7 100644
--- a/pkgs/development/libraries/hawknl/default.nix
+++ b/pkgs/development/libraries/hawknl/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, unzip}:
 
-stdenv.mkDerivation {
-  name = "hawknl-1.68";
+stdenv.mkDerivation rec {
+  pname = "hawknl";
+  version = "1.68";
 
   src = fetchurl {
-    url = "http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip";
+    url = "http://urchlay.naptime.net/~urchlay/src/HawkNL${lib.replaceStrings ["."] [""] version}src.zip";
     sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028";
   };
 
diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix
index 1d6fed2281e7..4bc06a97a7b2 100644
--- a/pkgs/development/libraries/imlib/default.nix
+++ b/pkgs/development/libraries/imlib/default.nix
@@ -2,10 +2,11 @@
 , libX11, libXext, xorgproto, libjpeg, giflib, libtiff, libpng
 }:
 
-stdenv.mkDerivation {
-  name = "imlib-1.9.15";
+stdenv.mkDerivation rec {
+  pname = "imlib";
+  version = "1.9.15";
   src = fetchurl {
-    url = "http://tarballs.nixos.org/imlib-1.9.15.tar.gz";
+    url = "https://tarballs.nixos.org/imlib-${version}.tar.gz";
     sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3";
   };
 
diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix
index ab55e76f29a3..40a46041caa2 100644
--- a/pkgs/development/libraries/jbigkit/default.nix
+++ b/pkgs/development/libraries/jbigkit/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "jbigkit-2.1";
+  pname = "jbigkit";
+  version = "2.1";
 
   src = fetchurl {
-    url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz";
+    url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${pname}-${version}.tar.gz";
     sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy";
   };
 
diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix
index 037225b86e5b..077c4fe90fdb 100644
--- a/pkgs/development/libraries/judy/default.nix
+++ b/pkgs/development/libraries/judy/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "judy-1.0.5";
+stdenv.mkDerivation rec {
+  pname = "judy";
+  version = "1.0.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/judy/Judy-1.0.5.tar.gz";
+    url = "mirror://sourceforge/judy/Judy-${version}.tar.gz";
     sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j";
   };
 
diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix
index 66bdcc03b966..b600a2ca4c3d 100644
--- a/pkgs/development/libraries/lcms2/default.nix
+++ b/pkgs/development/libraries/lcms2/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libtiff, libjpeg, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "lcms2-2.12";
+  pname = "lcms2";
+  version = "2.12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lcms/${name}.tar.gz";
+    url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz";
     sha256 = "sha256-GGY5hehkEARVrD5QdiXEOMNxA1TYXly7fNQEPhH+EPU=";
   };
 
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index d0ba47186559..dc0c8c0ed741 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, xlibsWrapper, libXp, libXau}:
 
 stdenv.mkDerivation rec {
-  name = "lesstif-0.95.2";
+  pname = "lesstif";
+  version = "0.95.2";
   src = fetchurl {
-    url = "mirror://sourceforge/lesstif/${name}.tar.bz2";
+    url = "mirror://sourceforge/lesstif/${pname}-${version}.tar.bz2";
     sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb";
   };
   buildInputs = [xlibsWrapper];
diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix
index ed945d9e5a08..f1ba199fc8e0 100644
--- a/pkgs/development/libraries/levmar/default.nix
+++ b/pkgs/development/libraries/levmar/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "levmar-2.6";
+  pname = "levmar";
+  version = "2.6";
 
   src = fetchurl {
-    url = "https://www.ics.forth.gr/~lourakis/levmar/${name}.tgz";
+    url = "https://www.ics.forth.gr/~lourakis/levmar/${pname}-${version}.tgz";
     sha256 = "1mxsjip9x782z6qa6k5781wjwpvj5aczrn782m9yspa7lhgfzx1v";
   };
 
diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix
index 0dc26b686117..c94e1c04e0ba 100644
--- a/pkgs/development/libraries/libasyncns/default.nix
+++ b/pkgs/development/libraries/libasyncns/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libasyncns-0.8";
+  pname = "libasyncns";
+  version = "0.8";
 
   src = fetchurl {
-    url = "http://0pointer.de/lennart/projects/libasyncns/${name}.tar.gz";
+    url = "http://0pointer.de/lennart/projects/libasyncns/${pname}-${version}.tar.gz";
     sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg";
   };
 
diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix
index f90815f4ee9f..9c790172039b 100644
--- a/pkgs/development/libraries/libaudclient/default.nix
+++ b/pkgs/development/libraries/libaudclient/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, dbus-glib }:
 
 stdenv.mkDerivation rec {
-  name = "libaudclient-3.5-rc2";
+  pname = "libaudclient";
   version = "3.5-rc2";
 
   src = fetchurl {
-    url = "https://distfiles.audacious-media-player.org/${name}.tar.bz2";
+    url = "https://distfiles.audacious-media-player.org/${pname}-${version}.tar.bz2";
     sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap";
   };
 
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix
index d9c10415b67a..2ac90a11f086 100644
--- a/pkgs/development/libraries/libavc1394/default.nix
+++ b/pkgs/development/libraries/libavc1394/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, libraw1394 }:
 
 stdenv.mkDerivation rec {
-  name = "libavc1394-0.5.4";
+  pname = "libavc1394";
+  version = "0.5.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libavc1394/${name}.tar.gz";
+    url = "mirror://sourceforge/libavc1394/${pname}-${version}.tar.gz";
     sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw";
   };
 
diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix
index 6ba832fb3cda..0ab380064429 100644
--- a/pkgs/development/libraries/libblocksruntime/default.nix
+++ b/pkgs/development/libraries/libblocksruntime/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, clang }:
 
 stdenv.mkDerivation {
-  name = "blocksruntime-20140624";
+  pname = "blocksruntime";
+  version = "unstable-2014-06-24";
 
   src = fetchFromGitHub {
     owner = "mackyle";
diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix
index 48812f091bea..ffbc3f671007 100644
--- a/pkgs/development/libraries/libdbi/default.nix
+++ b/pkgs/development/libraries/libdbi/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libdbi-0.9.0";
+  pname = "libdbi";
+  version = "0.9.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libdbi/${name}.tar.gz";
+    url = "mirror://sourceforge/libdbi/${pname}-${version}.tar.gz";
     sha256 = "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys";
   };
 
diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix
index 0f332f8ac74c..91b320826606 100644
--- a/pkgs/development/libraries/libdivsufsort/default.nix
+++ b/pkgs/development/libraries/libdivsufsort/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "libdivsufsort-2.0.1";
+stdenv.mkDerivation rec {
+  pname = "libdivsufsort";
+  version = "2.0.1";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdivsufsort/libdivsufsort-2.0.1.tar.bz2";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdivsufsort/libdivsufsort-${version}.tar.bz2";
     sha256 = "1g0q40vb2k689bpasa914yi8sjsmih04017mw20zaqqpxa32rh2m";
   };
 
diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix
index 8699e83d0fd0..5630047eed7f 100644
--- a/pkgs/development/libraries/libestr/default.nix
+++ b/pkgs/development/libraries/libestr/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libestr-0.1.11";
+  pname = "libestr";
+  version = "0.1.11";
 
   src = fetchurl {
-    url = "http://libestr.adiscon.com/files/download/${name}.tar.gz";
+    url = "http://libestr.adiscon.com/files/download/${pname}-${version}.tar.gz";
     sha256 = "0910ifzcs8kpd3srrr4fvbacgh2zrc6yn7i4rwfj6jpzhlkjnqs6";
   };
 
diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix
index ce1c35c7ec60..5a5d8b93057a 100644
--- a/pkgs/development/libraries/libf2c/default.nix
+++ b/pkgs/development/libraries/libf2c/default.nix
@@ -1,7 +1,8 @@
 {lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "libf2c-20160102";
+  pname = "libf2c";
+  version = "20160102";
 
   src = fetchurl {
     url = "http://www.netlib.org/f2c/libf2c.zip";
diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix
index 2576d426af55..589c08399a70 100644
--- a/pkgs/development/libraries/libfpx/default.nix
+++ b/pkgs/development/libraries/libfpx/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "libfpx-1.3.1-7";
+  pname = "libfpx";
+  version = "1.3.1-7";
 
   src = fetchurl {
-    url = "mirror://imagemagick/delegates/${name}.tar.xz";
+    url = "mirror://imagemagick/delegates/${pname}-${version}.tar.xz";
     sha256 = "1s28mwb06w6dj0zl6ashpj8m1qiyadawzl7cvbw7dmj1w39ipghh";
   };
 
diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix
index 0326b9c4f64f..68801883df9d 100644
--- a/pkgs/development/libraries/libftdi/default.nix
+++ b/pkgs/development/libraries/libftdi/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, libusb-compat-0_1}:
 
 stdenv.mkDerivation rec {
-  name = "libftdi-0.20";
+  pname = "libftdi";
+  version = "0.20";
 
   src = fetchurl {
-    url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz";
+    url = "https://www.intra2net.com/en/developer/libftdi/download/${pname}-${version}.tar.gz";
     sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii";
   };
 
diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix
index d4bf3ff1c2bb..0d01b05e223b 100644
--- a/pkgs/development/libraries/libgssglue/default.nix
+++ b/pkgs/development/libraries/libgssglue/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libkrb5 }:
 
 stdenv.mkDerivation rec {
-  name = "libgssglue-0.4";
+  pname = "libgssglue";
+  version = "0.4";
 
   src = fetchurl {
-    url = "http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/${name}.tar.gz";
+    url = "http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/${pname}-${version}.tar.gz";
     sha256 = "0fh475kxzlabwz30wz3bf7i8kfqiqzhfahayx3jj79rba1sily9z";
   };
 
diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix
index eea513a137cf..295ed9bf3054 100644
--- a/pkgs/development/libraries/libhangul/default.nix
+++ b/pkgs/development/libraries/libhangul/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "libhangul-0.1.0";
+stdenv.mkDerivation rec {
+  pname = "libhangul";
+  version = "0.1.0";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-0.1.0.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-${version}.tar.gz";
     sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar";
   };
 
diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix
index b6df338f122e..9088d9022069 100644
--- a/pkgs/development/libraries/libibmad/default.nix
+++ b/pkgs/development/libraries/libibmad/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libibumad }:
 
 stdenv.mkDerivation rec {
-  name = "libibmad-1.3.13";
+  pname = "libibmad";
+  version = "1.3.13";
 
   src = fetchurl {
-    url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz";
+    url = "https://www.openfabrics.org/downloads/management/${pname}-${version}.tar.gz";
     sha256 = "02sj8k2jpcbiq8s0l2lqk4vwji2dbb2lc730cv1yzv0zr0hxgk8p";
   };
 
diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix
index 6de97ad77cd7..b9ebef7d4ccb 100644
--- a/pkgs/development/libraries/libibumad/default.nix
+++ b/pkgs/development/libraries/libibumad/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libibumad-1.3.10.2";
+  pname = "libibumad";
+  version = "1.3.10.2";
 
   src = fetchurl {
-    url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz";
+    url = "https://www.openfabrics.org/downloads/management/${pname}-${version}.tar.gz";
     sha256 = "0bkygb3lbpaj6s4vsyixybrrkcnilbijv4ga5p1xdwyr3gip83sh";
   };
 
diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix
index 29d4c3432ebd..a15b00a66ef7 100644
--- a/pkgs/development/libraries/libiodbc/default.nix
+++ b/pkgs/development/libraries/libiodbc/default.nix
@@ -2,10 +2,11 @@
 , useGTK ? config.libiodbc.gtk or false }:
 
 stdenv.mkDerivation rec {
-  name = "libiodbc-3.52.12";
+  pname = "libiodbc";
+  version = "3.52.12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/iodbc/${name}.tar.gz";
+    url = "mirror://sourceforge/iodbc/${pname}-${version}.tar.gz";
     sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai";
   };
 
diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix
index 140faab43b1a..540d6d01a411 100644
--- a/pkgs/development/libraries/libiptcdata/default.nix
+++ b/pkgs/development/libraries/libiptcdata/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "libiptcdata-1.0.4";
+  pname = "libiptcdata";
+  version = "1.0.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libiptcdata/${name}.tar.gz";
+    url = "mirror://sourceforge/libiptcdata/${pname}-${version}.tar.gz";
     sha256 = "03pfvkmmx762iydq0q207x2028d275pbdysfsgpmrr0ywy63pxkr";
   };
 
diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix
index fe3038c3249a..74d32a6cc748 100644
--- a/pkgs/development/libraries/liblastfmSF/default.nix
+++ b/pkgs/development/libraries/liblastfmSF/default.nix
@@ -1,14 +1,15 @@
 { lib, stdenv, fetchurl, pkg-config, curl, openssl }:
 
-stdenv.mkDerivation {
-  name = "liblastfm-SF-0.5";
+stdenv.mkDerivation rec {
+  pname = "liblastfm-SF";
+  version = "0.5";
 
   nativeBuildInputs = [ pkg-config ];
 
   propagatedBuildInputs = [ curl openssl ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/liblastfm/libclastfm-0.5.tar.gz";
+    url = "mirror://sourceforge/liblastfm/libclastfm-${version}.tar.gz";
     sha256 = "0hpfflvfx6r4vvsbvdc564gkby8kr07p8ma7hgpxiy2pnlbpian9";
   };
 
diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix
index 2391d281d46a..a7d52fe17cf9 100644
--- a/pkgs/development/libraries/libltc/default.nix
+++ b/pkgs/development/libraries/libltc/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "libltc-1.3.1";
+stdenv.mkDerivation rec {
+  pname = "libltc";
+  version = "1.3.1";
 
   src = fetchurl {
-    url = "https://github.com/x42/libltc/releases/download/v1.3.1/libltc-1.3.1.tar.gz";
+    url = "https://github.com/x42/libltc/releases/download/v${version}/libltc-${version}.tar.gz";
     sha256 = "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh";
   };
 
diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix
index 44c55cb4682b..50bbf8383e61 100644
--- a/pkgs/development/libraries/libmcrypt/default.nix
+++ b/pkgs/development/libraries/libmcrypt/default.nix
@@ -2,11 +2,12 @@
 
 with lib;
 
-stdenv.mkDerivation {
-  name = "libmcrypt-2.5.8";
+stdenv.mkDerivation rec {
+  pname = "libmcrypt";
+  version = "2.5.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz";
+    url = "mirror://sourceforge/mcrypt/Libmcrypt/${version}/libmcrypt-${version}.tar.gz";
     sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4";
   };
 
diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index 0ee0701d9290..099dab139c4f 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }:
 
-stdenv.mkDerivation {
-  name = "libmemcached-1.0.18";
+stdenv.mkDerivation rec {
+  pname = "libmemcached";
+  version = "1.0.18";
 
   src = fetchurl {
-    url = "https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz";
+    url = "https://launchpad.net/libmemcached/${lib.versions.majorMinor version}/${version}/+download/libmemcached-${version}.tar.gz";
     sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72";
   };
 
diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix
index f1704a527b44..15a68bdce589 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/pkgs/development/libraries/libmng/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }:
 
 stdenv.mkDerivation rec {
-  name = "libmng-2.0.3";
+  pname = "libmng";
+  version = "2.0.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libmng/${name}.tar.xz";
+    url = "mirror://sourceforge/libmng/${pname}-${version}.tar.xz";
     sha256 = "1lvxnpds0vcf0lil6ia2036ghqlbl740c4d2sz0q5g6l93fjyija";
   };
 
diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix
index f81f63133384..a6a20141cc62 100644
--- a/pkgs/development/libraries/libmongo-client/default.nix
+++ b/pkgs/development/libraries/libmongo-client/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }:
 
 stdenv.mkDerivation rec {
-  name = "libmongo-client-0.1.8";
+  pname = "libmongo-client";
+  version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "algernon";
     repo = "libmongo-client";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0";
   };
 
diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix
index b42d9a3d1e43..753687221245 100644
--- a/pkgs/development/libraries/libmpcdec/default.nix
+++ b/pkgs/development/libraries/libmpcdec/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "libmpcdec-1.2.6";
+stdenv.mkDerivation rec {
+  pname = "libmpcdec";
+  version = "1.2.6";
 
   src = fetchurl {
-    url = "https://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2";
+    url = "https://files.musepack.net/source/libmpcdec-${version}.tar.bz2";
     sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab";
   };
 
diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix
index ab67d544a1df..e1ad8305188e 100644
--- a/pkgs/development/libraries/libmusicbrainz/default.nix
+++ b/pkgs/development/libraries/libmusicbrainz/default.nix
@@ -1,13 +1,14 @@
 { lib, stdenv, fetchurl, cmake, neon, libdiscid }:
 
 stdenv.mkDerivation rec {
-  name = "libmusicbrainz-3.0.3";
+  pname = "libmusicbrainz";
+  version = "3.0.3";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ neon libdiscid ];
 
   src = fetchurl {
-    url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz";
+    url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${pname}-${version}.tar.gz";
     sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z";
   };
 
diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix
index 5fe5ba86bea3..7ca9ec5acb6d 100644
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/pkgs/development/libraries/liboauth/default.nix
@@ -2,10 +2,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "liboauth-1.0.3";
+  pname = "liboauth";
+  version = "1.0.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/liboauth/${name}.tar.gz";
+    url = "mirror://sourceforge/liboauth/${pname}-${version}.tar.gz";
     sha256 = "07w1aq8y8wld43wmbk2q8134p3bfkp2vma78mmsfgw2jn1bh3xhd";
   };
 
diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix
index 15856c0262c7..ecf013363ad7 100644
--- a/pkgs/development/libraries/liboggz/default.nix
+++ b/pkgs/development/libraries/liboggz/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libogg, pkg-config }:
 
 stdenv.mkDerivation rec {
-  name = "liboggz-1.1.1";
+  pname = "liboggz";
+  version = "1.1.1";
 
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/liboggz/${name}.tar.gz";
+    url = "https://downloads.xiph.org/releases/liboggz/${pname}-${version}.tar.gz";
     sha256 = "0nj17lhnsw4qbbk8jy4j6a78w6v2llhqdwq46g44mbm9w2qsvbvb";
   };
 
diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix
index 7bf99e739f31..184cb2e7de4a 100644
--- a/pkgs/development/libraries/libraw1394/default.nix
+++ b/pkgs/development/libraries/libraw1394/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libraw1394-2.1.2";
+  pname = "libraw1394";
+  version = "2.1.2";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz";
+    url = "mirror://kernel/linux/libs/ieee1394/${pname}-${version}.tar.gz";
     sha256 = "0z5md84941ky5l7afayx2z6j0sk0mildxbjajq6niznd44ky7i6x";
   };
 
diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix
index 0756874b3e75..f466229cfe8e 100644
--- a/pkgs/development/libraries/libresample/default.nix
+++ b/pkgs/development/libraries/libresample/default.nix
@@ -6,10 +6,11 @@ let
     sha256 = "063w8rqxw87fc89gas47vk0ll7xl8cy7d8g70gm1l62bqkkajklx";
   };
 in
-stdenv.mkDerivation {
-  name = "libresample-0.1.3";
+stdenv.mkDerivation rec {
+  pname = "libresample";
+  version = "0.1.3";
   src = fetchurl {
-    url = "mirror://debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz";
+    url = "mirror://debian/pool/main/libr/libresample/libresample_${version}.orig.tar.gz";
     sha256 = "05a8mmh1bw5afqx0kfdqzmph4x2npcs4idx0p0v6q95lwf22l8i0";
   };
   patches = [ patch ];
diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix
index 892bbbbbfc04..12d1da460fb9 100644
--- a/pkgs/development/libraries/librevisa/default.nix
+++ b/pkgs/development/libraries/librevisa/default.nix
@@ -3,10 +3,11 @@
 # TODO: add VXI development files, for VXI-11 (TCPIP) support
 
 stdenv.mkDerivation rec {
-  name = "librevisa-0.0.20130412";
+  pname = "librevisa";
+  version = "0.0.20130412";
 
   src = fetchurl {
-    url = "http://www.librevisa.org/download/${name}.tar.gz";
+    url = "http://www.librevisa.org/download/${pname}-${version}.tar.gz";
     sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq";
   };
 
diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix
index 5a2b8636774f..d30fc55fc77f 100644
--- a/pkgs/development/libraries/libs3/default.nix
+++ b/pkgs/development/libraries/libs3/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, curl, libxml2 }:
 
 stdenv.mkDerivation {
-  name = "libs3-2018-12-03";
+  pname = "libs3";
+  version = "unstable-2018-12-03";
 
   src = fetchFromGitHub {
     owner = "bji";
diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix
index 1e5cdb389483..5b284e4408c6 100644
--- a/pkgs/development/libraries/libshout/default.nix
+++ b/pkgs/development/libraries/libshout/default.nix
@@ -4,10 +4,11 @@
 # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc
 
 stdenv.mkDerivation rec {
-  name = "libshout-2.4.5";
+  pname = "libshout";
+  version = "2.4.5";
 
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz";
+    url = "https://downloads.xiph.org/releases/libshout/${pname}-${version}.tar.gz";
     sha256 = "sha256-2eVoZopnOZTr4/HrXyvuBuMjal25K40MSH4cD4hqaJA=";
   };
 
diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix
index 6d874fe23678..37d1fcc9be79 100644
--- a/pkgs/development/libraries/libstatgrab/default.nix
+++ b/pkgs/development/libraries/libstatgrab/default.nix
@@ -2,10 +2,11 @@
 , IOKit ? null }:
 
 stdenv.mkDerivation rec {
-  name = "libstatgrab-0.92";
+  pname = "libstatgrab";
+  version = "0.92";
 
   src = fetchurl {
-    url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz";
+    url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${pname}-${version}.tar.gz";
     sha256 = "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav";
   };
 
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 5e1c0c671d90..6c2cb095a818 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -15,12 +15,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libvirt-glib-4.0.0";
+  pname = "libvirt-glib";
+  version = "4.0.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "https://libvirt.org/sources/glib/${name}.tar.xz";
+    url = "https://libvirt.org/sources/glib/${pname}-${version}.tar.xz";
     sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0=";
   };
 
diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix
index 90914d4186ea..066dcb4f34f4 100644
--- a/pkgs/development/libraries/libvterm/default.nix
+++ b/pkgs/development/libraries/libvterm/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "libvterm-0.99.7";
+  pname = "libvterm";
+  version = "0.99.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libvterm/${name}.tar.gz";
+    url = "mirror://sourceforge/libvterm/${pname}-${version}.tar.gz";
     sha256 = "10gaqygmmwp0cwk3j8qflri5caf8vl3f7pwfl2svw5whv8wkn0k2";
   };
 
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index cf85d57a7f20..bf0df220935c 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge }:
 
 stdenv.mkDerivation rec {
-  name = "libwpg-0.3.3";
+  pname = "libwpg";
+  version = "0.3.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libwpg/${name}.tar.xz";
+    url = "mirror://sourceforge/libwpg/${pname}-${version}.tar.xz";
     sha256 = "074x159immf139szkswv2zapnq75p7xk10dbha2p9193hgwggcwr";
   };
 
diff --git a/pkgs/development/libraries/libx86/src-for-default.nix b/pkgs/development/libraries/libx86/src-for-default.nix
index a681d9e58902..b7e432d8109c 100644
--- a/pkgs/development/libraries/libx86/src-for-default.nix
+++ b/pkgs/development/libraries/libx86/src-for-default.nix
@@ -1,9 +1,7 @@
 rec {
+   pname="libx86";
    version="1.1";
-   name="libx86-1.1";
    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";
-
-
+   advertisedUrl="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz";
 }
diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix
index d78bb1a7d946..47dfcab5a499 100644
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/pkgs/development/libraries/libxmp/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libxmp-4.5.0";
+  pname = "libxmp";
+  version = "4.5.0";
 
   meta = with lib; {
     description = "Extended module player library";
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz";
+    url = "mirror://sourceforge/xmp/libxmp/${pname}-${version}.tar.gz";
     sha256 = "sha256-eEfSYhEtFOhEL0TlrG7Z3bylTCUShHILVjyFKzHybnU=";
   };
 }
diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix
index 52d294525a0c..7997fc18d111 100644
--- a/pkgs/development/libraries/mysocketw/default.nix
+++ b/pkgs/development/libraries/mysocketw/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, openssl }:
 
-stdenv.mkDerivation {
-  name = "mysocketw-031026";
+stdenv.mkDerivation rec {
+  pname = "mysocketw";
+  version = "031026";
   src = fetchurl {
-    url = "http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz";
+    url = "https://www.digitalfanatics.org/cal/socketw/files/SocketW${version}.tar.gz";
     sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4";
   };
 
diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix
index 22161e3dc1d6..ab674833ebfc 100644
--- a/pkgs/development/libraries/nvidia-video-sdk/default.nix
+++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, unzip }:
 
-stdenv.mkDerivation {
-  name = "nvidia-video-sdk-6.0.1";
+stdenv.mkDerivation rec {
+  pname = "nvidia-video-sdk";
+  version = "6.0.1";
 
   src = fetchurl {
     url = "https://developer.nvidia.com/video-sdk-601";
-    name = "nvidia_video_sdk_6.0.1.zip";
+    name = "nvidia_video_sdk_${version}.zip";
     sha256 = "08h1vnqsv22js9v3pyim5yb80z87baxb7s2g5gsvvjax07j7w8h5";
   };
 
diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix
index 7a1c39715797..da95f9ef698c 100644
--- a/pkgs/development/libraries/plib/default.nix
+++ b/pkgs/development/libraries/plib/default.nix
@@ -2,11 +2,12 @@
 , libXi, libSM, libXmu, libXext, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "plib-1.8.5";
+  pname = "plib";
+  version = "1.8.5";
 
   src = fetchurl {
     # XXX: The author doesn't use the orthodox SF way to store tarballs.
-    url = "http://plib.sourceforge.net/dist/${name}.tar.gz";
+    url = "http://plib.sourceforge.net/dist/${pname}-${version}.tar.gz";
     sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8";
   };
 
diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index efa68146e8d8..bf0f8a7388de 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, alsa-lib, pkg-config, libjack2
 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }:
 
-stdenv.mkDerivation {
-  name = "portaudio-190600-20161030";
+stdenv.mkDerivation rec {
+  pname = "portaudio";
+  version = "190600-20161030";
 
   src = fetchurl {
-    url = "http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz";
+    url = "http://www.portaudio.com/archives/pa_stable_v${lib.replaceStrings ["-"] ["_"] version}.tgz";
     sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm";
   };
 
diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix
index 82ee5c3ae44d..c1a86b1f3979 100644
--- a/pkgs/development/libraries/psqlodbc/default.nix
+++ b/pkgs/development/libraries/psqlodbc/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libiodbc, postgresql, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "psqlodbc-09.01.0200";
+  pname = "psqlodbc";
+  version = "09.01.0200";
 
   src = fetchurl {
-    url = "https://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
+    url = "https://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz";
     sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9";
   };
 
diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix
index 0ff6db175611..edab4037a154 100644
--- a/pkgs/development/libraries/sbc/default.nix
+++ b/pkgs/development/libraries/sbc/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "sbc-1.4";
+  pname = "sbc";
+  version = "1.4";
 
   src = fetchurl {
-    url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz";
+    url = "https://www.kernel.org/pub/linux/bluetooth/${pname}-${version}.tar.xz";
     sha256 = "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si";
   };
 
diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix
index b75ac06627fb..2a832fc7c37a 100644
--- a/pkgs/development/libraries/science/biology/EBTKS/default.nix
+++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "EBTKS";
-  name  = "${pname}-2017-09-23";
+  version  = "unstable-2017-09-23";
 
   src = fetchFromGitHub {
     owner  = "BIC-MNI";
diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix
index 20c5a2070a05..3c194648c2a3 100644
--- a/pkgs/development/libraries/science/math/liblbfgs/default.nix
+++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
-stdenv.mkDerivation {
-  name = "liblbfgs-1.10";
+stdenv.mkDerivation rec {
+  pname = "liblbfgs";
+  version = "1.10";
 
   configureFlags = [ "--enable-sse2" ];
   src = fetchurl {
-    url = "https://github.com/downloads/chokkan/liblbfgs/liblbfgs-1.10.tar.gz";
+    url = "https://github.com/downloads/chokkan/liblbfgs/liblbfgs-${version}.tar.gz";
     sha256 = "1kv8d289rbz38wrpswx5dkhr2yh4fg4h6sszkp3fawxm09sann21";
   };
 
diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix
index b06b432372a7..da79f6d62499 100644
--- a/pkgs/development/libraries/science/math/metis/default.nix
+++ b/pkgs/development/libraries/science/math/metis/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, unzip, cmake }:
 
-stdenv.mkDerivation {
-  name = "metis-5.1.0";
+stdenv.mkDerivation rec {
+  name = "metis";
+  version = "5.1.0";
 
   src = fetchurl {
-    url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz";
+    url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-${version}.tar.gz";
     sha256 = "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn";
   };
 
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index 0fcb4884de5c..f6b9194a608c 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -2,15 +2,16 @@
 
 assert stdenv ? cc && stdenv.cc.libc != null;
 
-stdenv.mkDerivation {
-  name = "scmccid-5.0.11";
+stdenv.mkDerivation rec {
+  pname = "scmccid";
+  version = "5.0.11";
 
   src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
-      url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux.tar.gz";
+      url = "http://www.scmmicro.com/support/download/scmccid_${version}_linux.tar.gz";
       sha256 = "1r5wkarhzl09ncgj55baizf573czw0nplh1pgddzx9xck66kh5bm";
     })
     else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
-        url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux_x64.tar.gz";
+        url = "http://www.scmmicro.com/support/download/scmccid_${version}_linux_x64.tar.gz";
         sha256 = "0k9lzlk01sl4ycfqgrqqy3bildz0mcr1r0kkicgjz96l4s0jgz0i";
     })
     else throw "Architecture not supported";
diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix
index 9973e04a670b..56c4eccf434c 100644
--- a/pkgs/development/libraries/slib/default.nix
+++ b/pkgs/development/libraries/slib/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, unzip, scheme, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "slib-3b5";
+  pname = "slib";
+  version = "3b5";
 
   src = fetchurl {
-    url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip";
+    url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${pname}-${version}.zip";
     sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq";
   };
 
diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix
index c9debd36110e..46520714c510 100644
--- a/pkgs/development/libraries/soprano/default.nix
+++ b/pkgs/development/libraries/soprano/default.nix
@@ -2,10 +2,11 @@
 , pkg-config }:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.9.4";
+  pname = "soprano";
+  version = "2.9.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/soprano/${name}.tar.bz2";
+    url = "mirror://sourceforge/soprano/${pname}-${version}.tar.bz2";
     sha256 = "1rg0x7yg0a1cbnxz7kqk52580wla8jbnj4d4r3j7l7g7ajyny1k4";
   };
 
diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix
index e515dd1673fa..9ac026ee94b8 100644
--- a/pkgs/development/libraries/tre/default.nix
+++ b/pkgs/development/libraries/tre/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, fetchpatch}:
 
 stdenv.mkDerivation rec {
-  name = "tre-0.8.0";
+  pname = "tre";
+  version = "0.8.0";
   src = fetchurl {
-    url = "https://laurikari.net/tre/${name}.tar.gz";
+    url = "https://laurikari.net/tre/${pname}-${version}.tar.gz";
     sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my";
   };
 
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index 7cfd9f1edf5c..7306243bca9d 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -10,10 +10,11 @@ assert xor (openssl != null) (gnutls != null);
 assert !(xor (openssl != null) (zlib != null));
 
 stdenv.mkDerivation rec {
-  name = "ucommon-7.0.0";
+  pname = "ucommon";
+  version = "7.0.0";
 
   src = fetchurl {
-    url = "mirror://gnu/commoncpp/${name}.tar.gz";
+    url = "mirror://gnu/commoncpp/${pname}-${version}.tar.gz";
     sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7";
   };
 
diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix
index 0235912ce539..5c3140a177c3 100644
--- a/pkgs/development/libraries/vcdimager/default.nix
+++ b/pkgs/development/libraries/vcdimager/default.nix
@@ -2,10 +2,11 @@
 , libiconv, darwin }:
 
 stdenv.mkDerivation rec {
-  name = "vcdimager-2.0.1";
+  pname = "vcdimager";
+  version = "2.0.1";
 
   src = fetchurl {
-    url = "mirror://gnu/vcdimager/${name}.tar.gz";
+    url = "mirror://gnu/vcdimager/${pname}-${version}.tar.gz";
     sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7";
   };
 
diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix
index 6858cd93ab36..d87adabf56c6 100644
--- a/pkgs/development/libraries/vxl/default.nix
+++ b/pkgs/development/libraries/vxl/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
 stdenv.mkDerivation {
-  name = "vxl-1.17.0-nix1";
+  pname = "vxl";
+  version = "1.17.0-nix1";
 
   src = fetchFromGitHub {
     owner = "vxl";
diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix
index db36c2a34c15..dd5cd21d405f 100644
--- a/pkgs/development/libraries/xbase/default.nix
+++ b/pkgs/development/libraries/xbase/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "xbase-3.1.2";
+stdenv.mkDerivation rec {
+  pname = "xbase";
+  version = "3.1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xdb/xbase64-3.1.2.tar.gz";
+    url = "mirror://sourceforge/xdb/xbase64-${version}.tar.gz";
     sha256 = "17287kz1nmmm64y7zp9nhhl7slzlba09h6cc83w4mvsqwd9w882r";
   };
 

From c72ab3a8cd1292a8a41f696d053cc0ede0676a80 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 27 Jun 2021 17:07:58 +0200
Subject: [PATCH 048/330] python3Packages.watchdog: 2.1.2 -> 2.1.3

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

diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index e5d742bef28d..921ed5af4aa1 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "watchdog";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-AjfbTZAkhZvqJ9DvtZ/nXu8pCDP9mIuOrXqHmwMIwts=";
+    sha256 = "sha256-5SNqjoYCq220uHNmTC01bDZas8rJb73sSXCtYWQV3UU=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

From 2a9896e06545e2f4a7210d52b27d24729a1ac822 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 2 Jul 2021 16:33:32 +0200
Subject: [PATCH 049/330] libdrm: 2.4.106 -> 2.4.107

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

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index ca90750b8c24..c5bf352ff578 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdrm";
-  version = "2.4.106";
+  version = "2.4.107";
 
   src = fetchurl {
     url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "1m3vwpabjg3az84vmyxi96jyd7rrqm6qkhk1gq41w5wv89aarn4j";
+    sha256 = "127qf1rzhaf13vdd75a58v5q34617hvangjlfnlkcdh37gqcwm65";
   };
 
   outputs = [ "out" "dev" "bin" ];

From 33f09f4713490d075f043dfe6eb9f66464e29555 Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Fri, 2 Jul 2021 18:08:09 +0300
Subject: [PATCH 050/330] glibc: use `--enable-static-pie` only on supported
 platforms

glibc fails to build for armv7l without this change.
---
 pkgs/development/libraries/glibc/common.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 93f8f7a8641d..7725a3e4bf2e 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -153,10 +153,15 @@ stdenv.mkDerivation ({
       "--enable-add-ons"
       "--sysconfdir=/etc"
       "--enable-stackguard-randomization"
-      "--enable-static-pie"
       "--enable-bind-now"
       (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include")
       (lib.enableFeature profilingLibraries "profile")
+    ] ++ lib.optionals (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isAarch64) [
+      # This feature is currently supported on
+      # i386, x86_64 and x32 with binutils 2.29 or later,
+      # and on aarch64 with binutils 2.30 or later.
+      # https://sourceware.org/glibc/wiki/PortStatus
+      "--enable-static-pie"
     ] ++ lib.optionals withLinuxHeaders [
       "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
     ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

From dc98b9aa7dad17274b7df45c1a5b705607195d07 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Mon, 21 Jun 2021 22:00:46 +0200
Subject: [PATCH 051/330] gstreamer: support cross by disabling introspection

---
 pkgs/development/libraries/gstreamer/bad/default.nix         | 2 ++
 pkgs/development/libraries/gstreamer/base/default.nix        | 2 ++
 pkgs/development/libraries/gstreamer/core/default.nix        | 2 ++
 pkgs/development/libraries/gstreamer/devtools/default.nix    | 2 ++
 pkgs/development/libraries/gstreamer/ges/default.nix         | 2 ++
 pkgs/development/libraries/gstreamer/rtsp-server/default.nix | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index faf38a1a05fb..5723323defd6 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -292,6 +292,8 @@ stdenv.mkDerivation rec {
     # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`,
     # but its meson build system does not declare the dependency.
     "-Dapplemedia=disabled"
+  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-Dintrospection=disabled"
   ];
 
   # Argument list too long
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 699f70a0788a..3e00050ada2f 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -105,6 +105,8 @@ stdenv.mkDerivation rec {
     "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing
     # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
     "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}"
+  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-Dintrospection=disabled"
   ]
   ++ lib.optional (!enableX11) "-Dx11=disabled"
   # TODO How to disable Wayland?
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 2d43a02725f9..9cc1675de3ae 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -76,6 +76,8 @@ stdenv.mkDerivation rec {
     "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those
     "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
     "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
+  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-Dintrospection=disabled"
   ] ++ lib.optionals stdenv.isDarwin [
     # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it.
     "-Dlibunwind=disabled"
diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix
index 517fe9b302d3..12cb6dac6f31 100644
--- a/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -51,6 +51,8 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
+  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-Dintrospection=disabled"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 6ada053ea012..840b0f252857 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -59,6 +59,8 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
+  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-Dintrospection=disabled"
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 56596960019b..d66376b64996 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -54,6 +54,8 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
     "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
+  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-Dintrospection=disabled"
   ];
 
   postPatch = ''

From 273d8ab1b57763c8d753589b9ba16a94975efbf0 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Thu, 8 Apr 2021 22:56:41 +0200
Subject: [PATCH 052/330] startup-notification: fix cross compilation

assume that realloc implementation is always sane when cross-compiling

according to gnu standards this should be ok, so let's just hardcode
this and hope for the best.
---
 pkgs/development/libraries/startup-notification/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix
index f334bb2f35a4..9f330f3f32f8 100644
--- a/pkgs/development/libraries/startup-notification/default.nix
+++ b/pkgs/development/libraries/startup-notification/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation {
     sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";
   };
 
+  configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [
+    "lf_cv_sane_realloc=yes"
+  ];
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libX11 libxcb xcbutil ];
 

From c5a562e8bd8743b08cedadd92cf95ab6c31a85c1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 3 Jul 2021 14:46:47 +0200
Subject: [PATCH 053/330] python3Packages.markupsafe: update pname

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

diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix
index d48359af0fc3..12845da7e37a 100644
--- a/pkgs/development/python-modules/markupsafe/default.nix
+++ b/pkgs/development/python-modules/markupsafe/default.nix
@@ -6,12 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  pname = "MarkupSafe";
+  pname = "markupsafe";
   version = "2.0.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "MarkupSafe";
+    inherit version;
     sha256 = "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r";
   };
 
@@ -19,11 +20,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  pythonImportsCheck = [ "markupsafe" ];
+
   meta = with lib; {
     description = "Implements a XML/HTML/XHTML Markup safe string";
-    homepage = "http://dev.pocoo.org";
+    homepage = "https://palletsprojects.com/p/markupsafe/";
     license = licenses.bsd3;
     maintainers = with maintainers; [ domenkozar ];
   };
-
 }

From f7997354b7ad18f68a80e2bb9b670f71d0667dbf Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 3 Jul 2021 17:02:23 +0200
Subject: [PATCH 054/330] wayland-scanner: use for nativeBuildInputs

This makes things more explicit (and less confusing) but only touches
the packages that I maintain.
---
 pkgs/applications/networking/remote/wayvnc/default.nix | 4 ++--
 pkgs/applications/video/wf-recorder/default.nix        | 9 +++++----
 pkgs/applications/window-managers/cage/default.nix     | 6 +++---
 pkgs/applications/window-managers/sway/default.nix     | 6 +++---
 pkgs/applications/window-managers/tinywl/default.nix   | 6 +++---
 pkgs/applications/window-managers/weston/default.nix   | 6 +++---
 pkgs/development/libraries/libva/default.nix           | 6 +++---
 pkgs/development/libraries/libxkbcommon/default.nix    | 3 ++-
 pkgs/development/libraries/mesa/default.nix            | 4 ++--
 pkgs/tools/wayland/wayland-utils/default.nix           | 4 ++--
 pkgs/tools/wayland/wev/default.nix                     | 5 +++--
 pkgs/tools/wayland/wlsunset/default.nix                | 7 ++++---
 pkgs/tools/wayland/wob/default.nix                     | 9 +++++----
 pkgs/tools/wayland/wshowkeys/default.nix               | 8 ++++----
 14 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix
index 3e2231c10e82..f5641c762ecb 100644
--- a/pkgs/applications/networking/remote/wayvnc/default.nix
+++ b/pkgs/applications/networking/remote/wayvnc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc
+{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc, wayland-scanner
 , pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0q48fgh6gf3jicy4bk3kq18h9lhqfq9qz32ri6j9ffvbb8mcw64s";
   };
 
-  nativeBuildInputs = [ meson pkg-config ninja scdoc wayland ];
+  nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ];
   buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam ];
 
   meta = with lib; {
diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix
index 0b8d1ad22b9f..18b35c0d398b 100644
--- a/pkgs/applications/video/wf-recorder/default.nix
+++ b/pkgs/applications/video/wf-recorder/default.nix
@@ -1,5 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc
-, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers
+{ lib, stdenv, fetchFromGitHub
+, meson, ninja, pkg-config, scdoc, wayland-scanner
+, wayland, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers
 }:
 
 stdenv.mkDerivation rec {
@@ -13,9 +14,9 @@ stdenv.mkDerivation rec {
     sha256 = "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ];
+  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ];
   buildInputs = [
-    wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers
+    wayland wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix
index 7aabdf271970..963f86768832 100644
--- a/pkgs/applications/window-managers/cage/default.nix
+++ b/pkgs/applications/window-managers/cage/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub
-, meson, ninja, pkg-config, wayland, scdoc, makeWrapper
-, wlroots, wayland-protocols, pixman, libxkbcommon
+, meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper
+, wlroots, wayland, wayland-protocols, pixman, libxkbcommon
 , systemd, libGL, libX11, mesa
 , xwayland ? null
 , nixosTests
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "0vm96gxinhy48m3x9p1sfldyd03w3gk6iflb7n9kn06j1vqyswr6";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];
+  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc makeWrapper ];
 
   buildInputs = [
     wlroots wayland wayland-protocols pixman libxkbcommon
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 4e91c35146f0..92de633f0fa8 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, substituteAll, swaybg
-, meson, ninja, pkg-config, wayland, scdoc
-, libxkbcommon, pcre, json_c, dbus, libevdev
+, meson, ninja, pkg-config, wayland-scanner, scdoc
+, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
 , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
 , wlroots, wayland-protocols, libdrm
 , nixosTests
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    meson ninja pkg-config wayland scdoc
+    meson ninja pkg-config wayland-scanner scdoc
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/window-managers/tinywl/default.nix b/pkgs/applications/window-managers/tinywl/default.nix
index ea8a92615a46..965ec67b6e94 100644
--- a/pkgs/applications/window-managers/tinywl/default.nix
+++ b/pkgs/applications/window-managers/tinywl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, wlroots, pkg-config
+{ lib, stdenv, wlroots, pkg-config, wayland-scanner
 , libxkbcommon, pixman, udev, wayland, wayland-protocols
 }:
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
 
   sourceRoot = "source/tinywl";
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config wayland-scanner ];
   buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ];
 
   installPhase = ''
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://github.com/swaywm/wlroots/tree/master/tinywl";
-    description = ''"minimum viable product" Wayland compositor based on wlroots.'';
+    description = ''A "minimum viable product" Wayland compositor based on wlroots'';
     maintainers = with maintainers; [ qyliss ];
     license = licenses.cc0;
     inherit (wlroots.meta) platforms;
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 3a11444bcf44..598e78be2643 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland
-, libGL, mesa, libxkbcommon, cairo, libxcb
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner
+, wayland, libGL, mesa, libxkbcommon, cairo, libxcb
 , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
 , colord, lcms2, pipewire ? null
 , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config wayland ];
+  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
   buildInputs = [
     wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
     mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 32ecc34a2874..1eee4b3870bc 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, meson, pkg-config, ninja, wayland
+{ stdenv, lib, fetchFromGitHub, meson, pkg-config, ninja, wayland-scanner
 , libdrm
 , minimal ? false, libva-minimal
-, libX11, libXext, libXfixes, libffi, libGL
+, libX11, libXext, libXfixes, wayland, libffi, libGL
 , mesa
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" ];
 
-  nativeBuildInputs = [ meson pkg-config ninja wayland ];
+  nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ];
 
   buildInputs = [ libdrm ]
     ++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ];
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index b738089c853f..8bec962c0aea 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -16,6 +16,7 @@
 , withWaylandTools ? stdenv.isLinux
 , wayland
 , wayland-protocols
+, wayland-scanner
 }:
 
 stdenv.mkDerivation rec {
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ pkg-config ];
   nativeBuildInputs = [ meson ninja pkg-config bison doxygen ]
-    ++ lib.optional withWaylandTools wayland;
+    ++ lib.optional withWaylandTools wayland-scanner;
   buildInputs = [ xkeyboard_config libxcb libxml2 ]
     ++ lib.optionals withWaylandTools [ wayland wayland-protocols ];
   checkInputs = [ python3 ];
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index aaa78de47f75..c24444ee6aab 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, fetchpatch, buildPackages
 , meson, pkg-config, ninja
-, intltool, bison, flex, file, python3Packages
+, intltool, bison, flex, file, python3Packages, wayland-scanner
 , expat, libdrm, xorg, wayland, wayland-protocols, openssl
 , llvmPackages, libffi, libomxil-bellagio, libva-minimal
 , libelf, libvdpau
@@ -143,7 +143,7 @@ self = stdenv.mkDerivation {
     intltool bison flex file
     python3Packages.python python3Packages.Mako
   ] ++ lib.optionals (elem "wayland" eglPlatforms) [
-    wayland # For wayland-scanner during the build
+    wayland-scanner
   ];
 
   propagatedBuildInputs = with xorg; [
diff --git a/pkgs/tools/wayland/wayland-utils/default.nix b/pkgs/tools/wayland/wayland-utils/default.nix
index 5c07081099c6..16bce1723aa6 100644
--- a/pkgs/tools/wayland/wayland-utils/default.nix
+++ b/pkgs/tools/wayland/wayland-utils/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl
-, meson, pkg-config, ninja
+, meson, pkg-config, ninja, wayland-scanner
 , wayland, wayland-protocols
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1h38l850ww6hxjb1l8iwa33nkbz8q88bw6lh0aryjyp8b16crzk4";
   };
 
-  nativeBuildInputs = [ meson pkg-config ninja wayland ];
+  nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ];
   buildInputs = [ wayland wayland-protocols ];
 
   meta = with lib; {
diff --git a/pkgs/tools/wayland/wev/default.nix b/pkgs/tools/wayland/wev/default.nix
index 69288a1bc8ce..d04cee342b7e 100644
--- a/pkgs/tools/wayland/wev/default.nix
+++ b/pkgs/tools/wayland/wev/default.nix
@@ -3,6 +3,7 @@
 , fetchFromSourcehut
 , pkg-config
 , scdoc
+, wayland-scanner
 , wayland
 , wayland-protocols
 , libxkbcommon
@@ -19,8 +20,8 @@ stdenv.mkDerivation rec {
     sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms";
   };
 
-  nativeBuildInputs = [ pkg-config scdoc wayland ];
-  buildInputs = [ wayland-protocols libxkbcommon ];
+  nativeBuildInputs = [ pkg-config scdoc wayland-scanner ];
+  buildInputs = [ wayland wayland-protocols libxkbcommon ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/tools/wayland/wlsunset/default.nix
index 3572f63f57e5..7ced81616f63 100644
--- a/pkgs/tools/wayland/wlsunset/default.nix
+++ b/pkgs/tools/wayland/wlsunset/default.nix
@@ -1,5 +1,6 @@
-{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, ninja, wayland, scdoc
-, wayland-protocols
+{ lib, stdenv, fetchFromSourcehut
+, meson, pkg-config, ninja, wayland-scanner, scdoc
+, wayland, wayland-protocols
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0hhsddh3rs066rbsjksr8kcwg8lvglbvs67dq0r5wx5c1xcwb51w";
   };
 
-  nativeBuildInputs = [ meson pkg-config ninja wayland scdoc ];
+  nativeBuildInputs = [ meson pkg-config ninja wayland-scanner scdoc ];
   buildInputs = [ wayland wayland-protocols ];
 
   meta = with lib; {
diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix
index 3567ed6eea41..07fd6f433d73 100644
--- a/pkgs/tools/wayland/wob/default.nix
+++ b/pkgs/tools/wayland/wob/default.nix
@@ -5,9 +5,10 @@
 , ninja
 , pkg-config
 , scdoc
-, libseccomp
-, wayland # wayland-scanner
+, wayland-scanner
+, wayland
 , wayland-protocols
+, libseccomp
 }:
 
 stdenv.mkDerivation rec {
@@ -21,8 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ];
-  buildInputs = [ wayland-protocols ]
+  nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
+  buildInputs = [ wayland wayland-protocols ]
     ++ lib.optional stdenv.isLinux libseccomp;
 
   mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled";
diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/tools/wayland/wshowkeys/default.nix
index 5f0025d6072b..3a0d00b8197b 100644
--- a/pkgs/tools/wayland/wshowkeys/default.nix
+++ b/pkgs/tools/wayland/wshowkeys/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromSourcehut
-, meson, pkg-config, wayland, ninja
-, cairo, libinput, pango, wayland-protocols, libxkbcommon
+, meson, pkg-config, wayland-scanner, ninja
+, cairo, libinput, pango, wayland, wayland-protocols, libxkbcommon
 }:
 
 let
@@ -17,8 +17,8 @@ in stdenv.mkDerivation rec {
     sha256 = "10kafdja5cwbypspwhvaxjz3hvf51vqjzbgdasl977193cvxgmbs";
   };
 
-  nativeBuildInputs = [ meson pkg-config wayland ninja ];
-  buildInputs = [ cairo libinput pango wayland-protocols libxkbcommon ];
+  nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ];
+  buildInputs = [ cairo libinput pango wayland wayland-protocols libxkbcommon ];
 
   meta = with lib; {
     description = "Displays keys being pressed on a Wayland session";

From 392bca4c589ebb489d8f608c5842fddd45054d28 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Fri, 2 Jul 2021 15:44:25 +0200
Subject: [PATCH 055/330] expat: Fix cmake config files

Header & library path constructions in CMake modules expect them to reside under the same prefix as the CMake files.
This assumption doesn't work with our multiple outputs so we patch the library path to the correct output.

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
---
 pkgs/development/libraries/expat/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index fe30b701ed0c..3bfc215aea7b 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -27,6 +27,13 @@ stdenv.mkDerivation rec {
     patchShebangs ./configure ./run.sh ./test-driver-wrapper.sh
   '';
 
+  # CMake files incorrectly calculate library path from dev prefix
+  # https://github.com/libexpat/libexpat/issues/501
+  postFixup = ''
+    substituteInPlace $dev/lib/cmake/expat-${version}/expat-noconfig.cmake \
+      --replace "$"'{_IMPORT_PREFIX}' $out
+  '';
+
   meta = with lib; {
     homepage = "https://libexpat.github.io/";
     description = "A stream-oriented XML parser library written in C";

From 74af05601cdb974899f292f07d2c2f83e25fc062 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 3 Jul 2021 17:53:26 -0400
Subject: [PATCH 056/330] Revert "opencolorio: combine `dev` and `out` outputs
 of expat when building"

This reverts commit 7d82e18159f0e3d3655cda8f2c162a0d33d6c0fb.
---
 pkgs/development/libraries/opencolorio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index b93e517def66..522c8cfa4a13 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv, lib, fetchFromGitHub, symlinkJoin,
+  stdenv, lib, fetchFromGitHub,
   cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies
 
   glew, freeglut, # Only required on Linux
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
     sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487";
   };
 
-  nativeBuildInputs = [ cmake (symlinkJoin { name = "expat"; paths = [ expat.out expat.dev ]; }) ];
-  buildInputs = [ expat.out libyamlcpp ilmbase pystring ]
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ expat libyamlcpp ilmbase pystring ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ]
     ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ]

From 6cc62b18435d4413b00061baa49d5d1a73373084 Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Sat, 3 Jul 2021 18:50:36 -0700
Subject: [PATCH 057/330] shared-mime-info: strictdeps (#128803)

---
 pkgs/data/misc/shared-mime-info/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 63b8467e6cc5..416bf0095188 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -39,16 +39,16 @@ stdenv.mkDerivation rec {
     pkg-config
     gettext
     itstool
-  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     libxml2
-    shared-mime-info
-  ];
+  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) shared-mime-info;
 
   buildInputs = [
     libxml2
     glib
   ];
 
+  strictDeps = true;
+
   mesonFlags = [
     "-Dupdate-mimedb=true"
   ];

From 2913a89cd3084b16f9ea5edcaa0e5464c8899f89 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 4 Jul 2021 23:47:58 +0200
Subject: [PATCH 058/330] python3Packages.urllib3: 1.26.5 -> 1.26.6

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

diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index 6d73357e3bc2..1c25612a16d9 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -19,11 +19,11 @@
 
 buildPythonPackage rec {
   pname = "urllib3";
-  version = "1.26.5";
+  version = "1.26.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-p6zQl3ElMl9Ra9qXNfpxQrkJqNAeiy5MgQjQmE5uAJg=";
+    sha256 = "sha256-9XtMFsYvonYLfj2Xw1slVRL7a1miWXMPNroyzp+ONC8=";
   };
 
   propagatedBuildInputs = [

From 406479e52dfc801bdcccc00410c5dc3ee0f79e17 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jul 2021 02:58:33 +0000
Subject: [PATCH 059/330] librsvg: 2.50.6 -> 2.50.7

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

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index c5e4b6e82152..05b7a00be590 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "librsvg";
-  version = "2.50.6";
+  version = "2.50.7";
 
   outputs = [ "out" "dev" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "iAdJGZOoevVgxdP1I7jUpLugxQilYPH5NxdytRR3rFc=";
+    sha256 = "//thsIzVKCqq4UegKzBRZqdCb60iqLlCdwjw8vxCbrw=";
   };
 
   nativeBuildInputs = [

From ae8dd3c149b4d49e683f1414d417801b80b283e2 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 5 Jul 2021 13:59:30 +0300
Subject: [PATCH 060/330] ffmpeg_4: fix incorrect segment length in hls

---
 pkgs/development/libraries/ffmpeg/4.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index df3d0732393e..d557c87ebdf6 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -2,6 +2,7 @@
 # Darwin frameworks
 , Cocoa, CoreMedia, VideoToolbox
 , stdenv, lib
+, fetchpatch
 , ...
 }@args:
 
@@ -11,7 +12,18 @@ callPackage ./generic.nix (rec {
   sha256 = "03kxc29y8190k4y8s8qdpsghlbpmchv1m8iqygq2qn0vfm4ka2a2";
   darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
 
-  /* Work around https://trac.ffmpeg.org/ticket/9242 */
-  patches = lib.optional stdenv.isDarwin
-    ./v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch;
+  patches = [
+    # Fix incorrect segment length in HLS child playlist with fmp4 segment format
+    # FIXME remove in version 4.5
+    # https://trac.ffmpeg.org/ticket/9193
+    # https://trac.ffmpeg.org/ticket/9205
+    (fetchpatch {
+      name = "ffmpeg_fix_incorrect_segment_length_in_hls.patch";
+      url = "https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=59032494e81a1a65c0b960aaae7ec4c2cc9db35a";
+      sha256 = "03zz1lw51kkc3g3vh47xa5hfiz3g3g1rbrll3kcnslvwylmrqmy3";
+    })
+  ] ++ lib.optionals stdenv.isDarwin [
+    # Work around https://trac.ffmpeg.org/ticket/9242
+    ./v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch
+  ];
 } // args)

From fd5e084113897f56a6d8c7d3988ce832040d754a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jul 2021 18:28:19 +0000
Subject: [PATCH 061/330] gallery-dl: 1.18.0 -> 1.18.1

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

diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index 5cfca0b4a2bb..b617e7b2ea19 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonApplication rec {
   pname = "gallery_dl";
-  version = "1.18.0";
+  version = "1.18.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a0658cd2b629ec5b24b9a893056ce7224088ee5eb760f30642131a8df0279131";
+    sha256 = "1e231ed7122a753430d92f8c6240a99defa2b307d57f1a4cc3e48910269331a9";
   };
 
   propagatedBuildInputs = [ requests ];

From 742b8f71f7e101bf3ecd48f28af9eda67591339e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 5 Jul 2021 21:15:43 +0200
Subject: [PATCH 062/330] libuv: add patch for CVE-2021-22918

> libuv was vulnerable to out-of-bounds reads in the uv__idna_toascii()
> function which is used to convert strings to ASCII. This is called by
> the DNS resolution function and can lead to information disclosures or
> crashes.

https://github.com/libuv/libuv/commit/b7466e31e4bee160d82a68fca11b1f61d46debae

Fixes: CVE-2021-22918
---
 pkgs/development/libraries/libuv/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 6b1a0120e49e..b630fca16701 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
   version = "1.41.0";
@@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-i6AYD1Ony0L2+3yWK6bxOfwoZEvd9qCg33QSqA7bRXI=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Fixes out-of-bounds read in uv__idna_toascii() function
+      name = "CVE-2021-22918.patch";
+      url = "https://github.com/libuv/libuv/commit/b7466e31e4bee160d82a68fca11b1f61d46debae.patch";
+      sha256 = "0fbjy0jh7r9nrd27ag1k6am6d8p5ih7p0ywvjn53nq4cyqdqxhi7";
+    })
+  ];
+
   postPatch = let
     toDisable = [
       "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent

From 94cd70bae26efc34350d53894992fbaf1b1f3c6f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 13 Mar 2021 15:31:22 +0100
Subject: [PATCH 063/330] python3: 3.8 -> 3.9

---
 doc/languages-frameworks/python.section.md    |  2 +-
 .../interpreters/python/default.nix           | 24 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 847a41cf23c3..cd34fb38ce06 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -8,7 +8,7 @@
 
 Several versions of the Python interpreter are available on Nix, as well as a
 high amount of packages. The attribute `python3` refers to the default
-interpreter, which is currently CPython 3.8. The attribute `python` refers to
+interpreter, which is currently CPython 3.9. The attribute `python` refers to
 CPython 2.7 for backwards-compatibility. It is also possible to refer to
 specific versions, e.g. `python38` refers to CPython 3.8, and `pypy` refers to
 the default PyPy interpreter.
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 507ad8d36cf3..176f8db4bff1 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -118,7 +118,7 @@ with pkgs;
   };
 
   sources = {
-    "python38" = {
+    python38 = {
       sourceVersion = {
         major = "3";
         minor = "8";
@@ -127,6 +127,15 @@ with pkgs;
       };
       sha256 = "1n8rjb3jn0j8dvi1qn94rxayc9rh982d8wgkrjy41n1x15k4mwka";
     };
+    python39 = {
+      sourceVersion = {
+        major = "3";
+        minor = "9";
+        patch = "5";
+        suffix = "";
+      };
+      sha256 = "10vdf46q5ldnzkprm8pldvr5a9hrdpxjv7mpzgdw6vj3cl318nhc";
+    };
   };
 
 in {
@@ -176,18 +185,11 @@ in {
     inherit passthruFun;
   } // sources.python38);
 
-  python39 = callPackage ./cpython {
+  python39 = callPackage ./cpython ({
     self = python39;
-    sourceVersion = {
-      major = "3";
-      minor = "9";
-      patch = "5";
-      suffix = "";
-    };
-    sha256 = "10vdf46q5ldnzkprm8pldvr5a9hrdpxjv7mpzgdw6vj3cl318nhc";
     inherit (darwin) configd;
     inherit passthruFun;
-  };
+  } // sources.python39);
 
   python310 = callPackage ./cpython {
     self = python310;
@@ -224,7 +226,7 @@ in {
     includeSiteCustomize = false;
     enableOptimizations = false;
     mimetypesSupport = false;
-  } // sources.python38)).overrideAttrs(old: {
+  } // sources.python39)).overrideAttrs(old: {
     pname = "python3-minimal";
     meta = old.meta // {
       maintainers = [];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c728c453b435..340a475cdb97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12500,7 +12500,7 @@ in
   # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md
   python = python2;
   python2 = python27;
-  python3 = python38;
+  python3 = python39;
   pypy = pypy2;
   pypy2 = pypy27;
   pypy3 = pypy36;

From 322eb3596bba26f4a6e3b618e4142ee2520157f0 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 25 May 2021 19:43:22 +0200
Subject: [PATCH 064/330] cpython: add enableNoSemanticInterposition flag

This flags enables the -fno-semantic-interposition compiler flag for all
our cpython builds by default. It can be disabled by overriding the
enableNoSemanticInterposition attribute.

This CFLAG has the impact that our python code runs up to 23% faster
than previously. See the pyperformance benchmark results below.

The only downside that exists is that we can no longer override
libpython symbols via LD_PRELOAD when calling the python interpreter. If
a user needs they can disable the newly introduced flag and use that
instead. However those situations should be rare.

The Fedora Project did the equivalent change in their Fedora 32 release
(and haven't reverted it yet). They wrote a nice [wiki page] about the
ups and downs of this change. I recommend reading that.

Benchmark results of running Python 3.9 before and after this change:

+-------------------------+---------------+--------------------+--------------+------------------------+
| Benchmark               | py39.nix.json | py39-nsip.nix.json | Change       | Significance           |
+=========================+===============+====================+==============+========================+
| 2to3                    | 666 ms        | 642 ms             | 1.04x faster | Significant (t=12.73)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| chameleon               | 15.0 ms       | 14.6 ms            | 1.03x faster | Significant (t=4.70)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| chaos                   | 198 ms        | 182 ms             | 1.09x faster | Significant (t=13.73)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| crypto_pyaes            | 185 ms        | 175 ms             | 1.06x faster | Significant (t=9.70)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| deltablue               | 12.3 ms       | 11.2 ms            | 1.10x faster | Significant (t=14.45)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| django_template         | 85.1 ms       | 82.0 ms            | 1.04x faster | Significant (t=6.61)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| dulwich_log             | 102 ms        | 101 ms             | 1.01x faster | Not significant        |
+-------------------------+---------------+--------------------+--------------+------------------------+
| fannkuch                | 670 ms        | 634 ms             | 1.06x faster | Significant (t=15.87)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| float                   | 182 ms        | 176 ms             | 1.03x faster | Significant (t=7.32)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| go                      | 393 ms        | 366 ms             | 1.07x faster | Significant (t=17.63)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| hexiom                  | 15.8 ms       | 14.9 ms            | 1.06x faster | Significant (t=13.81)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| json_dumps              | 19.3 ms       | 18.7 ms            | 1.03x faster | Significant (t=7.46)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| json_loads              | 38.4 us       | 37.9 us            | 1.01x faster | Not significant        |
+-------------------------+---------------+--------------------+--------------+------------------------+
| logging_format          | 15.0 us       | 14.2 us            | 1.05x faster | Significant (t=6.32)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| logging_silent          | 328 ns        | 305 ns             | 1.07x faster | Significant (t=8.85)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| logging_simple          | 13.8 us       | 13.0 us            | 1.06x faster | Significant (t=10.77)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| mako                    | 25.2 ms       | 24.7 ms            | 1.02x faster | Not significant        |
+-------------------------+---------------+--------------------+--------------+------------------------+
| meteor_contest          | 133 ms        | 130 ms             | 1.03x faster | Significant (t=3.59)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| nbody                   | 222 ms        | 201 ms             | 1.10x faster | Significant (t=26.85)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| nqueens                 | 161 ms        | 152 ms             | 1.06x faster | Significant (t=8.84)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| pathlib                 | 28.4 ms       | 26.3 ms            | 1.08x faster | Significant (t=11.85)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| pickle                  | 13.8 us       | 13.1 us            | 1.06x faster | Significant (t=10.84)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| pickle_dict             | 32.7 us       | 26.6 us            | 1.23x faster | Significant (t=32.43)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| pickle_list             | 4.39 us       | 4.34 us            | 1.01x faster | Not significant        |
+-------------------------+---------------+--------------------+--------------+------------------------+
| pickle_pure_python      | 782 us        | 738 us             | 1.06x faster | Significant (t=15.71)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| pidigits                | 184 ms        | 181 ms             | 1.01x faster | Not significant        |
+-------------------------+---------------+--------------------+--------------+------------------------+
| pyflate                 | 1.02 sec      | 959 ms             | 1.07x faster | Significant (t=21.13)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| python_startup          | 34.3 ms       | 34.0 ms            | 1.01x faster | Not significant        |
+-------------------------+---------------+--------------------+--------------+------------------------+
| python_startup_no_site  | 15.5 ms       | 15.3 ms            | 1.01x faster | Not significant        |
+-------------------------+---------------+--------------------+--------------+------------------------+
| raytrace                | 912 ms        | 849 ms             | 1.07x faster | Significant (t=11.21)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| regex_compile           | 273 ms        | 261 ms             | 1.05x faster | Significant (t=5.82)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| regex_dna               | 188 ms        | 187 ms             | 1.00x faster | Not significant        |
+-------------------------+---------------+--------------------+--------------+------------------------+
| regex_effbot            | 3.37 ms       | 3.66 ms            | 1.09x slower | Significant (t=-16.12) |
+-------------------------+---------------+--------------------+--------------+------------------------+
| regex_v8                | 29.8 ms       | 29.7 ms            | 1.01x faster | Not significant        |
+-------------------------+---------------+--------------------+--------------+------------------------+
| richards                | 119 ms        | 113 ms             | 1.05x faster | Significant (t=5.71)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| scimark_fft             | 625 ms        | 592 ms             | 1.06x faster | Significant (t=19.64)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| scimark_lu              | 273 ms        | 253 ms             | 1.08x faster | Significant (t=16.68)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| scimark_monte_carlo     | 186 ms        | 170 ms             | 1.10x faster | Significant (t=14.70)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| scimark_sor             | 330 ms        | 310 ms             | 1.07x faster | Significant (t=11.89)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| scimark_sparse_mat_mult | 9.03 ms       | 8.36 ms            | 1.08x faster | Significant (t=17.71)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| spectral_norm           | 247 ms        | 232 ms             | 1.06x faster | Significant (t=14.64)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| sqlalchemy_declarative  | 194 ms        | 185 ms             | 1.04x faster | Significant (t=4.80)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| sqlalchemy_imperative   | 28.2 ms       | 27.4 ms            | 1.03x faster | Significant (t=3.80)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| sqlite_synth            | 4.89 us       | 4.73 us            | 1.03x faster | Significant (t=10.60)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| sympy_expand            | 833 ms        | 813 ms             | 1.02x faster | Significant (t=4.82)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| sympy_integrate         | 33.0 ms       | 31.6 ms            | 1.05x faster | Significant (t=6.47)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| sympy_str               | 490 ms        | 477 ms             | 1.03x faster | Significant (t=7.58)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| sympy_sum               | 254 ms        | 245 ms             | 1.04x faster | Significant (t=7.82)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| telco                   | 11.6 ms       | 11.3 ms            | 1.03x faster | Significant (t=5.62)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| tornado_http            | 175 ms        | 172 ms             | 1.02x faster | Not significant        |
+-------------------------+---------------+--------------------+--------------+------------------------+
| unpack_sequence         | 51.4 ns       | 56.2 ns            | 1.09x slower | Significant (t=-2.40)  |
+-------------------------+---------------+--------------------+--------------+------------------------+
| unpickle                | 20.3 us       | 19.8 us            | 1.02x faster | Significant (t=4.09)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| unpickle_list           | 5.41 us       | 5.75 us            | 1.06x slower | Significant (t=-26.56) |
+-------------------------+---------------+--------------------+--------------+------------------------+
| unpickle_pure_python    | 544 us        | 524 us             | 1.04x faster | Significant (t=6.47)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| xml_etree_generate      | 154 ms        | 148 ms             | 1.04x faster | Significant (t=7.98)   |
+-------------------------+---------------+--------------------+--------------+------------------------+
| xml_etree_iterparse     | 130 ms        | 129 ms             | 1.01x faster | Not significant        |
+-------------------------+---------------+--------------------+--------------+------------------------+
| xml_etree_parse         | 178 ms        | 179 ms             | 1.00x slower | Not significant        |
+-------------------------+---------------+--------------------+--------------+------------------------+
| xml_etree_process       | 123 ms        | 118 ms             | 1.04x faster | Significant (t=10.22)  |
+-------------------------+---------------+--------------------+--------------+------------------------+

[wiki page]: https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup
---
 .../interpreters/python/cpython/default.nix         | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 6abdd3f2cc8e..e0b941e009d1 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -39,6 +39,8 @@
 , includeSiteCustomize ? true
 , static ? stdenv.hostPlatform.isStatic
 , enableOptimizations ? false
+# enableNoSemanticInterposition is a subset of the enableOptimizations flag that doesn't harm reproducibility.
+, enableNoSemanticInterposition ? true
 , reproducibleBuild ? true
 , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
 }:
@@ -327,6 +329,17 @@ in with passthru; stdenv.mkDerivation {
     export DETERMINISTIC_BUILD=1;
   '' + optionalString stdenv.hostPlatform.isMusl ''
     export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
+  '' +
+
+  # enableNoSemanticInterposition essentially sets that CFLAG -fno-semantic-interposition
+  # which changes how symbols are looked up. This essentially means we can't override
+  # libpython symbols via LD_PRELOAD anymore. This is common enough as every build
+  # that uses --enable-optimizations has the same "issue".
+  #
+  # The Fedora wiki has a good article about their journey towards enabling this flag:
+  # https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup
+  optionalString enableNoSemanticInterposition ''
+    export CFLAGS_NODIST="-fno-semantic-interposition"
   '';
 
   setupHook = python-setup-hook sitePackages;

From 1e47dd9cb847f57ec859c071d6c697270a53d1e7 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 25 May 2021 20:30:28 +0200
Subject: [PATCH 065/330] cpython: Enable LTO on all builds as it doesn't break
 reproducibility

LTO allows us to optimise the binaries we are shipping a bit further
than just with the regular -Ox and other compiler flags. It also is
deterministic and doesn't harm our reproducibility efforts while
providing us with up to 10% performance gain (and sometimes slightly
slower). See the table below for a comparsion of this version with the
Python 3.9 build that sets -fno-semantic-interposition.

+-------------------------+--------------------+------------------------+--------------+------------------------+
| Benchmark               | py39-nsip.nix.json | py39-nsip-lto.nix.json | Change       | Significance           |
+=========================+====================+========================+==============+========================+
| 2to3                    | 642 ms             | 620 ms                 | 1.03x faster | Significant (t=12.04)  |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| chameleon               | 14.6 ms            | 14.4 ms                | 1.02x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| chaos                   | 182 ms             | 182 ms                 | 1.00x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| crypto_pyaes            | 175 ms             | 172 ms                 | 1.02x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| deltablue               | 11.2 ms            | 11.2 ms                | 1.00x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| django_template         | 82.0 ms            | 81.4 ms                | 1.01x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| dulwich_log             | 101 ms             | 99.8 ms                | 1.01x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| fannkuch                | 634 ms             | 638 ms                 | 1.01x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| float                   | 176 ms             | 189 ms                 | 1.08x slower | Significant (t=-4.30)  |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| go                      | 366 ms             | 365 ms                 | 1.00x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| hexiom                  | 14.9 ms            | 15.1 ms                | 1.01x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| json_dumps              | 18.7 ms            | 18.5 ms                | 1.01x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| json_loads              | 37.9 us            | 37.3 us                | 1.02x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| logging_format          | 14.2 us            | 14.3 us                | 1.01x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| logging_silent          | 305 ns             | 313 ns                 | 1.02x slower | Significant (t=-3.91)  |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| logging_simple          | 13.0 us            | 13.2 us                | 1.01x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| mako                    | 24.7 ms            | 23.3 ms                | 1.06x faster | Significant (t=10.74)  |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| meteor_contest          | 130 ms             | 128 ms                 | 1.01x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| nbody                   | 201 ms             | 201 ms                 | 1.00x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| nqueens                 | 152 ms             | 154 ms                 | 1.01x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| pathlib                 | 26.3 ms            | 26.2 ms                | 1.01x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| pickle                  | 13.1 us            | 13.7 us                | 1.05x slower | Significant (t=-10.36) |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| pickle_dict             | 26.6 us            | 27.1 us                | 1.02x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| pickle_list             | 4.34 us            | 4.31 us                | 1.01x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| pickle_pure_python      | 738 us             | 759 us                 | 1.03x slower | Significant (t=-5.26)  |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| pidigits                | 181 ms             | 181 ms                 | 1.00x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| pyflate                 | 959 ms             | 974 ms                 | 1.02x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| python_startup          | 34.0 ms            | 31.4 ms                | 1.08x faster | Significant (t=29.75)  |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| python_startup_no_site  | 15.3 ms            | 14.5 ms                | 1.06x faster | Significant (t=17.58)  |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| raytrace                | 849 ms             | 846 ms                 | 1.00x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| regex_compile           | 261 ms             | 261 ms                 | 1.00x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| regex_dna               | 187 ms             | 221 ms                 | 1.18x slower | Significant (t=-46.94) |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| regex_effbot            | 3.66 ms            | 3.98 ms                | 1.09x slower | Significant (t=-18.55) |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| regex_v8                | 29.7 ms            | 29.3 ms                | 1.01x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| richards                | 113 ms             | 110 ms                 | 1.03x faster | Significant (t=3.47)   |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| scimark_fft             | 592 ms             | 590 ms                 | 1.00x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| scimark_lu              | 253 ms             | 265 ms                 | 1.05x slower | Significant (t=-8.97)  |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| scimark_monte_carlo     | 170 ms             | 177 ms                 | 1.04x slower | Significant (t=-4.96)  |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| scimark_sor             | 310 ms             | 315 ms                 | 1.02x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| scimark_sparse_mat_mult | 8.36 ms            | 8.33 ms                | 1.00x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| spectral_norm           | 232 ms             | 229 ms                 | 1.02x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| sqlalchemy_declarative  | 185 ms             | 183 ms                 | 1.01x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| sqlalchemy_imperative   | 27.4 ms            | 27.6 ms                | 1.01x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| sqlite_synth            | 4.73 us            | 4.73 us                | 1.00x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| sympy_expand            | 813 ms             | 819 ms                 | 1.01x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| sympy_integrate         | 31.6 ms            | 31.8 ms                | 1.01x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| sympy_str               | 477 ms             | 479 ms                 | 1.00x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| sympy_sum               | 245 ms             | 247 ms                 | 1.01x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| telco                   | 11.3 ms            | 11.4 ms                | 1.00x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| tornado_http            | 172 ms             | 172 ms                 | 1.00x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| unpack_sequence         | 56.2 ns            | 51.2 ns                | 1.10x faster | Significant (t=2.50)   |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| unpickle                | 19.8 us            | 19.5 us                | 1.02x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| unpickle_list           | 5.75 us            | 5.75 us                | 1.00x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| unpickle_pure_python    | 524 us             | 522 us                 | 1.01x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| xml_etree_generate      | 148 ms             | 148 ms                 | 1.00x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| xml_etree_iterparse     | 129 ms             | 131 ms                 | 1.02x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| xml_etree_parse         | 179 ms             | 177 ms                 | 1.01x faster | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
| xml_etree_process       | 118 ms             | 119 ms                 | 1.00x slower | Not significant        |
+-------------------------+--------------------+------------------------+--------------+------------------------+
---
 pkgs/development/interpreters/python/cpython/default.nix | 6 ++++++
 pkgs/development/interpreters/python/default.nix         | 1 +
 2 files changed, 7 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index e0b941e009d1..4ee67a452fea 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -41,6 +41,8 @@
 , enableOptimizations ? false
 # enableNoSemanticInterposition is a subset of the enableOptimizations flag that doesn't harm reproducibility.
 , enableNoSemanticInterposition ? true
+# enableLTO is a subset of the enableOptimizations flag that doesn't harm reproducibility.
+, enableLTO ? true
 , reproducibleBuild ? true
 , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
 }:
@@ -102,6 +104,8 @@ let
   ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     buildPackages.stdenv.cc
     pythonForBuild
+  ] ++ optionals (stdenv.cc.isClang && enableLTO) [
+    stdenv.cc.cc.libllvm.out
   ];
 
   buildInputs = filter (p: p != null) ([
@@ -280,6 +284,8 @@ in with passthru; stdenv.mkDerivation {
     "--with-system-ffi"
   ] ++ optionals enableOptimizations [
     "--enable-optimizations"
+  ] ++ optionals enableLTO [
+    "--with-lto"
   ] ++ optionals (pythonOlder "3.7") [
     # This is unconditionally true starting in CPython 3.7.
     "--with-threads"
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 176f8db4bff1..be0d6ce1e43b 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -225,6 +225,7 @@ in {
     stripBytecode = true;
     includeSiteCustomize = false;
     enableOptimizations = false;
+    enableLTO = false;
     mimetypesSupport = false;
   } // sources.python39)).overrideAttrs(old: {
     pname = "python3-minimal";

From 49235a4e50da3acabae1afaef04b0d59a3ee1249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Tue, 29 Jun 2021 19:40:46 +0200
Subject: [PATCH 066/330] python3Packages.loguru: fix tests with Python 3.9

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

diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index 8146f8b183e1..3134d956af78 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -6,15 +6,14 @@
 , isPy27
 , colorama
 , pytestCheckHook
-, pythonAtLeast
 }:
 
 buildPythonPackage rec {
   pname = "loguru";
   version = "0.5.3";
 
-  # python3.9 compatibility should be in the next release after 0.5.3
-  disabled = isPy27 || pythonAtLeast "3.9";
+  disabled = isPy27;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319";
@@ -26,6 +25,11 @@ buildPythonPackage rec {
       url = "https://github.com/Delgan/loguru/commit/31cf758ee9d22dbfa125f38153782fe20ac9dce5.patch";
       sha256 = "1lzbs8akg1s7s6xjl3samf4c4bpssqvwg5fn3mwlm4ysr7jd5y67";
     })
+    # fix tests with Python 3.9
+    (fetchpatch {
+      url = "https://github.com/Delgan/loguru/commit/19f518c5f1f355703ffc4ee62f0e1e397605863e.patch";
+      sha256 = "0yn6smik58wdffr4svqsy2n212fwdlcfcwpgqhl9hq2zlivmsdc6";
+    })
   ];
 
   checkInputs = [ pytestCheckHook colorama ];

From 642b5ec6fdd50196830ddd713c7fd590ab2b34d0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 29 Jun 2021 11:00:51 -0700
Subject: [PATCH 067/330] nixos/rl-notes/21.11: add python3 default bump entry

---
 .../from_md/release-notes/rl-2111.section.xml    | 16 +++++++++++++++-
 .../doc/manual/release-notes/rl-2111.section.md  |  4 ++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index a95b1dd66b96..7860d21215bc 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -14,12 +14,18 @@
   </itemizedlist>
   <section xml:id="sec-release-21.11-highlights">
     <title>Highlights</title>
-    <itemizedlist spacing="compact">
+    <itemizedlist>
       <listitem>
         <para>
           PHP now defaults to PHP 8.0, updated from 7.4.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <literal>python3</literal> now defaults to Python 3.9, updated
+          from Python 3.8.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-21.11-new-services">
@@ -503,6 +509,14 @@
           <literal>rxvt-unicode</literal> explicitly.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <literal>python3</literal> now defaults to Python 3.9. Python
+          3.9 introduces many deprecation warnings, please look at the
+          <link xlink:href="https://docs.python.org/3/whatsnew/3.9.html">What’s
+          New In Python 3.9 post</link> for more information.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index be46591dfa16..df5f84ed0b3d 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -8,6 +8,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - PHP now defaults to PHP 8.0, updated from 7.4.
 
+- `python3` now defaults to Python 3.9, updated from Python 3.8.
+
 ## New Services {#sec-release-21.11-new-services}
 
 - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances).
@@ -122,3 +124,5 @@ In addition to numerous new and upgraded packages, this release has the followin
   However, if [`services.fail2ban.enable`](options.html#opt-services.fail2ban.enable) is `true`, the `fail2ban` will override the verbosity to `"VERBOSE"`, so that `fail2ban` can observe the failed login attempts from the SSH logs.
 
 - Sway: The terminal emulator `rxvt-unicode` is no longer installed by default via `programs.sway.extraPackages`. The current default configuration uses `alacritty` (and soon `foot`) so this is only an issue when using a customized configuration and not installing `rxvt-unicode` explicitly.
+
+- `python3` now defaults to Python 3.9. Python 3.9 introduces many deprecation warnings, please look at the [What's New In Python 3.9 post](https://docs.python.org/3/whatsnew/3.9.html) for more information.

From 9ac61d128a7e5e3203383ee04dd9bb1d4bf2b736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Tue, 29 Jun 2021 20:45:56 +0200
Subject: [PATCH 068/330] pythonPackages.google-i18n-address: fix compatibility
 with Python 3.9

---
 .../python-modules/google-i18n-address/default.nix    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix
index 53ce654e41bb..153377605e93 100644
--- a/pkgs/development/python-modules/google-i18n-address/default.nix
+++ b/pkgs/development/python-modules/google-i18n-address/default.nix
@@ -1,15 +1,22 @@
-{ buildPythonPackage, fetchPypi, pythonAtLeast, lib, requests, pytestCheckHook, mock }:
+{ buildPythonPackage, fetchPypi, fetchpatch, lib, requests, pytestCheckHook, mock }:
 
 buildPythonPackage rec {
   pname = "google-i18n-address";
   version = "2.4.0";
-  disabled = pythonAtLeast "3.9";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "8454a58f254a29988b8d1ca9ab663fd28a1f392a3d29b844d8824807db6333d7";
   };
 
+  patches = [
+    # fix compatibility with Python 3.9
+    (fetchpatch {
+      url = "https://github.com/mirumee/google-i18n-address/commit/b1d63d980e8b1a666e312e1c05c9037e2920685b.patch";
+      sha256 = "0lhsvkcgwz3i4az5hj8irbn8mj4b8yffq03isa18qp3z616adlrp";
+    })
+  ];
+
   propagatedBuildInputs = [ requests ];
 
   checkInputs = [ pytestCheckHook mock ];

From 760c09918098867facbc1bd90bcf9913b0068d18 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 29 Jun 2021 10:42:42 -0700
Subject: [PATCH 069/330] python3Packages.faker: 6.6.3 -> 8.8.2

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

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 196c7e47b399..eb36c9777a56 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -6,16 +6,17 @@
 , freezegun
 , pytestCheckHook
 , ukpostcodeparser
+, pillow
 , validators
 }:
 
 buildPythonPackage rec {
   pname = "Faker";
-  version = "6.6.3";
+  version = "8.8.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c2852cadc99a4ebdbf06934e4c15e30f2307d414ead21d15605759602645f152";
+    sha256 = "sha256-IlNMOqbS7584QDojTcm3G1y4ePt2XHKZS+Xce06vCGU=";
   };
 
   propagatedBuildInputs = [
@@ -25,6 +26,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     freezegun
+    pillow
     pytestCheckHook
     ukpostcodeparser
     validators

From ad361b47cd0a8aff543e14771092065a7e9e4b47 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 29 Jun 2021 11:28:55 -0700
Subject: [PATCH 070/330] python3Packages.faker: normalize pname

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

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index eb36c9777a56..ae47989141e9 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -11,11 +11,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "Faker";
+  pname = "faker";
   version = "8.8.2";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "Faker";
+    inherit version;
     sha256 = "sha256-IlNMOqbS7584QDojTcm3G1y4ePt2XHKZS+Xce06vCGU=";
   };
 

From a2c9f048495b7b6e9c592d0ec67b96c43e793453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 30 Jun 2021 08:54:02 +0200
Subject: [PATCH 071/330] fixup! python3: 3.8 -> 3.9

---
 doc/languages-frameworks/python.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index cd34fb38ce06..53df328f8d48 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -839,7 +839,7 @@ sets are
 and the aliases
 
 * `pkgs.python2Packages` pointing to `pkgs.python27Packages`
-* `pkgs.python3Packages` pointing to `pkgs.python38Packages`
+* `pkgs.python3Packages` pointing to `pkgs.python39Packages`
 * `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
 
 #### `buildPythonPackage` function {#buildpythonpackage-function}

From efacbac720f02e52ecc5c11ebe695af8265005e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 30 Jun 2021 10:29:20 +0200
Subject: [PATCH 072/330] pythonPackages.pyyaml: 5.4.1 -> 5.4.1.1

---
 .../python-modules/pyyaml/default.nix         | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix
index 93cfad78d50e..10073176aeb4 100644
--- a/pkgs/development/python-modules/pyyaml/default.nix
+++ b/pkgs/development/python-modules/pyyaml/default.nix
@@ -1,18 +1,37 @@
-{ lib, buildPythonPackage, fetchPypi, cython, libyaml, buildPackages }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, cython
+, libyaml
+, isPy27
+, python
+}:
 
 buildPythonPackage rec {
   pname = "PyYAML";
-  version = "5.4.1";
+  version = "5.4.1.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e";
+  src = fetchFromGitHub {
+    owner = "yaml";
+    repo = "pyyaml";
+    rev = version;
+    sha256 = "1v386gzdvsjg0mgix6v03rd0cgs9dl81qvn3m547849jm8r41dx8";
   };
 
-  nativeBuildInputs = [ cython buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ cython ];
 
   buildInputs = [ libyaml ];
 
+  checkPhase = let
+    testdir = if isPy27 then "tests/lib" else "tests/lib3";
+  in ''
+    runHook preCheck
+    PYTHONPATH="${testdir}:$PYTHONPATH" ${python.interpreter} -m test_all
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "yaml" ];
+
   meta = with lib; {
     description = "The next generation YAML parser and emitter for Python";
     homepage = "https://github.com/yaml/pyyaml";

From 81910baccc4ca224d9e9ebd3be69897c9b7b2a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 30 Jun 2021 16:19:00 +0200
Subject: [PATCH 073/330] python3Packages.google-i18n-address: 2.4.0 -> 2.5.0

---
 .../google-i18n-address/default.nix           | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix
index 153377605e93..e2724ac123c8 100644
--- a/pkgs/development/python-modules/google-i18n-address/default.nix
+++ b/pkgs/development/python-modules/google-i18n-address/default.nix
@@ -1,25 +1,26 @@
-{ buildPythonPackage, fetchPypi, fetchpatch, lib, requests, pytestCheckHook, mock }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "google-i18n-address";
-  version = "2.4.0";
+  version = "2.5.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "8454a58f254a29988b8d1ca9ab663fd28a1f392a3d29b844d8824807db6333d7";
+  src = fetchFromGitHub {
+    owner = "mirumee";
+    repo = "google-i18n-address";
+    rev = version;
+    sha256 = "0fn5sph6fq68zrjssgvnnvrkavs8arshjwgxng5dr5fsn6qii3mq";
   };
 
-  patches = [
-    # fix compatibility with Python 3.9
-    (fetchpatch {
-      url = "https://github.com/mirumee/google-i18n-address/commit/b1d63d980e8b1a666e312e1c05c9037e2920685b.patch";
-      sha256 = "0lhsvkcgwz3i4az5hj8irbn8mj4b8yffq03isa18qp3z616adlrp";
-    })
-  ];
-
   propagatedBuildInputs = [ requests ];
 
-  checkInputs = [ pytestCheckHook mock ];
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "i18naddress" ];
 
   meta = with lib; {
     description = "Google's i18n address data packaged for Python";

From 410c0b7a0bc68cfb46a5fc9bba3e180139bf6c29 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 30 Jun 2021 11:07:37 +0200
Subject: [PATCH 074/330] pythonPackages.fontmath: 0.7.0 -> 0.8.1

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

diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix
index 7a23abdd0374..a6982037c1eb 100644
--- a/pkgs/development/python-modules/fontmath/default.nix
+++ b/pkgs/development/python-modules/fontmath/default.nix
@@ -1,18 +1,21 @@
-{ lib, buildPythonPackage, fetchPypi
-, fonttools
+{ lib, buildPythonPackage, fetchPypi, isPy27
+, fonttools, setuptools-scm
 , pytest, pytestrunner
 }:
 
 buildPythonPackage rec {
   pname = "fontMath";
-  version = "0.6.0";
+  version = "0.8.1";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09xdqdjyjlx5k9ymi36d7hkgvn55zzjzd65l2yqidkfazlmh14ss";
+    sha256 = "0m2z2wwbxwljfcrg8hx4xq538adzcjpc352yqbfw0czbgs5ixmrr";
     extension = "zip";
   };
 
+  nativeBuildInputs = [ setuptools-scm ];
+
   propagatedBuildInputs = [ fonttools ];
   checkInputs = [ pytest pytestrunner ];
 

From 07571e7ae54dd0ec05c9c7f1278b4cea76e38f10 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 30 Jun 2021 16:39:22 -0700
Subject: [PATCH 075/330] python3: only enable LTO for 64bit builds

Avoid failures with 32bit builds:
```
cc1: error: LTO support has not been enabled in this configuration
```
---
 pkgs/development/interpreters/python/cpython/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 4ee67a452fea..842d132fd44c 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -42,7 +42,8 @@
 # enableNoSemanticInterposition is a subset of the enableOptimizations flag that doesn't harm reproducibility.
 , enableNoSemanticInterposition ? true
 # enableLTO is a subset of the enableOptimizations flag that doesn't harm reproducibility.
-, enableLTO ? true
+# enabling LTO on 32bit arch causes downstream packages to fail when linking
+, enableLTO ? stdenv.is64bit
 , reproducibleBuild ? true
 , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
 }:

From f019d3adb27c2754f1c122ea945aa51ea4347819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Thu, 1 Jul 2021 08:07:05 +0200
Subject: [PATCH 076/330] python3Packages.httplib2: fix tests

---
 pkgs/development/python-modules/httplib2/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index 40bfe4d3e884..756d3e4ddcc4 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , isPy27
 , mock
 , pyparsing
@@ -24,6 +25,14 @@ buildPythonPackage rec {
     sha256 = "sha256-e0Mq9AVJEWQ9GEtYFXk2fMIs7GtAUsyJN6XheqAnD3I=";
   };
 
+  patches = [
+    # fix test_inject_space
+    (fetchpatch {
+      url = "https://github.com/httplib2/httplib2/commit/08d6993b69256fbc6c0b1c615c24910803c4d610.patch";
+      sha256 = "0kbd1skn58m20kfkh4qzd66g9bvj31xlkbhsg435dkk4qz6l3yn3";
+    })
+  ];
+
   postPatch = ''
     sed -i "/--cov/d" setup.cfg
   '';

From 87f6a8dde588084963e0b6e724e2a4e09db46a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Thu, 1 Jul 2021 08:54:54 +0200
Subject: [PATCH 077/330] python39Packages.flake8-future-import: fix tests

---
 .../flake8-future-import/default.nix          | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix
index 661b7c71c33d..41e9680937db 100644
--- a/pkgs/development/python-modules/flake8-future-import/default.nix
+++ b/pkgs/development/python-modules/flake8-future-import/default.nix
@@ -1,4 +1,12 @@
-{ lib, isPy27, isPy38, fetchFromGitHub, buildPythonPackage, pythonOlder, fetchpatch, flake8, importlib-metadata, six }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonAtLeast
+, isPy27
+, flake8
+, six
+, python
+}:
 
 buildPythonPackage rec {
   pname = "flake8-future-import";
@@ -12,16 +20,22 @@ buildPythonPackage rec {
     sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z";
   };
 
-  propagatedBuildInputs = [ flake8 six ]
-    ++ lib.optionals (pythonOlder "3.8") [
-      importlib-metadata
-    ];
+  patches = lib.optionals (pythonAtLeast "3.8") [
+    ./fix-annotations-version.patch
+  ] ++ lib.optionals isPy27 [
+    # Upstream disables this test case naturally on python 3, but it also fails
+    # inside NixPkgs for python 2. Since it's going to be deleted, we just skip it
+    # on py2 as well.
+    ./skip-test.patch
+  ];
 
-  # Upstream disables this test case naturally on python 3, but it also fails
-  # inside NixPkgs for python 2. Since it's going to be deleted, we just skip it
-  # on py2 as well.
-  patches = lib.optionals isPy38 [ ./fix-annotations-version.patch ]
-    ++ lib.optionals isPy27 [ ./skip-test.patch ];
+  propagatedBuildInputs = [ flake8 ];
+
+  checkInputs = [ six ];
+
+  checkPhase = ''
+    ${python.interpreter} -m test_flake8_future_import
+  '';
 
   meta = with lib; {
     description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base";

From 4bee64c9f424257ba4b0ba7940543904783558f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Thu, 1 Jul 2021 17:36:29 +0200
Subject: [PATCH 078/330] python3Packages.xdis: 5.0.9 -> 5.0.10

https://github.com/rocky/python-xdis/releases/tag/5.0.10
---
 pkgs/development/python-modules/xdis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index 59cad86606fd..aec8b13a122c 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "xdis";
-  version = "5.0.9";
+  version = "5.0.10";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "rocky";
     repo = "python-xdis";
     rev = version;
-    sha256 = "sha256-joKPTEq0UabXMyld0DHrhC1D/Om2B5st0qa2F9r0muA=";
+    sha256 = "sha256-/3qyMgliua7W4Va1HdRbHyiR/eBQzHK+GrZVAMvMhLA=";
   };
 
   checkInputs = [ pytest ];

From 35a0095d4bf617810fd6f11a4d9bdccf3aac1755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Fri, 2 Jul 2021 13:28:38 +0200
Subject: [PATCH 079/330] python3Packages.numba: supports Python 3.9

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

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index e4af2ddadb57..74f7d4003dcd 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -14,8 +14,7 @@
 buildPythonPackage rec {
   version = "0.53.1";
   pname = "numba";
-  # uses f-strings, python 3.9 is not yet supported
-  disabled = pythonOlder "3.6" || pythonAtLeast "3.9";
+  disabled = pythonOlder "3.6" || pythonAtLeast "3.10";
 
   src = fetchPypi {
     inherit pname version;

From 11a1f2c8fed494d74dd4761eaf0688b9b0ef2ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Fri, 2 Jul 2021 14:00:46 +0200
Subject: [PATCH 080/330] tts: use python38

---
 pkgs/tools/audio/tts/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix
index 0e57e19a2883..b157d4b8f798 100644
--- a/pkgs/tools/audio/tts/default.nix
+++ b/pkgs/tools/audio/tts/default.nix
@@ -1,7 +1,6 @@
 { lib
-, python3Packages
+, python38
 , fetchFromGitHub
-, python3
 , fetchpatch
 }:
 
@@ -17,10 +16,15 @@
 # For now, for deployment check the systemd unit in the pull request:
 #   https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136
 
-python3Packages.buildPythonApplication rec {
+let
+  python3 = python38;
+in python3.pkgs.buildPythonApplication rec {
   pname = "tts";
   version = "0.0.15.1";
 
+  # https://github.com/coqui-ai/TTS/issues/570
+  disabled = python3.pythonAtLeast "3.9";
+
   src = fetchFromGitHub {
     owner = "coqui-ai";
     repo = "TTS";
@@ -36,11 +40,11 @@ python3Packages.buildPythonApplication rec {
     sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt
   '';
 
-  nativeBuildInputs = with python3Packages; [
+  nativeBuildInputs = with python3.pkgs; [
     cython
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3.pkgs; [
     anyascii
     coqpit
     flask
@@ -69,11 +73,11 @@ python3Packages.buildPythonApplication rec {
     # cython modules are not installed for some reasons
     (
       cd TTS/tts/layers/glow_tts/monotonic_align
-      ${python3Packages.python.interpreter} setup.py install --prefix=$out
+      ${python3.interpreter} setup.py install --prefix=$out
     )
   '';
 
-  checkInputs = with python3Packages; [
+  checkInputs = with python3.pkgs; [
     pytest-sugar
     pytestCheckHook
   ];

From 96e39fb15295f19e3b9ede088487433bfcabe327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 3 Jul 2021 01:28:17 +0200
Subject: [PATCH 081/330] unrpa: use python38

Its dependency uncompyle6 does not support Python 3.9 yet.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 340a475cdb97..4e38f33cc5a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9499,7 +9499,7 @@ in
 
   unrtf = callPackage ../tools/text/unrtf { };
 
-  unrpa = with python3Packages; toPythonApplication unrpa;
+  unrpa = with python38Packages; toPythonApplication unrpa;
 
   untex = callPackage ../tools/text/untex { };
 

From 4a6f6ab9c9e6a09e119e50d9ae5e8a58796cd493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 3 Jul 2021 11:23:54 +0200
Subject: [PATCH 082/330] duplicity: use python38

Its dependency boto does not support Python 3.9.
---
 pkgs/tools/backup/duplicity/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix         | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 24e1a2954ed6..a6f509d2504a 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv
 , fetchurl
-, pythonPackages
+, python38
 , librsync
 , ncftp
 , gnupg
@@ -12,6 +12,7 @@
 , gettext
 }:
 let
+  pythonPackages = python38.pkgs;
   inherit (lib.versions) majorMinor splitVersion;
   majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v));
 in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e38f33cc5a5..8f5250cd46fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4274,9 +4274,7 @@ in
 
   duplicati = callPackage ../tools/backup/duplicati { };
 
-  duplicity = callPackage ../tools/backup/duplicity {
-    pythonPackages = python3Packages;
-  };
+  duplicity = callPackage ../tools/backup/duplicity { };
 
   duply = callPackage ../tools/backup/duply { };
 

From fdfe5444438a99d963d96d8247979530882cccf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 3 Jul 2021 11:46:37 +0200
Subject: [PATCH 083/330] sigal: remove optional dependency boto

It does not support Python 3.9.
---
 pkgs/applications/misc/sigal/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix
index 860e8f8adb59..20b944efd5d5 100644
--- a/pkgs/applications/misc/sigal/default.nix
+++ b/pkgs/applications/misc/sigal/default.nix
@@ -21,7 +21,6 @@ python3Packages.buildPythonApplication rec {
     blinker
     natsort
     # extras_require
-    boto
     brotli
     feedgenerator
     zopfli

From 9ed4eacdfbadc2bf1eed17176508ef16db190dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 3 Jul 2021 12:12:58 +0200
Subject: [PATCH 084/330] pythonPackages.parameterizedtestcase: init at 0.1.0

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

diff --git a/pkgs/development/python-modules/parameterizedtestcase/default.nix b/pkgs/development/python-modules/parameterizedtestcase/default.nix
new file mode 100644
index 000000000000..20e662cd66d6
--- /dev/null
+++ b/pkgs/development/python-modules/parameterizedtestcase/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+, isPy27
+}:
+
+buildPythonPackage rec {
+  pname = "parameterizedtestcase";
+  version = "0.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "4ccc1d15d7e7ef153619a6a9cd45b170268cf82c67fdd336794c75139aae127e";
+  };
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m parameterizedtestcase.tests
+    runHook postCheck
+  '';
+
+  doCheck = isPy27;
+
+  meta = with lib; {
+    description = "Parameterized tests for Python's unittest module";
+    homepage = "https://github.com/msabramo/python_unittest_parameterized_test_case";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a15a1450c78d..385c40f42bf3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5237,6 +5237,8 @@ in {
 
   openapi-core = callPackage ../development/python-modules/openapi-core { };
 
+  parameterizedtestcase = callPackage ../development/python-modules/parameterizedtestcase { };
+
   pdunehd = callPackage ../development/python-modules/pdunehd { };
 
   phonopy = callPackage ../development/python-modules/phonopy { };

From 24eb4933fbcfb191ef2f2b0900d1c83f2adbbb8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 3 Jul 2021 11:53:21 +0200
Subject: [PATCH 085/330] python3Packages.smart-open: 4.2.0 -> 5.1.0

---
 .../python-modules/smart-open/default.nix     | 76 ++++++++++++++-----
 1 file changed, 56 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix
index 051d6c97397d..d4ad901fb9b7 100644
--- a/pkgs/development/python-modules/smart-open/default.nix
+++ b/pkgs/development/python-modules/smart-open/default.nix
@@ -1,39 +1,75 @@
 { lib
 , buildPythonPackage
-, fetchPypi
 , pythonOlder
-, boto
+, fetchFromGitHub
+, azure-common
+, azure-core
+, azure-storage-blob
 , boto3
-, bz2file
-, mock
-, moto
+, google-cloud-storage
 , requests
-, responses
+, moto
+, parameterizedtestcase
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "smart-open";
-  version = "4.2.0";
+  version = "5.1.0";
+
   disabled = pythonOlder "3.5";
 
-  src = fetchPypi {
-    pname = "smart_open";
-    inherit version;
-    sha256 = "d9f5a0f173ccb9bbae528db5a3804f57145815774f77ef755b9b0f3b4b2a9dcb";
+  src = fetchFromGitHub {
+    owner = "RaRe-Technologies";
+    repo = "smart_open";
+    rev = "v${version}";
+    sha256 = "0gv3vxpglnhh6d80wsqigxi7psn6s7ylz20kx5ahblcx5rqyhjmi";
   };
 
-  # moto>=1.0.0 is backwards-incompatible and some tests fail with it,
-  # so disable tests for now
-  doCheck = false;
+  propagatedBuildInputs = [
+    azure-common
+    azure-core
+    azure-storage-blob
+    boto3
+    google-cloud-storage
+    requests
+  ];
 
-  checkInputs = [ mock moto responses ];
+  checkInputs = [
+    moto
+    parameterizedtestcase
+    pytestCheckHook
+  ];
 
-  # upstream code requires both boto and boto3
-  propagatedBuildInputs = [ boto boto3 bz2file requests ];
+  pytestFlagsArray = [ "smart_open" ];
 
-  meta = {
-    license = lib.licenses.mit;
+  disabledTestPaths = [
+    "smart_open/tests/test_http.py"
+    "smart_open/tests/test_s3.py"
+    "smart_open/tests/test_s3_version.py"
+    "smart_open/tests/test_sanity.py"
+  ];
+
+  disabledTests = [
+    "test_compression_invalid"
+    "test_gs_uri_contains_question_mark"
+    "test_gzip_compress_sanity"
+    "test_http"
+    "test_ignore_ext"
+    "test_initialize_write"
+    "test_read_explicit"
+    "test_s3_handles_querystring"
+    "test_s3_uri_contains_question_mark"
+    "test_webhdfs"
+    "test_write"
+  ];
+
+  pythonImportsCheck = [ "smart_open" ];
+
+  meta = with lib; {
     description = "Library for efficient streaming of very large file";
-    maintainers = with lib.maintainers; [ jyp ];
+    homepage = "https://github.com/RaRe-Technologies/smart_open";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jyp ];
   };
 }

From bbf0832745d9a1d4c988d1fc730d8ab19fa0ef37 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 3 Jul 2021 18:28:40 +0200
Subject: [PATCH 086/330] python3Packages.graphene: disable failing test

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

diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix
index be2cc808eb0d..5eec4b8f0b25 100644
--- a/pkgs/development/python-modules/graphene/default.nix
+++ b/pkgs/development/python-modules/graphene/default.nix
@@ -50,6 +50,12 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "--benchmark-disable" ];
 
+  disabledTests = [
+    # Expects different Exeception classes, but receives none of them
+    # https://github.com/graphql-python/graphene/issues/1346
+    "test_unexpected_error"
+  ];
+
   pythonImportsCheck = [ "graphene" ];
 
   meta = with lib; {

From 1b4cff3a848df83e553603875b812e973951d164 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Jul 2021 01:11:29 +0200
Subject: [PATCH 087/330] python3Packages.BTrees: fix build and overhaul
 derivation

---
 .../python-modules/btrees/default.nix         | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 1fadf927a448..49acee691cfa 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -5,30 +5,45 @@
 , zope_interface
 , transaction
 , zope_testrunner
+, python
 }:
 
 buildPythonPackage rec {
   pname = "BTrees";
   version = "4.9.2";
 
-  buildInputs = [ transaction ];
-  propagatedBuildInputs = [ persistent zope_interface ];
-  checkInputs = [ zope_testrunner ];
-
-  # disable a failing test that looks broken
-  postPatch = ''
-    substituteInPlace BTrees/tests/common.py \
-      --replace "testShortRepr" "no_testShortRepr"
-  '';
-
   src = fetchPypi {
     inherit pname version;
     sha256 = "d33323655924192c4ac998d9ee3002e787915d19c1e17a6baf47c9a63d9556e3";
   };
 
+  propagatedBuildInputs = [
+    persistent
+    zope_interface
+  ];
+
+  checkInputs = [
+    transaction
+    zope_testrunner
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m zope.testrunner --test-path=src --auto-color --auto-progress
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [
+    "BTrees.OOBTree"
+    "BTrees.IOBTree"
+    "BTrees.IIBTree"
+    "BTrees.IFBTree"
+  ];
+
   meta = with lib; {
     description = "Scalable persistent components";
     homepage = "http://packages.python.org/BTrees";
     license = licenses.zpl21;
+    maintainers = with maintainers; [ ];
   };
 }

From 6b972ad4252056bd377c6f1c25ae7e65c268840d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 5 Jul 2021 21:06:50 +0200
Subject: [PATCH 088/330] python3Packages.phonopy: add missing scipy dependency

Not given in requirements but apparently an optional dependendency
as the tests are failing without it.

phonopy/qha/eos.py:

        try:
            from scipy.optimize import leastsq
            import scipy
        except ImportError:
            print("You need to install python-scipy.")
            sys.exit(1)
---
 .../development/python-modules/phonopy/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix
index 2ca29ffd8e3d..af728d414c1b 100644
--- a/pkgs/development/python-modules/phonopy/default.nix
+++ b/pkgs/development/python-modules/phonopy/default.nix
@@ -5,6 +5,7 @@
 , pyyaml
 , matplotlib
 , h5py
+, scipy
 , spglib
 , pytestCheckHook
 }:
@@ -18,9 +19,18 @@ buildPythonPackage rec {
     sha256 = "58485042ab7d88fc8b83744d18b2aefd677adb071c8a717ac3710458192743d7";
   };
 
-  propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ];
+  propagatedBuildInputs = [
+    h5py
+    matplotlib
+    numpy
+    pyyaml
+    scipy
+    spglib
+  ];
 
-  checkInputs = [ pytestCheckHook ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   # prevent pytest from importing local directory
   preCheck = ''

From 4d0e3984918b30459103ed78551dc22409a07b24 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 22 Jun 2021 09:57:21 +0900
Subject: [PATCH 089/330] builder.sh: shellcheck 2086

https://github.com/koalaman/shellcheck/wiki/SC2086
---
 pkgs/stdenv/generic/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index 79bf21ab4730..1cf08b0720d9 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -4,7 +4,7 @@ for i in $initialPath; do
     PATH=$PATH${PATH:+:}$i/bin
 done
 
-mkdir $out
+mkdir "$out"
 
 echo "export SHELL=$shell" > $out/setup
 echo "initialPath=\"$initialPath\"" >> $out/setup

From e39ee04d9796be7a6be35dda1894fc956ef203e8 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 22 Jun 2021 09:58:36 +0900
Subject: [PATCH 090/330] builder.sh: shellcheck 2129

https://github.com/koalaman/shellcheck/wiki/SC2129
---
 pkgs/stdenv/generic/builder.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index 1cf08b0720d9..edac4ff89d73 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -6,12 +6,14 @@ done
 
 mkdir "$out"
 
-echo "export SHELL=$shell" > $out/setup
-echo "initialPath=\"$initialPath\"" >> $out/setup
-echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup
-echo "defaultBuildInputs=\"$defaultBuildInputs\"" >> $out/setup
-echo "$preHook" >> $out/setup
-cat "$setup" >> $out/setup
+{
+    echo "export SHELL=$shell"
+    echo "initialPath=\"$initialPath\""
+    echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\""
+    echo "defaultBuildInputs=\"$defaultBuildInputs\""
+    echo "$preHook"
+    cat "$setup"
+} > "$out/setup"
 
 # Allow the user to install stdenv using nix-env and get the packages
 # in stdenv.

From 40ad05b4cbdc808c6fa5487ba195722c2734f02a Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 22 Jun 2021 09:59:52 +0900
Subject: [PATCH 091/330] builder.sh: check if variable is non null

This is not the "correct" way to check if a variable is non null in
bash. There is already an instance of the "right" way to do it in
setup.sh. Bash is "generous" enough to accept the original input though.
I couldn't find the relevant shellcheck.
---
 pkgs/stdenv/generic/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index edac4ff89d73..986d94943c59 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -18,6 +18,6 @@ mkdir "$out"
 # Allow the user to install stdenv using nix-env and get the packages
 # in stdenv.
 mkdir $out/nix-support
-if [ "$propagatedUserEnvPkgs" ]; then
+if [ -n "${propagatedUserEnvPkgs:-}" ]; then
     printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages
 fi

From 430fdb7e0d0ceae034f37743daac4942517736c9 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 22 Jun 2021 10:17:52 +0900
Subject: [PATCH 092/330] setup.sh: shellcheck 2086

https://github.com/koalaman/shellcheck/wiki/SC2086
---
 pkgs/stdenv/generic/setup.sh | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 066ef6ed9eb3..6f1b7eb35253 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -11,7 +11,7 @@ if (( "${NIX_DEBUG:-0}" >= 6 )); then
     set -x
 fi
 
-: ${outputs:=out}
+: "${outputs:=out}"
 
 
 ######################################################################
@@ -232,7 +232,7 @@ printWords() {
 # implementation uses zip archive and zip does not support dates going back to
 # 1970.
 export SOURCE_DATE_EPOCH
-: ${SOURCE_DATE_EPOCH:=315532800}
+: "${SOURCE_DATE_EPOCH:=315532800}"
 
 
 # Wildcard expansions that don't match should expand to an empty list.
@@ -437,12 +437,12 @@ findInputs() {
 }
 
 # Make sure all are at least defined as empty
-: ${depsBuildBuild=} ${depsBuildBuildPropagated=}
-: ${nativeBuildInputs=} ${propagatedNativeBuildInputs=} ${defaultNativeBuildInputs=}
-: ${depsBuildTarget=} ${depsBuildTargetPropagated=}
-: ${depsHostHost=} ${depsHostHostPropagated=}
-: ${buildInputs=} ${propagatedBuildInputs=} ${defaultBuildInputs=}
-: ${depsTargetTarget=} ${depsTargetTargetPropagated=}
+: "${depsBuildBuild=}" "${depsBuildBuildPropagated=}"
+: "${nativeBuildInputs=}" "${propagatedNativeBuildInputs=}" "${defaultNativeBuildInputs=}"
+: "${depsBuildTarget=}" "${depsBuildTargetPropagated=}"
+: "${depsHostHost=}" "${depsHostHostPropagated=}"
+: "${buildInputs=}" "${propagatedBuildInputs=}" "${defaultBuildInputs=}"
+: "${depsTargetTarget=}" "${depsTargetTargetPropagated=}"
 
 for pkg in $depsBuildBuild $depsBuildBuildPropagated; do
     findInputs "$pkg" -1 -1
@@ -718,6 +718,7 @@ substituteStream() {
 
 consumeEntire() {
     # read returns non-0 on EOF, so we want read to fail
+    # shellcheck disable=SC2086
     if IFS='' read -r -N 0 $1; then
         echo "consumeEntire(): ERROR: Input null bytes, won't process" >&2
         return 1
@@ -889,7 +890,7 @@ unpackPhase() {
     # Find the source directory.
 
     # set to empty if unset
-    : ${sourceRoot=}
+    : "${sourceRoot=}"
 
     if [ -n "${setSourceRoot:-}" ]; then
         runOneHook setSourceRoot
@@ -967,8 +968,8 @@ configurePhase() {
     runHook preConfigure
 
     # set to empty if unset
-    : ${configureScript=}
-    : ${configureFlags=}
+    : "${configureScript=}"
+    : "${configureFlags=}"
 
     if [[ -z "$configureScript" && -x ./configure ]]; then
         configureScript=./configure
@@ -1022,7 +1023,7 @@ buildPhase() {
     runHook preBuild
 
     # set to empty if unset
-    : ${makeFlags=}
+    : "${makeFlags=}"
 
     if [[ -z "$makeFlags" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
         echo "no Makefile, doing nothing"
@@ -1059,9 +1060,9 @@ checkPhase() {
     if [[ -z "${checkTarget:-}" ]]; then
         #TODO(@oxij): should flagsArray influence make -n?
         if make -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then
-            checkTarget=check
+            checkTarget="check"
         elif make -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then
-            checkTarget=test
+            checkTarget="test"
         fi
     fi
 
@@ -1291,7 +1292,7 @@ genericBuild() {
         if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then continue; fi
 
         if [[ -n $NIX_LOG_FD ]]; then
-            echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&$NIX_LOG_FD
+            echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD"
         fi
 
         showPhaseHeader "$curPhase"

From c335a18ea5c46ce6d8e8053c079295950ad7bb9e Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 22 Jun 2021 10:22:04 +0900
Subject: [PATCH 093/330] setup.sh: shellcheck 2206 + 2207

https://github.com/koalaman/shellcheck/wiki/SC2206
https://github.com/koalaman/shellcheck/wiki/SC2207

admittedly this one is a lot less pretty
---
 pkgs/stdenv/generic/setup.sh | 88 ++++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 38 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 6f1b7eb35253..ebdc2cdba84c 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -122,13 +122,14 @@ exitHandler() {
 
     if [ -n "${showBuildStats:-}" ]; then
         times > "$NIX_BUILD_TOP/.times"
-        local -a times=($(cat "$NIX_BUILD_TOP/.times"))
+        local -a buildTimesArray
+        IFS=" " read -r -a buildTimesArray <<< "$(cat "$NIX_BUILD_TOP/.times")"
         # Print the following statistics:
         # - user time for the shell
         # - system time for the shell
         # - user time for all child processes
         # - system time for all child processes
-        echo "build time elapsed: " "${times[@]}"
+        echo "build time elapsed: " "${buildTimesArray[@]}"
     fi
 
     if (( "$exitCode" != 0 )); then
@@ -1002,10 +1003,10 @@ configurePhase() {
     fi
 
     if [ -n "$configureScript" ]; then
-        # Old bash empty array hack
-        # shellcheck disable=SC2086
-        local flagsArray=(
-            $configureFlags ${configureFlagsArray+"${configureFlagsArray[@]}"}
+        IFS=" " read -r -a configureFlagsTemp <<< "$configureFlags"
+        local -a flagsArray=(
+            "${configureFlagsTemp[@]}"
+            ${configureFlagsArray+"${configureFlagsArray[@]}"}
         )
         echoCmd 'configure flags' "${flagsArray[@]}"
         # shellcheck disable=SC2086
@@ -1029,14 +1030,15 @@ buildPhase() {
         echo "no Makefile, doing nothing"
     else
         foundMakefile=1
-
-        # Old bash empty array hack
-        # shellcheck disable=SC2086
-        local flagsArray=(
+        IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
+        IFS=" " read -r -a buildFlagsTemp <<< "$buildFlags"
+        local -a flagsArray=(
             ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
-            SHELL=$SHELL
-            $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
-            $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"}
+            SHELL="$SHELL"
+            "${makeFlagsTemp[@]}"
+            ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            "${buildFlagsTemp[@]}"
+            ${buildFlagsArray+"${buildFlagsArray[@]}"}
         )
 
         echoCmd 'build flags' "${flagsArray[@]}"
@@ -1069,14 +1071,17 @@ checkPhase() {
     if [[ -z "${checkTarget:-}" ]]; then
         echo "no check/test target in ${makefile:-Makefile}, doing nothing"
     else
-        # Old bash empty array hack
-        # shellcheck disable=SC2086
-        local flagsArray=(
+        IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
+        IFS=" " read -r -a checkFlagsTemp <<< "${checkFlags:-VERBOSE=y}"
+        IFS=" " read -r -a checkTargetTemp <<< "${checkTarget}"
+        local -a flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
-            SHELL=$SHELL
-            $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
-            ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
-            ${checkTarget}
+            SHELL="$SHELL"
+            "${makeFlagsTemp[@]}"
+            ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            "${checkFlagsTemp[@]}"
+            ${checkFlagsArray+"${checkFlagsArray[@]}"}
+            "${checkTargetTemp[@]}"
         )
 
         echoCmd 'check flags' "${flagsArray[@]}"
@@ -1095,14 +1100,16 @@ installPhase() {
     if [ -n "$prefix" ]; then
         mkdir -p "$prefix"
     fi
-
-    # Old bash empty array hack
-    # shellcheck disable=SC2086
-    local flagsArray=(
-        SHELL=$SHELL
-        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
-        $installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
-        ${installTargets:-install}
+    IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
+    IFS=" " read -r -a installFlagsTemp <<< "$installFlags"
+    IFS=" " read -r -a installTargetsTemp <<< "${installTargets:-install}"
+    local -a flagsArray=(
+        SHELL="$SHELL"
+        "${makeFlagsTemp[@]}"
+        ${makeFlagsArray+"${makeFlagsArray[@]}"}
+        "${installFlagsTemp[@]}"
+        ${installFlagsArray+"${installFlagsArray[@]}"}
+        "${installTargetsTemp[@]}"
     )
 
     echoCmd 'install flags' "${flagsArray[@]}"
@@ -1203,14 +1210,17 @@ installCheckPhase() {
        && ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then
         echo "no installcheck target in ${makefile:-Makefile}, doing nothing"
     else
-        # Old bash empty array hack
-        # shellcheck disable=SC2086
-        local flagsArray=(
+        IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
+        IFS=" " read -r -a installCheckFlagsTemp <<< "$installCheckFlags"
+        IFS=" " read -r -a installCheckTargetTemp <<< "${installCheckTarget:-installcheck}"
+        local -a flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
-            SHELL=$SHELL
-            $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
-            $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
-            ${installCheckTarget:-installcheck}
+            SHELL="$SHELL"
+            "${makeFlagsTemp[@]}"
+            ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            "${installCheckFlagsTemp[@]}"
+            ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
+            "${installCheckTargetTemp[@]}"
         )
 
         echoCmd 'installcheck flags' "${flagsArray[@]}"
@@ -1225,10 +1235,12 @@ installCheckPhase() {
 distPhase() {
     runHook preDist
 
-    # Old bash empty array hack
-    # shellcheck disable=SC2086
+    IFS=" " read -r -a distFlagsTemp <<< "$distFlags"
+
     local flagsArray=(
-        $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist}
+        "${distFlagsTemp[@]}"
+        ${distFlagsArray+"${distFlagsArray[@]}"}
+        ${distTarget:-dist}
     )
 
     echo 'dist flags: %q' "${flagsArray[@]}"

From ac27528177b35e45aa5c2dc0dcd40e06c6c41b05 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 22 Jun 2021 10:23:51 +0900
Subject: [PATCH 094/330] setup.sh: arithmetic fixes

this one is a little more controversial
see https://github.com/oilshell/oil/issues/864
for more information
---
 pkgs/stdenv/generic/setup.sh | 54 ++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index ebdc2cdba84c..563e32f07abd 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -348,14 +348,14 @@ declare -a allPlatOffsets=(-1 0 1)
 # implements.
 findInputs() {
     local -r pkg="$1"
-    local -ri hostOffset="$2"
-    local -ri targetOffset="$3"
+    local -r hostOffset="$2"
+    local -r targetOffset="$3"
 
     # Sanity check
-    (( "$hostOffset" <= "$targetOffset" )) || exit -1
+    (( "$hostOffset" <= "$targetOffset" )) || exit 1
 
-    local varVar="${pkgAccumVarVars[$hostOffset + 1]}"
-    local varRef="$varVar[\$targetOffset - \$hostOffset]"
+    local varVar="${pkgAccumVarVars[$(( hostOffset + 1 ))]}"
+    local varRef="${varVar}[$(( targetOffset - hostOffset ))]"
     local var="${!varRef}"
     unset -v varVar varRef
 
@@ -363,7 +363,7 @@ findInputs() {
     # nix-shell doesn't use impure bash. This should replace the O(n)
     # case with an O(1) hash map lookup, assuming bash is implemented
     # well :D.
-    local varSlice="$var[*]"
+    local varSlice="${var}[*]"
     # ${..-} to hack around old bash empty array problem
     case "${!varSlice-}" in
         *" $pkg "*) return 0 ;;
@@ -380,28 +380,28 @@ findInputs() {
     # The current package's host and target offset together
     # provide a <=-preserving homomorphism from the relative
     # offsets to current offset
-    local -i mapOffsetResult
+    local mapOffsetResult
     function mapOffset() {
-        local -ri inputOffset="$1"
+        local -r inputOffset="$1"
         if (( "$inputOffset" <= 0 )); then
-            local -ri outputOffset="$inputOffset + $hostOffset"
+            local -r outputOffset=$(( inputOffset + hostOffset ))
         else
-            local -ri outputOffset="$inputOffset - 1 + $targetOffset"
+            local -r outputOffset=$(( inputOffset - 1 + targetOffset ))
         fi
         mapOffsetResult="$outputOffset"
     }
 
     # Host offset relative to that of the package whose immediate
     # dependencies we are currently exploring.
-    local -i relHostOffset
+    local relHostOffset
     for relHostOffset in "${allPlatOffsets[@]}"; do
         # `+ 1` so we start at 0 for valid index
-        local files="${propagatedDepFilesVars[$relHostOffset + 1]}"
+        local files="${propagatedDepFilesVars[$(( relHostOffset + 1 ))]}"
 
         # Host offset relative to the package currently being
         # built---as absolute an offset as will be used.
         mapOffset relHostOffset
-        local -i hostOffsetNext="$mapOffsetResult"
+        local hostOffsetNext="$mapOffsetResult"
 
         # Ensure we're in bounds relative to the package currently
         # being built.
@@ -409,18 +409,18 @@ findInputs() {
 
         # Target offset relative to the *host* offset of the package
         # whose immediate dependencies we are currently exploring.
-        local -i relTargetOffset
+        local relTargetOffset
         for relTargetOffset in "${allPlatOffsets[@]}"; do
             (( "$relHostOffset" <= "$relTargetOffset" )) || continue
 
-            local fileRef="${files}[$relTargetOffset - $relHostOffset]"
+            local fileRef="${files}[$(( relTargetOffset - relHostOffset ))]"
             local file="${!fileRef}"
             unset -v fileRef
 
             # Target offset relative to the package currently being
             # built.
             mapOffset relTargetOffset
-            local -i targetOffsetNext="$mapOffsetResult"
+            local targetOffsetNext="$mapOffsetResult"
 
             # Once again, ensure we're in bounds relative to the
             # package currently being built.
@@ -474,11 +474,11 @@ done
 # Add package to the future PATH and run setup hooks
 activatePackage() {
     local pkg="$1"
-    local -ri hostOffset="$2"
-    local -ri targetOffset="$3"
+    local -r hostOffset="$2"
+    local -r targetOffset="$3"
 
     # Sanity check
-    (( "$hostOffset" <= "$targetOffset" )) || exit -1
+    (( "$hostOffset" <= "$targetOffset" )) || exit 1
 
     if [ -f "$pkg" ]; then
         source "$pkg"
@@ -509,14 +509,14 @@ activatePackage() {
 }
 
 _activatePkgs() {
-    local -i hostOffset targetOffset
+    local hostOffset targetOffset
     local pkg
 
     for hostOffset in "${allPlatOffsets[@]}"; do
-        local pkgsVar="${pkgAccumVarVars[$hostOffset + 1]}"
+        local pkgsVar="${pkgAccumVarVars[$(( hostOffset + 1 ))]}"
         for targetOffset in "${allPlatOffsets[@]}"; do
             (( "$hostOffset" <= "$targetOffset" )) || continue
-            local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]"
+            local pkgsRef="${pkgsVar}[$(( targetOffset - hostOffset ))]"
             local pkgsSlice="${!pkgsRef}[@]"
             for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do
                 activatePackage "$pkg" "$hostOffset" "$targetOffset"
@@ -537,15 +537,15 @@ _activatePkgs
 # with this information to the relevant env hook array, but bash
 # doesn't have closures, so it's easier to just pass this in.
 _addToEnv() {
-    local -i depHostOffset depTargetOffset
+    local depHostOffset depTargetOffset
     local pkg
 
     for depHostOffset in "${allPlatOffsets[@]}"; do
-        local hookVar="${pkgHookVarVars[$depHostOffset + 1]}"
-        local pkgsVar="${pkgAccumVarVars[$depHostOffset + 1]}"
+        local hookVar="${pkgHookVarVars[$(( depHostOffset + 1 ))]}"
+        local pkgsVar="${pkgAccumVarVars[$(( depHostOffset + 1 ))]}"
         for depTargetOffset in "${allPlatOffsets[@]}"; do
             (( "$depHostOffset" <= "$depTargetOffset" )) || continue
-            local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]"
+            local hookRef="${hookVar}[$(( depTargetOffset - depHostOffset ))]"
             if [[ -z "${strictDeps-}" ]]; then
 
                 # Keep track of which packages we have visited before.
@@ -570,7 +570,7 @@ _addToEnv() {
                     visitedPkgs+=" $pkg"
                 done
             else
-                local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]"
+                local pkgsRef="${pkgsVar}[$(( depTargetOffset - depHostOffset ))]"
                 local pkgsSlice="${!pkgsRef}[@]"
                 for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do
                     runHook "${!hookRef}" "$pkg"

From b49f22fd3e08dbf43c38b4717e93bd1f1b704666 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Wed, 23 Jun 2021 11:17:02 +0900
Subject: [PATCH 095/330] setup.sh: replace type -p with test -e

type -p will exit 1 on failure.
Test makes the intent clearer here.
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 563e32f07abd..06bdaeaab2ba 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -68,7 +68,7 @@ _callImplicitHook() {
     local hookName="$2"
     if declare -F "$hookName" > /dev/null; then
         "$hookName"
-    elif type -p "$hookName" > /dev/null; then
+    elif test -e "$hookName" ; then
         source "$hookName"
     elif [ -n "${!hookName:-}" ]; then
         eval "${!hookName}"

From 422579f718bae4ca3fb708116ce76c8d3499eaa3 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Wed, 23 Jun 2021 16:27:54 +0900
Subject: [PATCH 096/330] shellcheck disable=SC2154

https://github.com/koalaman/shellcheck/wiki/SC2154
---
 pkgs/stdenv/generic/setup.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 06bdaeaab2ba..730a043b9597 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -141,6 +141,7 @@ exitHandler() {
         # normally.  Otherwise, return the original exit code.
         if [ -n "${succeedOnFailure:-}" ]; then
             echo "build failed with exit code $exitCode (ignored)"
+            # shellcheck disable=SC2154
             mkdir -p "$out/nix-support"
             printf "%s" "$exitCode" > "$out/nix-support/failed"
             exit 0
@@ -245,6 +246,7 @@ shopt -s nullglob
 # Set up the initial path.
 PATH=
 HOST_PATH=
+# shellcheck disable=SC2154
 for i in $initialPath; do
     if [ "$i" = / ]; then i=; fi
     addToSearchPath PATH "$i/bin"
@@ -1031,6 +1033,7 @@ buildPhase() {
     else
         foundMakefile=1
         IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
+        # shellcheck disable=SC2154
         IFS=" " read -r -a buildFlagsTemp <<< "$buildFlags"
         local -a flagsArray=(
             ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
@@ -1101,7 +1104,9 @@ installPhase() {
         mkdir -p "$prefix"
     fi
     IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
+    # shellcheck disable=SC2154
     IFS=" " read -r -a installFlagsTemp <<< "$installFlags"
+    # shellcheck disable=SC2154
     IFS=" " read -r -a installTargetsTemp <<< "${installTargets:-install}"
     local -a flagsArray=(
         SHELL="$SHELL"
@@ -1164,6 +1169,7 @@ fixupPhase() {
 
         [[ "${!propagatedInputsSlice}" ]] || continue
 
+        # shellcheck disable=SC2154
         mkdir -p "${!outputDev}/nix-support"
         # shellcheck disable=SC2086
         printWords ${!propagatedInputsSlice} > "${!outputDev}/nix-support/$propagatedInputsFile"
@@ -1191,6 +1197,7 @@ fixupPhase() {
     # Propagate user-env packages into the output with binaries, TODO?
 
     if [ -n "${propagatedUserEnvPkgs:-}" ]; then
+        # shellcheck disable=SC2154
         mkdir -p "${!outputBin}/nix-support"
         # shellcheck disable=SC2086
         printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages"
@@ -1211,6 +1218,7 @@ installCheckPhase() {
         echo "no installcheck target in ${makefile:-Makefile}, doing nothing"
     else
         IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
+        # shellcheck disable=SC2154
         IFS=" " read -r -a installCheckFlagsTemp <<< "$installCheckFlags"
         IFS=" " read -r -a installCheckTargetTemp <<< "${installCheckTarget:-installcheck}"
         local -a flagsArray=(
@@ -1235,6 +1243,7 @@ installCheckPhase() {
 distPhase() {
     runHook preDist
 
+    # shellcheck disable=SC2154
     IFS=" " read -r -a distFlagsTemp <<< "$distFlags"
 
     local flagsArray=(

From 796f1cdbeaad49d925113582281091cd57e4cb4d Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Wed, 23 Jun 2021 16:29:07 +0900
Subject: [PATCH 097/330] shellcheck disable=SC2148

https://github.com/koalaman/shellcheck/wiki/SC2148
---
 pkgs/stdenv/generic/setup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 730a043b9597..ee44e7faa8df 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1,3 +1,4 @@
+# shellcheck disable=SC2148
 set -eu
 set -o pipefail
 

From 8dbbd8fbe35af1abdef13c9644d66fede07dc870 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Wed, 23 Jun 2021 16:31:16 +0900
Subject: [PATCH 098/330] setup.sh: shellcheck disable=SC1090

https://github.com/koalaman/shellcheck/wiki/SC1090
---
 pkgs/stdenv/generic/setup.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index ee44e7faa8df..42bfe4be5f18 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -70,6 +70,7 @@ _callImplicitHook() {
     if declare -F "$hookName" > /dev/null; then
         "$hookName"
     elif test -e "$hookName" ; then
+        # shellcheck disable=SC1090
         source "$hookName"
     elif [ -n "${!hookName:-}" ]; then
         eval "${!hookName}"
@@ -484,6 +485,7 @@ activatePackage() {
     (( "$hostOffset" <= "$targetOffset" )) || exit 1
 
     if [ -f "$pkg" ]; then
+        # shellcheck disable=SC1090
         source "$pkg"
     fi
 
@@ -1287,6 +1289,7 @@ showPhaseHeader() {
 
 genericBuild() {
     if [ -f "${buildCommandPath:-}" ]; then
+        # shellcheck disable=SC1090
         source "$buildCommandPath"
         return
     fi

From 958c180d1f13eb94495edef7c64c0b7092fcf315 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Wed, 23 Jun 2021 16:32:00 +0900
Subject: [PATCH 099/330] setup.sh: shellcheck disable=SC2123

https://github.com/koalaman/shellcheck/wiki/SC2123
---
 pkgs/stdenv/generic/setup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 42bfe4be5f18..17d2e56a9be5 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -246,6 +246,7 @@ shopt -s nullglob
 
 
 # Set up the initial path.
+# shellcheck disable=SC2123
 PATH=
 HOST_PATH=
 # shellcheck disable=SC2154

From 5f015430709fe441efdf60834cafe912c7dd91b7 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Wed, 23 Jun 2021 16:34:11 +0900
Subject: [PATCH 100/330] setup.sh: fatal: Invalid integer constant
 'relHostOffset'

dereference variables passed to mapOffset
---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 17d2e56a9be5..e3ddf07fde1b 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -405,7 +405,7 @@ findInputs() {
 
         # Host offset relative to the package currently being
         # built---as absolute an offset as will be used.
-        mapOffset relHostOffset
+        mapOffset "$relHostOffset"
         local hostOffsetNext="$mapOffsetResult"
 
         # Ensure we're in bounds relative to the package currently
@@ -424,7 +424,7 @@ findInputs() {
 
             # Target offset relative to the package currently being
             # built.
-            mapOffset relTargetOffset
+            mapOffset "$relTargetOffset"
             local targetOffsetNext="$mapOffsetResult"
 
             # Once again, ensure we're in bounds relative to the

From faca9440fba4c823d0714e14b93ba394fe739191 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Wed, 23 Jun 2021 16:35:59 +0900
Subject: [PATCH 101/330] setup.sh: add quotes where semantically valid

---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index e3ddf07fde1b..e2778071034d 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1218,7 +1218,7 @@ installCheckPhase() {
         echo "no Makefile or custom installCheckPhase, doing nothing"
     #TODO(@oxij): should flagsArray influence make -n?
     elif [[ -z "${installCheckTarget:-}" ]] \
-       && ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then
+       && ! make -n ${makefile:+-f $makefile} "${installCheckTarget:-installcheck}" >/dev/null 2>&1; then
         echo "no installcheck target in ${makefile:-Makefile}, doing nothing"
     else
         IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
@@ -1253,7 +1253,7 @@ distPhase() {
     local flagsArray=(
         "${distFlagsTemp[@]}"
         ${distFlagsArray+"${distFlagsArray[@]}"}
-        ${distTarget:-dist}
+        "${distTarget:-dist}"
     )
 
     echo 'dist flags: %q' "${flagsArray[@]}"

From 740582739c6153924a33a9b4867f15d2ef7a2441 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Thu, 24 Jun 2021 13:45:33 +0900
Subject: [PATCH 102/330] setup.sh: missing white space

---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index e2778071034d..b668d9e7a2ad 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -494,7 +494,7 @@ activatePackage() {
     # build platform are included here. That would be `depsBuild*`,
     # and legacy `nativeBuildInputs`, in general. If we aren't cross
     # compiling, however, everything can be put on the PATH. To ease
-    # the transition, we do include everything in thatcase.
+    # the transition, we do include everything in that case.
     #
     # TODO(@Ericson2314): Don't special-case native compilation
     if [[ -z "${strictDeps-}" || "$hostOffset" -le -1 ]]; then

From b1c5a9f008d084dbeb6f4596dd817b753b4ba249 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Thu, 24 Jun 2021 13:47:42 +0900
Subject: [PATCH 103/330] setup.sh: shellcheck disable=SC2034

https://github.com/koalaman/shellcheck/wiki/SC2034
---
 pkgs/stdenv/generic/setup.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index b668d9e7a2ad..4f87ec0bd8bc 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1190,6 +1190,8 @@ fixupPhase() {
         mkdir -p "${!outputDev}/nix-support"
         local hook
         for hook in $setupHooks; do
+            # content is being assigned to in the following lines
+            # shellcheck disable=SC2034
             local content
             consumeEntire content < "$hook"
             substituteAllStream content "file '$hook'" >> "${!outputDev}/nix-support/setup-hook"

From 4e3d905b0d9c7f55fcb150c4da941d61bc67ac4b Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Thu, 24 Jun 2021 13:53:49 +0900
Subject: [PATCH 104/330] move-docs.sh: shellcheck 2166
 https://github.com/koalaman/shellcheck/wiki/SC2166

---
 pkgs/build-support/setup-hooks/move-docs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh
index ef31dcdce274..379882ec767c 100644
--- a/pkgs/build-support/setup-hooks/move-docs.sh
+++ b/pkgs/build-support/setup-hooks/move-docs.sh
@@ -6,7 +6,7 @@ preFixupHooks+=(_moveToShare)
 
 _moveToShare() {
     forceShare=${forceShare:=man doc info}
-    if [ -z "$forceShare" -o -z "$out" ]; then return; fi
+    if [ -z "$forceShare" ] || [ -z "$out" ]; then return; fi
 
     for d in $forceShare; do
         if [ -d "$out/$d" ]; then

From a7d7e40c00ebc73bdb4fbdd70a77f3e65b88e268 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Thu, 24 Jun 2021 13:54:15 +0900
Subject: [PATCH 105/330] move-docs.sh: quote where semanticaly valid

---
 pkgs/build-support/setup-hooks/move-docs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh
index 379882ec767c..e4bfc13fc491 100644
--- a/pkgs/build-support/setup-hooks/move-docs.sh
+++ b/pkgs/build-support/setup-hooks/move-docs.sh
@@ -14,8 +14,8 @@ _moveToShare() {
                 echo "both $d/ and share/$d/ exist!"
             else
                 echo "moving $out/$d to $out/share/$d"
-                mkdir -p $out/share
-                mv $out/$d $out/share/
+                mkdir -p "$out/share"
+                mv "$out/$d" "$out/share/"
             fi
         fi
     done

From 2bf424d6cc091cc06fe9a2b0226b4ab7f5410b97 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Thu, 24 Jun 2021 19:37:05 +0900
Subject: [PATCH 106/330] autopatchelf.sh: add link about grep -q

---
 pkgs/build-support/setup-hooks/auto-patchelf.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 511371931de8..70b1fc802b56 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -29,6 +29,7 @@ isExecutable() {
     isExeResult="$(LANG=C $READELF -h -l "$1" 2> /dev/null \
         | grep '^ *Type: *EXEC\>\|^ *INTERP\>')"
     # not using grep -q, because it can cause Broken pipe
+    # https://unix.stackexchange.com/questions/305547/broken-pipe-when-grepping-output-but-only-with-i-flag
     [ -n "$isExeResult" ]
 }
 

From 1a71a5fb082c6cfeeccedd8f5c06b0d77a57463c Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Thu, 24 Jun 2021 19:48:45 +0900
Subject: [PATCH 107/330] setup.sh: shellcheck disable=SC1091

https://github.com/koalaman/shellcheck/wiki/SC1091
---
 pkgs/stdenv/generic/setup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 4f87ec0bd8bc..388fcbaf7d84 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -510,6 +510,7 @@ activatePackage() {
     fi
 
     if [[ -f "$pkg/nix-support/setup-hook" ]]; then
+        # shellcheck disable=SC1091
         source "$pkg/nix-support/setup-hook"
     fi
 }

From bf99a819a16089a8df03cc06262f06b31dfb683c Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Thu, 24 Jun 2021 19:52:02 +0900
Subject: [PATCH 108/330] setup.sh: fatal: This word should yield a string, but
 it contains an array

remove implicit array comparison in case
---
 pkgs/stdenv/generic/setup.sh | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 388fcbaf7d84..83a623ef0801 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -364,16 +364,13 @@ findInputs() {
     local var="${!varRef}"
     unset -v varVar varRef
 
-    # TODO(@Ericson2314): Restore using associative array once Darwin
-    # nix-shell doesn't use impure bash. This should replace the O(n)
-    # case with an O(1) hash map lookup, assuming bash is implemented
-    # well :D.
-    local varSlice="${var}[*]"
-    # ${..-} to hack around old bash empty array problem
-    case "${!varSlice-}" in
-        *" $pkg "*) return 0 ;;
-    esac
-    unset -v varSlice
+    # var is a reference to an array and can sometimes be undefined
+    # so checking the array with "${!var}[@]" does not work
+    # check if $pkgs is in the var ref array
+    # TODO(@Ericson2314): Restore using associative array
+    if [[ "${var}[*]" = *" $pkg "* ]]; then
+        return 0
+    fi
 
     eval "$var"'+=("$pkg")'
 

From 9f156d0adc269b92f1badb2093b7773e3deae440 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Fri, 25 Jun 2021 19:12:58 +0900
Subject: [PATCH 109/330] setup.sh: fatal: Undefined variable

define hook arrays before assigning to them
---
 pkgs/stdenv/generic/setup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 83a623ef0801..b598fc9b47b7 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -312,6 +312,10 @@ declare -a pkgTargetHookVars=(envTargetTargetHook)
 
 declare -a pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars)
 
+# those variables are declared here, since where and if they are used varies
+# shellcheck disable=SC2034
+declare -a preFixupHooks fixupOutputHooks preConfigureHooks postFixupHooks postUnpackHooks unpackCmdHooks
+
 # Add env hooks for all sorts of deps with the specified host offset.
 addEnvHooks() {
     local depHostOffset="$1"

From db78412f25e533f8f73fe9af70fdfb3c98c7e143 Mon Sep 17 00:00:00 2001
From: Raphael Megzari <raphael@megzari.com>
Date: Sat, 26 Jun 2021 12:55:08 +0900
Subject: [PATCH 110/330] prefer [[ over [ for multiple conditionals

Co-authored-by: Jonas Chevalier <zimbatm@zimbatm.com>
---
 pkgs/build-support/setup-hooks/move-docs.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh
index e4bfc13fc491..9e1bc26cdf12 100644
--- a/pkgs/build-support/setup-hooks/move-docs.sh
+++ b/pkgs/build-support/setup-hooks/move-docs.sh
@@ -6,7 +6,7 @@ preFixupHooks+=(_moveToShare)
 
 _moveToShare() {
     forceShare=${forceShare:=man doc info}
-    if [ -z "$forceShare" ] || [ -z "$out" ]; then return; fi
+    if [[ -z "$forceShare" || -z "$out" ]]; then return; fi
 
     for d in $forceShare; do
         if [ -d "$out/$d" ]; then
@@ -20,4 +20,3 @@ _moveToShare() {
         fi
     done
 }
-

From db37d37d8454fabe08361aff444426b8b2bca4b2 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Sat, 26 Jun 2021 04:40:07 +0900
Subject: [PATCH 111/330] reproducible-builds.sh: fatal: += not allowed in
 assignment

take in account undefined case
assign and export in separate step
https://github.com/koalaman/shellcheck/wiki/SC2155
---
 pkgs/build-support/setup-hooks/reproducible-builds.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/reproducible-builds.sh b/pkgs/build-support/setup-hooks/reproducible-builds.sh
index 5b01c213fe4a..29efd22d9051 100644
--- a/pkgs/build-support/setup-hooks/reproducible-builds.sh
+++ b/pkgs/build-support/setup-hooks/reproducible-builds.sh
@@ -1,9 +1,13 @@
+# shellcheck disable=SC2148
 # Use the last part of the out path as hash input for the build.
 # This should ensure that it is deterministic across rebuilds of the same
 # derivation and not easily collide with other builds.
 # We also truncate the hash so that it cannot cause reference cycles.
-export NIX_CFLAGS_COMPILE+=" -frandom-seed=$(
+# NIX_CFLAGS_COMPILE might not have been defined before
+NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE:-} -frandom-seed=$(
+    # shellcheck disable=SC2154
     outbase="${out##*/}"
     randomseed="${outbase:0:10}"
-    echo $randomseed
+    echo "$randomseed"
 )"
+export NIX_CFLAGS_COMPILE

From 1f255cbe5c3d8b2e370938fcd30fe922767f41fe Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Sat, 26 Jun 2021 17:50:48 +0900
Subject: [PATCH 112/330] setup.sh: arithmetic conditional style

used "recommended" arithmetic conditional style
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index b598fc9b47b7..b1da14c9b9d7 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -644,7 +644,7 @@ export NIX_INDENT_MAKE=1
 
 if [ -z "${NIX_BUILD_CORES:-}" ]; then
   NIX_BUILD_CORES="1"
-elif [ "$NIX_BUILD_CORES" -le 0 ]; then
+elif (( "$NIX_BUILD_CORES" <= 0 )); then
   NIX_BUILD_CORES=$(nproc 2>/dev/null || true)
   if expr >/dev/null 2>&1 "$NIX_BUILD_CORES" : "^[0-9][0-9]*$"; then
     :

From 5617feb330e7cb024b4fe5ecd0a927d7c007e5a8 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Sat, 26 Jun 2021 17:53:14 +0900
Subject: [PATCH 113/330] setup.sh: remove extraneous cat cmd

---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index b1da14c9b9d7..0db99ad53944 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -125,7 +125,7 @@ exitHandler() {
     if [ -n "${showBuildStats:-}" ]; then
         times > "$NIX_BUILD_TOP/.times"
         local -a buildTimesArray
-        IFS=" " read -r -a buildTimesArray <<< "$(cat "$NIX_BUILD_TOP/.times")"
+        IFS=" " read -r -a buildTimesArray < "$NIX_BUILD_TOP/.times"
         # Print the following statistics:
         # - user time for the shell
         # - system time for the shell

From fc5438bfcf243226065fe1cbcbee7d43e9550e31 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Sat, 26 Jun 2021 17:55:05 +0900
Subject: [PATCH 114/330] setup.sh: use [[ for combined conditionals

---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 0db99ad53944..ea1b5326f3b7 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -657,11 +657,11 @@ export NIX_BUILD_CORES
 
 # Prevent SSL libraries from using certificates in /etc/ssl, unless set explicitly.
 # Leave it in impure shells for convenience.
-if [ -z "${NIX_SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then
+if [[ -z "${NIX_SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then
   export NIX_SSL_CERT_FILE=/no-cert-file.crt
 fi
 # Another variant left for compatibility.
-if [ -z "${SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then
+if [[ -z "${SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then
   export SSL_CERT_FILE=/no-cert-file.crt
 fi
 

From 5f8b5465e1ffb9e4eb59df548b217130ca065618 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Sat, 26 Jun 2021 17:55:37 +0900
Subject: [PATCH 115/330] setup.sh: remove bash empty array old hack

---
 pkgs/stdenv/generic/setup.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index ea1b5326f3b7..81e93f86e9ba 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -564,12 +564,12 @@ _addToEnv() {
                 #
                 # TODO(@Ericson2314): Don't special-case native compilation
                 for pkg in \
-                    ${pkgsBuildBuild+"${pkgsBuildBuild[@]}"} \
-                    ${pkgsBuildHost+"${pkgsBuildHost[@]}"} \
-                    ${pkgsBuildTarget+"${pkgsBuildTarget[@]}"} \
-                    ${pkgsHostHost+"${pkgsHostHost[@]}"} \
-                    ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \
-                    ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"}
+                    "${pkgsBuildBuild[@]}" \
+                    "${pkgsBuildHost[@]}" \
+                    "${pkgsBuildTarget[@]}" \
+                    "${pkgsHostHost[@]}" \
+                    "${pkgsHostTarget[@]}" \
+                    "${pkgsTargetTarget[@]}"
                 do
                     if [[ "$visitedPkgs" = *"$pkg"* ]]; then
                         continue
@@ -1014,7 +1014,7 @@ configurePhase() {
         IFS=" " read -r -a configureFlagsTemp <<< "$configureFlags"
         local -a flagsArray=(
             "${configureFlagsTemp[@]}"
-            ${configureFlagsArray+"${configureFlagsArray[@]}"}
+            "${configureFlagsArray[@]}"
         )
         echoCmd 'configure flags' "${flagsArray[@]}"
         # shellcheck disable=SC2086
@@ -1045,9 +1045,9 @@ buildPhase() {
             ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
             SHELL="$SHELL"
             "${makeFlagsTemp[@]}"
-            ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            "${makeFlagsArray[@]}"
             "${buildFlagsTemp[@]}"
-            ${buildFlagsArray+"${buildFlagsArray[@]}"}
+            "${buildFlagsArray[@]}"
         )
 
         echoCmd 'build flags' "${flagsArray[@]}"
@@ -1087,9 +1087,9 @@ checkPhase() {
             ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
             SHELL="$SHELL"
             "${makeFlagsTemp[@]}"
-            ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            "${makeFlagsArray[@]}"
             "${checkFlagsTemp[@]}"
-            ${checkFlagsArray+"${checkFlagsArray[@]}"}
+            "${checkFlagsArray[@]}"
             "${checkTargetTemp[@]}"
         )
 
@@ -1117,9 +1117,9 @@ installPhase() {
     local -a flagsArray=(
         SHELL="$SHELL"
         "${makeFlagsTemp[@]}"
-        ${makeFlagsArray+"${makeFlagsArray[@]}"}
+        "${makeFlagsArray[@]}"
         "${installFlagsTemp[@]}"
-        ${installFlagsArray+"${installFlagsArray[@]}"}
+        "${installFlagsArray[@]}"
         "${installTargetsTemp[@]}"
     )
 
@@ -1233,9 +1233,9 @@ installCheckPhase() {
             ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
             SHELL="$SHELL"
             "${makeFlagsTemp[@]}"
-            ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            "${makeFlagsArray[@]}"
             "${installCheckFlagsTemp[@]}"
-            ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
+            "${installCheckFlagsArray[@]}"
             "${installCheckTargetTemp[@]}"
         )
 

From caeb3c915fa559dc86c2704e896c600336dda1c8 Mon Sep 17 00:00:00 2001
From: Raphael Megzari <raphael@megzari.com>
Date: Sun, 27 Jun 2021 11:08:26 +0900
Subject: [PATCH 116/330] Update pkgs/stdenv/generic/setup.sh

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 81e93f86e9ba..aa1e23f2666c 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1,4 +1,4 @@
-# shellcheck disable=SC2148
+# shellcheck shell=bash
 set -eu
 set -o pipefail
 

From 8ebfafbce86b1235961309079d6917b170226dd0 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Sun, 27 Jun 2021 19:27:35 +0900
Subject: [PATCH 117/330] shellcheck: shell=bash

---
 pkgs/build-support/setup-hooks/make-symlinks-relative.sh | 1 +
 pkgs/build-support/setup-hooks/multiple-outputs.sh       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
index 0608d3ca81c4..fd65f2e8e13b 100644
--- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
+++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
@@ -1,3 +1,4 @@
+# shellcheck shell=bash
 fixupOutputHooks+=(_makeSymlinksRelative)
 
 # For every symlink in $output that refers to another file in $output
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index bfa47e3b20e1..babcd7cdd6cd 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -1,3 +1,4 @@
+# shellcheck shell=bash
 # The base package for automatic multiple-output splitting. Used in stdenv as well.
 preConfigureHooks+=(_multioutConfig)
 preFixupHooks+=(_multioutDocs)

From ef76a5e009d3e7ff7a9f3788739d3dd331dd332f Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Sun, 27 Jun 2021 19:28:37 +0900
Subject: [PATCH 118/330] autoreconf.sh: define preConfigurePhases before
 assigning

---
 pkgs/build-support/setup-hooks/autoreconf.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh
index c08cab158688..4ba4025a02e6 100644
--- a/pkgs/build-support/setup-hooks/autoreconf.sh
+++ b/pkgs/build-support/setup-hooks/autoreconf.sh
@@ -1,4 +1,5 @@
-preConfigurePhases+=" autoreconfPhase"
+# shellcheck shell=bash
+preConfigurePhases="${preConfigurePhases:-} autoreconfPhase"
 
 autoreconfPhase() {
     runHook preAutoreconf

From 06688b73ca661c0d7daa09355abc10c694164943 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Mon, 28 Jun 2021 22:43:23 +0900
Subject: [PATCH 119/330] setup.sh: separate command from combined conditional

---
 pkgs/stdenv/generic/setup.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index aa1e23f2666c..0db3a3f1254f 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -996,17 +996,19 @@ configurePhase() {
         configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 
-    # Add --disable-dependency-tracking to speed up some builds.
-    if [ -z "${dontAddDisableDepTrack:-}" ]; then
-        if [ -f "$configureScript" ] && grep -q dependency-tracking "$configureScript"; then
-            configureFlags="--disable-dependency-tracking $configureFlags"
+    if [ -f "$configureScript" ]; then
+        # Add --disable-dependency-tracking to speed up some builds.
+        if [ -z "${dontAddDisableDepTrack:-}" ]; then
+            if grep -q dependency-tracking "$configureScript"; then
+                configureFlags="--disable-dependency-tracking $configureFlags"
+            fi
         fi
-    fi
 
-    # By default, disable static builds.
-    if [ -z "${dontDisableStatic:-}" ]; then
-        if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then
-            configureFlags="--disable-static $configureFlags"
+        # By default, disable static builds.
+        if [ -z "${dontDisableStatic:-}" ]; then
+            if grep -q enable-static "$configureScript"; then
+                configureFlags="--disable-static $configureFlags"
+            fi
         fi
     fi
 

From 6d52db43d4a65857eadcd51596aa29e7b5e24102 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Mon, 28 Jun 2021 22:44:01 +0900
Subject: [PATCH 120/330] setup-hook.sh: use eval for dynamic variable export

---
 pkgs/build-support/bintools-wrapper/setup-hook.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh
index 7e9547b96c25..ba09d19b1f26 100644
--- a/pkgs/build-support/bintools-wrapper/setup-hook.sh
+++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh
@@ -1,3 +1,4 @@
+# shellcheck shell=bash
 # Binutils Wrapper hygiene
 #
 # See comments in cc-wrapper's setup hook. This works exactly the same way.
@@ -14,7 +15,9 @@ bintoolsWrapper_addLDVars () {
     getHostRoleEnvHook
 
     if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then
-        export NIX_LDFLAGS${role_post}+=" -L$1/lib64"
+        varName=NIX_LDFLAGS${role_post}
+        eval "$varName=\"${!varName:-} -L$1/lib64\""
+        export "${varName?}"
     fi
 
     if [[ -d "$1/lib" ]]; then
@@ -24,7 +27,9 @@ bintoolsWrapper_addLDVars () {
         # directories and bloats the size of the environment variable space.
         local -a glob=( $1/lib/lib* )
         if [ "${#glob[*]}" -gt 0 ]; then
-            export NIX_LDFLAGS${role_post}+=" -L$1/lib"
+            varName=NIX_LDFLAGS${role_post}
+            eval "$varName=\"${!varName:-} -L$1/lib\""
+            export "${varName?}"
         fi
     fi
 }

From 44819162e89ffb6119277766ad9a4ab48b427b8e Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 29 Jun 2021 11:20:58 +0900
Subject: [PATCH 121/330] multiple-outputs.sh: remove grep from combined
 conditional

---
 .../build-support/setup-hooks/multiple-outputs.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index babcd7cdd6cd..91f056cc89bd 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -48,22 +48,25 @@ _overrideFirst outputInfo "info" "$outputBin"
 
 # Add standard flags to put files into the desired outputs.
 _multioutConfig() {
-    if [ "$outputs" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi;
+    if [[ "$outputs" = "out" || -z "${setOutputFlags-1}" ]]; then
+        return
+    fi
 
     # try to detect share/doc/${shareDocName}
     # Note: sadly, $configureScript detection comes later in configurePhase,
     #   and reordering would cause more trouble than worth.
     if [ -z "$shareDocName" ]; then
         local confScript="$configureScript"
-        if [ -z "$confScript" ] && [ -x ./configure ]; then
+        if [[ -z "$confScript" && -x ./configure ]]; then
             confScript=./configure
         fi
         if [ -f "$confScript" ]; then
             local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")"
-        fi
-                                    # PACKAGE_TARNAME sometimes contains garbage.
-        if [ -z "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then
-            shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"
+            # PACKAGE_TARNAME sometimes contains garbage.
+            # verify that shareDocName contains only valid characters
+            if ! [[ $shareDocName =~ ^[a-zA-Z0f9_-]+$ ]]; then
+                shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"
+            fi
         fi
     fi
 

From bcdfbfa19fe0c352a99a60ad73f3b6e8d3b545d2 Mon Sep 17 00:00:00 2001
From: Raphael Megzari <raphael@megzari.com>
Date: Wed, 30 Jun 2021 13:23:26 +0900
Subject: [PATCH 122/330] Update pkgs/stdenv/generic/setup.sh: group var
 declaration

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/stdenv/generic/setup.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 0db3a3f1254f..dfb1640f1fd5 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -517,8 +517,7 @@ activatePackage() {
 }
 
 _activatePkgs() {
-    local hostOffset targetOffset
-    local pkg
+    local hostOffset targetOffset pkg
 
     for hostOffset in "${allPlatOffsets[@]}"; do
         local pkgsVar="${pkgAccumVarVars[$(( hostOffset + 1 ))]}"

From 80c9096d9cbed8f8cc5ae67106ef3f5bd9399d71 Mon Sep 17 00:00:00 2001
From: Raphael Megzari <raphael@megzari.com>
Date: Wed, 30 Jun 2021 13:23:45 +0900
Subject: [PATCH 123/330] Update pkgs/stdenv/generic/setup.sh: group var
 declaration

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/stdenv/generic/setup.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index dfb1640f1fd5..a2ac8b0504ef 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -544,8 +544,7 @@ _activatePkgs
 # with this information to the relevant env hook array, but bash
 # doesn't have closures, so it's easier to just pass this in.
 _addToEnv() {
-    local depHostOffset depTargetOffset
-    local pkg
+    local depHostOffset depTargetOffset pkg
 
     for depHostOffset in "${allPlatOffsets[@]}"; do
         local hookVar="${pkgHookVarVars[$(( depHostOffset + 1 ))]}"

From 2c3b847d29a3600096734da1e550e319bfbc6835 Mon Sep 17 00:00:00 2001
From: Raphael Megzari <raphael@megzari.com>
Date: Wed, 30 Jun 2021 13:24:25 +0900
Subject: [PATCH 124/330] Update pkgs/stdenv/generic/setup.sh: use [[ instead
 of [

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a2ac8b0504ef..7499a46a03b7 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -996,7 +996,7 @@ configurePhase() {
 
     if [ -f "$configureScript" ]; then
         # Add --disable-dependency-tracking to speed up some builds.
-        if [ -z "${dontAddDisableDepTrack:-}" ]; then
+        if [[ -z ${dontAddDisableDepTrack:-} ]]; then
             if grep -q dependency-tracking "$configureScript"; then
                 configureFlags="--disable-dependency-tracking $configureFlags"
             fi

From cf5882f27c249f843a357f2da58c763c94b804c1 Mon Sep 17 00:00:00 2001
From: Raphael Megzari <raphael@megzari.com>
Date: Wed, 30 Jun 2021 13:24:48 +0900
Subject: [PATCH 125/330] Update pkgs/stdenv/generic/setup.sh:use [[ instead of
 [

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 7499a46a03b7..3515439337c6 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1003,7 +1003,7 @@ configurePhase() {
         fi
 
         # By default, disable static builds.
-        if [ -z "${dontDisableStatic:-}" ]; then
+        if [[ -z ${dontDisableStatic:-} ]]; then
             if grep -q enable-static "$configureScript"; then
                 configureFlags="--disable-static $configureFlags"
             fi

From 8752c327377b581f203f85c6d31cd8fb0c0777ee Mon Sep 17 00:00:00 2001
From: Raphael Megzari <raphael@megzari.com>
Date: Wed, 30 Jun 2021 13:32:55 +0900
Subject: [PATCH 126/330] Update pkgs/build-support/setup-hooks/move-docs.sh:
 remove quote in conditional

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/build-support/setup-hooks/move-docs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh
index 9e1bc26cdf12..965c16be2f62 100644
--- a/pkgs/build-support/setup-hooks/move-docs.sh
+++ b/pkgs/build-support/setup-hooks/move-docs.sh
@@ -6,7 +6,7 @@ preFixupHooks+=(_moveToShare)
 
 _moveToShare() {
     forceShare=${forceShare:=man doc info}
-    if [[ -z "$forceShare" || -z "$out" ]]; then return; fi
+    if [[ -z $forceShare || -z $out ]]; then return; fi
 
     for d in $forceShare; do
         if [ -d "$out/$d" ]; then

From e202771a892e8d2156bed2ec1c085dbeeda6faa1 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Thu, 1 Jul 2021 23:37:44 -0400
Subject: [PATCH 127/330] pythonPackages.pillow: 8.2.0 -> 8.3.0

add support for defusedxml
---
 pkgs/development/python-modules/pillow/default.nix | 6 +++---
 pkgs/development/python-modules/pillow/generic.nix | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 0f747a8d73e0..ea568aff6a8c 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -1,17 +1,17 @@
 { lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k
-, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
+, defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook
 }@args:
 
 import ./generic.nix (rec {
   pname = "Pillow";
-  version = "8.2.0";
+  version = "8.3.0";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qf3bz1sfz58ff6hclg8phgqyy210x3aqdk5yzjr8m5vsw8ap1x7";
+    sha256 = "0ikwwh8lx08rag1yjkfhf33zlk67vas7l7kblkp6dqzk0vi0cdl0";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix
index 64ae91895593..3e33f1a8aa0f 100644
--- a/pkgs/development/python-modules/pillow/generic.nix
+++ b/pkgs/development/python-modules/pillow/generic.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
     "test_custom_metadata"
   ];
 
-  propagatedBuildInputs = [ olefile ];
+  propagatedBuildInputs = [ olefile ]
+    ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ];
 
   checkInputs = [ pytestCheckHook pyroma numpy ];
 

From 6635489576e4ef70a819d6dd8a355977841ecf64 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 6 Jul 2021 04:20:00 +0000
Subject: [PATCH 128/330] python38Packages.pillow: 8.3.0 -> 8.3.1

https://pillow.readthedocs.io/en/stable/releasenotes/8.3.1.html
---
 pkgs/development/python-modules/pillow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index ea568aff6a8c..af6c3d80deaf 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -5,13 +5,13 @@
 
 import ./generic.nix (rec {
   pname = "Pillow";
-  version = "8.3.0";
+  version = "8.3.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ikwwh8lx08rag1yjkfhf33zlk67vas7l7kblkp6dqzk0vi0cdl0";
+    sha256 = "2cac53839bfc5cece8fdbe7f084d5e3ee61e1303cccc86511d351adcb9e2c792";
   };
 
   meta = with lib; {

From 5a71fa84478ae86d2306aba0e9c4d79d1970ecb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 30 Jun 2021 19:47:13 +0200
Subject: [PATCH 129/330] stdenv bootstrap: hack around glibc version mismatch

With this we shouldn't need other workarounds for the LTO problems.
---
 pkgs/stdenv/linux/default.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 63a37d54547d..1fbd3cba27ef 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -258,6 +258,25 @@ in
         # Rewrap the binutils with the new glibc, so both the next
         # stage's wrappers use it.
         libc = getLibc self;
+
+        # Unfortunately, when building gcc in the next stage, its LTO plugin
+        # would use the final libc but `ld` would use the bootstrap one,
+        # and that can fail to load.  Therefore we upgrade `ld` to use newer libc;
+        # apparently the interpreter needs to match libc, too.
+        bintools = self.stdenvNoCC.mkDerivation {
+          inherit (prevStage.bintools.bintools) name;
+          dontUnpack = true;
+          dontBuild = true;
+          # We wouldn't need to *copy* all, but it's easier and the result is temporary anyway.
+          installPhase = ''
+            mkdir -p "$out"/bin
+            cp -a '${prevStage.bintools.bintools}'/bin/* "$out"/bin/
+            chmod +w "$out"/bin/ld.bfd
+            patchelf --set-interpreter '${getLibc self}'/lib/ld*.so.? \
+              --set-rpath "${getLibc self}/lib:$(patchelf --print-rpath "$out"/bin/ld.bfd)" \
+              "$out"/bin/ld.bfd
+          '';
+        };
       };
     };
   })

From acdcb8566ae560752a8a1ce3aacc617a3da6cdd5 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Mon, 1 Feb 2021 15:13:38 -0800
Subject: [PATCH 130/330] glibc: 2.32-46 -> 2.33-45

---
 .../libraries/glibc/2.32-master.patch.gz      | Bin 66850 -> 0 bytes
 .../libraries/glibc/2.33-master.patch.gz      | Bin 0 -> 55158 bytes
 pkgs/development/libraries/glibc/common.nix   |  16 ++---
 .../glibc/dont-use-system-ld-so-cache.patch   |  60 ++++++++++++------
 4 files changed, 47 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc/2.32-master.patch.gz
 create mode 100644 pkgs/development/libraries/glibc/2.33-master.patch.gz

diff --git a/pkgs/development/libraries/glibc/2.32-master.patch.gz b/pkgs/development/libraries/glibc/2.32-master.patch.gz
deleted file mode 100644
index 8ea998b5bea2cb66113573133190ff3a75fd51d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 66850
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%0AtLd6xYaXu07X!q9O#PioIjmp
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
IlJMFC0CBN~BLDyZ

diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz
new file mode 100644
index 0000000000000000000000000000000000000000..610f49d225928a4c7aa6c64cf234b74400f4fe0d
GIT binary patch
literal 55158
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
L@%tilzaIkt#C6Sr

literal 0
HcmV?d00001

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 7725a3e4bf2e..3a5da0afc744 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -41,9 +41,9 @@
 } @ args:
 
 let
-  version = "2.32";
-  patchSuffix = "-48";
-  sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn";
+  version = "2.33";
+  patchSuffix = "-45";
+  sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8=";
 in
 
 assert withLinuxHeaders -> linuxHeaders != null;
@@ -60,14 +60,14 @@ stdenv.mkDerivation ({
   patches =
     [
       /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
-          $ git fetch --all -p && git checkout origin/release/2.32/master && git describe
-          glibc-2.32-48-g16949aeaa0
-          $ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz
+          $ git fetch --all -p && git checkout origin/release/2.33/master && git describe
+          glibc-2.33-45-g58b90461ae
+          $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz
 
          To compare the archive contents zdiff can be used.
-          $ zdiff -u 2.32-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz
+          $ zdiff -u 2.33-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz
        */
-      ./2.32-master.patch.gz
+      ./2.33-master.patch.gz
 
       /* Allow NixOS and Nix to handle the locale-archive. */
       ./nix-locale-archive.patch
diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch
index f84b1049adf8..0e0315aca270 100644
--- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch
+++ b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch
@@ -1,19 +1,8 @@
-diff -Naur glibc-2.27-orig/elf/ldconfig.c glibc-2.27/elf/ldconfig.c
---- glibc-2.27-orig/elf/ldconfig.c	2018-02-01 11:17:18.000000000 -0500
-+++ glibc-2.27/elf/ldconfig.c	2018-02-17 22:43:17.232175182 -0500
-@@ -51,7 +51,7 @@
- #endif
- 
- #ifndef LD_SO_CONF
--# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
-+# define LD_SO_CONF PREFIX "/etc/ld.so.conf"
- #endif
- 
- /* Get libc version number.  */
-diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile
---- glibc-2.27-orig/elf/Makefile	2018-02-01 11:17:18.000000000 -0500
-+++ glibc-2.27/elf/Makefile	2018-02-17 22:44:50.334006750 -0500
-@@ -559,13 +559,13 @@
+diff --git a/elf/Makefile b/elf/Makefile
+index 5d666b1b..a5017e9c 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -669,14 +669,14 @@ $(objpfx)sln: $(sln-modules:%=$(objpfx)%.o)
  
  $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
  
@@ -26,16 +15,45 @@ diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile
 -CFLAGS-dl-cache.c += $(SYSCONF-FLAGS)
 -CFLAGS-cache.c += $(SYSCONF-FLAGS)
 -CFLAGS-rtld.c += $(SYSCONF-FLAGS)
+-CFLAGS-dl-usage.c += $(SYSCONF-FLAGS) \
 +CFLAGS-dl-cache.c += $(PREFIX-FLAGS)
 +CFLAGS-cache.c += $(PREFIX-FLAGS)
 +CFLAGS-rtld.c += $(PREFIX-FLAGS)
++CFLAGS-dl-usage.c += $(PREFIX-FLAGS) \
+   -D'RTLD="$(rtlddir)/$(rtld-installed-name)"'
  
  cpp-srcs-left := $(all-rtld-routines:=.os)
- lib := rtld
-diff -Naur glibc-2.27-orig/sysdeps/generic/dl-cache.h glibc-2.27/sysdeps/generic/dl-cache.h
---- glibc-2.27-orig/sysdeps/generic/dl-cache.h	2018-02-01 11:17:18.000000000 -0500
-+++ glibc-2.27/sysdeps/generic/dl-cache.h	2018-02-17 22:45:20.471598816 -0500
-@@ -28,7 +28,7 @@
+diff --git a/elf/dl-diagnostics.c b/elf/dl-diagnostics.c
+index bef224b3..8e166b12 100644
+--- a/elf/dl-diagnostics.c
++++ b/elf/dl-diagnostics.c
+@@ -205,7 +205,7 @@ print_paths (void)
+ {
+   _dl_diagnostics_print_labeled_string ("path.prefix", PREFIX);
+   _dl_diagnostics_print_labeled_string ("path.rtld", RTLD);
+-  _dl_diagnostics_print_labeled_string ("path.sysconfdir", SYSCONFDIR);
++  _dl_diagnostics_print_labeled_string ("path.sysconfdir", PREFIX "/etc");
+
+   unsigned int index = 0;
+   static const char *system_dirs = SYSTEM_DIRS "\0";
+diff --git a/elf/ldconfig.c b/elf/ldconfig.c
+index 28ed637a..6f07b79a 100644
+--- a/elf/ldconfig.c
++++ b/elf/ldconfig.c
+@@ -57,7 +57,7 @@
+ #define TLS_HWCAP_BIT 63
+ 
+ #ifndef LD_SO_CONF
+-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
++# define LD_SO_CONF PREFIX "/etc/ld.so.conf"
+ #endif
+ 
+ /* Get libc version number.  */
+diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h
+index 964d50a4..2224d651 100644
+--- a/sysdeps/generic/dl-cache.h
++++ b/sysdeps/generic/dl-cache.h
+@@ -35,7 +35,7 @@
  #endif
  
  #ifndef LD_SO_CACHE

From 3f5336e15bf72814ae5f8a3dd8a46a997c025ad6 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 May 2021 11:19:46 +0200
Subject: [PATCH 131/330] gnumake42: fix build w/glibc-2.33

---
 .../build-managers/gnumake/4.2/default.nix      |  1 +
 .../gnumake/4.2/glibc-2.33-glob.patch           | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch

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 387650e85ab7..69d9ba3d9abc 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation {
     ./pselect.patch
     # Fix support for glibc 2.27's glob, inspired by http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html
     ./glibc-2.27-glob.patch
+    ./glibc-2.33-glob.patch
   ];
 
   nativeBuildInputs = lib.optionals guileSupport [ pkg-config ];
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch
new file mode 100644
index 000000000000..d3e424d1c499
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch
@@ -0,0 +1,17 @@
+diff --git glob/glob.c glob/glob.c
+index 924f2b3..d4ef0c5 100644
+--- glob/glob.c
++++ glob/glob.c
+@@ -212,8 +212,8 @@ my_realloc (p, n)
+ # define __alloca	alloca
+ 
+ 
+-#ifndef __GNU_LIBRARY__
+ # define __stat stat
++#ifndef __GNU_LIBRARY__
+ # ifdef STAT_MACROS_BROKEN
+ #  undef S_ISDIR
+ # endif
+-- 
+2.31.1
+

From 6e50ffe704be17b6c1497e96ea65c59e9ed10ffa Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 May 2021 13:13:35 +0200
Subject: [PATCH 132/330] fakeroot: fix build w/glibc-2.33

---
 pkgs/tools/system/fakeroot/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index 0e4f51c7ea6c..bf42e987c4d3 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -9,7 +9,23 @@ stdenv.mkDerivation rec {
     sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700";
   };
 
-  patches = lib.optional stdenv.isLinux ./einval.patch
+  patches = lib.optionals stdenv.isLinux [
+    ./einval.patch
+
+    # glibc 2.33 patches from ArchLinux
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch";
+      sha256 = "sha256-F6BcxYInSLu7Fxg6OmMZDhTWoLqsc//yYPlTZqQQl68=";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch";
+      sha256 = "sha256-ifpJxhk6MyQpFolC1hIAAUjcHmOHVU1D25tRwpu2S/k=";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch";
+      sha256 = "sha256-o2Xm4C64Ny9TL8fjsZltjO1CdJ4VGwqZ+LnufVL5Sq8=";
+    })
+  ]
   # patchset from brew
   ++ lib.optionals stdenv.isDarwin [
     (fetchpatch {

From c1d014a975d58112ca678745eb3af5e1206fe1ea Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 31 May 2021 13:15:19 +0200
Subject: [PATCH 133/330] zig: add upstream patch to allow glibc 2.33 builds

---
 pkgs/development/compilers/zig/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index 60ca574f1ccb..9a01373cf2b2 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -4,6 +4,7 @@
 , llvmPackages
 , libxml2
 , zlib
+, fetchpatch
 }:
 
 let
@@ -20,6 +21,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-bILjcKX8jPl2n1HRYvYRb7jJkobwqmSJ+hHXSn9n2ag=";
   };
 
+  patches = [
+    # glibc 2.33 support
+    (fetchpatch {
+      url = "https://github.com/ziglang/zig/commit/0fee4b55a8c58791238efe6bf2da5ce3435a5cc1.patch";
+      sha256 = "sha256-waVtolUlmGrfiRk4tWsSOij5MfUc+g57DatC6GtSx6c=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     llvmPackages.llvm.dev

From d3a7d11e5c7935caff828e6698dbfd87c84ea9fb Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 31 May 2021 13:41:21 +0200
Subject: [PATCH 134/330] dmtcp: 2.6.0 -> unstable-2021-03-01

Fixes build for glibc-2.33. The upstream patches don't really apply
after 600 different changes so it makes sense to bump the package now.
---
 pkgs/os-specific/linux/dmtcp/default.nix           | 10 +++++-----
 .../linux/dmtcp/ld-linux-so-buffer-size.patch      | 14 ++++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index 5a472c73578a..50124a2bf452 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dmtcp";
-  version = "2.6.0";
+  version = "unstable-2021-03-01";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
-    sha256 = "01skyhr573w1dygvkwz66lvir2jsq443fjwkysglwxvmrdfz9kwd";
+    rev = "f999adbb8e88fe452a0e57ceb43b6eed7b4409f9";
+    sha256 = "sha256-codCHQui3fGfUZSNq8GuH4ad/GjD6I/S9rX83o8oFPc=";
   };
 
   dontDisableStatic = true;
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
     substituteInPlace configure \
       --replace '#define ELF_INTERPRETER "$interp"' \
                 "#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\""
-    substituteInPlace src/dmtcp_coordinator.cpp \
+    substituteInPlace src/restartscript.cpp \
       --replace /bin/bash ${stdenv.shell}
-    substituteInPlace util/gdb-add-symbol-file \
+    substituteInPlace util/dmtcp_restart_wrapper.sh \
       --replace /bin/bash ${stdenv.shell}
     substituteInPlace test/autotest.py \
       --replace /bin/bash ${bash}/bin/bash \
diff --git a/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch b/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch
index 5a81dad0cc90..118e52b8e626 100644
--- a/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch
+++ b/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch
@@ -1,11 +1,13 @@
---- dmtcp-2.5.1-src/src/util_exec.cpp	2017-09-19 13:36:22.947587034 +0200
-+++ dmtcp-2.5.1-src/src/util_exec.cpp	2017-09-19 13:36:32.221313460 +0200
-@@ -178,7 +178,7 @@
- 
- static string ld_linux_so_path(int version, bool is32bitElf = false)
+diff --git a/src/util_exec.cpp b/src/util_exec.cpp
+index 0e8a13c1..0cc99c1e 100644
+--- a/src/util_exec.cpp
++++ b/src/util_exec.cpp
+@@ -300,7 +300,7 @@ Util::elfType(const char *pathname, bool *isElf, bool *is32bitElf)
+ static string
+ ld_linux_so_path(int version, bool is32bitElf = false)
  {
 -  char buf[80];
 +  char buf[128];
+ 
  #if (defined(__x86_64__) || defined(__aarch64__)) && !defined(CONFIG_M32)
    if (is32bitElf) {
-     sprintf(buf, "/lib/ld-linux.so.%d", version);

From e3d46e691d8ede58ab65aa6e0c209a08d5aa1aa0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 31 May 2021 14:48:03 +0200
Subject: [PATCH 135/330] fakechroot: fix build w/glibc-2.33

---
 pkgs/tools/system/fakechroot/default.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix
index fb56350aa72f..382a47039ba8 100644
--- a/pkgs/tools/system/fakechroot/default.nix
+++ b/pkgs/tools/system/fakechroot/default.nix
@@ -21,6 +21,24 @@ stdenv.mkDerivation rec {
       # and are uninteresting as well as unimportant for our purposes (since NEWS never leaves the build env).
       excludes = [ "NEWS.md" ];
     })
+
+    # glibc 2.33 compat (https://github.com/dex4er/fakechroot/pull/85/)
+    (fetchpatch {
+      url = "https://github.com/dex4er/fakechroot/commit/534e6d555736b97211523970d378dfb0db2608e9.patch";
+      sha256 = "sha256-bUlGJZvOSrATPt8bxGqU1UETTUD9V/HhJyA5ZxsOLQU=";
+    })
+    (fetchpatch {
+      url = "https://github.com/dex4er/fakechroot/commit/75d7e6fa191c11a791faff06a0de86eaa7801d05.patch";
+      sha256 = "sha256-vWN7zFkKlBd/F+h/66z21RiZqkSCn3UIzy9NHV7TYDg=";
+    })
+    (fetchpatch {
+      url = "https://github.com/dex4er/fakechroot/commit/693a3597ea7fccfb62f357503ff177bd3e3d5a89.patch";
+      sha256 = "sha256-bFXsT0hWocJFbtS1cpzo7oIy/x66iUw6QE1/cEoZ+3k=";
+    })
+    (fetchpatch {
+      url = "https://github.com/dex4er/fakechroot/commit/e7c1f3a446e594a4d0cce5f5d499c9439ce1d5c5.patch";
+      sha256 = "sha256-eX6kB4U1ZlXoRtkSVEIBTRjO/cTS/7z5a9S366DiRMg=";
+    })
   ];
 
   nativeBuildInputs = [ autoreconfHook ];

From 04be5ced7efb8838821a16c78af4ad91ce38fa5a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 31 May 2021 18:34:55 +0200
Subject: [PATCH 136/330] qemu: fix build w/glibc-2.33

---
 pkgs/applications/virtualization/qemu/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 7fd01a8ffa95..df0e54798c53 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -114,6 +114,18 @@ stdenv.mkDerivation rec {
     # This means `-accel hvf` is broken for now, on aarch64-darwin only.
     substituteInPlace meson.build \
       --replace 'if exe_sign' 'if false'
+
+    # glibc 2.33 compat fix: if `has_statx = true` is set, `tools/virtiofsd/passthrough_ll.c` will
+    # rely on `stx_mnt_id`[1] which is not part of glibc's `statx`-struct definition.
+    #
+    # `has_statx` will be set to `true` if a simple C program which uses a few `statx`
+    # consts & struct fields successfully compiles. It seems as this only builds on glibc-2.33
+    # since most likely[2] and because of that, the problematic code-path will be used.
+    #
+    # [1] https://github.com/torvalds/linux/commit/fa2fcf4f1df1559a0a4ee0f46915b496cc2ebf60#diff-64bab5a0a3fcb55e1a6ad77b1dfab89d2c9c71a770a07ecf44e6b82aae76a03a
+    # [2] https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=io/bits/statx-generic.h;h=c34697e3c1fd79cddd60db294302e461ed8db6e2;hp=7a09e94be2abb92d2df612090c132e686a24d764;hb=88a2cf6c4bab6e94a65e9c0db8813709372e9180;hpb=c4e4b2e149705559d28b16a9b47ba2f6142d6a6c
+    substituteInPlace meson.build \
+      --replace 'has_statx = cc.links(statx_test)' 'has_statx = false'
   '';
 
   preConfigure = ''

From 25b20757e8c2e929ded0215eeaad19382497c318 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 3 Jun 2021 22:32:35 +0200
Subject: [PATCH 137/330] proj: 7.2.1 -> 8.0.1, fixes build w/glibc-2.33

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

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 3bbc4c6da33a..26558502c122 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "proj";
-  version = "7.2.1";
+  version = "8.0.1";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
     rev = version;
-    sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
+    sha256 = "sha256-pgmv/mtqpKbgU1RuKtue7NAnMyXR1BwGJwoeA/MTrpY=";
   };
 
   postPatch = lib.optionalString (version == "7.2.1") ''

From 094ecab1a1b7245b268248f641e88239abf65f37 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 6 Jul 2021 18:39:04 +0200
Subject: [PATCH 138/330] openexr: 2.5.3 -> 2.5.7

Fixes CVE-2021-3598
---
 pkgs/development/libraries/openexr/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index dc8004d8f481..d60b7b7fc436 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "openexr";
-  version = "2.5.3";
+  version = "2.5.7";
 
   outputs = [ "bin" "dev" "out" "doc" ];
 
@@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
     owner = "AcademySoftwareFoundation";
     repo = "openexr";
     rev = "v${version}";
-    sha256 = "xyYdRrwAYdnRZmErIK0tZspguqtrXvixO5+6nMDoOh8=";
+    sha256 = "1vja0rbilcd1wn184w8nbcmck00n7bfwlddwiaxw8dhj64nx4468";
   };
 
   patches = [
     # Fix pkg-config paths
     (fetchpatch {
-      url = "https://github.com/AcademySoftwareFoundation/openexr/commit/6442fb71a86c09fb0a8118b6dbd93bcec4883a3c.patch";
-      sha256 = "bwD5WTKPT4DjOJDnPXIvT5hJJkH0b71Vo7qupWO9nPA=";
+      url = "https://github.com/AcademySoftwareFoundation/openexr/commit/2f19a01923885fda75ec9d19332de080ec7102bd.patch";
+      sha256 = "1yxmrdzq1x1911wdzwnzr29jmg2r4wd4yx3vhjn0y5dpny0ri5y5";
     })
   ];
 

From 8cdb43c7ad850d72567fdffa788d8c8714780fcf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jul 2021 18:18:19 +0000
Subject: [PATCH 139/330] charis-sil: 6.000 -> 6.001

---
 pkgs/data/fonts/charis-sil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix
index 6639cb57d8ba..75f1d89be770 100644
--- a/pkgs/data/fonts/charis-sil/default.nix
+++ b/pkgs/data/fonts/charis-sil/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 
 let
-  version = "6.000";
+  version = "6.001";
 in
   fetchzip rec {
     name = "charis-sil-${version}";
@@ -14,7 +14,7 @@ in
       unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
     '';
 
-    sha256 = "sha256-eMmC893rI42qzZVCI17i9XSAbQzXCK2fHVe5Pf1/VnM=";
+    sha256 = "sha256-eKSOvYuTMpAnTk4sRiWFUDJrTsF+K5716ALCepaUU08=";
 
     meta = with lib; {
       homepage = "https://software.sil.org/charis";

From 5d57104d848ef0e997fd436c220801165a669862 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 8 Jul 2021 19:08:05 +0200
Subject: [PATCH 140/330] cacert: Add Haskell x509-system compatibility

This allows cacert to be used with Haskell-based fetchers like
you would with regular OpenSSL-based fetchers:

  buildInputs = [ cacert ];
---
 pkgs/data/misc/cacert/setup-hook.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/data/misc/cacert/setup-hook.sh
index 77b68a5c251c..93b682fbbd12 100644
--- a/pkgs/data/misc/cacert/setup-hook.sh
+++ b/pkgs/data/misc/cacert/setup-hook.sh
@@ -1,3 +1,7 @@
 export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
-# left for compatibility
+
+# compatibility
+#  - openssl
 export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
+#  - Haskell x509-system
+export SYSTEM_CERTIFICATE_PATH=@out@/etc/ssl/certs/ca-bundle.crt

From 824c83d7cee7afdc095ef01a5cc0fc447bb31506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Thu, 8 Jul 2021 18:36:14 +0100
Subject: [PATCH 141/330] fontconfig: 2.13.93 -> 2.13.94

---
 pkgs/development/libraries/fontconfig/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 075c810131c7..22875e51842a 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -1,5 +1,4 @@
 { lib, stdenv
-, fetchpatch
 , substituteAll
 , fetchurl
 , pkg-config
@@ -15,21 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fontconfig";
-  version = "2.13.93";
+  version = "2.13.94";
 
   src = fetchurl {
-    url = "http://fontconfig.org/release/${pname}-${version}.tar.xz";
-    sha256 = "1850q4k80yxma5g3yxkvyv8i5a3xqzswwml8gjy3jmywx8qqd5pa";
+    url = "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz";
+    sha256 = "0g004r0bkkqz00mpm3svnnxn7d83158q0yb9ggxryizxfg5m5w55";
   };
 
-  patches = [
-    # Fix build with no docbook2html.
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/60ce9b695ee9d1ac514a61f562e210d3278ba605.patch";
-      sha256 = "0hfd2jdvsgackdp29dyzf5b1277pnbacihxqh9vdn63rr932ipra";
-    })
-  ];
-
   outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
 
   nativeBuildInputs = [

From 707998b5660cb016cf4550aa20debcef8c9a6398 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jul 2021 06:34:41 +0000
Subject: [PATCH 142/330] earthly: 0.5.17 -> 0.5.18

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

diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix
index b46a97df20a3..e806b502de86 100644
--- a/pkgs/development/tools/earthly/default.nix
+++ b/pkgs/development/tools/earthly/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "earthly";
-  version = "0.5.17";
+  version = "0.5.18";
 
   src = fetchFromGitHub {
     owner = "earthly";
     repo = "earthly";
     rev = "v${version}";
-    sha256 = "sha256-SuHHeO2KFjB3HbLv1ODBGaXzNaDi/FNPOGg/lX8JLJE=";
+    sha256 = "sha256-YY4scGRMuvyEpeEgvoJJsTtROl11hMyGr7vYBYvJY/w=";
   };
 
-  vendorSha256 = "sha256-D62fG+T3G1W7xteSGlTtEkXbQfGAmBTYJeATH2CVtwY=";
+  vendorSha256 = "sha256-aDkaOycQ/wPybSH5fnJIGtCOh+KV0wEF+qinRQQIdm4=";
 
   buildFlagsArray = ''
     -ldflags=

From 9a761a4fc8f0b07c6162e334b34c69ddd9c754e8 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 26 May 2021 13:37:17 +0200
Subject: [PATCH 143/330] llvmPackages_12: 12.0.0 -> 12.0.1

---
 pkgs/development/compilers/llvm/12/clang/default.nix       | 2 +-
 pkgs/development/compilers/llvm/12/compiler-rt/default.nix | 2 +-
 pkgs/development/compilers/llvm/12/default.nix             | 4 ++--
 pkgs/development/compilers/llvm/12/libcxx/default.nix      | 2 +-
 pkgs/development/compilers/llvm/12/libcxxabi/default.nix   | 2 +-
 pkgs/development/compilers/llvm/12/libunwind/default.nix   | 2 +-
 pkgs/development/compilers/llvm/12/lld/default.nix         | 2 +-
 pkgs/development/compilers/llvm/12/lldb/default.nix        | 2 +-
 pkgs/development/compilers/llvm/12/llvm/default.nix        | 6 ++++--
 pkgs/development/compilers/llvm/12/openmp/default.nix      | 2 +-
 10 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix
index 87cdca834ea7..d6ee37524415 100644
--- a/pkgs/development/compilers/llvm/12/clang/default.nix
+++ b/pkgs/development/compilers/llvm/12/clang/default.nix
@@ -9,7 +9,7 @@ let
     pname = "clang";
     inherit version;
 
-    src = fetch "clang" "1vd9rhhrd8ghdg111lac7w8by71y9l14yh5zxfijsm6lj4p4avp2";
+    src = fetch "clang" "0px4gl27az6cdz6adds89qzdwb1cqpjsfvrldbz9qvpmphrj34bf";
     inherit clang-tools-extra_src;
 
     unpackPhase = ''
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
index cde1317ca35d..fdc134bdf4b1 100644
--- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
@@ -12,7 +12,7 @@ in
 stdenv.mkDerivation {
   pname = "compiler-rt" + lib.optionalString (haveLibc) "-libc";
   inherit version;
-  src = fetch "compiler-rt" "0d444qihq9jhqnfv003cr704v363va72zl6qaw2algj1c85cva45";
+  src = fetch "compiler-rt" "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l";
 
   nativeBuildInputs = [ cmake python3 llvm.dev ];
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix
index 35228eac43be..212c6e52876f 100644
--- a/pkgs/development/compilers/llvm/12/default.nix
+++ b/pkgs/development/compilers/llvm/12/default.nix
@@ -18,7 +18,7 @@
 }:
 
 let
-  release_version = "12.0.0";
+  release_version = "12.0.1";
   candidate = ""; # empty or "rcN"
   dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
   version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
@@ -29,7 +29,7 @@ let
     inherit sha256;
   };
 
-  clang-tools-extra_src = fetch "clang-tools-extra" "0p3dzr0qa7mar83y66xa5m5apynf6ia0lsdsq6axwnm64ysy0hdd";
+  clang-tools-extra_src = fetch "clang-tools-extra" "1r9a4fdz9ci58b5z2inwvm4z4cdp6scrivnaw05dggkxz7yrwrb5";
 
   llvm_meta = {
     license     = lib.licenses.ncsa;
diff --git a/pkgs/development/compilers/llvm/12/libcxx/default.nix b/pkgs/development/compilers/llvm/12/libcxx/default.nix
index 1c9a7dd3c53b..3ddcb7997505 100644
--- a/pkgs/development/compilers/llvm/12/libcxx/default.nix
+++ b/pkgs/development/compilers/llvm/12/libcxx/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   pname = "libcxx";
   inherit version;
 
-  src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx";
+  src = fetch "libcxx" "05cx39ldlxchck454lgfly1xj0c7x65iyx4hqhiihrlg6p6qj854";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/12/libcxxabi/default.nix b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix
index e360cf8d0b2f..16eaed20d78c 100644
--- a/pkgs/development/compilers/llvm/12/libcxxabi/default.nix
+++ b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   pname = "libcxxabi";
   inherit version;
 
-  src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a";
+  src = fetch "libcxxabi" "1l4idd8npbkm168d26kqn529yv3npsd8f2dm8a7iwyknj7iyivw8";
 
   outputs = [ "out" "dev" ];
 
diff --git a/pkgs/development/compilers/llvm/12/libunwind/default.nix b/pkgs/development/compilers/llvm/12/libunwind/default.nix
index abfe950614ad..8ed246876959 100644
--- a/pkgs/development/compilers/llvm/12/libunwind/default.nix
+++ b/pkgs/development/compilers/llvm/12/libunwind/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   pname = "libunwind";
   inherit version;
 
-  src = fetch pname "1x8wpmsrsgnwj2v5ih52ylni7r6n8gzkcj6hx65zbxski2rablly";
+  src = fetch pname "192ww6n81lj2mb9pj4043z79jp3cf58a9c2qrxjwm5c3a64n1shb";
 
   postUnpack = ''
     unpackFile ${libcxx.src}
diff --git a/pkgs/development/compilers/llvm/12/lld/default.nix b/pkgs/development/compilers/llvm/12/lld/default.nix
index e2c7470d2fc5..f9b0effbff30 100644
--- a/pkgs/development/compilers/llvm/12/lld/default.nix
+++ b/pkgs/development/compilers/llvm/12/lld/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   pname = "lld";
   inherit version;
 
-  src = fetch pname "1zakyxk5bwnh7jarckcd4rbmzi58jgn2dbah5j5cwcyfyfbx9drc";
+  src = fetch pname "0qg3fgc7wj34hdkqn21y03zcmsdd01szhhm1hfki63iifrm3y2v9";
 
   patches = [
     ./gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/12/lldb/default.nix b/pkgs/development/compilers/llvm/12/lldb/default.nix
index 0712396cccfa..b6659034e813 100644
--- a/pkgs/development/compilers/llvm/12/lldb/default.nix
+++ b/pkgs/development/compilers/llvm/12/lldb/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (rec {
   pname = "lldb";
   inherit version;
 
-  src = fetch pname "1v85qyq3snk81vjmwq5q7xikyyqsfpqy2c4qmr81mps4avsw1g0l";
+  src = fetch pname "0g3pj1m3chafavpr35r9fynm85y2hdyla6klj0h28khxs2613i78";
 
   patches = [
     ./procfs.patch
diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix
index 8413f0f5745b..361c6798385d 100644
--- a/pkgs/development/compilers/llvm/12/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/12/llvm/default.nix
@@ -34,8 +34,8 @@ in stdenv.mkDerivation (rec {
   pname = "llvm";
   inherit version;
 
-  src = fetch pname "0l4b79gwfvxild974aigcq1yigypjsk2j5p59syhl6ksd744gp29";
-  polly_src = fetch "polly" "1ixl9yj526n8iqh9ckyiah2vzravs9d1akybqq7rvy32n9vgr6hd";
+  src = fetch pname "1pzx9zrmd7r3481sbhwvkms68fwhffpp4mmz45dgrkjpyl2q96kx";
+  polly_src = fetch "polly" "1yfm9ixda4a2sx7ak5vswijx4ydk5lv1c1xh39xmd2kh299y4m12";
 
   unpackPhase = ''
     unpackFile $src
@@ -84,6 +84,8 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/IR/CMakeLists.txt \
       --replace "PassBuilderCallbacksTest.cpp" ""
     rm unittests/IR/PassBuilderCallbacksTest.cpp
+    # TODO: Fix failing tests:
+    rm test/DebugInfo/X86/vla-multi.ll
   '' + optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -i ${../../TLI-musl.patch}
     substituteInPlace unittests/Support/CMakeLists.txt \
diff --git a/pkgs/development/compilers/llvm/12/openmp/default.nix b/pkgs/development/compilers/llvm/12/openmp/default.nix
index c107258dd189..8ed1bf71f008 100644
--- a/pkgs/development/compilers/llvm/12/openmp/default.nix
+++ b/pkgs/development/compilers/llvm/12/openmp/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   pname = "openmp";
   inherit version;
 
-  src = fetch pname "0z8n1wanby6aq3i7d91mgk72hb33zfl5blayk0a22cs7l8i706zb";
+  src = fetch pname "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];

From 666c01d9776d5f3a707e0d38897bba21363c885b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 8 Jul 2021 20:46:22 +0000
Subject: [PATCH 144/330] libtiff: 4.2.0 -> 4.3.0; adopt; improve meta

Tested by viewing a TIFF file in imv.
---
 .../development/libraries/libtiff/default.nix |  8 +++---
 .../libraries/libtiff/headers.patch           | 25 ++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 46c13bbe4a9d..f481e7a0bd49 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libtiff";
-  version = "4.2.0";
+  version = "4.3.0";
 
   src = fetchurl {
     url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
-    sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b";
+    sha256 = "1j3snghqjbhwmnm5vz3dr1zm68dj15mgbx1wqld7vkl7n2nfaihf";
   };
 
   cmakeFlags = if stdenv.isDarwin then [
@@ -47,7 +47,9 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Library and utilities for working with the TIFF image file format";
-    homepage = "http://download.osgeo.org/libtiff";
+    homepage = "https://libtiff.gitlab.io/libtiff";
+    changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html";
+    maintainers = with maintainers; [ qyliss ];
     license = licenses.libtiff;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch
index 5a00502ef281..080ab881756d 100644
--- a/pkgs/development/libraries/libtiff/headers.patch
+++ b/pkgs/development/libraries/libtiff/headers.patch
@@ -1,13 +1,14 @@
-diff -ruN a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
---- a/libtiff/CMakeLists.txt	2019-05-31 13:05:22.849705817 +0000
-+++ b/libtiff/CMakeLists.txt	2020-11-27 21:50:03.527831837 +0000
-@@ -42,6 +42,9 @@
-   libtiffxx.map)
+diff --git i/libtiff/CMakeLists.txt w/libtiff/CMakeLists.txt
+index 90105b28..340c75cf 100755
+--- i/libtiff/CMakeLists.txt
++++ w/libtiff/CMakeLists.txt
+@@ -31,6 +31,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tiffconf.h.cmake.in
+                @ONLY)
  
- set(tiff_HEADERS
-+  tiffiop.h
-+  ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h
-+  tif_dir.h
-   tiff.h
-   tiffio.h
-   tiffvers.h)
+ set(tiff_public_HEADERS
++        tiffiop.h
++        ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h
++        tif_dir.h
+         tiff.h
+         tiffio.h
+         tiffvers.h

From 5df9305b60d5c0dcd5c57388ae4027a59ae50d23 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 9 Jul 2021 10:27:28 +0000
Subject: [PATCH 145/330] libtiff: fix cross by switching back to autoconf

The CMake implementation seems to be very in flux, and the latest
release broke cross-compilation for us.  Autotools seems to be
upstream's recommended build system -- it's the one mentioned in the
README.
---
 .../development/libraries/libtiff/default.nix | 13 ++++-----
 .../libraries/libtiff/headers.patch           | 28 ++++++++++---------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index f481e7a0bd49..035b0ab55ad6 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv
 , fetchurl
 
+, autoreconfHook
 , pkg-config
-, cmake
 
 , libdeflate
 , libjpeg
@@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
     sha256 = "1j3snghqjbhwmnm5vz3dr1zm68dj15mgbx1wqld7vkl7n2nfaihf";
   };
 
-  cmakeFlags = if stdenv.isDarwin then [
-    "-DCMAKE_SKIP_BUILD_RPATH=OFF"
-  ] else null;
-
   # FreeImage needs this patch
   patches = [ ./headers.patch ];
 
@@ -34,7 +30,9 @@ stdenv.mkDerivation rec {
     moveToOutput include/tiffiop.h $dev_private
   '';
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  # If you want to change to a different build system, please make
+  # sure cross-compilation works first!
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
 
@@ -42,8 +40,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doInstallCheck = true;
-  installCheckTarget = "test";
+  doCheck = true;
 
   meta = with lib; {
     description = "Library and utilities for working with the TIFF image file format";
diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch
index 080ab881756d..e1c681502b33 100644
--- a/pkgs/development/libraries/libtiff/headers.patch
+++ b/pkgs/development/libraries/libtiff/headers.patch
@@ -1,14 +1,16 @@
-diff --git i/libtiff/CMakeLists.txt w/libtiff/CMakeLists.txt
-index 90105b28..340c75cf 100755
---- i/libtiff/CMakeLists.txt
-+++ w/libtiff/CMakeLists.txt
-@@ -31,6 +31,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tiffconf.h.cmake.in
-                @ONLY)
+diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am
+index 44522b62..d66e5948 100644
+--- i/libtiff/Makefile.am
++++ w/libtiff/Makefile.am
+@@ -36,8 +36,11 @@ EXTRA_DIST = \
+ 	tiffconf.h.cmake.in
  
- set(tiff_public_HEADERS
-+        tiffiop.h
-+        ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h
-+        tif_dir.h
-         tiff.h
-         tiffio.h
-         tiffvers.h
+ libtiffinclude_HEADERS = \
++	tif_config.h \
++	tif_dir.h \
+ 	tiff.h \
+ 	tiffio.h \
++	tiffiop.h \
+ 	tiffvers.h
+ 
+ if HAVE_CXX

From 3ac0f867c2d6ac05310d3f5802ff0136d39f052f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jul 2021 19:20:34 +0200
Subject: [PATCH 146/330] esptool: 3.0 -> 3.1

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

diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
index 7c7f91621b82..3fc6e96e228b 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -2,13 +2,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "esptool";
-  version = "3.0";
+  version = "3.1";
 
   src = fetchFromGitHub {
     owner = "espressif";
     repo = "esptool";
     rev = "v${version}";
-    sha256 = "1y022qlcdgdx5a88lkc3sqavklz494afbfyh100lp7xfk3f2mjln";
+    sha256 = "sha256-GaGrV8L//pU4kt4HJmY88l5BNtT0IcZox7b24AFjPCI=";
   };
 
   checkInputs = with python3.pkgs;
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "ESP8266 and ESP32 serial bootloader utility";
     homepage = "https://github.com/espressif/esptool";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ dezgeg dotlambda ];
     platforms = platforms.linux;
   };

From 9889bdb6fb70e94532184d18cd418dd975afd610 Mon Sep 17 00:00:00 2001
From: Marc Seeger <mseeger@fb.com>
Date: Wed, 30 Jun 2021 15:14:57 -0700
Subject: [PATCH 147/330] zstd: Add pzstd to compiled binaries

---
 pkgs/tools/compression/zstd/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index a89453b55f4f..5253d7faa401 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
     (name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") {
       BUILD_SHARED = !static;
       BUILD_STATIC = static;
+      BUILD_CONTRIB = true;
       PROGRAMS_LINK_SHARED = !static;
       LEGACY_SUPPORT = legacySupport;
       BUILD_TESTS = doCheck;
@@ -62,12 +63,16 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = ''
+    mkdir -p $bin/bin
+    cp contrib/pzstd/pzstd $bin/bin/pzstd
     substituteInPlace ../programs/zstdgrep \
       --replace ":-grep" ":-${gnugrep}/bin/grep" \
       --replace ":-zstdcat" ":-$bin/bin/zstdcat"
 
     substituteInPlace ../programs/zstdless \
       --replace "zstdcat" "$bin/bin/zstdcat"
+  '' + lib.optionalString stdenv.isDarwin ''
+    install_name_tool -change @rpath/libzstd.1.dylib $out/lib/libzstd.1.dylib $bin/bin/pzstd
   '';
 
   outputs = [ "bin" "dev" ]

From fac5757eecc5f0ca2e2e275e4f0a436368d822de Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Jul 2021 18:33:05 +0200
Subject: [PATCH 148/330] cpython: disable no-semantic-interposition with older
 clang versions

> clang-7: error: unknown argument: '-fno-semantic-interposition'

This primarily affects current darwin builds, but as soon as they
migrate to a newer clang version they will immediately start benefitting
from this change.
---
 pkgs/development/interpreters/python/cpython/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 842d132fd44c..e9fdc638f6ae 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -40,7 +40,8 @@
 , static ? stdenv.hostPlatform.isStatic
 , enableOptimizations ? false
 # enableNoSemanticInterposition is a subset of the enableOptimizations flag that doesn't harm reproducibility.
-, enableNoSemanticInterposition ? true
+# clang starts supporting `-fno-sematic-interposition` with version 10
+, enableNoSemanticInterposition ? (!stdenv.cc.isClang || (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "10"))
 # enableLTO is a subset of the enableOptimizations flag that doesn't harm reproducibility.
 # enabling LTO on 32bit arch causes downstream packages to fail when linking
 , enableLTO ? stdenv.is64bit

From d6a51653d700b550cdfddb0ca679a7c9d0cd6ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 10 Jul 2021 16:35:32 +0200
Subject: [PATCH 149/330] stdenv/darwin: update bootstrap tools for
 x86_64-darwin

Updated python3 will block bootstrapping otherwise.

Verification instructions:
$ xdg-open https://hydra.nixos.org/build/144118577#tabs-details
$ nix build /nix/store/sh9cd0rarr8a2db1zdr4fzl4qsmvz5jp-stdenv-bootstrap-tools
$ cat /nix/store/sh9cd0rarr8a2db1zdr4fzl4qsmvz5jp-stdenv-bootstrap-tools/nix-support/hydra-build-products
$ nix hash-path /nix/store/9h4d7s313wv3gkfwi493yr1wvdsz9lf2-stdenv-bootstrap-tools/on-server/{sh,bzip2,mkdir,cpio}
sha256-igMAVEfumFv/LUNTGfNi2nSehgTNIP4Sg+f3L7u6SMA=
sha256-K3rhkJZipudT1Jgh+l41Y/fNsMkrPtiAsNRDha/lpZI=
sha256-VddFELwLDJGNADKB1fWwWPBtIAlEUgJv2hXRmC4NEeM=
sha256-SWkwvLaFyV44kLKL2nx720SvcL4ej/p2V/bX3uqAGO0=
$ nix hash-file /nix/store/9h4d7s313wv3gkfwi493yr1wvdsz9lf2-stdenv-bootstrap-tools/on-server/bootstrap-tools.cpio.bz2
sha256-b65dXbIm6o6s6U8tAiGpR6SMfvfn/VFcZgTHBetJZis=
---
 pkgs/stdenv/darwin/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index d6624a493aaf..dd692bb6991a 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -23,16 +23,17 @@
   else
     let
       fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
-        url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/5ab5783e4f46c373c6de84deac9ad59b608bb2e6/${file}";
+        url = "https://github.com/vcunat/patch-mirror/raw/stdenv/stdenv-darwin/x86_64/05ef940b94fe76e7ac06ea45a625adc8e4be96f9/${file}"; # FIXME: upload below
+        #url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/05ef940b94fe76e7ac06ea45a625adc8e4be96f9/${file}";
         inherit (localSystem) system;
         inherit sha256 executable;
       }; in
     {
-      sh = fetch { file = "sh"; sha256 = "sha256-nbb4XEk3go7ttiWrQyKQMLzPr+qUnwnHkWMtVCZsMCs="; };
-      bzip2 = fetch { file = "bzip2"; sha256 = "sha256-ybnA+JWrKhXSfn20+GVKXkHFTp2Zt79hat8hAVmsUOc="; };
-      mkdir = fetch { file = "mkdir"; sha256 = "sha256-nmvMxmfcY41/60Z/E8L9u0vgePW5l30Dqw1z+Nr02Hk="; };
-      cpio = fetch { file = "cpio"; sha256 = "sha256-cB36rN3NLj19Tk37Kc5bodMFMO+mCpEQkKKo0AEMkaU="; };
-      tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "sha256-kh2vKmjCr/HvR06czZbxUxV5KDRxSF27M6nN3cyofRI="; executable = false; };
+      sh = fetch { file = "sh"; sha256 = "sha256-igMAVEfumFv/LUNTGfNi2nSehgTNIP4Sg+f3L7u6SMA="; };
+      bzip2 = fetch { file = "bzip2"; sha256 = "sha256-K3rhkJZipudT1Jgh+l41Y/fNsMkrPtiAsNRDha/lpZI="; };
+      mkdir = fetch { file = "mkdir"; sha256 = "sha256-VddFELwLDJGNADKB1fWwWPBtIAlEUgJv2hXRmC4NEeM="; };
+      cpio = fetch { file = "cpio"; sha256 = "sha256-SWkwvLaFyV44kLKL2nx720SvcL4ej/p2V/bX3uqAGO0="; };
+      tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "sha256-b65dXbIm6o6s6U8tAiGpR6SMfvfn/VFcZgTHBetJZis="; executable = false; };
     }
 }:
 

From 17668028aa06c359d8370bde172e41f32fa98cc7 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 11 Jul 2021 06:42:39 -0400
Subject: [PATCH 150/330] python3Packages.cython: move gdb to checkInputs
 (#119815)

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

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index c09f1586fd6f..dcede9506e32 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -37,9 +37,9 @@ in buildPythonPackage rec {
     pkg-config
   ];
   checkInputs = [
-    numpy ncurses
+    gdb numpy ncurses
   ];
-  buildInputs = [ glibcLocales gdb ];
+  buildInputs = [ glibcLocales ];
   LC_ALL = "en_US.UTF-8";
 
   patches = [

From 370bbb409a1cc8564d915e52ca8a2da81ac93410 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 14 Jul 2021 08:24:10 +0800
Subject: [PATCH 151/330] ko: init at 0.8.3

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

diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix
new file mode 100644
index 000000000000..4754a32db825
--- /dev/null
+++ b/pkgs/development/tools/ko/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, git
+}:
+
+buildGoModule rec {
+  pname = "ko";
+  version = "0.8.3";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-LoOXZY4uF7GSS3Dh/ozCsLJTxgmPmZZuEisJ4ShjCBc=";
+  };
+
+  vendorSha256 = null;
+  excludedPackages = "test";
+  checkInputs = [ git ];
+  preCheck = ''
+    git init
+  '';
+
+  meta = with lib; {
+    description = "A simple, fast container image builder for Go applications.";
+    homepage = "https://github.com/google/ko";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ nickcao ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3888d415ca6d..b7c132b970cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13764,6 +13764,8 @@ in
 
   khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader {  };
 
+  ko = callPackage ../development/tools/ko { };
+
   krankerl = callPackage ../development/tools/krankerl { };
 
   krew = callPackage ../development/tools/krew { };

From 4781167c79989639ce7dc74ca4ec40729e8ac95a Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <sebastian.neubauer@amd.com>
Date: Wed, 14 Jul 2021 09:42:03 +0200
Subject: [PATCH 152/330] amdvlk: 2021.Q2.5 -> 2021.Q3.1

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

diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index 2ef3f3d3920b..3978f380a3b6 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -21,13 +21,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "amdvlk";
-  version = "2021.Q2.5";
+  version = "2021.Q3.1";
 
   src = fetchRepoProject {
     name = "${pname}-src";
     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
     rev = "refs/tags/v-${version}";
-    sha256 = "0NJoGk++SHt4dtoUj3UQeW4zFtwa7osczUr+vxi8DG8=";
+    sha256 = "HisJsG27UvVbe0w8zzZArqioQQRxfuK2TPEWggV3TNA=";
   };
 
   buildInputs = [

From 0bac0bfd7269cd2390b0cdde1ba264944bab911a Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Wed, 14 Jul 2021 07:51:48 -0300
Subject: [PATCH 153/330] tfk8s: 0.1.4 -> 0.1.5

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

diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix
index e6fc7bf3f7fe..536b8f1386d6 100644
--- a/pkgs/tools/misc/tfk8s/default.nix
+++ b/pkgs/tools/misc/tfk8s/default.nix
@@ -2,17 +2,17 @@
 
 buildGoModule rec {
   pname = "tfk8s";
-  version = "0.1.4";
+  version = "0.1.5";
   tag = "v${version}";
 
   src = fetchFromGitHub {
     owner = "jrhouston";
     repo = "tfk8s";
     rev = tag;
-    sha256 = "sha256-Ha/F8rCGZqFYqJzfemmKRyEBI5khaSIerJxvf2Pf2ao=";
+    sha256 = "sha256-T0zM2JOmzk8YyS3+De6yGwiwLgyb6Rwy6hT9b44wNxQ=";
   };
 
-  vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE=";
+  vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I=";
   runVend = true;
 
   buildFlagsArray = [

From 909c6f0394a79b804866437fd898c83fcf8f6cf9 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Wed, 14 Jul 2021 07:53:00 -0300
Subject: [PATCH 154/330] tfk8s: add passthru.tests.sample1

---
 pkgs/tools/misc/tfk8s/default.nix               |  6 +++++-
 pkgs/tools/misc/tfk8s/tests/sample1/default.nix | 11 +++++++++++
 pkgs/tools/misc/tfk8s/tests/sample1/input.yaml  |  7 +++++++
 pkgs/tools/misc/tfk8s/tests/sample1/output.tf   | 12 ++++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/tfk8s/tests/sample1/default.nix
 create mode 100644 pkgs/tools/misc/tfk8s/tests/sample1/input.yaml
 create mode 100644 pkgs/tools/misc/tfk8s/tests/sample1/output.tf

diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix
index 536b8f1386d6..d9c9ad0451bb 100644
--- a/pkgs/tools/misc/tfk8s/default.nix
+++ b/pkgs/tools/misc/tfk8s/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, callPackage }:
 
 buildGoModule rec {
   pname = "tfk8s";
@@ -30,6 +30,10 @@ buildGoModule rec {
     $out/bin/tfk8s --version | grep ${tag} > /dev/null
   '';
 
+  passthru.tests = {
+    sample1 = callPackage ./tests/sample1 { };
+  };
+
   meta = with lib; {
     description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format";
     license = licenses.mit;
diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/default.nix b/pkgs/tools/misc/tfk8s/tests/sample1/default.nix
new file mode 100644
index 000000000000..6b06dbf32340
--- /dev/null
+++ b/pkgs/tools/misc/tfk8s/tests/sample1/default.nix
@@ -0,0 +1,11 @@
+{ runCommandCC, tfk8s }:
+
+runCommandCC "tfk8s-test-sample1" {
+    buildInputs = [
+      tfk8s
+    ];
+    meta.timeout = 60;
+  }
+  ''
+    cmp <(${tfk8s}/bin/tfk8s -f ${./input.yaml}) ${./output.tf} > $out
+  ''
diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml b/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml
new file mode 100644
index 000000000000..58ed0eb11d76
--- /dev/null
+++ b/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml
@@ -0,0 +1,7 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test
+data:
+  TEST: test
diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/output.tf b/pkgs/tools/misc/tfk8s/tests/sample1/output.tf
new file mode 100644
index 000000000000..51d564400b55
--- /dev/null
+++ b/pkgs/tools/misc/tfk8s/tests/sample1/output.tf
@@ -0,0 +1,12 @@
+resource "kubernetes_manifest" "configmap_test" {
+  manifest = {
+    "apiVersion" = "v1"
+    "data" = {
+      "TEST" = "test"
+    }
+    "kind" = "ConfigMap"
+    "metadata" = {
+      "name" = "test"
+    }
+  }
+}

From 88feff5924db44c5d5cba6ab5cb4eeed277576bc Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Wed, 14 Jul 2021 16:34:25 +0200
Subject: [PATCH 155/330] notmuch-mutt: deprecate phases

---
 pkgs/applications/networking/mailreaders/notmuch/mutt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
index 18264c5c6af4..ffd30c754b47 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
 
   src = notmuch.src;
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+  dontConfigure = true;
+  dontBuild = true;
 
   installPhase = ''
     ${coreutils}/bin/install -Dm755 \
@@ -36,7 +37,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    inherit version;
     description = "Mutt support for notmuch";
     homepage    = "https://notmuchmail.org/";
     license     = with licenses; gpl3;

From ac75afe239efdffba33ad3027b29f9c23481fcab Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Wed, 14 Jul 2021 16:40:28 +0200
Subject: [PATCH 156/330] logisim: deprecate phases

---
 pkgs/applications/science/logic/logisim/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix
index 1ca22cf769c6..db5d33ef4755 100644
--- a/pkgs/applications/science/logic/logisim/default.nix
+++ b/pkgs/applications/science/logic/logisim/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "1hkvc9zc7qmvjbl9579p84hw3n8wl3275246xlzj136i5b0phain";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   nativeBuildInputs = [makeWrapper];
 

From 41c42dbfd85e96981a7d5c16f399ad4042fbe9db Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 14 Jul 2021 23:34:42 +0800
Subject: [PATCH 157/330] strawberry: 0.9.2 -> 0.9.3

---
 pkgs/applications/audio/strawberry/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index 5a5671ec7730..a1cba439c493 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -35,13 +35,13 @@
 
 mkDerivation rec {
   pname = "strawberry";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "jonaski";
     repo = pname;
     rev = version;
-    sha256 = "sha256:0d9asg21j9ai23sb35cimws8bd8fsnpha777rgscraa7i09q0rx2";
+    sha256 = "sha256-OOdHsii6O4okVHDhrqCNJ7WVB0VKPs8q0AhEY+IvflE=";
   };
 
   buildInputs = [
@@ -77,7 +77,10 @@ mkDerivation rec {
   ++ lib.optional withVlc libvlc;
 
   nativeBuildInputs = [
-    cmake ninja pkg-config qttools
+    cmake
+    ninja
+    pkg-config
+    qttools
   ] ++ lib.optionals stdenv.isLinux [
     util-linux
   ];

From b5a7a474d17a5a851c80a144fc4ea013079a4770 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 15 Jul 2021 11:01:34 +0200
Subject: [PATCH 158/330] mesa: 21.1.4 -> 21.1.5

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index c24444ee6aab..54c02b84ecc9 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -31,7 +31,7 @@ with lib;
 let
   # Release calendar: https://www.mesa3d.org/release-calendar.html
   # Release frequency: https://www.mesa3d.org/releasing.html#schedule
-  version = "21.1.4";
+  version = "21.1.5";
   branch  = versions.major version;
 
 self = stdenv.mkDerivation {
@@ -45,7 +45,7 @@ self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "02z9g6zpkg1p1sm8f84xdi7v2n7x534x9pn565bvcr411527y5qz";
+    sha256 = "0vbn40azh7izrxvb15c51z3lfcb9zas2v1wc4z9cxvja0y9p4b02";
   };
 
   prePatch = "patchShebangs .";

From 692e70c3ae2af606c2b99f51893061dc2bd7d8e6 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Thu, 15 Jul 2021 17:34:51 +0200
Subject: [PATCH 159/330] gnomeExtensions.fuzzy-app-search: remove custom
 packaging

---
 .../extensions/fuzzy-app-search/default.nix   | 27 -------------------
 .../gnome/extensions/manuallyPackaged.nix     |  1 -
 2 files changed, 28 deletions(-)
 delete mode 100755 pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix

diff --git a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix
deleted file mode 100755
index 552e0a2dcafd..000000000000
--- a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, stdenv, fetchFromGitLab, gnome, glib }:
-
-stdenv.mkDerivation rec {
-  pname = "gnome-shell-extension-fuzzy-app-search";
-  version = "4.0.1";
-
-  src = fetchFromGitLab {
-    owner = "Czarlie";
-    repo = "gnome-fuzzy-app-search";
-    rev = "v${version}";
-    sha256 = "127n3jc5d6cl0yrpjf8acdj76br97knks1wx4f6jcswkx9x47w0a";
-  };
-
-  passthru.extensionUuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com";
-
-  nativeBuildInputs = [ glib ];
-
-  makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ];
-
-  meta = with lib; {
-    description = "Fuzzy application search results for Gnome Search";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ rhoriguchi ];
-    homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search";
-    broken = versionOlder gnome.gnome-shell.version "3.18";
-  };
-}
diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix
index 53395c5c861f..3e99f3143d24 100644
--- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix
+++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix
@@ -9,7 +9,6 @@
   "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { };
   "emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { };
   "freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { };
-  "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = callPackage ./fuzzy-app-search { };
   "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { };
   "icon-hider@kalnitsky.org" = callPackage ./icon-hider { };
   "impatience@gfxmonk.net" = callPackage ./impatience { };

From 6c72f80b4161b6505d2093a5c4b777f5018b2102 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+nixpkgs@sourcephile.fr>
Date: Thu, 15 Jul 2021 18:21:02 +0200
Subject: [PATCH 160/330] nixos/sanoid: fix submodule aliases

Use `mkDefault` into `mkAliasDefitinions`.
This avoids conflicting definitions when using `process_children_only`.
---
 nixos/modules/services/backup/sanoid.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix
index be44a43b6d3f..abc4def1c61f 100644
--- a/nixos/modules/services/backup/sanoid.nix
+++ b/nixos/modules/services/backup/sanoid.nix
@@ -108,8 +108,8 @@ in {
         type = types.attrsOf (types.submodule ({config, options, ...}: {
           freeformType = datasetSettingsType;
           options = commonOptions // datasetOptions;
-          config.use_template = mkAliasDefinitions (options.useTemplate or {});
-          config.process_children_only = mkAliasDefinitions (options.processChildrenOnly or {});
+          config.use_template = mkAliasDefinitions (mkDefault options.useTemplate or {});
+          config.process_children_only = mkAliasDefinitions (mkDefault options.processChildrenOnly or {});
         }));
         default = {};
         description = "Datasets to snapshot.";

From 8b01f2c017591289dc4abc13021a41cb6b21c992 Mon Sep 17 00:00:00 2001
From: whonore <wolfhonore@gmail.com>
Date: Thu, 15 Jul 2021 15:11:14 -0400
Subject: [PATCH 161/330] maintainers: add whonore

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7e4e02c5a7f0..6cd9e0ead279 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11314,6 +11314,12 @@
     githubId = 19174984;
     name = "Alex Whitt";
   };
+  whonore = {
+    email = "wolfhonore@gmail.com";
+    github = "whonore";
+    githubId = 7121530;
+    name = "Wolf Honoré";
+  };
   wildsebastian = {
     name = "Sebastian Wild";
     email = "sebastian@wild-siena.com";

From 42e69ba13fc6628e147a0060468ec35daada5edd Mon Sep 17 00:00:00 2001
From: FliegendeWurst <2012gdwu+github@posteo.de>
Date: Thu, 15 Jul 2021 14:56:47 +0200
Subject: [PATCH 162/330] tor-browser-bundle-bin: 10.0.18 -> 10.5.2

---
 .../browsers/tor-browser-bundle-bin/default.nix     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index d1830f1c52f8..ca57c27ba50d 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -88,19 +88,19 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "10.0.18";
+  version = "10.5.2";
 
   lang = "en-US";
 
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
-      sha256 = "15ni33mkg3awfmk3ynr0vi4max1h2k0s10xw3dpmdx6chzv4ll14";
+      sha256 = "16zk7d0sxm2j00vb002mjj38wxcxxlahnfdb9lmkmkfms9p9xfkb";
     };
 
     i686-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
-      sha256 = "16lx8wkxli1fzq5f6gcw3im4p8k3xdmnmf6w0p7n8hd8681b1w5s";
+      sha256 = "0xc3ac2y9xf7ff3pqrp5n6l9j8i5hk3y2y3zwykwhnycnfi6dfv4";
     };
   };
 in
@@ -311,6 +311,13 @@ stdenv.mkDerivation rec {
     # chance that TBB would continue using old font files.
     rm -rf "\$HOME/.cache/fontconfig"
 
+    # Manually specify data paths (by default TB attempts to create these in the store)
+    {
+      echo "user_pref(\"extensions.torlauncher.toronionauthdir_path\", \"\$HOME/TorBrowser/Data/Tor/onion-auth\");"
+      echo "user_pref(\"extensions.torlauncher.torrc_path\", \"\$HOME/TorBrowser/Data/Tor/torrc\");"
+      echo "user_pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/TorBrowser/Data/Tor\");"
+    } >> "\$HOME/TorBrowser/Data/Browser/profile.default/prefs.js"
+
     # Lift-off
     #
     # XAUTHORITY and DISPLAY are required for TBB to work at all.

From f3596d78cb3eaff274ba31eeb7dfee6fbbd58296 Mon Sep 17 00:00:00 2001
From: Vanilla <neko@hydev.org>
Date: Fri, 16 Jul 2021 07:17:38 +0800
Subject: [PATCH 163/330] flat-remix-gnome: 20210623 -> 20210715

---
 pkgs/data/themes/flat-remix-gnome/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix
index cff5f9115843..f9eed54534cd 100644
--- a/pkgs/data/themes/flat-remix-gnome/default.nix
+++ b/pkgs/data/themes/flat-remix-gnome/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flat-remix-gnome";
-  version = "20210623";
+  version = "20210715";
 
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = pname;
     rev = version;
-    hash = "sha256-FKsbAvjhXb2ipe3XqACM6OwGYwbBbzvDjsUQYCIQ8NM=";
+    hash = "sha256-e7sXzmhfBfcp+KqIc9yuqqXLfYzVlQVn9TNYoa2lZcA=";
   };
 
   nativeBuildInputs = [ glib ];

From 263f2f666a98e1e83afc1d2e425a3fc0297f9130 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 12 Jul 2021 22:29:41 +0200
Subject: [PATCH 164/330] userhosts: init at 1.0.0

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

diff --git a/pkgs/tools/networking/userhosts/default.nix b/pkgs/tools/networking/userhosts/default.nix
new file mode 100644
index 000000000000..6cec402638a1
--- /dev/null
+++ b/pkgs/tools/networking/userhosts/default.nix
@@ -0,0 +1,23 @@
+{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }:
+
+stdenv.mkDerivation rec {
+  pname = "userhosts";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "figiel";
+    repo = "hosts";
+    rev = "v${version}";
+    hash = "sha256-9uF0fYl4Zz/Ia2UKx7CBi8ZU8jfWoBfy2QSgTSwXo5A";
+  };
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with lib; {
+    description = "A libc wrapper providing per-user hosts file";
+    homepage = "https://github.com/figiel/hosts";
+    maintainers = [ maintainers.bobvanderlinden ];
+    license = licenses.cc0;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 378663e4b3f5..8a876b0ca592 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21292,6 +21292,8 @@ in
 
   usbutils = callPackage ../os-specific/linux/usbutils { };
 
+  userhosts = callPackage ../tools/networking/userhosts { };
+
   usermount = callPackage ../os-specific/linux/usermount { };
 
   util-linux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { }

From 6f239d7309690153b181479735d9a254dfa2fcc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 11 Jul 2021 16:02:17 +0200
Subject: [PATCH 165/330] Revert "setup.sh: fatal: This word should yield a
 string, but it contains an array"

This reverts commit bf99a819a16089a8df03cc06262f06b31dfb683c.
It caused regressions in some packages; see:
https://github.com/NixOS/nixpkgs/commit/bf99a819a160
---
 pkgs/stdenv/generic/setup.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 3515439337c6..4ae561fbca07 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -368,13 +368,16 @@ findInputs() {
     local var="${!varRef}"
     unset -v varVar varRef
 
-    # var is a reference to an array and can sometimes be undefined
-    # so checking the array with "${!var}[@]" does not work
-    # check if $pkgs is in the var ref array
-    # TODO(@Ericson2314): Restore using associative array
-    if [[ "${var}[*]" = *" $pkg "* ]]; then
-        return 0
-    fi
+    # TODO(@Ericson2314): Restore using associative array once Darwin
+    # nix-shell doesn't use impure bash. This should replace the O(n)
+    # case with an O(1) hash map lookup, assuming bash is implemented
+    # well :D.
+    local varSlice="${var}[*]"
+    # ${..-} to hack around old bash empty array problem
+    case "${!varSlice-}" in
+        *" $pkg "*) return 0 ;;
+    esac
+    unset -v varSlice
 
     eval "$var"'+=("$pkg")'
 

From 1f2b1f3bb03674fd181444848452c32407afab5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 16 Jul 2021 10:14:56 +0200
Subject: [PATCH 166/330] cpython: restrict enableLTO to Linux

Both darwin platforms would fail:
  https://hydra.nixos.org/build/147600631
  https://hydra.nixos.org/build/147646604
And as it seems to be a risky feature, I switched other platforms along
(though none are on the official build farm)
---
 pkgs/development/interpreters/python/cpython/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index e9fdc638f6ae..f52255f4748b 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -44,7 +44,8 @@
 , enableNoSemanticInterposition ? (!stdenv.cc.isClang || (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "10"))
 # enableLTO is a subset of the enableOptimizations flag that doesn't harm reproducibility.
 # enabling LTO on 32bit arch causes downstream packages to fail when linking
-, enableLTO ? stdenv.is64bit
+# enabling LTO on *-darwin causes python3 to fail when linking.
+, enableLTO ? stdenv.is64bit && stdenv.isLinux
 , reproducibleBuild ? true
 , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
 }:

From f47ee76a6ab61a8b3d37791db2f0992e7d8cb12b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 16 Jul 2021 10:44:04 +0200
Subject: [PATCH 167/330] stdenv/darwin: switch to the official bootstrap URLs

---
 pkgs/stdenv/darwin/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index dd692bb6991a..b5a9f0cc5cb9 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -23,8 +23,7 @@
   else
     let
       fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
-        url = "https://github.com/vcunat/patch-mirror/raw/stdenv/stdenv-darwin/x86_64/05ef940b94fe76e7ac06ea45a625adc8e4be96f9/${file}"; # FIXME: upload below
-        #url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/05ef940b94fe76e7ac06ea45a625adc8e4be96f9/${file}";
+        url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/05ef940b94fe76e7ac06ea45a625adc8e4be96f9/${file}";
         inherit (localSystem) system;
         inherit sha256 executable;
       }; in

From bf6cac3e7a94de1a5dc0da81899ec489780210a7 Mon Sep 17 00:00:00 2001
From: nixbitcoin <nixbitcoin@i2pmail.org>
Date: Tue, 13 Jul 2021 09:19:21 +0000
Subject: [PATCH 168/330] btcpayserver: optional altcoin support

---
 .../blockchains/btcpayserver/default.nix      |  6 +-
 .../blockchains/btcpayserver/deps.nix         | 95 +++++++++++++++++++
 .../blockchains/btcpayserver/update.sh        |  3 +-
 .../blockchains/nbxplorer/update.sh           |  2 +-
 .../blockchains/nbxplorer/util/create-deps.sh |  3 +-
 .../nbxplorer/util/update-common.sh           |  3 +-
 6 files changed, 105 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix
index d942ac768a83..ba029aedeeb2 100644
--- a/pkgs/applications/blockchains/btcpayserver/default.nix
+++ b/pkgs/applications/blockchains/btcpayserver/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper,
-  dotnetPackages, dotnetCorePackages
+  dotnetPackages, dotnetCorePackages, altcoinSupport ? false
 }:
 
 let
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
     nuget sources Add -Name tmpsrc -Source $TMP/nuget
     nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget
 
-    dotnet restore --source $TMP/nuget BTCPayServer/BTCPayServer.csproj
-    dotnet publish --no-restore --output $out/share/$pname -c Release BTCPayServer/BTCPayServer.csproj
+    dotnet restore --source $TMP/nuget ${lib.optionalString altcoinSupport ''/p:Configuration="Altcoins-Release"''} BTCPayServer/BTCPayServer.csproj
+    dotnet publish --no-restore --output $out/share/$pname ${lib.optionalString altcoinSupport "-c Altcoins-Release"} BTCPayServer/BTCPayServer.csproj
   '';
 
   # btcpayserver requires the publish directory as its working dir
diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix
index 20b97972107e..8884dc2fe140 100644
--- a/pkgs/applications/blockchains/btcpayserver/deps.nix
+++ b/pkgs/applications/blockchains/btcpayserver/deps.nix
@@ -84,6 +84,11 @@
     version = "3.2.435";
     sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk";
   })
+  (fetchNuGet {
+    name = "Common.Logging.Core";
+    version = "3.4.1";
+    sha256 = "06h80c7l12nh6gnkzskcs4w8741xhprv72vf88f33ilzfy37h5jy";
+  })
   (fetchNuGet {
     name = "CsvHelper";
     version = "15.0.5";
@@ -759,6 +764,11 @@
     version = "2.0.31";
     sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm";
   })
+  (fetchNuGet {
+    name = "NBitcoin";
+    version = "5.0.33";
+    sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a";
+  })
   (fetchNuGet {
     name = "NBitcoin";
     version = "5.0.4";
@@ -794,6 +804,86 @@
     version = "3.0.21";
     sha256 = "1asri2wsjq3ljf2p4r4x52ba9cirh8ccc5ysxpnv4cvladkdazbi";
   })
+  (fetchNuGet {
+    name = "Nethereum.ABI";
+    version = "3.8.0";
+    sha256 = "10saq2qsqqgsf9d5cjji4lay74ydwkvkqgnns6gxikqicci8yx5c";
+  })
+  (fetchNuGet {
+    name = "Nethereum.Accounts";
+    version = "3.8.0";
+    sha256 = "03dq4l1gsd6r2hah5flas8d8pfys7hh5srd279kiidaaxrp8fv2m";
+  })
+  (fetchNuGet {
+    name = "Nethereum.BlockchainProcessing";
+    version = "3.8.0";
+    sha256 = "0sz6710a3rvzbj1ghx8dx9adfpsaydw8129c5nj2bqvvh6shi4ax";
+  })
+  (fetchNuGet {
+    name = "Nethereum.Contracts";
+    version = "3.8.0";
+    sha256 = "0989as81dqz4j0h8b5a9f5hnd4lrjdj851cfc4j5h6hd633a13f8";
+  })
+  (fetchNuGet {
+    name = "Nethereum.HdWallet";
+    version = "3.8.0";
+    sha256 = "0dy1bcm0gsp137286q3bx5q9gyd8lymrdmnh1ip3sszs5j31l9k2";
+  })
+  (fetchNuGet {
+    name = "Nethereum.Hex";
+    version = "3.8.0";
+    sha256 = "0sbi982jnfs39sp7w85wf8lb51mijpwr9mpsmws08zrm90n93kb6";
+  })
+  (fetchNuGet {
+    name = "Nethereum.JsonRpc.Client";
+    version = "3.8.0";
+    sha256 = "0gmdvsxhs398cj14f16r3dl8yv52iaxr9c9214k2ra28r14gfd1l";
+  })
+  (fetchNuGet {
+    name = "Nethereum.JsonRpc.RpcClient";
+    version = "3.8.0";
+    sha256 = "05k5f0dfcx4afbkc1w7cfnz514i7840j2haxyzsxkp8818yvfg0a";
+  })
+  (fetchNuGet {
+    name = "Nethereum.KeyStore";
+    version = "3.8.0";
+    sha256 = "05pj95vcfznlk4saq9dw19377gd1sqgmjcg5h92b5rzpgm9v811s";
+  })
+  (fetchNuGet {
+    name = "Nethereum.Model";
+    version = "3.8.0";
+    sha256 = "1qfhzqirj9bi49zb6rdcy7w5bm9jyv3a79q7crmgpq3qx4lmz5yh";
+  })
+  (fetchNuGet {
+    name = "Nethereum.RLP";
+    version = "3.8.0";
+    sha256 = "16142ag09h95394ip0ffkci09hchxh2i5xaw2rq46qcr8xd3kiym";
+  })
+  (fetchNuGet {
+    name = "Nethereum.RPC";
+    version = "3.8.0";
+    sha256 = "1m2p10dds1k0r3gci25lh6cxl9z7ciw18g6wwa4yqi1hsw7n59vb";
+  })
+  (fetchNuGet {
+    name = "Nethereum.Signer";
+    version = "3.8.0";
+    sha256 = "175acfqjqacc5zwh2kmrfnwd15jm3fjpv0xlgpyqry52mqxd9khf";
+  })
+  (fetchNuGet {
+    name = "Nethereum.StandardTokenEIP20";
+    version = "3.8.0";
+    sha256 = "0xqb32x5b9y9r380frhj52i1lxsfs92nfgcpmys3shjxz6fnwf6g";
+  })
+  (fetchNuGet {
+    name = "Nethereum.Util";
+    version = "3.8.0";
+    sha256 = "1ig1zkzpglq2q465n4c0ckv8w9gca9cfxz1qnrdhap0f1z90jyg8";
+  })
+  (fetchNuGet {
+    name = "Nethereum.Web3";
+    version = "3.8.0";
+    sha256 = "0n18chc9h1cxqp01kncik9lqfgiqrzl2zr8jgzbb05drlf6k0f3i";
+  })
   (fetchNuGet {
     name = "NETStandard.Library";
     version = "1.6.1";
@@ -914,6 +1004,11 @@
     version = "2.2.1";
     sha256 = "1w6s9wjbsyvq8cnqknkdzm9chnv0g5gcsrq5i94zp6br9vg7c627";
   })
+  (fetchNuGet {
+    name = "Portable.BouncyCastle";
+    version = "1.8.2";
+    sha256 = "0xqc8q40lr4r7ahsmzpa1q0jagp12abb6rsj80p37q34hsv5284q";
+  })
   (fetchNuGet {
     name = "QRCoder";
     version = "1.4.1";
diff --git a/pkgs/applications/blockchains/btcpayserver/update.sh b/pkgs/applications/blockchains/btcpayserver/update.sh
index 9debe6780f23..082911b42a3d 100755
--- a/pkgs/applications/blockchains/btcpayserver/update.sh
+++ b/pkgs/applications/blockchains/btcpayserver/update.sh
@@ -8,4 +8,5 @@ echo "Updating nbxplorer"
 ../nbxplorer/update.sh
 echo
 echo "Updating btcpayserver"
-../nbxplorer/util/update-common.sh btcpayserver deps.nix
+# Include Razor SDK packages in deps.nix
+../nbxplorer/util/update-common.sh btcpayserver deps.nix '"/p:Configuration="Altcoins-Release" /p:RazorCompileOnBuild=false'
diff --git a/pkgs/applications/blockchains/nbxplorer/update.sh b/pkgs/applications/blockchains/nbxplorer/update.sh
index 5db2723ef8e9..caab20c928f8 100755
--- a/pkgs/applications/blockchains/nbxplorer/update.sh
+++ b/pkgs/applications/blockchains/nbxplorer/update.sh
@@ -3,4 +3,4 @@ set -euo pipefail
 
 scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
 
-getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix
+getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix ''
diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
index 14b1687dffff..fb10446142e2 100755
--- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
+++ b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
@@ -7,6 +7,7 @@ set -euo pipefail
 
 pkgSrc=$1
 depsFile=$(realpath "$2")
+customFlags=$3
 
 sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1)
 [[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; }
@@ -20,7 +21,7 @@ pushd "$tmpdir" > /dev/null
 mkdir home
 echo "Running dotnet restore for $sln"
 HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \
-  dotnet restore -v normal --no-cache "$sln" > restore_log
+  dotnet restore $customFlags -v normal --no-cache "$sln" > restore_log
 
 echo "{ fetchNuGet }: [" > "$depsFile"
 while read pkgSpec; do
diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
index 7a9262bf4833..a9912b8b368c 100755
--- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
+++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
@@ -8,6 +8,7 @@ set -euo pipefail
 
 pkgName=$1
 depsFile=$2
+customFlags=$3
 
 : ${getVersionFromTags:=}
 : ${refetch:=}
@@ -71,4 +72,4 @@ echo
 
 # Create deps file
 storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)"
-. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile"
+. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" "$customFlags"

From ab25d5fc78c1c19ad08a1f17114a077bb37d3022 Mon Sep 17 00:00:00 2001
From: whonore <wolfhonore@gmail.com>
Date: Thu, 15 Jul 2021 15:06:05 -0400
Subject: [PATCH 169/330] bitwise: init at 0.42

---
 pkgs/tools/misc/bitwise/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/bitwise/default.nix

diff --git a/pkgs/tools/misc/bitwise/default.nix b/pkgs/tools/misc/bitwise/default.nix
new file mode 100644
index 000000000000..a7ae6243f453
--- /dev/null
+++ b/pkgs/tools/misc/bitwise/default.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  pname = "bitwise";
+  version = "0.42";
+
+  src = fetchFromGitHub {
+    owner = "mellowcandle";
+    repo = "bitwise";
+    rev = "v${version}";
+    sha256 = "154y0sn3z64z56k84ghsazkyihbkaz40hfwxcxdymnhvhh6m9f3g";
+  };
+
+  buildInputs = [ ncurses readline ];
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with lib; {
+    description = "Terminal based bitwise calculator in curses";
+    homepage = "https://github.com/mellowcandle/bitwise";
+    license = licenses.gpl3Only;
+    maintainers = [ maintainers.whonore ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66b25b7eeb41..81417100ef88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1249,6 +1249,8 @@ in
 
   betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { };
 
+  bitwise = callPackage ../tools/misc/bitwise { };
+
   brakeman = callPackage ../development/tools/analysis/brakeman { };
 
   brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ;

From 22b642f457b12c5b5b58169d62b290bc824b8fe4 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 16 Jul 2021 14:31:23 +0200
Subject: [PATCH 170/330] nar-serve: 0.3.0 -> 0.4.0

---
 pkgs/tools/nix/nar-serve/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix
index 146165d880de..1d7fd6beb4a7 100644
--- a/pkgs/tools/nix/nar-serve/default.nix
+++ b/pkgs/tools/nix/nar-serve/default.nix
@@ -1,24 +1,19 @@
 { buildGoModule
 , fetchFromGitHub
 , lib
-
 }:
-let
-  pname = "nar-serve";
-  version = "0.3.0";
-
-in
 buildGoModule rec {
-  inherit pname version;
+  pname = "nar-serve";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "nar-serve";
     rev = "v${version}";
-    sha256 = "000xxrar5ngrqqfi7ynx84i6wi27mirgm26brhyg0y4pygc9ykhz";
+    hash = "sha256-h/pzKRXgcGTpr1YUKppDa+iTLKak/PGhbYa8ZczWj1U=";
   };
 
-  vendorSha256 = "0qkzbr85wkx3r7qgnzg9pdl7vsli10bzcdbj2gqd1kdzwb8khszs";
+  vendorSha256 = "sha256-eW+cul/5qJocpKV/6azxj7HTmkezDw6dNubPtAOP5HU=";
 
   doCheck = false;
 

From 2a44031d56f6cf8707d65a17bc9a7777a03dfa61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 16 Jul 2021 16:15:32 +0200
Subject: [PATCH 171/330] stdenv/make-bootstrap-tools: nuke yet another header

This is needed after glibc bump from PR #111616.
---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 4db40a2e516b..0eee6e692fd3 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -183,7 +183,7 @@ in with pkgs; rec {
         nuke-refs $out/lib/*
         nuke-refs $out/libexec/gcc/*/*/*
         nuke-refs $out/lib/gcc/*/*/*
-        nuke-refs $out/lib/gcc/*/*/include-fixed/*/*
+        nuke-refs $out/lib/gcc/*/*/include-fixed/*{,/*}
 
         mkdir $out/.pack
         mv $out/* $out/.pack

From 6a10c72d90a50e73171a8b9963a67407962e1c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 16 Jul 2021 16:27:33 +0200
Subject: [PATCH 172/330] xf86_input_wacom: fix build

I suspect that some of the stdenv changes (PR #127736 maybe?)
affected how the newline was handled.  Anyway, it was ugly,
so let's use a more standard approach.
---
 pkgs/os-specific/linux/xf86-input-wacom/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index 34cfd58ab4bc..5f4434c0a6b2 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -45,13 +45,11 @@ stdenv.mkDerivation rec {
     xorgserver
   ];
 
-  preConfigure = ''
-    mkdir -p $out/share/X11/xorg.conf.d
-    configureFlags="--with-xorg-module-dir=$out/lib/xorg/modules
-    --with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d"
-  '';
-
-  CFLAGS = "-I${pixman}/include/pixman-1";
+  configureFlags = [
+    "--with-xorg-module-dir=$(out)/lib/xorg/modules"
+    "--with-sdkdir=$(out)/include/xorg"
+    "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d"
+  ];
 
   meta = with lib; {
     maintainers = with maintainers; [ goibhniu fortuneteller2k ];

From b8130cbd64a3c1107a4bc9a5499564a13a644885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 16 Jul 2021 16:42:31 +0200
Subject: [PATCH 173/330] Revert "zig: add upstream patch to allow glibc 2.33
 builds"

This reverts commit c1d014a975d58112ca678745eb3af5e1206fe1ea.
The patch was included in 0.8.0 and now was failing to apply.
---
 pkgs/development/compilers/zig/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index 9a01373cf2b2..60ca574f1ccb 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -4,7 +4,6 @@
 , llvmPackages
 , libxml2
 , zlib
-, fetchpatch
 }:
 
 let
@@ -21,14 +20,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-bILjcKX8jPl2n1HRYvYRb7jJkobwqmSJ+hHXSn9n2ag=";
   };
 
-  patches = [
-    # glibc 2.33 support
-    (fetchpatch {
-      url = "https://github.com/ziglang/zig/commit/0fee4b55a8c58791238efe6bf2da5ce3435a5cc1.patch";
-      sha256 = "sha256-waVtolUlmGrfiRk4tWsSOij5MfUc+g57DatC6GtSx6c=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     llvmPackages.llvm.dev

From bf051e91d6018e3620e368d4401470694bebd831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 16 Jul 2021 16:57:13 +0200
Subject: [PATCH 174/330] setools: fix build

I assume it broke with python 3.8 -> 3.9.
Updating would be another way, but that would require also updating some
dependencies, and I'm not a selinux person so I chose a simple patch.
---
 pkgs/os-specific/linux/setools/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix
index 0da84ab1cefd..842a525353d4 100644
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/pkgs/os-specific/linux/setools/default.nix
@@ -1,5 +1,6 @@
 { lib, fetchFromGitHub, python3
 , libsepol, libselinux, checkpolicy
+, fetchpatch
 , withGraphics ? false
 }:
 
@@ -17,6 +18,13 @@ buildPythonApplication rec {
     sha256 = "0vr20bi8w147z5lclqz1l0j1b34137zg2r04pkafkgqqk7qbyjk6";
   };
 
+  patches = [
+    (fetchpatch { # included in 4.4.0
+      url = "https://github.com/SELinuxProject/setools/commit/f1b4a5d375be05fbccedb258c940d771bff8e524.diff";
+      sha256 = "1r38s6i4i6bdr2zdp5wcg1yifpf3pd018c73a511mgynyg7d11xy";
+    })
+  ];
+
   nativeBuildInputs = [ cython ];
   buildInputs = [ libsepol ];
   propagatedBuildInputs = [ enum34 libselinux networkx ]

From d7427b0d8bfc52f898798f6cbfb0c3b13d43917f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 16 Jul 2021 17:35:02 +0200
Subject: [PATCH 175/330] xf86_input_wacom: also fix xorg-wacom.pc

I didn't notice that $(out) wouldn't get expanded there,
and that naturally caused issues for reverse dependencies.
---
 pkgs/os-specific/linux/xf86-input-wacom/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index 5f4434c0a6b2..4ebc4ed76638 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-xorg-module-dir=$(out)/lib/xorg/modules"
-    "--with-sdkdir=$(out)/include/xorg"
-    "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d"
+    "--with-xorg-module-dir=${placeholder "out"}/lib/xorg/modules"
+    "--with-sdkdir=${placeholder "out"}/include/xorg"
+    "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d"
   ];
 
   meta = with lib; {

From a7ce1485c5b6fe9db172f347c81fa30ed3138c3d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 16 Jul 2021 19:57:56 +0200
Subject: [PATCH 176/330] step-cli: 0.15.16 -> 0.16.1

---
 pkgs/tools/security/step-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix
index a13eec71eb84..413e331f0958 100644
--- a/pkgs/tools/security/step-cli/default.nix
+++ b/pkgs/tools/security/step-cli/default.nix
@@ -5,20 +5,20 @@
 
 buildGoModule rec {
   pname = "step-cli";
-  version = "0.15.16";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "smallstep";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-/HqCG3LscwogLXvZlL2CVo2Pj1hVRnOMPCmG1hxrG/I=";
+    sha256 = "sha256-gMXvHPqWvaZmzWiWrxlknaMkUraS64yrKl+RzAF7c4I=";
   };
 
   preCheck = ''
     # Tries to connect to smallstep.com
     rm command/certificate/remote_test.go
   '';
-  vendorSha256 = "sha256-plQgIqs6QUbzndn8C0ByKceGtz/JxZ1Rx0fXWHNJ0kM=";
+  vendorSha256 = "sha256-WF2UD0LwzCMkoW1EfcjV+9ZboPp1oWhmsSEryj13Kg0=";
 
   meta = with lib; {
     description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";

From 6ca65a0946d91908ed9b35e1833370582f71c50a Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sat, 10 Jul 2021 14:31:25 -0600
Subject: [PATCH 177/330] quill: init at 0.2.1

---
 pkgs/tools/security/quill/default.nix | 46 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  4 +++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/tools/security/quill/default.nix

diff --git a/pkgs/tools/security/quill/default.nix b/pkgs/tools/security/quill/default.nix
new file mode 100644
index 000000000000..74c7996a8964
--- /dev/null
+++ b/pkgs/tools/security/quill/default.nix
@@ -0,0 +1,46 @@
+{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, Security, libiconv, pkg-config, protobuf, which, buildPackages }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "quill";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "dfinity";
+    repo = "quill";
+    rev = "v${version}";
+    sha256 = "02ga2xkdxs36mfr4lv43cy6wkf27c28bdkzfkp3az5jvyk17mkfr";
+  };
+
+  ic = fetchFromGitHub {
+    owner = "dfinity";
+    repo = "ic";
+    rev = "779549eccfcf61ac702dfc2ee6d76ffdc2db1f7f";
+    sha256 = "1r31d5hab7k1n60a7y8fw79fjgfq04cgj9krwa6r9z4isi3919v6";
+  };
+
+  registry = "file://local-registry";
+
+  preBuild = ''
+    export REGISTRY_TRANSPORT_PROTO_INCLUDES=${ic}/rs/registry/transport/proto
+    export IC_BASE_TYPES_PROTO_INCLUDES=${ic}/rs/types/base_types/proto
+    export IC_PROTOBUF_PROTO_INCLUDES=${ic}/rs/protobuf/def
+    export IC_NNS_COMMON_PROTO_INCLUDES=${ic}/rs/nns/common/proto
+    export PROTOC=${buildPackages.protobuf}/bin/protoc
+    export OPENSSL_DIR=${openssl.dev}
+    export OPENSSL_LIB_DIR=${openssl.out}/lib
+  '';
+
+  cargoSha256 = "142pzhyi73ljlqas5vbhjhn4vmp9w9ps1mv8q7s3kzg0h7jcvm1k";
+
+  nativeBuildInputs = [ pkg-config protobuf ];
+  buildInputs = [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
+
+  meta = with lib; {
+    homepage = "https://github.com/dfinity/quill";
+    changelog = "https://github.com/dfinity/quill/releases/tag/v${version}";
+    description = "Minimalistic ledger and governance toolkit for cold wallets on the Internet Computer.";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ imalison ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ca6d840318f..dcfa09362e62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18021,6 +18021,10 @@ in
 
   quicksynergy = callPackage ../applications/misc/quicksynergy { };
 
+  quill = callPackage ../tools/security/quill {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {};
 
   qwt = callPackage ../development/libraries/qwt {};

From c1ed4a4d07231d5c687019986cfa9c7f4bed1296 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 16 Jul 2021 20:53:55 +0200
Subject: [PATCH 178/330] step-cli: add ldflags for version

---
 pkgs/tools/security/step-cli/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix
index 413e331f0958..c91a83c0a0d7 100644
--- a/pkgs/tools/security/step-cli/default.nix
+++ b/pkgs/tools/security/step-cli/default.nix
@@ -14,10 +14,17 @@ buildGoModule rec {
     sha256 = "sha256-gMXvHPqWvaZmzWiWrxlknaMkUraS64yrKl+RzAF7c4I=";
   };
 
+  ldflags = [
+    "-w"
+    "-s"
+    "-X main.Version=${version}"
+  ];
+
   preCheck = ''
     # Tries to connect to smallstep.com
     rm command/certificate/remote_test.go
   '';
+
   vendorSha256 = "sha256-WF2UD0LwzCMkoW1EfcjV+9ZboPp1oWhmsSEryj13Kg0=";
 
   meta = with lib; {

From 2ae4f06e4ff222af93ba9dfbe1a461687b308b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 17 Jul 2021 10:17:55 +0200
Subject: [PATCH 179/330] hplip: replace preConfigure with a nicer approach

The newlines were a problem at *this* moment:
https://github.com/NixOS/nixpkgs/commit/c335a18e#commitcomment-53611461
but let's make the hplip expression nicer regardless of how that ends.
---
 pkgs/misc/drivers/hplip/default.nix | 55 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index c8566bfc07a9..f33ca5024383 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -123,36 +123,35 @@ python3Packages.buildPythonApplication {
       {} +
   '';
 
-  preConfigure = ''
-    export configureFlags="$configureFlags
-      --with-hpppddir=$out/share/cups/model/HP
-      --with-cupsfilterdir=$out/lib/cups/filter
-      --with-cupsbackenddir=$out/lib/cups/backend
-      --with-icondir=$out/share/applications
-      --with-systraydir=$out/xdg/autostart
-      --with-mimedir=$out/etc/cups
-      --enable-policykit
-      ${lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"}
-      --disable-qt4
-      ${lib.optionalString withQt5 "--enable-qt5"}
-    "
+  configureFlags = let out = placeholder "out"; in [
+    "--with-hpppddir=${out}/share/cups/model/HP"
+    "--with-cupsfilterdir=${out}/lib/cups/filter"
+    "--with-cupsbackenddir=${out}/lib/cups/backend"
+    "--with-icondir=${out}/share/applications"
+    "--with-systraydir=${out}/xdg/autostart"
+    "--with-mimedir=${out}/etc/cups"
+    "--enable-policykit"
+    "--disable-qt4"
+  ]
+    ++ lib.optional withStaticPPDInstall "--enable-cups-ppd-install"
+    ++ lib.optional withQt5 "--enable-qt5"
+    ;
 
-    export makeFlags="
-      halpredir=$out/share/hal/fdi/preprobe/10osvendor
-      rulesdir=$out/etc/udev/rules.d
-      policykit_dir=$out/share/polkit-1/actions
-      policykit_dbus_etcdir=$out/etc/dbus-1/system.d
-      policykit_dbus_sharedir=$out/share/dbus-1/system-services
-      hplip_confdir=$out/etc/hp
-      hplip_statedir=$out/var/lib/hp
-    "
+  # Prevent 'ppdc: Unable to find include file "<font.defs>"' which prevent
+  # generation of '*.ppd' files.
+  # This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox.
+  # Could not find how to fix the problem in 'ppdc' so this is a workaround.
+  CUPS_DATADIR = "${cups}/share/cups";
 
-    # Prevent 'ppdc: Unable to find include file "<font.defs>"' which prevent
-    # generation of '*.ppd' files.
-    # This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox.
-    # Could not find how to fix the problem in 'ppdc' so this is a workaround.
-    export CUPS_DATADIR="${cups}/share/cups"
-  '';
+  makeFlags = let out = placeholder "out"; in [
+    "halpredir=${out}/share/hal/fdi/preprobe/10osvendor"
+    "rulesdir=${out}/etc/udev/rules.d"
+    "policykit_dir=${out}/share/polkit-1/actions"
+    "policykit_dbus_etcdir=${out}/etc/dbus-1/system.d"
+    "policykit_dbus_sharedir=${out}/share/dbus-1/system-services"
+    "hplip_confdir=${out}/etc/hp"
+    "hplip_statedir=${out}/var/lib/hp"
+  ];
 
   postConfigure = ''
     # don't save timestamp, in order to improve reproducibility

From 5e1aa874ccf2dddf08701190ef009e411abc2002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 17 Jul 2021 10:32:21 +0200
Subject: [PATCH 180/330] eventlog: fix build after commit fd25c03e095

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

diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix
index c26b1d1a923e..ba4155db1e3c 100644
--- a/pkgs/development/libraries/eventlog/default.nix
+++ b/pkgs/development/libraries/eventlog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "eventlog";
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0a2za3hs7wzy14z7mfgldy1r9xdlqv97yli9wlm8xldr0amsx869";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   meta = {
     description = "Syslog event logger library";
     longDescription = ''

From b0fc0ba4ac80eb2c266524288dda259413677592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 17 Jul 2021 10:46:09 +0200
Subject: [PATCH 181/330] osm2pgsql: fix build with new proj

A forgotten flag, apparently.  Now it seems to be detecting
the (new) API well.
---
 pkgs/tools/misc/osm2pgsql/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix
index 8208459bc89a..062b49e8bbdc 100644
--- a/pkgs/tools/misc/osm2pgsql/default.nix
+++ b/pkgs/tools/misc/osm2pgsql/default.nix
@@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ]
     ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON";
 
-  NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
-
   meta = with lib; {
     description = "OpenStreetMap data to PostgreSQL converter";
     homepage = "https://osm2pgsql.org";

From a57e9fc6c0ae4c349ff0e8c57e1bd56d958ac664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 17 Jul 2021 10:57:04 +0200
Subject: [PATCH 182/330] osm2xmap: mark as broken

Upstream seems dead; I found no fork (in other distros, etc.)
---
 pkgs/applications/misc/osm2xmap/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix
index 4f2af99ab14d..101a626f2c37 100644
--- a/pkgs/applications/misc/osm2xmap/default.nix
+++ b/pkgs/applications/misc/osm2xmap/default.nix
@@ -29,5 +29,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = [ maintainers.mpickering ];
     platforms = with lib.platforms; linux;
+    # it probably needs https://proj.org/development/migration.html
+    broken = true;
   };
 }

From efc838b196c7bc7222d2a1046827947638f28d72 Mon Sep 17 00:00:00 2001
From: Aumy <46275902+AumyF@users.noreply.github.com>
Date: Sun, 18 Jul 2021 00:36:31 +0900
Subject: [PATCH 183/330] nushell: use --features=extra by default

---
 pkgs/shells/nushell/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 65ed6d5000c2..b7fa5453d87a 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -12,7 +12,7 @@
 , Security
 , nghttp2
 , libgit2
-, withStableFeatures ? true
+, withExtraFeatures ? true
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "sha256-Ly59mdUzSI2pIPbckWn1WBz/o2zVzpAzaCDROLdjG7Y=";
 
   nativeBuildInputs = [ pkg-config ]
-    ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];
+    ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
 
   buildInputs = [ openssl ]
     ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ]
-    ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ]
-    ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
+    ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ]
+    ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
 
-  cargoBuildFlags = lib.optional withStableFeatures "--features stable";
+  cargoBuildFlags = lib.optional withExtraFeatures "--features=extra";
 
   # TODO investigate why tests are broken on darwin
   # failures show that tests try to write to paths

From 4bd38c330fc6dace1f45a29bbc7f5c64b22fffdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 17 Jul 2021 20:27:52 +0200
Subject: [PATCH 184/330] Revert #127736: stdenv changes towards an alternative
 shell

At least for now.  Such changes are risky (we have very many packages),
and apparently it needs more testing/review without blocking other
changes.

This reverts the whole range 4d0e3984918^..8752c327377,
except for one commit that got reverted in 6f239d73096 already.
(that MR didn't even get its merge commit)
---
 .../bintools-wrapper/setup-hook.sh            |   9 +-
 .../setup-hooks/auto-patchelf.sh              |   1 -
 pkgs/build-support/setup-hooks/autoreconf.sh  |   3 +-
 .../setup-hooks/make-symlinks-relative.sh     |   1 -
 pkgs/build-support/setup-hooks/move-docs.sh   |   7 +-
 .../setup-hooks/multiple-outputs.sh           |  16 +-
 .../setup-hooks/reproducible-builds.sh        |   8 +-
 pkgs/stdenv/generic/builder.sh                |  18 +-
 pkgs/stdenv/generic/setup.sh                  | 244 ++++++++----------
 9 files changed, 128 insertions(+), 179 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh
index ba09d19b1f26..7e9547b96c25 100644
--- a/pkgs/build-support/bintools-wrapper/setup-hook.sh
+++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh
@@ -1,4 +1,3 @@
-# shellcheck shell=bash
 # Binutils Wrapper hygiene
 #
 # See comments in cc-wrapper's setup hook. This works exactly the same way.
@@ -15,9 +14,7 @@ bintoolsWrapper_addLDVars () {
     getHostRoleEnvHook
 
     if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then
-        varName=NIX_LDFLAGS${role_post}
-        eval "$varName=\"${!varName:-} -L$1/lib64\""
-        export "${varName?}"
+        export NIX_LDFLAGS${role_post}+=" -L$1/lib64"
     fi
 
     if [[ -d "$1/lib" ]]; then
@@ -27,9 +24,7 @@ bintoolsWrapper_addLDVars () {
         # directories and bloats the size of the environment variable space.
         local -a glob=( $1/lib/lib* )
         if [ "${#glob[*]}" -gt 0 ]; then
-            varName=NIX_LDFLAGS${role_post}
-            eval "$varName=\"${!varName:-} -L$1/lib\""
-            export "${varName?}"
+            export NIX_LDFLAGS${role_post}+=" -L$1/lib"
         fi
     fi
 }
diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 70b1fc802b56..511371931de8 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -29,7 +29,6 @@ isExecutable() {
     isExeResult="$(LANG=C $READELF -h -l "$1" 2> /dev/null \
         | grep '^ *Type: *EXEC\>\|^ *INTERP\>')"
     # not using grep -q, because it can cause Broken pipe
-    # https://unix.stackexchange.com/questions/305547/broken-pipe-when-grepping-output-but-only-with-i-flag
     [ -n "$isExeResult" ]
 }
 
diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh
index 4ba4025a02e6..c08cab158688 100644
--- a/pkgs/build-support/setup-hooks/autoreconf.sh
+++ b/pkgs/build-support/setup-hooks/autoreconf.sh
@@ -1,5 +1,4 @@
-# shellcheck shell=bash
-preConfigurePhases="${preConfigurePhases:-} autoreconfPhase"
+preConfigurePhases+=" autoreconfPhase"
 
 autoreconfPhase() {
     runHook preAutoreconf
diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
index fd65f2e8e13b..0608d3ca81c4 100644
--- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
+++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh
@@ -1,4 +1,3 @@
-# shellcheck shell=bash
 fixupOutputHooks+=(_makeSymlinksRelative)
 
 # For every symlink in $output that refers to another file in $output
diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh
index 965c16be2f62..ef31dcdce274 100644
--- a/pkgs/build-support/setup-hooks/move-docs.sh
+++ b/pkgs/build-support/setup-hooks/move-docs.sh
@@ -6,7 +6,7 @@ preFixupHooks+=(_moveToShare)
 
 _moveToShare() {
     forceShare=${forceShare:=man doc info}
-    if [[ -z $forceShare || -z $out ]]; then return; fi
+    if [ -z "$forceShare" -o -z "$out" ]; then return; fi
 
     for d in $forceShare; do
         if [ -d "$out/$d" ]; then
@@ -14,9 +14,10 @@ _moveToShare() {
                 echo "both $d/ and share/$d/ exist!"
             else
                 echo "moving $out/$d to $out/share/$d"
-                mkdir -p "$out/share"
-                mv "$out/$d" "$out/share/"
+                mkdir -p $out/share
+                mv $out/$d $out/share/
             fi
         fi
     done
 }
+
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 91f056cc89bd..bfa47e3b20e1 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -1,4 +1,3 @@
-# shellcheck shell=bash
 # The base package for automatic multiple-output splitting. Used in stdenv as well.
 preConfigureHooks+=(_multioutConfig)
 preFixupHooks+=(_multioutDocs)
@@ -48,25 +47,22 @@ _overrideFirst outputInfo "info" "$outputBin"
 
 # Add standard flags to put files into the desired outputs.
 _multioutConfig() {
-    if [[ "$outputs" = "out" || -z "${setOutputFlags-1}" ]]; then
-        return
-    fi
+    if [ "$outputs" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi;
 
     # try to detect share/doc/${shareDocName}
     # Note: sadly, $configureScript detection comes later in configurePhase,
     #   and reordering would cause more trouble than worth.
     if [ -z "$shareDocName" ]; then
         local confScript="$configureScript"
-        if [[ -z "$confScript" && -x ./configure ]]; then
+        if [ -z "$confScript" ] && [ -x ./configure ]; then
             confScript=./configure
         fi
         if [ -f "$confScript" ]; then
             local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")"
-            # PACKAGE_TARNAME sometimes contains garbage.
-            # verify that shareDocName contains only valid characters
-            if ! [[ $shareDocName =~ ^[a-zA-Z0f9_-]+$ ]]; then
-                shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"
-            fi
+        fi
+                                    # PACKAGE_TARNAME sometimes contains garbage.
+        if [ -z "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then
+            shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"
         fi
     fi
 
diff --git a/pkgs/build-support/setup-hooks/reproducible-builds.sh b/pkgs/build-support/setup-hooks/reproducible-builds.sh
index 29efd22d9051..5b01c213fe4a 100644
--- a/pkgs/build-support/setup-hooks/reproducible-builds.sh
+++ b/pkgs/build-support/setup-hooks/reproducible-builds.sh
@@ -1,13 +1,9 @@
-# shellcheck disable=SC2148
 # Use the last part of the out path as hash input for the build.
 # This should ensure that it is deterministic across rebuilds of the same
 # derivation and not easily collide with other builds.
 # We also truncate the hash so that it cannot cause reference cycles.
-# NIX_CFLAGS_COMPILE might not have been defined before
-NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE:-} -frandom-seed=$(
-    # shellcheck disable=SC2154
+export NIX_CFLAGS_COMPILE+=" -frandom-seed=$(
     outbase="${out##*/}"
     randomseed="${outbase:0:10}"
-    echo "$randomseed"
+    echo $randomseed
 )"
-export NIX_CFLAGS_COMPILE
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index 986d94943c59..79bf21ab4730 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -4,20 +4,18 @@ for i in $initialPath; do
     PATH=$PATH${PATH:+:}$i/bin
 done
 
-mkdir "$out"
+mkdir $out
 
-{
-    echo "export SHELL=$shell"
-    echo "initialPath=\"$initialPath\""
-    echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\""
-    echo "defaultBuildInputs=\"$defaultBuildInputs\""
-    echo "$preHook"
-    cat "$setup"
-} > "$out/setup"
+echo "export SHELL=$shell" > $out/setup
+echo "initialPath=\"$initialPath\"" >> $out/setup
+echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup
+echo "defaultBuildInputs=\"$defaultBuildInputs\"" >> $out/setup
+echo "$preHook" >> $out/setup
+cat "$setup" >> $out/setup
 
 # Allow the user to install stdenv using nix-env and get the packages
 # in stdenv.
 mkdir $out/nix-support
-if [ -n "${propagatedUserEnvPkgs:-}" ]; then
+if [ "$propagatedUserEnvPkgs" ]; then
     printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages
 fi
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 4ae561fbca07..066ef6ed9eb3 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1,4 +1,3 @@
-# shellcheck shell=bash
 set -eu
 set -o pipefail
 
@@ -12,7 +11,7 @@ if (( "${NIX_DEBUG:-0}" >= 6 )); then
     set -x
 fi
 
-: "${outputs:=out}"
+: ${outputs:=out}
 
 
 ######################################################################
@@ -69,8 +68,7 @@ _callImplicitHook() {
     local hookName="$2"
     if declare -F "$hookName" > /dev/null; then
         "$hookName"
-    elif test -e "$hookName" ; then
-        # shellcheck disable=SC1090
+    elif type -p "$hookName" > /dev/null; then
         source "$hookName"
     elif [ -n "${!hookName:-}" ]; then
         eval "${!hookName}"
@@ -124,14 +122,13 @@ exitHandler() {
 
     if [ -n "${showBuildStats:-}" ]; then
         times > "$NIX_BUILD_TOP/.times"
-        local -a buildTimesArray
-        IFS=" " read -r -a buildTimesArray < "$NIX_BUILD_TOP/.times"
+        local -a times=($(cat "$NIX_BUILD_TOP/.times"))
         # Print the following statistics:
         # - user time for the shell
         # - system time for the shell
         # - user time for all child processes
         # - system time for all child processes
-        echo "build time elapsed: " "${buildTimesArray[@]}"
+        echo "build time elapsed: " "${times[@]}"
     fi
 
     if (( "$exitCode" != 0 )); then
@@ -143,7 +140,6 @@ exitHandler() {
         # normally.  Otherwise, return the original exit code.
         if [ -n "${succeedOnFailure:-}" ]; then
             echo "build failed with exit code $exitCode (ignored)"
-            # shellcheck disable=SC2154
             mkdir -p "$out/nix-support"
             printf "%s" "$exitCode" > "$out/nix-support/failed"
             exit 0
@@ -236,7 +232,7 @@ printWords() {
 # implementation uses zip archive and zip does not support dates going back to
 # 1970.
 export SOURCE_DATE_EPOCH
-: "${SOURCE_DATE_EPOCH:=315532800}"
+: ${SOURCE_DATE_EPOCH:=315532800}
 
 
 # Wildcard expansions that don't match should expand to an empty list.
@@ -246,10 +242,8 @@ shopt -s nullglob
 
 
 # Set up the initial path.
-# shellcheck disable=SC2123
 PATH=
 HOST_PATH=
-# shellcheck disable=SC2154
 for i in $initialPath; do
     if [ "$i" = / ]; then i=; fi
     addToSearchPath PATH "$i/bin"
@@ -312,10 +306,6 @@ declare -a pkgTargetHookVars=(envTargetTargetHook)
 
 declare -a pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars)
 
-# those variables are declared here, since where and if they are used varies
-# shellcheck disable=SC2034
-declare -a preFixupHooks fixupOutputHooks preConfigureHooks postFixupHooks postUnpackHooks unpackCmdHooks
-
 # Add env hooks for all sorts of deps with the specified host offset.
 addEnvHooks() {
     local depHostOffset="$1"
@@ -357,14 +347,14 @@ declare -a allPlatOffsets=(-1 0 1)
 # implements.
 findInputs() {
     local -r pkg="$1"
-    local -r hostOffset="$2"
-    local -r targetOffset="$3"
+    local -ri hostOffset="$2"
+    local -ri targetOffset="$3"
 
     # Sanity check
-    (( "$hostOffset" <= "$targetOffset" )) || exit 1
+    (( "$hostOffset" <= "$targetOffset" )) || exit -1
 
-    local varVar="${pkgAccumVarVars[$(( hostOffset + 1 ))]}"
-    local varRef="${varVar}[$(( targetOffset - hostOffset ))]"
+    local varVar="${pkgAccumVarVars[$hostOffset + 1]}"
+    local varRef="$varVar[\$targetOffset - \$hostOffset]"
     local var="${!varRef}"
     unset -v varVar varRef
 
@@ -372,7 +362,7 @@ findInputs() {
     # nix-shell doesn't use impure bash. This should replace the O(n)
     # case with an O(1) hash map lookup, assuming bash is implemented
     # well :D.
-    local varSlice="${var}[*]"
+    local varSlice="$var[*]"
     # ${..-} to hack around old bash empty array problem
     case "${!varSlice-}" in
         *" $pkg "*) return 0 ;;
@@ -389,28 +379,28 @@ findInputs() {
     # The current package's host and target offset together
     # provide a <=-preserving homomorphism from the relative
     # offsets to current offset
-    local mapOffsetResult
+    local -i mapOffsetResult
     function mapOffset() {
-        local -r inputOffset="$1"
+        local -ri inputOffset="$1"
         if (( "$inputOffset" <= 0 )); then
-            local -r outputOffset=$(( inputOffset + hostOffset ))
+            local -ri outputOffset="$inputOffset + $hostOffset"
         else
-            local -r outputOffset=$(( inputOffset - 1 + targetOffset ))
+            local -ri outputOffset="$inputOffset - 1 + $targetOffset"
         fi
         mapOffsetResult="$outputOffset"
     }
 
     # Host offset relative to that of the package whose immediate
     # dependencies we are currently exploring.
-    local relHostOffset
+    local -i relHostOffset
     for relHostOffset in "${allPlatOffsets[@]}"; do
         # `+ 1` so we start at 0 for valid index
-        local files="${propagatedDepFilesVars[$(( relHostOffset + 1 ))]}"
+        local files="${propagatedDepFilesVars[$relHostOffset + 1]}"
 
         # Host offset relative to the package currently being
         # built---as absolute an offset as will be used.
-        mapOffset "$relHostOffset"
-        local hostOffsetNext="$mapOffsetResult"
+        mapOffset relHostOffset
+        local -i hostOffsetNext="$mapOffsetResult"
 
         # Ensure we're in bounds relative to the package currently
         # being built.
@@ -418,18 +408,18 @@ findInputs() {
 
         # Target offset relative to the *host* offset of the package
         # whose immediate dependencies we are currently exploring.
-        local relTargetOffset
+        local -i relTargetOffset
         for relTargetOffset in "${allPlatOffsets[@]}"; do
             (( "$relHostOffset" <= "$relTargetOffset" )) || continue
 
-            local fileRef="${files}[$(( relTargetOffset - relHostOffset ))]"
+            local fileRef="${files}[$relTargetOffset - $relHostOffset]"
             local file="${!fileRef}"
             unset -v fileRef
 
             # Target offset relative to the package currently being
             # built.
-            mapOffset "$relTargetOffset"
-            local targetOffsetNext="$mapOffsetResult"
+            mapOffset relTargetOffset
+            local -i targetOffsetNext="$mapOffsetResult"
 
             # Once again, ensure we're in bounds relative to the
             # package currently being built.
@@ -447,12 +437,12 @@ findInputs() {
 }
 
 # Make sure all are at least defined as empty
-: "${depsBuildBuild=}" "${depsBuildBuildPropagated=}"
-: "${nativeBuildInputs=}" "${propagatedNativeBuildInputs=}" "${defaultNativeBuildInputs=}"
-: "${depsBuildTarget=}" "${depsBuildTargetPropagated=}"
-: "${depsHostHost=}" "${depsHostHostPropagated=}"
-: "${buildInputs=}" "${propagatedBuildInputs=}" "${defaultBuildInputs=}"
-: "${depsTargetTarget=}" "${depsTargetTargetPropagated=}"
+: ${depsBuildBuild=} ${depsBuildBuildPropagated=}
+: ${nativeBuildInputs=} ${propagatedNativeBuildInputs=} ${defaultNativeBuildInputs=}
+: ${depsBuildTarget=} ${depsBuildTargetPropagated=}
+: ${depsHostHost=} ${depsHostHostPropagated=}
+: ${buildInputs=} ${propagatedBuildInputs=} ${defaultBuildInputs=}
+: ${depsTargetTarget=} ${depsTargetTargetPropagated=}
 
 for pkg in $depsBuildBuild $depsBuildBuildPropagated; do
     findInputs "$pkg" -1 -1
@@ -483,14 +473,13 @@ done
 # Add package to the future PATH and run setup hooks
 activatePackage() {
     local pkg="$1"
-    local -r hostOffset="$2"
-    local -r targetOffset="$3"
+    local -ri hostOffset="$2"
+    local -ri targetOffset="$3"
 
     # Sanity check
-    (( "$hostOffset" <= "$targetOffset" )) || exit 1
+    (( "$hostOffset" <= "$targetOffset" )) || exit -1
 
     if [ -f "$pkg" ]; then
-        # shellcheck disable=SC1090
         source "$pkg"
     fi
 
@@ -498,7 +487,7 @@ activatePackage() {
     # build platform are included here. That would be `depsBuild*`,
     # and legacy `nativeBuildInputs`, in general. If we aren't cross
     # compiling, however, everything can be put on the PATH. To ease
-    # the transition, we do include everything in that case.
+    # the transition, we do include everything in thatcase.
     #
     # TODO(@Ericson2314): Don't special-case native compilation
     if [[ -z "${strictDeps-}" || "$hostOffset" -le -1 ]]; then
@@ -514,19 +503,19 @@ activatePackage() {
     fi
 
     if [[ -f "$pkg/nix-support/setup-hook" ]]; then
-        # shellcheck disable=SC1091
         source "$pkg/nix-support/setup-hook"
     fi
 }
 
 _activatePkgs() {
-    local hostOffset targetOffset pkg
+    local -i hostOffset targetOffset
+    local pkg
 
     for hostOffset in "${allPlatOffsets[@]}"; do
-        local pkgsVar="${pkgAccumVarVars[$(( hostOffset + 1 ))]}"
+        local pkgsVar="${pkgAccumVarVars[$hostOffset + 1]}"
         for targetOffset in "${allPlatOffsets[@]}"; do
             (( "$hostOffset" <= "$targetOffset" )) || continue
-            local pkgsRef="${pkgsVar}[$(( targetOffset - hostOffset ))]"
+            local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]"
             local pkgsSlice="${!pkgsRef}[@]"
             for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do
                 activatePackage "$pkg" "$hostOffset" "$targetOffset"
@@ -547,14 +536,15 @@ _activatePkgs
 # with this information to the relevant env hook array, but bash
 # doesn't have closures, so it's easier to just pass this in.
 _addToEnv() {
-    local depHostOffset depTargetOffset pkg
+    local -i depHostOffset depTargetOffset
+    local pkg
 
     for depHostOffset in "${allPlatOffsets[@]}"; do
-        local hookVar="${pkgHookVarVars[$(( depHostOffset + 1 ))]}"
-        local pkgsVar="${pkgAccumVarVars[$(( depHostOffset + 1 ))]}"
+        local hookVar="${pkgHookVarVars[$depHostOffset + 1]}"
+        local pkgsVar="${pkgAccumVarVars[$depHostOffset + 1]}"
         for depTargetOffset in "${allPlatOffsets[@]}"; do
             (( "$depHostOffset" <= "$depTargetOffset" )) || continue
-            local hookRef="${hookVar}[$(( depTargetOffset - depHostOffset ))]"
+            local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]"
             if [[ -z "${strictDeps-}" ]]; then
 
                 # Keep track of which packages we have visited before.
@@ -565,12 +555,12 @@ _addToEnv() {
                 #
                 # TODO(@Ericson2314): Don't special-case native compilation
                 for pkg in \
-                    "${pkgsBuildBuild[@]}" \
-                    "${pkgsBuildHost[@]}" \
-                    "${pkgsBuildTarget[@]}" \
-                    "${pkgsHostHost[@]}" \
-                    "${pkgsHostTarget[@]}" \
-                    "${pkgsTargetTarget[@]}"
+                    ${pkgsBuildBuild+"${pkgsBuildBuild[@]}"} \
+                    ${pkgsBuildHost+"${pkgsBuildHost[@]}"} \
+                    ${pkgsBuildTarget+"${pkgsBuildTarget[@]}"} \
+                    ${pkgsHostHost+"${pkgsHostHost[@]}"} \
+                    ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \
+                    ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"}
                 do
                     if [[ "$visitedPkgs" = *"$pkg"* ]]; then
                         continue
@@ -579,7 +569,7 @@ _addToEnv() {
                     visitedPkgs+=" $pkg"
                 done
             else
-                local pkgsRef="${pkgsVar}[$(( depTargetOffset - depHostOffset ))]"
+                local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]"
                 local pkgsSlice="${!pkgsRef}[@]"
                 for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do
                     runHook "${!hookRef}" "$pkg"
@@ -645,7 +635,7 @@ export NIX_INDENT_MAKE=1
 
 if [ -z "${NIX_BUILD_CORES:-}" ]; then
   NIX_BUILD_CORES="1"
-elif (( "$NIX_BUILD_CORES" <= 0 )); then
+elif [ "$NIX_BUILD_CORES" -le 0 ]; then
   NIX_BUILD_CORES=$(nproc 2>/dev/null || true)
   if expr >/dev/null 2>&1 "$NIX_BUILD_CORES" : "^[0-9][0-9]*$"; then
     :
@@ -658,11 +648,11 @@ export NIX_BUILD_CORES
 
 # Prevent SSL libraries from using certificates in /etc/ssl, unless set explicitly.
 # Leave it in impure shells for convenience.
-if [[ -z "${NIX_SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then
+if [ -z "${NIX_SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then
   export NIX_SSL_CERT_FILE=/no-cert-file.crt
 fi
 # Another variant left for compatibility.
-if [[ -z "${SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then
+if [ -z "${SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then
   export SSL_CERT_FILE=/no-cert-file.crt
 fi
 
@@ -728,7 +718,6 @@ substituteStream() {
 
 consumeEntire() {
     # read returns non-0 on EOF, so we want read to fail
-    # shellcheck disable=SC2086
     if IFS='' read -r -N 0 $1; then
         echo "consumeEntire(): ERROR: Input null bytes, won't process" >&2
         return 1
@@ -900,7 +889,7 @@ unpackPhase() {
     # Find the source directory.
 
     # set to empty if unset
-    : "${sourceRoot=}"
+    : ${sourceRoot=}
 
     if [ -n "${setSourceRoot:-}" ]; then
         runOneHook setSourceRoot
@@ -978,8 +967,8 @@ configurePhase() {
     runHook preConfigure
 
     # set to empty if unset
-    : "${configureScript=}"
-    : "${configureFlags=}"
+    : ${configureScript=}
+    : ${configureFlags=}
 
     if [[ -z "$configureScript" && -x ./configure ]]; then
         configureScript=./configure
@@ -997,27 +986,25 @@ configurePhase() {
         configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 
-    if [ -f "$configureScript" ]; then
-        # Add --disable-dependency-tracking to speed up some builds.
-        if [[ -z ${dontAddDisableDepTrack:-} ]]; then
-            if grep -q dependency-tracking "$configureScript"; then
-                configureFlags="--disable-dependency-tracking $configureFlags"
-            fi
+    # Add --disable-dependency-tracking to speed up some builds.
+    if [ -z "${dontAddDisableDepTrack:-}" ]; then
+        if [ -f "$configureScript" ] && grep -q dependency-tracking "$configureScript"; then
+            configureFlags="--disable-dependency-tracking $configureFlags"
         fi
+    fi
 
-        # By default, disable static builds.
-        if [[ -z ${dontDisableStatic:-} ]]; then
-            if grep -q enable-static "$configureScript"; then
-                configureFlags="--disable-static $configureFlags"
-            fi
+    # By default, disable static builds.
+    if [ -z "${dontDisableStatic:-}" ]; then
+        if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then
+            configureFlags="--disable-static $configureFlags"
         fi
     fi
 
     if [ -n "$configureScript" ]; then
-        IFS=" " read -r -a configureFlagsTemp <<< "$configureFlags"
-        local -a flagsArray=(
-            "${configureFlagsTemp[@]}"
-            "${configureFlagsArray[@]}"
+        # Old bash empty array hack
+        # shellcheck disable=SC2086
+        local flagsArray=(
+            $configureFlags ${configureFlagsArray+"${configureFlagsArray[@]}"}
         )
         echoCmd 'configure flags' "${flagsArray[@]}"
         # shellcheck disable=SC2086
@@ -1035,22 +1022,20 @@ buildPhase() {
     runHook preBuild
 
     # set to empty if unset
-    : "${makeFlags=}"
+    : ${makeFlags=}
 
     if [[ -z "$makeFlags" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
         echo "no Makefile, doing nothing"
     else
         foundMakefile=1
-        IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
-        # shellcheck disable=SC2154
-        IFS=" " read -r -a buildFlagsTemp <<< "$buildFlags"
-        local -a flagsArray=(
+
+        # Old bash empty array hack
+        # shellcheck disable=SC2086
+        local flagsArray=(
             ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
-            SHELL="$SHELL"
-            "${makeFlagsTemp[@]}"
-            "${makeFlagsArray[@]}"
-            "${buildFlagsTemp[@]}"
-            "${buildFlagsArray[@]}"
+            SHELL=$SHELL
+            $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"}
         )
 
         echoCmd 'build flags' "${flagsArray[@]}"
@@ -1074,26 +1059,23 @@ checkPhase() {
     if [[ -z "${checkTarget:-}" ]]; then
         #TODO(@oxij): should flagsArray influence make -n?
         if make -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then
-            checkTarget="check"
+            checkTarget=check
         elif make -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then
-            checkTarget="test"
+            checkTarget=test
         fi
     fi
 
     if [[ -z "${checkTarget:-}" ]]; then
         echo "no check/test target in ${makefile:-Makefile}, doing nothing"
     else
-        IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
-        IFS=" " read -r -a checkFlagsTemp <<< "${checkFlags:-VERBOSE=y}"
-        IFS=" " read -r -a checkTargetTemp <<< "${checkTarget}"
-        local -a flagsArray=(
+        # Old bash empty array hack
+        # shellcheck disable=SC2086
+        local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
-            SHELL="$SHELL"
-            "${makeFlagsTemp[@]}"
-            "${makeFlagsArray[@]}"
-            "${checkFlagsTemp[@]}"
-            "${checkFlagsArray[@]}"
-            "${checkTargetTemp[@]}"
+            SHELL=$SHELL
+            $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
+            ${checkTarget}
         )
 
         echoCmd 'check flags' "${flagsArray[@]}"
@@ -1112,18 +1094,14 @@ installPhase() {
     if [ -n "$prefix" ]; then
         mkdir -p "$prefix"
     fi
-    IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
-    # shellcheck disable=SC2154
-    IFS=" " read -r -a installFlagsTemp <<< "$installFlags"
-    # shellcheck disable=SC2154
-    IFS=" " read -r -a installTargetsTemp <<< "${installTargets:-install}"
-    local -a flagsArray=(
-        SHELL="$SHELL"
-        "${makeFlagsTemp[@]}"
-        "${makeFlagsArray[@]}"
-        "${installFlagsTemp[@]}"
-        "${installFlagsArray[@]}"
-        "${installTargetsTemp[@]}"
+
+    # Old bash empty array hack
+    # shellcheck disable=SC2086
+    local flagsArray=(
+        SHELL=$SHELL
+        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+        $installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
+        ${installTargets:-install}
     )
 
     echoCmd 'install flags' "${flagsArray[@]}"
@@ -1178,7 +1156,6 @@ fixupPhase() {
 
         [[ "${!propagatedInputsSlice}" ]] || continue
 
-        # shellcheck disable=SC2154
         mkdir -p "${!outputDev}/nix-support"
         # shellcheck disable=SC2086
         printWords ${!propagatedInputsSlice} > "${!outputDev}/nix-support/$propagatedInputsFile"
@@ -1195,8 +1172,6 @@ fixupPhase() {
         mkdir -p "${!outputDev}/nix-support"
         local hook
         for hook in $setupHooks; do
-            # content is being assigned to in the following lines
-            # shellcheck disable=SC2034
             local content
             consumeEntire content < "$hook"
             substituteAllStream content "file '$hook'" >> "${!outputDev}/nix-support/setup-hook"
@@ -1208,7 +1183,6 @@ fixupPhase() {
     # Propagate user-env packages into the output with binaries, TODO?
 
     if [ -n "${propagatedUserEnvPkgs:-}" ]; then
-        # shellcheck disable=SC2154
         mkdir -p "${!outputBin}/nix-support"
         # shellcheck disable=SC2086
         printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages"
@@ -1225,21 +1199,17 @@ installCheckPhase() {
         echo "no Makefile or custom installCheckPhase, doing nothing"
     #TODO(@oxij): should flagsArray influence make -n?
     elif [[ -z "${installCheckTarget:-}" ]] \
-       && ! make -n ${makefile:+-f $makefile} "${installCheckTarget:-installcheck}" >/dev/null 2>&1; then
+       && ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then
         echo "no installcheck target in ${makefile:-Makefile}, doing nothing"
     else
-        IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
-        # shellcheck disable=SC2154
-        IFS=" " read -r -a installCheckFlagsTemp <<< "$installCheckFlags"
-        IFS=" " read -r -a installCheckTargetTemp <<< "${installCheckTarget:-installcheck}"
-        local -a flagsArray=(
+        # Old bash empty array hack
+        # shellcheck disable=SC2086
+        local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
-            SHELL="$SHELL"
-            "${makeFlagsTemp[@]}"
-            "${makeFlagsArray[@]}"
-            "${installCheckFlagsTemp[@]}"
-            "${installCheckFlagsArray[@]}"
-            "${installCheckTargetTemp[@]}"
+            SHELL=$SHELL
+            $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
+            ${installCheckTarget:-installcheck}
         )
 
         echoCmd 'installcheck flags' "${flagsArray[@]}"
@@ -1254,13 +1224,10 @@ installCheckPhase() {
 distPhase() {
     runHook preDist
 
-    # shellcheck disable=SC2154
-    IFS=" " read -r -a distFlagsTemp <<< "$distFlags"
-
+    # Old bash empty array hack
+    # shellcheck disable=SC2086
     local flagsArray=(
-        "${distFlagsTemp[@]}"
-        ${distFlagsArray+"${distFlagsArray[@]}"}
-        "${distTarget:-dist}"
+        $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist}
     )
 
     echo 'dist flags: %q' "${flagsArray[@]}"
@@ -1297,7 +1264,6 @@ showPhaseHeader() {
 
 genericBuild() {
     if [ -f "${buildCommandPath:-}" ]; then
-        # shellcheck disable=SC1090
         source "$buildCommandPath"
         return
     fi
@@ -1325,7 +1291,7 @@ genericBuild() {
         if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then continue; fi
 
         if [[ -n $NIX_LOG_FD ]]; then
-            echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD"
+            echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&$NIX_LOG_FD
         fi
 
         showPhaseHeader "$curPhase"

From c2d4ce2808616d558b6cef8a6d270c4930b06c18 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Sat, 17 Jul 2021 00:07:54 +0000
Subject: [PATCH 185/330] Pick #130412: glibc: 2.33-45 -> 2.33-47 (security)

Includes CVE-2021-35942.
https://sourceware.org/bugzilla/show_bug.cgi?id=28011
---
 .../libraries/glibc/2.33-master.patch.gz      | Bin 55158 -> 56984 bytes
 pkgs/development/libraries/glibc/common.nix   |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz
index 610f49d225928a4c7aa6c64cf234b74400f4fe0d..59230761cd432b3ae6e9a6bad5b7367b138426ab 100644
GIT binary patch
delta 1884
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
W>kmLw)i#Nty7D)l;|z6PG6MiIpRNl4

delta 44
zcmV+{0Mq}Ny#w~H1F%%rBE#0}AbTw=ieUs7wW6q2LR!a)R=SdTQy2j8`yzC|9|Hi|
CEfb~y

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 3a5da0afc744..e651a8effac9 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -42,7 +42,7 @@
 
 let
   version = "2.33";
-  patchSuffix = "-45";
+  patchSuffix = "-47";
   sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8=";
 in
 
@@ -61,7 +61,7 @@ stdenv.mkDerivation ({
     [
       /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
           $ git fetch --all -p && git checkout origin/release/2.33/master && git describe
-          glibc-2.33-45-g58b90461ae
+          glibc-2.33-47-gb5711025bc
           $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz
 
          To compare the archive contents zdiff can be used.

From abf22a044d9ece9ad051192e04cfa1b7382e9f1f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sat, 17 Jul 2021 23:22:02 +0200
Subject: [PATCH 186/330] openapi-generator-ci: deprecate phases

---
 pkgs/tools/networking/openapi-generator-cli/default.nix  | 2 +-
 pkgs/tools/networking/openapi-generator-cli/unstable.nix | 2 +-
 2 files 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 b195c655c93f..34d2c22fb242 100644
--- a/pkgs/tools/networking/openapi-generator-cli/default.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/default.nix
@@ -15,7 +15,7 @@ let this = stdenv.mkDerivation rec {
     sha256 = "06dvy4pwgpyf209n0b27qwkjj7zlgadg2czwxapy94fd1wpq9yb2";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix
index 306654f05d99..33eb33e10b06 100644
--- a/pkgs/tools/networking/openapi-generator-cli/unstable.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix
@@ -15,7 +15,7 @@ let this = stdenv.mkDerivation rec {
     sha256 = "1ji3yw9dp4srlgqxvb21vrcp2bzj4himxsmp8l8zid9nxsc1m71x";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     runHook preInstall

From e96a983712b7daf55a5a533b267577d0de78d0f4 Mon Sep 17 00:00:00 2001
From: Ashley Chiara <PersonaVinny@protonmail.com>
Date: Sun, 18 Jul 2021 09:01:53 +0200
Subject: [PATCH 187/330] yafetch: unstable-2021-06-15 -> unstable-2021-07-18

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

diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/tools/misc/yafetch/default.nix
index 8dad93d0debb..5a0821844007 100644
--- a/pkgs/tools/misc/yafetch/default.nix
+++ b/pkgs/tools/misc/yafetch/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yafetch";
-  version = "unstable-2021-06-15";
+  version = "unstable-2021-07-18";
 
   src = fetchFromGitLab {
     owner = "cyberkitty";
     repo = pname;
-    rev = "423a7d1f1ef8f0e4caf586710828620d3cb593e3";
-    sha256 = "184yy7i8ca2fh6d1rxyhxi9gqb57fpz7ia0i56dl1zhg769m8b99";
+    rev = "f3efbca54df1ffea22cc40034114af141ccff9c1";
+    sha256 = "1cxhrjy9vzq87rzql4dcknkwca7nydysp1p1x4fh1qfw79dfdmxw";
   };
 
   # Use the provided NixOS logo automatically

From 8e4607f40ffe2a80e8431968ac72cf47e93b7c4c Mon Sep 17 00:00:00 2001
From: Kid <44045911+kidonng@users.noreply.github.com>
Date: Sun, 18 Jul 2021 08:12:26 +0000
Subject: [PATCH 188/330] maintainers: add kidonng

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9ba85483ccd2..c6e430021e71 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5490,6 +5490,12 @@
     githubId = 25607;
     name = "Raimon Grau";
   };
+  kidonng = {
+    email = "hi@xuann.wang";
+    github = "kidonng";
+    githubId = 44045911;
+    name = "Kid";
+  };
   kierdavis = {
     email = "kierdavis@gmail.com";
     github = "kierdavis";

From 195e90b7db8d49fc0629d61dc77d549d0be7a899 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 18 Jul 2021 12:28:46 +0200
Subject: [PATCH 189/330] xgeometry-select: deprecate phases

---
 pkgs/tools/X11/xgeometry-select/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xgeometry-select/default.nix b/pkgs/tools/X11/xgeometry-select/default.nix
index b954205990b9..87c643af483d 100644
--- a/pkgs/tools/X11/xgeometry-select/default.nix
+++ b/pkgs/tools/X11/xgeometry-select/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0s7kirgh5iz91m3qy8xiq0j4gljy8zrcnylf4szl5h0lrsaqj7ya";
   };
 
-  phases = [ "buildPhase" "installPhase" ];
+  dontUnpack = true;
 
   buildInputs = [ libX11 ];
 

From f439e8dba78ea00cd0300db888fa7ad88c9c809c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 18 Jul 2021 12:31:37 +0200
Subject: [PATCH 190/330] shellcheck: deprecate phases

---
 pkgs/development/tools/shellcheck/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix
index 568b9e1e1ddd..284ce6d817a9 100644
--- a/pkgs/development/tools/shellcheck/default.nix
+++ b/pkgs/development/tools/shellcheck/default.nix
@@ -27,8 +27,6 @@ let
 
     outputs = [ "bin" "man" "doc" "out" ];
 
-    phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
-
     buildPhase = ''
       pandoc -s -f markdown-smart -t man shellcheck.1.md -o shellcheck.1
     '';

From 9d86dc113d5e9e244275d4783a3df8a9a251152d Mon Sep 17 00:00:00 2001
From: devhell <devhell@mailfresser.de>
Date: Sun, 18 Jul 2021 16:17:03 +0100
Subject: [PATCH 191/330] profanity 0.10.0 -> 0.11.0

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

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index e7f8a9e77261..9d8a0d68e756 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -21,13 +21,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "profanity";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "profanity-im";
     repo = "profanity";
     rev = version;
-    sha256 = "0a9rzhnivxcr8v02xxzrbck7pvvv4c66ap2zy0gzxhri5p8ac03r";
+    sha256 = "0xmzsh0szm8x3hgw65j0cd2bp8cmrnq5pjz49lqajircyzflsngm";
   };
 
   patches = [

From 7b21ffc4d448429f6c3270ea1843c9c773fa4116 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Fri, 16 Jul 2021 11:12:08 +0200
Subject: [PATCH 192/330] vscode-extensions.hashicorp.terraform: 2.13.0 ->
 2.13.1

---
 .../vscode-extensions/terraform/default.nix   |  6 ++--
 .../terraform/fix-terraform-ls.patch          | 31 +++++++++++--------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix
index 658495296bf6..dbc4873c85b9 100644
--- a/pkgs/misc/vscode-extensions/terraform/default.nix
+++ b/pkgs/misc/vscode-extensions/terraform/default.nix
@@ -3,19 +3,19 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
   mktplcRef = {
     name = "terraform";
     publisher = "hashicorp";
-    version = "2.13.0";
+    version = "2.13.1";
   };
 
   vsix = fetchurl {
     name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
     url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix";
-    sha256 = "1wc4jl4h3ja4ivynf20yxzwqssi6yd7alvqvcjrkksic98480qcz";
+    sha256 = "1l7gsb28yj2z1zfzgb8xiyf166v4blxfdkyiixlm1pqnn2lj6yb6";
   };
 
   patches = [ ./fix-terraform-ls.patch ];
 
   postPatch = ''
-    substituteInPlace out/extension.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls
+    substituteInPlace out/clientHandler.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls
   '';
 
   meta = with lib; {
diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
index 95e8d92da332..02991c0826f6 100644
--- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
+++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
@@ -1,8 +1,22 @@
+diff --git a/out/clientHandler.js b/out/clientHandler.js
+index 6d314ea..dadab90 100644
+--- a/out/clientHandler.js
++++ b/out/clientHandler.js
+@@ -33,8 +33,7 @@ class ClientHandler {
+             this.reporter.sendTelemetryEvent('usePathToBinary');
+         }
+         else {
+-            const installPath = path.join(context.extensionPath, 'lsp');
+-            this.pathToBinary = path.join(installPath, 'terraform-ls');
++            this.pathToBinary = 'TERRAFORM-LS-PATH';
+         }
+     }
+     startClients(folders) {
 diff --git a/out/extension.js b/out/extension.js
-index e932d27..099126b 100644
+index f1eb66d..9b0f832 100644
 --- a/out/extension.js
 +++ b/out/extension.js
-@@ -143,25 +143,6 @@ function updateLanguageServer() {
+@@ -145,25 +145,6 @@ function updateLanguageServer(clientHandler, installPath) {
      return __awaiter(this, void 0, void 0, function* () {
          const delay = 1000 * 60 * 60 * 24;
          languageServerUpdater.timeout(updateLanguageServer, delay); // check for new updates every 24hrs
@@ -11,7 +25,7 @@ index e932d27..099126b 100644
 -            const installer = new languageServerInstaller_1.LanguageServerInstaller(installPath, reporter);
 -            const install = yield installer.needsInstall();
 -            if (install) {
--                yield stopClients();
+-                yield clientHandler.stopClients();
 -                try {
 -                    yield installer.install();
 -                }
@@ -25,15 +39,6 @@ index e932d27..099126b 100644
 -                }
 -            }
 -        }
-         return startClients(); // on repeat runs with no install, this will be a no-op
+         return clientHandler.startClients(vscodeUtils_1.prunedFolderNames()); // on repeat runs with no install, this will be a no-op
      });
  }
-@@ -259,7 +240,7 @@ function pathToBinary() {
-                 reporter.sendTelemetryEvent('usePathToBinary');
-             }
-             else {
--                command = path.join(installPath, 'terraform-ls');
-+                command = 'TERRAFORM-LS-PATH';
-             }
-             _pathToBinaryPromise = Promise.resolve(command);
-         }

From f6ab886df53d6fa75b99048a0b03ebc9cd30be6b Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 18 Jul 2021 12:17:44 -0400
Subject: [PATCH 193/330] kodi.packages.pvr-iptvsimple: 7.6.5 -> 7.6.9

---
 .../video/kodi-packages/pvr-iptvsimple/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
index b6feec8ab039..7905ffc8ef5a 100644
--- a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
+++ b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
@@ -6,13 +6,13 @@
 buildKodiBinaryAddon rec {
   pname = "pvr-iptvsimple";
   namespace = "pvr.iptvsimple";
-  version = "7.6.5";
+  version = "7.6.9";
 
   src = fetchFromGitHub {
     owner = "kodi-pvr";
     repo = "pvr.iptvsimple";
     rev = "${version}-${rel}";
-    sha256 = "sha256-Z4H+5dUYJ3vAgodPxWmttVhPVdPVYTJbmYxo1lzLHNA=";
+    sha256 = "1nj4qgr35cw5ly16w2fdgscz5245d7mgvm4sxgxy19jkyv7jmzn3";
   };
 
   extraBuildInputs = [

From 9e63e783618890cf18418b241ab1f6bb85ecc541 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 18 Jul 2021 12:20:52 -0400
Subject: [PATCH 194/330] kodi.packages.pvr-hts: 8.3.0 -> 8.3.4

---
 pkgs/applications/video/kodi-packages/pvr-hts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
index 5e7f39d911f1..30f5c895c355 100644
--- a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
+++ b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
@@ -2,13 +2,13 @@
 buildKodiBinaryAddon rec {
   pname = "pvr-hts";
   namespace = "pvr.hts";
-  version = "8.3.0";
+  version = "8.3.4";
 
   src = fetchFromGitHub {
     owner = "kodi-pvr";
     repo = "pvr.hts";
     rev = "${version}-${rel}";
-    sha256 = "1lqd0kkfv06n8ax8ywsi1rx9glvx3pwi9yj9yb3fdf39xmd3hz7y";
+    sha256 = "15gv499r6jf89chp7xpv0z4v0nia907czs83lz57lxydqcbmmjnn";
   };
 
   meta = with lib; {

From d899f71e541522cc80eb942446a8492889e32e90 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 18 Jul 2021 12:22:26 -0400
Subject: [PATCH 195/330] kodi.packages.inputstream-ffmpegdirect: 1.21.3 ->
 1.21.8

---
 .../video/kodi-packages/inputstream-ffmpegdirect/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix b/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix
index 1e91c2679855..53abde6c3f4a 100644
--- a/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix
+++ b/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix
@@ -3,13 +3,13 @@
 buildKodiBinaryAddon rec {
   pname = "inputstream-ffmpegdirect";
   namespace = "inputstream.ffmpegdirect";
-  version = "1.21.3";
+  version = "1.21.8";
 
   src = fetchFromGitHub {
     owner = "xbmc";
     repo = "inputstream.ffmpegdirect";
     rev = "${version}-${rel}";
-    sha256 = "sha256-OShd6sPGXXu0rlSwuQFMWqrLscE6Y0I2eV2YJYyZNMs=";
+    sha256 = "0iq89vfb3p3b5qhivxs95xk122vgmbpixdvqpmkxp19rlyn3z9j6";
   };
 
   extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ];

From 0990ee70ba72ca28d0b5eb8b024a31617bfcdf20 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 18 Jul 2021 12:25:58 -0400
Subject: [PATCH 196/330] kodi.packages.inputstream-adaptive: 2.6.17 -> 2.6.20

---
 .../video/kodi-packages/inputstream-adaptive/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
index e3cf4621ca67..784e0f7faf01 100644
--- a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
+++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
@@ -2,13 +2,13 @@
 buildKodiBinaryAddon rec {
   pname = "inputstream-adaptive";
   namespace = "inputstream.adaptive";
-  version = "2.6.17";
+  version = "2.6.20";
 
   src = fetchFromGitHub {
     owner = "xbmc";
     repo = "inputstream.adaptive";
     rev = "${version}-${rel}";
-    sha256 = "sha256-MHwLTSyMF7vYiVTof3xePW2eOySCr4/xYlPvWSzBZUg=";
+    sha256 = "0g0pvfdmnd3frsd5sdckv3llwyjiw809rqy1slq3xj6i08xhcmd5";
   };
 
   extraNativeBuildInputs = [ gtest ];

From d690f131ed853456489d053f4adba9866ba347b3 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 18 Jul 2021 12:26:26 -0400
Subject: [PATCH 197/330] kodi.packages.netflix: 1.16.0 -> 1.16.2

---
 pkgs/applications/video/kodi-packages/netflix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi-packages/netflix/default.nix b/pkgs/applications/video/kodi-packages/netflix/default.nix
index 20317b26828c..d9d11657e8b9 100644
--- a/pkgs/applications/video/kodi-packages/netflix/default.nix
+++ b/pkgs/applications/video/kodi-packages/netflix/default.nix
@@ -3,13 +3,13 @@
 buildKodiAddon rec {
   pname = "netflix";
   namespace = "plugin.video.netflix";
-  version = "1.16.0";
+  version = "1.16.2";
 
   src = fetchFromGitHub {
     owner = "CastagnaIT";
     repo = namespace;
     rev = "v${version}";
-    sha256 = "0k5jz6zjsazf0z2xv7gk848p4hvkzd79d0kl71a5d20f96g3938k";
+    sha256 = "0yycwm8vrpkr4fsbf713mhpnaxfd849nhzp5r1898sb9vldab4xk";
   };
 
   propagatedBuildInputs = [

From 3ed08b05552b41cb7ea3b6ab4a45bca9ae5621be Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 19 Jul 2021 08:13:41 +0200
Subject: [PATCH 198/330] strace: 5.12 -> 5.13

ChangeLog: https://github.com/strace/strace/releases/tag/v5.13
---
 pkgs/development/tools/misc/strace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 4da1a2cba09b..b3722965fdcd 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "strace";
-  version = "5.12";
+  version = "5.13";
 
   src = fetchurl {
     url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-KRce350lL4nJiKTDQN/exmL0WMuMY9hUMdZLq1kR58Q=";
+    sha256 = "sha256-Wsw0iIudUQrWrJFdSo3wj1HPGukg6iRkn2pLuYTQtlY=";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From f1af4c1d18e1db293ff6fd68e9912b7c1f45aadd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 17 Jul 2021 20:54:41 +0200
Subject: [PATCH 199/330] sshuttle: 1.0.3 -> 1.0.5

New dependency: psutil
Changed license: LGPL-2.1
---
 pkgs/tools/security/sshuttle/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index eec82712c8c7..959712488a20 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -11,11 +11,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "sshuttle";
-  version = "1.0.3";
+  version = "1.0.5";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0fff1c88669a20bb6a4e7331960673a3a02a2e04ff163e4c9299496646edcf61";
+    sha256 = "fd8c691aac2cb80933aae7f94d9d9e271a820efc5c48e73408f1a90da426a1bd";
   };
 
   patches = [ ./sudo.patch ];
@@ -27,6 +27,8 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ];
 
+  propagatedBuildInputs = [ python3Packages.psutil ];
+
   checkInputs = with python3Packages; [ mock pytestCheckHook flake8 ];
 
   postInstall = ''
@@ -42,7 +44,7 @@ python3Packages.buildPythonApplication rec {
       target network (though it does require Python 2.7, Python 3.5 or later at both ends).
       Works with Linux and Mac OS and supports DNS tunneling.
     '';
-    license = licenses.gpl2;
+    license = licenses.lgpl21;
     maintainers = with maintainers; [ domenkozar carlosdagos ];
   };
 }

From 9a503047574e9219ebad26d62937f4df9bebdf77 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Mon, 19 Jul 2021 19:42:09 +0700
Subject: [PATCH 200/330] althttpd: unstable-2021-05-07 -> unstable-2021-06-09

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

diff --git a/pkgs/servers/althttpd/default.nix b/pkgs/servers/althttpd/default.nix
index dfb073aa11fb..4f1a128dd388 100644
--- a/pkgs/servers/althttpd/default.nix
+++ b/pkgs/servers/althttpd/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "althttpd";
-  version = "unstable-2021-05-07";
+  version = "unstable-2021-06-09";
 
   src = fetchfossil {
     url = "https://sqlite.org/althttpd/";
-    rev = "2c5e3f9f7051a578";
-    sha256 = "sha256-+RuogtQAc+zjCWTOiOunu1pXf3LxfdWYQX+24ysJ7uY=";
+    rev = "0d3b5e232c57e188";
+    sha256 = "sha256-vZwpjYYMdP/FgPTAQ9Kdh2RRMovpONqu2v73cCoYyxE=";
   };
 
   installPhase = ''

From e6723a40b1decf022c117a3a0ac4604535657c7c Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 18 Jul 2021 18:38:25 +0300
Subject: [PATCH 201/330] python3Packages.pyqtgraph: 0.12.1 -> 0.12.2 and
 enable tests

---
 .../python-modules/pyqtgraph/default.nix      | 53 +++++++++++++++----
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix
index fd2b9d461859..54a136d5dcd4 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -1,26 +1,57 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, numpy
-, pyopengl
-, pyqt5
+, fetchFromGitHub
 , scipy
+, numpy
+, pyqt5
+, pyopengl
+, qt5
+, python
+, pytestCheckHook
+, freefont_ttf
+, makeFontsConf
+, fetchpatch
 }:
 
+let
+  fontsConf = makeFontsConf {
+    fontDirectories = [ freefont_ttf ];
+  };
+in
 buildPythonPackage rec {
   pname = "pyqtgraph";
-  version = "0.12.1";
+  version = "0.12.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d2ef3b5289184fb48dfe5f44ccb58d9d64ffb5452fc524a2bd7a640a36b3874d";
+  src = fetchFromGitHub {
+    owner = "pyqtgraph";
+    repo = "pyqtgraph";
+    rev = "pyqtgraph-${version}";
+    sha256 = "093kkxwj75nb508vz7px4x7lxrwpaff10pl15m4h74hjwyvbsg3d";
   };
 
-  propagatedBuildInputs = [ numpy pyopengl pyqt5 scipy ];
+  # TODO: remove when updating to 0.12.3
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/pyqtgraph/pyqtgraph/commit/2de5cd78da92b48e48255be2f41ae332cf8bb675.patch";
+      sha256 = "1hy86psqyl6ipvbg23zvackkd6f7ajs6qll0mbs0x2zmrj92hk00";
+    })
+  ];
 
-  doCheck = false;  # tries to create windows (QApps) on collection, which fails (probably due to no display)
+  propagatedBuildInputs = [
+    numpy
+    pyqt5
+    scipy
+    pyopengl
+  ];
 
-  pythonImportsCheck = [ "pyqtgraph" ];
+  checkInputs = [ pytestCheckHook ];
+
+  preCheck = ''
+    export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
+    export QT_QPA_PLATFORM=offscreen
+    export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks
+    export FONTCONFIG_FILE=${fontsConf}
+  '';
 
   meta = with lib; {
     description = "Scientific Graphics and GUI Library for Python";

From 18c2460b70f380ea385258d5dd308b9434d0f854 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Jul 2021 07:51:36 +0000
Subject: [PATCH 202/330] gtkgnutella: 1.2.0 -> 1.2.1

---
 pkgs/tools/networking/p2p/gtk-gnutella/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
index 0c0bc3705263..8d8069bec29e 100644
--- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
+++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
@@ -17,15 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gtk-gnutella";
-  # NOTE: Please remove hardeningDisable on the next release, see:
-  # https://sourceforge.net/p/gtk-gnutella/bugs/555/#5c19
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "gtk-gnutella";
     repo = "gtk-gnutella";
     rev = "v${version}";
-    sha256 = "0j596dpajk68bkry0gmpqawsi61rphfciy4vji1dh890jyhkhdgy";
+    sha256 = "sha256-Hk5KPXSJ2s0J/stW3Qgvu6p6RG5VCvuWx1UlMR+3JO4=";
   };
 
   nativeBuildInputs = [
@@ -54,8 +52,6 @@ stdenv.mkDerivation rec {
     ++ lib.optionals (!enableGui) [ "--topless" ]
   ;
 
-  hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ];
-
   enableParallelBuilding = true;
 
   postInstall = ''

From 0ea333554146931c6058b4c1c7a3a95737044d12 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Mon, 19 Jul 2021 11:17:02 -0400
Subject: [PATCH 203/330] ode: 0.12 -> 0.16.2

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

diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index d9c82f79bb35..211821e084cc 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "ode";
-  version = "0.12";
+  version = "0.16.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/opende/ode-${version}.tar.bz2";
-    sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5";
+    url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz";
+    sha256 = "08hgh4gqdk77jcw8b7gq2mwsfg4a5v5y0j7g42bxiqhmn3ffnsmj";
   };
 
   meta = with lib; {
     description = "Open Dynamics Engine";
-    homepage = "https://sourceforge.net/projects/opende";
+    homepage = "https://www.ode.org";
     platforms = platforms.linux;
     license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ];
   };

From fa09a124a7911e78055288b6d5bb60b8d7e2c06c Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.helbling@determinate.systems>
Date: Thu, 15 Jul 2021 09:46:10 -0700
Subject: [PATCH 204/330] buildkite-agent-metrics: init at 5.2.1

---
 .../buildkite-agent-metrics/default.nix       | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/servers/monitoring/buildkite-agent-metrics/default.nix

diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix
new file mode 100644
index 000000000000..8112feb75fed
--- /dev/null
+++ b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, fetchpatch
+}:
+buildGoModule rec {
+  pname = "buildkite-agent-metrics";
+  version = "5.2.1";
+
+  outputs = [ "out" "lambda" ];
+
+  src = fetchFromGitHub {
+    owner = "buildkite";
+    repo = "buildkite-agent-metrics";
+    rev = "v${version}";
+    sha256 = "XZYVCSJ/DIwoLrz37aQ3yW3RUhOhorY8L1AsAWxywcg=";
+  };
+
+  vendorSha256 = "UIkU3i45IEXWHdiakTj7f4W9kR49k4A93msfkqeXmQQ=";
+
+  patches = [
+    # Necessary to support passing the agent token in an env var, rather than on
+    # the command line. Should be removed upon the next release.
+    (fetchpatch {
+      name = "BUILDKITE_AGENT_TOKEN-env-var.patch";
+      url = "https://github.com/buildkite/buildkite-agent-metrics/commit/6c40b478b95f0e05fc12b87158222a9ff68169e0.patch";
+      sha256 = "Y4m9qGyPIROSqOY6G6xRQfFENEG4bFF3q5dZcHI4XiY=";
+    })
+  ];
+
+  postInstall = ''
+    mkdir -p $lambda/bin
+    mv $out/bin/lambda $lambda/bin
+  '';
+
+  meta = with lib; {
+    description = "A command-line tool (and Lambda) for collecting Buildkite agent metrics";
+    homepage = "https://github.com/buildkite/buildkite-agent-metrics";
+    license = licenses.mit;
+    maintainers = teams.determinatesystems.members;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5024a4d8d3a..173b2d1b9d71 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13206,6 +13206,8 @@ in
   buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)";
   buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { };
 
+  buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { };
+
   buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { };
 
   bump = callPackage ../development/tools/github/bump { };

From 88fb6d25d87f5ff6e75d471809bb61463e1c5cc6 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.helbling@determinate.systems>
Date: Thu, 15 Jul 2021 10:37:54 -0700
Subject: [PATCH 205/330] nixos/prometheus-buildkite-agent-exporter: init

---
 .../from_md/release-notes/rl-2111.section.xml |  8 +++
 .../manual/release-notes/rl-2111.section.md   |  1 +
 .../monitoring/prometheus/exporters.nix       |  1 +
 .../prometheus/exporters/buildkite-agent.nix  | 64 +++++++++++++++++++
 4 files changed, 74 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix

diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 88d075a9a482..fc1cec16ef90 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -99,6 +99,14 @@
           <link linkend="opt-services.hockeypuck.enable">services.hockeypuck</link>.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <link xlink:href="https://github.com/buildkite/buildkite-agent-metrics">buildkite-agent-metrics</link>,
+          a command-line tool for collecting Buildkite agent metrics,
+          now has a Prometheus exporter available as
+          <link linkend="opt-services.prometheus.exporters.buildkite-agent.enable">services.prometheus.exporters.buildkite-agent</link>.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-21.11-incompatibilities">
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index f7275480ff81..9303393aba34 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -30,6 +30,7 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - [Hockeypuck](https://github.com/hockeypuck/hockeypuck), a OpenPGP Key Server. Available as [services.hockeypuck](#opt-services.hockeypuck.enable).
 
+- [buildkite-agent-metrics](https://github.com/buildkite/buildkite-agent-metrics), a command-line tool for collecting Buildkite agent metrics, now has a Prometheus exporter available as [services.prometheus.exporters.buildkite-agent](#opt-services.prometheus.exporters.buildkite-agent.enable).
 
 ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
 
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 6bd075697fa2..d648de6a4148 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -27,6 +27,7 @@ let
     "bird"
     "bitcoin"
     "blackbox"
+    "buildkite-agent"
     "collectd"
     "dnsmasq"
     "domain"
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix b/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix
new file mode 100644
index 000000000000..7557480ac062
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix
@@ -0,0 +1,64 @@
+{ config, lib, pkgs, options }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.buildkite-agent;
+in
+{
+  port = 9876;
+  extraOpts = {
+    tokenPath = mkOption {
+      type = types.nullOr types.path;
+      apply = final: if final == null then null else toString final;
+      description = ''
+        The token from your Buildkite "Agents" page.
+
+        A run-time path to the token file, which is supposed to be provisioned
+        outside of Nix store.
+      '';
+    };
+    interval = mkOption {
+      type = types.str;
+      default = "30s";
+      example = "1min";
+      description = ''
+        How often to update metrics.
+      '';
+    };
+    endpoint = mkOption {
+      type = types.str;
+      default = "https://agent.buildkite.com/v3";
+      description = ''
+        The Buildkite Agent API endpoint.
+      '';
+    };
+    queues = mkOption {
+      type = with types; nullOr (listOf str);
+      default = null;
+      example = literalExample ''[ "my-queue1" "my-queue2" ]'';
+      description = ''
+        Which specific queues to process.
+      '';
+    };
+  };
+  serviceOpts = {
+    script =
+      let
+        queues = concatStringsSep " " (map (q: "-queue ${q}") cfg.queues);
+      in
+      ''
+        export BUILDKITE_AGENT_TOKEN="$(cat ${toString cfg.tokenPath})"
+        exec ${pkgs.buildkite-agent-metrics}/bin/buildkite-agent-metrics \
+          -backend prometheus \
+          -interval ${cfg.interval} \
+          -endpoint ${cfg.endpoint} \
+          ${optionalString (cfg.queues != null) queues} \
+          -prometheus-addr "${cfg.listenAddress}:${toString cfg.port}" ${concatStringsSep " " cfg.extraFlags}
+      '';
+    serviceConfig = {
+      DynamicUser = false;
+      RuntimeDirectory = "buildkite-agent-metrics";
+    };
+  };
+}

From 8729e3238a6036bd78b78b79982a3200a42ecce9 Mon Sep 17 00:00:00 2001
From: nils-degroot <nils@peeko.nl>
Date: Mon, 19 Jul 2021 16:45:06 +0200
Subject: [PATCH 206/330] maintainers: add nils-degroot

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9ba85483ccd2..5c0b3d89269a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7582,6 +7582,12 @@
     githubId = 26231126;
     name = "Nils ANDRÉ-CHANG";
   };
+  nils-degroot = {
+    email = "nils@peeko.nl";
+    github = "nils-degroot";
+    githubId = 53556985;
+    name = "Nils de Groot";
+  };
   ninjatrappeur = {
     email = "felix@alternativebit.fr";
     github = "ninjatrappeur";

From 8af3db7f82114331d663f1ac9a228d4ab7455c4b Mon Sep 17 00:00:00 2001
From: fortuneteller2k <lythe1107@gmail.com>
Date: Tue, 20 Jul 2021 01:07:28 +0800
Subject: [PATCH 207/330] elfcat: 0.1.3 -> 0.1.4

---
 pkgs/tools/misc/elfcat/Cargo.lock  | 2 +-
 pkgs/tools/misc/elfcat/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/elfcat/Cargo.lock b/pkgs/tools/misc/elfcat/Cargo.lock
index e6c694bffb33..c5b48135993f 100644
--- a/pkgs/tools/misc/elfcat/Cargo.lock
+++ b/pkgs/tools/misc/elfcat/Cargo.lock
@@ -4,4 +4,4 @@ version = 3
 
 [[package]]
 name = "elfcat"
-version = "0.1.3"
+version = "0.1.4"
diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/tools/misc/elfcat/default.nix
index 38b1cc9b64f0..a9691e43c6a9 100644
--- a/pkgs/tools/misc/elfcat/default.nix
+++ b/pkgs/tools/misc/elfcat/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "elfcat";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "ruslashev";
     repo = pname;
     rev = version;
-    sha256 = "sha256-s56FyRoD2IhgdwEV63jMaB265CodHUlvmrWzmXAmonY=";
+    sha256 = "sha256-gh5JO3vO2FpHiZfaHOODPhRSB9HqZe1ir4g7UEkSUHY=";
   };
 
   cargoLock.lockFile = ./Cargo.lock;

From 2d1568561b80205b89a5b47e892e636441c26720 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 7 Jul 2021 13:20:37 -0700
Subject: [PATCH 208/330] nixUnstable: 2.4pre20210601_5985b8b ->
 2.4pre20210707_02dd6bb

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 6ba5135fdd6c..02c37e45c333 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -215,13 +215,13 @@ in rec {
   nixUnstable = lib.lowPrio (callPackage common rec {
     pname = "nix";
     version = "2.4${suffix}";
-    suffix = "pre20210601_5985b8b";
+    suffix = "pre20210707_02dd6bb";
 
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "5985b8b5275605ddd5e92e2f0a7a9f494ac6e35d";
-      sha256 = "sha256-2So7ZsD8QJlOXCYqdoj8naNgBw6O4Vw1MM2ORsaqlXc=";
+      rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2";
+      sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA=";
     };
 
     inherit storeDir stateDir confDir boehmgc;

From 596ac242af767b38e48af9076887b206dc72e472 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 7 Jul 2021 22:49:18 +0200
Subject: [PATCH 209/330] nixUnstable: patch boehmgc (nix#4944)

As has been done in https://github.com/NixOS/nix/pull/4944

This introduces the boehmgc_nix and boehmgc_nixUnstable attributes
which are useful for external packages that link with Nix and its
boehmgc.
---
 pkgs/tools/package-management/nix/default.nix | 11 ++++++++---
 pkgs/top-level/all-packages.nix               | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 02c37e45c333..1e64a9f36dac 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -2,7 +2,8 @@
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
-, boehmgc
+, boehmgc_nix
+, boehmgc_nixUnstable
 , Security
 }:
 
@@ -209,7 +210,9 @@ in rec {
       sha256 = "sha256-ITp9ScRhB5syNh5NAI0kjX9o400syTR/Oo/5Ap+a+10=";
     };
 
-    inherit storeDir stateDir confDir boehmgc;
+    boehmgc = boehmgc_nix;
+
+    inherit storeDir stateDir confDir;
   });
 
   nixUnstable = lib.lowPrio (callPackage common rec {
@@ -224,7 +227,9 @@ in rec {
       sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA=";
     };
 
-    inherit storeDir stateDir confDir boehmgc;
+    boehmgc = boehmgc_nixUnstable;
+
+    inherit storeDir stateDir confDir;
 
   });
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5024a4d8d3a..7859ff6a84a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14669,6 +14669,18 @@ in
 
   boehmgc = callPackage ../development/libraries/boehm-gc { };
   boehmgc_766 = callPackage ../development/libraries/boehm-gc/7.6.6.nix { };
+  boehmgc_nix = pkgs.boehmgc.override {
+    enableLargeConfig = true;
+  };
+  boehmgc_nixUnstable = pkgs.boehmgc_nix.overrideAttrs (drv: {
+    patches = (drv.patches or []) ++ [
+      # Part of the GC solution in https://github.com/NixOS/nix/pull/4944
+      (pkgs.fetchpatch {
+        url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff;
+        sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI=";
+      })
+    ];
+  });
 
   boolstuff = callPackage ../development/libraries/boolstuff { };
 
@@ -31157,7 +31169,6 @@ in
   inherit (callPackage ../tools/package-management/nix {
       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

From 2c2e1db91db465d7a83593d9322aa204c0fa4b43 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 18 Jul 2021 00:00:00 +0200
Subject: [PATCH 210/330] boehmgc_{nix,nixUnstable}: Move into
 {nix,nixUnstable}.passthru

Do not pollute top-level, but do provide allow the derivations to
be accessed for debugging and reuse if necessary.
---
 pkgs/tools/package-management/nix/default.nix | 18 ++++++++++++++++--
 pkgs/top-level/all-packages.nix               | 12 ------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 1e64a9f36dac..1ded58aba22a 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -2,8 +2,7 @@
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
-, boehmgc_nix
-, boehmgc_nixUnstable
+, boehmgc
 , Security
 }:
 
@@ -194,10 +193,25 @@ common =
 
           preBuild = "unset NIX_INDENT_MAKE";
         });
+        inherit boehmgc;
       };
     };
   in nix;
 
+  boehmgc_nix = boehmgc.override {
+    enableLargeConfig = true;
+  };
+
+  boehmgc_nixUnstable = boehmgc_nix.overrideAttrs (drv: {
+    patches = (drv.patches or []) ++ [
+      # Part of the GC solution in https://github.com/NixOS/nix/pull/4944
+      (fetchpatch {
+        url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff;
+        sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI=";
+      })
+    ];
+  });
+
 in rec {
 
   nix = nixStable;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7859ff6a84a5..6d0ce6c5910e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14669,18 +14669,6 @@ in
 
   boehmgc = callPackage ../development/libraries/boehm-gc { };
   boehmgc_766 = callPackage ../development/libraries/boehm-gc/7.6.6.nix { };
-  boehmgc_nix = pkgs.boehmgc.override {
-    enableLargeConfig = true;
-  };
-  boehmgc_nixUnstable = pkgs.boehmgc_nix.overrideAttrs (drv: {
-    patches = (drv.patches or []) ++ [
-      # Part of the GC solution in https://github.com/NixOS/nix/pull/4944
-      (pkgs.fetchpatch {
-        url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff;
-        sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI=";
-      })
-    ];
-  });
 
   boolstuff = callPackage ../development/libraries/boolstuff { };
 

From 845f1c503316ac0d4cc7b7df509712285a7e41e6 Mon Sep 17 00:00:00 2001
From: fortuneteller2k <lythe1107@gmail.com>
Date: Tue, 20 Jul 2021 01:12:08 +0800
Subject: [PATCH 211/330] stevenblack-blocklist: 3.7.13 -> 3.8.2

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

diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix
index ebbaaa73fce1..ddccc9ac6358 100644
--- a/pkgs/tools/networking/stevenblack-blocklist/default.nix
+++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub }:
 
 let
-  version = "3.7.13";
+  version = "3.8.2";
 in
 fetchFromGitHub {
   name = "stevenblack-blocklist-${version}";
@@ -9,7 +9,7 @@ fetchFromGitHub {
   owner = "StevenBlack";
   repo = "hosts";
   rev = version;
-  sha256 = "sha256-nSajiRDpcFp3MwnQPnoBVB/OWnhVqkeSmS7OBrfhMnw=";
+  sha256 = "sha256-rkyAF1/kPI34nZ57Hqg8QivK0YERZ54jZ1HQ5oXYgxc=";
 
   meta = with lib; {
     description = "Unified hosts file with base extensions";

From a6b9ef6aa87094f5dc0860dc343f46d91385dcf4 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Mon, 19 Jul 2021 22:19:01 +0200
Subject: [PATCH 212/330] inkcut: use 'lpr' from closure

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

diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix
index 4ca373ee2751..300423cb7f67 100644
--- a/pkgs/applications/misc/inkcut/default.nix
+++ b/pkgs/applications/misc/inkcut/default.nix
@@ -2,6 +2,7 @@
 , python3Packages
 , fetchFromGitHub
 , wrapQtAppsHook
+, cups
 }:
 
 with python3Packages;
@@ -17,6 +18,11 @@ buildPythonApplication rec {
     sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32";
   };
 
+  postPatch = ''
+    substituteInPlace inkcut/device/transports/printer/plugin.py \
+      --replace ", 'lpr', " ", '${cups}/bin/lpr', "
+  '';
+
   nativeBuildInputs = [ wrapQtAppsHook ];
 
   propagatedBuildInputs = [

From a93f2af20beadfa2af905c9ff2d42ecbc7ad4ce5 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 19 Jul 2021 16:19:27 -0400
Subject: [PATCH 213/330] snakemake: add missing optional dependenices

These are needed to generate reports
---
 pkgs/applications/science/misc/snakemake/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix
index 5ecde8396069..ece6b1bf538a 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@@ -12,10 +12,13 @@ python3Packages.buildPythonApplication rec {
     docutils
     filelock
     GitPython
+    jinja2
     jsonschema
     nbformat
+    networkx
     psutil
     pulp
+    pygraphviz
     pyyaml
     ratelimiter
     requests

From 3a79b1fece0d9457d0394e45e13d818424cfd427 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 19 Jul 2021 16:22:36 -0400
Subject: [PATCH 214/330] snakemake: 6.5.3 -> 6.6.1

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

diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix
index ece6b1bf538a..5270cac57823 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@@ -2,7 +2,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
-  version = "6.5.3";
+  version = "6.6.1";
 
   propagatedBuildInputs = with python3Packages; [
     appdirs
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec {
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "a06839346425c74542e6e2e6047db3133cd747ef89e1ebd87dad1fbba041f62d";
+    sha256 = "91637a801342f3bc349c033b284fef7c0201b4e5e29d5650cb6c7f69096d4184";
   };
 
   doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json

From a5ee0aede3e3ffacc1bf8f3fb3a9970523cce79e Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Mon, 19 Jul 2021 20:43:38 +0000
Subject: [PATCH 215/330] linux: 5.10.50 -> 5.10.51

---
 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 988de97e03b0..23e4099438bd 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.50";
+  version = "5.10.51";
 
   # 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,7 +13,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0dmlpy9k7am99495bxcm46i4y6g34d1fzdkzz3wgzb4mgmx35nlb";
+    sha256 = "1qkssvqk29svn10ws3lrnzfbmlvzrixkf7r7lslc7k3lqa9yiflm";
   };
 
   kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];

From 72d6452921296dda48c531f465c5e37fa91c7c3f Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Mon, 19 Jul 2021 20:43:44 +0000
Subject: [PATCH 216/330] linux: 5.12.17 -> 5.12.18

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix
index 82218dc1cef0..fe180d95563c 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.12.17";
+  version = "5.12.18";
 
   # 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,7 +13,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1ghyqxfxslxzr7273vj2yn14pkdnkja3wk50xxhavpvf87i8c40j";
+    sha256 = "12sjscf53z6fc1jah3i2578r3a0i7rkw2jmqi0w328a22i0paakg";
   };
 
   kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];

From 72bcb1ace3cfe336d18342d6540733d8e69083a5 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Mon, 19 Jul 2021 20:43:51 +0000
Subject: [PATCH 217/330] linux: 5.13.2 -> 5.13.3

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix
index da90ee69de80..4bb0f5deef1b 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.13.2";
+  version = "5.13.3";
 
   # 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,7 +13,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0dx9khk7fh003xyb3xix0kc0rmjncg7ric5p830zhadnrw4hv563";
+    sha256 = "1ir80wn019kslv6ysiqxdvarrjlr8b3skk1s43cwki3x2cjnxskq";
   };
 
   kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];

From 1e8af69febc3205e403209caa7f0c711d92c2463 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Mon, 19 Jul 2021 20:43:58 +0000
Subject: [PATCH 218/330] linux: 5.4.132 -> 5.4.133

---
 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 003f1e96e4f6..318d0887fb94 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.132";
+  version = "5.4.133";
 
   # 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,7 +13,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1vq0dmrn7gl2vprm08l8by5ja3xjgggrcd38vqg7b7jpnfzssrl4";
+    sha256 = "0c08jp5k5h4c2s4pbpyvnvzczr79jh833wy9jv15nkvqp3xnd8w9";
   };
 
   kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];

From 8e75e31ae4f6b98cf68d68bdb1ce9ecd6d24a807 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Mon, 19 Jul 2021 20:44:24 +0000
Subject: [PATCH 219/330] linux/hardened/patches/5.10: 5.10.50-hardened1 ->
 5.10.51-hardened1

---
 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 eac71ee36aa1..142de8f6fb92 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": "-hardened1",
-        "name": "linux-hardened-5.10.50-hardened1.patch",
-        "sha256": "0z57cdvyaarl5p0b6sj93pag34wvf128s30ymkc4m50a60kp7cr8",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.50-hardened1/linux-hardened-5.10.50-hardened1.patch"
+        "name": "linux-hardened-5.10.51-hardened1.patch",
+        "sha256": "0s9q7vlhnsd484kzg9mnqc7zab09ch3i3w654wvhkxk9zy4kgzhr",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.51-hardened1/linux-hardened-5.10.51-hardened1.patch"
     },
     "5.12": {
         "extra": "-hardened1",

From 9e10f08e102e10a2a70401dbe1a5707099f61954 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Mon, 19 Jul 2021 20:44:25 +0000
Subject: [PATCH 220/330] linux/hardened/patches/5.12: 5.12.17-hardened1 ->
 5.12.18-hardened1

---
 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 142de8f6fb92..263d63e4b9c6 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -19,9 +19,9 @@
     },
     "5.12": {
         "extra": "-hardened1",
-        "name": "linux-hardened-5.12.17-hardened1.patch",
-        "sha256": "09vh04a1sa80shm0z5if31j5r8s4syrqv4i22q5pnnfnlzhbqk59",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.17-hardened1/linux-hardened-5.12.17-hardened1.patch"
+        "name": "linux-hardened-5.12.18-hardened1.patch",
+        "sha256": "0mlff4ylnx1pvswamhsms9366jw618ic8w42rnzrwqhasfnwkqjb",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.18-hardened1/linux-hardened-5.12.18-hardened1.patch"
     },
     "5.4": {
         "extra": "-hardened1",

From e87737ca6026c81e81514e447f2a82c7ca56c8a2 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Mon, 19 Jul 2021 20:44:26 +0000
Subject: [PATCH 221/330] linux/hardened/patches/5.4: 5.4.132-hardened1 ->
 5.4.133-hardened1

---
 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 263d63e4b9c6..5ff1221e3bd3 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -25,8 +25,8 @@
     },
     "5.4": {
         "extra": "-hardened1",
-        "name": "linux-hardened-5.4.132-hardened1.patch",
-        "sha256": "0a4n8ss16qqbrbxajlad4j7nc10ipdnl70yz6ppryyw94i5lf5pb",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.132-hardened1/linux-hardened-5.4.132-hardened1.patch"
+        "name": "linux-hardened-5.4.133-hardened1.patch",
+        "sha256": "0nnsyl2fxv7nnj7c47nnr753yh5x3wbny7ml8x23f5zdvjz43yfj",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.133-hardened1/linux-hardened-5.4.133-hardened1.patch"
     }
 }

From 54a0999326eb416156ed3480969a55356471b63a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Jul 2021 20:47:06 +0000
Subject: [PATCH 222/330] aws-c-common: 0.5.11 -> 0.6.8

---
 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 9913631e8548..5c71d079aa21 100644
--- a/pkgs/development/libraries/aws-c-common/default.nix
+++ b/pkgs/development/libraries/aws-c-common/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aws-c-common";
-  version = "0.5.11";
+  version = "0.6.8";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-4CYbL+ICabKvpfjlALJ0wRbuwgy+JKJnKqYbQFsHQsI=";
+    sha256 = "sha256-wtgD8txViYu7yXdnID6TTf4gCDmvebD19XRxFnubndY=";
   };
 
   nativeBuildInputs = [ cmake ];

From a6470c3ca2baae0bddf89d605ac3487ec280303b Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Mon, 19 Jul 2021 18:15:14 -0400
Subject: [PATCH 223/330] xmoto: 0.5.11 -> 0.6.1

---
 pkgs/games/xmoto/default.nix | 69 ++++++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 19 deletions(-)

diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix
index afeded792f2e..246e1afc7444 100644
--- a/pkgs/games/xmoto/default.nix
+++ b/pkgs/games/xmoto/default.nix
@@ -1,34 +1,65 @@
-{ lib, stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg
-, libpng, freeglut, libGLU, libGL, SDL, SDL_mixer, SDL_image, SDL_net
-, SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gettext, makeWrapper, bzip2
+, curl, libjpeg, libxml2, xz, lua, ode, libGL, libpng, SDL, SDL_mixer, SDL_net
+, SDL_ttf, sqlite, libxdg_basedir, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "xmoto";
-  version = "0.5.11";
+  version = "0.6.1";
 
-  src = fetchurl {
-    url = "https://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
-    sha256 = "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155";
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "00f5ha79lfa2iiaz66wl0hl5dapa1l15qdr7m7knzi0ll7j6z66n";
   };
 
+  patches = [
+    # Fix build with Nix
+    (fetchpatch {
+      url = "https://github.com/xmoto/xmoto/commit/536dcc7ec77a4c4c454b86220e85b1cb3cd1c7f7.patch";
+      sha256 = "0h9lld668jrbmrqva89zqwp63jiagjj86prkxzx6372p3kk9y7g7";
+    })
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    gettext
+    makeWrapper
+  ];
+
   buildInputs = [
-    chipmunk sqlite curl zlib bzip2 libjpeg libpng
-    freeglut libGLU libGL SDL SDL_mixer SDL_image SDL_net SDL_ttf
-    lua5 ode libxdg_basedir libxml2
+    bzip2
+    curl
+    libjpeg
+    libxml2
+    xz
+    lua
+    ode
+    libGL
+    libpng
+    SDL
+    SDL_mixer
+    SDL_net
+    SDL_ttf
+    sqlite
+    libxdg_basedir
+    zlib
   ];
 
-  CXXFLAGS = [
-    "-fpermissive"
-    # Build using the old C++ ABI to fix issue with missing text; the issue
-    # should be fixed in the next stable release (if that ever does happen)
-    "-D_GLIBCXX_USE_CXX11_ABI=0"
-  ];
+  preFixup = ''
+    wrapProgram "$out/bin/xmoto" \
+      --prefix XDG_DATA_DIRS : "$out/share/"
+  '';
 
   meta = with lib; {
-    description = "Obstacled race game";
+    description = "A challenging 2D motocross platform game, where physics play an important role";
+    longDescription = ''
+      X-Moto is a challenging 2D motocross platform game, where physics plays an all important role in the gameplay.
+      You need to control your bike to its limits, if you want to have a chance to finish the most difficult challenges.
+    '';
     homepage = "http://xmoto.tuxfamily.org";
     maintainers = with maintainers; [ raskin pSub ];
-    platforms = platforms.linux;
-    license = licenses.gpl2;
+    platforms = platforms.all;
+    license = licenses.gpl2Plus;
   };
 }

From 1fb1cbc18b3f0b70c146cd3abb938cc40c0c614f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Jul 2021 22:59:29 +0000
Subject: [PATCH 224/330] ccextractor: 0.89 -> 0.90

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

diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix
index aa40291790e1..b559a85d44c6 100644
--- a/pkgs/applications/video/ccextractor/default.nix
+++ b/pkgs/applications/video/ccextractor/default.nix
@@ -4,13 +4,13 @@
 with lib;
 stdenv.mkDerivation rec {
   pname = "ccextractor";
-  version = "0.89";
+  version = "0.90";
 
   src = fetchFromGitHub {
     owner = "CCExtractor";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-847yt6pUTsDnVbrMQQPJ0pqu6UnKmYmr8UtR8+TP11A=";
+    sha256 = "sha256-NVFCwUZZVt8GrWXWyvoF8UrUZ/ix+GWubKtc3218k7o=";
   };
 
   sourceRoot = "source/src";

From c39aafa62b8fca88770f6728b19304ed74ea9107 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 19 Jul 2021 23:55:22 +0000
Subject: [PATCH 225/330] chezmoi: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index a0aed739c2ab..fd289f9cfb8a 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "chezmoi";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     rev = "v${version}";
-    sha256 = "sha256-dxNZk1pd6kfWgwbUmV5dqjTnhpHqYWGivupN8D+eBMU=";
+    sha256 = "sha256-EStR/tmbu95tptB7h3rHxoro87jlhu3i0XwRQNbIBvA=";
   };
 
   vendorSha256 = "sha256-Geeo/tqF+VJamIzgU1qz0iEjTKE8jwFQLGXPBuN9eN8=";

From ca2db83adcfbeda9e3edc38e1a206bfbda9fa280 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 01:04:03 +0000
Subject: [PATCH 226/330] csound: 6.16.0 -> 6.16.2

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

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index dbf895ed02c5..029710206f03 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # When updating, please check if https://github.com/csound/csound/issues/1078
   # has been fixed in the new version so we can use the normal fluidsynth
   # version and remove fluidsynth 1.x from nixpkgs again.
-  version = "6.16.0";
+  version = "6.16.2";
 
   hardeningDisable = [ "format" ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     owner = "csound";
     repo = "csound";
     rev = version;
-    sha256 = "sha256-1+P2W8auc34sNJdKHUcilOBCK+Is9GHnM+J+M4oNR3U=";
+    sha256 = "sha256-1rcS3kOspU9ACx45yB8betph4G0hso1OSJQRiabX6tE=";
   };
 
   cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp

From 174d8c0d3f04511cf7e186ccf22cfb6d9787498d Mon Sep 17 00:00:00 2001
From: Kid <44045911+kidonng@users.noreply.github.com>
Date: Sun, 18 Jul 2021 08:12:41 +0000
Subject: [PATCH 227/330] lsix: init at 1.7.4

---
 pkgs/tools/graphics/lsix/default.nix | 36 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/graphics/lsix/default.nix

diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix
new file mode 100644
index 000000000000..ba07e2886b53
--- /dev/null
+++ b/pkgs/tools/graphics/lsix/default.nix
@@ -0,0 +1,36 @@
+{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, imagemagick }:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "lsix";
+  version = "1.7.4";
+
+  src = fetchFromGitHub {
+    owner = "hackerb9";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-mOueSNhf1ywG4k1kRODBaWRjy0L162BAO1HRPaMMbFM=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 lsix -t $out/bin
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/lsix \
+      --prefix PATH : ${lib.makeBinPath [ imagemagick ]}
+  '';
+
+  meta = with lib; {
+    description = "Shows thumbnails in terminal using sixel graphics";
+    homepage = "https://github.com/hackerb9/lsix";
+    license = licenses.gpl3Only;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ kidonng ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1dd7beb83a3..4e72e9fd2b8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1644,6 +1644,8 @@ in
 
   lesspass-cli = callPackage ../tools/security/lesspass-cli { };
 
+  lsix = callPackage ../tools/graphics/lsix { };
+
   mpdevil = callPackage ../applications/audio/mpdevil { };
 
   pacparser = callPackage ../tools/networking/pacparser { };

From 1e462be4ebd7317e5343f77049625ed09f7aade8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 20 Jul 2021 03:23:47 +0200
Subject: [PATCH 228/330] python3Packages.ansible-core: 2.11.2 -> 2.11.3

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

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index 4dd606c9adbf..ba29b0fb092b 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -29,11 +29,11 @@ let
 in
 buildPythonPackage rec {
   pname = "ansible-core";
-  version = "2.11.2";
+  version = "2.11.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1syadgzn5ww5bhq9s2py4h1hkh11h7aac5b37zi8rw2xfvdc7r2s";
+    sha256 = "sha256-DO0bT2cZftsntQk0yV1MtkTG1jXXLH+CbEQl3+RTdnQ=";
   };
 
   # ansible_connection is already wrapped, so don't pass it through

From 32d56411205ba845946d94f68528ddc1c631d337 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 20 Jul 2021 03:24:51 +0200
Subject: [PATCH 229/330] python3Packages.ansible-base: 2.10.11 -> 2.10.12

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

diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix
index 0a5cc01d9294..0c88c378516e 100644
--- a/pkgs/development/python-modules/ansible/base.nix
+++ b/pkgs/development/python-modules/ansible/base.nix
@@ -28,11 +28,11 @@ let
 in
 buildPythonPackage rec {
   pname = "ansible-base";
-  version = "2.10.11";
+  version = "2.10.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jr3cxqiami9k07g2kmvfp54iafbcnd1d66l8fdnaqka5bc19wdw";
+    sha256 = "sha256-qWVW4tI5+Sg+FWVNQMGqhmgqTntD9Qtf8CK8jkK2mHg=";
   };
 
   # ansible_connection is already wrapped, so don't pass it through

From dc1137bc98695e2ac2ae71bec57593d801481fdc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 20 Jul 2021 03:33:37 +0200
Subject: [PATCH 230/330] python3Packages.ansible-core.collections: 4.1.0 ->
 4.2.0

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

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index ba29b0fb092b..8584ba7166a2 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -23,8 +23,8 @@
 
 let
   ansible-collections = callPackage ./collections.nix {
-    version = "4.1.0";
-    sha256 = "0rrivq1g0vizah8zmf012lzig2xxfk5x1371k16s3nn4zfkwqqgm";
+    version = "4.2.0";
+    sha256 = "1l30j97q24klylchvbskdmp1xllswn9xskjvg4l0ra6pzfgq2zbk";
   };
 in
 buildPythonPackage rec {

From a9206d8c4c85ca6387129753f8a3877bc8a5321f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 20 Jul 2021 03:38:55 +0200
Subject: [PATCH 231/330] python3Packages.ansible: 2.9.23 -> 2.9.24

---
 pkgs/development/python-modules/ansible/legacy.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix
index 12eed6bdb29e..95b127a0db3b 100644
--- a/pkgs/development/python-modules/ansible/legacy.nix
+++ b/pkgs/development/python-modules/ansible/legacy.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchFromGitHub
+, fetchPypi
 , buildPythonPackage
 , pycrypto
 , paramiko
@@ -18,13 +18,11 @@
 
 buildPythonPackage rec {
   pname = "ansible";
-  version = "2.9.23";
+  version = "2.9.24";
 
-  src = fetchFromGitHub {
-    owner = "ansible";
-    repo = "ansible";
-    rev = "v${version}";
-    sha256 = "0mikykpzyqpmaiczz53f71mcyc4qvahi9ckn7wgfx7sw7s2z3skk";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-DC9Tt75z3cNCPZZY/NGQeYl9Wx/FM8StVQ21ixea64o=";
   };
 
   prePatch = ''

From 1caa4f9452cea9f941054a7b0ef90430557f2629 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 01:52:24 +0000
Subject: [PATCH 232/330] docker-buildx: 0.5.1 -> 0.6.0

---
 pkgs/applications/virtualization/docker/buildx.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index 84019395853b..020e22db6019 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "docker-buildx";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "buildx";
     rev = "v${version}";
-    sha256 = "0l03ncs1x4lhgy0kf7bd1zq00md8fi93f8xq6k0ans4400divfzk";
+    sha256 = "sha256-5j1+3FlLc0gYDnYvDsAdmILxgjHCU1bTVOytfaF03iU=";
   };
 
   vendorSha256 = null;

From f5d2540160e516b3c37808a65e731a9568ffec20 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Mon, 19 Jul 2021 22:56:36 -0300
Subject: [PATCH 233/330] temporal: 1.10.5 -> 1.11.1

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

diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix
index 26967b7ed856..55f1a5a2c09e 100644
--- a/pkgs/applications/networking/cluster/temporal/default.nix
+++ b/pkgs/applications/networking/cluster/temporal/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "temporal";
-  version = "1.10.5";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "temporal";
     rev = "v${version}";
-    sha256 = "sha256-+rU/Tn3k/VmAgZl169tVZsRf5SL4bI9r3p1svVfKN2E=";
+    sha256 = "sha256-upoWftm82QBdax0lbeu+Nmwscsj/fsOzGUPI+fzcKUM=";
   };
 
-  vendorSha256 = "sha256-jbQPhGfZPPxjYTSJ9wMLzQIOhAwxJZypRzqwL421RfM=";
+  vendorSha256 = "sha256-eO/23MQpdXQNPCIzMC9nxvrgUFuEPABJ7vkBZKv+XZI";
 
   # Errors:
   #  > === RUN   TestNamespaceHandlerGlobalNamespaceDisabledSuite

From 547c3caf305208fe0aeaf552770adf955fd9137f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 02:12:57 +0000
Subject: [PATCH 234/330] du-dust: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
index 97b98eea4f9a..85055ccba5eb 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "du-dust";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "bootandy";
     repo = "dust";
     rev = "v${version}";
-    sha256 = "sha256-15n8CpyyC41oJRrFlNHYXF5UjOyYPX93Zrq7jcU2DVM=";
+    sha256 = "sha256-SgTEawxuz9gRxSZ9edNz2NwfJWSAwxKXxDJVpU6oTBg=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     extraPostFetch = ''
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoSha256 = "sha256-rqNj3EwszSIn2cMmslO6T3K5NxQJ9u56m37TU1GwtVI=";
+  cargoSha256 = "sha256-/kDF1ZOzu32Dwd5fWZGhMlEf65TAKLMPFu+ZnZxOAms=";
 
   doCheck = false;
 

From 8115c9c7bc0bc4ee83c23a2ea2d3b8d95a0ba07f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 02:47:29 +0000
Subject: [PATCH 235/330] exoscale-cli: 1.36.0 -> 1.37.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 b37f3ce465ea..4fb11de26c3c 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.36.0";
+  version = "1.37.0";
 
   src = fetchFromGitHub {
     owner  = "exoscale";
     repo   = "cli";
     rev    = "v${version}";
-    sha256 = "sha256-2pkSwr/8pmRedcsvl55wHskv0aSAjlIbmHFUoTXCTE0=";
+    sha256 = "sha256-ETj14xwCQJv3xNYXFY/Z0FsxjxLrlpcVkap2sRsLzVU=";
   };
 
   goPackagePath = "github.com/exoscale/cli";

From 1fa595db425224419c74476ec067b44ec035fc53 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 19 Jul 2021 23:14:49 -0400
Subject: [PATCH 236/330] yoda: apply patch to fix a minor bug in yodascale

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

diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index c5a83f782f46..9398c4d2f36e 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -25,6 +25,13 @@ stdenv.mkDerivation rec {
       sha256 = "sha256-MZTOIt468bdPCS7UVfr5hQZUsVy3TpY/TjRrNySIL70=";
       excludes = [ "ChangeLog" ];
     })
+    # fix a minor bug
+    # https://gitlab.com/hepcedar/yoda/-/merge_requests/45
+    (fetchpatch {
+      name = "yoda-fix-yodascale-for-gz.patch";
+      url = "https://gitlab.com/hepcedar/yoda/-/commit/b03162aeaa2c99e38512ba6e4818d2e0a825b757.diff";
+      sha256 = "sha256-IMuPalQ/GKcdJOKAlwE/IRWtxDdu0inoj+A9nbRl6Gs=";
+    })
   ];
 
   nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];

From b7e8dc0a0cc4d1ca0380f6cc8711ccafdf904493 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 03:30:56 +0000
Subject: [PATCH 237/330] flow: 0.155.0 -> 0.155.1

---
 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 8ac0958ffdd4..f602f1b1813b 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.155.0";
+  version = "0.155.1";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "sha256-NMqglKpVrGgkxnrxSKKUeQ9RZ3eamlO6CDlaHjwKA3I=";
+    sha256 = "sha256-tlnABN/mcUsR8tgqgrQT+t6joo6wJMeGKtcbjyiVbbE=";
   };
 
   installPhase = ''

From 1f7681c8b6efabda7cbeeb536a46a071a49e2a85 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 03:54:23 +0000
Subject: [PATCH 238/330] frugal: 3.14.5 -> 3.14.6

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

diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix
index 0b1e8d16b65a..c20993fbea9f 100644
--- a/pkgs/development/tools/frugal/default.nix
+++ b/pkgs/development/tools/frugal/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "frugal";
-  version = "3.14.5";
+  version = "3.14.6";
 
   src = fetchFromGitHub {
     owner = "Workiva";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Er9V6mSe4Pt/RzFAPa3ci3J7FQh5GLbh9CjYHx/HnYM=";
+    sha256 = "sha256-MtQz/9+e2l4FQ1E299KtRzFpX67FynHdsvcMA4CqKUo=";
   };
 
   subPackages = [ "." ];
 
-  vendorSha256 = "sha256-9M6SSxMQ8JMJ7ZNl8cjQuid/B0xc28/BuPozxftthe0=";
+  vendorSha256 = "sha256-Y7lh+U4FKiht2PgACWSXwGTx+y8aJi22KEhqxHPooCw=";
 
   meta = with lib; {
     description = "Thrift improved";

From 112de3a3f6ffaf133e729b3248fe5020ad1954c0 Mon Sep 17 00:00:00 2001
From: dan4ik <6057430gu@gmail.com>
Date: Tue, 20 Jul 2021 12:13:04 +0700
Subject: [PATCH 239/330] i3lock-blur: init at 2.10

---
 .../window-managers/i3/lock-blur.nix          | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/window-managers/i3/lock-blur.nix

diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/applications/window-managers/i3/lock-blur.nix
new file mode 100644
index 000000000000..a536a44d452b
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/lock-blur.nix
@@ -0,0 +1,21 @@
+{ i3lock-color, lib, fetchFromGitHub }:
+
+i3lock-color.overrideAttrs (oldAttrs : rec {
+  pname = "i3lock-blur";
+  version = "2.10";
+
+  src = fetchFromGitHub {
+    owner = "karulont";
+    repo = "i3lock-blur";
+    rev = version;
+    sha256 = "sha256-rBQHYVD9rurzTEXrgEnOziOP22D2EePC1+EV9Wi2pa0=";
+  };
+
+  meta = with lib; {
+    description = "An improved screenlocker based upon XCB and PAM with background blurring filter";
+    homepage = "https://github.com/karulont/i3lock-blur/";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ dan4ik605743 ];
+    platforms = platforms.all;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f519f10fdf9b..b4f868288f0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24786,6 +24786,8 @@ in
     cairo = cairo.override { xcbSupport = true; };
   };
 
+  i3lock-blur = callPackage ../applications/window-managers/i3/lock-blur.nix { };
+
   i3lock-color = callPackage ../applications/window-managers/i3/lock-color.nix { };
 
   i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { };

From 9a846d9be40ee4db5323be9c3a4dcfea8664a5c6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 00:38:19 +0000
Subject: [PATCH 240/330] containerd: 1.5.2 -> 1.5.4

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

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index ca9ae20f3468..0c44805bedd3 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -10,7 +10,7 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "1.5.2";
+  version = "1.5.4";
 
   outputs = [ "out" "man" ];
 
@@ -18,7 +18,7 @@ buildGoModule rec {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "sha256-RDLAmPBjDHCx9al+gstUTrvKc/L0vAm8IEd/mvX5Als=";
+    sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA=";
   };
 
   vendorSha256 = null;

From 1cf78b53afa080eaa7d34f912adad7e98c4290eb Mon Sep 17 00:00:00 2001
From: embr <git@liclac.eu>
Date: Fri, 16 Jul 2021 12:29:26 +0200
Subject: [PATCH 241/330] nixos/cri-o: Add RFC42 'settings' option

---
 nixos/modules/virtualisation/cri-o.nix | 61 ++++++++++++++++----------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index 8d352e36ef99..b93776a3871f 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -6,6 +6,9 @@ let
 
   crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; });
 
+  format = pkgs.formats.toml { };
+
+  cfgFile = format.generate "00-default.conf" cfg.settings;
 in
 {
   imports = [
@@ -80,6 +83,15 @@ in
       description = "Override the network_dir option.";
       internal = true;
     };
+
+    settings = lib.mkOption {
+      type = format.type;
+      default = { };
+      description = ''
+        Configuration for cri-o, see
+        <link xlink:href="https://github.com/cri-o/cri-o/blob/master/docs/crio.conf.5.md"/>.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -87,36 +99,38 @@ in
 
     environment.etc."crictl.yaml".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml";
 
-    environment.etc."crio/crio.conf.d/00-default.conf".text = ''
-      [crio]
-      storage_driver = "${cfg.storageDriver}"
+    virtualisation.cri-o.settings.crio = {
+      storage_driver = cfg.storageDriver;
 
-      [crio.image]
-      ${optionalString (cfg.pauseImage != null) ''pause_image = "${cfg.pauseImage}"''}
-      ${optionalString (cfg.pauseCommand != null) ''pause_command = "${cfg.pauseCommand}"''}
+      image = {
+        pause_image = lib.mkIf (cfg.pauseImage != null) cfg.pauseImage;
+        pause_command = lib.mkIf (cfg.pauseCommand != null) cfg.pauseCommand;
+      };
 
-      [crio.network]
-      plugin_dirs = ["${pkgs.cni-plugins}/bin/"]
-      ${optionalString (cfg.networkDir != null) ''network_dir = "${cfg.networkDir}"''}
+      network = {
+        plugin_dirs = [ "${pkgs.cni-plugins}/bin" ];
+        network_dir = lib.mkIf (cfg.networkDir != null) cfg.networkDir;
+      };
 
-      [crio.runtime]
-      cgroup_manager = "systemd"
-      log_level = "${cfg.logLevel}"
-      pinns_path = "${cfg.package}/bin/pinns"
-      hooks_dir = [
-      ${lib.optionalString config.virtualisation.containers.ociSeccompBpfHook.enable
-        ''"${config.boot.kernelPackages.oci-seccomp-bpf-hook}",''}
-      ]
+      runtime = {
+        cgroup_manager = "systemd";
+        log_level = cfg.logLevel;
+        manage_ns_lifecycle = true;
+        pinns_path = "${cfg.package}/bin/pinns";
+        hooks_dir =
+          optional (config.virtualisation.containers.ociSeccompBpfHook.enable)
+            config.boot.kernelPackages.oci-seccomp-bpf-hook;
 
-      ${optionalString (cfg.runtime != null) ''
-      default_runtime = "${cfg.runtime}"
-      [crio.runtime.runtimes]
-      [crio.runtime.runtimes.${cfg.runtime}]
-      ''}
-    '';
+        default_runtime = lib.mkIf (cfg.runtime != null) cfg.runtime;
+        runtimes = lib.mkIf (cfg.runtime != null) {
+          "${cfg.runtime}" = { };
+        };
+      };
+    };
 
     environment.etc."cni/net.d/10-crio-bridge.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf";
     environment.etc."cni/net.d/99-loopback.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf";
+    environment.etc."crio/crio.conf.d/00-default.conf".source = cfgFile;
 
     # Enable common /etc/containers configuration
     virtualisation.containers.enable = true;
@@ -139,6 +153,7 @@ in
         TimeoutStartSec = "0";
         Restart = "on-abnormal";
       };
+      restartTriggers = [ cfgFile ];
     };
   };
 }

From 8e6c4f9a2ec1febe7f644dd3be9af597c14c9e7c Mon Sep 17 00:00:00 2001
From: embr <git@liclac.eu>
Date: Fri, 16 Jul 2021 13:07:46 +0200
Subject: [PATCH 242/330] nixos/cri-o: Remove unnecessary `lib.` qualifiers

We're already using `with lib` here, so we can just say `mkOption`, etc.
---
 nixos/modules/virtualisation/cri-o.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index b93776a3871f..c135081959a6 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -16,7 +16,7 @@ in
   ];
 
   meta = {
-    maintainers = lib.teams.podman.members;
+    maintainers = teams.podman.members;
   };
 
   options.virtualisation.cri-o = {
@@ -58,7 +58,7 @@ in
     extraPackages = mkOption {
       type = with types; listOf package;
       default = [ ];
-      example = lib.literalExample ''
+      example = literalExample ''
         [
           pkgs.gvisor
         ]
@@ -68,7 +68,7 @@ in
       '';
     };
 
-    package = lib.mkOption {
+    package = mkOption {
       type = types.package;
       default = crioPackage;
       internal = true;
@@ -84,7 +84,7 @@ in
       internal = true;
     };
 
-    settings = lib.mkOption {
+    settings = mkOption {
       type = format.type;
       default = { };
       description = ''
@@ -103,13 +103,13 @@ in
       storage_driver = cfg.storageDriver;
 
       image = {
-        pause_image = lib.mkIf (cfg.pauseImage != null) cfg.pauseImage;
-        pause_command = lib.mkIf (cfg.pauseCommand != null) cfg.pauseCommand;
+        pause_image = mkIf (cfg.pauseImage != null) cfg.pauseImage;
+        pause_command = mkIf (cfg.pauseCommand != null) cfg.pauseCommand;
       };
 
       network = {
         plugin_dirs = [ "${pkgs.cni-plugins}/bin" ];
-        network_dir = lib.mkIf (cfg.networkDir != null) cfg.networkDir;
+        network_dir = mkIf (cfg.networkDir != null) cfg.networkDir;
       };
 
       runtime = {
@@ -121,8 +121,8 @@ in
           optional (config.virtualisation.containers.ociSeccompBpfHook.enable)
             config.boot.kernelPackages.oci-seccomp-bpf-hook;
 
-        default_runtime = lib.mkIf (cfg.runtime != null) cfg.runtime;
-        runtimes = lib.mkIf (cfg.runtime != null) {
+        default_runtime = mkIf (cfg.runtime != null) cfg.runtime;
+        runtimes = mkIf (cfg.runtime != null) {
           "${cfg.runtime}" = { };
         };
       };

From 7594db623375588791743a76ca44c795f4349cb6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 06:29:15 +0000
Subject: [PATCH 243/330] istioctl: 1.10.2 -> 1.10.3

---
 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 3c69fe05cfc4..f3da97057959 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.10.2";
+  version = "1.10.3";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    sha256 = "sha256-jzLffTAGlNeglzoJ3AG4d0pwrkXmT5ttJxr2z4MwP90=";
+    sha256 = "sha256-MHERRJ9t7EG4sd4gevUnZLA25UnRqZprCXFWkp5roms=";
   };
-  vendorSha256 = "sha256-q/m1H6gcnn35ULi+e8fVuJg8eIXhzizGwXJmyf1Hfy4=";
+  vendorSha256 = "sha256-lzRIXZXrNQOwgl774B9r6OW/O8QwykSk3Mv5oGmvDuY=";
 
   doCheck = false;
 

From a96e02a808fcfd2aa8fabd2933c1d5857126e0e0 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Tue, 20 Jul 2021 08:56:18 +0200
Subject: [PATCH 244/330] vscode-extensions.hashicorp.terraform: 2.13.1 ->
 2.13.2

---
 pkgs/misc/vscode-extensions/terraform/default.nix   |  4 ++--
 .../terraform/fix-terraform-ls.patch                | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix
index dbc4873c85b9..e934f03b2095 100644
--- a/pkgs/misc/vscode-extensions/terraform/default.nix
+++ b/pkgs/misc/vscode-extensions/terraform/default.nix
@@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
   mktplcRef = {
     name = "terraform";
     publisher = "hashicorp";
-    version = "2.13.1";
+    version = "2.13.2";
   };
 
   vsix = fetchurl {
     name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
     url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix";
-    sha256 = "1l7gsb28yj2z1zfzgb8xiyf166v4blxfdkyiixlm1pqnn2lj6yb6";
+    sha256 = "0h7c6p2dcwsg7wlp49p2fsq0f164pzkx65929imd1m2df77aykqa";
   };
 
   patches = [ ./fix-terraform-ls.patch ];
diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
index 02991c0826f6..9153276d3674 100644
--- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
+++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
@@ -1,5 +1,5 @@
 diff --git a/out/clientHandler.js b/out/clientHandler.js
-index 6d314ea..dadab90 100644
+index 7f9716d..a543d60 100644
 --- a/out/clientHandler.js
 +++ b/out/clientHandler.js
 @@ -33,8 +33,7 @@ class ClientHandler {
@@ -13,14 +13,13 @@ index 6d314ea..dadab90 100644
      }
      startClients(folders) {
 diff --git a/out/extension.js b/out/extension.js
-index f1eb66d..9b0f832 100644
+index 7a271fc..726bbf8 100644
 --- a/out/extension.js
 +++ b/out/extension.js
-@@ -145,25 +145,6 @@ function updateLanguageServer(clientHandler, installPath) {
-     return __awaiter(this, void 0, void 0, function* () {
-         const delay = 1000 * 60 * 60 * 24;
-         languageServerUpdater.timeout(updateLanguageServer, delay); // check for new updates every 24hrs
--        // skip install if a language server binary path is set
+@@ -149,24 +149,6 @@ function updateLanguageServer(clientHandler, installPath) {
+             updateLanguageServer(clientHandler, installPath);
+         }, 24 * hour);
+         // skip install if a language server binary path is set
 -        if (!vscodeUtils_1.config('terraform').get('languageServer.pathToBinary')) {
 -            const installer = new languageServerInstaller_1.LanguageServerInstaller(installPath, reporter);
 -            const install = yield installer.needsInstall();

From 0d70345ec2bdc53b89f4b9c12bb85bc61edfb688 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 07:12:53 +0000
Subject: [PATCH 245/330] kotlin: 1.5.20 -> 1.5.21

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 07d90f9e013e..7e46e4bf2eaf 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "kotlin";
-  version = "1.5.20";
+  version = "1.5.21";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "12wa7blf7l4360rfm8fk5x36ij0x1m61wrjrxkvligdavmil5wzd";
+    sha256 = "sha256-8zE6/dar8bjHXGKS9OQfLbr+/I9scnYse6mz2u712lk=";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 3e61e156883f2b6c86393b3e5c4d0bbb3a2c45ea Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 20 Jul 2021 10:20:21 +0300
Subject: [PATCH 246/330] node2nix: Fix hashes for patches

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

diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix
index 498f41bc1b3f..1a1a8a9eb0b8 100644
--- a/pkgs/development/node-packages/default.nix
+++ b/pkgs/development/node-packages/default.nix
@@ -218,12 +218,12 @@ let
           # remove node_ name prefix
           (fetchpatch {
             url = "https://github.com/svanderburg/node2nix/commit/b54d45207427ff46e90f16f2f32771fdc8bff5a4.patch";
-            sha256 = "03cg2xwryvdlvg299dg91qxicrw2r43grja80an9zkb875ps8jxh";
+            sha256 = "sha256-ubUdF0q3l4xxqZ7f9EiQEUQzyqxi9Q6zsRPETHlfzh8=";
           })
           # set meta platform
           (fetchpatch {
             url = "https://github.com/svanderburg/node2nix/commit/58736093161f2d237c17e75a96529b018cd0ac64.patch";
-            sha256 = "1c91qfqa6p4hzyafv5pq6rpgnny2805n007b1443gbqwrz5awz6n";
+            sha256 = "0sif7803c9g6gjmmdniw5qxrq5igiz9nqdmdrcf1hxfi5x43a32h";
           })
         ];
       };

From 0b39735cdddca5ce0abb38389fbbdcd1cbff7d27 Mon Sep 17 00:00:00 2001
From: nils-degroot <nils@peeko.nl>
Date: Mon, 19 Jul 2021 16:46:08 +0200
Subject: [PATCH 247/330] rm-improved: init at 0.13.0

Changes description
---
 .../applications/misc/rm-improved/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/misc/rm-improved/default.nix

diff --git a/pkgs/applications/misc/rm-improved/default.nix b/pkgs/applications/misc/rm-improved/default.nix
new file mode 100644
index 000000000000..0a1d38f5f7f9
--- /dev/null
+++ b/pkgs/applications/misc/rm-improved/default.nix
@@ -0,0 +1,24 @@
+{ fetchFromGitHub, rustPlatform, lib }:
+
+with lib;
+
+rustPlatform.buildRustPackage rec {
+  pname = "rm-improved";
+  version = "0.13.0";
+
+  cargoSha256 = "0wgpr6gx9dpvf02xgvrdbyiqfz1k9vipnvriz3jg0cz7n1afqisj";
+
+  src = fetchFromGitHub {
+    owner = "nivekuil";
+    repo = "rip";
+    rev = "0.13.0";
+    sha256 = "0d065xia4mwdhxkiqfg7pic6scfzipzmsvvx7l6l97w62lzpiqx3";
+  };
+
+  meta = {
+    description = "Replacement for rm with focus on safety, ergonomics and performance";
+    homepage = "https://github.com/nivekuil/rip";
+    maintainers = with maintainers; [ nils-degroot ];
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5024a4d8d3a..b5824f554fb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3218,6 +3218,8 @@ in
 
   rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { };
 
+  rm-improved = callPackage ../applications/misc/rm-improved { };
+
   remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };
 
   restream = callPackage ../applications/misc/remarkable/restream { };

From bf975558482fe9488cb07297fb525bac3e0f9a02 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 07:30:41 +0000
Subject: [PATCH 248/330] kubernetes: 1.21.2 -> 1.21.3

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

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 2dfbac5c5ac6..2a66b391ae8a 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "kubernetes";
-  version = "1.21.2";
+  version = "1.21.3";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "sha256-GAX8ODjGj5LM44KgJC0N5uuOH4z33lDWoQgImOl8/xo=";
+    sha256 = "sha256-GMigdVuqJN6eIN0nhY5PVUEnCqjAYUzitetk2QmX5wQ=";
   };
 
   nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];

From 80d24e8856674db25286fdc18b82350f3c7ed7d4 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 20 Jul 2021 09:45:46 +0200
Subject: [PATCH 249/330] cypress: 7.7.0 -> 8.0.0

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

diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index 811a63b0cef8..ff673658272e 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cypress";
-  version = "7.7.0";
+  version = "8.0.0";
 
   src = fetchzip {
     url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-    sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897";
+    sha256 = "144mz37xhk7gkwhmf67q1h07f2biy5nnw78yb2syc7w28v48ng0z";
   };
 
   # don't remove runtime deps

From 6e001c1ace93719b7639a1578d4ee9ca8086b94e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 20 Jul 2021 10:09:19 +0200
Subject: [PATCH 250/330] perlPackages.BKeywords: 1.21 -> 1.22

This fixes the build (tests), probably after perl update.
---
 pkgs/top-level/perl-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ff35e5231463..6124fc5859ec 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1328,12 +1328,12 @@ let
     propagatedBuildInputs = [ CarpClan ];
   };
 
-  BKeywords = buildPerlPackage {
+  BKeywords = buildPerlPackage rec {
     pname = "B-Keywords";
-    version = "1.21";
+    version = "1.22";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.21.tar.gz";
-      sha256 = "12481z1z1nyrjlkizzqn4cdmcrfjkc3hvxppqipsf6r5gnffh9as";
+      url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-${version}.tar.gz";
+      sha256 = "0i2ksp0w9wv1qc22hrdl3k48cww64syhmv8zf6x0kgyd4081hr56";
     };
     meta = {
       description = "Lists of reserved barewords and symbol names";

From 5c6608144f9cd108565297c7c03ec79bb0fe611f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 20 Jul 2021 10:08:44 +0200
Subject: [PATCH 251/330] chromiumBeta: 92.0.4515.101 -> 92.0.4515.107

---
 .../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 d7b14cb4ba6b..71887b8b85f2 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": "92.0.4515.101",
-    "sha256": "1jcas265hhlqd9f63h4zw4n4xsl26c5zmjlmbf1px5icvcjfb2xd",
-    "sha256bin64": "0sb5l5nzfzisvrnhcfwhdh9rn6z6pkzqz4p92c40q2mlhmjrfhj0",
+    "version": "92.0.4515.107",
+    "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf",
+    "sha256bin64": "179i18lckd85i6cc60mqpvv2jqdshc338m686yackdgz9qjrrlwd",
     "deps": {
       "gn": {
         "version": "2021-05-07",

From b9e49d257c2e457e8ae26da4876472ffa9ac9f49 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 20 Jul 2021 10:13:30 +0200
Subject: [PATCH 252/330] xob: remove myself as maintainer

All my systems use Wayland now (with wob) and I cannot even properly
test X11 software anymore.
---
 pkgs/tools/X11/xob/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xob/default.nix b/pkgs/tools/X11/xob/default.nix
index 2c1ae4bdf61c..754904449efa 100644
--- a/pkgs/tools/X11/xob/default.nix
+++ b/pkgs/tools/X11/xob/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ primeos ];
+    maintainers = with maintainers; [ ];
   };
 }

From 4eeb4167874dc2674f102cbefcefc4fdfec8afef Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 20 Jul 2021 10:47:18 +0200
Subject: [PATCH 253/330] libwebsockets: cleanup

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

diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index b6ef6fa49b21..151d4c7ee48f 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -26,8 +26,12 @@ let
 
     NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
 
-    postInstall = "rm -rf ${placeholder "out"}/share/libwebsockets-test-server";
-    disallowedReferences = [ stdenv.cc.cc ];  # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o
+    postInstall = ''
+      rm -r ${placeholder "out"}/share/libwebsockets-test-server
+    '';
+
+    # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o
+    disallowedReferences = [ stdenv.cc.cc ];
 
     meta = with lib; {
       description = "Light, portable C library for websockets";

From 0a0f6ab848bb291d470da05549e0d1e4606c2c43 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 20 Jul 2021 10:48:48 +0200
Subject: [PATCH 254/330] firecracker: use dontConfigure

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

diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix
index a8fbb1d09c16..1d049621aa5f 100644
--- a/pkgs/applications/virtualization/firecracker/default.nix
+++ b/pkgs/applications/virtualization/firecracker/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     aarch64-linux = "0m7xs12g97z1ipzaf7dgknf3azlah0p6bdr9i454azvzg955238b";
   };
 
-  configurePhase = ":";
+  dontConfigure = true;
 
   buildPhase     = ''
     mv firecracker-* firecracker

From 3e75263ca766961572ed31134468594b317119b9 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 20 Jul 2021 10:48:48 +0200
Subject: [PATCH 255/330] lnd: 0.13.0-beta -> 0.13.1-beta

https://github.com/lightningnetwork/lnd/blob/master/docs/release-notes/release-notes-0.13.1.md
---
 pkgs/applications/blockchains/lnd.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix
index e8c6d14b3db8..c956bca9a1a5 100644
--- a/pkgs/applications/blockchains/lnd.nix
+++ b/pkgs/applications/blockchains/lnd.nix
@@ -1,21 +1,21 @@
 { buildGoModule
 , fetchFromGitHub
 , lib
-, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" ]
+, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" ]
 }:
 
 buildGoModule rec {
   pname = "lnd";
-  version = "0.13.0-beta";
+  version = "0.13.1-beta";
 
   src = fetchFromGitHub {
     owner = "lightningnetwork";
     repo = "lnd";
     rev = "v${version}";
-    sha256 = "0fwidjkfzzd7k891x5z7jrx2arl0kwj6vm9z2acsyy7riv4zfjbq";
+    sha256 = "07cs9yq83laajmfwfv42xfkfai3q873wg4qg7bfzw18w5fllivkg";
   };
 
-  vendorSha256 = "19myr9f5zh05y6lagd9pra60y8df7pz837310cbpq9a6zzwpdxk2";
+  vendorSha256 = "1hk67x8nlc0wm1pg8k8hywih623p4c0klfhfyy26b7mqq62lazia";
 
   subPackages = ["cmd/lncli" "cmd/lnd"];
 

From 07b9fef470319edea17ba27d2bf08ae3d9962d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 20 Jul 2021 10:49:29 +0200
Subject: [PATCH 256/330] libtiff: revert to previous version on aarch64-darwin

/cc PR #129687.  This should work; I can't see another way immediately.
---
 .../libraries/libtiff/aarch64-darwin.nix      | 53 +++++++++++++++++++
 .../development/libraries/libtiff/default.nix |  2 +
 .../libraries/libtiff/headers-cmake.patch     | 13 +++++
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libtiff/aarch64-darwin.nix
 create mode 100644 pkgs/development/libraries/libtiff/headers-cmake.patch

diff --git a/pkgs/development/libraries/libtiff/aarch64-darwin.nix b/pkgs/development/libraries/libtiff/aarch64-darwin.nix
new file mode 100644
index 000000000000..5de481066f67
--- /dev/null
+++ b/pkgs/development/libraries/libtiff/aarch64-darwin.nix
@@ -0,0 +1,53 @@
+{ lib, stdenv
+, fetchurl
+
+, pkg-config
+, cmake
+
+, libdeflate
+, libjpeg
+, xz
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libtiff";
+  version = "4.2.0";
+
+  src = fetchurl {
+    url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
+    sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b";
+  };
+
+  cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_SKIP_BUILD_RPATH=OFF";
+
+  # FreeImage needs this patch
+  patches = [ ./headers-cmake.patch ];
+
+  outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ];
+
+  postFixup = ''
+    moveToOutput include/tif_dir.h $dev_private
+    moveToOutput include/tif_config.h $dev_private
+    moveToOutput include/tiffiop.h $dev_private
+  '';
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
+
+  buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs.
+
+  enableParallelBuilding = true;
+
+  doInstallCheck = true;
+  installCheckTarget = "test";
+
+  meta = with lib; {
+    description = "Library and utilities for working with the TIFF image file format";
+    homepage = "https://libtiff.gitlab.io/libtiff";
+    changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html";
+    license = licenses.libtiff;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 035b0ab55ad6..ea246790020e 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -10,6 +10,8 @@
 , zlib
 }:
 
+#FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix
+
 stdenv.mkDerivation rec {
   pname = "libtiff";
   version = "4.3.0";
diff --git a/pkgs/development/libraries/libtiff/headers-cmake.patch b/pkgs/development/libraries/libtiff/headers-cmake.patch
new file mode 100644
index 000000000000..5a00502ef281
--- /dev/null
+++ b/pkgs/development/libraries/libtiff/headers-cmake.patch
@@ -0,0 +1,13 @@
+diff -ruN a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
+--- a/libtiff/CMakeLists.txt	2019-05-31 13:05:22.849705817 +0000
++++ b/libtiff/CMakeLists.txt	2020-11-27 21:50:03.527831837 +0000
+@@ -42,6 +42,9 @@
+   libtiffxx.map)
+ 
+ set(tiff_HEADERS
++  tiffiop.h
++  ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h
++  tif_dir.h
+   tiff.h
+   tiffio.h
+   tiffvers.h)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d3e942ca5af..8725cd73e976 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17088,7 +17088,9 @@ in
 
   libtifiles2 = callPackage ../development/libraries/libtifiles2 { };
 
-  libtiff = callPackage ../development/libraries/libtiff { };
+  libtiff = if stdenv.isDarwin && stdenv.isAarch64
+    then callPackage ../development/libraries/libtiff/aarch64-darwin.nix { }
+    else callPackage ../development/libraries/libtiff { };
 
   libtiger = callPackage ../development/libraries/libtiger { };
 

From 8503fe2241478d2bd9228a949cce3303dd966560 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 20 Jul 2021 11:06:10 +0200
Subject: [PATCH 257/330] amass: 3.13.3 -> 3.13.4 (#130727)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/tools/networking/amass/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index 184ba0862c57..5d539cc56978 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "amass";
-  version = "3.13.3";
+  version = "3.13.4";
 
   src = fetchFromGitHub {
     owner = "OWASP";
     repo = "Amass";
     rev = "v${version}";
-    sha256 = "sha256-uIqnylq99P9M8nOuqkKl7fGIVfYO6cO0DAQ4eaC2qyY=";
+    sha256 = "0zlkr0r06w3y34nx174wyfwk69i2q0bcq88kfvb0j3d28fdh5p31";
   };
 
-  vendorSha256 = "sha256-LOnnvidUdDDhNPWM+o0Ef4NqRboi89s0DzDwuxi0nl8=";
+  vendorSha256 = "065n1vhj5003ay4pflp418w32s84jvza52lghj6cpcdzs0rwgc45";
 
   outputs = [ "out" "wordlists" ];
 

From 46de2b8ffbb4ea99a520b4e6262fe6593967bce0 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Tue, 20 Jul 2021 11:21:29 +0200
Subject: [PATCH 258/330] pythonPackages.crate: mark broken (#130017)

---
 pkgs/development/python-modules/agate-sql/default.nix | 4 ++++
 pkgs/development/python-modules/crate/default.nix     | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix
index 890f44b4ad38..68f166b3c7c5 100644
--- a/pkgs/development/python-modules/agate-sql/default.nix
+++ b/pkgs/development/python-modules/agate-sql/default.nix
@@ -22,6 +22,10 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ agate sqlalchemy ];
 
+  # crate is broken in nixpkgs, with SQLAlchemy > 1.3
+  # Skip tests for now as they rely on it.
+  doCheck = false;
+
   checkInputs = [ crate nose geojson ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix
index 07b9652e7753..c4a698c5250a 100644
--- a/pkgs/development/python-modules/crate/default.nix
+++ b/pkgs/development/python-modules/crate/default.nix
@@ -39,5 +39,11 @@ buildPythonPackage rec {
     description = "A Python client library for CrateDB";
     license = licenses.asl20;
     maintainers = with maintainers; [ doronbehar ];
+    # 2021-07-12 (@layus): Please unbreak when an update fixes compatibility
+    # with the version of SQLAlchemy in nixpkgs
+    # And also re-enable tests in pythonPackages.agate-sql.
+    # The version string below is intentionally split, so nixpkgs-update does
+    # not change it. That would make this warning pretty useless.
+    broken = assert version == "0.2"+"6.0"; true;
   };
 }

From b98c1d1789529e2d14d5aa7bcae277fccd232bb1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 09:23:52 +0000
Subject: [PATCH 259/330] bitwig-studio: 4.0 -> 4.0.1

---
 pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
index b6dea53012d8..492054396702 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bitwig-studio";
-  version = "4.0";
+  version = "4.0.1";
 
   src = fetchurl {
     url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
-    sha256 = "38381c1a382abd9543931f34d5ae1789c31ec1217a1c852b5c5c442ccaf97063";
+    sha256 = "sha256-yhCAKlbLjyBywkSYY1aqbUGFlAHBLR8g8xPDIqoUIZk=";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];

From 34a9c0daf5b1d21c10a1836f2774d348d9c1f413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 20 Jul 2021 11:24:28 +0200
Subject: [PATCH 260/330] Revert "proj: 7.2.1 -> 8.0.1" + patch the test

This reverts commit 25b20757e8c2e929ded0215eeaad19382497c318
and adds an upstream patch.  There are API changes
https://proj.org/development/migration.html
and I couldn't make some of the other packages build,
so I decided to just patch the test instead (for now).
---
 pkgs/development/libraries/proj/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 26558502c122..f22878ec8290 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -7,19 +7,28 @@
 , libtiff
 , curl
 , gtest
+, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
   pname = "proj";
-  version = "8.0.1";
+  version = "7.2.1";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
     rev = version;
-    sha256 = "sha256-pgmv/mtqpKbgU1RuKtue7NAnMyXR1BwGJwoeA/MTrpY=";
+    sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
   };
 
+  patches = [
+    (fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557
+      name = "gie_self_tests-fail.diff"; # included in >= 8.0.1
+      url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";
+      sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";
+    })
+  ];
+
   postPatch = lib.optionalString (version == "7.2.1") ''
     substituteInPlace CMakeLists.txt \
       --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"

From b53692cdc6c06881578f206239291326ed42a78c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 20 Jul 2021 11:40:04 +0200
Subject: [PATCH 261/330] Revert "osm2xmap: mark as broken"

This reverts commit a57e9fc6c0ae4c349ff0e8c57e1bd56d958ac664.
After the parent commit it builds again.  For now; future seems bleak.
---
 pkgs/applications/misc/osm2xmap/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix
index 101a626f2c37..4f2af99ab14d 100644
--- a/pkgs/applications/misc/osm2xmap/default.nix
+++ b/pkgs/applications/misc/osm2xmap/default.nix
@@ -29,7 +29,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = [ maintainers.mpickering ];
     platforms = with lib.platforms; linux;
-    # it probably needs https://proj.org/development/migration.html
-    broken = true;
   };
 }

From d6f3b3f01aa4d16c366c43082d2fef204d33dac5 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 11:42:18 +0200
Subject: [PATCH 262/330] osinfo-db: deprecate phases

---
 pkgs/data/misc/osinfo-db/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index ec0fa407d733..17a63debdc64 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];
 
-  phases = [ "installPhase" ];
-
   installPhase = ''
     osinfo-db-import --dir "$out/share/osinfo" "${src}"
   '';

From 917e97076e57084661634fb7fe01c76b2c603517 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 11:45:35 +0200
Subject: [PATCH 263/330] vue: deprecate phases

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

diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix
index 13b09865c6ac..5994df7c559a 100644
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0yfzr80pw632lkayg4qfmwzrqk02y30yz8br7isyhmgkswyp5rnx";
   };
 
-  phases = "installPhase";
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p "$out"/{share/vue,bin}

From 0e9e040375659bb53e746f8cde58f6b20b331335 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 11:53:09 +0200
Subject: [PATCH 264/330] dotnetPackages.Nuget: deprecate phases

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 6a189c0005a0..f13e1f919b5d 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -296,7 +296,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
       sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
     };
 
-    phases = [ "unpackPhase" "installPhase" ];
+    dontBuild = true;
 
     outputFiles = [ "*" ];
     dllFiles = [ "NuGet*.dll" ];

From abdbec434af6a4efe5086d2c1718d587b832a07a Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 11:57:12 +0200
Subject: [PATCH 265/330] reckon: deprecate phases

---
 pkgs/tools/text/reckon/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix
index b37928fc7c5b..3af64e39ed17 100644
--- a/pkgs/tools/text/reckon/default.nix
+++ b/pkgs/tools/text/reckon/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "reckon";
   version = (import ./gemset.nix).reckon.version;
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   nativeBuildInputs = [ makeWrapper ];
 

From ade7d55936351662e14c16cc6489d750abbb1de8 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 11:58:53 +0200
Subject: [PATCH 266/330] papertrail: deprecate phases

---
 pkgs/tools/text/papertrail/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix
index 57e79b08fda8..c3d005a97e08 100644
--- a/pkgs/tools/text/papertrail/default.nix
+++ b/pkgs/tools/text/papertrail/default.nix
@@ -11,7 +11,7 @@ let
 in stdenv.mkDerivation {
   name = "papertrail-${(import ./gemset.nix).papertrail.version}";
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p $out/bin

From 9cdaede5abdcd22b8293eba977b88a845c8a1b17 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 12:01:25 +0200
Subject: [PATCH 267/330] ledger2beancount: deprecate phases

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

diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix
index b3f48085d1db..12fe3a9c9e0b 100644
--- a/pkgs/tools/text/ledger2beancount/default.nix
+++ b/pkgs/tools/text/ledger2beancount/default.nix
@@ -26,11 +26,7 @@ in stdenv.mkDerivation rec {
     sha256 = "0kimp8l9ax37grfv5r5iw0g0xnrpkak022fl10y3i7kc4nyi1s99";
   };
 
-  phases = [
-    "unpackPhase"
-    "installPhase"
-    "fixupPhase"
-  ];
+  dontBuild = true;
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ perlPackages.perl beancount ] ++ perlDeps;

From 9bd010b956dec652c551add2a8607f8aff46aac1 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 12:03:14 +0200
Subject: [PATCH 268/330] fastlane: deprecate phases

---
 pkgs/tools/admin/fastlane/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix
index 245c1dfef8cb..dc8dd1fd7a6c 100644
--- a/pkgs/tools/admin/fastlane/default.nix
+++ b/pkgs/tools/admin/fastlane/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = let
     env = bundlerEnv {

From b82f92c1f61048de0e48d53d4cd4b9442ef1bace Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 12:05:31 +0200
Subject: [PATCH 269/330] maphosts: deprecate phases

---
 pkgs/tools/networking/maphosts/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix
index 8e3d0cf9160c..896b3402d16a 100644
--- a/pkgs/tools/networking/maphosts/default.nix
+++ b/pkgs/tools/networking/maphosts/default.nix
@@ -9,7 +9,7 @@ let
 in stdenv.mkDerivation {
   name = "maphosts-${env.gems.maphosts.version}";
 
-  phases = ["installPhase"];
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p "$out/bin"

From 833a6087b9d8e4d8785370552efd77a50b043dd1 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 12:10:39 +0200
Subject: [PATCH 270/330] ubidump: deprecate phases

---
 pkgs/tools/filesystems/ubidump/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix
index 6a6409ad3251..bf141c8d94d7 100644
--- a/pkgs/tools/filesystems/ubidump/default.nix
+++ b/pkgs/tools/filesystems/ubidump/default.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo ];
 
-  phases = [ "unpackPhase" "patchPhase" "installPhase" "installCheckPhase" ];
+  dontBuild = true;
 
   patchPhase = ''
     sed -i '1s;^;#!${python3.interpreter}\n;' ubidump.py

From 5df11293fec538e1d8ff0b86224674f0def6c1b4 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 12:15:36 +0200
Subject: [PATCH 271/330] ditaa: deprecate phases

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

diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix
index 79a24ed3841c..cb06e8ba9f16 100644
--- a/pkgs/tools/graphics/ditaa/default.nix
+++ b/pkgs/tools/graphics/ditaa/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p "$out/bin"

From 10af5753c9dd5b217a78a23799751be49c813590 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 12:28:59 +0200
Subject: [PATCH 272/330] collectd-data: deprecate phases

---
 pkgs/tools/system/collectd/data.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix
index 378eb62d6cc5..3867bd6bb3d9 100644
--- a/pkgs/tools/system/collectd/data.nix
+++ b/pkgs/tools/system/collectd/data.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   pname = "collectd-data";
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p $out/share/collectd

From 67d0658e65303704fc231f0055c8c0a9a8e4ad5c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 12:33:29 +0200
Subject: [PATCH 273/330] ossec: remove phases

---
 pkgs/tools/security/ossec/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix
index 22374e1d302b..89c71d8ffc7e 100644
--- a/pkgs/tools/security/ossec/default.nix
+++ b/pkgs/tools/security/ossec/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation {
 
   buildInputs = [ which ];
 
-  phases = [ "unpackPhase" "patchPhase" "buildPhase" ];
-
   patches = [ ./no-root.patch ];
 
   buildPhase = ''

From f145d62cad21d649e20f2c579ec4985c14d80e5f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 10:37:52 +0000
Subject: [PATCH 274/330] cri-o-unwrapped: 1.21.1 -> 1.21.2

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

diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 42095da8f52d..26e56ccc609e 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -15,13 +15,13 @@
 
 buildGoModule rec {
   pname = "cri-o";
-  version = "1.21.1";
+  version = "1.21.2";
 
   src = fetchFromGitHub {
     owner = "cri-o";
     repo = "cri-o";
     rev = "v${version}";
-    sha256 = "sha256-WoQeZkHuCQGv//UKTpvucJXq7xI9Fkil8V1B1qTM75k=";
+    sha256 = "sha256-hapXwd7K0xbkZ0MKkJ5wv4zfDKRTC3IC4oLYLL460oI=";
   };
   vendorSha256 = null;
 

From aef1db45b33d88bf0cb4f9f997dc34b67e3bd210 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 20 Jul 2021 12:51:09 +0200
Subject: [PATCH 275/330] ossec: convert to pname + version; cleanup

---
 pkgs/tools/security/ossec/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix
index 22374e1d302b..8f38dd20f166 100644
--- a/pkgs/tools/security/ossec/default.nix
+++ b/pkgs/tools/security/ossec/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, which }:
 
-stdenv.mkDerivation {
-  name = "ossec-client-2.6";
+stdenv.mkDerivation rec {
+  pname = "ossec-client";
+  version = "2.6";
 
   src = fetchurl {
-    url = "https://www.ossec.net/files/ossec-hids-2.6.tar.gz";
-
+    url = "https://www.ossec.net/files/ossec-hids-${version}.tar.gz";
     sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip";
   };
 
@@ -30,11 +30,12 @@ yes
 "   | ./install.sh
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Open source host-based instrusion detection system";
     homepage = "https://www.ossec.net";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.linux;
   };
 }
 

From 4b518a313274843fc10805d485eabee7e0f1f796 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 20 Jul 2021 12:53:50 +0200
Subject: [PATCH 276/330] maphosts: convert to pname + version

---
 pkgs/tools/networking/maphosts/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix
index 8e3d0cf9160c..2578fea800d4 100644
--- a/pkgs/tools/networking/maphosts/default.nix
+++ b/pkgs/tools/networking/maphosts/default.nix
@@ -7,7 +7,8 @@ let
     gemdir = ./.;
   };
 in stdenv.mkDerivation {
-  name = "maphosts-${env.gems.maphosts.version}";
+  pname = "maphosts";
+  version = env.gems.maphosts.version;
 
   phases = ["installPhase"];
 

From 72775d4ea428d738a9a8682e8066cdb0766f175c Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 20 Jul 2021 13:22:52 +0200
Subject: [PATCH 277/330] nix-prefetch: cleanup

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

diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix
index 662be6a09783..5936429c7a45 100644
--- a/pkgs/tools/package-management/nix-prefetch/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch/default.nix
@@ -2,10 +2,7 @@
 , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk
 , gnugrep, gnused, jq, nix }:
 
-let
-  binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ];
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "nix-prefetch";
   version = "0.4.1";
 
@@ -55,7 +52,7 @@ in stdenv.mkDerivation rec {
     install -Dm555 -t $lib src/*.sh
     install -Dm444 -t $lib lib/*
     makeWrapper $lib/main.sh $out/bin/${pname} \
-      --prefix PATH : ${binPath}
+      --prefix PATH : ${lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]}
 
     installManPage doc/nix-prefetch.?
 
@@ -69,7 +66,7 @@ in stdenv.mkDerivation rec {
     description = "Prefetch any fetcher function call, e.g. package sources";
     license = licenses.mit;
     maintainers = with maintainers; [ msteen ];
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/msteen/nix-prefetch";
     platforms = platforms.all;
   };
 }

From 2e09265a54dc36a27a1eee851da17668980caac2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer@users.noreply.github.com>
Date: Tue, 20 Jul 2021 04:27:10 -0700
Subject: [PATCH 278/330] nix-template: 0.1.1 -> 0.1.4 (#130580)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 .../nix-template/default.nix                  | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix
index f56222f403a2..13c254cbee29 100644
--- a/pkgs/tools/package-management/nix-template/default.nix
+++ b/pkgs/tools/package-management/nix-template/default.nix
@@ -1,4 +1,5 @@
 { lib, stdenv, rustPlatform, fetchFromGitHub
+, installShellFiles
 , makeWrapper
 , nix
 , openssl
@@ -8,18 +9,24 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-template";
-  version = "0.1.1";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
+    name = "${pname}-${version}-src";
     owner = "jonringer";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-A1b/fgSr27sfMDnTi4R3PUZfhAdLA5wUOd4yh9/4Bnk=";
+    sha256 = "sha256-kNFhSfHUYBUOCXoD6m7thMho4tOIpRHfHGcsW8FTgkc=";
   };
 
-  cargoSha256 = "sha256-resyY/moqLo4KWOKUvFJiOWealCmcEsLFgkN12slKN0=";
+  cargoSha256 = "sha256-7PthFLCEt+E/Gx5//aulHYYBKZqapNEWKtKfRlDr3Pw=";
+
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+    pkg-config
+  ];
 
-  nativeBuildInputs = [ makeWrapper pkg-config ];
   buildInputs = [ openssl ]
     ++ lib.optional stdenv.isDarwin Security;
 
@@ -27,6 +34,11 @@ rustPlatform.buildRustPackage rec {
   postInstall = ''
     wrapProgram $out/bin/nix-template \
       --prefix PATH : ${lib.makeBinPath [ nix ]}
+
+    installShellCompletion --cmd nix-template \
+      --bash <($out/bin/nix-template completions bash) \
+      --fish <($out/bin/nix-template completions fish) \
+      --zsh <($out/bin/nix-template completions zsh)
   '';
 
   meta = with lib; {

From 6cafd781ca99b37302bf6422cf760e9d8b036e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20B=C3=BChler?=
 <Stunkymonkey@users.noreply.github.com>
Date: Tue, 20 Jul 2021 13:27:46 +0200
Subject: [PATCH 279/330] nix-script: remove phases (#130742)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/tools/nix/nix-script/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix
index a755d933219e..f9077ef13871 100644
--- a/pkgs/tools/nix/nix-script/default.nix
+++ b/pkgs/tools/nix/nix-script/default.nix
@@ -15,13 +15,20 @@ stdenv.mkDerivation {
     (haskellPackages.ghcWithPackages (hs: with hs; [ posix-escape ]))
   ];
 
-  phases = [ "buildPhase" "installPhase" "fixupPhase" ];
   buildPhase = ''
+    runHook preBuild
+
     mkdir -p $out/bin
     ghc -O2 $src/nix-script.hs -o $out/bin/nix-script -odir . -hidir .
+
+    runHook postBuild
   '';
   installPhase = ''
+    runHook preInstall
+
     ln -s $out/bin/nix-script $out/bin/nix-scripti
+
+    runHook postInstall
   '';
 
   meta = with lib; {

From 25404a3418a3bfc0cd68d8f570802f0c8daeedb4 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 13:36:48 +0200
Subject: [PATCH 280/330] emv: deprecate phases

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

diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix
index 1dbb5199f754..3e5a348c5823 100644
--- a/pkgs/tools/misc/emv/default.nix
+++ b/pkgs/tools/misc/emv/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "7e0e12afa45ef5ed8025e5f2c6deea0ff5f512644a721f7b1b95b63406a8f7ce";
   };
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -pv $out/bin

From d36cf5c023f256d0ae122e2860c5478ab8d23bb8 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 13:38:07 +0200
Subject: [PATCH 281/330] gibo: remove phases

---
 pkgs/tools/misc/gibo/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix
index 70d0eb19ca85..6ee4698d750c 100644
--- a/pkgs/tools/misc/gibo/default.nix
+++ b/pkgs/tools/misc/gibo/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "07j3sv9ar9l074krajw8nfmsfmdp836irsbd053dbqk2v880gfm6";
   };
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
   installPhase = ''
     mkdir -p $out/bin $out/share/bash-completion/completions
     cp gibo $out/bin

From 928c7dbb61504d717ed356b3c6d6d26154aeea24 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 19 Jul 2021 21:12:29 +0900
Subject: [PATCH 282/330] firefox-bin: 90.0 -> 90.0.1

---
 .../browsers/firefox-bin/release_sources.nix  | 778 +++++++++---------
 1 file changed, 389 insertions(+), 389 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 12c76c8e4dde..5813868286a3 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,975 +1,975 @@
 {
-  version = "90.0";
+  version = "90.0.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ach/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ach/firefox-90.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "b21effb602d202574d3498a2a1d4d381f1581eb794691123fa00eb25adb21b5a";
+      sha256 = "b985849c5109b6a9992ca0fc4699b769af37c84f1aea5fc6c1b66845f51da83d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/af/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/af/firefox-90.0.1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "2ee727fe495f586ca0f825e1bbadd4d737b1c6e4050ad1e77f3cb84cd9d50e3a";
+      sha256 = "7ddb078a80b7991576f691a1c3bc76635621aa13d64c465651e16ae4dade7436";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/an/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/an/firefox-90.0.1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "f33700fc2178d6ea0bc6bd47cf16744a7551e3987abe9cd9bb891cd48a019000";
+      sha256 = "dca47858177ed263332c7cb093e3285b5c8f61782a66cf683ee52896c3fc76a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ar/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ar/firefox-90.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "5633334afb6a338a861b665c78209ba13558c0b6dfab44f80cd690533633575d";
+      sha256 = "2249834099e5cc9a5feb0b38bdc277e5e3f65635b1a1179afe1240113f0ee1d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ast/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ast/firefox-90.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "98fff4f8216441b7b404dc00ca4bbd3b8161514dde85bfe56c23ea15a20c1ba6";
+      sha256 = "7ad21576299643e480922a2a7b6077a0edc84d362e33bb8318b33d04133a7c7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/az/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/az/firefox-90.0.1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "02a48160df4f22842f09bbf54190ed91f83f0b0af9b15134ce6f83a163de8891";
+      sha256 = "10eabc925d651985229d6bac1c34b12267a31886f5354ba943178f6a2d0ef04a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/be/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/be/firefox-90.0.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "1848205609b3bb57a84fb2ddd002e57868dce7f2046a4603e2058fb4bf6b4046";
+      sha256 = "d1e6d939233b23e5378161c79f338e66c010056d9d3e619b9eb6c26dc4461724";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bg/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bg/firefox-90.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "27a40aba90c5b8ef51d2077770ee0803e0d8327db36d1f95a463c54ca74a7536";
+      sha256 = "d59e69127462aa3efff558d5cd5035951dbe54161f913dacb4142a8bd3f258fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bn/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bn/firefox-90.0.1.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "490da4669e9711bbdb309abba2251b88407ec843065b5c81e61cae5be59d8e9e";
+      sha256 = "56ca1d7e84ada3f0124e36186a32dfdf287547bdc8d3b111baf9407fedf0a7ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/br/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/br/firefox-90.0.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "be50bcfb6bfc9144cf690165801abc294dfa9b67597d727f7707025b8a61be97";
+      sha256 = "33a6ceb6d37b73d03fe5a6e93e19e29346b2861ee69ab2fffd6cca4a2dbaf40f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bs/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bs/firefox-90.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "90fcf0f8a7fa13ca4157ec710e06053485df7e47264ba46bebe4551154244b89";
+      sha256 = "7c853a13afd74307e7a468b85ed430b20f1622dbecb697b8c80945ccea9f0805";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ca-valencia/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ca-valencia/firefox-90.0.1.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "bb32faff40658d974d9f1909ee574043c3501d7d5149629a8abce919aeb37232";
+      sha256 = "0aa103c471b3f71ef638cbf9e8f83447875ef5cd96bdc8535435188510272c65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ca/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ca/firefox-90.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "bd5b977e54ee504dce9aafcb093419b23da0c85ca1f84c6c0060014d3ec3b32a";
+      sha256 = "4672d9fe667f72de45af1eb6a205792440afa9de86eae1f33426d3b948fbc841";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cak/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cak/firefox-90.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "aa2e5b116ebfc296cfb6522b2b35bf006cd2d4154b04d20ac4c6a720fad90008";
+      sha256 = "7b12a52926888f52957a75f639f09094dc4cbc18a1c6d14bf433028461c4a71a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cs/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cs/firefox-90.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "ec9b5c46617f9ef8f29374793c8a5f272d370b9e974d004ec0db85a65b5a76d3";
+      sha256 = "7dfdf0c4c740dab356205c52384faf61e9963a42675031f0292be1c0f4e402c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cy/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cy/firefox-90.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "17ef10b7e321db0374c87595d13e4bad57707902dd02a4a20e7f375ff328b905";
+      sha256 = "ad7f76b997bced6df5c240273fb736fe7dcb0c86ae867a5cbdb5097dd5c382ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/da/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/da/firefox-90.0.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "46d83a4256eb11f5db42039184e0ed138280f21ecdbafb1e7533399cfd58f88d";
+      sha256 = "9f59ff2eec510b75312bcbe29e9706fe0710f300c12e33200937571414254d31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/de/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/de/firefox-90.0.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "b4417505454008a2722c691c9006450d90ec80c7461eaf0ecb9b4f9cc0883ed0";
+      sha256 = "c838f9238939cc8e91fff903a231062c03388c2202e273f7b99701415a8f3f22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/dsb/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/dsb/firefox-90.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "8eec9d5753aaa92c31fd52556595c9fb5889f36904cb05722bb2d727fa618941";
+      sha256 = "5370c32283f8bf7fc3273dbe3cb5c77db829723a39401b00f0e8f70c9f3dba91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/el/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/el/firefox-90.0.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "ca3e4958df9aedc5e6e1f5a9a8778248cc8b3f8b988b143aa2da94a8fbc6b3af";
+      sha256 = "2af4feceeea5c0932935d91c22df516ae2e25d9006ab41ba6274783b74b3a5e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-CA/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-CA/firefox-90.0.1.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "341f133b3787746993df3e9176601b485bb7a0a16c7a294e7de64f8af39c2ac7";
+      sha256 = "e805c2eebe0c9892082b900af2bd1511264ed5fd5d47864ca5a8fc3e6c0a05de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-GB/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-GB/firefox-90.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "13343f3cb63be5c02ee7c8d6883ff473681bff8f55377f74095768c87109f620";
+      sha256 = "2d888fdd72a65137790b10f02056d6194fd9c374cc6ff09cf7217cfbb84e2d7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-US/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-US/firefox-90.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "29fd51b6316d1e589220c2f47e5ff7cdd996cddd450f64ce1dd28ed0e8e4e8fa";
+      sha256 = "998607f028043b3780f296eee03027279ef059acab5b50f9754df2bd69ca42b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/eo/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/eo/firefox-90.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "41c9ed4d9da13fa798e6d75e67b854b84fa0bb76a0771d387a1cf3261838408d";
+      sha256 = "3fee8ee742d6ebc03a6fd66404979b7e2fc823757801ac205ca291c249f7b31c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-AR/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-AR/firefox-90.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "8b5c954f4942834a93424b2af17e01f1bcea3d07e1ac404cb205b7b53094088c";
+      sha256 = "854cf81090ccdb2f8d4ccf0729c7228c2945626a56d1cfee524f927c5bb67c47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-CL/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-CL/firefox-90.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "cdd4eefae21d33263feb67f020e727e4f9d569a49a0311483f24837a19a88c49";
+      sha256 = "c0b92a9e2defa74171c880be9ed84f12ab946d4d9af888d7d9ed735114968fb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-ES/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-ES/firefox-90.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "7cc98380be959aa6375b05b7861e0bd29ab0c2f87824fe0a7a4d0655fb2daf6f";
+      sha256 = "a2fcc7126f6c5b6edf162357ddf7493df2873ecbe36d74a176c3924b877c4448";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-MX/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-MX/firefox-90.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "52ab52d3c2d92cb7919b1505f1a72a2a066629f1adb45600c08b5f1a7df7b714";
+      sha256 = "fd27c822086cfdd3636d1edd0afb62be22546d2dcb86d968ef4e1875acbb66fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/et/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/et/firefox-90.0.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "aacc5ae2e7750d917e117349183afe8f166f4f51ff7c442f205e119c60faec7d";
+      sha256 = "13f34d32f05de7d77d4ffed59a00d539cc819edb3ad9ab52d1a77d9f92a05264";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/eu/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/eu/firefox-90.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "c6c9276e9e4ac8f34005f6cc6c6fc8d1ec06a25665d9564e864fd77faf0cf777";
+      sha256 = "b53133754eadfd473a68b0647bbf3ada70ad46cd0820ffc94b96ca0bd259db62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fa/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fa/firefox-90.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "a1253cf75cbb09b9aed574464285360c6f4bae185ca2ec0e4ee28ecbe2582c19";
+      sha256 = "048ab2377915cf7efd4daab495873f9c1282f74907bedc22093b0cf17cc3b301";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ff/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ff/firefox-90.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "e7a13e96f1f231053de8599d1a1b75ffe0d10a2303938ffb74b5bf0ad954da41";
+      sha256 = "99de5853888020d6435e8a369eb8b983fe4374e754451dabc2785b9ab2d5bb24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fi/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fi/firefox-90.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "0e7651b6c88fe0308490d716193a16ed6fcfead4f490f299047604c49662a56b";
+      sha256 = "03513b1d725a6f5ffa243fe38e19a66c2850d849c09d7b80c3ba17fcb3012b17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fr/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fr/firefox-90.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "72b35bd4c84d3ea42c40873500177c0cbde37e5ebcbc49c2dc2c5f436d261a15";
+      sha256 = "350c5ded72a988773acdb3411f0d9d1ecfdd79501cbc04a9ed8777ada8248ae5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fy-NL/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fy-NL/firefox-90.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "62aa9cb69604233483bd7d510980f4b6a1c96874e98effa9d4179b150f4118a1";
+      sha256 = "026a5a3e8140110c830c237b1dee5857d07c9eacd1e803d0f5b054afd0d5d06b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ga-IE/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ga-IE/firefox-90.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "159dabccaab426c9aade1379be14874b04ee099752d38bbf0bca5db6b82dc4b1";
+      sha256 = "1b522979314c1c672c30da02ea7d38f94ea811df91d86b8327836937069ed956";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gd/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gd/firefox-90.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "26b2deeeabf6fb49cd87c138a7c5a1142358db743f2a55468374ad63ff7f60f7";
+      sha256 = "d6830e901c20477dd4121cd3a0f918634bc3107d799eaf4439b9ba036acd88d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gl/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gl/firefox-90.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "31cd8e5029cbad931492ab3dcc0abf9b194e08292f4ab7876ebf662ab707bea7";
+      sha256 = "f25adcd9c7c027a7e531a9072201f174cb69e30c30dffabfff4d0d8e12250f68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gn/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gn/firefox-90.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "ccdd7ad239105e642a721a44737165bb075f1e6db74733fc2f5b30c863b8222e";
+      sha256 = "a0df03aa486320a1fbb554a5be600067d2447af0a63726290f2c7d599c9a9534";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gu-IN/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gu-IN/firefox-90.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "a25562ca23e69f03f2d6d106afefcf11c5770820aed885a8efbcef001c256fe0";
+      sha256 = "daf1ba05f971b8b8f04da9085eefb03ad15fa5bf6d637ad1bcedb94665bb150d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/he/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/he/firefox-90.0.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "e28b51837f7a9c8b8ac4a62bc5b7ac6c834696c8c41c7609b77c9d2807bb05b0";
+      sha256 = "cedcbd2e76bf371ed8daefd100631e0381470b3980946e033b39a2b94035a55c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hi-IN/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hi-IN/firefox-90.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "8e6a5104be7e05a58e01acae446294d7459289871213e62e26d59076619f674a";
+      sha256 = "d0d6ba66c59fed2c33d9e21c9015b40743ac7e4305b1055f39b909754af984bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hr/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hr/firefox-90.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "e2d7f357b9574e0892d3cb8672b43ac9532e59c32f9eba0e36bac32d65fb0c25";
+      sha256 = "11ba8ffdf88bbaec536e4a362dd40f2eb535edb652fb01587ed46ba09fa7f17e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hsb/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hsb/firefox-90.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "9039cd192bb39e3b4a828fdea48630f8e113f54db87644ecf2b3c84eb8201990";
+      sha256 = "d1e1fbba7748ffc2c0f92e4be4dbe346359bc145fa2dc063ed4660d14ffb0b1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hu/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hu/firefox-90.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "98550b7e259df01476dad15cfe8bb3ec055e1ff57041ae73d09156671dcfdf6f";
+      sha256 = "ba8d28151ddd5e02b530b653f5bf5de9dc97669355a8b6370e5067527f22bf34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hy-AM/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hy-AM/firefox-90.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "74d34585f9ff86fbd5bf68620964bdad82d7f5b5e0cf7087b12cba3fcc795271";
+      sha256 = "df7d7543013687f02a88f9e6d52d4bfbb46c6ce6646bfbbf86571d7473be2554";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ia/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ia/firefox-90.0.1.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "fa705d3b2c9dde9e0cd190e183219f879d72a57f7a1209a293a1bf74cc0a86d8";
+      sha256 = "1df0469ba5a368bf5ddd323e68ab458d29042b85e471bb7e20dfccefdf086ba9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/id/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/id/firefox-90.0.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "23bda2ac0b1026bd3443f89e78157cbe47807ae2e0316d68804fd734ed6e196c";
+      sha256 = "fee462d383763763a6034a452150166d507d424e303b114b68bb13b6779605d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/is/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/is/firefox-90.0.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "257dbec349ed5368a10463a1cf1e21d03c1eac1ed3b093a54b1f28e274ec575c";
+      sha256 = "86568d6afaed2043d916343c565689047246ff3dbab5e6d928e5a6722f8d093d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/it/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/it/firefox-90.0.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "ff19dbc318739dd11cab9424b5058a6ca8396d6988723a4a3d8b72ef7095713d";
+      sha256 = "36e5dc00b8f9bc3fdc91441c0939eae5d43356ef0268c2bebea1d087f5d414e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ja/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ja/firefox-90.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "3c3003bf0366ccfe5b6e964720411e06d5622fb5e76ab7f0b2f1d06bb92c8e44";
+      sha256 = "b07f66b82be0f6f716384c37286205be455c83d8c9299456376d171167269903";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ka/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ka/firefox-90.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "70b53851ec2b8e512fbafee0d87b0dd32123019c1ed798f4b03b08fed790af68";
+      sha256 = "5b391f01586ca70900ce279de8f3e22c670de5b210f350bc8bf82c75dd47e0ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kab/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kab/firefox-90.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "175f112e07f75bda7e42291779655a18601f50c81c84d529874baf3aa1c5bd35";
+      sha256 = "a833e4c862c8805d4a1571b210de928f5d4fd6e7973d1de5e7ac1e8e3877b722";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kk/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kk/firefox-90.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "7aa1edddf9f1d55aa307f8954b0a4043fa8f27243331d97ffb21ccbab4439a3e";
+      sha256 = "5041bbd4acba0a2710e705798c8196605c62852de8a1c43f3676631dba5369a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/km/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/km/firefox-90.0.1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "45d013eb6a15558722b9633bbcfbe38c74f20964db716797b4c5358a31596b55";
+      sha256 = "f71888db4e4cc49172d625cca26b5b72c6d85180894f29ee0b934781f0f6efff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kn/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kn/firefox-90.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "19f7cf799760e51d852981d1217f3303f347631bdc484d44293a85fbe16a2752";
+      sha256 = "7d32dee56e657d791eb80e6829ad2ff3624d949531bff1366b685924564d6534";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ko/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ko/firefox-90.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "c2a1aca33c678e225cc66f1f363f666313d41de5629575bccc3244b2246a517a";
+      sha256 = "f9f0781ca8eeb1b21060a3cc2df8f8f5fecd659a230fa4f5f2907db5c37fe6c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lij/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lij/firefox-90.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "6645b96ea75cf11afa03d7830fcaeb3cf40ae62a34cd780d703632b04c1c70db";
+      sha256 = "0cff9a886e2d158ff00638200106d6537a254cc5a64e48a8233770e5798c1ca5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lt/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lt/firefox-90.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "c4c9b1c346a2e18d813302094c5048b758db64effd0276fb453d77f76a3795c6";
+      sha256 = "69c8e5a6f5c3d2435ed6dd02bc1c4b9264b1543b7763ade3accf4f30eea7b9e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lv/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lv/firefox-90.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "3cd2b96471ce03fcc7ce0217ae68534d0f891cbb21c7c325ff37f02e8a96f310";
+      sha256 = "55b59adc86e9e91f5a134bb16837c8843449f4dfc85abbb3f292bb34214bbca0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/mk/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/mk/firefox-90.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "95de1a0db3f284e23741f39c9de13acdb2cc8aa3046387f2c923b2fb41ea9e85";
+      sha256 = "d670166e34e513ff4dac69740f547542e4e2c3e24f7ae7d165dbe5a4151f17e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/mr/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/mr/firefox-90.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "6336fa56e8eaefc5f30934cb1232bc9b4c5a4a1070612026fd4eaaf79a763af2";
+      sha256 = "9cd258a90e1a12a113e626bbaa4d557936b29b71491138e73f74ebf6645a9b76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ms/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ms/firefox-90.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "1efd8100aa12bc3b2c304837b16638bd23fcc1bebbd1b7cdaf8f07bb642eba09";
+      sha256 = "0b68ba835ae0f3561eaa2721de08bab95946c1e1111b05f8b02cb7f95bc23335";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/my/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/my/firefox-90.0.1.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "4b9dcf5f8d476ff931a497acfb42747b3b788a031d156b1444126fcece789d68";
+      sha256 = "071df9d8ee0a5d1e3b3ae8f472173b5da378b6b41646a3d1d2222a3dbc73596a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nb-NO/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nb-NO/firefox-90.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "81c5973aa829b52c2ebb3ebe35a355bd65c5e803dd5b02fbfcdb58cad56d768a";
+      sha256 = "2623cb59780a1db3cc20267023c93f578ad4c6cfede8b12416f538d62ffa930c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ne-NP/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ne-NP/firefox-90.0.1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "ca1823de015e593f89a78a578fbf136748ae9e56eeb819773c32fc4d21169398";
+      sha256 = "a6c6c514cf476bd93d64c1e315161d765792528a632aa881a75abb85076ac998";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nl/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nl/firefox-90.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "253e19bbca6cdae42673b2f102bf930531a72a6d67ef3c0a93e2c415fefa18e3";
+      sha256 = "60d7de62f35cadc8bab987bf81fe6d8635388b361f3157e5d13809604cc41927";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nn-NO/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nn-NO/firefox-90.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "248d44236b2111f0aa8b49ac97e17353740f983448dc0b5085efca9ca1401ed8";
+      sha256 = "a1b0cebb8de16685011e5cded38add6a3b13738163dbcf6216182b350c293f27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/oc/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/oc/firefox-90.0.1.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "85414645c073035536a940f2e2daff958d25213aae01dd5a8617019f5315b9e7";
+      sha256 = "f4f491e962ec713e708e9f773de3af9f6251ab6f2f41f516116f83a63824928a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pa-IN/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pa-IN/firefox-90.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "9ce28522a04464bec876d301380f991e3543e2eb9fabe294066e23ee1a1ffa87";
+      sha256 = "5a41333ed465121d212ddc6c61faf2a5c4eab25daf0ec3206196077f490a18e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pl/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pl/firefox-90.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "6a05196e0b881ca19ed405cd42d3dd377a22e0cc7788971ca3fb3ddb6da5c73d";
+      sha256 = "de5d8c3e5b8f458c400a98c1b72595ff951a54083ff29e1bf01fc3421443cbd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pt-BR/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pt-BR/firefox-90.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "e15e7fee01afbd4b585aa74b5de4efbbd2e30cc4e9e87911c4707760c6a8d198";
+      sha256 = "53fb72801cc33ded2e31142161faaca04ec5f7742413faeada30e1c5ef51025b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pt-PT/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pt-PT/firefox-90.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "f76da7fb580424c0d1326f2daf40ba4f27083447bd7051fc77e6162caadd5292";
+      sha256 = "2c72ac24a7cbdb79b338ad9a79f649be85caa0377b78fabcf07c42b1ef02a94e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/rm/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/rm/firefox-90.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "55b0aa8f6dc462190a01f3385ff36cc813fcbd071d0e024c388efd3f247b22f0";
+      sha256 = "bfd252411406e6a8816ef000fc6fcff6357741924754daf05ee39ff331bdf3e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ro/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ro/firefox-90.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "4d245e0e633e741bf0438603fd0ac76030878bccf69cc28509c018514fbc55be";
+      sha256 = "f4c9a173ab7e9fc964f4c255ef9830559fc835d1f18ac388de5fa16d2df5d521";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ru/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ru/firefox-90.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "5687877a5e8dd4c5eb9dcfbde681f1d6fd9997b562d44592956ecc86024c8806";
+      sha256 = "07d1c8cd10323f039a040295230f223e9e6b40860830b2e26a0ab9fd2c15d0a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/si/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/si/firefox-90.0.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "4843700d73e84099cbbca968d2d251fbfd012d3230735c22f8dd8e39edb57ed6";
+      sha256 = "6f816e89adaabb79ff1b73eed516e6c5f817d7af0ccaee58262ea47c80a08664";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sk/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sk/firefox-90.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "26bf6c61cf9388f3c0f83362a3f6e744cde8aef12bf48de4e5da0debdd232a4d";
+      sha256 = "14fbd3f2057da82c95e2cd194021adc3c7c19b0f64cd56e623ae2341b7414301";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sl/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sl/firefox-90.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "65578af61cfde136408690f38867b141d48205514398af1b7f2771f6c219c513";
+      sha256 = "388ef17576722a32d22350ac2848c8e7f0239481f1d0172441770052bf1c53d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/son/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/son/firefox-90.0.1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "69d59e4ef8dbaabdf86acd7fe413b0fc3532b13cffd67cb0d122c08e72f234b9";
+      sha256 = "f7785fc5a91c991c277b36eca1928c350953043e77cdb4b47f25d5f2f611828d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sq/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sq/firefox-90.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "d8bc0fab11d1d3641159dcbe0248d1987e6d5a25cb45acde769c3c4632f6364f";
+      sha256 = "cc0f348c99304e0da47bbc4be45bc350c53574ea1e20d781f88862e5add4c60a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sr/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sr/firefox-90.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "7ea2ff12e6df802e98cef89aede582e3c6ee800e51c4d5cd6a9ba6a7aba0e4a6";
+      sha256 = "6824091ffb721ff42072798cd72c3061921eb69f85a710c141407f83ddddd836";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sv-SE/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sv-SE/firefox-90.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "e4924167458d6b1251956de695c610bf311047a2b3cce4cffc3b09bb026c07c0";
+      sha256 = "3d86180707aa4f2fbe271e9d8fdf10ef5cd52126648a64e684214f159cbc7512";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/szl/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/szl/firefox-90.0.1.tar.bz2";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "4904579fff0628ba012f269c9be0123f06fe8d414066fa3f52fd28832d6f004e";
+      sha256 = "e49776c7820b51648c8e2d19f5e8073515fda5397adae3302383e9f503240e08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ta/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ta/firefox-90.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "9611d0624ea57ead7eb9b889faac6a166a1581c64e0fcf8d89e1ff3c6f43c963";
+      sha256 = "d8b32890c9ad376cd9122ae6e80d1dc65c0b8be1e5dd4c7381011b1059dd8bbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/te/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/te/firefox-90.0.1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "d06b945ee1646a37f347f438dcc5cfc2ca34e520fda7e5119d076a35a1636537";
+      sha256 = "87974e3cf5214db7f82244b43a584f3cb11d4ba66ac45dfce1d22f417fd63185";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/th/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/th/firefox-90.0.1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "4e0f715b9df45ed6e5c469d31e886184ab3712d65ed9b5f09f930de55bac7cae";
+      sha256 = "1d65c868936bd174ae9ecac66e1c1bc30e4b1214aaa0a2762dfcda6929eed1ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/tl/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/tl/firefox-90.0.1.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "ffb9acf1bdc1470c5d077707a38b8b754b638297bdcae51ecd985faed50d0c51";
+      sha256 = "115ecf4d90d13df1352637c9ed6d1701b6a9d0793d3487d582b90d487e27b52f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/tr/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/tr/firefox-90.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "58a4e1b95887aef20744113cc712961cd331afe7b32c9fce9ae95cd10036a075";
+      sha256 = "d66f4114e577e945abbb1b32206b2cddff65db1f9a2b1cbd1c8a11e528ce656f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/trs/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/trs/firefox-90.0.1.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "f517e93f9819e008f224078af54c6b080e5022cdfb84ae13e16a65368cf3c971";
+      sha256 = "1dc6d43229d0912d34394889deba3d91796ac4aac437b7ed86065d978871fbec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/uk/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/uk/firefox-90.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "e6f29d8f6e7c92b5c911444c869173a8991bbab60e13c2279c1bb8139bf7d3ee";
+      sha256 = "1795fbe577dee1bc042a7b50bceb958446e7f6c95133c2d1432f1494ba86b6a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ur/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ur/firefox-90.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "bcc00d70f7ab06bd024053d5f66d6363f8aaaea65be089bcad99fb0dad2d978c";
+      sha256 = "1da88a58d6262c4b2866e765efae0ccc23ff224ed59d5f9a30434a16408b17d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/uz/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/uz/firefox-90.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "62d8ff68b7c144610c05300fcc8072b832c5ca3ea3b0da3f197f04c1c352114b";
+      sha256 = "549956dc6ac0eab50becf7562e91a17fdc3f0244197379f03bbdb2b12f2ecaef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/vi/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/vi/firefox-90.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "152b2c3e4b66d5056cf02d6a0d88968da0d2d0d7983ba4a90b17937c752dbc68";
+      sha256 = "3e9575342f30b81bebc730c855b54120c95e385edf9273e5355f857da81d55ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xh/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xh/firefox-90.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "bbd12d232fd53c2ca879b55f19abce804ad14da4c47ee11c2723f37f166d69fb";
+      sha256 = "d2e7dd3cbd70ef34c53bcfc5b3427508ed368cad548afe0509ff7149a6472ff8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/zh-CN/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/zh-CN/firefox-90.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "44f71d53e7055b19617b66985f583b44b3d8aa6b63621a8ce34cb2f33e2c35fe";
+      sha256 = "a65f4a1002422a07083fb8566e3129f781a8083d9427ba4236812204c953a5f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/zh-TW/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/zh-TW/firefox-90.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "23a5054f37211f0b4637baa7b17c0b41cbf16f8c30cbb7c00d486698a98150e9";
+      sha256 = "e5f1c0d36c7a4b3634858d691c5f26481018ac4ce7c5ab7a4c19e04b33810941";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ach/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ach/firefox-90.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "985bb9b46a2767f00704f7dbf43ffdf650fa70da1b5c82b66bae9b3ed8e53ec9";
+      sha256 = "b5908565dea1f33f82d8e380bb5d648fab9ebcb4af24d602a6c71e176fee5007";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/af/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/af/firefox-90.0.1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "2b9ac10fca0815b755c89eeaaec3db597bd7eb56294452c715615bcd9edb685b";
+      sha256 = "d40bd877e5ad156a45c0c325794537ef9dd71770a395aeebf8381075df0c74d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/an/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/an/firefox-90.0.1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "cd6aa9c8b5e384c36f35c4620954fc29facc9e82600f1fe759bcf239bacd5cb6";
+      sha256 = "c72b84b92239955c750cdc302cfed32c7ed1a1352a88b5f599b4edfaad79fdf6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ar/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ar/firefox-90.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "c6a75b71f6c24f05a92608401b70ce4b3e91f83f7511eeed0b7dfb91ce52ab22";
+      sha256 = "25b4175421efe766e7be49591c04b636699bc685aee6459c48b19fe9aaca07db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ast/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ast/firefox-90.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "ffc9f0b54fb7df8398e5ccedd75902d4872b2b735d79189e2e00bc519b7914be";
+      sha256 = "d7919de20cf70de38f03e508b6ac5728b76ceedb626636cfed74c4698ce4dbc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/az/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/az/firefox-90.0.1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "3843e554e11c687e9d0676ed9ed06c11cc6eb571287430cbe8ab26b4c2553e63";
+      sha256 = "addbe7fa0121dc3643afde905bf33b764d36d49a60ccf6c427ab97ac941ce9f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/be/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/be/firefox-90.0.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "412e6a776fbf1cd698092bcaafe30a652a8ab35b72e3edf4cffd0b7438c091c7";
+      sha256 = "db52de7ce7236110b28322996303e2a07f69b88eb53393aa4ff75dd841b02aa3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bg/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bg/firefox-90.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "142d1db515272948aa7788403be55080471773d835476a532fd0e44f08a223c9";
+      sha256 = "2abe8c91ce73f350e31de13807fcdc48c2621a29fe25d17ed25a2fb8052ce831";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bn/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bn/firefox-90.0.1.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "75531cdc30d0c9173ab8d8113ceb9897373f7808e1019834545f0130ebbb8ee9";
+      sha256 = "2b5f6e1bd73eda0fdf69f6d8181b83206bfbcfcb5edb11be12f2a29e6ffd4a37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/br/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/br/firefox-90.0.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "20e76daf7a280c5d50c9a937e409f25aac7f0ee3254f9145605ee00d00316d5f";
+      sha256 = "53339a26816934aa1f5edac114844c42b7107326f114ba28818700ae8ee199ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bs/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bs/firefox-90.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "1bc0fd2a8ec265d59594bb298cdb51f5506b56e40e5dfc0fc66a37e3d4328e5f";
+      sha256 = "d49005f911a027a7628f45103ad2e43438a7ec33142f9a5ec7738a8694d071de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ca-valencia/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ca-valencia/firefox-90.0.1.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "dfffd0c2b98641944d74486de4d9f08c2e76b30506942021a5263d1238ab07db";
+      sha256 = "ccaa99d7eede57e43c57ab2a185a53061476cedb65f37d4659c1e765297c937a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ca/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ca/firefox-90.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "bcf3b78bcb2bd133ad66d551695d372d099d250e01d790f48bbd69b46c07abd4";
+      sha256 = "b4df85c3f723a3e8c44d249f12f37bd27eeade4ec802baccf2e82a92e9869002";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cak/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cak/firefox-90.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "e27cc065df6bc8ff338a34c97d9f6d4825d711b77bf24e5f1d16ca68dffd6f74";
+      sha256 = "a8e1244c9904e3f5bada11c33f2f542b6dbb5ccb867f7cc6d5a2d1a99e95c48d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cs/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cs/firefox-90.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "f25b02aecf709edfd75ceb2faa01979e99ea2a88e981c0d3fa5dc118eca77a5d";
+      sha256 = "b2cbe665a6b2482edbe29b50036922708e7bc7aaad65ef6d91b47beb4f53acbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cy/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cy/firefox-90.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "d9f09d6c812740f077234dcd5f7caee7be17569526b215d4ebb7d987b8915b47";
+      sha256 = "5e151c341812dcf8bdf769ba0a1ae9ec03b3e79d5f55fb18241ab0ef907538fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/da/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/da/firefox-90.0.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "604342f07532112ca7ad6c8a1d6194dc1487a3f0a05c9785f4d252d6359996c8";
+      sha256 = "ebcb60a77185d17114c26d58a61a3a3ef5198709c43133263efbe39c05275dcd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/de/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/de/firefox-90.0.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "c2383d7801ff0fd4a111c49d82d7b41f140f1974d20c8bcbfc745b76a78f24f4";
+      sha256 = "8819ad2efc7d49946eed2adbb10280602d0004722207cb46e06f46f4fb0f80d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/dsb/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/dsb/firefox-90.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "9972aef81947ebcd09349776a01f7335c41971ac72d2ed806cfd384831b35623";
+      sha256 = "c91e40aed7b1c1c41ebe0cdf77e46cb284d7cd308c6ae66a70f46fc4dab008a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/el/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/el/firefox-90.0.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "942285c706c4321dc6c4578e665edc76523e46f98aa89521f4276bdb2736f610";
+      sha256 = "f9032320f0fd0622c9e6ad048de12533e92660bf56e255d2f79fc0c2adc3356c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-CA/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-CA/firefox-90.0.1.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "71b236a224823a13ea1b0f144217a735e76c4d25b2725591a5aaea068d1a9808";
+      sha256 = "9224c71771b26085f067acd29993e48aea66a61c7ae193bb6442569b9291677a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-GB/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-GB/firefox-90.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "1c9f4c7b35faa87d7c1b046abd629e2d4305ff8769f986a4e1def8e381a0ca94";
+      sha256 = "fd27cadfa31f81d7103f867aea3efb6f03f341708c4ed93df5d6d8fba601c1eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-US/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-US/firefox-90.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "f983e7537f54131697366c0926b6aad8045c2f1e16c78a0d5edb392d214e535f";
+      sha256 = "1043cc2125aa682953340fb40b721b3dcffab1ad0c06184fc5a92740638d4a13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/eo/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/eo/firefox-90.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "90f713f53326849e1b41c7aad160eb5828e4a06f2e9f11918ba61b9ec4d29fef";
+      sha256 = "1dd42f52563463c146ddef224f97b6e87f82f01249f7bea290a4cb8331dc9fde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-AR/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-AR/firefox-90.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "e9abf48307351d5461086d34cd765dcd5af38eac50dbaf3833ddcdd5432908c8";
+      sha256 = "fae114afacd99e045abad6dd5a6d4ad5669b00158431ea8458d48e43aa06d4af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-CL/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-CL/firefox-90.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "04797e8c12c08eb25f8048f0a653380582cff4f193d03e8e6d3e0d66cf1e59ea";
+      sha256 = "1a4b839f8b55ef758c56ce18770cc31e871278e58f378fa7e7cbf4502e3b930c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-ES/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-ES/firefox-90.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "1f655463e919d3546a841e86e3aac0bb6b4bc3482153a24d6afaf4eb4f09db0d";
+      sha256 = "cc21e66b7c7250d57067c8fc133a8b6f4a4f4020474bb7d4510c94ca02c316c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-MX/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-MX/firefox-90.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "3e9b14809de0df3d1f5c0d7bb83f9a769fb5852194511b1cfc33275ca1bbed41";
+      sha256 = "cfd89dd866f633359c57af8915586abc7d3bedcf2523bf60f7878d70417c09db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/et/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/et/firefox-90.0.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "918f284c60618404b7f8130b7e14a57d4ca483adeb6007a79422e6fdb7908114";
+      sha256 = "6e678eeef5ebe30b6005533e69ebbc4f096e3a1e2fc07be8c8f1cf3d1b5c1b06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/eu/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/eu/firefox-90.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "5f682f553356652d92684dff3f8385d1d675539d6cb8b155f12874682c0de235";
+      sha256 = "4fcab02f0a755db4baadd5e04fe9589226b0082768ef58e32680a72a86ef52f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fa/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fa/firefox-90.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "5056f42eaef5f5538bfa9af23e123bf9f0a0d370d6fd7848dcdbc50d0cf61d92";
+      sha256 = "bd7500a850ae6c4ea9702521716336bd2809c8e3fc058ea021ee27a1b6d40aa7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ff/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ff/firefox-90.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "cf58279f578ef725e2b89ed4a89021a811b3e237d46d02c7d98137fef3775318";
+      sha256 = "76b4327258aedc72fcae8b56dc5dd0c99952f0a2021252c5d0e36d1366b68016";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fi/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fi/firefox-90.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "28bd2f67ae638fd602adac6327fe51ebf90ff52c8695e8c8ff4161d6bc20be2b";
+      sha256 = "4500cd834525149ad46b94a7b86ff776511f3173a48064ed88d6b2e67596dc68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fr/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fr/firefox-90.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "53b69cbc6cd3097b67537979637614a6bcc01450426883b7d35a8de5df6647ae";
+      sha256 = "85313248992ddcc04bc5b72802929a2c601daae07d5e6d8a11c762159caecf86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fy-NL/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fy-NL/firefox-90.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "8ee8e11a845a2e2b0f9d12d95f8dcc6b58be2722a68f1a8707b0c1f3a66f90d5";
+      sha256 = "ba0d003e88355027ccf1be545555e68e06a19e11b7090844707e0053796f2a1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ga-IE/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ga-IE/firefox-90.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "39a2bbb6c9a3b3a0ec2c21eeb9f919a54502f891834556ee439704af3705f3fa";
+      sha256 = "52f94cb53101e4d2564cb4f4589cb2246a4c78314e38e3d566290adf43f40e74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gd/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gd/firefox-90.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "b667e68662d81518f03ffa0bab538d4601457b6b1eab1f51dc0be3752855d5ad";
+      sha256 = "0998440173e3b5886ff3a356a79fd05e7ea113cab4582a9400abad44ecbf6c48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gl/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gl/firefox-90.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "65e9376490e6ee833312b99aa7d8f730495f8320e14203a8d6cc7a94e83e6adc";
+      sha256 = "6ab3ef1a97c8382160420f563c814f14610f1a0d4565ef8f86b8c8ddbf34e162";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gn/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gn/firefox-90.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "45f3da559b51c5ec300ac64f8d5f0e7583c55abfca4c22e72994f65682d0717e";
+      sha256 = "f57a5d2ed2b9eb8d35b9bbbb9f76a988409db09c7855d6cb93abf151f8e449c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gu-IN/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gu-IN/firefox-90.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "db1394cf1c52fc0eeab116d49fff3bbcef07f64870345490a1f46f3045268d94";
+      sha256 = "eb62873a8c7e2b5b706cd0033b5042a4f4496c265f7e57e1c65f23e3fc896a6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/he/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/he/firefox-90.0.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "52b49a0014fa2aad266f2503b6e455310d37af0d93102f22404b303de6afe772";
+      sha256 = "6c22304604f9e93153d55251e31bb250168015a4ac6c3d93cffcdd9c64ece7e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hi-IN/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hi-IN/firefox-90.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "59484d61d3d4802f9389d668f6125299ba072077a87a16d9b09f9780e975d120";
+      sha256 = "155f425d7d9b867acc7035d1220f60148fb94c25dd51ee7049e9c2e9b096a0fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hr/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hr/firefox-90.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "292ac6975f6319c0b4274fbe64bd9512a8361c254f82c079e8ac75c974839316";
+      sha256 = "96faca700f49d3f8d9337f0f4f820f8a5a6335b06348b835bd39a26619e4efdc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hsb/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hsb/firefox-90.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "81bcc94349b7b83533b5a60d3f8bcef9b3fd0d85628ce0f043013a4c7fe0aacd";
+      sha256 = "42ce59b460cf94705f88b80c91705bba81142798803bb1d7a3a0bc34dd96a7e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hu/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hu/firefox-90.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "1c5867bd108e9232472ccdec0bc24a6558d9a5a6d9147d0c44a4fba2c44ae01a";
+      sha256 = "804db507b43af04716bbb4d53525aa9b2958b1d3ff08b93812f1d78531eb01da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hy-AM/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hy-AM/firefox-90.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "de35f4653730d253e5bf147e65ec1f8680ef1fda008f785eb3e49831a00d8b4d";
+      sha256 = "488e6bdd3d36490a33d5794f5ede500bad29cd2014cdd50ab5edf74c829fd424";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ia/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ia/firefox-90.0.1.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "5ea51c02e6f41291da5840d511bf4ad743e475d6d35fbbfa76c4df3e8f45fb50";
+      sha256 = "fd3f22e1247b394b654c12aed384c515a390e91651bcc66f3823205c67951287";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/id/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/id/firefox-90.0.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "b9ebc450eb9097902f13c7c30e45a361ade71b99b273d0da898301d3e9bdae36";
+      sha256 = "2a197f4f2aa069b888ad9bfaa54da1b3bc461309a2f0475c298b7e501f06e6fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/is/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/is/firefox-90.0.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "64f7480703eb13e9ba4f12615bd84dead1322d139af1115813b7ab8e6819190d";
+      sha256 = "b215c19156d129ef30c2d5b30d723d3923e57658888736bd31d3c7fd4a30f835";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/it/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/it/firefox-90.0.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "3f314ed7442d57345d6d1b368dd55bb9e2dd966e269e56d5ea2abfd9140aca67";
+      sha256 = "f94a4ddd3278993c80e776849cd52721f40a2808a41f37c74f34ef4b7deea972";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ja/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ja/firefox-90.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "7cbd06ee69dec66522d35163427f8034bd3ee928aa6bd3c5203f3c9a5e526018";
+      sha256 = "4b22759406f177c98ee2496ff17de565f87a0f566e3759ce030fd757c1555e32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ka/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ka/firefox-90.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "81575f637a65d1d31503967b380b3337a8af532d5ebd3bc7d35026c37831d50e";
+      sha256 = "7e602c099b680f1da42030067988f818e954ec4b02ddc6ec5473e02402a06428";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kab/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kab/firefox-90.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "bb84536e819cd77b4d45786982384821b7d08dda48fc8fa3f0e12e90e75a688e";
+      sha256 = "92d0441b33b179d515c88711bb13684e37c748a938d818723256092930428dea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kk/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kk/firefox-90.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "ced99ad16e7b84fd1c344ff2ad96715e0654ed6cfa0cf6379179bdabf5cb0443";
+      sha256 = "50a44e34e2a12ba6357f62bc82d9de9c5250c6e3b5635c81724d0a96f5111436";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/km/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/km/firefox-90.0.1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "f2641008a2bfd95467b274419d4305014b8b3e5c75622d30a46c5eb9ad761990";
+      sha256 = "de8bddaf5a937bfc5bc21897cf95b3d40068133df4c9edfe7eb9eaf76d23e17f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kn/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kn/firefox-90.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "5bcda92360ae86a1ed015736847e7d43eac239a6bd995fc932259f169a7f3821";
+      sha256 = "86e88fbc62e131f6b6a599575f5c507385251e7d03a114b61e8c1b78c4a8c22f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ko/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ko/firefox-90.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "5be9eaa06a7e35b1d401643601ac7e212489609c52961303cb8fe054bf698190";
+      sha256 = "10e0169e337cbef4a33e227ea57ff517ec570997fc471509ff95f098cfb52b12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lij/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lij/firefox-90.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "01baf23ab6d89adb3eed47b9f216a0b17b8bc8850b10d09c2bef10792fb1d76a";
+      sha256 = "3e054180575b29c5afb286f6d7e8453bc8d4bfaf1ff5d8ac5fc53757b9dc48f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lt/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lt/firefox-90.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "a5f8a4fa438fe054d1e8d09ced0079673bc25431aa9cbc6b36ca2e5a1dc58d72";
+      sha256 = "79685f8b0d646dc6fb446a85808e22107760343a63be429551866a22581106da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lv/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lv/firefox-90.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "8ed19c630ad2cabdd374d2499ddda0ab8993a79c50e7e6728081a6842d1f68d2";
+      sha256 = "4df1044be63e35775c89005cddba209760b169be29a3e49d3d29bc370b11dacc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/mk/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/mk/firefox-90.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "cb497f4b8f1766afdeed4e351a597bd1da4376c78cdb4172d4815c055583ef4c";
+      sha256 = "8040fd3637b5e25215e1e50cb74b6f25736f78d610cc862eef08b5a7e4905f2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/mr/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/mr/firefox-90.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "0e03049ef7efb5c78963b4f718a61469cb6b1931313ffb50d3e4484b6cf14837";
+      sha256 = "49b9eddd2dff87a631ad143e66019d52574ea16b136956e4da473fcee4b810ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ms/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ms/firefox-90.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "1a92300fdd218d1fff96388794cea650371c0b1da72b20b22d6deaef7a794c24";
+      sha256 = "629d480a6cc207b558cc2aff169225ec636c3d5656b0d04d34b60f8235151bc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/my/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/my/firefox-90.0.1.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "066061e09aace32d8a7a67499a75aeb143ef1e474e8ce37131e6c37472704169";
+      sha256 = "25b330fa564734cd9ead80a58a770a6453d64483cd448dc8ac93e70a2a06a04b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nb-NO/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nb-NO/firefox-90.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "12771de667402fc8d8d782ad1b799cc20974f2ee6dba8db87b39f319e6752dc1";
+      sha256 = "4d2a0b7101197a603c136b7476e6887d6d9731bbb62e5176ad9876039cc7e166";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ne-NP/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ne-NP/firefox-90.0.1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "d2d8610eb11fe1aeb948a2ad2b580a396450c92458a9b4cf6cc2b3b051e6b7c1";
+      sha256 = "74c9685da27d362a2729303ddf451f684be097d3ca74bf3596585a869921a881";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nl/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nl/firefox-90.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "99c76cd723c19c6a2192de4f588557060284185047e4597c067e35ba623f01f4";
+      sha256 = "a10dc5b62f058d71b3dbd8cb12083fc583528b1642d4f2bccce0f1a422147c7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nn-NO/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nn-NO/firefox-90.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "5e25d25ae36bbe8346aab027ad684fee3766a1b79c9bf86a370b91e36ab417b9";
+      sha256 = "479c022dbadf9b10b2c37577199c3f4df714501502bc894c63efde9358b59745";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/oc/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/oc/firefox-90.0.1.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "462c07c7a8864711c0309fa0847bbb993eee518508dbb5614571f994f2241099";
+      sha256 = "3b702fcd7972cc48151498783e8d0129766fa7adef311369acdba7902bd08f19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pa-IN/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pa-IN/firefox-90.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "d1b1f53ed3aa7bd139541e249f29e6672c30d5f88eb980be793b6c6622338eb0";
+      sha256 = "69727d81e5dd911bfa426f3f66385caed061e3b22825eeea270925e6d7997a03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pl/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pl/firefox-90.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "b63144adb425b8477f3b8c9026ea3a1168fb3af513d25d5594b810a0aa4be831";
+      sha256 = "29d59a753381aed8fd4838cf6da0a43389b1dd408988ffd4e97ec3262c1ec75a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pt-BR/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pt-BR/firefox-90.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "218108b556c88c9d4ce6f0cc37b3b45dd5b03e7beb591ba0c52aa257d17c54db";
+      sha256 = "6ca5bf042fc2a94dd229303cec352ec797e8494ca58b12a337997b8289dff78a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pt-PT/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pt-PT/firefox-90.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "96600b7012300cfea1ede41e2c3ac9756cac3981691908e8b2e7c2624eca2d9d";
+      sha256 = "50e682cf9bff2b4202ee4c9e64d5efcca66acbcb74d4074ae5d571875cd0f509";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/rm/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/rm/firefox-90.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "93bf70fc04f53f779335db31a264a0298188459aa3687d15c7b890199dfd76fc";
+      sha256 = "983c8fb011f348b6de1665b1347cdbda23fe130ea33c7c58a49cd417d0419cff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ro/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ro/firefox-90.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "bd38c728d06513f3b8fc0ebcfadce3e3029a5779f0c745085d52d823075f0266";
+      sha256 = "1f2ff5fe5d65f5f143e89e258a247291d10c25ee2270607250817187353bafa7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ru/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ru/firefox-90.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "abc35efade33dc03e6a4ce093d5995e79daea3383c8a4a4b63d83f8336ecfad1";
+      sha256 = "3a2f872bcdd7736c1e528d306cb9409826c4958d1e8aea627ef0e2c26b7d8889";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/si/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/si/firefox-90.0.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "201dd56f43db3862243b41fc5b41eefba737d91a05826d50e922f206bd6f6906";
+      sha256 = "cfb67ee121130d9ea92af43e33751c31f778f9ff6f9beca2dc609ef5340f09b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sk/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sk/firefox-90.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "fa5b0d2d00c146ffc0fafb760e870db3133d9b387d383f34099e7e5446986169";
+      sha256 = "c045f5c48e3f3f9b20229e744b85920e47e3858f97262ab4d3a8fd61db80da40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sl/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sl/firefox-90.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "84900580af3f7b7b10481f6acd42bcf30b98ffa5af3b80cc020f4217a150252a";
+      sha256 = "ae3bf5e327c4f4fb7a36b8367539de466acf8f60f40e9deee3bd4928959f0111";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/son/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/son/firefox-90.0.1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "122f4a2f50a5bf38e59fd7ea1fc5eaefa8f4dd55a603220a272a32252d6b7c80";
+      sha256 = "a7d7f7d1ffdc9126f04f8f96001bce26d21de0e0c65dd1fd00f6f85f75976ba8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sq/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sq/firefox-90.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "b829a9b18ca57b53b029841812ce6bd4400f3df60d71980258b9a8e7f5b4c33b";
+      sha256 = "2982b315ab29ab375d77b1093c53a4a207f36a2d9a40b34aed3376ce96ce5dbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sr/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sr/firefox-90.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "523bc6ed11bd320067361f8be81b0c0793618e376be9a8ef1a7a513b544a279a";
+      sha256 = "0a2a702216adf7c98ddb19cebfea886b5d0582523ca64f2d7c8656ec663aaf6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sv-SE/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sv-SE/firefox-90.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "8c8a7f21fedf76d294a1521f4c786c944498e98567c969c9e1455f6b2a535022";
+      sha256 = "dded767dd98cc3725044c988354842086768bf9a35eb316111df96368a95900e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/szl/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/szl/firefox-90.0.1.tar.bz2";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "a1530e1ad9eef4cad401d0374db80593a3960feca67715d352aac51c66dc0415";
+      sha256 = "4ab8b5112cdfdc051a65b5cd562015bf85e11d5ccc0773111439cd469e175c33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ta/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ta/firefox-90.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "0d4da9f60ffaa360424e73120a782d0480d52227e8b110a1eafdaeb0e6f47092";
+      sha256 = "0240cb3f5357a213f622f1c708e2116db4a4271f4b36135d6614bacdee88f00c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/te/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/te/firefox-90.0.1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "fe7cfd5db5b98a9245fa30a8970a729497e563ddf5511609d7930537b5586f2b";
+      sha256 = "83b5ed844b16f6b9108432a692bc0895d733de03701ab800bb330d06796176bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/th/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/th/firefox-90.0.1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "1c1a643ea94193bbb063e35921db54bcb6b6333fa06b2de6b91c88ecb888e868";
+      sha256 = "faedac7df604ed9cd321a655d27ebf313c08b085c4eeecc310a94c3afd979b6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/tl/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/tl/firefox-90.0.1.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "89ec5b3f116c6e86bc8e003548c9be2772b7d46c86233b87e96b579d5d7d8851";
+      sha256 = "5abdce18c7b0e53f5efd00aa0381c6e90f669c51dcb4c021128a0e7a0a86223e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/tr/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/tr/firefox-90.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "03a367c5f7b52a8e8e863ea108485dafc0232e5dea5da538a3a632e8ae5de454";
+      sha256 = "92fd9bb4aef9b723b00cb84ffd253b81d5c86b2bfcefad93e948e443d871bd95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/trs/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/trs/firefox-90.0.1.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "85d3ba651e9f39a76f2ef1d92d6ce34ed792f6477848b7e75a806c699c72c3c6";
+      sha256 = "291c64e95d8accc64fd83738a9b7060122e713786cbb360acbd26b5ed0dc3793";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/uk/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/uk/firefox-90.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "90649b7b2cad702b53b7b63fea7e72e666bad605841887bb42d69d487a561678";
+      sha256 = "163de4dd52684912f794c1f9c35b003f9cd38acf1be3bc68f42b2da9c1e13fce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ur/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ur/firefox-90.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "9b9c80716edc99a3e0b7bec2da38a7391798d401734fce4d1bee60f0c71a18ea";
+      sha256 = "72ebffebcaf8848c5a9cfbc6c9e33cd1a7bfd62b7689f938065730249506a6eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/uz/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/uz/firefox-90.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "5b154b4f8c036ed7c62bf123e0802f2318cfede67bfafe9aa86cda7b2650a2b2";
+      sha256 = "f9c56e6adfa9a0e7289e2a80f88869ebb1556843c940574cfcba4295aac464c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/vi/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/vi/firefox-90.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "8c3b943e33a1f33086fcce734e183dcf96cd29be0daedc1b4a1f4cd068aaca8b";
+      sha256 = "f15136e2e432ae999df5efda82d44c2c61cd680995436cda094bd2fd705e541b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/xh/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/xh/firefox-90.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "c43f991777a8fbf8372f1928a465de170b25b07ede53dfb0adc83af18fd11e02";
+      sha256 = "360623cac6e11c9179f9c08f2f7f3eb844c3671b8f26a2680e097e1c84896b06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/zh-CN/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/zh-CN/firefox-90.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "1b8f9f96ee1d59b92b974f9f18639c7e38cd3124c5fb2f9ba7fd44ceb5c532a0";
+      sha256 = "f69c7f0fad2bbefbe477ed7ee5414dab2c9ab14e1009970eca07092357cfc7ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/zh-TW/firefox-90.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/zh-TW/firefox-90.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "7a6b520e84e7f5cbf372f1482e4b138a7bf785215776f193e49b30c3860e3625";
+      sha256 = "612abc1a9b8b116753ee1417d774fc2ea2f2f931248c57ea93c32ee1c534f9c0";
     }
     ];
 }

From 1ad4db95fbf0841806e488371f825ddd696d4bfa Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 19 Jul 2021 21:12:42 +0900
Subject: [PATCH 283/330] firefox: 90.0 -> 90.0.1

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 8799764fe216..091ca7b4485b 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,10 +7,10 @@ in
 rec {
   firefox = common rec {
     pname = "firefox";
-    ffversion = "90.0";
+    ffversion = "90.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "233ad59e4ab2f08d2253b49235b51b26fa32fb7c285928110573ccbe67c79965d9401a6c58a3af2ad22b8a58ca5d9b3154e3e8c9d29b153acd16152d9b75442c";
+      sha512 = "9f87c3f3dad33e42a7a9d2161d7f23ff2e7184b2274f9081511c7982957ae9954784bd844a2348ff4744231415aac195d1f12971392db90be0375b4738acb590";
     };
 
     meta = {

From fc125d06bc210c077169c8607d997e3f90853902 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 20 Jul 2021 14:46:26 +0200
Subject: [PATCH 284/330] taskwarrior: Remove space from URL

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

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index ee781c75e693..812c9b72f99e 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   srcs = [
     (fetchurl {
-      url = " https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/${sourceRoot}.tar.gz";
+      url = "https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/${sourceRoot}.tar.gz";
       sha256 = "0fwnxshhlha21hlgg5z1ad01w13zm1hlmncs274y5n8i15gdfhvj";
     })
     (fetchurl {

From 21b39527bfc5b718c798bb41df5b85b1f0de034c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 20 Jul 2021 14:48:00 +0200
Subject: [PATCH 285/330] warrant: Remove space from URL

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

diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix
index a4bbee43d012..8da1cf55b54a 100644
--- a/pkgs/development/python-modules/warrant/default.nix
+++ b/pkgs/development/python-modules/warrant/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage {
   patches = [
     (fetchpatch {
       name = "fix-pip10-compat.patch";
-      url = " https://github.com/capless/warrant/commit/ae17d17d9888b9218a8facf6f6ad0bf4adae9a12.patch";
+      url = "https://github.com/capless/warrant/commit/ae17d17d9888b9218a8facf6f6ad0bf4adae9a12.patch";
       sha256 = "1lvqi2qfa3kxdz05ab2lc7xnd3piyvvnz9kla2jl4pchi876z17c";
     })
   ];

From c48be3c17d2754d396790fb30405d625a562d1a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 20 Jul 2021 14:48:50 +0200
Subject: [PATCH 286/330] copy-tarballs.pl: Handle SRI hashes

This should fix

  Jul 20 07:16:12 bastion mirror-tarballs-start[21663]: Use of uninitialized value $algo in concatenation (.) or string at ./maintainers/scripts/copy-tarballs.pl line 80.
  Jul 20 07:16:12 bastion mirror-tarballs-start[21663]: Use of uninitialized value in subroutine entry at ./maintainers/scripts/copy-tarballs.pl line 185.
  Jul 20 07:16:13 bastion mirror-tarballs-start[21663]: error: unknown hash algorithm '' at ./maintainers/scripts/copy-tarballs.pl line 185.
---
 maintainers/scripts/copy-tarballs.pl | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl
index 59696a4432d8..6a08eb88bf84 100755
--- a/maintainers/scripts/copy-tarballs.pl
+++ b/maintainers/scripts/copy-tarballs.pl
@@ -165,6 +165,20 @@ elsif (defined $expr) {
         my $hash = $fetch->{hash};
         my $name = $fetch->{name};
 
+        if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) {
+            $algo = $1;
+            $hash = `nix hash to-base16 $hash` or die;
+            chomp $hash;
+        }
+
+        next unless $algo =~ /^[a-z0-9]+$/;
+
+        # Convert non-SRI base-64 to base-16.
+        if ($hash =~ /^[A-Za-z0-9+\/=]+$/) {
+            $hash = `nix hash to-base16 --type '$algo' $hash` or die;
+            chomp $hash;
+        }
+
         if (defined $ENV{DEBUG}) {
             print "$url $algo $hash\n";
             next;
@@ -184,7 +198,7 @@ elsif (defined $expr) {
 
         my $storePath = makeFixedOutputPath(0, $algo, $hash, $name);
 
-        print STDERR "mirroring $url ($storePath)...\n";
+        print STDERR "mirroring $url ($storePath, $algo, $hash)...\n";
 
         if ($dryRun) {
             $mirrored++;

From 105602b5aedb6d8e39aa427e43665f664093e2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Tue, 20 Jul 2021 15:21:34 +0200
Subject: [PATCH 287/330] roundcube: remove composer.json-dist to prevent
 roundcube from trying to update composer.json

this removes the warning

```
WARNING: unable to update composer.json!
```

since it might be confusing people, as nixOS already handles dependency updates
---
 pkgs/servers/roundcube/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index 75afedaa2ddc..0b0b5a0f8299 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     cp -r * $out/
     ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php
     rm -rf $out/installer
+    # shut up updater
+    rm $out/composer.json-dist
   '';
 
   passthru.withPlugins = f: buildEnv {

From 5143ab9f742d27086790e07ebf35f36cb6b26ade Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@web.de>
Date: Mon, 13 Apr 2020 05:56:20 +0200
Subject: [PATCH 288/330] tigervnc, tightvnc: add basic tests

Co-Authored-By: Ingo Blechschmidt <iblech@web.de>
---
 nixos/lib/test-driver/test-driver.py  |  4 +-
 nixos/tests/all-tests.nix             |  1 +
 nixos/tests/tigervnc.nix              | 53 +++++++++++++++++++++++++++
 pkgs/tools/admin/tigervnc/default.nix |  3 ++
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 nixos/tests/tigervnc.nix

diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 15eaba88476f..2a3e4d94b948 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -499,7 +499,7 @@ class Machine:
                 output += out
         return output
 
-    def wait_until_succeeds(self, command: str) -> str:
+    def wait_until_succeeds(self, command: str, timeout: int = 900) -> str:
         """Wait until a command returns success and return its output.
         Throws an exception on timeout.
         """
@@ -511,7 +511,7 @@ class Machine:
             return status == 0
 
         with self.nested("waiting for success: {}".format(command)):
-            retry(check_success)
+            retry(check_success, timeout)
             return output
 
     def wait_until_fails(self, command: str) -> str:
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 76e5077f42d5..6abbc92d6438 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -421,6 +421,7 @@ in
   taskserver = handleTest ./taskserver.nix {};
   telegraf = handleTest ./telegraf.nix {};
   tiddlywiki = handleTest ./tiddlywiki.nix {};
+  tigervnc = handleTest ./tigervnc.nix {};
   timezone = handleTest ./timezone.nix {};
   tinc = handleTest ./tinc {};
   tinydns = handleTest ./tinydns.nix {};
diff --git a/nixos/tests/tigervnc.nix b/nixos/tests/tigervnc.nix
new file mode 100644
index 000000000000..c0a52808b279
--- /dev/null
+++ b/nixos/tests/tigervnc.nix
@@ -0,0 +1,53 @@
+{ system ? builtins.currentSystem
+, config ? {}
+, pkgs ? import ../.. { inherit system config; }
+}:
+
+with import ../lib/testing-python.nix { inherit system pkgs; };
+makeTest {
+  name = "tigervnc";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ lheckemann ];
+  };
+
+  nodes = {
+    server = { pkgs, ...}: {
+      environment.systemPackages = with pkgs; [
+        tigervnc # for Xvnc
+        xorg.xwininfo
+        imagemagickBig # for display with working label: support
+      ];
+      networking.firewall.allowedTCPPorts = [ 5901 ];
+    };
+
+    client = { pkgs, ... }: {
+      imports = [ ./common/x11.nix ];
+      # for vncviewer
+      environment.systemPackages = [ pkgs.tigervnc ];
+    };
+  };
+
+  enableOCR = true;
+
+  testScript = ''
+    start_all()
+
+    for host in [server, client]:
+        host.succeed("echo foobar | vncpasswd -f > vncpasswd")
+
+    server.succeed("Xvnc -geometry 720x576 :1 -PasswordFile vncpasswd &")
+    server.wait_until_succeeds("nc -z localhost 5901", timeout=10)
+    server.succeed("DISPLAY=:1 xwininfo -root | grep 720x576")
+    server.execute("DISPLAY=:1 display -size 360x200 -font sans -gravity south label:'HELLO VNC WORLD' &")
+
+    client.wait_for_x()
+    client.execute("vncviewer server:1 -PasswordFile vncpasswd &")
+    client.wait_for_window(r"VNC")
+    client.screenshot("screenshot")
+    text = client.get_screen_text()
+    # Displayed text
+    assert 'HELLO VNC WORLD' in text
+    # Client window title
+    assert 'TigerVNC' in text
+  '';
+}
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 20d17b77741b..01579b059b08 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -7,6 +7,7 @@
 , gnutls, pam, nettle
 , xterm, openssh, perl
 , makeWrapper
+, nixosTests
 }:
 
 with lib;
@@ -98,6 +99,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs;
 
+  passthru.tests.tigervnc = nixosTests.vnc.testTigerVNC;
+
   meta = {
     homepage = "https://tigervnc.org/";
     license = lib.licenses.gpl2Plus;

From cfb935c54940115751270011a569ba3214984f5a Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 20 Jul 2021 15:21:49 +0200
Subject: [PATCH 289/330] tigervnc: remove fontDirectories

These aren't necessary for tigervnc to function, and introduce an
unfree dependency, so let's remove them.
---
 pkgs/tools/admin/tigervnc/default.nix | 8 --------
 pkgs/top-level/all-packages.nix       | 4 +---
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 01579b059b08..1ef584ec977f 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -1,7 +1,6 @@
 { lib, stdenv, fetchFromGitHub
 , xorg, xkeyboard_config, zlib
 , libjpeg_turbo, pixman, fltk
-, fontDirectories
 , cmake, gettext, libtool
 , libGLU
 , gnutls, pam, nettle
@@ -23,17 +22,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-IX39oEhTyk7NV+9dD9mFtes22fBdMTAVIv5XkqFK560=";
   };
 
-  inherit fontDirectories;
 
   postPatch = ''
     sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in
     fontPath=
-    for i in $fontDirectories; do
-      for j in $(find $i -name fonts.dir); do
-        addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j)
-      done
-    done
-    sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver/vncserver.in
     substituteInPlace vncviewer/vncviewer.cxx \
        --replace '"/usr/bin/ssh' '"${openssh}/bin/ssh'
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c3366e81d33..e2bd3bcb3210 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9878,9 +9878,7 @@ in
 
   tftp-hpa = callPackage ../tools/networking/tftp-hpa {};
 
-  tigervnc = callPackage ../tools/admin/tigervnc {
-    fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ];
-  };
+  tigervnc = callPackage ../tools/admin/tigervnc {};
 
   tightvnc = callPackage ../tools/admin/tightvnc {
     fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc

From dbbbb190b131b2f5f53c19a3f12287dc9a61918c Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Tue, 20 Jul 2021 15:39:15 +0200
Subject: [PATCH 290/330] palemoon: 29.2.1 -> 29.3.0

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

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 6afdf61886aa..2cd3ee11d277 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -52,14 +52,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "palemoon";
-  version = "29.2.1";
+  version = "29.3.0";
 
   src = fetchFromGitHub {
     githubBase = "repo.palemoon.org";
     owner = "MoonchildProductions";
     repo = "Pale-Moon";
     rev = "${version}_Release";
-    sha256 = "0djjl79jrnny16p32db5w7pwwv0a24dc8mg1s1bnavhlvmmk52vq";
+    sha256 = "1q0w1ffmdfk22df4p2ks4n55zmz44ir8fbcdn5a5h4ihy73nf6xp";
     fetchSubmodules = true;
   };
 

From d96748cf42cc9d4823af4ee7a9e58b1fba127371 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 14:35:45 +0000
Subject: [PATCH 291/330] pantheon.elementary-sound-theme: 1.0 -> 1.1.0

---
 .../pantheon/artwork/elementary-sound-theme/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
index a89ea19079ed..d273f03f4bda 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-sound-theme";
-  version = "1.0";
+  version = "1.1.0";
 
   repoName = "sound-theme";
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "sha256-v8ludbPCJaMHCxuzjZchTJwpGiF6UJlVMIMFg+lAhbU=";
+    sha256 = "sha256-fR6gtKx9J6o2R1vQZ5yx4kEX3Ak+q8I6hRVMZzyB2E8=";
   };
 
   nativeBuildInputs = [

From 0776027aadb05ca9a267c9791930dc94adf2da19 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 20 Jul 2021 15:43:15 +0100
Subject: [PATCH 292/330] nerdctl: 0.10.0 -> 0.11.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 418f3259178a..4909d734ff31 100644
--- a/pkgs/applications/networking/cluster/nerdctl/default.nix
+++ b/pkgs/applications/networking/cluster/nerdctl/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "nerdctl";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-cqIIpdkQ6DF7DKXvwCoJBQKG0+lL8iP/Vx0q7rL8prg=";
+    sha256 = "sha256-uYiGerxZb5GW1dOcflERF3wvgJ8VOtRmQkyzC/ztwjk=";
   };
 
-  vendorSha256 = "sha256-0+k1e7Sn+NYGAJDVUbUm0oedc1t2blezUhsjDIuIKvA=";
+  vendorSha256 = "sha256-kGSibuXutyOvDkmajIQ0AqrwR3VUiWoM1Y2zk3MwwyU=";
 
   nativeBuildInputs = [ makeWrapper installShellFiles ];
 

From 8ba51139bfb5a0889fdfc002269457e07bdf6109 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 16:54:52 +0200
Subject: [PATCH 293/330] ix: deprecate phases

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

diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix
index 83d8a7704192..95b53c3b6ccd 100644
--- a/pkgs/tools/misc/ix/default.nix
+++ b/pkgs/tools/misc/ix/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  phases = [ "installPhase" "fixupPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     install -Dm +x $src $out/bin/ix

From b214498527374eb7578625e63577ab36b04b3a2a Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 16:58:42 +0200
Subject: [PATCH 294/330] plowshare: deprecate phases

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

diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index 2cfbf5ae91ac..1d15db020407 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+  dontBuild = true;
 
   installPhase = ''
     make PREFIX="$out" install

From 1aa335e94232d6639ad137d26d0440db2934941c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 17:00:18 +0200
Subject: [PATCH 295/330] ponysay: remove phases

---
 pkgs/tools/misc/ponysay/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix
index 113c2b05ff59..08f0cf0ed62d 100644
--- a/pkgs/tools/misc/ponysay/default.nix
+++ b/pkgs/tools/misc/ponysay/default.nix
@@ -13,8 +13,6 @@ stdenv.mkDerivation {
 
   inherit python3;
 
-  phases = "unpackPhase installPhase fixupPhase";
-
   installPhase = ''
     find -type f -name "*.py" | xargs sed -i "s@/usr/bin/env python3@$python3/bin/python3@g"
     substituteInPlace setup.py --replace \

From 5070a55b5b072db7e8cad968de63842d2ed4bb5b Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 17:02:35 +0200
Subject: [PATCH 296/330] pws: deprecate phases

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

diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix
index e98323b75eea..1cfa64909f3a 100644
--- a/pkgs/tools/misc/pws/default.nix
+++ b/pkgs/tools/misc/pws/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  phases = ["installPhase"];
+  dontUnpack = true;
 
   installPhase = let
     env = bundlerEnv {

From e66237af154f63998eaf45233763b2e535b78b95 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 18 Jul 2021 12:19:31 +0200
Subject: [PATCH 297/330] nixStable: 2.3.12 -> 2.3.14

Changes: https://github.com/NixOS/nix/compare/2.3.12...2.3.14

Since this is a bugfix release that wasn't pushed to `nixpkgs`, I
decided to take care of it.

As it's usually done in `upload-release.pl`[1], I updated the
fallback-paths accordingly and used eval `1687468`[2] for this with Nix
2.3.14.

Also added a fallback-path for `aarch64-darwin` as Nix 2.3.14 seems to
support this now[3].

[1] https://github.com/NixOS/nix/blob/2.3-maintenance/maintainers/upload-release.pl
[2] https://hydra.nixos.org/eval/1687468
[3] https://github.com/NixOS/nix/commit/14262b86cc5825deae095c14553d623af498124c
---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 9 +++++----
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 801e28cec44a..e3576074a5b7 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,7 @@
 {
-  x86_64-linux = "/nix/store/d1ppfhjhdwcsb4npfzyifv5z8i00fzsk-nix-2.3.11";
-  i686-linux = "/nix/store/c6ikndcrzwpfn2sb5b9xb1f17p9b8iga-nix-2.3.11";
-  aarch64-linux = "/nix/store/fb0lfrn0m8s197d264jzd64vhz9c8zbx-nix-2.3.11";
-  x86_64-darwin = "/nix/store/qvb86ffv08q3r66qbd6nqifz425lyyhf-nix-2.3.11";
+  x86_64-linux = "/nix/store/qsgz2hhn6mzlzp53a7pwf9z2pq3l5z6h-nix-2.3.14";
+  i686-linux = "/nix/store/1yw40bj04lykisw2jilq06lir3k9ga4a-nix-2.3.14";
+  aarch64-linux = "/nix/store/32yzwmynmjxfrkb6y6l55liaqdrgkj4a-nix-2.3.14";
+  x86_64-darwin = "/nix/store/06j0vi2d13w4l0p3jsigq7lk4x6gkycj-nix-2.3.14";
+  aarch64-darwin = "/nix/store/77wi7vpbrghw5rgws25w30bwb8yggnk9-nix-2.3.14";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 6ba5135fdd6c..108f24ce5141 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -203,10 +203,10 @@ in rec {
 
   nixStable = callPackage common (rec {
     pname = "nix";
-    version = "2.3.12";
+    version = "2.3.14";
     src = fetchurl {
       url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz";
-      sha256 = "sha256-ITp9ScRhB5syNh5NAI0kjX9o400syTR/Oo/5Ap+a+10=";
+      sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk=";
     };
 
     inherit storeDir stateDir confDir boehmgc;

From a94dba429b5a824f7d5f33aa436315a147130bb2 Mon Sep 17 00:00:00 2001
From: D Anzorge <d.anzorge@gmail.com>
Date: Tue, 20 Jul 2021 17:16:39 +0200
Subject: [PATCH 298/330] maintainers: add DeeUnderscore

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 334ea7b72d72..6f4291941657 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2469,6 +2469,12 @@
     githubId = 452652;
     name = "Kosyrev Serge";
   };
+  DeeUnderscore = {
+    email = "d.anzorge@gmail.com";
+    github = "DeeUnderscore";
+    githubId = 156239;
+    name = "D Anzorge";
+  };
   delan = {
     name = "Delan Azabani";
     email = "delan@azabani.com";

From 87c2751d0b89d54c5e3d8b4b9d4f27323e20b038 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 17:20:44 +0200
Subject: [PATCH 299/330] libbass: fix sha256sum

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

diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index 49a3a5478cff..ab97090e8899 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -15,7 +15,7 @@ let
         x86_64-linux = "x64/libbass.so";
       };
       urlpath = "bass24-linux.zip";
-      sha256 = "1ycvpfa7yyi1qxgflpfzcw1q32f0isd14m9cf351pk8zwndkmp4q";
+      sha256 = "1lmysxfhy727zskavml3ibg5w876ir88923bm17c21s59w5lh7l8";
     };
 
     bass_fx = {

From 8adb7faf49d9c566da9172160f31fd7f1c8c21bb Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 20 Jul 2021 17:21:05 +0200
Subject: [PATCH 300/330] ultrastar-manager: deprecate phases

---
 pkgs/tools/misc/ultrastar-manager/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix
index f69955020c72..d5dd47e0f669 100644
--- a/pkgs/tools/misc/ultrastar-manager/default.nix
+++ b/pkgs/tools/misc/ultrastar-manager/default.nix
@@ -27,7 +27,8 @@ let
     in mkDerivation {
       name = "${src.name}-patched";
       inherit src;
-      phases = [ "unpackPhase" "patchPhase" ];
+
+      dontInstall = true;
 
       patchPhase = with lib; ''
         # we don’t want prebuild binaries checked into version control!

From 835dedfdbd175f343a1fac87101b9fbb2e435bab Mon Sep 17 00:00:00 2001
From: D Anzorge <d.anzorge@gmail.com>
Date: Tue, 20 Jul 2021 16:20:49 +0200
Subject: [PATCH 301/330] streamlink: 2.1.1 -> 2.2.0

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

diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index d7ade6899dc2..fde2833c98c3 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -7,13 +7,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "streamlink";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "streamlink";
     repo = "streamlink";
     rev = version;
-    sha256 = "14vqh4pck3q766qln7c57n9bz8zrlgfqrpkdn8x0ac9zhlhfn1zm";
+    sha256 = "1323v1pavmbb2vk3djdkxd8j6i3yrcgrkyl2d7xwkb7nwlla1x1v";
   };
 
   checkInputs = with python3.pkgs; [
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/streamlink/streamlink";
     description = "CLI for extracting streams from various websites to video player of your choosing";
     longDescription = ''
-      Streamlink is a CLI utility that pipes flash videos from online
+      Streamlink is a CLI utility that pipes videos from online
       streaming services to a variety of video players such as VLC, or
       alternatively, a browser.
 
@@ -51,6 +51,6 @@ python3.pkgs.buildPythonApplication rec {
     '';
     license = licenses.bsd2;
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ dezgeg zraexy ];
+    maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ];
   };
 }

From 8c9748cd5e1ba4a0536523532903b4ad4192fbdd Mon Sep 17 00:00:00 2001
From: TilCreator J <tilcreator@tc-j.de>
Date: Tue, 20 Jul 2021 17:25:02 +0200
Subject: [PATCH 302/330] llvmPackages_11.libclc: 2019-06-09 -> 11.0.1
 (#111065)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/libraries/libclc/default.nix | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
index 7be5f8b4000f..fdcc2ae0081b 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -1,35 +1,32 @@
-{ lib, stdenv, fetchFromGitHub, python3, llvmPackages }:
+{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages }:
 
 let
   llvm = llvmPackages.llvm;
-  clang = llvmPackages.clang;
   clang-unwrapped = llvmPackages.clang-unwrapped;
 in
 
-stdenv.mkDerivation {
-  name = "libclc-2019-06-09";
+stdenv.mkDerivation rec {
+  pname = "libclc";
+  version = "11.0.1";
 
   src = fetchFromGitHub {
-    owner = "llvm-mirror";
-    repo = "libclc";
-    rev = "9f6204ec04a8cadb6bef57caa71e3161c4f398f2";
-    sha256 = "03l9frx3iw3qdsb9rrscgzdwm6872gv6mkssvn027ndf9y321xk7";
+    owner = "llvm";
+    repo = "llvm-project";
+    rev = "llvmorg-${version}";
+    sha256 = "0bxh43hp1vl4axl3s9n2nb2ii8x1cbq98xz9c996f8rl5jy84ags";
   };
+  sourceRoot = "source/libclc";
 
-  nativeBuildInputs = [ python3 llvm ];
-
-  strictDeps = true;
-
+  # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch
   postPatch = ''
-    sed -i 's,llvm_clang =.*,llvm_clang = "${clang-unwrapped}/bin/clang",' configure.py
-    sed -i 's,cxx_compiler =.*,cxx_compiler = "${clang}/bin/clang++",' configure.py
+    substituteInPlace CMakeLists.txt \
+      --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \
+                'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )'
   '';
 
-  configurePhase = ''
-    ${python3.interpreter} ./configure.py --prefix=$out
-  '';
-
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ninja python3 ];
+  buildInputs = [ llvm clang-unwrapped ];
+  strictDeps = true;
 
   meta = with lib; {
     homepage = "http://libclc.llvm.org/";

From f8dc849739c64fb68b9ab10cea082f0e128fbb64 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 20 Jul 2021 16:27:50 +0100
Subject: [PATCH 303/330] mtools: 3.0.31 -> 4.0.33

See release announcements:

- 4.0.33: https://lists.gnu.org/archive/html/info-gnu/2021-07/msg00006.html
- 4.0.32: https://lists.gnu.org/archive/html/info-gnu/2021-07/msg00004.html
---
 pkgs/tools/filesystems/mtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index 4618a9b3b79a..f82b008e41d0 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mtools";
-  version = "4.0.31";
+  version = "4.0.33";
 
   src = fetchurl {
     url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2";
-    sha256 = "11nm5mhsq700f3dzvzjpcik89cfcn38mb249yc0sjbwggwkrk2ak";
+    sha256 = "0m5rx8djvg4jfvdgs4dxjkfd2na55wkdpid9xa32yc103s70zc8w";
   };
 
   patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;

From 918af17672e0de1a1c4e754da80035f8bbac441c Mon Sep 17 00:00:00 2001
From: Jonas Carpay <jonascarpay@gmail.com>
Date: Wed, 21 Jul 2021 00:45:38 +0900
Subject: [PATCH 304/330] powerline-go: 1.21.0 -> 2021-07-15

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

diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix
index 2f6ff216dc87..eff23b55df9d 100644
--- a/pkgs/tools/misc/powerline-go/default.nix
+++ b/pkgs/tools/misc/powerline-go/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "powerline-go";
-  version = "1.21.0";
+  version = "2021-07-15";
 
   src = fetchFromGitHub {
     owner = "justjanne";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-IO3I5lvPdN73EF+S5Xo+TMEYaBtd1pOGMs+aQtRnHjE=";
+    rev = "f27435b26b5001c52ffb1aee454572c59494c81b";
+    sha256 = "sha256-YB/WMprjXA5ZN6baT5nWahNj0xwbP8kzS7X/1tCwWiE=";
   };
 
   vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg=";

From ab7a73a286f50d6c5868c3105d6bcfe0a00cff86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 20 Jul 2021 18:25:24 +0200
Subject: [PATCH 305/330] ponysay: cleanup, pname + version

---
 pkgs/tools/misc/ponysay/default.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix
index 08f0cf0ed62d..b27aa32481c0 100644
--- a/pkgs/tools/misc/ponysay/default.nix
+++ b/pkgs/tools/misc/ponysay/default.nix
@@ -1,15 +1,18 @@
-{ lib, stdenv, fetchurl, python3, texinfo, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, python3, texinfo, makeWrapper }:
 
-stdenv.mkDerivation {
-  name = "ponysay-3.0.3";
+stdenv.mkDerivation rec {
+  name = "ponysay";
+  version = "3.0.3";
 
-  src = fetchurl {
-    url = "https://github.com/erkin/ponysay/archive/3.0.3.tar.gz";
-    sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3";
+  src = fetchFromGitHub {
+    owner = "erkin";
+    repo = "ponysay";
+    rev = version;
+    sha256 = "sha256-R2B0TU3ZSEncGsijKgvhaHIbcZa5Dx/jVPxrILBaoVw=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ python3 texinfo  ];
+  buildInputs = [ python3 texinfo ];
 
   inherit python3;
 
@@ -23,11 +26,11 @@ stdenv.mkDerivation {
         --with-bash
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Cowsay reimplemention for ponies";
     homepage = "https://github.com/erkin/ponysay";
-    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ bodil ];
-    platforms = with lib.platforms; unix;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ bodil ];
+    platforms = platforms.unix;
   };
 }

From 89271903b331e5b9aed3b8919985926e776c9666 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 20 Jul 2021 18:26:48 +0200
Subject: [PATCH 306/330] pws: convert to pname + version

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

diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix
index 1cfa64909f3a..783bb9b5a384 100644
--- a/pkgs/tools/misc/pws/default.nix
+++ b/pkgs/tools/misc/pws/default.nix
@@ -1,7 +1,8 @@
 { stdenv, lib, bundlerEnv, ruby, bundlerUpdateScript, xsel, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "pws-${(import ./gemset.nix).pws.version}";
+  pname = "pws";
+  version = (import ./gemset.nix).pws.version;
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -9,7 +10,7 @@ stdenv.mkDerivation rec {
 
   installPhase = let
     env = bundlerEnv {
-      name = "${name}-gems";
+      name = "${pname}-gems";
 
       inherit ruby;
 

From 61e0f211532acbf69ad114578e765c7b87915aa1 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Tue, 20 Jul 2021 12:27:31 -0400
Subject: [PATCH 307/330] pylsp-mypy: init at 0.5.1 (#130642)

Co-authored-by: Jonathan Ringer <jonringer@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 .../python-modules/pylsp-mypy/default.nix     | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/pylsp-mypy/default.nix

diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix
new file mode 100644
index 000000000000..a7d13bb32a2f
--- /dev/null
+++ b/pkgs/development/python-modules/pylsp-mypy/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, mypy
+, pytestCheckHook
+, python-lsp-server
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "pylsp-mypy";
+  version = "0.5.1";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "Richardk2n";
+    repo = "pylsp-mypy";
+    rev = version;
+    sha256 = "1d119csj1k5m9j0f7wdvpvnd02h548css6ybxqah92nk2v0rjscr";
+  };
+
+  checkInputs = [ pytestCheckHook mock ];
+
+  propagatedBuildInputs = [ mypy python-lsp-server ];
+
+  meta = with lib; {
+    homepage = "https://github.com/Richardk2n/pylsp-mypy";
+    description = "Mypy plugin for the Python LSP Server";
+    license = licenses.mit;
+    maintainers = with maintainers; [ cpcloud ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a21ad59ce41..a31cb4893eed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6180,6 +6180,8 @@ in {
 
   pyls-spyder = callPackage ../development/python-modules/pyls-spyder { };
 
+  pylsp-mypy = callPackage ../development/python-modules/pylsp-mypy { };
+
   PyLTI = callPackage ../development/python-modules/pylti { };
 
   pylutron = callPackage ../development/python-modules/pylutron { };

From 01db77414a8913f58310e83510d20e413475ef7c Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 20 Jul 2021 18:27:58 +0200
Subject: [PATCH 308/330] ditaa: convert to pname + version; cleanup (#130758)

Co-authored-by: Leo <github@ca.em0lar.de>
---
 pkgs/tools/graphics/ditaa/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix
index cb06e8ba9f16..a22f402b5d17 100644
--- a/pkgs/tools/graphics/ditaa/default.nix
+++ b/pkgs/tools/graphics/ditaa/default.nix
@@ -1,18 +1,18 @@
 { lib, stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "ditaa-0.11.0";
+  pname = "ditaa";
+  version = "0.11.0";
 
   src = fetchurl {
-    url = "https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar";
+    url = "https://github.com/stathissideris/ditaa/releases/download/v${version}/ditaa-${version}-standalone.jar";
     sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l";
   };
 
   dontUnpack = true;
 
   installPhase = ''
-    mkdir -p "$out/bin"
-    mkdir -p "$out/lib"
+    mkdir -p $out/bin $out/lib
 
     cp ${src} "$out/lib/ditaa.jar"
 

From 528e90adf2e047a4b7fcc8f0208863dc64d46105 Mon Sep 17 00:00:00 2001
From: Aaron Zeng <me@bcc32.com>
Date: Tue, 20 Jul 2021 12:29:52 -0400
Subject: [PATCH 309/330] fast-cli: 1.0.0 -> 3.0.1 (#130698)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/node-packages/default.nix    |   23 +-
 .../node-packages/node-packages.json          |    2 +-
 .../node-packages/node-packages.nix           | 2225 ++++++++---------
 3 files changed, 1032 insertions(+), 1218 deletions(-)

diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix
index 1a1a8a9eb0b8..c632a4cbc1e2 100644
--- a/pkgs/development/node-packages/default.nix
+++ b/pkgs/development/node-packages/default.nix
@@ -46,6 +46,17 @@ let
       '';
     };
 
+    fast-cli = super.fast-cli.override ({
+      nativeBuildInputs = [ pkgs.makeWrapper ];
+      prePatch = ''
+        export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
+      '';
+      postInstall = ''
+        wrapProgram $out/bin/fast \
+          --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium
+      '';
+    });
+
     hyperspace-cli = super."@hyperspace/cli".override {
       nativeBuildInputs = with pkgs; [
         makeWrapper
@@ -68,10 +79,6 @@ let
       meta.broken = since "10";
     };
 
-    "fast-cli-1.x" = super."fast-cli-1.x".override {
-      meta.broken = since "10";
-    };
-
     jshint = super.jshint.override {
       buildInputs = [ pkgs.phantomjs2 ];
     };
@@ -94,14 +101,6 @@ let
       meta.mainProgram = "bw";
     });
 
-    fast-cli = super."fast-cli-1.x".override {
-      preRebuild = ''
-        # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
-        sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
-      '';
-      buildInputs = [ pkgs.phantomjs2 ];
-    };
-
     flood = super.flood.override {
       buildInputs = [ self.node-pre-gyp ];
       meta.mainProgram = "flood";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index f529212b081e..7e17928d7dcb 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -90,7 +90,7 @@
 , "eslint_d"
 , "esy"
 , "expo-cli"
-, {"fast-cli": "1.x"}
+, "fast-cli"
 , "fauna-shell"
 , "firebase-tools"
 , "fixjson"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 3abbf3d0abd6..1f7599914136 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -1795,166 +1795,166 @@ let
         sha512 = "Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==";
       };
     };
-    "@electron-forge/async-ora-6.0.0-beta.57" = {
+    "@electron-forge/async-ora-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_async-ora";
       packageName = "@electron-forge/async-ora";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.57.tgz";
-        sha512 = "pinf6bB5etIKNwFgMx2V+kwsFlkjU4mApALv0Jn/lmcH5dlAB4zPwuKTccC44xVO4pp/bV1HWb1XJ4lHVxYaJg==";
+        url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.58.tgz";
+        sha512 = "osJoCA+Mxda0ToHnVh0c52UiqG0vYRChFp7YZnXSOFAyv/pJhO1gaSfJeTX+2ddki0SLvWQbgiJS5ysMax6Veg==";
       };
     };
-    "@electron-forge/core-6.0.0-beta.57" = {
+    "@electron-forge/core-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_core";
       packageName = "@electron-forge/core";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.57.tgz";
-        sha512 = "pLYG0QefjAEjxRazgEjryb4TrxVeebGTqXqZsKOpABAlDaKU4EmBq06SeSu8H9IAzMPwzpDIa6PaXdkMclqhnA==";
+        url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.58.tgz";
+        sha512 = "mro6o/Oa2BETPfnzlWcpLJ5W5IWVuDokE7HZPzb9c6OTlcm/BWwl8pbfSZU19Q9SLsjou9hAuMwqzFveZRqGew==";
       };
     };
-    "@electron-forge/installer-base-6.0.0-beta.57" = {
+    "@electron-forge/installer-base-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_installer-base";
       packageName = "@electron-forge/installer-base";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.57.tgz";
-        sha512 = "qeQMUos0WADEddSGhViCUeMswsFz1IL+elIy5h06AxgjoRtOU75VVy9RgVfDAMIN0iKvEWNKLQz1CBUtVAt0fA==";
+        url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.58.tgz";
+        sha512 = "VXA9cjCy9HHWyOcPGkO1Q5ym63AAfBLj/dL0Ezpw9r0/GKbgAN0g8HWgTwvs+rqWCdOAeyhIs+sTNI0rZQjc+A==";
       };
     };
-    "@electron-forge/installer-darwin-6.0.0-beta.57" = {
+    "@electron-forge/installer-darwin-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_installer-darwin";
       packageName = "@electron-forge/installer-darwin";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.57.tgz";
-        sha512 = "3dsa948r3gCkD+ooKeGwWSUyh5GEJ7ngi9t1dRD+f1jUnkU1e3SqcGXH68dr5NYn3OcsFDWreK3xvx/1qdEQAg==";
+        url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.58.tgz";
+        sha512 = "yfx97cL7+kB77xTeniNqRT4Va++uJX6j9kZwIwgaBFvtyLHZ1DChOlOI8IR6/qctzEtrZHW41DySFKXnsWYwuw==";
       };
     };
-    "@electron-forge/installer-deb-6.0.0-beta.57" = {
+    "@electron-forge/installer-deb-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_installer-deb";
       packageName = "@electron-forge/installer-deb";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.57.tgz";
-        sha512 = "Dnm68RUwR0UEe1hq1OPWso0LwdkZTa7Rpv0m9bHl+IvXTmrU//S5fdHEtjHAmto8f8PD5VadsLQcxsc3bQVNGQ==";
+        url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.58.tgz";
+        sha512 = "Ukw1ccUtmTOKCiorYLJCAIWGT5zxpinH1W9UpxlMP3JhrzQXApm2rF7n9TEGowkTMtPciEsNXaF/F9lzjRqIpQ==";
       };
     };
-    "@electron-forge/installer-dmg-6.0.0-beta.57" = {
+    "@electron-forge/installer-dmg-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_installer-dmg";
       packageName = "@electron-forge/installer-dmg";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.57.tgz";
-        sha512 = "kmAYga2yY5JcrRI3Dtpau5Ldsebzs4pGkCCBJqq5asqgDGdCpw+8Cky6ouJDaZMl853C0CEnqxeoGYDTAlVBKA==";
+        url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.58.tgz";
+        sha512 = "zw46CQSZ2Jihx7GBUcEPHGBQJD1pIBv6oTi5HPR7IkEJ7CQ/yjESAfDuu1UfQc9mgAKI+6s+QMuFZMW+ZMqYPg==";
       };
     };
-    "@electron-forge/installer-exe-6.0.0-beta.57" = {
+    "@electron-forge/installer-exe-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_installer-exe";
       packageName = "@electron-forge/installer-exe";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.57.tgz";
-        sha512 = "hVh4vh2q7BxJ8npsVCSxSdoUMwQwcs0LidbanXK8CqHmTgnb9MNDSHomCxOnX+kMQX85mCj9Nc5ROviXnLN4Xg==";
+        url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.58.tgz";
+        sha512 = "Z7gl1CX8WJ/9kr5As9y0GELK8/u754j7bzSlxmaeyhaO/vSf5+M/MjkEiPUQUKVmqZ77ngdzN/T4IfDGxpk++A==";
       };
     };
-    "@electron-forge/installer-linux-6.0.0-beta.57" = {
+    "@electron-forge/installer-linux-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_installer-linux";
       packageName = "@electron-forge/installer-linux";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.57.tgz";
-        sha512 = "MTK4wLCWxYctzo/htghNhZ5ptIf46AE3UdeQItjiEhL4+KjJjQN8JAVkl40WeM+rUDA53WRQ35HeykNBmspb6A==";
+        url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.58.tgz";
+        sha512 = "39A2mmhsJg2MEjYS+gtF/9FUYLKEoVmD6e4S+Rn0u9Yv/WOtdqOR0KR/pLYPtsiQKsGQA5nD2V2/ZN8N/qTxZw==";
       };
     };
-    "@electron-forge/installer-rpm-6.0.0-beta.57" = {
+    "@electron-forge/installer-rpm-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_installer-rpm";
       packageName = "@electron-forge/installer-rpm";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.57.tgz";
-        sha512 = "cTzL6mwkhKEkl4v7NE2ATaEsptf5OhTbtwb/tRVIuEOblYKTxw3x9nnH8iGJ73xPW/54awGiU1kHJTKA6UhcUA==";
+        url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.58.tgz";
+        sha512 = "RyuKOGJoJknnp1C9WPFDc06Jw9K+KBM574byYegNiJPm5eGu+ZL/4tU9hD29YAtImyoGUy8L5dquApaC4d9zKA==";
       };
     };
-    "@electron-forge/installer-zip-6.0.0-beta.57" = {
+    "@electron-forge/installer-zip-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_installer-zip";
       packageName = "@electron-forge/installer-zip";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.57.tgz";
-        sha512 = "ip/mlC32/mdUzFsM/39cZWshLN1B1f6atYHd2OpXlyAz6IZWrRHdsrJGtYsGdpgeoV/wMm09MTyuKXku3ehPaQ==";
+        url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.58.tgz";
+        sha512 = "J71WhNtHdgFDNCYB2vm3vv4Zt/rCuXFgtXxXRowb+pT39wxyL35DjXsOi/a6j5Vb2lGq0mekMuHvpcD/4MSo8w==";
       };
     };
-    "@electron-forge/maker-base-6.0.0-beta.57" = {
+    "@electron-forge/maker-base-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_maker-base";
       packageName = "@electron-forge/maker-base";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.57.tgz";
-        sha512 = "VnoSCeyCHBv9q0Bz9JRgKC1b4k3z/Qb2T9DrpMqEVW6ClZVkOAZVmjyEtb+Xn8DnRPc4UtSjpAquycC/AZJ4MQ==";
+        url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.58.tgz";
+        sha512 = "Ztbv99kznlOAK/iDM03Hu/XmdTEXmfLnkcfAJ+uBlRwJmFqiAcPWNlUrPWtCu5KKxHcOiDl6mN3OC/Ae2/3fMA==";
       };
     };
-    "@electron-forge/plugin-base-6.0.0-beta.57" = {
+    "@electron-forge/plugin-base-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_plugin-base";
       packageName = "@electron-forge/plugin-base";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.57.tgz";
-        sha512 = "lErdgdSGd+HcIzXsZC1Pf6VuLYsDVHTwFUzuZqUPdl28AOWKfwW+XpIZoPMDt2/Mdd5K0mCcYSylikcSa8RHYA==";
+        url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.58.tgz";
+        sha512 = "RMRjw8iRqkPChSMKdTSWCSubvDMSdJx+9Q9eO8n3GRN0jx4ExizhSIkxWpLSuze5dPyJXm3i24YUZjKOAR21EA==";
       };
     };
-    "@electron-forge/publisher-base-6.0.0-beta.57" = {
+    "@electron-forge/publisher-base-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_publisher-base";
       packageName = "@electron-forge/publisher-base";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.57.tgz";
-        sha512 = "eJFVt4JI/zCw86PMu/LERMAMVcPchyFfZ9upFec4YuOOMLaJH1NvbO3gGgYj7vavH1hQWZA6Yn7u8b+E8y8Byw==";
+        url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.58.tgz";
+        sha512 = "pnAZ7VXnL0vosYn4Au347WukXVTU0XLqUSQrjC4pYCMs7YumL4n+ya+JNy51D6SkcFMmd0nCU2ohz7IHo3ttcg==";
       };
     };
-    "@electron-forge/shared-types-6.0.0-beta.57" = {
+    "@electron-forge/shared-types-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_shared-types";
       packageName = "@electron-forge/shared-types";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.57.tgz";
-        sha512 = "8jRAf7HsfQC5BA8MTOwh8cXmqJ8JJqzO7WzDW9A50tHOKbpBxPW9YM8036SZzZ4GNZYBSWmJt3d3vW+KFLeYXg==";
+        url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.58.tgz";
+        sha512 = "Kz21kMg+EnINGK3H6qW4YXjFbXYvRv24O8PBnVaQiFXYIaUOXpaXj42QeytDXR/zMSA/jy78GoGodJLKE+gbdA==";
       };
     };
-    "@electron-forge/template-base-6.0.0-beta.57" = {
+    "@electron-forge/template-base-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_template-base";
       packageName = "@electron-forge/template-base";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.57.tgz";
-        sha512 = "3Nc7ik99VHQK8eTUrO/lA2tMRM5a0fLX+GgjR32yzkaAv081qd6t/XWS7MfU3k5Ld5cYMturUywJnEP/QdxOvA==";
+        url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.58.tgz";
+        sha512 = "U2iT2YUY9R2wz9RNkM9dAEzv5q+b3HSDJcqPy/B7lzT3lB9kni0HZTZKihZttlQYGRO6jj+9aWnLqaE3HmtgsQ==";
       };
     };
-    "@electron-forge/template-typescript-6.0.0-beta.57" = {
+    "@electron-forge/template-typescript-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_template-typescript";
       packageName = "@electron-forge/template-typescript";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.57.tgz";
-        sha512 = "NhcyTaLjbBGtdCTkAJgazKR4B9+yNFNH8QiXm3u6bg0cv2MhPWydmPuiEjFRLqG+Vz6jS4sW6jSIyCjFRK42ow==";
+        url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.58.tgz";
+        sha512 = "x3dJeB4VDg18c69GOOUSk0LFRygaN2fDYxxjTZcGMlnsUTyypXkuaVIoEnMnB01TlY+gTPrsoITeB2e7ahSyaQ==";
       };
     };
-    "@electron-forge/template-typescript-webpack-6.0.0-beta.57" = {
+    "@electron-forge/template-typescript-webpack-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_template-typescript-webpack";
       packageName = "@electron-forge/template-typescript-webpack";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.57.tgz";
-        sha512 = "S9AzVLB02AvOwEOtQvtSJlv7BPZPSX3gdqwhoxPcTP6Pi/hOvVeEweptkwwRzGsZmSI7/ifi1bq7avhnzjasZw==";
+        url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.58.tgz";
+        sha512 = "PTh0TW+ohn7BT+jjdQ3ubqFU9biP2ilfA36vA1Dgnv9/N8P1IBoEtXFJ4ilsMZOAfbp344ja9vsTFG+qGTsiDw==";
       };
     };
-    "@electron-forge/template-webpack-6.0.0-beta.57" = {
+    "@electron-forge/template-webpack-6.0.0-beta.58" = {
       name = "_at_electron-forge_slash_template-webpack";
       packageName = "@electron-forge/template-webpack";
-      version = "6.0.0-beta.57";
+      version = "6.0.0-beta.58";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.57.tgz";
-        sha512 = "df4/jHKcZ6+8qIE+h2U9Ej5P36uGQZjI8+CcIPDE/46avHT+BwCmlMA/ZTGUQ787U9WkoMiI7122jdd7GNyuCQ==";
+        url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.58.tgz";
+        sha512 = "Uf7Ck17bn3djuoSglzOioXhOBRqY72pqMSZF0K84zNGwfzsW/KSonizmOMG3yrvSDEQf48JE5Ezhssla3SSgiA==";
       };
     };
     "@electron/get-1.12.4" = {
@@ -2038,15 +2038,6 @@ let
         sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==";
       };
     };
-    "@eslint/eslintrc-0.4.2" = {
-      name = "_at_eslint_slash_eslintrc";
-      packageName = "@eslint/eslintrc";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz";
-        sha512 = "8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==";
-      };
-    };
     "@eslint/eslintrc-0.4.3" = {
       name = "_at_eslint_slash_eslintrc";
       packageName = "@eslint/eslintrc";
@@ -2668,6 +2659,15 @@ let
         sha512 = "V29L2QNKkLWM3bcJfVFMSo+Z7kkO8A1s7MAfdzBXLYEC1PE5/M0n1iXBDiD5aUtyVLh5GILcbme2bGtIHl0FMQ==";
       };
     };
+    "@grpc/grpc-js-1.3.6" = {
+      name = "_at_grpc_slash_grpc-js";
+      packageName = "@grpc/grpc-js";
+      version = "1.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.6.tgz";
+        sha512 = "v7+LQFbqZKmd/Tvf5/j1Xlbq6jXL/4d+gUtm2TNX4QiEC3ELWADmGr2dGlUyLl6aKTuYfsN72vAsO5zmavYkEg==";
+      };
+    };
     "@grpc/proto-loader-0.6.2" = {
       name = "_at_grpc_slash_proto-loader";
       packageName = "@grpc/proto-loader";
@@ -4018,6 +4018,15 @@ let
         sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==";
       };
     };
+    "@malept/cross-spawn-promise-2.0.0" = {
+      name = "_at_malept_slash_cross-spawn-promise";
+      packageName = "@malept/cross-spawn-promise";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz";
+        sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==";
+      };
+    };
     "@mapbox/node-pre-gyp-1.0.5" = {
       name = "_at_mapbox_slash_node-pre-gyp";
       packageName = "@mapbox/node-pre-gyp";
@@ -4234,13 +4243,13 @@ let
         sha512 = "KiXfYPO/X24p7EYQjcjBTizoyfY3U8zPv68Rte0EtayW2ZSqIslLLpNNd2gteqdh0Q83mzSiESdhlQHd0Ckjjg==";
       };
     };
-    "@netlify/plugin-edge-handlers-1.11.21" = {
+    "@netlify/plugin-edge-handlers-1.11.22" = {
       name = "_at_netlify_slash_plugin-edge-handlers";
       packageName = "@netlify/plugin-edge-handlers";
-      version = "1.11.21";
+      version = "1.11.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.21.tgz";
-        sha512 = "shUFM+l1ALeGCgy4Lag2wQzOD3zcHW0+HFdWXCRsvtjHdNwTMBnbYg7ztnWurwgMthwiQ1jiTmWr8hFrui7Vng==";
+        url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.22.tgz";
+        sha512 = "tFb7J6+YEtZP0OYpS/b9Rjp1lm02XfhAQR6KRHAaeRlHp98/zgd0hhubfwXUCppP2BLfn+imkeVS0FnANh5B3g==";
       };
     };
     "@netlify/plugins-list-2.19.3" = {
@@ -4279,58 +4288,58 @@ let
         sha512 = "EFUYbcB7g/7Sa4KYZaqNrqe+mJJCeoosUNl8mFyeF3qIqn0po7txSZn0/y1sgjejuv9mRKv8sm7dH8kMM/HJcg==";
       };
     };
-    "@node-red/editor-api-1.3.5" = {
+    "@node-red/editor-api-2.0.1" = {
       name = "_at_node-red_slash_editor-api";
       packageName = "@node-red/editor-api";
-      version = "1.3.5";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.3.5.tgz";
-        sha512 = "IJyfyVhEvkf2YNRPoR+1SPSi76evVV/boAKhOeVoIMBBeuYd1wM1ihMM3rnNWDYXjN/7CbTKz2DVmdMQ5aCIeQ==";
+        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.1.tgz";
+        sha512 = "0+wY8FJvS6P3hiRnz7YzjWmkannoJyBMYgnSevQ6euf8dABML5AOYThghpMNPrtl+RzRIar0oabHrTRSoEpDEg==";
       };
     };
-    "@node-red/editor-client-1.3.5" = {
+    "@node-red/editor-client-2.0.1" = {
       name = "_at_node-red_slash_editor-client";
       packageName = "@node-red/editor-client";
-      version = "1.3.5";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.3.5.tgz";
-        sha512 = "B/JB7KuSeTHkiwzrQtCgmkUfHN5nP2htUoE4wkTt118IA/1xUWXEtl+WnT5aDLiFUyFI21q9Fl4BnDOa7JqLEw==";
+        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.1.tgz";
+        sha512 = "9YP0n+VFruudzZfcsTL0fofm7j/BYodKzQTqksL3ZlcZsB075O3d8zM8ZuoNlpj2CfROR/PZi7E72ucmNExzlQ==";
       };
     };
-    "@node-red/nodes-1.3.5" = {
+    "@node-red/nodes-2.0.1" = {
       name = "_at_node-red_slash_nodes";
       packageName = "@node-red/nodes";
-      version = "1.3.5";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.3.5.tgz";
-        sha512 = "kLZOn8YDiDemJ/ufx0eagpmPPbUzLifgvoF1fHq9Jzf+K/xWtzDLHqNyLM6VSzo6QlCAnS939dU9kDb5G3fs3Q==";
+        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.1.tgz";
+        sha512 = "op1gcV99xp/xZAVg1B+VRzylNpWk/oF//I6dcRqiF8xoXjff42VfIJ8l01/JqsvuJD3p9+x9fz82QRMmASOu+w==";
       };
     };
-    "@node-red/registry-1.3.5" = {
+    "@node-red/registry-2.0.1" = {
       name = "_at_node-red_slash_registry";
       packageName = "@node-red/registry";
-      version = "1.3.5";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.3.5.tgz";
-        sha512 = "wy74xMnD87v/oB5P/HnUiJ6kTgdcCTgIJadeRBh0DSwcMjG3MhSxe8QCk3U9BxLH1fxw0IwxWbNgGwzuM8EOdw==";
+        url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.1.tgz";
+        sha512 = "B2La0qWpSEqbiiBWVmUKTqS4y/c/pZuUDPu7a5ZibGgcUEe032X05uZ68wIYMt1y2/ltnUlrPSdOjjpzpxEhEQ==";
       };
     };
-    "@node-red/runtime-1.3.5" = {
+    "@node-red/runtime-2.0.1" = {
       name = "_at_node-red_slash_runtime";
       packageName = "@node-red/runtime";
-      version = "1.3.5";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.3.5.tgz";
-        sha512 = "4Cz83wX9trvhhPxFkF5HfYzqYQEcVOYf4f1lSDHP2xYowE22+x4BTCs8gZA4hCI4kbon3eyaU5NrzlrKd+nZbQ==";
+        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.1.tgz";
+        sha512 = "3MbJk5Xum38Nt13FIvDmsuQYcdo5uxzKu2khHbXN3hG7XlECALSaKqLq19t7yg6e8q8Jqnb7j6184A1m34GVqQ==";
       };
     };
-    "@node-red/util-1.3.5" = {
+    "@node-red/util-2.0.1" = {
       name = "_at_node-red_slash_util";
       packageName = "@node-red/util";
-      version = "1.3.5";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/util/-/util-1.3.5.tgz";
-        sha512 = "1TTvTwvGMSe9SQMEKN5zGdyGMv8Kth49eiUcdPnUWigtafk1BE9iP7gVSyLVYgijzCwh40GUkSYey0TUaSbRBw==";
+        url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.1.tgz";
+        sha512 = "gT+3cI134m2pD4U0/iKuOAjRqluPXKlS19eCE06ArWGLxHmqx7Gi6Cyjxu971gNcw69QEfwJzEA2xIrAKRAR+g==";
       };
     };
     "@nodelib/fs.scandir-2.1.5" = {
@@ -4765,310 +4774,310 @@ let
         sha512 = "t4fKikazahwNKmwD+CE/icHyuZldWvNMupJhjxdk9T/KxHFx3zCGjHT3MKavwYP6abzgAAm5WwzD1oHlmj7dyg==";
       };
     };
-    "@ot-builder/bin-composite-types-1.0.11" = {
+    "@ot-builder/bin-composite-types-1.1.0" = {
       name = "_at_ot-builder_slash_bin-composite-types";
       packageName = "@ot-builder/bin-composite-types";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.11.tgz";
-        sha512 = "EZaye0ulSh5+SVBSz8loz+EOT+wEhrn5hqL3mGYMVMIXHf/JNexwB1n/uffbENfmRQcFLp+GRlVhsEyw+k2HdA==";
+        url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.1.0.tgz";
+        sha512 = "/JaR3T99LHJWzOp08qLE9yTpe+v9DlgyE/ZwSyueG/fbzfCquHve9qgOaIP/yEiVNhQdMEBMsJdpQyicL6db3w==";
       };
     };
-    "@ot-builder/bin-util-1.0.11" = {
+    "@ot-builder/bin-util-1.1.0" = {
       name = "_at_ot-builder_slash_bin-util";
       packageName = "@ot-builder/bin-util";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.11.tgz";
-        sha512 = "pH7MhJDe3WjlkPsbnUz+nLJedIpDhwqgCPKUDmyLeVaS+JD/+gRERRWDPycywzOwusHlHD6GBMDT68Phy9BuCw==";
+        url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.1.0.tgz";
+        sha512 = "Cwk6FsYU9aJmmbFcrE1DI3t+FzdyTb6IotsCY1YAxnS4nEkj70bNRfDbxu4rzpPqBgndIjAz1FSXtlSayW0LMw==";
       };
     };
-    "@ot-builder/cli-help-shower-1.0.11" = {
+    "@ot-builder/cli-help-shower-1.1.0" = {
       name = "_at_ot-builder_slash_cli-help-shower";
       packageName = "@ot-builder/cli-help-shower";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.11.tgz";
-        sha512 = "vGn9lGxBBknfGLYQ97fUd6fujTkv8IcOUJtsAG6VlMeu4BdMUNsSeAWX7nA/ZWrKPblBSV9E/H8TbiLwLcOWwg==";
+        url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.1.0.tgz";
+        sha512 = "0KaiPVXkjyuBhHZK5/1fxGX7Ch0/YAmc/+Os3QSwH8xgN2O682TZhW+TaKJzGLe6wuTomQ0H3YzO5Z4PfIyx3g==";
       };
     };
-    "@ot-builder/cli-proc-1.0.11" = {
+    "@ot-builder/cli-proc-1.1.0" = {
       name = "_at_ot-builder_slash_cli-proc";
       packageName = "@ot-builder/cli-proc";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.11.tgz";
-        sha512 = "icbfgW3eXE7G7sK6MxIzyUkeCoJxW3UCVXCyhQKgs7MVgQo/xEl6Mj04YE2fz62L+IsTccEdvMIFJXWUPjw44g==";
+        url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.1.0.tgz";
+        sha512 = "NiFyLMF6YCSum5gvqTWYZai2by0ULkOAX41bRdyoq9i+bq2vLQAisCdo3jZ6rjAWHO+zo4YTvcTyj2ukfABycw==";
       };
     };
-    "@ot-builder/cli-shared-1.0.11" = {
+    "@ot-builder/cli-shared-1.1.0" = {
       name = "_at_ot-builder_slash_cli-shared";
       packageName = "@ot-builder/cli-shared";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.11.tgz";
-        sha512 = "PBdRmB3Mp5mHCxd889UJHq0eJwHUJiiSMY+M9VXfxgu4WxbA0NUY5IpiEs69RnfJhiSUjvdkiaWH5xJzB9+mdA==";
+        url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.1.0.tgz";
+        sha512 = "rMsvIZHPc6RPSX1V2XJWM0fO/stSLctRMQZPnoPWQFcChS8Xvjf7iCBD8NA7V07LUI/8hYrcb4DMzp6aoJ4/pg==";
       };
     };
-    "@ot-builder/common-impl-1.0.11" = {
+    "@ot-builder/common-impl-1.1.0" = {
       name = "_at_ot-builder_slash_common-impl";
       packageName = "@ot-builder/common-impl";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.11.tgz";
-        sha512 = "7FCjFJb32++fIlPpXzzuNZB7TtrwkYKB32VOBlVz/u/wGAI3DcQEeG4jqAIF9XOUb9jtISQUcEUj7YHDYdOKWQ==";
+        url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.1.0.tgz";
+        sha512 = "Gnm1eCD2UMSXJhqoqK4vEGGIqVHKch+UF6VBO6uezT7vzdHfTW/IltIaB5ukbT4wumQfRMuZs9Eb6cabNae+hg==";
       };
     };
-    "@ot-builder/errors-1.0.11" = {
+    "@ot-builder/errors-1.1.0" = {
       name = "_at_ot-builder_slash_errors";
       packageName = "@ot-builder/errors";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.11.tgz";
-        sha512 = "hNMMJRVYNLgue0tYY2FKEk1RZmUKm4eY3CzoBOkhCNG7FAS1M2m2MGeE/TNaxxlJz3VTEiSXl1uMaFKXQLgrWw==";
+        url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.1.0.tgz";
+        sha512 = "88O6kaLJSWv+n1rboJ/lFEWEs3gRlABlLbqEgUX/tXqVs3cineH7ZZlBDpoNvVYnYV53KzReh8P0P4MIQklejQ==";
       };
     };
-    "@ot-builder/io-bin-cff-1.0.11" = {
+    "@ot-builder/io-bin-cff-1.1.0" = {
       name = "_at_ot-builder_slash_io-bin-cff";
       packageName = "@ot-builder/io-bin-cff";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.11.tgz";
-        sha512 = "gcD/FhE6s6Xk2AIurJh8cXjwdB7N1hLhQFf8YkOGgZ4jX1lpSmm9Dx7GrwYx9iii7LodXBDVS5AJh4N+hpaESw==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.1.0.tgz";
+        sha512 = "bLVT7VnEViiKjL2emb1GbWwybBN0qkfqWgZgkdZJEU930nlnY//FsQhKrpZDW6A9vce7GiwuZaxeSETexF0/ug==";
       };
     };
-    "@ot-builder/io-bin-encoding-1.0.11" = {
+    "@ot-builder/io-bin-encoding-1.1.0" = {
       name = "_at_ot-builder_slash_io-bin-encoding";
       packageName = "@ot-builder/io-bin-encoding";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.11.tgz";
-        sha512 = "5ytVt41rCuyDKi6XCrKOIaW88xf8b3gTKzjSvTRvYcsK/0uqJocpdbB7OIGU2TqpUNVuEs3IktDpMBiUrcFjuw==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.1.0.tgz";
+        sha512 = "77cYkXoJxfrDfjXkVIGuCHy/E+ff+t5E2zABHIFLoNmpXJvJdjYPupM/roMKkHqWjhnIP6caEwdCuxt3e8UNHA==";
       };
     };
-    "@ot-builder/io-bin-ext-private-1.0.11" = {
+    "@ot-builder/io-bin-ext-private-1.1.0" = {
       name = "_at_ot-builder_slash_io-bin-ext-private";
       packageName = "@ot-builder/io-bin-ext-private";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.11.tgz";
-        sha512 = "BwG9QBsPebZR1ycakpAYHc1zuCpKcpDr9pxp6D7kNSZAaZsosVinqI1cW0h/AbK99TYblI1MN4+FA2c4DJxWAg==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.1.0.tgz";
+        sha512 = "EwaHkGdP53bEXm7drrwrD6u63kSHw0A4NX+5xzhsIqDV24LShsZ9t34O2Pby9pN9jCJJFIWN3ryXEq3sHny4cA==";
       };
     };
-    "@ot-builder/io-bin-font-1.0.11" = {
+    "@ot-builder/io-bin-font-1.1.0" = {
       name = "_at_ot-builder_slash_io-bin-font";
       packageName = "@ot-builder/io-bin-font";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.11.tgz";
-        sha512 = "xtGq9iU48CUAB/xm+a9wsvWKd2K4K637SqRjc9y0jou0h9TZ3g9fDF6RRCva1VJkAPHT4gJes6wALMuoLb9lfg==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.1.0.tgz";
+        sha512 = "PslL6SFENEGtQ6zOXMewl69cOibOLLzrr8CS2Pe78zNcxJ4BWsP6dwZNeu8gVqWKLsUQJQIWbwaPiP/RDhQKUQ==";
       };
     };
-    "@ot-builder/io-bin-glyph-store-1.0.11" = {
+    "@ot-builder/io-bin-glyph-store-1.1.0" = {
       name = "_at_ot-builder_slash_io-bin-glyph-store";
       packageName = "@ot-builder/io-bin-glyph-store";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.11.tgz";
-        sha512 = "ipBYDaX7jsLiaJgpbyrTxeLqCB55KZ3UumVfxxTt8AUEKT1m6PUnG9BvaLBzvZxyjBF0sfiJDVQaS+mznbVj0Q==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.1.0.tgz";
+        sha512 = "ontsdJHI6dY1N0HKzdwLIb0o9G5Q+S1ETADuShP/nQD0lV3cxxj1KS/PnFE/LSoyY0AKrs630kLV1lrMS3R4rg==";
       };
     };
-    "@ot-builder/io-bin-layout-1.0.11" = {
+    "@ot-builder/io-bin-layout-1.1.0" = {
       name = "_at_ot-builder_slash_io-bin-layout";
       packageName = "@ot-builder/io-bin-layout";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.11.tgz";
-        sha512 = "5oquyNtdX/hRmtnmcgvdy0rxFiC1sqjRIi+6ycPNtMvJx9Z7z5USplveTf14W53Iyr/qGBsbk0QfNmv++fWEiQ==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.1.0.tgz";
+        sha512 = "QEW3kR/Tu1Qtp3f6zrmQKGGeRD6daTpuBwjS4AnR47WhGHLZ9IJxVsNMHJeyYwnjXAWg6Tht5HjHGnI9dKnSDA==";
       };
     };
-    "@ot-builder/io-bin-metadata-1.0.11" = {
+    "@ot-builder/io-bin-metadata-1.1.0" = {
       name = "_at_ot-builder_slash_io-bin-metadata";
       packageName = "@ot-builder/io-bin-metadata";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.11.tgz";
-        sha512 = "JdUp6qrHAfaa8UsCOKnWRveUiQGqa7QYQaPNLKaOVKvzo6jdIKB5uELX+GOc6qQU5ktGIjRuCbKWq2jZxcZToQ==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.1.0.tgz";
+        sha512 = "PjeEoquOsI2mwg3MZL4VDRlzmWVA5LBeYKAY3LH140WOPYFlPN27YfWGVUO/swc98Z+5xgDZau3emj3ElSRvrw==";
       };
     };
-    "@ot-builder/io-bin-metric-1.0.11" = {
+    "@ot-builder/io-bin-metric-1.1.0" = {
       name = "_at_ot-builder_slash_io-bin-metric";
       packageName = "@ot-builder/io-bin-metric";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.11.tgz";
-        sha512 = "5mjN6J6hOO7TDUazjI8Hl0eCkogLsod0N1u38UAVL4JmDAVEY6NCwYXVe0TDoNBRG17jfoOW+/xoz40uCI37AA==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.1.0.tgz";
+        sha512 = "mVjDTkxn6ARu7UUMi7rQCNC+fYK7IgSuO2bmYdzuozP7EmEWI5VQq3rhhMHDlvTodEuNARKJxr/tmzcB5Tx7PQ==";
       };
     };
-    "@ot-builder/io-bin-name-1.0.11" = {
+    "@ot-builder/io-bin-name-1.1.0" = {
       name = "_at_ot-builder_slash_io-bin-name";
       packageName = "@ot-builder/io-bin-name";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.11.tgz";
-        sha512 = "SjeUgpDTPIqGo/lA7ACvk/L2SAIzzMfKs4WV+QYRh6hzN9IRfhoj2OYepxXpvInOiNj9FHqTzEnYz5l7mskqmw==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.1.0.tgz";
+        sha512 = "EBQLOP5LFdU18crQuNRQ4lWBzLv3Dw2R8vTvlyUY8nX8OfVUE2KhBreyTjMYTZATfNA2Ey1ZzJPhbT5LpwHg8Q==";
       };
     };
-    "@ot-builder/io-bin-sfnt-1.0.11" = {
+    "@ot-builder/io-bin-sfnt-1.1.0" = {
       name = "_at_ot-builder_slash_io-bin-sfnt";
       packageName = "@ot-builder/io-bin-sfnt";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.11.tgz";
-        sha512 = "/AhSr/xsXEDY8mCVO+yJTmOKwaUjVuhKtJ9kZrJymV8I7xm1gJjdH+JdTPtikhm36Mc9WWC+KY/2zot+pN2PtQ==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.1.0.tgz";
+        sha512 = "SO0kgwif/7idUMT/Oo8J2N1iwIY98FKtl3yKSFYegiGrMqmL4qYGq26NxCt1NgpQyyZrMQV3D5eC81EpmvEy/Q==";
       };
     };
-    "@ot-builder/io-bin-ttf-1.0.11" = {
+    "@ot-builder/io-bin-ttf-1.1.0" = {
       name = "_at_ot-builder_slash_io-bin-ttf";
       packageName = "@ot-builder/io-bin-ttf";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.11.tgz";
-        sha512 = "euZnFeumI9V21VmezT7yVNFYm2HuBJhWhy9JE8V9aaoIo2Qj5lVpMu+3WAuhCDp1qk2fs+o5JlI83lXrdWeWmQ==";
+        url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.1.0.tgz";
+        sha512 = "jlyLDuCocNq43uX2wGLspoJ/t901ywgO5OTIfx/x8hg4ka6TKlC13bi0bSvaiVNB6HpDO62GJ69gufRaSCEzvQ==";
       };
     };
-    "@ot-builder/ot-1.0.11" = {
+    "@ot-builder/ot-1.1.0" = {
       name = "_at_ot-builder_slash_ot";
       packageName = "@ot-builder/ot";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.11.tgz";
-        sha512 = "TARoyL9D+i6gEzIijuh2C4MG4rNjY+Jkk1L5yMM/cVnzhLTy4PY+bTkszf2GJgcNi8iH8+XL213oHUOcEN8gWg==";
+        url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.1.0.tgz";
+        sha512 = "9ikUYwiE5ur7l89Ki7uDscMYWm1bxvuRzeWJoMr7thxibtnlMl6rVW5H6NspjEbOZmxgAf3YmiL3oPCq/jiewA==";
       };
     };
-    "@ot-builder/ot-encoding-1.0.11" = {
+    "@ot-builder/ot-encoding-1.1.0" = {
       name = "_at_ot-builder_slash_ot-encoding";
       packageName = "@ot-builder/ot-encoding";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.11.tgz";
-        sha512 = "Z6ZIuIq+R9E+2HpvrBsXVXTkjJLWWyJgBssTl1n5DRF8nIWIwmKufoCjMXHMtCCMHMK8jlDCCv8U3AAhPjvAZQ==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.1.0.tgz";
+        sha512 = "2x/lVIxC42XJdNB9BhvKq3P/bO1yomTwkLVcBS9R92x6/V1t4KOVCYHOtNL79lCGfZkdCWxHxtHhChF55BetsQ==";
       };
     };
-    "@ot-builder/ot-ext-private-1.0.11" = {
+    "@ot-builder/ot-ext-private-1.1.0" = {
       name = "_at_ot-builder_slash_ot-ext-private";
       packageName = "@ot-builder/ot-ext-private";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.11.tgz";
-        sha512 = "7dOIKMYaAEgYj6FtKCxWFqctNhT05zAaCVRRh6QVfOrQf7cldxmIVHW76aHa27eHTWPdtXWBxtb3eA0BVbEzHA==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.1.0.tgz";
+        sha512 = "MBMiz8RC8crmx7PB89G75y2nIue6+QkIiXGsx402ozlLQVgJe9YznV7dzUHlpLrPGFsbMYPRfZVTV4Ro+YAK0A==";
       };
     };
-    "@ot-builder/ot-glyphs-1.0.11" = {
+    "@ot-builder/ot-glyphs-1.1.0" = {
       name = "_at_ot-builder_slash_ot-glyphs";
       packageName = "@ot-builder/ot-glyphs";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.11.tgz";
-        sha512 = "NuhRdeS6vJnV6HVUEUMKDrNxW1PHYS2IWRsz+Dtr2ffrQ/GXtX857MXeZPd8cTrH+i0arfQeIUJPY0ZRmvXlJA==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.1.0.tgz";
+        sha512 = "EURkR2aUUR4Zlhdx+SdvEAkA7Vx+2mRorozb4gySs5PNqbKq43uzgXIgz1Djq6wasN00KcJGlOjogIv1zKFBwg==";
       };
     };
-    "@ot-builder/ot-layout-1.0.11" = {
+    "@ot-builder/ot-layout-1.1.0" = {
       name = "_at_ot-builder_slash_ot-layout";
       packageName = "@ot-builder/ot-layout";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.11.tgz";
-        sha512 = "x2K3Nnv5WVyOZ6b23p0fOPB5oMqNuj8UyNZ7OCpgZTMTFEXjrIvnkuWpjnYRd6JfWXAYF0vfZdBMHd7F0l+Y4A==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.1.0.tgz";
+        sha512 = "x07BUvdLmcU2w8V8JxiMzv1dI5ybkuDrvpVDuwSAL/eBsuDYf7/3i+ewvHv1WlqG9nQ0v2RJK48CicrCGhlpQw==";
       };
     };
-    "@ot-builder/ot-metadata-1.0.11" = {
+    "@ot-builder/ot-metadata-1.1.0" = {
       name = "_at_ot-builder_slash_ot-metadata";
       packageName = "@ot-builder/ot-metadata";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.11.tgz";
-        sha512 = "yInNtU6UkmzXIGJYARl5VZcA63UOLP3xc6o0APkHwVQNN53e5nN35GFwaDbeaWYYe0uRq/7/bDzeVsqr2GaV0Q==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.1.0.tgz";
+        sha512 = "zgUlAqDj8eCuizVbMN4CVA76m+PAUdl91tUO1JTAn5qt0Lo8kfnOWaFc/aU+Q8HD3RXENRpAjA3N3kBm05UNiQ==";
       };
     };
-    "@ot-builder/ot-name-1.0.11" = {
+    "@ot-builder/ot-name-1.1.0" = {
       name = "_at_ot-builder_slash_ot-name";
       packageName = "@ot-builder/ot-name";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.11.tgz";
-        sha512 = "opSvFhUgrveV+cpOhKFnD/nrfNj3pbW6Z1mem1Rz/oWnrkx73g8kgDyip+8acW5h3iulYHGWL3XsKVOm4UpKug==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.1.0.tgz";
+        sha512 = "mudNPddCD/UD+v1fuFdPv3CzHjVS9Jt4GJhQ7or5HsG3/dIQ9N8jfqtBXtSK5ePEgoUsfhPWN5do/cwd//GQQQ==";
       };
     };
-    "@ot-builder/ot-sfnt-1.0.11" = {
+    "@ot-builder/ot-sfnt-1.1.0" = {
       name = "_at_ot-builder_slash_ot-sfnt";
       packageName = "@ot-builder/ot-sfnt";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.11.tgz";
-        sha512 = "w254e5eLINkwS00N0UY4UMTK4UCHN7/Oh8p7/e7INw6EaCR7Gg1j7VKnbU6Fldg2leHDQ939tkGSNIU6uHisKg==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.1.0.tgz";
+        sha512 = "iyz7npSWu5z9mgSnEjFkBFoOA4mKYIfbG27SGUWWWx0HWHI9cRoE+FHIcQOCJH0PmATvNCXMVfiCSPHesb57GA==";
       };
     };
-    "@ot-builder/ot-standard-glyph-namer-1.0.11" = {
+    "@ot-builder/ot-standard-glyph-namer-1.1.0" = {
       name = "_at_ot-builder_slash_ot-standard-glyph-namer";
       packageName = "@ot-builder/ot-standard-glyph-namer";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.11.tgz";
-        sha512 = "bynoGWRfxaVhqF6SjQZn7Vo+ApmMePBQn7HRwcnsS3CxxSTzP+O9Z2FtoN7/NiaQiENWrciMkTsDY2VH6iBo4A==";
+        url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.1.0.tgz";
+        sha512 = "2jyZCBOWmkKyLfU/EOS2AZjJ0Y0toqZqOb2vrIhQRUkli9cb1RyALxkOnP60IfGsD2SNa9yxZcEbS9RlRK8rvw==";
       };
     };
-    "@ot-builder/prelude-1.0.11" = {
+    "@ot-builder/prelude-1.1.0" = {
       name = "_at_ot-builder_slash_prelude";
       packageName = "@ot-builder/prelude";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.11.tgz";
-        sha512 = "BM1TmmUrGsA/goZ8RIGpjvw18nRDeFEWC7wFel/i4hFQuCKbfgfKixEDJ2iKzVXm6nGUl7/7xWZ0pfu3ij6tuA==";
+        url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.1.0.tgz";
+        sha512 = "ghZ04jh2z8WD4UdHJVXKTyjzAo7zUD4lyilrO17fKT3WqD/LW/2vKC7inwepELwVC03uT8xaVhnflF1rYGMzKg==";
       };
     };
-    "@ot-builder/primitive-1.0.11" = {
+    "@ot-builder/primitive-1.1.0" = {
       name = "_at_ot-builder_slash_primitive";
       packageName = "@ot-builder/primitive";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.11.tgz";
-        sha512 = "Hh6QGMC0XuAfiLWl7Q0eZSAOoEqkO6BPO9d3OFAxaNg05ekRJBzVvtB3iSEkdigbmg1aZChTy4HDFRw9D5SmGw==";
+        url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.1.0.tgz";
+        sha512 = "ob7od9Lr3nlGSM6v4xoM8krXuO2W0bOFfpog4Trsg6BArRz8zFfdFVjsZ8umxAhJX2z0Jroiq1nM8okdkw0TDQ==";
       };
     };
-    "@ot-builder/rectify-1.0.11" = {
+    "@ot-builder/rectify-1.1.0" = {
       name = "_at_ot-builder_slash_rectify";
       packageName = "@ot-builder/rectify";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.11.tgz";
-        sha512 = "B3hzfmONslDbTtFqX+tKff6zlrDMVD1B0yyC44Sm8iP6OFt1HgPwNKyVUntEs3Wzod9SCCN/hOcRFAeaXTM5RA==";
+        url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.1.0.tgz";
+        sha512 = "nT6VP78JwQtLcyn+DEVp5Xv5bAi+6z9Y8QaaLYWCtv5AnY4aNN7VKwiK4v9Kag77BYDqYT7PI4et2tR5Pf4jSA==";
       };
     };
-    "@ot-builder/stat-glyphs-1.0.11" = {
+    "@ot-builder/stat-glyphs-1.1.0" = {
       name = "_at_ot-builder_slash_stat-glyphs";
       packageName = "@ot-builder/stat-glyphs";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.11.tgz";
-        sha512 = "ldzOx2QtDKsqdQolgCM6cCRzCcdS/B46a4Emu3vuMRs2M0yNAoy4EzVkX6h0nEnTBcgq2NKFFL4BxWIG4la1ZQ==";
+        url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.1.0.tgz";
+        sha512 = "FquKCcC2/Z/cCV16vi+8DHoQzMdwaYSgvA8Hv4Djx3aYLyAmYe14ODfZF63RcW5uh7pZsG1c6u82bf1trwZr9g==";
       };
     };
-    "@ot-builder/trace-1.0.11" = {
+    "@ot-builder/trace-1.1.0" = {
       name = "_at_ot-builder_slash_trace";
       packageName = "@ot-builder/trace";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.11.tgz";
-        sha512 = "feOrmdS9Tc0+lnXHtPsq2QfMpI4zQqsIOEBYzzGGK4UPrdwO1a7DhBLgOEJt1C8o7d+2QeLE8KJnB4NGgx6kHQ==";
+        url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.1.0.tgz";
+        sha512 = "1C2vziYWUYe2YzPEPfNIdqjXtVjl5we69EjX5q4ZZPbCFFoeWGRR54Zxgyp8V5GAvKz0Pn94nXGaFlfEdwk3jQ==";
       };
     };
-    "@ot-builder/var-store-1.0.11" = {
+    "@ot-builder/var-store-1.1.0" = {
       name = "_at_ot-builder_slash_var-store";
       packageName = "@ot-builder/var-store";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.11.tgz";
-        sha512 = "kg1T34FaRepMJ7vgatiVSjScH1H9c2H87vPauNR6lft8oeMORUuowJyFIzeckfaKcUFm/0uip6H5zj8Bypu9Wg==";
+        url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.1.0.tgz";
+        sha512 = "Q60yNeIDJiqlHIPDkqJJXZWN5zodkKQQv/5PpLIocKMdHrQVqltrTQ5QL+V42Nup1+BiGt1zmR+sO+uUa3A/Iw==";
       };
     };
-    "@ot-builder/variance-1.0.11" = {
+    "@ot-builder/variance-1.1.0" = {
       name = "_at_ot-builder_slash_variance";
       packageName = "@ot-builder/variance";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.11.tgz";
-        sha512 = "p1VXo+2ZZl5SDMWPLTzz2rtIlfY3G3RgPDAdG4dwWPjH9PLtZlrWDLQR9SGmisAe3p1NIUQh82TD6X2a9XMnXA==";
+        url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.1.0.tgz";
+        sha512 = "azUnRrvj2LKkPTYWuiEFStbUEQWbaiI6F63SZOL8yIOEr5Jya/iZ33HeeGltx/jbCrLdboad5pBechG/QD44+w==";
       };
     };
     "@parcel/fs-1.11.0" = {
@@ -5314,13 +5323,13 @@ let
         sha512 = "tU8fQs0D76ZKhJ2cWtnfQthWqiZgGBx0gH0+5D8JvaBEBaqA8foPPBt3Nonwr3ygyv5xrw2IzKWgIY86BlGs+w==";
       };
     };
-    "@redocly/openapi-core-1.0.0-beta.53" = {
+    "@redocly/openapi-core-1.0.0-beta.54" = {
       name = "_at_redocly_slash_openapi-core";
       packageName = "@redocly/openapi-core";
-      version = "1.0.0-beta.53";
+      version = "1.0.0-beta.54";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.53.tgz";
-        sha512 = "n5WixBRb7oWS31v3/cdOW/eNXbr2M4N8+HjHfCA/oQX6Z4ZYqPOJCekw64sQ/fnUQMIQyT6fKqyaf+iO4tG7YA==";
+        url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.54.tgz";
+        sha512 = "uYs0N1Trjkh7u8IMIuCU2VxCXhMyGWSZUkP/WNdTR1OgBUtvNdF9C32zoQV+hyCIH4gVu42ROHkjisy333ZX+w==";
       };
     };
     "@redocly/react-dropdown-aria-2.0.12" = {
@@ -5890,13 +5899,13 @@ let
         sha512 = "WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A==";
       };
     };
-    "@snyk/snyk-docker-pull-3.6.2" = {
+    "@snyk/snyk-docker-pull-3.6.3" = {
       name = "_at_snyk_slash_snyk-docker-pull";
       packageName = "@snyk/snyk-docker-pull";
-      version = "3.6.2";
+      version = "3.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.6.2.tgz";
-        sha512 = "Ngebbk2LLMYNj5iMeTrt066nzWZ3oc8I5aN5A1qXpXmuAv8hW/hA1pfF3qwWrskl0RbPIhcSnY833e8l+drjEQ==";
+        url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.6.3.tgz";
+        sha512 = "SXhIAVfBVB/WoMgh3pTJNEKehpHygzqnnqHpg3ucw2rc5z0LqSAJQyYWl3jSAUnl5LgA11UuYD8zj0dsRbed2A==";
       };
     };
     "@snyk/snyk-hex-plugin-1.1.4" = {
@@ -7654,6 +7663,15 @@ let
         sha512 = "ijZ1vzRawI7QoWnTNL8KpHixd2b2XVb9I9HAqI3triPsh1EC0xH0Eg6w2O3TKbDCgiNNlJqfrof6j4T2I+l9vw==";
       };
     };
+    "@types/ws-7.4.7" = {
+      name = "_at_types_slash_ws";
+      packageName = "@types/ws";
+      version = "7.4.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.7.tgz";
+        sha512 = "JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==";
+      };
+    };
     "@types/yargs-13.0.12" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
@@ -7708,13 +7726,13 @@ let
         sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==";
       };
     };
-    "@typescript-eslint/eslint-plugin-4.28.3" = {
+    "@typescript-eslint/eslint-plugin-4.28.4" = {
       name = "_at_typescript-eslint_slash_eslint-plugin";
       packageName = "@typescript-eslint/eslint-plugin";
-      version = "4.28.3";
+      version = "4.28.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.3.tgz";
-        sha512 = "jW8sEFu1ZeaV8xzwsfi6Vgtty2jf7/lJmQmDkDruBjYAbx5DA8JtbcMnP0rNPUG+oH5GoQBTSp+9613BzuIpYg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz";
+        sha512 = "s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw==";
       };
     };
     "@typescript-eslint/experimental-utils-3.10.1" = {
@@ -7726,13 +7744,13 @@ let
         sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==";
       };
     };
-    "@typescript-eslint/experimental-utils-4.28.3" = {
+    "@typescript-eslint/experimental-utils-4.28.4" = {
       name = "_at_typescript-eslint_slash_experimental-utils";
       packageName = "@typescript-eslint/experimental-utils";
-      version = "4.28.3";
+      version = "4.28.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.3.tgz";
-        sha512 = "zZYl9TnrxwEPi3FbyeX0ZnE8Hp7j3OCR+ELoUfbwGHGxWnHg9+OqSmkw2MoCVpZksPCZYpQzC559Ee9pJNHTQw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz";
+        sha512 = "OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA==";
       };
     };
     "@typescript-eslint/parser-3.10.1" = {
@@ -7744,22 +7762,22 @@ let
         sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==";
       };
     };
-    "@typescript-eslint/parser-4.28.3" = {
+    "@typescript-eslint/parser-4.28.4" = {
       name = "_at_typescript-eslint_slash_parser";
       packageName = "@typescript-eslint/parser";
-      version = "4.28.3";
+      version = "4.28.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.3.tgz";
-        sha512 = "ZyWEn34bJexn/JNYvLQab0Mo5e+qqQNhknxmc8azgNd4XqspVYR5oHq9O11fLwdZMRcj4by15ghSlIEq+H5ltQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.4.tgz";
+        sha512 = "4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA==";
       };
     };
-    "@typescript-eslint/scope-manager-4.28.3" = {
+    "@typescript-eslint/scope-manager-4.28.4" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "4.28.3";
+      version = "4.28.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.3.tgz";
-        sha512 = "/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz";
+        sha512 = "ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w==";
       };
     };
     "@typescript-eslint/types-3.10.1" = {
@@ -7771,13 +7789,13 @@ let
         sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==";
       };
     };
-    "@typescript-eslint/types-4.28.3" = {
+    "@typescript-eslint/types-4.28.4" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "4.28.3";
+      version = "4.28.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.3.tgz";
-        sha512 = "kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.4.tgz";
+        sha512 = "3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww==";
       };
     };
     "@typescript-eslint/typescript-estree-3.10.1" = {
@@ -7789,13 +7807,13 @@ let
         sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==";
       };
     };
-    "@typescript-eslint/typescript-estree-4.28.3" = {
+    "@typescript-eslint/typescript-estree-4.28.4" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "4.28.3";
+      version = "4.28.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz";
-        sha512 = "YAb1JED41kJsqCQt1NcnX5ZdTA93vKFCMP4lQYG6CFxd0VzDJcKttRlMrlG+1qiWAw8+zowmHU1H0OzjWJzR2w==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz";
+        sha512 = "z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ==";
       };
     };
     "@typescript-eslint/visitor-keys-3.10.1" = {
@@ -7807,13 +7825,13 @@ let
         sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";
       };
     };
-    "@typescript-eslint/visitor-keys-4.28.3" = {
+    "@typescript-eslint/visitor-keys-4.28.4" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "4.28.3";
+      version = "4.28.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz";
-        sha512 = "ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz";
+        sha512 = "NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg==";
       };
     };
     "@uifabric/foundation-7.9.26" = {
@@ -8941,6 +8959,15 @@ let
         sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==";
       };
     };
+    "acorn-walk-8.1.1" = {
+      name = "acorn-walk";
+      packageName = "acorn-walk";
+      version = "8.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz";
+        sha512 = "FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w==";
+      };
+    };
     "adbkit-2.11.1" = {
       name = "adbkit";
       packageName = "adbkit";
@@ -11227,13 +11254,13 @@ let
         sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg==";
       };
     };
-    "aws-sdk-2.948.0" = {
+    "aws-sdk-2.949.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.948.0";
+      version = "2.949.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.948.0.tgz";
-        sha512 = "UJaCwccNaNNFtbhlvg+BmcaVWNI7RPonZA16nca0s3O+UnHm5y5H/nN6XpuJp+NUrxrLgTFaztPvjmBp5q6p+g==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.949.0.tgz";
+        sha512 = "n9vqtsLPmSvJcvYvBLBbI1n4GZokwc/5zgHZD7VxdioLNXo1nHQ3VUi4MiW+3kIN40NUNf+Gc5vpc82yNYCvsw==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -12136,22 +12163,13 @@ let
         sha512 = "BR2vwQZwu24aRm588XHOnPVjjQtbK8sF0RopRFgMuke63/REJMWnePTa2YHKDBefuBYiVdgkowuB1/e4K7Ue3g==";
       };
     };
-    "bcrypt-3.0.6" = {
+    "bcrypt-5.0.1" = {
       name = "bcrypt";
       packageName = "bcrypt";
-      version = "3.0.6";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.6.tgz";
-        sha512 = "taA5bCTfXe7FUjKroKky9EXpdhkVvhE5owfxfLYodbrAR1Ul3juLmIQmIQBK4L9a5BuUcE6cqmwT+Da20lF9tg==";
-      };
-    };
-    "bcrypt-3.0.8" = {
-      name = "bcrypt";
-      packageName = "bcrypt";
-      version = "3.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.8.tgz";
-        sha512 = "jKV6RvLhI36TQnPDvUFqBEnGX9c8dRRygKxCZu7E+MgLfKZbmmXL8a7/SFFOyHoPNX9nV81cKRC5tbQfvEQtpw==";
+        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz";
+        sha512 = "9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==";
       };
     };
     "bcrypt-nodejs-0.0.3" = {
@@ -14458,15 +14476,6 @@ let
         sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b";
       };
     };
-    "callback-stream-1.1.0" = {
-      name = "callback-stream";
-      packageName = "callback-stream";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz";
-        sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
-      };
-    };
     "caller-0.0.1" = {
       name = "caller";
       packageName = "caller";
@@ -15187,15 +15196,6 @@ let
         sha1 = "5c710f2bab95653272842ba01c6ea61b3545ec35";
       };
     };
-    "cheerio-0.22.0" = {
-      name = "cheerio";
-      packageName = "cheerio";
-      version = "0.22.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz";
-        sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e";
-      };
-    };
     "cheerio-1.0.0-rc.10" = {
       name = "cheerio";
       packageName = "cheerio";
@@ -16420,13 +16420,13 @@ let
         sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==";
       };
     };
-    "color-3.2.0" = {
+    "color-3.2.1" = {
       name = "color";
       packageName = "color";
-      version = "3.2.0";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-3.2.0.tgz";
-        sha512 = "4ximSqKXLTQmYLJuvrRHtpOqniR+ASoaVK+Rxdy6ZpfsLvUqtIM7oGGgopRG+O4p9NRv/AfuVD3jsvdxyXqozQ==";
+        url = "https://registry.npmjs.org/color/-/color-3.2.1.tgz";
+        sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==";
       };
     };
     "color-convert-1.9.3" = {
@@ -17365,13 +17365,13 @@ let
         sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
       };
     };
-    "constructs-3.3.97" = {
+    "constructs-3.3.98" = {
       name = "constructs";
       packageName = "constructs";
-      version = "3.3.97";
+      version = "3.3.98";
       src = fetchurl {
-        url = "https://registry.npmjs.org/constructs/-/constructs-3.3.97.tgz";
-        sha512 = "KDemmmUBgTDd2OKVOZkVEJM1LwP/bzm+cs2l/v1UYctIUl2X4LW+MrK7Ajd8blKkS5Vp6edkQSTSHUJnR/413w==";
+        url = "https://registry.npmjs.org/constructs/-/constructs-3.3.98.tgz";
+        sha512 = "VvDuJMqDUb16jB4EsCHthVb74yJcnD/5XWkybYgK5Ieee5o54eyxEzM9jFbZEasysPX4zR05Z/ygEzdlj+QZPg==";
       };
     };
     "consume-http-header-1.0.0" = {
@@ -18194,15 +18194,6 @@ let
         sha512 = "Pb3XjZNKdCs0Nk46yFKb82y+a3xRQeMvGi1AlJfIV40y/iwkgBqzS5EfqdnakEOvh2jzTOx3v8QxZpkz4hPzyw==";
       };
     };
-    "cron-1.7.2" = {
-      name = "cron";
-      packageName = "cron";
-      version = "1.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz";
-        sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ==";
-      };
-    };
     "cron-1.8.2" = {
       name = "cron";
       packageName = "cron";
@@ -18212,6 +18203,15 @@ let
         sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==";
       };
     };
+    "cronosjs-1.7.1" = {
+      name = "cronosjs";
+      packageName = "cronosjs";
+      version = "1.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cronosjs/-/cronosjs-1.7.1.tgz";
+        sha512 = "d6S6+ep7dJxsAG8OQQCdKuByI/S/AV64d9OF5mtmcykOyPu92cAkAnF3Tbc9s5oOaLQBYYQmTNvjqYRkPJ/u5Q==";
+      };
+    };
     "cross-env-5.2.1" = {
       name = "cross-env";
       packageName = "cross-env";
@@ -18302,6 +18302,15 @@ let
         sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc";
       };
     };
+    "cross-spawn-windows-exe-1.2.0" = {
+      name = "cross-spawn-windows-exe";
+      packageName = "cross-spawn-windows-exe";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz";
+        sha512 = "mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw==";
+      };
+    };
     "crossroads-0.12.2" = {
       name = "crossroads";
       packageName = "crossroads";
@@ -20813,6 +20822,15 @@ let
         sha512 = "y/Ev98AleGvl43YKTNcA2Q+lyFmsmCfTTNWy4cjEJxoLkbobcXtRS0Kvx06daCgr2GdtlwLfNzL553BkktfJoA==";
       };
     };
+    "devtools-protocol-0.0.869402" = {
+      name = "devtools-protocol";
+      packageName = "devtools-protocol";
+      version = "0.0.869402";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz";
+        sha512 = "VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==";
+      };
+    };
     "devtools-protocol-0.0.883894" = {
       name = "devtools-protocol";
       packageName = "devtools-protocol";
@@ -22019,13 +22037,13 @@ let
         sha512 = "icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==";
       };
     };
-    "electron-packager-15.2.0" = {
+    "electron-packager-15.3.0" = {
       name = "electron-packager";
       packageName = "electron-packager";
-      version = "15.2.0";
+      version = "15.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-packager/-/electron-packager-15.2.0.tgz";
-        sha512 = "BaklTBRQy1JTijR3hi8XxHf/uo76rHbDCNM/eQHSblzE9C0NoNfOe86nPxB7y1u2jwlqoEJ4zFiHpTFioKGGRA==";
+        url = "https://registry.npmjs.org/electron-packager/-/electron-packager-15.3.0.tgz";
+        sha512 = "PHcykXinmjPyJcYoNGbOWNsOU25nIbMLHBAfg4caazWzYELFL14FshDZEqqrvVOMEUnqjx/Ktc1NmMIN5ZRomQ==";
       };
     };
     "electron-rebuild-2.3.5" = {
@@ -22037,13 +22055,13 @@ let
         sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ==";
       };
     };
-    "electron-to-chromium-1.3.779" = {
+    "electron-to-chromium-1.3.780" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.779";
+      version = "1.3.780";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.779.tgz";
-        sha512 = "nreave0y/1Qhmo8XtO6C/LpawNyC6U26+q7d814/e+tIqUK073pM+4xW7WUXyqCRa5K4wdxHmNMBAi8ap9nEew==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.780.tgz";
+        sha512 = "2KQ9OYm9WMUNpAPA/4aerURl3hwRc9tNlpsiEj3Y8Gf7LVf26NzyLIX2v0hSagQwrS9+cWab+28A2GPKDoVNRA==";
       };
     };
     "electrum-client-git://github.com/janoside/electrum-client" = {
@@ -23074,15 +23092,6 @@ let
         sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==";
       };
     };
-    "eslint-7.30.0" = {
-      name = "eslint";
-      packageName = "eslint";
-      version = "7.30.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz";
-        sha512 = "VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==";
-      };
-    };
     "eslint-7.31.0" = {
       name = "eslint";
       packageName = "eslint";
@@ -23128,13 +23137,13 @@ let
         sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==";
       };
     };
-    "eslint-plugin-vue-7.13.0" = {
+    "eslint-plugin-vue-7.14.0" = {
       name = "eslint-plugin-vue";
       packageName = "eslint-plugin-vue";
-      version = "7.13.0";
+      version = "7.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.13.0.tgz";
-        sha512 = "u0+jL8h2MshRuMTCLslktxRsPTjlENNcNufhgHu01N982DmHVdeFniyMPoVLLRjACQOwdz3FdlsgYGBMBG+AKg==";
+        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.14.0.tgz";
+        sha512 = "IW5A2Td0wEWjFGaGVEO24JNXa8cVFzAQTXrYv/Vu3zyDVS9sjwOpZY0iqub7FOkT2AK3Imtw4U4wg48pP9oWww==";
       };
     };
     "eslint-scope-3.7.3" = {
@@ -24127,15 +24136,6 @@ let
         sha512 = "94JMAXcBkBHYazc8y85akJQvq/7PFdBHOWc5B421liyQXdDzvq49ct4tbTHRnpOZ3aPlsufLGVQdhJIuGUNiTQ==";
       };
     };
-    "express-session-1.17.1" = {
-      name = "express-session";
-      packageName = "express-session";
-      version = "1.17.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.17.1.tgz";
-        sha512 = "UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q==";
-      };
-    };
     "express-session-1.17.2" = {
       name = "express-session";
       packageName = "express-session";
@@ -24352,15 +24352,6 @@ let
         sha512 = "AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ==";
       };
     };
-    "extract-zip-1.7.0" = {
-      name = "extract-zip";
-      packageName = "extract-zip";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz";
-        sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==";
-      };
-    };
     "extract-zip-2.0.1" = {
       name = "extract-zip";
       packageName = "extract-zip";
@@ -26260,15 +26251,6 @@ let
         sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
       };
     };
-    "fs-extra-1.0.0" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
-        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
-      };
-    };
     "fs-extra-10.0.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -27358,13 +27340,13 @@ let
         sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==";
       };
     };
-    "glob-parent-6.0.0" = {
+    "glob-parent-6.0.1" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "6.0.0";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.0.tgz";
-        sha512 = "Hdd4287VEJcZXUwv1l8a+vXC1GjOQqXe+VS30w/ypihpcnu9M1n3xeYeJu5CBpeEQj2nAab2xxz28GuA3vp4Ww==";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.1.tgz";
+        sha512 = "kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog==";
       };
     };
     "glob-slash-1.0.0" = {
@@ -28682,15 +28664,6 @@ let
         sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==";
       };
     };
-    "hasha-2.2.0" = {
-      name = "hasha";
-      packageName = "hasha";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
-        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
-      };
-    };
     "hasha-5.2.2" = {
       name = "hasha";
       packageName = "hasha";
@@ -28925,13 +28898,13 @@ let
         sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA==";
       };
     };
-    "help-me-1.1.0" = {
+    "help-me-3.0.0" = {
       name = "help-me";
       packageName = "help-me";
-      version = "1.1.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz";
-        sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6";
+        url = "https://registry.npmjs.org/help-me/-/help-me-3.0.0.tgz";
+        sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ==";
       };
     };
     "here-0.0.2" = {
@@ -29186,6 +29159,15 @@ let
         sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2";
       };
     };
+    "hpagent-0.1.2" = {
+      name = "hpagent";
+      packageName = "hpagent";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hpagent/-/hpagent-0.1.2.tgz";
+        sha512 = "ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ==";
+      };
+    };
     "hrpc-2.2.0" = {
       name = "hrpc";
       packageName = "hrpc";
@@ -29997,13 +29979,13 @@ let
         sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d";
       };
     };
-    "i18next-15.1.2" = {
+    "i18next-20.3.2" = {
       name = "i18next";
       packageName = "i18next";
-      version = "15.1.2";
+      version = "20.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/i18next/-/i18next-15.1.2.tgz";
-        sha512 = "98ELn/dqep00DQ/v1E1gpM21HNN6nqU3mS85mYKd9P7lXrhfUcuysPaa3HviKSFb3WPdjf7avuAST3P0dhNp/A==";
+        url = "https://registry.npmjs.org/i18next/-/i18next-20.3.2.tgz";
+        sha512 = "e8CML2R9Ng2sSQOM80wb/PrM2j8mDm84o/T4Amzn9ArVyNX5/ENWxxAXkRpZdTQNDaxKImF93Wep4mAoozFrKw==";
       };
     };
     "iconv-lite-0.4.23" = {
@@ -30033,15 +30015,6 @@ let
         sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
       };
     };
-    "iconv-lite-0.6.2" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz";
-        sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==";
-      };
-    };
     "iconv-lite-0.6.3" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
@@ -30582,13 +30555,13 @@ let
         sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA==";
       };
     };
-    "ink-3.0.8" = {
+    "ink-3.0.9" = {
       name = "ink";
       packageName = "ink";
-      version = "3.0.8";
+      version = "3.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ink/-/ink-3.0.8.tgz";
-        sha512 = "ubMFylXYaG4IkXQVhPautbhV/p6Lo0GlvAMI/jh8cGJQ39yeznJbaTTJP2CqZXezA4GOHzalpwCWqux/NEY38w==";
+        url = "https://registry.npmjs.org/ink/-/ink-3.0.9.tgz";
+        sha512 = "BN+SyJ1rLbKzGPxGYkk22dYB0b58OtyMI4uN0dYucQ8MlIu5TpXJzaP6Bt8Mgqi1dkNZT55bjGyZ2iVLTkJ70w==";
       };
     };
     "ink-spinner-4.0.2" = {
@@ -33462,13 +33435,13 @@ let
         sha512 = "Heu6D+yI5mmUklLQdX3PdDvHUQm14618Fj4PQM9seKa4cohxzJ7EHopfRObKYHMko9awopx4Qr7Gtu6u/QPqfw==";
       };
     };
-    "jsii-srcmak-0.1.300" = {
+    "jsii-srcmak-0.1.301" = {
       name = "jsii-srcmak";
       packageName = "jsii-srcmak";
-      version = "0.1.300";
+      version = "0.1.301";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.300.tgz";
-        sha512 = "yTB5QIeh1RkiixLzoP3BJ49yiVXnjTGh4O7Ywsn4oxH0IK6e6uDdqn6woFwbBpRwbShixo4PIytpsE2X6hDGgw==";
+        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.301.tgz";
+        sha512 = "RmUimAPVkk1QflCGjJVUsQsv+W+lD6yZMLpHEHkNEdUvlYSUkZIM2VXjF7LUw7HnS9gFFBftUd6W02OVGbd9Bg==";
       };
     };
     "json-bigint-0.2.3" = {
@@ -33777,13 +33750,13 @@ let
         sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A==";
       };
     };
-    "json2jsii-0.1.267" = {
+    "json2jsii-0.1.270" = {
       name = "json2jsii";
       packageName = "json2jsii";
-      version = "0.1.267";
+      version = "0.1.270";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.267.tgz";
-        sha512 = "mo/Vagk6g+O5olk+K7AwukyrmNFuj/OyBNswmhbGUCmiNN/ddEIVcmCMx481FmYoewTKl0Axyt33iapt5IcxCg==";
+        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.270.tgz";
+        sha512 = "blBOb7+GDWTLv6jxye684joWzQyuFM6HT+NsPQPuASkT7pABBt3Xx2wsVm/qMJeg7ITufgSfeh1TnNrFROicMg==";
       };
     };
     "json3-3.2.6" = {
@@ -34354,15 +34327,6 @@ let
         sha512 = "5AsrYCiCHIUxuw/G2r7xcoTW/NTf5IFwAe1fkwf2ifM/KZzEojaTylh1Pppu60oEixww1rfcWJaRGLi3eAJsrQ==";
       };
     };
-    "kew-0.7.0" = {
-      name = "kew";
-      packageName = "kew";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
-        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
-      };
-    };
     "keyboardevent-key-polyfill-1.1.0" = {
       name = "keyboardevent-key-polyfill";
       packageName = "keyboardevent-key-polyfill";
@@ -36037,15 +36001,6 @@ let
         sha1 = "5d19fa005c8c4d236faf4742c7b7a1fcabe29267";
       };
     };
-    "lodash.bind-4.2.1" = {
-      name = "lodash.bind";
-      packageName = "lodash.bind";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz";
-        sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35";
-      };
-    };
     "lodash.camelcase-4.3.0" = {
       name = "lodash.camelcase";
       packageName = "lodash.camelcase";
@@ -36649,15 +36604,6 @@ let
         sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b";
       };
     };
-    "lodash.pick-4.4.0" = {
-      name = "lodash.pick";
-      packageName = "lodash.pick";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz";
-        sha1 = "52f05610fff9ded422611441ed1fc123a03001b3";
-      };
-    };
     "lodash.reduce-4.6.0" = {
       name = "lodash.reduce";
       packageName = "lodash.reduce";
@@ -36667,15 +36613,6 @@ let
         sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b";
       };
     };
-    "lodash.reject-4.6.0" = {
-      name = "lodash.reject";
-      packageName = "lodash.reject";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz";
-        sha1 = "80d6492dc1470864bbf583533b651f42a9f52415";
-      };
-    };
     "lodash.repeat-4.1.0" = {
       name = "lodash.repeat";
       packageName = "lodash.repeat";
@@ -39790,15 +39727,6 @@ let
         sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==";
       };
     };
-    "mkpath-1.0.0" = {
-      name = "mkpath";
-      packageName = "mkpath";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz";
-        sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d";
-      };
-    };
     "mobx-6.3.2" = {
       name = "mobx";
       packageName = "mobx";
@@ -40096,13 +40024,13 @@ let
         sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw==";
       };
     };
-    "mqtt-4.2.6" = {
+    "mqtt-4.2.8" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "4.2.6";
+      version = "4.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.6.tgz";
-        sha512 = "GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q==";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.8.tgz";
+        sha512 = "DJYjlXODVXtSDecN8jnNzi6ItX3+ufGsEs9OB3YV24HtkRrh7kpx8L5M1LuyF0KzaiGtWr2PzDcMGAY60KGOSA==";
       };
     };
     "mqtt-packet-6.10.0" = {
@@ -40591,24 +40519,6 @@ let
         sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d";
       };
     };
-    "nan-2.13.2" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz";
-        sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==";
-      };
-    };
-    "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 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==";
-      };
-    };
     "nan-2.14.2" = {
       name = "nan";
       packageName = "nan";
@@ -41727,15 +41637,6 @@ let
         sha1 = "e652bbf3885a04dad6a353d74176177c83914707";
       };
     };
-    "node-phantom-simple-2.2.4" = {
-      name = "node-phantom-simple";
-      packageName = "node-phantom-simple";
-      version = "2.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz";
-        sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d";
-      };
-    };
     "node-polyglot-1.0.0" = {
       name = "node-polyglot";
       packageName = "node-polyglot";
@@ -41754,24 +41655,6 @@ let
         sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==";
       };
     };
-    "node-pre-gyp-0.12.0" = {
-      name = "node-pre-gyp";
-      packageName = "node-pre-gyp";
-      version = "0.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz";
-        sha512 = "4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==";
-      };
-    };
-    "node-pre-gyp-0.14.0" = {
-      name = "node-pre-gyp";
-      packageName = "node-pre-gyp";
-      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==";
-      };
-    };
     "node-pre-gyp-0.6.39" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
@@ -41790,31 +41673,13 @@ let
         sha1 = "dbbd4af12134e2e635c245ef93ffcf6f60673a5d";
       };
     };
-    "node-red-admin-0.2.7" = {
+    "node-red-admin-2.2.0" = {
       name = "node-red-admin";
       packageName = "node-red-admin";
-      version = "0.2.7";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-0.2.7.tgz";
-        sha512 = "bsFbC7KFfGY37+SuYfmM9Er00cM92anqp6xCj8x7Y+4qZHOXnLi9XDFoWtvvsC1uQyaMqas1ALCfqcOxLlWngw==";
-      };
-    };
-    "node-red-node-rbe-0.5.0" = {
-      name = "node-red-node-rbe";
-      packageName = "node-red-node-rbe";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.5.0.tgz";
-        sha512 = "88zuty5SiLW2/0vK8ZpMCoEBq2JbR4GEEIoJp3YWhQQytQRRvzHgOodzOkuH4AQoMFZXuVxF1lVswL6yiDCQiQ==";
-      };
-    };
-    "node-red-node-tail-0.3.1" = {
-      name = "node-red-node-tail";
-      packageName = "node-red-node-tail";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-tail/-/node-red-node-tail-0.3.1.tgz";
-        sha512 = "d/CbPGJMSNekJHOQu4WMNwjXRFnZ4c2+D3nlSdRH6wdUVVc++4nat8TuhcXKUe9W9+nqMrmVhReGnf8UwKsfBw==";
+        url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-2.2.0.tgz";
+        sha512 = "dBljNubVsolJkgfXUAF3KrCAO+hi5AXz+cftGjfHT76PyVB9pFUbAgTrkjZmKciC/B/14kEV5Ds+SwonqyTMfg==";
       };
     };
     "node-releases-1.1.73" = {
@@ -43852,22 +43717,22 @@ let
         sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
-    "ot-builder-1.0.11" = {
+    "ot-builder-1.1.0" = {
       name = "ot-builder";
       packageName = "ot-builder";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.11.tgz";
-        sha512 = "bexZrUc8L6R5N47kgD52vMP6mU4y+09VTc2ZqZD/0uktzY4ksXCEjLcRkHe9uEocmq2jtuPFtpoSTaO9mTxrhA==";
+        url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.1.0.tgz";
+        sha512 = "IvQqHq33yHRKQuBzlzE6N3tXR2IktvBXeTvdASzib5Lqz84MJ1raGQrDNMimYxpRjcXZFJVfDgATYy5+gLhJIQ==";
       };
     };
-    "otb-ttc-bundle-1.0.11" = {
+    "otb-ttc-bundle-1.1.0" = {
       name = "otb-ttc-bundle";
       packageName = "otb-ttc-bundle";
-      version = "1.0.11";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.11.tgz";
-        sha512 = "Wx/WXWyvWnlyTBBZBxOJsEWbBxf8MdOXNmggISi+0l4o63jobEe3ZB5oCOMbNyJPynqv+JyyrroVDTOuzP3HAQ==";
+        url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.1.0.tgz";
+        sha512 = "tn3jkqHfaVIQsecQyAUTNf/VAAfE5EQiDH3AyIb1OFXjcdp0P9pBZUd0E4iP+rQjVoN8eMy1uCgvde5M5ZqVrg==";
       };
     };
     "ow-0.21.0" = {
@@ -45463,13 +45328,13 @@ let
         sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
       };
     };
-    "perfect-scrollbar-1.5.1" = {
+    "perfect-scrollbar-1.5.2" = {
       name = "perfect-scrollbar";
       packageName = "perfect-scrollbar";
-      version = "1.5.1";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.1.tgz";
-        sha512 = "MrSImINnIh3Tm1hdPT6bji6fmIeRorVEegQvyUnhqko2hDGTHhmjPefHXfxG/Jb8xVbfCwgmUIlIajERGXjVXQ==";
+        url = "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.2.tgz";
+        sha512 = "McHAinFkyzKbBZrFtb4MT2mxkehp15KvOX/UrjB8C5EZZXHTHgyETo5IGFYtHRTI2Pb2bsV0OE0YnkjT9Cw3aw==";
       };
     };
     "performance-now-0.2.0" = {
@@ -45553,15 +45418,6 @@ let
         sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==";
       };
     };
-    "phantomjs-prebuilt-2.1.16" = {
-      name = "phantomjs-prebuilt";
-      packageName = "phantomjs-prebuilt";
-      version = "2.1.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz";
-        sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef";
-      };
-    };
     "phin-2.9.3" = {
       name = "phin";
       packageName = "phin";
@@ -47525,15 +47381,6 @@ let
         sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
       };
     };
-    "promise-phantom-3.1.6" = {
-      name = "promise-phantom";
-      packageName = "promise-phantom";
-      version = "3.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz";
-        sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931";
-      };
-    };
     "promise-queue-2.2.5" = {
       name = "promise-queue";
       packageName = "promise-queue";
@@ -48776,6 +48623,15 @@ let
         sha512 = "bsyDHbFBvbofZ63xqF7hMhuKBX1h4WsqFIAoh1GuHr/Y9cewh+EFNAOdqWSkQRHLiBU/MY6M+8PUnXXjAPtuSg==";
       };
     };
+    "puppeteer-9.1.1" = {
+      name = "puppeteer";
+      packageName = "puppeteer";
+      version = "9.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz";
+        sha512 = "W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==";
+      };
+    };
     "purgecss-2.3.0" = {
       name = "purgecss";
       packageName = "purgecss";
@@ -49532,13 +49388,13 @@ let
         sha1 = "08c6e04a0168f6eb621c22ab6cb1151bd9f4a64d";
       };
     };
-    "rcedit-2.3.0" = {
+    "rcedit-3.0.1" = {
       name = "rcedit";
       packageName = "rcedit";
-      version = "2.3.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rcedit/-/rcedit-2.3.0.tgz";
-        sha512 = "h1gNEl9Oai1oijwyJ1WYqYSXTStHnOcv1KYljg/8WM4NAg3H1KBK3azIaKkQ1WQl+d7PoJpcBMscPfLXVKgCLQ==";
+        url = "https://registry.npmjs.org/rcedit/-/rcedit-3.0.1.tgz";
+        sha512 = "XM0Jv40/y4hVAqj/MO70o/IWs4uOsaSoo2mLyk3klFDW+SStLnCtzuQu+1OBTIMGlM8CvaK9ftlYCp6DJ+cMsw==";
       };
     };
     "re-emitter-1.1.4" = {
@@ -50180,13 +50036,13 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "rechoir-0.7.0" = {
+    "rechoir-0.7.1" = {
       name = "rechoir";
       packageName = "rechoir";
-      version = "0.7.0";
+      version = "0.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz";
-        sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==";
+        url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz";
+        sha512 = "/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==";
       };
     };
     "record-cache-1.1.1" = {
@@ -52340,13 +52196,13 @@ let
         sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==";
       };
     };
-    "schema-utils-3.1.0" = {
+    "schema-utils-3.1.1" = {
       name = "schema-utils";
       packageName = "schema-utils";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz";
-        sha512 = "tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==";
+        url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz";
+        sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==";
       };
     };
     "scoped-regex-2.1.0" = {
@@ -53852,13 +53708,13 @@ let
         sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ==";
       };
     };
-    "snyk-docker-plugin-4.21.3" = {
+    "snyk-docker-plugin-4.22.1" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "4.21.3";
+      version = "4.22.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.21.3.tgz";
-        sha512 = "u54T2ooQatEWeeFRgzpEl6PpyzEHjNU78VkMg2FarNzuNPdmVsE/Wb6rs8JsB8shTLS6jWp9XCY2zmkpr9Zgag==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.22.1.tgz";
+        sha512 = "fpXGkBu69Vb5meSrq0KjSKr0nlibA8z18fuH/O8HuDh1b5XyqKNz412njybpJtW07JPpA9rKX9gewRBZWch6fQ==";
       };
     };
     "snyk-go-parser-1.4.1" = {
@@ -55346,13 +55202,13 @@ let
         sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA==";
       };
     };
-    "sscaff-1.2.20" = {
+    "sscaff-1.2.21" = {
       name = "sscaff";
       packageName = "sscaff";
-      version = "1.2.20";
+      version = "1.2.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.20.tgz";
-        sha512 = "D5a+kU//hvpNbXUxIdKmEkzdmdByB8AB2PVVWUrkh08bZPGSZfbTALrBclQDVuxtKbrCa5X6d7SqwM69OltT2Q==";
+        url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.21.tgz";
+        sha512 = "X9Ei1liwS+LljdRsWz/QbgYK2sByLbDpvLTwVlL8+fGSz9Oh1D85WU3TR8kCCuPKLvfdGWIRimSQWvJ8zh5riw==";
       };
     };
     "ssh-config-1.1.6" = {
@@ -56624,13 +56480,13 @@ let
         sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa";
       };
     };
-    "strtok3-6.2.0" = {
+    "strtok3-6.2.2" = {
       name = "strtok3";
       packageName = "strtok3";
-      version = "6.2.0";
+      version = "6.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.0.tgz";
-        sha512 = "hBbPN4+f9fypbfTs0NImALgzYcb6k/blFr2mJVX6bUOmJCbXe/trDHdIC+Ir5XUXRMGFvq487ecwLitDoHVoew==";
+        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.2.tgz";
+        sha512 = "iUzLl3UhF2RfqQah80JngnfltQFLEidGyTX8+hHFMQFjzUj3UpIpOx824FtFmRI9bwyywReENpdHGDkFJwJlGQ==";
       };
     };
     "structured-source-3.0.2" = {
@@ -58479,15 +58335,6 @@ let
         sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0";
       };
     };
-    "tmp-0.0.31" = {
-      name = "tmp";
-      packageName = "tmp";
-      version = "0.0.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
-        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
-      };
-    };
     "tmp-0.0.33" = {
       name = "tmp";
       packageName = "tmp";
@@ -59955,15 +59802,6 @@ let
         sha512 = "57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg==";
       };
     };
-    "uglify-js-3.13.3" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "3.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.3.tgz";
-        sha512 = "otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig==";
-      };
-    };
     "uglify-js-3.4.10" = {
       name = "uglify-js";
       packageName = "uglify-js";
@@ -63115,13 +62953,13 @@ let
         sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA==";
       };
     };
-    "vue-eslint-parser-7.8.0" = {
+    "vue-eslint-parser-7.9.0" = {
       name = "vue-eslint-parser";
       packageName = "vue-eslint-parser";
-      version = "7.8.0";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.8.0.tgz";
-        sha512 = "ehmmrLZNYLUoKayvVW8l8HyPQIfuYZHiJoQLRP3dapDlTU7bGs4tqIKVGdAEpMuXS/b4R/PImCt7Tkj4UhX1SQ==";
+        url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.9.0.tgz";
+        sha512 = "QBlhZ5LteDRVy2dISfQhNEmmcqph+GTaD4SH41bYzXcVHFPJ9p34zCG6QAqOZVa8PKaVgbomFnoZpGJRZi14vg==";
       };
     };
     "vue-onsenui-helper-json-1.0.2" = {
@@ -63583,13 +63421,13 @@ let
         sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==";
       };
     };
-    "webpack-sources-2.3.0" = {
+    "webpack-sources-2.3.1" = {
       name = "webpack-sources";
       packageName = "webpack-sources";
-      version = "2.3.0";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.0.tgz";
-        sha512 = "WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==";
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz";
+        sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==";
       };
     };
     "webpack-stream-6.1.0" = {
@@ -63637,13 +63475,13 @@ let
         sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
       };
     };
-    "webtorrent-1.2.4" = {
+    "webtorrent-1.2.5" = {
       name = "webtorrent";
       packageName = "webtorrent";
-      version = "1.2.4";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.2.4.tgz";
-        sha512 = "oQf2HYtylJSHlPX8FDqn79JEO2Og856X78oZHH3So7zJK0RlQVdDolH82MvjbrVxDv6Mfa7s1rIjPKcy+hQEFw==";
+        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.2.5.tgz";
+        sha512 = "EvtAQ3rK4c7Kf4ZGxYOGvi8Jih8qsZka1IgNB8T5Vxw5UzSNG1nxTVNNTXL0jFhQUMsyRwIOkTgd7ZkJY6bqsw==";
       };
     };
     "well-known-symbols-2.0.0" = {
@@ -64573,15 +64411,6 @@ let
         sha512 = "eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==";
       };
     };
-    "ws-6.2.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "6.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz";
-        sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==";
-      };
-    };
     "ws-6.2.2" = {
       name = "ws";
       packageName = "ws";
@@ -64618,6 +64447,15 @@ let
         sha512 = "6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw==";
       };
     };
+    "ws-7.5.1" = {
+      name = "ws";
+      packageName = "ws";
+      version = "7.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz";
+        sha512 = "2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow==";
+      };
+    };
     "ws-7.5.3" = {
       name = "ws";
       packageName = "ws";
@@ -65708,15 +65546,6 @@ let
         sha512 = "7tDlwhrBG+oYFdXNOjILSurpfQyuVgkRe3hB2q8TEssamDHB7BbLWYkYO98nTn0FibfdFroFKDjndbgufAgS/Q==";
       };
     };
-    "zen-observable-0.5.2" = {
-      name = "zen-observable";
-      packageName = "zen-observable";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz";
-        sha512 = "Dhp/R0pqSHj3vPs5O1gVd9kZx5Iew2lqVcfJQOBHx3llM/dLea8vl9wSa9FK8wLdSBQJ6mmgKi9+Rk2DRH3i9Q==";
-      };
-    };
     "zen-observable-0.8.15" = {
       name = "zen-observable";
       packageName = "zen-observable";
@@ -67196,7 +67025,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       (sources."enhanced-resolve-5.8.2" // {
@@ -67371,7 +67200,7 @@ in
         dependencies = [
           sources."ajv-6.12.6"
           sources."json-schema-traverse-0.4.1"
-          sources."schema-utils-3.1.0"
+          sources."schema-utils-3.1.1"
           sources."source-map-0.6.1"
         ];
       })
@@ -67397,12 +67226,12 @@ in
         dependencies = [
           sources."ajv-6.12.6"
           sources."json-schema-traverse-0.4.1"
-          sources."schema-utils-3.1.0"
+          sources."schema-utils-3.1.1"
           sources."tapable-2.2.0"
         ];
       })
       sources."webpack-node-externals-3.0.0"
-      (sources."webpack-sources-2.3.0" // {
+      (sources."webpack-sources-2.3.1" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -67611,7 +67440,7 @@ in
       sources."@types/range-parser-1.2.4"
       sources."@types/serve-static-1.13.10"
       sources."@types/through-0.0.30"
-      sources."@types/ws-7.4.6"
+      sources."@types/ws-7.4.7"
       sources."@vue/cli-shared-utils-4.5.13"
       (sources."@vue/cli-ui-4.5.13" // {
         dependencies = [
@@ -67876,7 +67705,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.779"
+      sources."electron-to-chromium-1.3.780"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
@@ -68897,7 +68726,7 @@ in
       sources."convert-source-map-1.8.0"
       sources."debug-4.3.2"
       sources."ejs-3.1.6"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       sources."ensure-posix-path-1.1.1"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
@@ -69028,7 +68857,7 @@ in
       sources."browserslist-4.16.6"
       sources."caniuse-lite-1.0.30001245"
       sources."colorette-1.2.2"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       sources."escalade-3.1.1"
       sources."fraction.js-4.1.1"
       sources."node-releases-1.1.73"
@@ -69062,7 +68891,7 @@ in
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."ast-types-0.13.4"
-      (sources."aws-sdk-2.948.0" // {
+      (sources."aws-sdk-2.949.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -71411,7 +71240,7 @@ in
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commonmark-0.29.3"
-      sources."constructs-3.3.97"
+      sources."constructs-3.3.98"
       sources."date-format-3.0.0"
       sources."debug-4.3.2"
       sources."decamelize-5.0.0"
@@ -71484,13 +71313,13 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.300" // {
+      (sources."jsii-srcmak-0.1.301" // {
         dependencies = [
           sources."fs-extra-9.1.0"
         ];
       })
       sources."json-schema-0.3.0"
-      sources."json2jsii-0.1.267"
+      sources."json2jsii-0.1.270"
       sources."jsonfile-6.1.0"
       sources."jsonschema-1.4.0"
       sources."locate-path-5.0.0"
@@ -71526,7 +71355,7 @@ in
       sources."snake-case-3.0.4"
       sources."sort-json-2.0.0"
       sources."spdx-license-list-6.4.0"
-      sources."sscaff-1.2.20"
+      sources."sscaff-1.2.21"
       (sources."streamroller-2.2.4" // {
         dependencies = [
           sources."date-format-2.1.0"
@@ -71594,7 +71423,7 @@ in
           sources."type-fest-0.21.3"
         ];
       })
-      sources."ansi-regex-4.1.0"
+      sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."archiver-5.3.0"
       (sources."archiver-utils-2.1.0" // {
@@ -71641,7 +71470,7 @@ in
       sources."commonmark-0.29.3"
       sources."compress-commons-4.1.1"
       sources."concat-map-0.0.1"
-      sources."constructs-3.3.97"
+      sources."constructs-3.3.98"
       sources."convert-to-spaces-1.0.2"
       sources."core-util-is-1.0.2"
       sources."crc-32-1.2.0"
@@ -71696,7 +71525,7 @@ in
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      (sources."ink-3.0.8" // {
+      (sources."ink-3.0.9" // {
         dependencies = [
           sources."type-fest-0.12.0"
         ];
@@ -71760,7 +71589,7 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.300" // {
+      (sources."jsii-srcmak-0.1.301" // {
         dependencies = [
           sources."fs-extra-9.1.0"
           sources."jsonfile-6.1.0"
@@ -71843,7 +71672,7 @@ in
       sources."slice-ansi-3.0.0"
       sources."sort-json-2.0.0"
       sources."spdx-license-list-6.4.0"
-      sources."sscaff-1.2.20"
+      sources."sscaff-1.2.21"
       sources."stack-utils-2.0.3"
       sources."stream-buffers-3.0.2"
       (sources."streamroller-2.2.4" // {
@@ -71851,22 +71680,12 @@ in
           sources."date-format-2.1.0"
         ];
       })
-      (sources."string-length-3.1.0" // {
-        dependencies = [
-          sources."astral-regex-1.0.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
       sources."string-width-4.2.2"
       sources."string.prototype.repeat-0.2.0"
       sources."string.prototype.trimend-1.0.4"
       sources."string.prototype.trimstart-1.0.4"
       sources."string_decoder-1.1.1"
-      (sources."strip-ansi-6.0.0" // {
-        dependencies = [
-          sources."ansi-regex-5.0.0"
-        ];
-      })
+      sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
       sources."tar-stream-2.2.0"
       sources."type-fest-0.15.1"
@@ -72144,10 +71963,10 @@ in
   coc-explorer = nodeEnv.buildNodePackage {
     name = "coc-explorer";
     packageName = "coc-explorer";
-    version = "0.18.8";
+    version = "0.18.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.8.tgz";
-      sha512 = "CjSVxlpHutTkycvsJyebL+7Om+okMCkffn6V2LC9/Ix68/RVTjhmvwmbZhVe8zg5G9uyjdNUW+UpDBQy/GAm9Q==";
+      url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.11.tgz";
+      sha512 = "L16wPMe5iDrprv5JNlTBtTd3WmRM+kLN9u+lQTDFpj0t6WxE16WzCm2Ktl1jzgpGY+xcdGakbZAL2y9bLXaJqg==";
     };
     dependencies = [
       sources."@sindresorhus/df-3.1.1"
@@ -72230,10 +72049,10 @@ in
   coc-git = nodeEnv.buildNodePackage {
     name = "coc-git";
     packageName = "coc-git";
-    version = "2.4.0";
+    version = "2.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.0.tgz";
-      sha512 = "I2DcWVp/meb44yLAHrKvkLU869MLcwK1Tz87hk1W8+naD+9oMNvWBYjxQR7AU5l0WUB5SeCMuay63MFELhyPfA==";
+      url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.1.tgz";
+      sha512 = "CgBUD5qPMvbdTUKTIaeKPxmJSieVJNK3JS1PPgr4ivIXqXYZ4ECP4DM7jmnkA+BnK9Xvz1FnlebUTxTv3z/IFQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -72661,7 +72480,7 @@ in
           sources."escape-string-regexp-1.0.5"
         ];
       })
-      sources."@eslint/eslintrc-0.4.2"
+      sources."@eslint/eslintrc-0.4.3"
       sources."@humanwhocodes/config-array-0.5.0"
       sources."@humanwhocodes/object-schema-1.2.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
@@ -72831,14 +72650,14 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enquirer-2.3.6"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-4.0.0"
-      (sources."eslint-7.30.0" // {
+      (sources."eslint-7.31.0" // {
         dependencies = [
           sources."eslint-visitor-keys-2.1.0"
         ];
@@ -73630,10 +73449,10 @@ in
   coc-pyright = nodeEnv.buildNodePackage {
     name = "coc-pyright";
     packageName = "coc-pyright";
-    version = "1.1.156";
+    version = "1.1.157";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.156.tgz";
-      sha512 = "lPtMmvdxFMVKm7KYKWVDmYyQo1KpG7oOwre4WlKj4+TeWxhOfkxz2q1HtsoYeideu0X9Y6GCGNlBpeZbFMhP4g==";
+      url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.157.tgz";
+      sha512 = "GyjrMQFSqrAnBB0SlZC93JV9E8VAcsDhfCBHZ6DIRDCH9qsSI3g0Y0RGJp7v+JHDDZTrEPJiiPOu1e/6PFA90A==";
     };
     dependencies = [
       sources."pyright-1.1.157"
@@ -73880,7 +73699,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -74289,7 +74108,7 @@ in
           sources."escape-string-regexp-1.0.5"
         ];
       })
-      sources."@eslint/eslintrc-0.4.2"
+      sources."@eslint/eslintrc-0.4.3"
       sources."@humanwhocodes/config-array-0.5.0"
       sources."@humanwhocodes/object-schema-1.2.0"
       sources."acorn-7.4.1"
@@ -74325,8 +74144,12 @@ in
       sources."emoji-regex-8.0.0"
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-4.0.0"
-      sources."eslint-7.30.0"
-      sources."eslint-plugin-vue-7.13.0"
+      sources."eslint-7.31.0"
+      (sources."eslint-plugin-vue-7.14.0" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
         dependencies = [
@@ -74443,7 +74266,7 @@ in
       sources."uri-js-4.4.1"
       sources."v8-compile-cache-2.3.0"
       sources."vls-0.7.4"
-      (sources."vue-eslint-parser-7.8.0" // {
+      (sources."vue-eslint-parser-7.9.0" // {
         dependencies = [
           sources."eslint-visitor-keys-1.3.0"
           sources."espree-6.2.1"
@@ -74656,10 +74479,10 @@ in
   configurable-http-proxy = nodeEnv.buildNodePackage {
     name = "configurable-http-proxy";
     packageName = "configurable-http-proxy";
-    version = "4.4.0";
+    version = "4.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.4.0.tgz";
-      sha512 = "8tSSnS8pjuw6Wtu/3Ufd2elV/3DnE3AUu3L+IYyukLoQNrRY9iS+Qfg3e1APokk7OzSghDkxW7yRZFiAoHF6FQ==";
+      url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.5.0.tgz";
+      sha512 = "iuaG85EDWIp02Dm1LZsi7vRE4CH5cRwo2+GaEEAi6fgX3dRLpt/jhQc7ylwXibi4kUjMvpV/xbMwjRRmGcg4NQ==";
     };
     dependencies = [
       sources."@dabh/diagnostics-2.0.2"
@@ -74671,7 +74494,7 @@ in
       sources."color-string-1.6.0"
       sources."colors-1.4.0"
       sources."colorspace-1.1.2"
-      sources."commander-7.2.0"
+      sources."commander-8.0.0"
       sources."core-util-is-1.0.2"
       sources."enabled-2.0.0"
       sources."eventemitter3-4.0.7"
@@ -76971,30 +76794,30 @@ in
   "@electron-forge/cli" = nodeEnv.buildNodePackage {
     name = "_at_electron-forge_slash_cli";
     packageName = "@electron-forge/cli";
-    version = "6.0.0-beta.57";
+    version = "6.0.0-beta.58";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.57.tgz";
-      sha512 = "ouIL3FI6C0W3iLwwwQzKufjoP/OZagUDMCDjGLN/dqeg+lZ+cR40bdfaNTFha9ajz+zSe2SmhCOMVUVNNkJ5Sg==";
+      url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.58.tgz";
+      sha512 = "dlGj8lrtUGOwoNaU/zEhbJMOEAqiZUcn9AJrX80saSplkkWEkOpoo4UkLJ256BLyK8nA1+k89pT/KMtFrUFcPg==";
     };
     dependencies = [
-      sources."@electron-forge/async-ora-6.0.0-beta.57"
-      sources."@electron-forge/core-6.0.0-beta.57"
-      sources."@electron-forge/installer-base-6.0.0-beta.57"
-      sources."@electron-forge/installer-darwin-6.0.0-beta.57"
-      sources."@electron-forge/installer-deb-6.0.0-beta.57"
-      sources."@electron-forge/installer-dmg-6.0.0-beta.57"
-      sources."@electron-forge/installer-exe-6.0.0-beta.57"
-      sources."@electron-forge/installer-linux-6.0.0-beta.57"
-      sources."@electron-forge/installer-rpm-6.0.0-beta.57"
-      sources."@electron-forge/installer-zip-6.0.0-beta.57"
-      sources."@electron-forge/maker-base-6.0.0-beta.57"
-      sources."@electron-forge/plugin-base-6.0.0-beta.57"
-      sources."@electron-forge/publisher-base-6.0.0-beta.57"
-      sources."@electron-forge/shared-types-6.0.0-beta.57"
-      sources."@electron-forge/template-base-6.0.0-beta.57"
-      sources."@electron-forge/template-typescript-6.0.0-beta.57"
-      sources."@electron-forge/template-typescript-webpack-6.0.0-beta.57"
-      sources."@electron-forge/template-webpack-6.0.0-beta.57"
+      sources."@electron-forge/async-ora-6.0.0-beta.58"
+      sources."@electron-forge/core-6.0.0-beta.58"
+      sources."@electron-forge/installer-base-6.0.0-beta.58"
+      sources."@electron-forge/installer-darwin-6.0.0-beta.58"
+      sources."@electron-forge/installer-deb-6.0.0-beta.58"
+      sources."@electron-forge/installer-dmg-6.0.0-beta.58"
+      sources."@electron-forge/installer-exe-6.0.0-beta.58"
+      sources."@electron-forge/installer-linux-6.0.0-beta.58"
+      sources."@electron-forge/installer-rpm-6.0.0-beta.58"
+      sources."@electron-forge/installer-zip-6.0.0-beta.58"
+      sources."@electron-forge/maker-base-6.0.0-beta.58"
+      sources."@electron-forge/plugin-base-6.0.0-beta.58"
+      sources."@electron-forge/publisher-base-6.0.0-beta.58"
+      sources."@electron-forge/shared-types-6.0.0-beta.58"
+      sources."@electron-forge/template-base-6.0.0-beta.58"
+      sources."@electron-forge/template-typescript-6.0.0-beta.58"
+      sources."@electron-forge/template-typescript-webpack-6.0.0-beta.58"
+      sources."@electron-forge/template-webpack-6.0.0-beta.58"
       (sources."@electron/get-1.12.4" // {
         dependencies = [
           sources."@sindresorhus/is-0.14.0"
@@ -77021,7 +76844,7 @@ in
           sources."universalify-0.1.2"
         ];
       })
-      sources."@malept/cross-spawn-promise-1.1.1"
+      sources."@malept/cross-spawn-promise-2.0.0"
       sources."@sindresorhus/is-4.0.1"
       sources."@szmarczak/http-timer-4.0.6"
       sources."@types/cacheable-request-6.0.2"
@@ -77108,6 +76931,11 @@ in
       sources."core-js-3.15.2"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-7.0.3"
+      (sources."cross-spawn-windows-exe-1.2.0" // {
+        dependencies = [
+          sources."@malept/cross-spawn-promise-1.1.1"
+        ];
+      })
       sources."currently-unhandled-0.4.1"
       sources."dashdash-1.14.1"
       (sources."debug-4.3.2" // {
@@ -77146,13 +76974,14 @@ in
           sources."debug-2.6.9"
         ];
       })
-      (sources."electron-packager-15.2.0" // {
+      (sources."electron-packager-15.3.0" // {
         dependencies = [
           sources."fs-extra-9.1.0"
         ];
       })
       (sources."electron-rebuild-2.3.5" // {
         dependencies = [
+          sources."@malept/cross-spawn-promise-1.1.1"
           sources."fs-extra-9.1.0"
         ];
       })
@@ -77449,7 +77278,7 @@ in
       sources."qs-6.5.2"
       sources."quick-lru-5.1.1"
       sources."rc-1.2.8"
-      sources."rcedit-2.3.0"
+      sources."rcedit-3.0.1"
       sources."read-pkg-2.0.0"
       (sources."read-pkg-up-2.0.0" // {
         dependencies = [
@@ -77733,7 +77562,7 @@ in
       })
       sources."defer-to-connect-2.0.1"
       sources."dot-prop-5.3.0"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       sources."emoji-regex-8.0.0"
       sources."emojilib-2.4.0"
       sources."end-of-stream-1.4.4"
@@ -77763,7 +77592,7 @@ in
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      (sources."ink-3.0.8" // {
+      (sources."ink-3.0.9" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.1"
@@ -77916,13 +77745,6 @@ in
           sources."escape-string-regexp-2.0.0"
         ];
       })
-      (sources."string-length-3.1.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."astral-regex-1.0.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
       sources."string-width-4.2.2"
       sources."strip-ansi-6.0.0"
       sources."strip-eof-1.0.0"
@@ -79678,10 +79500,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "7.30.0";
+    version = "7.31.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz";
-      sha512 = "VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==";
+      url = "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz";
+      sha512 = "vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.12.11"
@@ -79888,7 +79710,7 @@ in
       sources."emoji-regex-8.0.0"
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-4.0.0"
-      sources."eslint-7.30.0"
+      sources."eslint-7.31.0"
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
         dependencies = [
@@ -80649,12 +80471,7 @@ in
       })
       sources."code-point-at-1.1.0"
       sources."collection-visit-1.0.0"
-      (sources."color-3.2.0" // {
-        dependencies = [
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-        ];
-      })
+      sources."color-3.2.1"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."color-string-1.6.0"
@@ -80851,7 +80668,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.779"
+      sources."electron-to-chromium-1.3.780"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -82259,7 +82076,7 @@ in
       sources."url-join-4.0.0"
       (sources."url-loader-4.1.1" // {
         dependencies = [
-          sources."schema-utils-3.1.0"
+          sources."schema-utils-3.1.1"
         ];
       })
       sources."url-parse-1.5.1"
@@ -82562,184 +82379,274 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "fast-cli-1.x" = nodeEnv.buildNodePackage {
+  fast-cli = nodeEnv.buildNodePackage {
     name = "fast-cli";
     packageName = "fast-cli";
-    version = "1.0.0";
+    version = "3.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/fast-cli/-/fast-cli-1.0.0.tgz";
-      sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010";
+      url = "https://registry.npmjs.org/fast-cli/-/fast-cli-3.0.1.tgz";
+      sha512 = "QT3uBdxjHiXEz8iSAUJezETjKgTEP0PicHk36ga2veZHmIpqU5k+M0z1bmZ5G+EJHCN84o4w++fngJIgcj1Nqw==";
     };
     dependencies = [
-      sources."ajv-6.12.6"
-      sources."ansi-escapes-1.4.0"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."array-find-index-1.0.2"
-      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."bcrypt-pbkdf-1.0.2"
+      sources."@babel/code-frame-7.14.5"
+      sources."@babel/compat-data-7.14.7"
+      sources."@babel/core-7.14.6"
+      sources."@babel/generator-7.14.5"
+      sources."@babel/helper-annotate-as-pure-7.14.5"
+      sources."@babel/helper-compilation-targets-7.14.5"
+      sources."@babel/helper-function-name-7.14.5"
+      sources."@babel/helper-get-function-arity-7.14.5"
+      sources."@babel/helper-hoist-variables-7.14.5"
+      sources."@babel/helper-member-expression-to-functions-7.14.7"
+      sources."@babel/helper-module-imports-7.14.5"
+      sources."@babel/helper-module-transforms-7.14.5"
+      sources."@babel/helper-optimise-call-expression-7.14.5"
+      sources."@babel/helper-plugin-utils-7.14.5"
+      sources."@babel/helper-replace-supers-7.14.5"
+      sources."@babel/helper-simple-access-7.14.5"
+      sources."@babel/helper-split-export-declaration-7.14.5"
+      sources."@babel/helper-validator-identifier-7.14.5"
+      sources."@babel/helper-validator-option-7.14.5"
+      sources."@babel/helpers-7.14.6"
+      sources."@babel/highlight-7.14.5"
+      sources."@babel/parser-7.14.7"
+      sources."@babel/plugin-proposal-object-rest-spread-7.14.7"
+      sources."@babel/plugin-syntax-jsx-7.14.5"
+      sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
+      sources."@babel/plugin-transform-destructuring-7.14.7"
+      sources."@babel/plugin-transform-parameters-7.14.5"
+      sources."@babel/plugin-transform-react-jsx-7.14.5"
+      sources."@babel/template-7.14.5"
+      sources."@babel/traverse-7.14.7"
+      sources."@babel/types-7.14.5"
+      sources."@types/minimist-1.2.2"
+      sources."@types/node-16.3.3"
+      sources."@types/normalize-package-data-2.4.1"
+      sources."@types/yauzl-2.9.2"
+      sources."@types/yoga-layout-1.9.2"
+      sources."agent-base-6.0.2"
+      (sources."ansi-escapes-4.3.2" // {
+        dependencies = [
+          sources."type-fest-0.21.3"
+        ];
+      })
+      sources."ansi-regex-5.0.0"
+      sources."ansi-styles-3.2.1"
+      sources."arrify-1.0.1"
+      sources."astral-regex-2.0.0"
+      sources."auto-bind-4.0.0"
+      sources."balanced-match-1.0.2"
+      sources."base64-js-1.5.1"
+      sources."bl-4.1.0"
+      sources."brace-expansion-1.1.11"
+      sources."browserslist-4.16.6"
+      sources."buffer-5.7.1"
       sources."buffer-crc32-0.2.13"
-      sources."buffer-from-1.1.1"
-      sources."camelcase-2.1.1"
-      sources."camelcase-keys-2.1.0"
-      sources."caseless-0.12.0"
-      sources."chalk-1.1.3"
-      sources."cli-cursor-1.0.2"
-      sources."cli-spinners-1.3.1"
-      sources."co-4.6.0"
+      sources."caller-callsite-2.0.0"
+      sources."caller-path-2.0.0"
+      sources."callsites-2.0.0"
+      sources."camelcase-5.3.1"
+      sources."camelcase-keys-6.2.2"
+      sources."caniuse-lite-1.0.30001245"
+      sources."chalk-2.4.2"
+      sources."chownr-1.1.4"
+      sources."ci-info-2.0.0"
+      sources."cli-boxes-2.2.1"
+      sources."cli-cursor-3.1.0"
+      sources."cli-spinners-2.6.0"
+      sources."cli-truncate-2.1.0"
+      sources."code-excerpt-3.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."combined-stream-1.0.8"
-      sources."concat-stream-1.6.2"
-      sources."core-util-is-1.0.2"
-      sources."currently-unhandled-0.4.1"
-      sources."dashdash-1.14.1"
-      sources."debug-2.6.9"
+      sources."colorette-1.2.2"
+      sources."commondir-1.0.1"
+      sources."concat-map-0.0.1"
+      sources."convert-source-map-1.8.0"
+      sources."convert-to-spaces-1.0.2"
+      sources."debug-4.3.2"
       sources."decamelize-1.2.0"
-      sources."delayed-stream-1.0.0"
-      sources."ecc-jsbn-0.1.2"
+      (sources."decamelize-keys-1.1.0" // {
+        dependencies = [
+          sources."map-obj-1.0.1"
+        ];
+      })
+      sources."delay-5.0.0"
+      sources."devtools-protocol-0.0.869402"
+      sources."electron-to-chromium-1.3.780"
+      sources."emoji-regex-8.0.0"
+      sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
-      sources."es6-promise-4.2.8"
+      sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
-      sources."exit-hook-1.1.1"
-      sources."extend-3.0.2"
-      sources."extract-zip-1.7.0"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
+      sources."extract-zip-2.0.1"
       sources."fd-slicer-1.1.0"
-      sources."find-up-1.1.2"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."fs-extra-1.0.0"
+      sources."find-cache-dir-3.3.1"
+      sources."find-up-4.1.0"
+      sources."fs-constants-1.0.0"
+      sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
-      sources."get-stdin-4.0.1"
-      sources."getpass-0.1.7"
-      sources."graceful-fs-4.2.6"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
+      sources."gensync-1.0.0-beta.2"
+      sources."get-stream-5.2.0"
+      sources."glob-7.1.7"
+      sources."globals-11.12.0"
+      sources."hard-rejection-2.1.0"
       sources."has-1.0.3"
-      sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."hasha-2.2.0"
-      sources."hosted-git-info-2.8.9"
-      sources."http-signature-1.2.0"
-      sources."indent-string-2.1.0"
+      sources."hosted-git-info-4.0.2"
+      sources."https-proxy-agent-5.0.0"
+      sources."ieee754-1.2.1"
+      sources."import-jsx-4.0.0"
+      sources."indent-string-4.0.0"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.4"
+      (sources."ink-3.0.9" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."chalk-4.1.1"
+          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."ink-spinner-4.0.2"
       sources."is-arrayish-0.2.1"
+      sources."is-ci-2.0.0"
       sources."is-core-module-2.5.0"
-      sources."is-finite-1.1.0"
-      sources."is-stream-1.1.0"
-      sources."is-typedarray-1.0.0"
-      sources."is-utf8-0.2.1"
-      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."kew-0.7.0"
-      sources."klaw-1.3.1"
-      sources."load-json-file-1.1.0"
-      (sources."log-symbols-2.2.0" // {
+      sources."is-fullwidth-code-point-3.0.0"
+      sources."is-plain-obj-1.1.0"
+      sources."js-tokens-4.0.0"
+      sources."jsesc-2.5.2"
+      sources."json-parse-even-better-errors-2.3.1"
+      sources."json5-2.2.0"
+      sources."kind-of-6.0.3"
+      sources."lines-and-columns-1.1.6"
+      sources."locate-path-5.0.0"
+      sources."lodash-4.17.21"
+      sources."loose-envify-1.4.0"
+      sources."lru-cache-6.0.0"
+      sources."make-dir-3.1.0"
+      sources."map-obj-4.2.1"
+      (sources."meow-9.0.0" // {
         dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."supports-color-5.5.0"
+          sources."type-fest-0.18.1"
         ];
       })
-      sources."log-update-1.0.2"
-      sources."loud-rejection-1.6.0"
-      sources."map-obj-1.0.1"
-      sources."meow-3.7.0"
-      sources."mime-db-1.48.0"
-      sources."mime-types-2.1.31"
-      sources."mimic-fn-1.2.0"
+      sources."mimic-fn-2.1.0"
+      sources."min-indent-1.0.1"
+      sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      sources."mkdirp-0.5.5"
-      sources."mkpath-1.0.0"
-      sources."ms-2.0.0"
-      sources."node-phantom-simple-2.2.4"
-      sources."normalize-package-data-2.5.0"
-      sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
-      sources."onetime-1.1.0"
-      (sources."ora-1.4.0" // {
+      sources."minimist-options-4.1.0"
+      sources."mkdirp-classic-0.5.3"
+      sources."ms-2.1.2"
+      sources."node-fetch-2.6.1"
+      sources."node-releases-1.1.73"
+      (sources."normalize-package-data-3.0.2" // {
         dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."cli-cursor-2.1.0"
-          sources."onetime-2.0.1"
-          sources."restore-cursor-2.0.0"
-          sources."supports-color-5.5.0"
+          sources."semver-7.3.5"
         ];
       })
-      sources."os-tmpdir-1.0.2"
-      sources."parse-json-2.2.0"
-      sources."path-exists-2.1.0"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."onetime-5.1.2"
+      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."patch-console-1.0.0"
+      sources."path-exists-4.0.0"
+      sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.7"
-      sources."path-type-1.1.0"
       sources."pend-1.2.0"
-      sources."performance-now-2.1.0"
-      sources."phantomjs-prebuilt-2.1.16"
-      sources."pify-2.3.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      sources."process-nextick-args-2.0.1"
-      sources."progress-1.1.8"
-      sources."promise-phantom-3.1.6"
-      sources."psl-1.8.0"
-      sources."punycode-2.1.1"
-      sources."qs-6.5.2"
-      sources."read-pkg-1.1.0"
-      sources."read-pkg-up-1.0.1"
-      sources."readable-stream-2.3.7"
-      sources."redent-1.0.0"
-      sources."repeating-2.0.1"
-      sources."request-2.88.2"
-      sources."request-progress-2.0.1"
+      sources."pkg-dir-4.2.0"
+      sources."progress-2.0.3"
+      sources."prop-types-15.7.2"
+      sources."proxy-from-env-1.1.0"
+      sources."pump-3.0.0"
+      sources."puppeteer-9.1.1"
+      sources."quick-lru-4.0.1"
+      sources."react-16.14.0"
+      sources."react-devtools-core-4.14.0"
+      sources."react-is-16.13.1"
+      sources."react-reconciler-0.24.0"
+      (sources."read-pkg-5.2.0" // {
+        dependencies = [
+          sources."hosted-git-info-2.8.9"
+          sources."normalize-package-data-2.5.0"
+          sources."semver-5.7.1"
+          sources."type-fest-0.6.0"
+        ];
+      })
+      (sources."read-pkg-up-7.0.1" // {
+        dependencies = [
+          sources."type-fest-0.8.1"
+        ];
+      })
+      sources."readable-stream-3.6.0"
+      sources."redent-3.0.0"
       sources."resolve-1.20.0"
-      sources."restore-cursor-1.0.1"
+      sources."resolve-from-3.0.0"
+      sources."restore-cursor-3.1.0"
+      sources."rimraf-3.0.2"
       sources."safe-buffer-5.1.2"
-      sources."safer-buffer-2.1.2"
-      sources."semver-5.7.1"
+      sources."scheduler-0.18.0"
+      sources."semver-6.3.0"
+      sources."shell-quote-1.7.2"
       sources."signal-exit-3.0.3"
+      (sources."slice-ansi-3.0.0" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+        ];
+      })
+      sources."source-map-0.5.7"
       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.9"
-      sources."sshpk-1.16.1"
-      sources."string_decoder-1.1.1"
-      sources."strip-ansi-3.0.1"
-      sources."strip-bom-2.0.0"
-      sources."strip-indent-1.0.1"
-      sources."supports-color-2.0.0"
-      sources."throttleit-1.0.0"
-      sources."tmp-0.0.31"
-      sources."tough-cookie-2.5.0"
-      sources."trim-newlines-1.0.0"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."typedarray-0.0.6"
-      sources."uri-js-4.4.1"
+      (sources."stack-utils-2.0.3" // {
+        dependencies = [
+          sources."escape-string-regexp-2.0.0"
+        ];
+      })
+      sources."string-width-4.2.2"
+      (sources."string_decoder-1.3.0" // {
+        dependencies = [
+          sources."safe-buffer-5.2.1"
+        ];
+      })
+      sources."strip-ansi-6.0.0"
+      sources."strip-indent-3.0.0"
+      sources."supports-color-5.5.0"
+      sources."tar-fs-2.1.1"
+      sources."tar-stream-2.2.0"
+      sources."through-2.3.8"
+      sources."to-fast-properties-2.0.0"
+      sources."trim-newlines-3.0.1"
+      sources."type-fest-0.12.0"
+      sources."unbzip2-stream-1.4.3"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.4.0"
       sources."validate-npm-package-license-3.0.4"
-      sources."verror-1.10.0"
-      sources."which-1.3.1"
+      sources."widest-line-3.1.0"
+      (sources."wrap-ansi-6.2.0" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+        ];
+      })
+      sources."wrappy-1.0.2"
+      sources."ws-7.5.3"
+      sources."yallist-4.0.0"
+      sources."yargs-parser-20.2.9"
       sources."yauzl-2.10.0"
-      sources."zen-observable-0.5.2"
+      sources."yoga-layout-prebuilt-1.10.0"
+      sources."zen-observable-0.8.15"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Test your download speed using fast.com";
+      description = "Test your download and upload speed using fast.com";
       homepage = "https://github.com/sindresorhus/fast-cli#readme";
       license = "MIT";
     };
@@ -83390,7 +83297,7 @@ in
           sources."google-auth-library-7.3.0"
         ];
       })
-      sources."@grpc/grpc-js-1.3.5"
+      sources."@grpc/grpc-js-1.3.6"
       sources."@grpc/proto-loader-0.6.4"
       sources."@jsdevtools/ono-7.1.3"
       (sources."@npmcli/move-file-1.1.2" // {
@@ -85473,7 +85380,7 @@ in
       sources."dotenv-8.6.0"
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
@@ -85884,7 +85791,7 @@ in
       sources."strip-final-newline-2.0.0"
       sources."strip-indent-3.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."strtok3-6.2.0"
+      sources."strtok3-6.2.2"
       sources."style-to-object-0.3.0"
       sources."supports-color-5.5.0"
       sources."term-size-2.2.1"
@@ -87215,7 +87122,7 @@ in
       sources."path-root-0.1.1"
       sources."path-root-regex-0.1.2"
       sources."picomatch-2.3.0"
-      sources."rechoir-0.7.0"
+      sources."rechoir-0.7.1"
       sources."resolve-1.20.0"
       sources."resolve-dir-1.0.1"
       sources."to-regex-range-5.0.1"
@@ -89387,9 +89294,9 @@ in
     dependencies = [
       sources."@iarna/toml-2.2.5"
       sources."@msgpack/msgpack-2.7.0"
-      sources."@ot-builder/bin-composite-types-1.0.11"
-      sources."@ot-builder/bin-util-1.0.11"
-      (sources."@ot-builder/cli-help-shower-1.0.11" // {
+      sources."@ot-builder/bin-composite-types-1.1.0"
+      sources."@ot-builder/bin-util-1.1.0"
+      (sources."@ot-builder/cli-help-shower-1.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.1"
@@ -89399,37 +89306,37 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."@ot-builder/cli-proc-1.0.11"
-      sources."@ot-builder/cli-shared-1.0.11"
-      sources."@ot-builder/common-impl-1.0.11"
-      sources."@ot-builder/errors-1.0.11"
-      sources."@ot-builder/io-bin-cff-1.0.11"
-      sources."@ot-builder/io-bin-encoding-1.0.11"
-      sources."@ot-builder/io-bin-ext-private-1.0.11"
-      sources."@ot-builder/io-bin-font-1.0.11"
-      sources."@ot-builder/io-bin-glyph-store-1.0.11"
-      sources."@ot-builder/io-bin-layout-1.0.11"
-      sources."@ot-builder/io-bin-metadata-1.0.11"
-      sources."@ot-builder/io-bin-metric-1.0.11"
-      sources."@ot-builder/io-bin-name-1.0.11"
-      sources."@ot-builder/io-bin-sfnt-1.0.11"
-      sources."@ot-builder/io-bin-ttf-1.0.11"
-      sources."@ot-builder/ot-1.0.11"
-      sources."@ot-builder/ot-encoding-1.0.11"
-      sources."@ot-builder/ot-ext-private-1.0.11"
-      sources."@ot-builder/ot-glyphs-1.0.11"
-      sources."@ot-builder/ot-layout-1.0.11"
-      sources."@ot-builder/ot-metadata-1.0.11"
-      sources."@ot-builder/ot-name-1.0.11"
-      sources."@ot-builder/ot-sfnt-1.0.11"
-      sources."@ot-builder/ot-standard-glyph-namer-1.0.11"
-      sources."@ot-builder/prelude-1.0.11"
-      sources."@ot-builder/primitive-1.0.11"
-      sources."@ot-builder/rectify-1.0.11"
-      sources."@ot-builder/stat-glyphs-1.0.11"
-      sources."@ot-builder/trace-1.0.11"
-      sources."@ot-builder/var-store-1.0.11"
-      sources."@ot-builder/variance-1.0.11"
+      sources."@ot-builder/cli-proc-1.1.0"
+      sources."@ot-builder/cli-shared-1.1.0"
+      sources."@ot-builder/common-impl-1.1.0"
+      sources."@ot-builder/errors-1.1.0"
+      sources."@ot-builder/io-bin-cff-1.1.0"
+      sources."@ot-builder/io-bin-encoding-1.1.0"
+      sources."@ot-builder/io-bin-ext-private-1.1.0"
+      sources."@ot-builder/io-bin-font-1.1.0"
+      sources."@ot-builder/io-bin-glyph-store-1.1.0"
+      sources."@ot-builder/io-bin-layout-1.1.0"
+      sources."@ot-builder/io-bin-metadata-1.1.0"
+      sources."@ot-builder/io-bin-metric-1.1.0"
+      sources."@ot-builder/io-bin-name-1.1.0"
+      sources."@ot-builder/io-bin-sfnt-1.1.0"
+      sources."@ot-builder/io-bin-ttf-1.1.0"
+      sources."@ot-builder/ot-1.1.0"
+      sources."@ot-builder/ot-encoding-1.1.0"
+      sources."@ot-builder/ot-ext-private-1.1.0"
+      sources."@ot-builder/ot-glyphs-1.1.0"
+      sources."@ot-builder/ot-layout-1.1.0"
+      sources."@ot-builder/ot-metadata-1.1.0"
+      sources."@ot-builder/ot-name-1.1.0"
+      sources."@ot-builder/ot-sfnt-1.1.0"
+      sources."@ot-builder/ot-standard-glyph-namer-1.1.0"
+      sources."@ot-builder/prelude-1.1.0"
+      sources."@ot-builder/primitive-1.1.0"
+      sources."@ot-builder/rectify-1.1.0"
+      sources."@ot-builder/stat-glyphs-1.1.0"
+      sources."@ot-builder/trace-1.1.0"
+      sources."@ot-builder/var-store-1.1.0"
+      sources."@ot-builder/variance-1.1.0"
       sources."@unicode/unicode-13.0.0-1.1.0"
       sources."aglfn-1.0.2"
       sources."amdefine-1.0.1"
@@ -89511,8 +89418,8 @@ in
       sources."once-1.4.0"
       sources."onetime-5.1.2"
       sources."optionator-0.8.3"
-      sources."ot-builder-1.0.11"
-      sources."otb-ttc-bundle-1.0.11"
+      sources."ot-builder-1.1.0"
+      sources."otb-ttc-bundle-1.1.0"
       sources."passerror-1.1.1"
       sources."patel-0.34.0"
       sources."path-is-absolute-1.0.1"
@@ -89786,7 +89693,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.948.0" // {
+      (sources."aws-sdk-2.949.0" // {
         dependencies = [
           sources."sax-1.2.1"
           sources."uuid-3.3.2"
@@ -90272,9 +90179,7 @@ in
       sources."seventh-0.7.40"
       (sources."sharp-0.26.3" // {
         dependencies = [
-          sources."color-3.2.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
+          sources."color-3.2.1"
           sources."decompress-response-6.0.0"
           sources."mimic-response-3.1.0"
           sources."simple-get-4.0.0"
@@ -94921,7 +94826,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -96827,10 +96732,10 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "4.4.2";
+    version = "4.4.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.4.2.tgz";
-      sha512 = "VR0FrWp5wRUxTSTq/RDv6Lybhi/KL8UCf1pQN6xyUDBamysfPneunOB/TNa29cazM+AXslVYxe8VnDJxMjBaiA==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.4.4.tgz";
+      sha512 = "vDyRF0MxUCccnk/nttQtWSE+KrcHgqjT0s/SyK7Hw06dAKg9X5kDyvDXjHQl2Dmc8Nc68050xc9ql36xUid2dQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.14.5"
@@ -97016,7 +96921,7 @@ in
         ];
       })
       sources."@netlify/open-api-2.5.0"
-      (sources."@netlify/plugin-edge-handlers-1.11.21" // {
+      (sources."@netlify/plugin-edge-handlers-1.11.22" // {
         dependencies = [
           sources."@types/node-14.17.5"
         ];
@@ -97211,8 +97116,8 @@ in
       sources."@types/semver-7.3.7"
       sources."@types/yargs-13.0.12"
       sources."@types/yargs-parser-20.2.1"
-      sources."@typescript-eslint/types-4.28.3"
-      (sources."@typescript-eslint/typescript-estree-4.28.3" // {
+      sources."@typescript-eslint/types-4.28.4"
+      (sources."@typescript-eslint/typescript-estree-4.28.4" // {
         dependencies = [
           sources."@nodelib/fs.stat-2.0.5"
           sources."array-union-2.1.0"
@@ -97229,7 +97134,7 @@ in
           sources."to-regex-range-5.0.1"
         ];
       })
-      sources."@typescript-eslint/visitor-keys-4.28.3"
+      sources."@typescript-eslint/visitor-keys-4.28.4"
       sources."@ungap/from-entries-0.2.1"
       sources."accepts-1.3.7"
       sources."acorn-8.4.1"
@@ -97628,7 +97533,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       sources."elegant-spinner-1.0.1"
       sources."elf-cam-0.1.1"
       sources."emoji-regex-8.0.0"
@@ -99326,20 +99231,20 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "1.3.5";
+    version = "2.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-1.3.5.tgz";
-      sha512 = "P/EmWwzuY/0mQFlrklSUrVANdv9xQsbrpKrpfA8tuhhxu1OEiSgzYdo87Zj13Hi38K4f1rNPQj4rw2vEBcYS/g==";
+      url = "https://registry.npmjs.org/node-red/-/node-red-2.0.1.tgz";
+      sha512 = "r+wpPLWySuj/toc1mMkR8++mpFoTm9RZwsqe6guFc/IwEpQdDpmYkT11OGmTqjUqr8WdteOP+MNvdgNgtTzyxQ==";
     };
     dependencies = [
       sources."@babel/runtime-7.14.6"
-      sources."@node-red/editor-api-1.3.5"
-      sources."@node-red/editor-client-1.3.5"
-      (sources."@node-red/nodes-1.3.5" // {
+      sources."@mapbox/node-pre-gyp-1.0.5"
+      sources."@node-red/editor-api-2.0.1"
+      sources."@node-red/editor-client-2.0.1"
+      (sources."@node-red/nodes-2.0.1" // {
         dependencies = [
-          sources."cookie-0.4.1"
           sources."http-errors-1.7.3"
-          sources."iconv-lite-0.6.2"
+          sources."iconv-lite-0.6.3"
           sources."inherits-2.0.4"
           sources."media-typer-1.1.0"
           (sources."raw-body-2.4.1" // {
@@ -99349,18 +99254,28 @@ in
           })
         ];
       })
-      sources."@node-red/registry-1.3.5"
-      sources."@node-red/runtime-1.3.5"
-      sources."@node-red/util-1.3.5"
+      sources."@node-red/registry-2.0.1"
+      sources."@node-red/runtime-2.0.1"
+      sources."@node-red/util-2.0.1"
+      sources."@sindresorhus/is-4.0.1"
+      sources."@szmarczak/http-timer-4.0.6"
+      sources."@types/cacheable-request-6.0.2"
+      sources."@types/http-cache-semantics-4.0.1"
+      sources."@types/keyv-3.1.2"
+      sources."@types/node-16.3.3"
+      sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
+      sources."acorn-8.4.1"
+      sources."acorn-walk-8.1.1"
       (sources."agent-base-6.0.2" // {
         dependencies = [
           sources."debug-4.3.2"
           sources."ms-2.1.2"
         ];
       })
-      sources."ajv-6.12.6"
+      sources."ajv-8.6.0"
+      sources."ansi-colors-4.1.1"
       sources."ansi-regex-2.1.1"
       sources."append-field-1.0.0"
       sources."aproba-1.2.0"
@@ -99374,14 +99289,9 @@ in
       })
       sources."argparse-1.0.10"
       sources."array-flatten-1.1.1"
-      sources."asn1-0.2.4"
-      sources."assert-plus-1.0.0"
       sources."async-0.1.22"
-      sources."async-limiter-1.0.1"
       sources."async-mutex-0.3.1"
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.11.0"
       sources."axios-0.21.1"
       sources."balanced-match-1.0.2"
       sources."base64-js-1.5.1"
@@ -99390,21 +99300,7 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      (sources."bcrypt-3.0.6" // {
-        dependencies = [
-          sources."chownr-1.1.4"
-          sources."fs-minipass-1.2.7"
-          sources."minipass-2.9.0"
-          sources."minizlib-1.3.3"
-          sources."nan-2.13.2"
-          sources."node-pre-gyp-0.12.0"
-          sources."nopt-4.0.3"
-          sources."semver-5.7.1"
-          sources."tar-4.4.13"
-          sources."yallist-3.1.1"
-        ];
-      })
-      sources."bcrypt-pbkdf-1.0.2"
+      sources."bcrypt-5.0.1"
       sources."bcryptjs-2.4.3"
       (sources."bl-4.1.0" // {
         dependencies = [
@@ -99420,12 +99316,14 @@ in
       sources."buffer-from-1.1.1"
       sources."busboy-0.2.14"
       sources."bytes-3.1.0"
-      sources."callback-stream-1.1.0"
-      sources."caseless-0.12.0"
-      sources."cheerio-0.22.0"
+      sources."cacheable-lookup-5.0.4"
+      sources."cacheable-request-7.0.2"
+      sources."cheerio-1.0.0-rc.10"
+      sources."cheerio-select-1.5.0"
       sources."chownr-2.0.0"
       sources."cli-table-0.3.6"
       sources."clone-2.1.2"
+      sources."clone-response-1.0.2"
       sources."code-point-at-1.1.0"
       sources."colors-1.0.3"
       sources."combined-stream-1.0.8"
@@ -99446,17 +99344,25 @@ in
         ];
       })
       sources."content-type-1.0.4"
-      sources."cookie-0.4.0"
-      sources."cookie-parser-1.4.5"
+      sources."cookie-0.4.1"
+      (sources."cookie-parser-1.4.5" // {
+        dependencies = [
+          sources."cookie-0.4.0"
+        ];
+      })
       sources."cookie-signature-1.0.6"
       sources."core-util-is-1.0.2"
       sources."cors-2.8.5"
-      sources."cron-1.7.2"
-      sources."css-select-1.2.0"
-      sources."css-what-2.1.3"
-      sources."dashdash-1.14.1"
+      sources."cronosjs-1.7.1"
+      sources."css-select-4.1.3"
+      sources."css-what-5.0.1"
       sources."debug-2.6.9"
-      sources."deep-extend-0.6.0"
+      (sources."decompress-response-6.0.0" // {
+        dependencies = [
+          sources."mimic-response-3.1.0"
+        ];
+      })
+      sources."defer-to-connect-2.0.1"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."denque-1.5.0"
@@ -99464,126 +99370,102 @@ in
       sources."destroy-1.0.4"
       sources."detect-libc-1.0.3"
       sources."dicer-0.2.5"
-      sources."dom-serializer-0.1.1"
-      sources."domelementtype-1.3.1"
-      sources."domhandler-2.4.2"
-      sources."domutils-1.5.1"
-      (sources."duplexify-3.7.1" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
-      sources."ecc-jsbn-0.1.2"
-      sources."ee-first-1.1.1"
-      sources."encodeurl-1.0.2"
-      sources."end-of-stream-1.4.4"
-      sources."entities-1.1.2"
-      sources."escape-html-1.0.3"
-      sources."esprima-4.0.1"
-      sources."etag-1.8.1"
-      (sources."express-4.17.1" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
-      (sources."express-session-1.17.1" // {
-        dependencies = [
-          sources."depd-2.0.0"
-        ];
-      })
-      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."finalhandler-1.1.2"
-      sources."follow-redirects-1.14.1"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."forwarded-0.2.0"
-      sources."fresh-0.5.2"
-      sources."fs-extra-8.1.0"
-      sources."fs-minipass-2.1.0"
-      sources."fs.notify-0.0.4"
-      sources."fs.realpath-1.0.0"
-      sources."gauge-2.7.4"
-      sources."getpass-0.1.7"
-      sources."glob-7.1.7"
-      sources."glob-parent-3.1.0"
-      (sources."glob-stream-6.1.0" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
-      sources."graceful-fs-4.2.6"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
-      sources."has-unicode-2.0.1"
-      sources."hash-sum-2.0.0"
-      sources."help-me-1.1.0"
-      (sources."htmlparser2-3.10.1" // {
+      sources."dom-serializer-1.3.2"
+      sources."domelementtype-2.2.0"
+      sources."domhandler-4.2.0"
+      sources."domutils-2.7.0"
+      (sources."duplexify-4.1.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
           sources."string_decoder-1.3.0"
         ];
       })
+      sources."ee-first-1.1.1"
+      sources."encodeurl-1.0.2"
+      sources."end-of-stream-1.4.4"
+      sources."enquirer-2.3.6"
+      sources."entities-2.2.0"
+      sources."escape-html-1.0.3"
+      sources."esprima-4.0.1"
+      sources."etag-1.8.1"
+      (sources."express-4.17.1" // {
+        dependencies = [
+          sources."cookie-0.4.0"
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      (sources."express-session-1.17.2" // {
+        dependencies = [
+          sources."depd-2.0.0"
+        ];
+      })
+      sources."fast-deep-equal-3.1.3"
+      sources."finalhandler-1.1.2"
+      sources."follow-redirects-1.14.1"
+      sources."form-data-4.0.0"
+      sources."forwarded-0.2.0"
+      sources."fresh-0.5.2"
+      (sources."fs-extra-10.0.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
+      sources."fs-minipass-2.1.0"
+      sources."fs.notify-0.0.4"
+      sources."fs.realpath-1.0.0"
+      sources."gauge-2.7.4"
+      sources."get-stream-5.2.0"
+      sources."glob-7.1.7"
+      sources."got-11.8.2"
+      sources."graceful-fs-4.2.6"
+      sources."has-unicode-2.0.1"
+      sources."hash-sum-2.0.0"
+      (sources."help-me-3.0.0" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+          sources."string_decoder-1.3.0"
+        ];
+      })
+      sources."hpagent-0.1.2"
+      sources."htmlparser2-6.1.0"
+      sources."http-cache-semantics-4.1.0"
       sources."http-errors-1.7.2"
-      sources."http-signature-1.2.0"
+      sources."http2-wrapper-1.0.3"
       (sources."https-proxy-agent-5.0.0" // {
         dependencies = [
           sources."debug-4.3.2"
           sources."ms-2.1.2"
         ];
       })
-      sources."i18next-15.1.2"
+      sources."i18next-20.3.2"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
-      sources."ignore-walk-3.0.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."ini-1.3.8"
       sources."ipaddr.js-1.9.1"
-      sources."is-absolute-1.0.0"
-      sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-1.0.0"
-      sources."is-glob-3.1.0"
-      sources."is-negated-glob-1.0.0"
-      sources."is-relative-1.0.0"
-      sources."is-typedarray-1.0.0"
-      sources."is-unc-path-1.0.0"
       sources."is-utf8-0.2.1"
-      sources."is-windows-1.0.2"
       sources."isarray-0.0.1"
-      sources."isstream-0.1.2"
-      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-stable-stringify-without-jsonify-1.0.1"
+      sources."js-yaml-3.14.1"
+      sources."json-buffer-3.0.1"
+      sources."json-schema-traverse-1.0.0"
       sources."json-stringify-safe-5.0.1"
       sources."jsonata-1.8.4"
-      sources."jsonfile-4.0.0"
-      sources."jsprim-1.4.1"
+      (sources."jsonfile-6.1.0" // {
+        dependencies = [
+          sources."universalify-2.0.0"
+        ];
+      })
+      sources."keyv-4.0.3"
       sources."leven-2.1.0"
-      sources."lodash.assignin-4.2.0"
-      sources."lodash.bind-4.2.1"
       sources."lodash.clonedeep-4.5.0"
-      sources."lodash.defaults-4.2.0"
-      sources."lodash.filter-4.6.0"
-      sources."lodash.flatten-4.4.0"
-      sources."lodash.foreach-4.5.0"
-      sources."lodash.map-4.6.0"
-      sources."lodash.merge-4.6.2"
-      sources."lodash.pick-4.4.0"
-      sources."lodash.reduce-4.6.0"
-      sources."lodash.reject-4.6.0"
-      sources."lodash.some-4.6.0"
+      sources."lowercase-keys-2.0.0"
       sources."lru-cache-4.1.5"
+      (sources."make-dir-3.1.0" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."media-typer-0.3.0"
       (sources."memorystore-1.6.6" // {
         dependencies = [
@@ -99596,6 +99478,7 @@ in
       sources."mime-2.5.2"
       sources."mime-db-1.48.0"
       sources."mime-types-2.1.31"
+      sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       (sources."minipass-3.1.3" // {
@@ -99611,14 +99494,13 @@ in
       sources."mkdirp-0.5.5"
       sources."moment-2.29.1"
       sources."moment-timezone-0.5.33"
-      (sources."mqtt-4.2.6" // {
+      (sources."mqtt-4.2.8" // {
         dependencies = [
           sources."concat-stream-2.0.0"
           sources."debug-4.3.2"
           sources."ms-2.1.2"
           sources."readable-stream-3.6.0"
           sources."string_decoder-1.3.0"
-          sources."ws-7.5.3"
         ];
       })
       (sources."mqtt-packet-6.10.0" // {
@@ -99631,99 +99513,60 @@ in
       sources."multer-1.4.2"
       sources."mustache-4.2.0"
       sources."mute-stream-0.0.8"
-      sources."nan-2.14.0"
-      (sources."needle-2.8.0" // {
-        dependencies = [
-          sources."debug-3.2.7"
-          sources."ms-2.1.3"
-        ];
-      })
       sources."negotiator-0.6.2"
-      (sources."node-pre-gyp-0.14.0" // {
-        dependencies = [
-          sources."chownr-1.1.4"
-          sources."fs-minipass-1.2.7"
-          sources."minipass-2.9.0"
-          sources."minizlib-1.3.3"
-          sources."nopt-4.0.3"
-          sources."semver-5.7.1"
-          sources."tar-4.4.13"
-          sources."yallist-3.1.1"
-        ];
-      })
-      (sources."node-red-admin-0.2.7" // {
-        dependencies = [
-          sources."bcrypt-3.0.8"
-        ];
-      })
-      sources."node-red-node-rbe-0.5.0"
-      sources."node-red-node-tail-0.3.1"
+      sources."node-addon-api-3.2.1"
+      sources."node-fetch-2.6.1"
+      sources."node-red-admin-2.2.0"
       sources."nopt-5.0.0"
-      sources."npm-bundled-1.1.2"
-      sources."npm-normalize-package-bin-1.0.1"
-      sources."npm-packlist-1.4.8"
+      sources."normalize-url-6.1.0"
       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-sign-0.9.0"
       sources."oauth2orize-1.11.0"
       sources."object-assign-4.1.1"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
-      (sources."ordered-read-streams-1.0.1" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
+      sources."p-cancelable-2.1.1"
+      sources."parse5-6.0.1"
+      sources."parse5-htmlparser2-tree-adapter-6.0.1"
       sources."parseurl-1.3.3"
       sources."passport-0.4.1"
       sources."passport-http-bearer-1.0.1"
       sources."passport-oauth2-client-password-0.1.2"
       sources."passport-strategy-1.0.0"
-      sources."path-dirname-1.0.2"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
       sources."pause-0.0.1"
-      sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."proxy-addr-2.0.7"
       sources."pseudomap-1.0.2"
       sources."psl-1.8.0"
       sources."pump-3.0.0"
-      (sources."pumpify-1.5.1" // {
-        dependencies = [
-          sources."pump-2.0.1"
-        ];
-      })
       sources."punycode-2.1.1"
       sources."qs-6.7.0"
+      sources."quick-lru-5.1.1"
       sources."random-bytes-1.0.0"
       sources."range-parser-1.2.1"
       sources."raw-body-2.4.0"
-      sources."rc-1.2.8"
       sources."read-1.0.7"
       sources."readable-stream-1.1.14"
       sources."regenerator-runtime-0.13.8"
       sources."reinterval-1.1.0"
-      sources."remove-trailing-separator-1.1.0"
-      (sources."request-2.88.0" // {
-        dependencies = [
-          sources."qs-6.5.2"
-        ];
-      })
+      sources."require-from-string-2.0.2"
+      sources."resolve-alpn-1.1.2"
+      sources."responselike-2.0.0"
       sources."retry-0.6.1"
-      sources."rimraf-2.7.1"
-      sources."safe-buffer-5.2.0"
+      sources."rimraf-3.0.2"
+      sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-6.3.0"
+      (sources."semver-7.3.5" // {
+        dependencies = [
+          sources."lru-cache-6.0.0"
+          sources."yallist-4.0.0"
+        ];
+      })
       (sources."send-0.17.1" // {
         dependencies = [
           sources."mime-1.6.0"
@@ -99741,58 +99584,36 @@ in
         ];
       })
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.16.1"
       sources."statuses-1.5.0"
       sources."stream-shift-1.0.1"
       sources."streamsearch-0.1.2"
       sources."string-width-1.0.2"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-3.0.1"
-      sources."strip-json-comments-2.0.1"
-      sources."tail-2.2.3"
       (sources."tar-6.1.0" // {
         dependencies = [
           sources."mkdirp-1.0.4"
           sources."yallist-4.0.0"
         ];
       })
-      (sources."through2-2.0.5" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.7"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
-      sources."through2-filter-3.0.0"
-      sources."to-absolute-glob-2.0.2"
       sources."toidentifier-1.0.0"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-4.0.0"
       sources."tslib-2.3.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.13.3"
+      sources."uglify-js-3.13.10"
       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."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.4.0"
+      sources."uuid-8.3.2"
       sources."vary-1.1.2"
-      sources."verror-1.10.0"
       sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
-      sources."ws-6.2.1"
+      sources."ws-7.5.1"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
       sources."xtend-4.0.2"
@@ -101560,12 +101381,7 @@ in
       sources."clone-2.1.2"
       sources."coa-2.0.2"
       sources."collection-visit-1.0.0"
-      (sources."color-3.2.0" // {
-        dependencies = [
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-        ];
-      })
+      sources."color-3.2.1"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."color-string-1.6.0"
@@ -101692,7 +101508,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.779"
+      sources."electron-to-chromium-1.3.780"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -103769,10 +103585,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "6.10.2";
+    version = "6.10.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-6.10.2.tgz";
-      sha512 = "o/CAEMtqjalEJyS9MgID3iZVx46LsqZ8MlwYGmWHNHD7Q0nOqtuYj+BKmgCXRiIWANA/JuC0Y6usNKhU8P3haw==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-6.10.3.tgz";
+      sha512 = "GdxerBN3hhe9x9W0mAMmiWoDELy7KekrmHbYdo7WeHC1MthP/gI7MGVYIgcKj9Vy4zWLO9v1hVYOgKUrewkDVg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -105069,12 +104885,7 @@ in
       sources."clone-response-1.0.2"
       sources."coa-2.0.2"
       sources."collection-visit-1.0.0"
-      (sources."color-3.2.0" // {
-        dependencies = [
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-        ];
-      })
+      sources."color-3.2.1"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."color-string-1.6.0"
@@ -105249,7 +105060,7 @@ in
       sources."duplexify-3.7.1"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -106636,7 +106447,7 @@ in
       sources."@emotion/unitless-0.7.5"
       sources."@exodus/schemasafe-1.0.0-rc.3"
       sources."@redocly/ajv-8.6.2"
-      (sources."@redocly/openapi-core-1.0.0-beta.53" // {
+      (sources."@redocly/openapi-core-1.0.0-beta.54" // {
         dependencies = [
           sources."@types/node-14.17.5"
         ];
@@ -106813,7 +106624,7 @@ in
       sources."parse-asn1-5.1.6"
       sources."path-browserify-0.0.1"
       sources."pbkdf2-3.1.2"
-      sources."perfect-scrollbar-1.5.1"
+      sources."perfect-scrollbar-1.5.2"
       sources."picomatch-2.3.0"
       sources."polished-4.1.3"
       sources."postcss-value-parser-4.1.0"
@@ -107178,13 +106989,13 @@ in
       sources."@types/node-fetch-2.5.11"
       sources."@types/resolve-1.17.1"
       sources."@types/vscode-1.58.1"
-      sources."@typescript-eslint/eslint-plugin-4.28.3"
-      sources."@typescript-eslint/experimental-utils-4.28.3"
-      sources."@typescript-eslint/parser-4.28.3"
-      sources."@typescript-eslint/scope-manager-4.28.3"
-      sources."@typescript-eslint/types-4.28.3"
-      sources."@typescript-eslint/typescript-estree-4.28.3"
-      sources."@typescript-eslint/visitor-keys-4.28.3"
+      sources."@typescript-eslint/eslint-plugin-4.28.4"
+      sources."@typescript-eslint/experimental-utils-4.28.4"
+      sources."@typescript-eslint/parser-4.28.4"
+      sources."@typescript-eslint/scope-manager-4.28.4"
+      sources."@typescript-eslint/types-4.28.4"
+      sources."@typescript-eslint/typescript-estree-4.28.4"
+      sources."@typescript-eslint/visitor-keys-4.28.4"
       sources."@ungap/promise-all-settled-1.1.2"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.2"
@@ -107266,7 +107077,7 @@ in
       sources."entities-2.2.0"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-4.0.0"
-      (sources."eslint-7.30.0" // {
+      (sources."eslint-7.31.0" // {
         dependencies = [
           (sources."eslint-utils-2.1.0" // {
             dependencies = [
@@ -107984,7 +107795,7 @@ in
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.948.0" // {
+      (sources."aws-sdk-2.949.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -108570,7 +108381,7 @@ in
       sources."strip-dirs-2.1.0"
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
-      sources."strtok3-6.2.0"
+      sources."strtok3-6.2.2"
       (sources."superagent-3.8.3" // {
         dependencies = [
           sources."debug-3.2.7"
@@ -109339,10 +109150,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.662.0";
+    version = "1.664.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.662.0.tgz";
-      sha512 = "sVSFIZ5cxhKoe2Gr3KD3LHKuTlCzVgA0KPa/2NhwyHFVQoSmoVirqntUt4V3taiEOFAk+F++cQ9jAcx2Qlc8nA==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.664.0.tgz";
+      sha512 = "4YPqDdPPZsn3BBN82UiN6+Jy4zdKbBvw4MKClvh2QQgUJy6R9nEm/Q8IbdsM0jOqPByDRWVMwsCPQu3ZpqG3KA==";
     };
     dependencies = [
       sources."@arcanis/slice-ansi-1.0.2"
@@ -109409,7 +109220,7 @@ in
           sources."tslib-2.3.0"
         ];
       })
-      (sources."@snyk/snyk-docker-pull-3.6.2" // {
+      (sources."@snyk/snyk-docker-pull-3.6.3" // {
         dependencies = [
           sources."rimraf-3.0.2"
           sources."tmp-0.2.1"
@@ -109878,7 +109689,7 @@ in
           sources."tslib-2.3.0"
         ];
       })
-      (sources."snyk-docker-plugin-4.21.3" // {
+      (sources."snyk-docker-plugin-4.22.1" // {
         dependencies = [
           sources."argparse-2.0.1"
           sources."js-yaml-4.1.0"
@@ -111366,7 +111177,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.948.0" // {
+      (sources."aws-sdk-2.949.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -112242,7 +112053,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -115027,7 +114838,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
-      sources."strtok3-6.2.0"
+      sources."strtok3-6.2.2"
       sources."supports-color-7.2.0"
       sources."tar-4.4.13"
       sources."tlds-1.208.0"
@@ -116224,7 +116035,11 @@ in
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-4.0.0"
       sources."eslint-7.31.0"
-      sources."eslint-plugin-vue-7.13.0"
+      (sources."eslint-plugin-vue-7.14.0" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."eslint-scope-5.1.1"
       (sources."eslint-utils-2.1.0" // {
         dependencies = [
@@ -116340,7 +116155,7 @@ in
       sources."typescript-4.3.5"
       sources."uri-js-4.4.1"
       sources."v8-compile-cache-2.3.0"
-      (sources."vue-eslint-parser-7.8.0" // {
+      (sources."vue-eslint-parser-7.9.0" // {
         dependencies = [
           sources."eslint-visitor-keys-1.3.0"
           sources."espree-6.2.1"
@@ -116616,7 +116431,7 @@ in
       sources."domelementtype-2.2.0"
       sources."domhandler-4.2.0"
       sources."domutils-2.7.0"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
       sources."enhanced-resolve-5.8.2"
@@ -116756,13 +116571,13 @@ in
       sources."read-1.0.7"
       sources."readable-stream-1.0.34"
       sources."readdirp-3.5.0"
-      sources."rechoir-0.7.0"
+      sources."rechoir-0.7.1"
       sources."require-directory-2.1.1"
       sources."resolve-1.20.0"
       sources."resolve-cwd-3.0.0"
       sources."resolve-from-5.0.0"
       sources."safe-buffer-5.2.1"
-      sources."schema-utils-3.1.0"
+      sources."schema-utils-3.1.1"
       sources."semver-5.7.1"
       sources."serialize-javascript-5.0.1"
       sources."shallow-clone-3.0.1"
@@ -116833,7 +116648,7 @@ in
         ];
       })
       sources."webpack-merge-5.8.0"
-      sources."webpack-sources-2.3.0"
+      sources."webpack-sources-2.3.1"
       sources."which-2.0.2"
       sources."wide-align-1.1.3"
       sources."wildcard-2.0.0"
@@ -117383,7 +117198,7 @@ in
           sources."eslint-scope-5.1.1"
           sources."espree-6.2.1"
           sources."ms-2.1.2"
-          (sources."vue-eslint-parser-7.8.0" // {
+          (sources."vue-eslint-parser-7.9.0" // {
             dependencies = [
               sources."semver-6.3.0"
             ];
@@ -118945,7 +118760,7 @@ in
       sources."chrome-trace-event-1.0.3"
       sources."colorette-1.2.2"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.779"
+      sources."electron-to-chromium-1.3.780"
       sources."enhanced-resolve-5.8.2"
       sources."es-module-lexer-0.7.1"
       sources."escalade-3.1.1"
@@ -118975,7 +118790,7 @@ in
       sources."punycode-2.1.1"
       sources."randombytes-2.1.0"
       sources."safe-buffer-5.2.1"
-      sources."schema-utils-3.1.0"
+      sources."schema-utils-3.1.1"
       sources."serialize-javascript-6.0.0"
       sources."source-list-map-2.0.1"
       sources."source-map-0.6.1"
@@ -118990,7 +118805,7 @@ in
       sources."terser-webpack-plugin-5.1.4"
       sources."uri-js-4.4.1"
       sources."watchpack-2.2.0"
-      sources."webpack-sources-2.3.0"
+      sources."webpack-sources-2.3.1"
       sources."yocto-queue-0.1.0"
     ];
     buildInputs = globalBuildInputs;
@@ -119048,7 +118863,7 @@ in
       sources."path-key-3.1.1"
       sources."path-parse-1.0.7"
       sources."pkg-dir-4.2.0"
-      sources."rechoir-0.7.0"
+      sources."rechoir-0.7.1"
       sources."resolve-1.20.0"
       sources."resolve-cwd-3.0.0"
       sources."resolve-from-5.0.0"
@@ -119680,7 +119495,7 @@ in
       sources."fast-json-stable-stringify-2.1.0"
       sources."fastq-1.11.1"
       sources."fill-range-7.0.1"
-      sources."glob-parent-6.0.0"
+      sources."glob-parent-6.0.1"
       sources."globby-11.0.4"
       sources."ignore-5.1.8"
       sources."is-extglob-2.1.1"
@@ -119699,7 +119514,7 @@ in
       sources."reusify-1.0.4"
       sources."run-parallel-1.2.0"
       sources."safe-buffer-5.2.1"
-      sources."schema-utils-3.1.0"
+      sources."schema-utils-3.1.1"
       sources."serialize-javascript-6.0.0"
       sources."slash-3.0.0"
       sources."to-regex-range-5.0.1"
@@ -119719,10 +119534,10 @@ in
   webtorrent-cli = nodeEnv.buildNodePackage {
     name = "webtorrent-cli";
     packageName = "webtorrent-cli";
-    version = "3.5.2";
+    version = "3.5.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.2.tgz";
-      sha512 = "czMFGRzxT2IsgZoMkmHwGASBSx/pLGQOZV3oAD/c5qCw4+YVBMYP2/FehaQ/CF3dMKBnIH4jIevK2KT6pdRC2A==";
+      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.3.tgz";
+      sha512 = "Av+6PnflFJueTj19z6Pv/ai9KzOV8r7nClBiQCBbO55eqNL6pNBV47N/KwxDIPx8OeATTFEA/joCohi5AD/8TQ==";
     };
     dependencies = [
       sources."@leichtgewicht/ip-codec-2.0.3"
@@ -120027,7 +119842,7 @@ in
       sources."utp-native-2.5.3"
       sources."videostream-3.2.2"
       sources."vlc-command-1.2.0"
-      (sources."webtorrent-1.2.4" // {
+      (sources."webtorrent-1.2.5" // {
         dependencies = [
           sources."debug-4.3.2"
           sources."decompress-response-6.0.0"

From fd1ab319b73b4aa2970a91afc850306e95fff165 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 20 Jul 2021 18:33:48 +0200
Subject: [PATCH 310/330] logisim: cleanup

---
 .../science/logic/logisim/default.nix         | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix
index 1ca22cf769c6..1e289b790f3d 100644
--- a/pkgs/applications/science/logic/logisim/default.nix
+++ b/pkgs/applications/science/logic/logisim/default.nix
@@ -1,29 +1,28 @@
 { lib, stdenv, fetchurl, jre, makeWrapper }:
 
-let version = "2.7.1"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "logisim";
-  inherit version;
+  version = "2.7.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar";
+    url = "mirror://sourceforge/project/circuit/${lib.versions.majorMinor version}.x/${version}/logisim-generic-${version}.jar";
     sha256 = "1hkvc9zc7qmvjbl9579p84hw3n8wl3275246xlzj136i5b0phain";
   };
 
   phases = [ "installPhase" ];
 
-  nativeBuildInputs = [makeWrapper];
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -pv $out/bin
+    mkdir -p $out/bin
     makeWrapper ${jre}/bin/java $out/bin/logisim --add-flags "-jar $src"
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "http://ozark.hendrix.edu/~burch/logisim";
     description = "Educational tool for designing and simulating digital logic circuits";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.unix;
+    maintainers = with maintainers; [ ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
   };
 }

From 50e45c0f96cfb54bda43d90170a127dbc8e8e2ab Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 20 Jul 2021 18:39:41 +0200
Subject: [PATCH 311/330] powerline-go: fix version number

---
 pkgs/tools/misc/powerline-go/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix
index eff23b55df9d..004bebaebbea 100644
--- a/pkgs/tools/misc/powerline-go/default.nix
+++ b/pkgs/tools/misc/powerline-go/default.nix
@@ -5,7 +5,7 @@
 
 buildGoModule rec {
   pname = "powerline-go";
-  version = "2021-07-15";
+  version = "unstable-2021-07-15";
 
   src = fetchFromGitHub {
     owner = "justjanne";

From 9b3e240b246dc9b75804cea2555176107d05689f Mon Sep 17 00:00:00 2001
From: Heph <srht@mrkeebs.eu>
Date: Tue, 20 Jul 2021 14:36:10 +0200
Subject: [PATCH 312/330] maintainers: add heph2

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7e4e02c5a7f0..d30a0085c376 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4213,6 +4213,12 @@
     githubId = 6430643;
     name = "Henry Till";
   };
+  heph2 = {
+    email = "srht@mrkeebs.eu";
+    github = "heph2";
+    githubId = 87579883;
+    name = "Marco";
+  };
   herberteuler = {
     email = "herberteuler@gmail.com";
     github = "herberteuler";

From 6671b113bd3aca45910616f178e1ed262e1795b6 Mon Sep 17 00:00:00 2001
From: Heph <srht@mrkeebs.eu>
Date: Mon, 19 Jul 2021 12:54:10 +0200
Subject: [PATCH 313/330] telescope: init at 0.3.1

---
 .../networking/browsers/telescope/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/telescope/default.nix

diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/applications/networking/browsers/telescope/default.nix
new file mode 100644
index 000000000000..fa9b3853a9d1
--- /dev/null
+++ b/pkgs/applications/networking/browsers/telescope/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, lib
+, fetchurl
+, pkg-config
+, bison
+, libevent
+, libressl
+, ncurses
+}:
+
+stdenv.mkDerivation rec {
+  pname = "telescope";
+  version = "0.3.1";
+
+  src = fetchurl {
+    url = "https://github.com/omar-polo/telescope/releases/download/${version}/telescope-${version}.tar.gz";
+    sha256 = "11xrsh064ph1idhygh52y4mqapgwn1cqr0l3naj5n2a2p7lcsvvw";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    bison
+  ];
+
+  buildInputs = [
+    libevent
+    libressl
+    ncurses
+  ];
+
+  meta = with lib; {
+    description = "Telescope is a w3m-like browser for Gemini";
+    homepage = "https://telescope.omarpolo.com/";
+    license = licenses.isc;
+    maintainers = with maintainers; [ heph2 ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 134d26935606..56c711539587 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9241,6 +9241,8 @@ in
 
   teler = callPackage ../tools/security/teler { };
 
+  telescope = callPackage ../applications/networking/browsers/telescope { };
+
   termius = callPackage ../applications/networking/termius { };
 
   termplay = callPackage ../tools/misc/termplay { };

From bbdf2e931a84b9d8a8a03ab508f42e9c2adabf55 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 20 Jul 2021 16:52:59 +0000
Subject: [PATCH 314/330] squashfs-tools-ng: 1.1.1 -> 1.1.2

tar2sqfs seems to work on the source tarball.
---
 pkgs/tools/filesystems/squashfs-tools-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix
index 8661740d8074..cb4f3820bcc0 100644
--- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix
+++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "squashfs-tools-ng";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
-    sha256 = "07c8vpzgwvqr9ycww1769ya40cf077c6igdg1b4akwszz2nw0bxq";
+    sha256 = "0hlrbiy8xmccczi11ml0lzmg3946l9ck5wpfyw03wn5zgvx29zja";
   };
 
   nativeBuildInputs = [ doxygen graphviz pkg-config perl ];

From e6592586d5dd3d570c1c3bdff0f924f9b7c75d7b Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 8 Jun 2021 23:29:26 +0200
Subject: [PATCH 315/330] eclair: init at 0.6.1

---
 pkgs/applications/blockchains/eclair.nix | 38 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/blockchains/eclair.nix

diff --git a/pkgs/applications/blockchains/eclair.nix b/pkgs/applications/blockchains/eclair.nix
new file mode 100644
index 000000000000..7b74512a388a
--- /dev/null
+++ b/pkgs/applications/blockchains/eclair.nix
@@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchzip
+, jq
+, openjdk11
+}:
+
+stdenv.mkDerivation rec {
+  pname = "eclair";
+  version = "0.6.1";
+  revision = "d3ae323";
+
+  src = fetchzip {
+    url = "https://github.com/ACINQ/eclair/releases/download/v${version}/eclair-node-${version}-${revision}-bin.zip";
+    sha256 = "0hmdssj6pxhvadrgr1svb2lh7hfbd2axr5wsl7glizv1a21g0l2c";
+  };
+
+  propagatedBuildInputs = [ jq openjdk11 ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir $out
+    cp -a * $out
+    mv $out/bin/eclair-node.sh $out/bin/eclair-node
+    rm $out/bin/eclair-node.bat
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A scala implementation of the Lightning Network";
+    homepage = "https://github.com/ACINQ/eclair";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ prusnak ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 382dc4265696..96af754ce4a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28537,6 +28537,8 @@ in
   dogecoin  = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; };
   dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; };
 
+  eclair = callPackage ../applications/blockchains/eclair.nix { };
+
   electrs = callPackage ../applications/blockchains/electrs.nix { };
 
   elements  = libsForQt5.callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = true; };

From 6ddefbdd3c5da5e7e4e3df6bea6c267e6eb849c3 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Tue, 20 Jul 2021 19:22:33 +0200
Subject: [PATCH 316/330] zellij: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix
index d55353682fdd..c7889b158735 100644
--- a/pkgs/tools/misc/zellij/default.nix
+++ b/pkgs/tools/misc/zellij/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zellij";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "zellij-org";
     repo = "zellij";
     rev = "v${version}";
-    sha256 = "sha256-1GG3Bvw3P77dLhvJKwq48TUWMwg+bDgzWmtrw2JixLg=";
+    sha256 = "sha256-IcpCE9mqR7H1+gRhHyscvXhYHOynJFtOyrSr1FiMxFc=";
   };
 
-  cargoSha256 = "sha256-cqm4QCGy6eTKtEBlE2ihmh93eO7d47zlCrLY8Gp0dxM=";
+  cargoSha256 = "sha256-22ggPs4iVOI1LKHtW5skfSO7J/FLF8EinvcyHVO14Dw=";
 
   nativeBuildInputs = [ installShellFiles pkg-config ];
 

From 31990d01dc4410e3f3a27260b40ece3866434374 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Wed, 21 Jul 2021 02:15:24 +0800
Subject: [PATCH 317/330] osu-lazer: 2021.707.0 -> 2021.720.0

The tag `2021.707.0` is deleted from upstream, result in a build failure
---
 pkgs/games/osu-lazer/default.nix |  4 ++--
 pkgs/games/osu-lazer/deps.nix    | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index d4ae6046f1c6..55f9bfb75c30 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -16,13 +16,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "osu-lazer";
-  version = "2021.707.0";
+  version = "2021.720.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     rev = version;
-    sha256 = "UdsN/kvpqZrOiigxGttwrExlOkEFa2xWqDQS/d7y/0k=";
+    sha256 = "I7UkbyH2i218d5RCq4al9Gr1C0MX339jFOeyKrKQ3b0=";
   };
 
   patches = [ ./bypass-tamper-detection.patch ];
diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix
index 4684d79d95c5..d2c19b08d03d 100644
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/games/osu-lazer/deps.nix
@@ -26,8 +26,8 @@
   })
   (fetchNuGet {
     name = "Fody";
-    version = "6.5.1";
-    sha256 = "08zpyrniajjba5isjb09spggfh0af2z6x4h2zy5ilk3y5bb9vdch";
+    version = "6.5.2";
+    sha256 = "0vq97mkfk5ijinwnhpkm212y69ik6cd5x0n61ssyxmz50q1vp84f";
   })
   (fetchNuGet {
     name = "HidSharpCore";
@@ -781,13 +781,13 @@
   })
   (fetchNuGet {
     name = "ppy.LocalisationAnalyser";
-    version = "2021.706.0";
-    sha256 = "087x61vi1rv1slzr8hhcslngdd41p2d5r8yhpqm1kmls24csv556";
+    version = "2021.716.0";
+    sha256 = "0w45af0mlh4bkjxxhk5p4kb6z0na8fmm6xz10dfzs3b4i61h5x3z";
   })
   (fetchNuGet {
     name = "ppy.osu.Framework";
-    version = "2021.707.0";
-    sha256 = "1ai8yam6v67y9z8yipqjn578bk2qzqm05ncyqfgig3in6baxwpna";
+    version = "2021.714.0";
+    sha256 = "175i0hcbl01xy633zvij8185nj4g7ja1rsv2lmfz8qdykqj6g9kl";
   })
   (fetchNuGet {
     name = "ppy.osu.Framework.NativeLibs";
@@ -816,13 +816,13 @@
   })
   (fetchNuGet {
     name = "Realm";
-    version = "10.2.1";
-    sha256 = "14pi7vz7nl8ag0bmlbyds52z5nx9wbg154qkm6jai10rm02ws86l";
+    version = "10.3.0";
+    sha256 = "12zmp43cf2kilzq1yi9x2hy1jdh51c0kbnddw5s960k1kvyx2s2v";
   })
   (fetchNuGet {
     name = "Realm.Fody";
-    version = "10.2.1";
-    sha256 = "1zv57wb7zcgyigsxqikf2yq2h7an4c3dbydl9la5xdpa76dgmxdi";
+    version = "10.3.0";
+    sha256 = "0mhjkahi2ldxcizv08i70mrpwgrvljxdjlr81x3dmwgpxxfji18d";
   })
   (fetchNuGet {
     name = "Remotion.Linq";

From a015aaf1c9e0bcccfa128cb5030952c9940acea2 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Wed, 21 Jul 2021 02:30:08 +0800
Subject: [PATCH 318/330] dotnetPackages.Nuget: fix runtime error

configurePhase breaks the binary and results in
`File does not contain a valid CIL image.`
---
 pkgs/top-level/dotnet-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index f13e1f919b5d..06d7693006bb 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -296,6 +296,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
       sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
     };
 
+    # configurePhase breaks the binary and results in
+    # `File does not contain a valid CIL image.`
+    dontConfigure = true;
     dontBuild = true;
 
     outputFiles = [ "*" ];

From cff54843940859dce83905dccb9d4affa092003c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 18:34:41 +0000
Subject: [PATCH 319/330] cascadia-code: 2105.24 -> 2106.17

---
 pkgs/data/fonts/cascadia-code/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix
index a78bf6b4a785..c223f9366af1 100644
--- a/pkgs/data/fonts/cascadia-code/default.nix
+++ b/pkgs/data/fonts/cascadia-code/default.nix
@@ -1,13 +1,13 @@
 { lib, fetchzip }:
 let
-  version = "2105.24";
+  version = "2106.17";
 in
 fetchzip {
   name = "cascadia-code-${version}";
 
   url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip";
 
-  sha256 = "sha256-j3IPzrch8oueOmCDa2gpD8uYFs8cKWjkxcmicZcfqQ8=";
+  sha256 = "sha256-EsXD6gY3q3KIk37vYPz731lLz5989cd+s5fz5rKIn2k=";
 
   postFetch = ''
     mkdir -p $out/share/fonts/

From 013fe00139f63ff587869f4ca9c320b3e04753d0 Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Tue, 20 Jul 2021 13:20:45 -0500
Subject: [PATCH 320/330] anki-bin: install desktop entry and man page

---
 pkgs/games/anki/bin.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix
index 09f92b0f8481..26b29b9228e3 100644
--- a/pkgs/games/anki/bin.nix
+++ b/pkgs/games/anki/bin.nix
@@ -43,6 +43,14 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {
     exec ${unpacked}/bin/anki
   '';
 
+  extraInstallCommands = ''
+    mkdir -p $out/share
+    cp -R ${unpacked}/share/applications \
+      ${unpacked}/share/man \
+      ${unpacked}/share/pixmaps \
+      $out/share/
+  '';
+
   inherit meta;
 }) else stdenv.mkDerivation {
   inherit pname version;

From 3e3e5dcc170249c37f8a8884346b7caf179f1183 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 18:54:10 +0000
Subject: [PATCH 321/330] andika: 6.000 -> 6.001

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

diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix
index 4799804b9ecf..aaa380098a27 100644
--- a/pkgs/data/fonts/andika/default.nix
+++ b/pkgs/data/fonts/andika/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 
 let
-  version = "6.000";
+  version = "6.001";
 in
   fetchzip rec {
     name = "andika-${version}";
@@ -14,7 +14,7 @@ in
       unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
     '';
 
-    sha256 = "sha256-5ymTBFssoEhmc2Z+JyEcMqw2p91i9/R44GRzEzUzK9Q=";
+    sha256 = "sha256-ukPFBLjHQbOosQ1h0ImVlz8HhNNMp0e41SjzUhQaZtc=";
 
     meta = with lib; {
       homepage = "https://software.sil.org/andika";

From 3c093fd023e4e31ab3acf6e0c27ec82c2e2d2da0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 18:39:35 +0000
Subject: [PATCH 322/330] folks: 0.15.2 -> 0.15.3

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

diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix
index 6cd651e66ebb..720c274ad520 100644
--- a/pkgs/development/libraries/folks/default.nix
+++ b/pkgs/development/libraries/folks/default.nix
@@ -34,13 +34,13 @@
 
 stdenv.mkDerivation rec {
   pname = "folks";
-  version = "0.15.2";
+  version = "0.15.3";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "08nirjax4m4g4ljr8ksq16wzmrvzq6myqh5rm0dw6pnijqk7nxzg";
+    sha256 = "Idc3+vCT9L4GVHPucMogiFuaLDaFlB26JMIjn9PFRKU=";
   };
 
   nativeBuildInputs = [

From 0ad752febe0488650155e680a7f3f01de791f024 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 Jul 2021 21:13:43 +0200
Subject: [PATCH 323/330] sqlfluff: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix
index 12e5c8c14abd..6578bf8bf712 100644
--- a/pkgs/development/tools/database/sqlfluff/default.nix
+++ b/pkgs/development/tools/database/sqlfluff/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sqlfluff";
-  version = "0.6.0";
+  version = "0.6.1";
   disabled = python3.pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-RW3+NpKZns3Jo1b3GfTymUE74pVoJi9f0zi4j4mUGiY=";
+    sha256 = "0p5vjpfmy52hbq6mz8svvxrg9757cvgj0cbvaa0340309953ilvj";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 53b07b7f3395ebae06e22f168d82af0cfa77304f Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 20 Jul 2021 00:38:11 +0300
Subject: [PATCH 324/330] CopyQ: 3.13.0 -> 4.1.0

---
 pkgs/applications/misc/copyq/default.nix | 62 +++++++++++++++++++-----
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index de1dacd50c2e..5c96a3282243 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -1,32 +1,68 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake
-, qtbase, qtscript, qtwebkit, libXfixes, libXtst, qtx11extras, git
-, webkitSupport ? true
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, extra-cmake-modules
+, qtbase
+, qtscript
+, libXfixes
+, libXtst
+, qtx11extras
+, git
+, knotifications
+, qtwayland
+, wayland
+, fetchpatch
 }:
 
 mkDerivation rec {
   pname = "CopyQ";
-  version = "3.13.0";
+  version = "4.1.0";
 
-  src  = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "0qssyavx0dkgsyj2myqg8n7sih8niy960nyb1yknsbjm37iqraah";
+    sha256 = "1iacnd9dn0mrajff80r2g5nlks5sch9lmpl633mnyqmih9dwx2li";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
 
   buildInputs = [
-    git qtbase qtscript libXfixes libXtst qtx11extras
-  ] ++ lib.optional webkitSupport qtwebkit;
+    qtbase
+    qtscript
+    libXfixes
+    libXtst
+    qtx11extras
+    knotifications
+    qtwayland
+    wayland
+  ];
+
+  patches = [
+    # Install the bash completion script correctly
+    # Remove once 4.1.1 is released
+    (fetchpatch {
+      url = "https://github.com/hluk/CopyQ/commit/aca7222ec28589af0b08f63686104b992d63ee42.patch";
+      sha256 = "0d440d0zsdzm9cd0b6c42y9qbrvxg7gdam0qmif62mr8qa0ylidl";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace shared/com.github.hluk.copyq.desktop.in \
+      --replace copyq "$out/bin/copyq"
+  '';
 
   meta = with lib; {
-    homepage    = "https://hluk.github.io/CopyQ";
+    homepage = "https://hluk.github.io/CopyQ";
     description = "Clipboard Manager with Advanced Features";
-    license     = licenses.gpl3;
-    maintainers = [ maintainers.willtim ];
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ willtim artturin ];
     # NOTE: CopyQ supports windows and osx, but I cannot test these.
     # OSX build requires QT5.
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1dd7beb83a3..fc9d151c5a64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23431,7 +23431,7 @@ in
 
   confclerk = callPackage ../applications/misc/confclerk { };
 
-  copyq = libsForQt514.callPackage ../applications/misc/copyq { };
+  copyq = libsForQt5.callPackage ../applications/misc/copyq { };
 
   corectrl = libsForQt5.callPackage ../applications/misc/corectrl { };
 

From 5d01b52010a21ecf6c2cfe8dab487115601e6573 Mon Sep 17 00:00:00 2001
From: Matt Layher <mdlayher@gmail.com>
Date: Tue, 20 Jul 2021 15:31:32 -0400
Subject: [PATCH 325/330] corerad: 0.3.2 -> 0.3.3

Signed-off-by: Matt Layher <mdlayher@gmail.com>
---
 pkgs/tools/networking/corerad/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix
index 341e1c13335c..8ba8109f2668 100644
--- a/pkgs/tools/networking/corerad/default.nix
+++ b/pkgs/tools/networking/corerad/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "corerad";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "corerad";
     rev = "v${version}";
-    sha256 = "1avbd0ldmzzkfay2pm6b88aln388cj8z7dzyw6i8m5k0lmmmmz9y";
+    sha256 = "1xfqjxygf6r5wbf3brilx4d4hm0h518zaadmmzvkmbbz6w0fyl0k";
   };
 
-  vendorSha256 = "0cd6h5d4yjn86q296qp6lgxcykci1233s4s2fp8m0l3ywss69fck";
+  vendorSha256 = "0ydyfdx9syrv719knwv64srfx4d1m9pzkivfc3q188bx5qx67pjw";
 
   doCheck = false;
 

From 1916bd87173c3af6efa077da53180a16f3697139 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 20 Jul 2021 10:23:48 -0700
Subject: [PATCH 326/330] mill: 0.9.8 -> 0.9.9

Use the `${version}-assembly` artifact, which avoids
having to download it using the release script
---
 .../tools/build-managers/mill/default.nix        | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index 4682fab41db1..27a21619c1d7 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mill";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchurl {
-    url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}";
-    sha256 = "sha256-vWCzjit7MPrKqEYgJfQHAkam9J9NgMObOQ/A+OQr24o=";
+    url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
+    sha256 = "sha256-HIT7bxMEz7jpSsYvohN9+zYuyCf/ARE7hd48YMTo9/4=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
   dontConfigure = true;
   dontBuild = true;
 
+  # this is mostly downloading a pre-built artifact
+  preferLocal = true;
+
   installPhase = ''
     runHook preInstall
     install -Dm555 "$src" "$out/bin/.mill-wrapped"
@@ -25,6 +28,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  doInstallCheck = true;
+  # The default release is a script which will do an impure download
+  # just ensure that the application can run without network
+  installCheckPhase = ''
+    $out/bin/mill --help > /dev/null
+  '';
+
   meta = with lib; {
     homepage = "https://www.lihaoyi.com/mill";
     license = licenses.mit;

From f150d0a6bd7c331f5cc014a9da1efd325e4590d8 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 20 Jul 2021 22:32:28 +0200
Subject: [PATCH 327/330] fetchurl: replace dead sourceforge mirrors (#130834)

---
 pkgs/build-support/fetchurl/mirrors.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 292baed20dfe..e5095478002a 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -19,9 +19,9 @@
   sourceforge = [
     "https://downloads.sourceforge.net/"
     "https://prdownloads.sourceforge.net/"
-    "https://heanet.dl.sourceforge.net/sourceforge/"
-    "https://surfnet.dl.sourceforge.net/sourceforge/"
-    "https://dfn.dl.sourceforge.net/sourceforge/"
+    "https://netcologne.dl.sourceforge.net/sourceforge/"
+    "https://versaweb.dl.sourceforge.net/sourceforge/"
+    "https://freefr.dl.sourceforge.net/sourceforge/"
     "https://osdn.dl.sourceforge.net/sourceforge/"
     "https://kent.dl.sourceforge.net/sourceforge/"
   ];

From 5f496e0da3dee5ad4ee32c485e1c103c1139ae00 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 20 Jul 2021 19:47:25 +0000
Subject: [PATCH 328/330] gnome.gnome-desktop: 40.1 -> 40.3

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

diff --git a/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-desktop/default.nix
index 56bd074c2cb9..1a7887fc35da 100644
--- a/pkgs/desktops/gnome/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-desktop/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-desktop";
-  version = "40.1";
+  version = "40.3";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-igeJcwUhnFaZVJriBI9xVVFe+Xx85NZYXd2hXVhZ4c8=";
+    sha256 = "sha256-U9ZGlEbXoJsCaTZ2nllTUv3zvlYy80a7Af5XyLUWLOs=";
   };
 
   patches = [

From 34141d226ac86bd3bd695fbc074722114bef5c15 Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Tue, 20 Jul 2021 21:47:01 +0000
Subject: [PATCH 329/330] exploitdb: 2021-07-17 -> 2021-07-20

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

diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index ba4844d9ed18..bd3057896f68 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2021-07-17";
+  version = "2021-07-20";
 
   src = fetchFromGitHub {
     owner = "offensive-security";
     repo = pname;
     rev = version;
-    sha256 = "sha256-33Jv6sGJDguXOn2iiq3KpEPe4+LexDwwcY6P8AWbpVg=";
+    sha256 = "sha256-WjCayhpWeZ19DygKNLfwE5OGi4sQI+I+j3BMLuce9Z4=";
   };
 
   installPhase = ''

From af9ea49430fe014708fa68b1ffe8513e4ecc9a00 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 21 Jul 2021 00:49:58 +0200
Subject: [PATCH 330/330] chromiumBeta: Temporarily build on Hydra

The stable channel update in #130877 is currently blocked due to
regressions but a cached build on Hydra might be useful for the meantime
(and that build would even be reusable if the PR is merged without any
changes).
---
 pkgs/applications/networking/browsers/chromium/browser.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 602e2e6a8299..6398b82dbe36 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -88,7 +88,7 @@ mkChromiumDerivation (base: rec {
     license = if enableWideVine then licenses.unfree else licenses.bsd3;
     platforms = platforms.linux;
     mainProgram = "chromium";
-    hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium")
+    hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium" || channel == "beta")
       then ["aarch64-linux" "x86_64-linux"]
       else [];
     timeout = 172800; # 48 hours (increased from the Hydra default of 10h)