From 5b3f9e0d4135e622200fdcb1da773eb282e40a1d Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Tue, 30 Mar 2021 20:46:10 +0200
Subject: [PATCH 001/235] glib: follow profile updates when searching apps

GNOME Shell monitors XDG_DATA_DIRS for changes using inotify for the
purpose of updating the list of applications displayed in the overview
as they are installed or removed. Because the relevant directories are
symlinks under NixOS and are swapped on change, Shell never notices it.
To remedy this, also monitor various profile directories to signal an
update whenever profiles are changed.

This uses a patch from Guix, slightly modified to also encompass user
environment profiles (/etc/profiles/per-user/$USER) in addition to the
system profile (/nix/var/nix/profiles/system) as well as regular user
profiles (/nix/var/nix/profiles/per-user/$USER/profile).
---
 pkgs/development/libraries/glib/default.nix   |   1 +
 .../libraries/glib/glib-appinfo-watch.patch   | 102 ++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 pkgs/development/libraries/glib/glib-appinfo-watch.patch

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index b18ce099dced..d879a0847bd4 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
     ./quark_init_on_demand.patch
     ./gobject_init_on_demand.patch
   ] ++ [
+    ./glib-appinfo-watch.patch
     ./schema-override-variable.patch
 
     # GLib contains many binaries used for different purposes;
diff --git a/pkgs/development/libraries/glib/glib-appinfo-watch.patch b/pkgs/development/libraries/glib/glib-appinfo-watch.patch
new file mode 100644
index 000000000000..cbd78a6db4a6
--- /dev/null
+++ b/pkgs/development/libraries/glib/glib-appinfo-watch.patch
@@ -0,0 +1,102 @@
+This patch lets GLib's GDesktopAppInfo API watch and notice changes
+to the Nix user and system profiles.  That way, the list of available
+applications shown by the desktop environment is immediately updated
+when the user installs or removes any
+(see <https://issues.guix.gnu.org/35594>).
+
+It does so by monitoring /nix/var/nix/profiles (for changes to the system
+profile) and /nix/var/nix/profiles/per-user/USER (for changes to the user
+profile) as well as /etc/profiles/per-user (for chanes to the user
+environment profile) and crawling their share/applications sub-directory when
+changes happen.
+
+diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
+index b779b30..31069f7 100644
+--- a/gio/gdesktopappinfo.c
++++ b/gio/gdesktopappinfo.c
+@@ -150,6 +150,7 @@ typedef struct
+   gchar                      *alternatively_watching;
+   gboolean                    is_config;
+   gboolean                    is_setup;
++  gchar                      *nix_profile_watch_dir;
+   GFileMonitor               *monitor;
+   GHashTable                 *app_names;
+   GHashTable                 *mime_tweaks;
+@@ -181,6 +182,7 @@ desktop_file_dir_unref (DesktopFileDir *dir)
+     {
+       desktop_file_dir_reset (dir);
+       g_free (dir->path);
++      g_free (dir->nix_profile_watch_dir);
+       g_free (dir);
+     }
+ }
+@@ -205,6 +207,14 @@ desktop_file_dir_get_alternative_dir (DesktopFileDir *dir)
+ {
+   gchar *parent;
+ 
++  /* If DIR is a profile, watch the specified directory--e.g.,
++   * /nix/var/nix/profiles/per-user/$USER/ for the user profile.  Do not watch
++   * ~/.nix-profile or /run/current-system/sw because GFileMonitor does
++   * not pass IN_DONT_FOLLOW and thus cannot notice any change.
++   * /etc/profiles/per-user is monitored directly for the same reason. */
++  if (dir->nix_profile_watch_dir != NULL)
++    return g_strdup (dir->nix_profile_watch_dir);
++
+   /* If the directory itself exists then we need no alternative. */
+   if (g_access (dir->path, R_OK | X_OK) == 0)
+     return NULL;
+@@ -250,11 +260,11 @@ desktop_file_dir_changed (GFileMonitor      *monitor,
+    *
+    * If this is a notification for a parent directory (because the
+    * desktop directory didn't exist) then we shouldn't fire the signal
+-   * unless something actually changed.
++   * unless something actually changed or it's part of a Nix profile.
+    */
+   g_mutex_lock (&desktop_file_dir_lock);
+ 
+-  if (dir->alternatively_watching)
++  if (dir->alternatively_watching && dir->nix_profile_watch_dir == NULL)
+     {
+       gchar *alternative_dir;
+ 
+@@ -1556,6 +1566,40 @@ desktop_file_dirs_lock (void)
+       for (i = 0; dirs[i]; i++)
+         g_ptr_array_add (desktop_file_dirs, desktop_file_dir_new (dirs[i]));
+ 
++      {
++        /* Monitor the system and user profile under /nix/var/nix/profiles and
++         * treat modifications to them as if they were modifications to their
++         * /share sub-directory.  */
++        const gchar *user;
++        DesktopFileDir *system_profile_dir, *user_profile_dir, *user_env_dir;
++
++        system_profile_dir =
++          desktop_file_dir_new ("/nix/var/nix/profiles/system/sw/share");
++        system_profile_dir->nix_profile_watch_dir = g_strdup ("/nix/var/nix/profiles");
++        g_ptr_array_add (desktop_file_dirs, desktop_file_dir_ref (system_profile_dir));
++
++        user = g_get_user_name ();
++        if (user != NULL)
++          {
++            gchar *profile_dir, *user_data_dir, *env_dir, *env_data_dir;
++
++            profile_dir = g_build_filename ("/nix/var/nix/profiles/per-user", user, NULL);
++            user_data_dir = g_build_filename (profile_dir, "profile", "share", NULL);
++            user_profile_dir = desktop_file_dir_new (user_data_dir);
++            user_profile_dir->nix_profile_watch_dir = profile_dir;
++            
++            env_dir = g_build_filename ("/etc/profiles/per-user", NULL);
++            env_data_dir = g_build_filename (env_dir, user, "share", NULL);
++            user_env_dir = desktop_file_dir_new (env_data_dir);
++            user_env_dir->nix_profile_watch_dir = env_dir;
++
++            g_ptr_array_add (desktop_file_dirs, desktop_file_dir_ref (user_profile_dir));
++            g_ptr_array_add (desktop_file_dirs, desktop_file_dir_ref (user_env_dir));
++            g_free (user_data_dir);
++            g_free (env_data_dir);
++          }
++      }
++
+       /* The list of directories will never change after this, unless
+        * g_get_user_config_dir() changes due to %G_TEST_OPTION_ISOLATE_DIRS. */
+       desktop_file_dirs_config_dir = user_config_dir;

From 03242983afd1948a446a6d0747c2e52ae48a4f22 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 26 Apr 2021 18:50:02 +0200
Subject: [PATCH 002/235] ncurses: remove unnecessary patch

Tested compilation with

* clangStdenv
* gccStdenv
* gcc9Stdenv
* gcc8Stdenv
* gcc7Stdenv
* gcc6Stdenv
* gcc49Stdenv
---
 .../development/libraries/ncurses/clang.patch | 42 -------------------
 .../development/libraries/ncurses/default.nix |  2 -
 2 files changed, 44 deletions(-)
 delete mode 100644 pkgs/development/libraries/ncurses/clang.patch

diff --git a/pkgs/development/libraries/ncurses/clang.patch b/pkgs/development/libraries/ncurses/clang.patch
deleted file mode 100644
index ce33049bf405..000000000000
--- a/pkgs/development/libraries/ncurses/clang.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ruNp ncurses-5.8.orig/c++/cursesf.h ncurses-5.8/c++/cursesf.h
---- ncurses-5.8.orig/c++/cursesf.h	2005-08-13 21:08:24.000000000 +0300
-+++ ncurses-5.8/c++/cursesf.h	2011-04-03 18:29:29.000000000 +0300
-@@ -681,7 +681,7 @@ public:
- 		   const T* p_UserData = STATIC_CAST(T*)(0),
- 		   bool with_frame=FALSE,
- 		   bool autoDelete_Fields=FALSE)
--    : NCursesForm (Fields, with_frame, autoDelete_Fields) {
-+    : NCursesForm (&Fields, with_frame, autoDelete_Fields) {
-       if (form)
- 	set_user (const_cast<void *>(p_UserData));
-   };
-@@ -694,7 +694,7 @@ public:
- 		   const T* p_UserData = STATIC_CAST(T*)(0),
- 		   bool with_frame=FALSE,
- 		   bool autoDelete_Fields=FALSE)
--    : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
-+    : NCursesForm (&Fields, nlines, ncols, begin_y, begin_x,
- 		   with_frame, autoDelete_Fields) {
-       if (form)
- 	set_user (const_cast<void *>(p_UserData));
-diff -ruNp ncurses-5.8.orig/c++/cursesm.h ncurses-5.8/c++/cursesm.h
---- ncurses-5.8.orig/c++/cursesm.h	2005-08-13 21:10:36.000000000 +0300
-+++ ncurses-5.8/c++/cursesm.h	2011-04-03 18:31:42.000000000 +0300
-@@ -639,7 +639,7 @@ public:
- 		   const T* p_UserData = STATIC_CAST(T*)(0),
- 		   bool with_frame=FALSE,
- 		   bool autoDelete_Items=FALSE)
--    : NCursesMenu (Items, with_frame, autoDelete_Items) {
-+    : NCursesMenu (&Items, with_frame, autoDelete_Items) {
-       if (menu)
- 	set_user (const_cast<void *>(p_UserData));
-   };
-@@ -651,7 +651,7 @@ public:
- 		   int begin_x = 0,
- 		   const T* p_UserData = STATIC_CAST(T*)(0),
- 		   bool with_frame=FALSE)
--    : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
-+    : NCursesMenu (&Items, nlines, ncols, begin_y, begin_x, with_frame) {
-       if (menu)
- 	set_user (const_cast<void *>(p_UserData));
-   };
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 742de6cf92e7..db41657b8057 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
     sha256 = "15r2456g0mlq2q7gh2z52vl6zv6y0z8sdchrs80kg4idqd8sm8fd";
   };
 
-  patches = lib.optional (!stdenv.cc.isClang) ./clang.patch;
-
   outputs = [ "out" "dev" "man" ];
   setOutputFlags = false; # some aren't supported
 

From efbeb4ee5bb4da39bd9c936d6ff1930dbe95d00b Mon Sep 17 00:00:00 2001
From: Simone Mosciatti <simone.mosciatti@cern.ch>
Date: Sat, 12 Dec 2020 17:31:50 +0100
Subject: [PATCH 003/235] autogen: fix patchelf invocation to remove generic
 build path from rpath

Co-authored-by: Ryan Burns <rtburns@protonmail.com>
---
 pkgs/development/tools/misc/autogen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 75c6471eb4c6..5ea6ae4d7c65 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -79,9 +79,9 @@ stdenv.mkDerivation rec {
     done
 
   '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-    # remove /build/** from RPATHs
+    # remove build directory (/build/**, or /tmp/nix-build-**) from RPATHs
     for f in "$bin"/bin/*; do
-      local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)/build/[^:]*:@\1@g')"
+      local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)'$NIX_BUILD_TOP'[^:]*:@\1@g')"
       patchelf --set-rpath "$nrp" "$f"
     done
   '';

From 5e2f703e83cb97cfddef33f9345f208bac40d128 Mon Sep 17 00:00:00 2001
From: milahu <milahu@gmail.com>
Date: Thu, 9 Sep 2021 20:13:21 +0200
Subject: [PATCH 004/235] unpackFile: ignore timestamp warnings

---
 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 ec5a5e6dcb9d..249303b5936b 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -832,12 +832,12 @@ _defaultUnpack() {
         case "$fn" in
             *.tar.xz | *.tar.lzma | *.txz)
                 # Don't rely on tar knowing about .xz.
-                xz -d < "$fn" | tar xf -
+                xz -d < "$fn" | tar xf - --warning=no-timestamp
                 ;;
             *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz)
                 # GNU tar can automatically select the decompression method
                 # (info "(tar) gzip").
-                tar xf "$fn"
+                tar xf "$fn" --warning=no-timestamp
                 ;;
             *)
                 return 1

From 152a8a69aff8ee6e2a7bf0cc12234201f644fce4 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 20 Sep 2021 08:31:06 +0100
Subject: [PATCH 005/235] ell: 0.43 -> 0.44

Closes: https://github.com/NixOS/nixpkgs/pull/136324
---
 pkgs/os-specific/linux/ell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index 5fea8c197963..308997501ff0 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.43";
+  version = "0.44";
 
   outputs = [ "out" "dev" ];
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
     rev = version;
-    sha256 = "sha256-ttKFKV8spxnkFpZHV4Dn9BxJdjxYLWYrHY+qq6uAOlg=";
+    sha256 = "sha256-8korsEvlQOtfyuGkzFun1Xbuc4uhI2I0YpACUfxlpIM=";
   };
 
   nativeBuildInputs = [

From eeaf2004b01cdb4191a3e15cbb6f7f9a868a7412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 13 Sep 2021 14:26:30 +0200
Subject: [PATCH 006/235] pam: add audit dependency

This allows building the pam_tty_audit module, among others
---
 pkgs/os-specific/linux/pam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index fb993699494f..12ff9f493a37 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchurl, flex, cracklib, db4, gettext
+{ lib, stdenv, buildPackages, fetchurl, flex, cracklib, db4, gettext, audit
 , nixosTests
 , withLibxcrypt ? false, libxcrypt
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ flex ]
     ++ lib.optional stdenv.buildPlatform.isDarwin gettext;
 
-  buildInputs = [ cracklib db4 ]
+  buildInputs = [ cracklib db4 audit ]
     ++ lib.optional withLibxcrypt libxcrypt;
 
   enableParallelBuilding = true;

From f3d00b3a94bbbe89890bb75bb099c52988300fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 13 Sep 2021 14:43:12 +0200
Subject: [PATCH 007/235] nixos/pam: add pam_tty_audit option

---
 nixos/modules/security/pam.nix | 46 ++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 8b1f653d4e2c..0fe4d1bcae78 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -197,6 +197,46 @@ let
         '';
       };
 
+      ttyAudit = {
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Enable or disable TTY auditing for specified users
+          '';
+        };
+
+        enablePattern = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            For each user matching one of comma-separated
+            glob patterns, enable TTY auditing
+          '';
+        };
+
+        disablePattern = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            For each user matching one of comma-separated
+            glob patterns, disable TTY auditing
+          '';
+        };
+
+        openOnly = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Set the TTY audit flag when opening the session,
+            but do not restore it when closing the session.
+            Using this option is necessary for some services
+            that don't fork() to run the authenticated session,
+            such as sudo.
+          '';
+        };
+      };
+
       forwardXAuth = mkOption {
         default = false;
         type = types.bool;
@@ -482,6 +522,12 @@ let
               "session ${
                 if config.boot.isContainer then "optional" else "required"
               } pam_loginuid.so"}
+          ${optionalString cfg.ttyAudit.enable
+              "session required ${pkgs.pam}/lib/security/pam_tty_audit.so
+                open_only=${toString cfg.ttyAudit.openOnly}
+                ${optionalString (cfg.ttyAudit.enablePattern != null) "enable=${cfg.ttyAudit.enablePattern}"}
+                ${optionalString (cfg.ttyAudit.disablePattern != null) "disable=${cfg.ttyAudit.disablePattern}"}
+              "}
           ${optionalString cfg.makeHomeDir
               "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0022"}
           ${optionalString cfg.updateWtmp

From 3251722dcd47112e1558df2c996ce94c5d613a7b Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Mon, 4 Oct 2021 11:42:18 +0000
Subject: [PATCH 008/235] xorg.libXi: 1.7.10 -> 1.8

https://lists.x.org/archives/xorg-announce/2021-September/003109.html
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d7311ef44003..a4269672f978 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1032,11 +1032,11 @@ lib.makeScope newScope (self: with self; {
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation {
     pname = "libXi";
-    version = "1.7.10";
+    version = "1.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2";
-      sha256 = "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn";
+      url = "mirror://xorg/individual/lib/libXi-1.8.tar.bz2";
+      sha256 = "005sicls6faddkcj449858i9xz1nafy70y26frsk7iv1d9283l9f";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index b3a4aedfeb6a..0ebf07f5da3f 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -189,7 +189,7 @@ mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
 mirror://xorg/individual/lib/libXfont2-2.0.5.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2
-mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2
+mirror://xorg/individual/lib/libXi-1.8.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2
 mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2
 mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2

From 6b7671d4ae7a4a09473ee5705a51650cfbab6f06 Mon Sep 17 00:00:00 2001
From: Emil Karlson <jekarlson@gmail.com>
Date: Tue, 5 Oct 2021 11:39:07 +0300
Subject: [PATCH 009/235] kernel: enable EFI initrd loader

Initrd loader is not enabled by default in some aarch64 kernels,
which makes systemd-boot booted kernels fail by default, add this
everywhere, since this is a sane default even when it's already in
some kernel defaults.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 717fdaee72a5..eebdd8ded207 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -756,6 +756,8 @@ let
       DVB_DYNAMIC_MINORS = option yes; # we use udev
 
       EFI_STUB            = yes; # EFI bootloader in the bzImage itself
+      EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER =
+          whenAtLeast "5.8" yes; # initrd kernel parameter for EFI
       CGROUPS             = yes; # used by systemd
       FHANDLE             = yes; # used by systemd
       SECCOMP             = yes; # used by systemd >= 231

From 4a7fca22400e50a6606734ae88be1ee50726899e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 6 Oct 2021 19:28:16 +0200
Subject: [PATCH 010/235] llvmPackages_latest: 12 -> 13

---
 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 a22aabc13d7d..349cf47806c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12246,7 +12246,7 @@ with pkgs;
     stdenv = gcc7Stdenv;
   }));
 
-  llvmPackages_latest = llvmPackages_12;
+  llvmPackages_latest = llvmPackages_13;
 
   llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { });
 

From 379757c56d202b7e2e80cc7ebc6ee2665bd42f8c Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Fri, 8 Oct 2021 16:13:14 -0700
Subject: [PATCH 011/235] srtp: 2.4.0 -> 2.4.2

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

diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
index b0ab391a89f0..6c903805175f 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libsrtp";
-  version = "2.4.0";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "cisco";
     repo = "libsrtp";
     rev = "v${version}";
-    sha256 = "0syl2ywddgqz29h43d6rc7waf3hp2yc14yhnrvdsja2bg8wrv6sb";
+    sha256 = "sha256-6FAkfxC7Tg7uIAmTmRt5Sn8/YofILfpe7Y4pSaq8XL8=";
   };
 
   outputs = [ "out" "dev" ];

From ed148c28905633f432fd8bedfa7b304af84770a7 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Sat, 9 Oct 2021 09:34:20 +0000
Subject: [PATCH 012/235] xorg.xf86inputlibinput: 1.1.0 -> 1.2.0

https://lists.x.org/archives/xorg-announce/2021-September/003110.html
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d7311ef44003..e83fef02fab2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1977,11 +1977,11 @@ lib.makeScope newScope (self: with self; {
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation {
     pname = "xf86-input-libinput";
-    version = "1.1.0";
+    version = "1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/driver/xf86-input-libinput-1.1.0.tar.bz2";
-      sha256 = "05ldqr10f2rrnshyk3lc773rz0gp3ccdzwa8n7lsc94i850jl7g1";
+      url = "mirror://xorg/individual/driver/xf86-input-libinput-1.2.0.tar.bz2";
+      sha256 = "1xk9b05csndcgcj8kbb6fkwa3c7njzzxc6qvz9bvy77y2k2s63gq";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index b3a4aedfeb6a..25bf8143d4c2 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -81,7 +81,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-libinput-1.1.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-libinput-1.2.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2

From 0166a98edc90336a21c6715d48b40c67c59070b3 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sun, 10 Oct 2021 15:45:15 -0700
Subject: [PATCH 013/235] help2man: 1.48.1 -> 1.48.5

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

diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index d4d6dc41657d..24edb2c5955b 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "help2man";
-  version = "1.48.1";
+  version = "1.48.5";
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-3op0dAvQWGRlZ7kqtOzeudqfGgfMfE9gejwU3TjRB5k=";
+    sha256 = "sha256-ZznkyqQuau0zmb5Dh8p5OZZAlnM06RcohjuOqpIlgr4=";
   };
 
   nativeBuildInputs = [ gettext perlPackages.LocaleGettext ];

From 424d7df201d51039ad11e85646fe88c181bff2ea Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Tue, 12 Oct 2021 07:18:30 +0200
Subject: [PATCH 014/235] sphinx: 4.0.2 -> 4.2.0

Update to latest release.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/development/python-modules/sphinx/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index a04a0585019f..9d82b4c59810 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -2,7 +2,6 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
-, fetchpatch
 # propagatedBuildInputs
 , Babel
 , alabaster
@@ -29,24 +28,16 @@
 
 buildPythonPackage rec {
   pname = "sphinx";
-  version = "4.0.2";
+  version = "4.2.0";
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "sphinx-doc";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-0QdgHFX4r40BDHjpi9R40lXqT4n5ZgrIny+w070LZPE=";
+    sha256 = "1i38n5bxqiycjwmiv9dl72r3f5ks4zmif30znqg8zilclbx6g16x";
   };
 
-  patches = [
-    (fetchpatch {
-      # Fix tests with pygments 2.10
-      url = "https://github.com/sphinx-doc/sphinx/commit/bde6c8d2effc56dc8b9098abee796167f972c306.patch";
-      sha256 = "0d0ddhgrrh7z9ix0f3zrc2gjb4d73f6ffm98zl62fzv5l4fd00lr";
-    })
-  ];
-
   propagatedBuildInputs = [
     Babel
     alabaster

From fd5a074a9b6931d0c2353c6d9689837ffc1a2499 Mon Sep 17 00:00:00 2001
From: ckie <git-525ff67@ckie.dev>
Date: Sat, 21 Aug 2021 05:42:16 +0300
Subject: [PATCH 015/235] cnping: init at 2021-04-04

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

diff --git a/pkgs/tools/networking/cnping/default.nix b/pkgs/tools/networking/cnping/default.nix
new file mode 100644
index 000000000000..0a7aed4fcb5d
--- /dev/null
+++ b/pkgs/tools/networking/cnping/default.nix
@@ -0,0 +1,32 @@
+{ lib, stdenv, fetchFromGitHub, libglvnd, xorg }:
+
+stdenv.mkDerivation rec {
+  pname = "cnping";
+  version = "unstable-2021-04-04";
+
+  src = fetchFromGitHub {
+    owner = "cntools";
+    repo = "cnping";
+    rev = "6b89363e6b79ecbf612306d42a8ef94a5a2f756a";
+    sha256 = "sha256-E3Wm5or6C4bHq7YoyaEbtDwyd+tDVYUOMeQrprlmL4A=";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [ libglvnd xorg.libXinerama xorg.libXext xorg.libX11 ];
+
+  # The "linuxinstall" target won't work for us:
+  # it tries to setcap and copy to a FHS directory
+  installPhase = ''
+    mkdir -p $out/{bin,share/man/man1}
+    cp cnping $out/bin/cnping
+    cp cnping.1 $out/share/man/man1/cnping.1
+  '';
+
+  meta = with lib; {
+    description = "Minimal Graphical IPV4 Ping Tool";
+    homepage = "https://github.com/cntools/cnping";
+    license = with licenses; [ mit bsd3 ]; # dual licensed, MIT-x11 & BSD-3-Clause
+    maintainers = with maintainers; [ ckie ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80ea6f313f16..2cdbcafb8e38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8554,6 +8554,8 @@ with pkgs;
 
   cntlm = callPackage ../tools/networking/cntlm { };
 
+  cnping = callPackage ../tools/networking/cnping { };
+
   past-time = python3Packages.callPackage ../tools/misc/past-time { };
 
   pastebinit = callPackage ../tools/misc/pastebinit { };

From 2ba28b7226d72bda0b15c66e55abf871f49f27a3 Mon Sep 17 00:00:00 2001
From: ckie <git-525ff67@ckie.dev>
Date: Sat, 21 Aug 2021 05:43:43 +0300
Subject: [PATCH 016/235] nixos/cnping: init

---
 nixos/modules/module-list.nix     |  1 +
 nixos/modules/programs/cnping.nix | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 nixos/modules/programs/cnping.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index df35a57d047f..cda1fff24245 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -127,6 +127,7 @@
   ./programs/cdemu.nix
   ./programs/chromium.nix
   ./programs/clickshare.nix
+  ./programs/cnping.nix
   ./programs/command-not-found/command-not-found.nix
   ./programs/criu.nix
   ./programs/dconf.nix
diff --git a/nixos/modules/programs/cnping.nix b/nixos/modules/programs/cnping.nix
new file mode 100644
index 000000000000..d208d2b07040
--- /dev/null
+++ b/nixos/modules/programs/cnping.nix
@@ -0,0 +1,21 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.cnping;
+in
+{
+  options = {
+    programs.cnping = {
+      enable = mkEnableOption "Whether to install a setcap wrapper for cnping";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    security.wrappers.cnping = {
+      source = "${pkgs.cnping}/bin/cnping";
+      capabilities = "cap_net_raw+ep";
+    };
+  };
+}

From 52b6290b734f7716e55149531de5440467fe338f Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 14 Oct 2021 21:41:58 +0200
Subject: [PATCH 017/235] e2fsprogs: 1.46.2 -> 1.46.4

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

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 327ddbf8d6dd..5f1775e77e09 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "e2fsprogs";
-  version = "1.46.2";
+  version = "1.46.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-958mtPZb3AWfyhLh7GowQMPOGlA/tw65Fb7nGQOBXNU=";
+    sha256 = "0ra2d1wasksy1zy3rgviwdni40dnamchisjrrqqi940y545m493m";
   };
 
   outputs = [ "bin" "dev" "out" "man" "info" ];

From 5de3c5d89d8d8229838fd98a8c386da344853367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 5 Oct 2021 23:33:08 -0700
Subject: [PATCH 018/235] python3Packages.multidict: improve expression

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

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 6a167697f9cd..0ea21ecbe405 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -2,14 +2,14 @@
 , fetchPypi
 , buildPythonPackage
 , pytestCheckHook
-, isPy3k
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "multidict";
   version = "5.2.0";
 
-  disabled = !isPy3k;
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
@@ -17,12 +17,13 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "--cov=multidict --cov-report term-missing:skip-covered --cov-report xml" ""
+    sed -i '/^addopts/d' setup.cfg
   '';
 
   checkInputs = [ pytestCheckHook ];
 
+  pythonImportsCheck = [ "multidict" ];
+
   meta = with lib; {
     description = "Multidict implementation";
     homepage = "https://github.com/aio-libs/multidict/";

From c895c947b187dbf6e3898e3ec19f6c53f8f27923 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Fri, 15 Oct 2021 20:47:47 +0200
Subject: [PATCH 019/235] libsoup_3: support cross-compilation

---
 pkgs/development/libraries/libsoup/3.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix
index 6fd7f3e696a2..a356836b85ca 100644
--- a/pkgs/development/libraries/libsoup/3.x.nix
+++ b/pkgs/development/libraries/libsoup/3.x.nix
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     glib
+    python3
   ] ++ lib.optionals withIntrospection [
     gobject-introspection
   ] ++ lib.optionals withVala [
@@ -42,7 +43,6 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    python3
     sqlite
     libpsl
     glib.out

From c4bf11346c5328286a8de9ebfcececbf4a0abc12 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 15 Oct 2021 23:09:56 +0200
Subject: [PATCH 020/235] libaom: 3.1.3 -> 3.2.0

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

diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index 62415ea1335e..82e440333136 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libaom";
-  version = "3.1.3";
+  version = "3.2.0";
 
   src = fetchzip {
     url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz";
-    sha256 = "08rk31d2cp9k9nj37s6a4n7klpfqfbj62anwyiggzsz7b68psjq3";
+    sha256 = "0fmnbzpl481i7kchx4hbvb507r5pfgyrzfrlrs7jk3bicycm75qv";
     stripRoot = false;
   };
 

From 1d1b097b865e2d7eb2aecf60f88f4decd72f0758 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Sat, 16 Oct 2021 10:12:36 +0200
Subject: [PATCH 021/235] cryptsetup: 2.4.0 -> 2.4.1

---
 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 9522e9e52241..150547367a34 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.4.0";
+  version = "2.4.1";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/cryptsetup/v2.4/${pname}-${version}.tar.xz";
-    sha256 = "sha256-xci9oxFZqcAQ6nLnCAU8xCUs9e69ylIOFQq8Bgkof/g=";
+    sha256 = "sha256-o1anJ6g6RkreVm6VI5Yioi2+Tg9IKxmP2wSrDTpanF8=";
   };
 
   # Disable 4 test cases that fail in a sandbox

From faca78ac3805fea9dbfc3597ea21ec42cd8da95e Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Sat, 16 Oct 2021 10:29:40 +0200
Subject: [PATCH 022/235] valgrind: 3.17.0 -> 3.18.1

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

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 5d747317e453..be7841c3a0d4 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "valgrind";
-  version = "3.17.0";
+  version = "3.18.1";
 
   src = fetchurl {
     url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "18l5jbk301j3462gipqn9bkfx44mdmwn0pwr73r40gl1irkfqfmd";
+    sha256 = "sha256-AIWaoTp3Lt33giIl9LRu4NOa++Bx0yd42k2ZmECB9/U=";
   };
 
   outputs = [ "out" "dev" "man" "doc" ];

From 106e944e19d6fdbb0fc3d64495403b788835e1d4 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 16 Oct 2021 02:17:31 +0100
Subject: [PATCH 023/235] curl: 7.76.1 -> 7.79.1

patching out SystemConfiguration requirement on darwin as we
can't use it from within the curl bootstrap loop
---
 ...7.79.1-darwin-no-systemconfiguration.patch |  52 +++
 .../networking/curl/CVE-2021-22897.patch      |  64 ---
 .../networking/curl/CVE-2021-22898.patch      |  25 -
 .../networking/curl/CVE-2021-22901.patch      | 437 ------------------
 .../networking/curl/CVE-2021-22945.patch      |  27 --
 pkgs/tools/networking/curl/default.nix        |   9 +-
 6 files changed, 55 insertions(+), 559 deletions(-)
 create mode 100644 pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch
 delete mode 100644 pkgs/tools/networking/curl/CVE-2021-22897.patch
 delete mode 100644 pkgs/tools/networking/curl/CVE-2021-22898.patch
 delete mode 100644 pkgs/tools/networking/curl/CVE-2021-22901.patch
 delete mode 100644 pkgs/tools/networking/curl/CVE-2021-22945.patch

diff --git a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch
new file mode 100644
index 000000000000..eddc282dd87b
--- /dev/null
+++ b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch
@@ -0,0 +1,52 @@
+On darwin, providing SystemConfiguration to curl currently results in a
+reference loop, so we have to disable the check for it and the feature
+which requires it (NAT64).
+
+Patching actual configure script here as we also don't want to require
+autoconf in the bootstrap loop just to regenerate a patched configure.ac.
+
+--- a/configure   2021-10-16 00:51:59.000000000 +0100
++++ b/configure   2021-10-16 01:06:46.000000000 +0100
+@@ -20810,7 +20810,7 @@
+     if test "x$build_for_macos" != xno; then
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ printf "%s\n" "yes" >&6; }
+-      LDFLAGS="$LDFLAGS -framework CoreFoundation -framework SystemConfiguration"
++      LDFLAGS="$LDFLAGS -framework CoreFoundation"
+     else
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+@@ -22211,9 +22211,6 @@
+ fi
+ 
+ 
+-if test "$HAVE_GETHOSTBYNAME" != "1"; then
+-  as_fn_error $? "couldn't find libraries for gethostbyname()" "$LINENO" 5
+-fi
+ 
+ 
+ curl_includes_winsock2="\
+diff --git a/lib/curl_setup.h b/lib/curl_setup.h
+index 99048c489..19abfbbac 100644
+--- a/lib/curl_setup.h
++++ b/lib/curl_setup.h
+@@ -247,19 +247,6 @@
+ #  include "setup-win32.h"
+ #endif
+ 
+-/*
+- * Use getaddrinfo to resolve the IPv4 address literal. If the current network
+- * interface doesn't support IPv4, but supports IPv6, NAT64, and DNS64,
+- * performing this task will result in a synthesized IPv6 address.
+- */
+-#if defined(__APPLE__) && !defined(USE_ARES)
+-#include <TargetConditionals.h>
+-#define USE_RESOLVE_ON_IPS 1
+-#  if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+-#    define CURL_OSX_CALL_COPYPROXIES 1
+-#  endif
+-#endif
+-
+ #ifdef USE_LWIPSOCK
+ #  include <lwip/init.h>
+ #  include <lwip/sockets.h>
diff --git a/pkgs/tools/networking/curl/CVE-2021-22897.patch b/pkgs/tools/networking/curl/CVE-2021-22897.patch
deleted file mode 100644
index a48888795036..000000000000
--- a/pkgs/tools/networking/curl/CVE-2021-22897.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From bbb71507b7bab52002f9b1e0880bed6a32834511 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Fri, 23 Apr 2021 10:54:10 +0200
-Subject: [PATCH] schannel: don't use static to store selected ciphers
-
-CVE-2021-22897
-
-Bug: https://curl.se/docs/CVE-2021-22897.html
----
- lib/vtls/schannel.c | 9 +++++----
- lib/vtls/schannel.h | 3 +++
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
-index 8c25ac5dd5a5..dba7072273a9 100644
---- a/lib/vtls/schannel.c
-+++ b/lib/vtls/schannel.c
-@@ -328,12 +328,12 @@ get_alg_id_by_name(char *name)
- }
- 
- static CURLcode
--set_ssl_ciphers(SCHANNEL_CRED *schannel_cred, char *ciphers)
-+set_ssl_ciphers(SCHANNEL_CRED *schannel_cred, char *ciphers,
-+                int *algIds)
- {
-   char *startCur = ciphers;
-   int algCount = 0;
--  static ALG_ID algIds[45]; /*There are 45 listed in the MS headers*/
--  while(startCur && (0 != *startCur) && (algCount < 45)) {
-+  while(startCur && (0 != *startCur) && (algCount < NUMOF_CIPHERS)) {
-     long alg = strtol(startCur, 0, 0);
-     if(!alg)
-       alg = get_alg_id_by_name(startCur);
-@@ -593,7 +593,8 @@ schannel_connect_step1(struct Curl_easy *data, struct connectdata *conn,
-     }
- 
-     if(SSL_CONN_CONFIG(cipher_list)) {
--      result = set_ssl_ciphers(&schannel_cred, SSL_CONN_CONFIG(cipher_list));
-+      result = set_ssl_ciphers(&schannel_cred, SSL_CONN_CONFIG(cipher_list),
-+                               BACKEND->algIds);
-       if(CURLE_OK != result) {
-         failf(data, "Unable to set ciphers to passed via SSL_CONN_CONFIG");
-         return result;
-diff --git a/lib/vtls/schannel.h b/lib/vtls/schannel.h
-index 2952caa1a5a1..77853aa30f96 100644
---- a/lib/vtls/schannel.h
-+++ b/lib/vtls/schannel.h
-@@ -71,6 +71,8 @@ CURLcode Curl_verify_certificate(struct Curl_easy *data,
- #endif
- #endif
- 
-+#define NUMOF_CIPHERS 45 /* There are 45 listed in the MS headers */
-+
- struct Curl_schannel_cred {
-   CredHandle cred_handle;
-   TimeStamp time_stamp;
-@@ -102,6 +104,7 @@ struct ssl_backend_data {
- #ifdef HAS_MANUAL_VERIFY_API
-   bool use_manual_cred_validation; /* true if manual cred validation is used */
- #endif
-+  ALG_ID algIds[NUMOF_CIPHERS];
- };
- #endif /* EXPOSE_SCHANNEL_INTERNAL_STRUCTS */
- 
diff --git a/pkgs/tools/networking/curl/CVE-2021-22898.patch b/pkgs/tools/networking/curl/CVE-2021-22898.patch
deleted file mode 100644
index ea4d2cb37e87..000000000000
--- a/pkgs/tools/networking/curl/CVE-2021-22898.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 39ce47f219b09c380b81f89fe54ac586c8db6bde Mon Sep 17 00:00:00 2001
-From: Harry Sintonen <sintonen@iki.fi>
-Date: Fri, 7 May 2021 13:09:57 +0200
-Subject: [PATCH] telnet: check sscanf() for correct number of matches
-
-CVE-2021-22898
-
-Bug: https://curl.se/docs/CVE-2021-22898.html
----
- lib/telnet.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/telnet.c b/lib/telnet.c
-index 26e0658ba9cc..fdd137fb0c04 100644
---- a/lib/telnet.c
-+++ b/lib/telnet.c
-@@ -922,7 +922,7 @@ static void suboption(struct Curl_easy *data)
-         size_t tmplen = (strlen(v->data) + 1);
-         /* Add the variable only if it fits */
-         if(len + tmplen < (int)sizeof(temp)-6) {
--          if(sscanf(v->data, "%127[^,],%127s", varname, varval)) {
-+          if(sscanf(v->data, "%127[^,],%127s", varname, varval) == 2) {
-             msnprintf((char *)&temp[len], sizeof(temp) - len,
-                       "%c%s%c%s", CURL_NEW_ENV_VAR, varname,
-                       CURL_NEW_ENV_VALUE, varval);
diff --git a/pkgs/tools/networking/curl/CVE-2021-22901.patch b/pkgs/tools/networking/curl/CVE-2021-22901.patch
deleted file mode 100644
index 6bd70aa41b1e..000000000000
--- a/pkgs/tools/networking/curl/CVE-2021-22901.patch
+++ /dev/null
@@ -1,437 +0,0 @@
-Based on upstream 7f4a9a9b2a49547eae24d2e19bc5c346e9026479, modified by ris to
-apply without 0c55fbab45bedb761766109d41c3da49c4bc66c6
-
-diff --git a/lib/multi.c b/lib/multi.c
-index 54365f399e9b..1b3e261c682a 100644
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -878,8 +878,10 @@ bool Curl_multiplex_wanted(const struct Curl_multi *multi)
- void Curl_detach_connnection(struct Curl_easy *data)
- {
-   struct connectdata *conn = data->conn;
--  if(conn)
-+  if(conn) {
-     Curl_llist_remove(&conn->easyq, &data->conn_queue, NULL);
-+    Curl_ssl_detach_conn(data, conn);
-+  }
-   data->conn = NULL;
- }
- 
-@@ -896,6 +898,7 @@ void Curl_attach_connnection(struct Curl_easy *data,
-   data->conn = conn;
-   Curl_llist_insert_next(&conn->easyq, conn->easyq.tail, data,
-                          &data->conn_queue);
-+  Curl_ssl_associate_conn(data, conn);
- }
- 
- static int waitconnect_getsock(struct connectdata *conn,
-diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c
-index c648f624579b..ca953769d1ba 100644
---- a/lib/vtls/gskit.c
-+++ b/lib/vtls/gskit.c
-@@ -1304,7 +1304,9 @@ const struct Curl_ssl Curl_ssl_gskit = {
-   Curl_none_set_engine_default,   /* set_engine_default */
-   Curl_none_engines_list,         /* engines_list */
-   Curl_none_false_start,          /* false_start */
--  NULL                            /* sha256sum */
-+  NULL,                           /* sha256sum */
-+  NULL,                           /* associate_connection */
-+  NULL                            /* disassociate_connection */
- };
- 
- #endif /* USE_GSKIT */
-diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
-index a10c0dbcca05..ecde5c44deeb 100644
---- a/lib/vtls/gtls.c
-+++ b/lib/vtls/gtls.c
-@@ -1656,7 +1656,9 @@ const struct Curl_ssl Curl_ssl_gnutls = {
-   Curl_none_set_engine_default,  /* set_engine_default */
-   Curl_none_engines_list,        /* engines_list */
-   Curl_none_false_start,         /* false_start */
--  gtls_sha256sum                 /* sha256sum */
-+  gtls_sha256sum,                /* sha256sum */
-+  NULL,                          /* associate_connection */
-+  NULL                           /* disassociate_connection */
- };
- 
- #endif /* USE_GNUTLS */
-diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
-index ca77de58667c..3a0be0f04b4f 100644
---- a/lib/vtls/mbedtls.c
-+++ b/lib/vtls/mbedtls.c
-@@ -1093,7 +1093,9 @@ const struct Curl_ssl Curl_ssl_mbedtls = {
-   Curl_none_set_engine_default,     /* set_engine_default */
-   Curl_none_engines_list,           /* engines_list */
-   Curl_none_false_start,            /* false_start */
--  mbedtls_sha256sum                 /* sha256sum */
-+  mbedtls_sha256sum,                /* sha256sum */
-+  NULL,                             /* associate_connection */
-+  NULL                              /* disassociate_connection */
- };
- 
- #endif /* USE_MBEDTLS */
-diff --git a/lib/vtls/mesalink.c b/lib/vtls/mesalink.c
-index f16c77c27fe0..bf8600d3230b 100644
---- a/lib/vtls/mesalink.c
-+++ b/lib/vtls/mesalink.c
-@@ -666,7 +666,9 @@ const struct Curl_ssl Curl_ssl_mesalink = {
-   Curl_none_set_engine_default,  /* set_engine_default */
-   Curl_none_engines_list,        /* engines_list */
-   Curl_none_false_start,         /* false_start */
--  NULL                           /* sha256sum */
-+  NULL,                          /* sha256sum */
-+  NULL,                          /* associate_connection */
-+  NULL                           /* disassociate_connection */
- };
- 
- #endif
-diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
-index 2aa4bdaa134f..1582b1e580a9 100644
---- a/lib/vtls/nss.c
-+++ b/lib/vtls/nss.c
-@@ -2465,7 +2465,9 @@ const struct Curl_ssl Curl_ssl_nss = {
-   Curl_none_set_engine_default, /* set_engine_default */
-   Curl_none_engines_list,       /* engines_list */
-   nss_false_start,              /* false_start */
--  nss_sha256sum                 /* sha256sum */
-+  nss_sha256sum,                /* sha256sum */
-+  NULL,                         /* associate_connection */
-+  NULL                          /* disassociate_connection */
- };
- 
- #endif /* USE_NSS */
-diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
-index 1521600dd5f6..ebd7abc3b4ac 100644
---- a/lib/vtls/openssl.c
-+++ b/lib/vtls/openssl.c
-@@ -240,6 +240,10 @@ struct ssl_backend_data {
- #endif
- };
- 
-+static void ossl_associate_connection(struct Curl_easy *data,
-+                                      struct connectdata *conn,
-+                                      int sockindex);
-+
- /*
-  * Number of bytes to read from the random number seed file. This must be
-  * a finite value (because some entropy "files" like /dev/urandom have
-@@ -2581,6 +2585,7 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data,
-   curl_socket_t sockfd = conn->sock[sockindex];
-   struct ssl_connect_data *connssl = &conn->ssl[sockindex];
-   ctx_option_t ctx_options = 0;
-+  void *ssl_sessionid = NULL;
- 
- #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
-   bool sni;
-@@ -3225,46 +3230,23 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data,
-   }
- #endif
- 
--  /* Check if there's a cached ID we can/should use here! */
--  if(SSL_SET_OPTION(primary.sessionid)) {
--    void *ssl_sessionid = NULL;
--    int data_idx = ossl_get_ssl_data_index();
--    int connectdata_idx = ossl_get_ssl_conn_index();
--    int sockindex_idx = ossl_get_ssl_sockindex_index();
--    int proxy_idx = ossl_get_proxy_index();
--
--    if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 &&
--       proxy_idx >= 0) {
--      /* Store the data needed for the "new session" callback.
--       * The sockindex is stored as a pointer to an array element. */
--      SSL_set_ex_data(backend->handle, data_idx, data);
--      SSL_set_ex_data(backend->handle, connectdata_idx, conn);
--      SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex);
--#ifndef CURL_DISABLE_PROXY
--      SSL_set_ex_data(backend->handle, proxy_idx, SSL_IS_PROXY() ? (void *) 1:
--                      NULL);
--#else
--      SSL_set_ex_data(backend->handle, proxy_idx, NULL);
--#endif
--
--    }
-+  ossl_associate_connection(data, conn, sockindex);
- 
--    Curl_ssl_sessionid_lock(data);
--    if(!Curl_ssl_getsessionid(data, conn, SSL_IS_PROXY() ? TRUE : FALSE,
--                              &ssl_sessionid, NULL, sockindex)) {
--      /* we got a session id, use it! */
--      if(!SSL_set_session(backend->handle, ssl_sessionid)) {
--        Curl_ssl_sessionid_unlock(data);
--        failf(data, "SSL: SSL_set_session failed: %s",
--              ossl_strerror(ERR_get_error(), error_buffer,
--                            sizeof(error_buffer)));
--        return CURLE_SSL_CONNECT_ERROR;
--      }
--      /* Informational message */
--      infof(data, "SSL re-using session ID\n");
-+  Curl_ssl_sessionid_lock(data);
-+  if(!Curl_ssl_getsessionid(data, conn, SSL_IS_PROXY() ? TRUE : FALSE,
-+                            &ssl_sessionid, NULL, sockindex)) {
-+    /* we got a session id, use it! */
-+    if(!SSL_set_session(backend->handle, ssl_sessionid)) {
-+      Curl_ssl_sessionid_unlock(data);
-+      failf(data, "SSL: SSL_set_session failed: %s",
-+            ossl_strerror(ERR_get_error(), error_buffer,
-+                          sizeof(error_buffer)));
-+      return CURLE_SSL_CONNECT_ERROR;
-     }
--    Curl_ssl_sessionid_unlock(data);
-+    /* Informational message */
-+    infof(data, "SSL re-using session ID\n");
-   }
-+  Curl_ssl_sessionid_unlock(data);
- 
- #ifndef CURL_DISABLE_PROXY
-   if(conn->proxy_ssl[sockindex].use) {
-@@ -4498,6 +4480,90 @@ static void *ossl_get_internals(struct ssl_connect_data *connssl,
-          (void *)backend->ctx : (void *)backend->handle;
- }
- 
-+static void ossl_associate_connection(struct Curl_easy *data,
-+                                      struct connectdata *conn,
-+                                      int sockindex)
-+{
-+  struct ssl_connect_data *connssl = &conn->ssl[sockindex];
-+  struct ssl_backend_data *backend = connssl->backend;
-+
-+  /* If we don't have SSL context, do nothing. */
-+  if(!backend->handle)
-+    return;
-+
-+  if(SSL_SET_OPTION(primary.sessionid)) {
-+    int data_idx = ossl_get_ssl_data_index();
-+    int connectdata_idx = ossl_get_ssl_conn_index();
-+    int sockindex_idx = ossl_get_ssl_sockindex_index();
-+    int proxy_idx = ossl_get_proxy_index();
-+
-+    if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 &&
-+       proxy_idx >= 0) {
-+      /* Store the data needed for the "new session" callback.
-+       * The sockindex is stored as a pointer to an array element. */
-+      SSL_set_ex_data(backend->handle, data_idx, data);
-+      SSL_set_ex_data(backend->handle, connectdata_idx, conn);
-+      SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex);
-+#ifndef CURL_DISABLE_PROXY
-+      SSL_set_ex_data(backend->handle, proxy_idx, SSL_IS_PROXY() ? (void *) 1:
-+                      NULL);
-+#else
-+      SSL_set_ex_data(backend->handle, proxy_idx, NULL);
-+#endif
-+    }
-+  }
-+}
-+
-+/*
-+ * Starting with TLS 1.3, the ossl_new_session_cb callback gets called after
-+ * the handshake. If the transfer that sets up the callback gets killed before
-+ * this callback arrives, we must make sure to properly clear the data to
-+ * avoid UAF problems. A future optimization could be to instead store another
-+ * transfer that might still be using the same connection.
-+ */
-+
-+static void ossl_disassociate_connection(struct Curl_easy *data,
-+                                         int sockindex)
-+{
-+  struct connectdata *conn = data->conn;
-+  struct ssl_connect_data *connssl = &conn->ssl[sockindex];
-+  struct ssl_backend_data *backend = connssl->backend;
-+
-+  /* If we don't have SSL context, do nothing. */
-+  if(!backend->handle)
-+    return;
-+
-+  if(SSL_SET_OPTION(primary.sessionid)) {
-+    bool isproxy = FALSE;
-+    bool incache;
-+    void *old_ssl_sessionid = NULL;
-+    int data_idx = ossl_get_ssl_data_index();
-+    int connectdata_idx = ossl_get_ssl_conn_index();
-+    int sockindex_idx = ossl_get_ssl_sockindex_index();
-+    int proxy_idx = ossl_get_proxy_index();
-+
-+    if(data_idx >= 0 && connectdata_idx >= 0 && sockindex_idx >= 0 &&
-+       proxy_idx >= 0) {
-+      /* Invalidate the session cache entry, if any */
-+      isproxy = SSL_get_ex_data(backend->handle, proxy_idx) ? TRUE : FALSE;
-+
-+      /* Disable references to data in "new session" callback to avoid
-+       * accessing a stale pointer. */
-+      SSL_set_ex_data(backend->handle, data_idx, NULL);
-+      SSL_set_ex_data(backend->handle, connectdata_idx, NULL);
-+      SSL_set_ex_data(backend->handle, sockindex_idx, NULL);
-+      SSL_set_ex_data(backend->handle, proxy_idx, NULL);
-+    }
-+
-+    Curl_ssl_sessionid_lock(data);
-+    incache = !(Curl_ssl_getsessionid(data, conn, isproxy,
-+                                      &old_ssl_sessionid, NULL, sockindex));
-+    if(incache)
-+      Curl_ssl_delsessionid(data, old_ssl_sessionid);
-+    Curl_ssl_sessionid_unlock(data);
-+  }
-+}
-+
- const struct Curl_ssl Curl_ssl_openssl = {
-   { CURLSSLBACKEND_OPENSSL, "openssl" }, /* info */
- 
-@@ -4533,10 +4599,12 @@ const struct Curl_ssl Curl_ssl_openssl = {
-   ossl_engines_list,        /* engines_list */
-   Curl_none_false_start,    /* false_start */
- #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256)
--  ossl_sha256sum            /* sha256sum */
-+  ossl_sha256sum,           /* sha256sum */
- #else
--  NULL                      /* sha256sum */
-+  NULL,                     /* sha256sum */
- #endif
-+  ossl_associate_connection, /* associate_connection */
-+  ossl_disassociate_connection /* disassociate_connection */
- };
- 
- #endif /* USE_OPENSSL */
-diff --git a/lib/vtls/rustls.c b/lib/vtls/rustls.c
-index 9dfbd2c3c4c2..161f3bf51d75 100644
---- a/lib/vtls/rustls.c
-+++ b/lib/vtls/rustls.c
-@@ -604,7 +604,9 @@ const struct Curl_ssl Curl_ssl_rustls = {
-   Curl_none_set_engine_default,    /* set_engine_default */
-   Curl_none_engines_list,          /* engines_list */
-   Curl_none_false_start,           /* false_start */
--  NULL                             /* sha256sum */
-+  NULL,                            /* sha256sum */
-+  NULL,                            /* associate_connection */
-+  NULL                             /* disassociate_connection */
- };
- 
- #endif /* USE_RUSTLS */
-diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
-index dba7072273a9..2bcf11db2576 100644
---- a/lib/vtls/schannel.c
-+++ b/lib/vtls/schannel.c
-@@ -329,7 +329,7 @@ get_alg_id_by_name(char *name)
- 
- static CURLcode
- set_ssl_ciphers(SCHANNEL_CRED *schannel_cred, char *ciphers,
--                int *algIds)
-+                ALG_ID *algIds)
- {
-   char *startCur = ciphers;
-   int algCount = 0;
-@@ -2433,7 +2433,9 @@ const struct Curl_ssl Curl_ssl_schannel = {
-   Curl_none_set_engine_default,      /* set_engine_default */
-   Curl_none_engines_list,            /* engines_list */
-   Curl_none_false_start,             /* false_start */
--  schannel_sha256sum                 /* sha256sum */
-+  schannel_sha256sum,                /* sha256sum */
-+  NULL,                              /* associate_connection */
-+  NULL                               /* disassociate_connection */
- };
- 
- #endif /* USE_SCHANNEL */
-diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c
-index 4276b89cfb3a..8b1e84ed7715 100644
---- a/lib/vtls/sectransp.c
-+++ b/lib/vtls/sectransp.c
-@@ -3453,6 +3453,8 @@ const struct Curl_ssl Curl_ssl_sectransp = {
-   Curl_none_engines_list,             /* engines_list */
-   sectransp_false_start,              /* false_start */
-   sectransp_sha256sum                 /* sha256sum */
-+  NULL,                               /* associate_connection */
-+  NULL                                /* disassociate_connection */
- };
- 
- #ifdef __clang__
-diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
-index d63fd5c76386..65f4f773dd63 100644
---- a/lib/vtls/vtls.c
-+++ b/lib/vtls/vtls.c
-@@ -586,6 +586,25 @@ CURLcode Curl_ssl_addsessionid(struct Curl_easy *data,
-   return CURLE_OK;
- }
- 
-+void Curl_ssl_associate_conn(struct Curl_easy *data,
-+                             struct connectdata *conn)
-+{
-+  if(Curl_ssl->associate_connection) {
-+    Curl_ssl->associate_connection(data, conn, FIRSTSOCKET);
-+    if(conn->sock[SECONDARYSOCKET] && conn->bits.sock_accepted)
-+      Curl_ssl->associate_connection(data, conn, SECONDARYSOCKET);
-+  }
-+}
-+
-+void Curl_ssl_detach_conn(struct Curl_easy *data,
-+                          struct connectdata *conn)
-+{
-+  if(Curl_ssl->disassociate_connection) {
-+    Curl_ssl->disassociate_connection(data, FIRSTSOCKET);
-+    if(conn->sock[SECONDARYSOCKET] && conn->bits.sock_accepted)
-+      Curl_ssl->disassociate_connection(data, SECONDARYSOCKET);
-+  }
-+}
- 
- void Curl_ssl_close_all(struct Curl_easy *data)
- {
-@@ -1214,7 +1233,9 @@ static const struct Curl_ssl Curl_ssl_multi = {
-   Curl_none_set_engine_default,      /* set_engine_default */
-   Curl_none_engines_list,            /* engines_list */
-   Curl_none_false_start,             /* false_start */
--  NULL                               /* sha256sum */
-+  NULL,                              /* sha256sum */
-+  NULL,                              /* associate_connection */
-+  NULL                               /* disassociate_connection */
- };
- 
- const struct Curl_ssl *Curl_ssl =
-diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h
-index a22d526ca810..7f93e7aedb21 100644
---- a/lib/vtls/vtls.h
-+++ b/lib/vtls/vtls.h
-@@ -84,6 +84,11 @@ struct Curl_ssl {
-   bool (*false_start)(void);
-   CURLcode (*sha256sum)(const unsigned char *input, size_t inputlen,
-                     unsigned char *sha256sum, size_t sha256sumlen);
-+
-+  void (*associate_connection)(struct Curl_easy *data,
-+                               struct connectdata *conn,
-+                               int sockindex);
-+  void (*disassociate_connection)(struct Curl_easy *data, int sockindex);
- };
- 
- #ifdef USE_SSL
-@@ -283,6 +288,11 @@ bool Curl_ssl_cert_status_request(void);
- 
- bool Curl_ssl_false_start(void);
- 
-+void Curl_ssl_associate_conn(struct Curl_easy *data,
-+                             struct connectdata *conn);
-+void Curl_ssl_detach_conn(struct Curl_easy *data,
-+                          struct connectdata *conn);
-+
- #define SSL_SHUTDOWN_TIMEOUT 10000 /* ms */
- 
- #else /* if not USE_SSL */
-@@ -309,6 +319,8 @@ bool Curl_ssl_false_start(void);
- #define Curl_ssl_cert_status_request() FALSE
- #define Curl_ssl_false_start() FALSE
- #define Curl_ssl_tls13_ciphersuites() FALSE
-+#define Curl_ssl_associate_conn(a,b) Curl_nop_stmt
-+#define Curl_ssl_detach_conn(a,b) Curl_nop_stmt
- #endif
- 
- #endif /* HEADER_CURL_VTLS_H */
-diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c
-index 02fcd236697e..60e27e366252 100644
---- a/lib/vtls/wolfssl.c
-+++ b/lib/vtls/wolfssl.c
-@@ -1125,7 +1125,9 @@ const struct Curl_ssl Curl_ssl_wolfssl = {
-   Curl_none_set_engine_default,    /* set_engine_default */
-   Curl_none_engines_list,          /* engines_list */
-   Curl_none_false_start,           /* false_start */
--  wolfssl_sha256sum                /* sha256sum */
-+  wolfssl_sha256sum,               /* sha256sum */
-+  NULL,                            /* associate_connection */
-+  NULL                             /* disassociate_connection */
- };
- 
- #endif
diff --git a/pkgs/tools/networking/curl/CVE-2021-22945.patch b/pkgs/tools/networking/curl/CVE-2021-22945.patch
deleted file mode 100644
index f8e570d2d65c..000000000000
--- a/pkgs/tools/networking/curl/CVE-2021-22945.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 43157490a5054bd24256fe12876931e8abc9df49 Mon Sep 17 00:00:00 2001
-From: z2_ on hackerone <>
-Date: Tue, 24 Aug 2021 09:50:33 +0200
-Subject: [PATCH] mqtt: clear the leftovers pointer when sending succeeds
-
-CVE-2021-22945
-
-Bug: https://curl.se/docs/CVE-2021-22945.html
----
- lib/mqtt.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/mqtt.c b/lib/mqtt.c
-index f077e6c3dc44..fcd40b41e600 100644
---- a/lib/mqtt.c
-+++ b/lib/mqtt.c
-@@ -128,6 +128,10 @@ static CURLcode mqtt_send(struct Curl_easy *data,
-     mq->sendleftovers = sendleftovers;
-     mq->nsend = nsend;
-   }
-+  else {
-+    mq->sendleftovers = NULL;
-+    mq->nsend = 0;
-+  }
-   return result;
- }
- 
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 7d6b96ac9f01..12ff42d4cbf1 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -43,21 +43,18 @@ assert gssSupport -> libkrb5 != null;
 
 stdenv.mkDerivation rec {
   pname = "curl";
-  version = "7.76.1";
+  version = "7.79.1";
 
   src = fetchurl {
     urls = [
       "https://curl.haxx.se/download/${pname}-${version}.tar.bz2"
       "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2"
     ];
-    sha256 = "1scmfrp0c27pkd7yva9k50miprjpsyfbb33apx72qc9igm6ii3ks";
+    sha256 = "0lbq73wz44p4fm2gp05mzrqrzfvhlmvlgfg8c8wkj5lkkamw8qny";
   };
 
   patches = [
-    ./CVE-2021-22897.patch
-    ./CVE-2021-22898.patch
-    ./CVE-2021-22901.patch
-    ./CVE-2021-22945.patch
+    ./7.79.1-darwin-no-systemconfiguration.patch
   ];
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];

From f651d617a65a21f61b8cf359c054dabeaf215f25 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 29 May 2021 15:25:19 +0200
Subject: [PATCH 024/235] curl: use --with/without-openssl instead of
 --with/without-ssl

This also migrates sslSupport to opensslSupport, which affects packages
overriding the curl package in that regard.
---
 pkgs/applications/misc/robo3t/default.nix          |  2 +-
 .../version-management/gitkraken/default.nix       |  2 +-
 pkgs/applications/video/filebot/default.nix        |  2 +-
 pkgs/build-support/appimage/default.nix            |  2 +-
 pkgs/games/steam/fhsenv.nix                        |  2 +-
 pkgs/tools/networking/curl/default.nix             | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix
index 41f3475a645f..1499cfc40dc8 100644
--- a/pkgs/applications/misc/robo3t/default.nix
+++ b/pkgs/applications/misc/robo3t/default.nix
@@ -15,7 +15,7 @@
 }:
 
 let
-  curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
+  curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 748e34c33aea..be829baeabb6 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -9,7 +9,7 @@
 with lib;
 
 let
-  curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
+  curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
 in
 stdenv.mkDerivation rec {
   pname = "gitkraken";
diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix
index a32228176cb9..93f11e78ffb3 100644
--- a/pkgs/applications/video/filebot/default.nix
+++ b/pkgs/applications/video/filebot/default.nix
@@ -4,7 +4,7 @@
 
 let
   # FileBot requires libcurl-gnutls.so to build
-  curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
+  curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
 
 in
 
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 9df241a48cad..5d9273db931d 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -107,7 +107,7 @@ rec {
       xorg.libICE
       gnome2.GConf
       freetype
-      (curl.override { gnutlsSupport = true; sslSupport = false; })
+      (curl.override { gnutlsSupport = true; opensslSupport = false; })
       nspr
       nss
       fontconfig
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index 63da5d7a2b78..2b46c7ff2cfb 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -187,7 +187,7 @@ in buildFHSUserEnv rec {
     xorg.libICE
     gnome2.GConf
     freetype
-    (curl.override { gnutlsSupport = true; sslSupport = false; })
+    (curl.override { gnutlsSupport = true; opensslSupport = false; })
     nspr
     nss
     fontconfig
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 12ff42d4cbf1..5937249c0794 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -3,7 +3,7 @@
 , idnSupport ? false, libidn ? null
 , ldapSupport ? false, openldap ? null
 , zlibSupport ? true, zlib ? null
-, sslSupport ? zlibSupport, openssl ? null
+, opensslSupport ? zlibSupport, openssl ? null
 , gnutlsSupport ? false, gnutls ? null
 , wolfsslSupport ? false, wolfssl ? null
 , scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null
@@ -30,10 +30,10 @@ assert http2Support -> nghttp2 != null;
 assert idnSupport -> libidn != null;
 assert ldapSupport -> openldap != null;
 assert zlibSupport -> zlib != null;
-assert sslSupport -> openssl != null;
-assert !(gnutlsSupport && sslSupport);
+assert opensslSupport -> openssl != null;
+assert !(gnutlsSupport && opensslSupport);
 assert !(gnutlsSupport && wolfsslSupport);
-assert !(sslSupport && wolfsslSupport);
+assert !(opensslSupport && wolfsslSupport);
 assert gnutlsSupport -> gnutls != null;
 assert wolfsslSupport -> wolfssl != null;
 assert scpSupport -> libssh2 != null;
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     optional zlibSupport zlib ++
     optional gssSupport libkrb5 ++
     optional c-aresSupport c-ares ++
-    optional sslSupport openssl ++
+    optional opensslSupport openssl ++
     optional gnutlsSupport gnutls ++
     optional wolfsslSupport wolfssl ++
     optional scpSupport libssh2 ++
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
       # The build fails when using wolfssl with --with-ca-fallback
       (lib.withFeature (!wolfsslSupport) "ca-fallback")
       "--disable-manual"
-      (lib.withFeatureAs sslSupport "ssl" openssl.dev)
+      (lib.withFeatureAs opensslSupport "openssl" openssl.dev)
       (lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev)
       (lib.withFeatureAs scpSupport "libssh2" libssh2.dev)
       (lib.enableFeature ldapSupport "ldap")
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    inherit sslSupport openssl;
+    inherit opensslSupport openssl;
   };
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b012558a2299..f976c4457fc3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27763,7 +27763,7 @@ with pkgs;
 
   spotify-unwrapped = callPackage ../applications/audio/spotify {
     curl = curl.override {
-      sslSupport = false; gnutlsSupport = true;
+      opensslSupport = false; gnutlsSupport = true;
     };
   };
 

From deffa7350d593c7c2b226399455d1cd74da3c889 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 4 Oct 2021 06:40:10 -0500
Subject: [PATCH 025/235] systemd: remove compatibility patch for legacy Plasma

---
 ...eat-debus-show-CanMultiSession-again.patch | 26 -------------------
 pkgs/os-specific/linux/systemd/default.nix    |  1 -
 2 files changed, 27 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch

diff --git a/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch b/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch
deleted file mode 100644
index 21d466b02bb8..000000000000
--- a/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From beb594ff3bceb95598ffa8ec47c31bacb2449473 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Mon, 26 Oct 2020 21:21:38 +0100
-Subject: [PATCH 18/19] logind-seat-debus: show CanMultiSession again
-
-Fixes the "switch user" function in Plasma < 5.20.
----
- src/login/logind-seat-dbus.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
-index cceb3b1d2d..94b4723bb9 100644
---- a/src/login/logind-seat-dbus.c
-+++ b/src/login/logind-seat-dbus.c
-@@ -419,7 +419,7 @@ static const sd_bus_vtable seat_vtable[] = {
- 
-         SD_BUS_PROPERTY("Id", "s", NULL, offsetof(Seat, id), SD_BUS_VTABLE_PROPERTY_CONST),
-         SD_BUS_PROPERTY("ActiveSession", "(so)", property_get_active_session, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
--        SD_BUS_PROPERTY("CanMultiSession", "b", property_get_const_true, 0, SD_BUS_VTABLE_PROPERTY_CONST|SD_BUS_VTABLE_HIDDEN),
-+        SD_BUS_PROPERTY("CanMultiSession", "b", property_get_const_true, 0, SD_BUS_VTABLE_PROPERTY_CONST),
-         SD_BUS_PROPERTY("CanTTY", "b", property_get_can_tty, 0, SD_BUS_VTABLE_PROPERTY_CONST),
-         SD_BUS_PROPERTY("CanGraphical", "b", property_get_can_graphical, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
-         SD_BUS_PROPERTY("Sessions", "a(so)", property_get_sessions, 0, 0),
--- 
-2.32.0
-
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 3cb9216b184e..6ca872a66574 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -155,7 +155,6 @@ stdenv.mkDerivation {
     ./0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
     ./0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
     ./0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
-    ./0018-logind-seat-debus-show-CanMultiSession-again.patch
     ./0019-pkg-config-derive-prefix-from-prefix.patch
 
     # In v249 a bunch of meson files had been touched as part of the migration to

From 1c95c92c5904d92ee0505841b84fb85425427798 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 16 Oct 2021 08:49:53 -0500
Subject: [PATCH 026/235] systemd: regenerate patch list according to
 instructions

---
 ...ice-units-for-uninitialised-encrypted-devic.patch |  6 +++---
 .../0002-Don-t-try-to-unmount-nix-or-nix-store.patch |  6 +++---
 .../linux/systemd/0003-Fix-NixOS-containers.patch    |  6 +++---
 .../0004-Look-for-fsck-in-the-right-place.patch      |  6 +++---
 ...05-Add-some-NixOS-specific-unit-directories.patch |  8 ++++----
 ...t-rid-of-a-useless-message-in-user-sessions.patch |  8 ++++----
 ...-localed-timedated-disable-methods-that-cha.patch |  6 +++---
 .../linux/systemd/0008-Fix-hwdb-paths.patch          |  6 +++---
 ...9-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch |  6 +++---
 ...0010-localectl-use-etc-X11-xkb-for-list-x11.patch |  6 +++---
 ...-t-create-statedir-and-don-t-touch-prefixdi.patch |  6 +++---
 ...systemd-environment-when-calling-generators.patch | 10 +++++-----
 .../0013-add-rootprefix-to-lookup-dir-paths.patch    |  6 +++---
 ...hutdown-execute-scripts-in-etc-systemd-syst.patch |  6 +++---
 ...leep-execute-scripts-in-etc-systemd-system-.patch |  6 +++---
 ...ic-nodes.service-Update-ConditionFileNotEmp.patch |  6 +++---
 ...l.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch |  6 +++---
 ... 0018-pkg-config-derive-prefix-from-prefix.patch} |  8 ++++----
 ...ct-install_sysconfdir_samples-in-meson-fil.patch} |  6 +++---
 ...ect-install_sysconfdir_samples-in-meson-fi.patch} |  6 +++---
 ...21-core-handle-lookup-paths-being-symlinks.patch} |  6 +++---
 ...make-find_executable-work-without-proc-mou.patch} | 12 ++++++++----
 pkgs/os-specific/linux/systemd/default.nix           | 10 +++++-----
 23 files changed, 81 insertions(+), 77 deletions(-)
 rename pkgs/os-specific/linux/systemd/{0019-pkg-config-derive-prefix-from-prefix.patch => 0018-pkg-config-derive-prefix-from-prefix.patch} (84%)
 rename pkgs/os-specific/linux/systemd/{0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch => 0019-core-respect-install_sysconfdir_samples-in-meson-fil.patch} (86%)
 rename pkgs/os-specific/linux/systemd/{0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch => 0020-login-respect-install_sysconfdir_samples-in-meson-fi.patch} (87%)
 rename pkgs/os-specific/linux/systemd/{0022-core-Handle-lookup-paths-being-symlinks.patch => 0021-core-handle-lookup-paths-being-symlinks.patch} (96%)
 rename pkgs/os-specific/linux/systemd/{0023-path-util-make-find_executable-work-without-proc-mounted.patch => 0022-path-util-make-find_executable-work-without-proc-mou.patch} (73%)

diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
index 8a1cdc1da847..d17db995ae94 100644
--- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
+++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -1,7 +1,7 @@
-From 57e31a2d4a5d5bd7a9e1cd8a0d8bc6a00624ad68 Mon Sep 17 00:00:00 2001
+From 6c5d8677e1b3c18455066e55b65cf699d8db363b Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:46:30 +0100
-Subject: [PATCH 01/19] Start device units for uninitialised encrypted devices
+Subject: [PATCH 01/22] Start device units for uninitialised encrypted devices
 
 This is necessary because the NixOS service that initialises the
 filesystem depends on the appearance of the device unit.  Also, this
@@ -28,5 +28,5 @@ index 25b8a590a6..d18999ea87 100644
  SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root"
  SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks"
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
index 129e0825d9fe..cb27db971ca9 100644
--- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
+++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
@@ -1,7 +1,7 @@
-From 43465a392b47238a32f8719f603ed9e2c9bb0363 Mon Sep 17 00:00:00 2001
+From ce8c1905a81f143e2baa0f77f12753073b556d62 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Fri, 12 Apr 2013 13:16:57 +0200
-Subject: [PATCH 02/19] Don't try to unmount /nix or /nix/store
+Subject: [PATCH 02/22] Don't try to unmount /nix or /nix/store
 
 They'll still be remounted read-only.
 
@@ -38,5 +38,5 @@ index c2a26242c0..9936398f32 100644
                  || path_equal(path, "/usr")
  #endif
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
index 91fdebc7ad38..6892f8c9662f 100644
--- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
@@ -1,7 +1,7 @@
-From a99666d3d7012c2162fdacf84a57fc0b848fd957 Mon Sep 17 00:00:00 2001
+From 9d6a1dfefa2342cc466e4cdebb86da1b174ae962 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Wed, 16 Apr 2014 10:59:28 +0200
-Subject: [PATCH 03/19] Fix NixOS containers
+Subject: [PATCH 03/22] Fix NixOS containers
 
 In NixOS containers, the init script is bind-mounted into the
 container, so checking early whether it exists will fail.
@@ -30,5 +30,5 @@ index 04685fecba..0e5ece5f91 100644
  
          } else {
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
index bdd205dd29e8..d7576e0387dc 100644
--- a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
+++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
@@ -1,7 +1,7 @@
-From 3f0780b25bdbe4156a2f761c90083bbba5f4d473 Mon Sep 17 00:00:00 2001
+From 9f3850d67c57c8e9912d2da0357b66d0d1d08d2f Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Thu, 1 May 2014 14:10:10 +0200
-Subject: [PATCH 04/19] Look for fsck in the right place
+Subject: [PATCH 04/22] Look for fsck in the right place
 
 ---
  src/fsck/fsck.c | 2 +-
@@ -21,5 +21,5 @@ index cd7adfaeb9..68cebdd158 100644
                  cmdline[i++] = "-T";
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
index 8680d147ad17..2969ecf1a38b 100644
--- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
+++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
@@ -1,7 +1,7 @@
-From 82698c6a5142e710c302f9c38367ed00d8ec94ba Mon Sep 17 00:00:00 2001
+From 04d3d52868f40b3401884b06c494f5dcfc85da3d Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Fri, 19 Dec 2014 14:46:17 +0100
-Subject: [PATCH 05/19] Add some NixOS-specific unit directories
+Subject: [PATCH 05/22] Add some NixOS-specific unit directories
 
 Look in `/nix/var/nix/profiles/default/lib/systemd/{system,user}` for
 units provided by packages installed into the default profile via
@@ -92,7 +92,7 @@ index 05eb17d66c..1cd141d012 100644
  
                  if (!add)
 diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
-index fc0f8c34fa..ded74ce50a 100644
+index fc0f8c34fa..162432e77f 100644
 --- a/src/core/systemd.pc.in
 +++ b/src/core/systemd.pc.in
 @@ -38,10 +38,10 @@ systemdsystemconfdir=${systemd_system_conf_dir}
@@ -122,5 +122,5 @@ index fc0f8c34fa..ded74ce50a 100644
  
  systemd_sleep_dir=${root_prefix}/lib/systemd/system-sleep
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
index f6fa5833518c..34a3b3edf1f6 100644
--- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
+++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
@@ -1,7 +1,7 @@
-From e2a8db60ebfb1e0477ce989f6c3d4a95f2e08120 Mon Sep 17 00:00:00 2001
+From 22c7a75220bd3b9c535f7b589b88e755aad93040 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Mon, 11 May 2015 15:39:38 +0200
-Subject: [PATCH 06/19] Get rid of a useless message in user sessions
+Subject: [PATCH 06/22] Get rid of a useless message in user sessions
 
 Namely lots of variants of
 
@@ -13,7 +13,7 @@ in containers.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index 8884437347..e23d47b4a4 100644
+index 34891a8754..b9b4789720 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
 @@ -1375,7 +1375,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
@@ -27,5 +27,5 @@ index 8884437347..e23d47b4a4 100644
                  /* If stopping a unit fails continuously we might enter a stop loop here, hence stop acting on the
                   * service being unnecessary after a while. */
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
index 17c53e2e5180..440b38837c40 100644
--- a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
+++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
@@ -1,7 +1,7 @@
-From 56ae06b48c6852071dfc57c1203c04f07309d757 Mon Sep 17 00:00:00 2001
+From e9c6714cce635ee4b302993a73c59e091f931952 Mon Sep 17 00:00:00 2001
 From: Gabriel Ebner <gebner@gebner.org>
 Date: Sun, 6 Dec 2015 14:26:36 +0100
-Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that
+Subject: [PATCH 07/22] hostnamed, localed, timedated: disable methods that
  change system settings.
 
 ---
@@ -104,5 +104,5 @@ index 66b454269d..0a8fe25d0f 100644
          if (r < 0)
                  return r;
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
index f272ef23dc01..b53630a32815 100644
--- a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
+++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
@@ -1,7 +1,7 @@
-From b783b2da164482f26ac5e6e347dc41930c072ea5 Mon Sep 17 00:00:00 2001
+From 4561f306751256a77d4c78dddf5c3d3056825b7a Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Thu, 7 Jul 2016 02:47:13 +0300
-Subject: [PATCH 08/19] Fix hwdb paths
+Subject: [PATCH 08/22] Fix hwdb paths
 
 Patch by vcunat.
 ---
@@ -24,5 +24,5 @@ index 5ddc2211e6..ee621eec46 100644
 +        "/etc/udev/hwdb.bin\0"
 +
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
index 791e47065d6f..6517279399f0 100644
--- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
@@ -1,7 +1,7 @@
-From e24c05ef8cfe48c4f0ebdb92e8147ae2151e4c87 Mon Sep 17 00:00:00 2001
+From d082d08ae0a4ffbefccf29065806ebc1821b5c67 Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Tue, 11 Oct 2016 13:12:08 +0300
-Subject: [PATCH 09/19] Change /usr/share/zoneinfo to /etc/zoneinfo
+Subject: [PATCH 09/22] Change /usr/share/zoneinfo to /etc/zoneinfo
 
 NixOS uses this path.
 ---
@@ -137,5 +137,5 @@ index 0a8fe25d0f..2f02b9a520 100644
                          return -ENOMEM;
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
index d9b048113862..038bdfcb114b 100644
--- a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
+++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
@@ -1,7 +1,7 @@
-From 09f6ca91b4131637038686dafd57b5da642c100e Mon Sep 17 00:00:00 2001
+From bbfcc492757c2ea2c6452256c7040021b390a60a Mon Sep 17 00:00:00 2001
 From: Imuli <i@imu.li>
 Date: Wed, 19 Oct 2016 08:46:47 -0400
-Subject: [PATCH 10/19] localectl: use /etc/X11/xkb for list-x11-*
+Subject: [PATCH 10/22] localectl: use /etc/X11/xkb for list-x11-*
 
 NixOS has an option to link the xkb data files to /etc/X11, but not to
 /usr/share/X11.
@@ -23,5 +23,5 @@ index 548ac8eb2c..5e372f1566 100644
                  return log_error_errno(errno, "Failed to open keyboard mapping list. %m");
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
index f88b802b2988..77b03b413863 100644
--- a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
+++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
@@ -1,7 +1,7 @@
-From d5716cd93fdaad16b590a581f39d95954f40748e Mon Sep 17 00:00:00 2001
+From 654ac88b9b6f6b6a13e8af57ef88844769e1408f Mon Sep 17 00:00:00 2001
 From: Franz Pletz <fpletz@fnordicwalking.de>
 Date: Sun, 11 Feb 2018 04:37:44 +0100
-Subject: [PATCH 11/19] build: don't create statedir and don't touch prefixdir
+Subject: [PATCH 11/22] build: don't create statedir and don't touch prefixdir
 
 ---
  meson.build | 3 ---
@@ -22,5 +22,5 @@ index 738879eb21..453ee4b1c0 100644
  
  # Ensure that changes to the docs/ directory do not break the
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
index f5a6fde26b1f..5d0fddc0f680 100644
--- a/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
+++ b/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
@@ -1,7 +1,7 @@
-From 40a5df71e7af5feefacae9fc95bf94e72c6c12f4 Mon Sep 17 00:00:00 2001
+From a716de6dc551008ffa6ce46686422d2fd9bc5397 Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Fri, 2 Nov 2018 21:15:42 +0100
-Subject: [PATCH 12/19] inherit systemd environment when calling generators.
+Subject: [PATCH 12/22] inherit systemd environment when calling generators.
 
 Systemd generators need access to the environment configured in
 stage-2-init.sh since it schedules fsck and mkfs executions based on
@@ -16,10 +16,10 @@ executables that are being called from managers.
  1 file changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index e23d47b4a4..1047aadebc 100644
+index b9b4789720..79239afe4a 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -4145,10 +4145,15 @@ static int manager_run_generators(Manager *m) {
+@@ -4149,10 +4149,15 @@ static int manager_run_generators(Manager *m) {
          argv[4] = NULL;
  
          RUN_WITH_UMASK(0022)
@@ -40,5 +40,5 @@ index e23d47b4a4..1047aadebc 100644
  
  finish:
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
index da6aa2627ff8..489f4dc2fdf7 100644
--- a/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
+++ b/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
@@ -1,7 +1,7 @@
-From fe3aff271cf127c1484533237fe0a024e07ae7bc Mon Sep 17 00:00:00 2001
+From 0a71c96913eeadfb8db6b4cc1856120abd5f0bd3 Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Thu, 9 May 2019 11:15:22 +0200
-Subject: [PATCH 13/19] add rootprefix to lookup dir paths
+Subject: [PATCH 13/22] add rootprefix to lookup dir paths
 
 systemd does not longer use the UDEVLIBEXEC directory as root for
 discovery default udev rules. By adding `$out/lib` to the lookup paths
@@ -34,5 +34,5 @@ index 2e60abb4f1..732ec51d36 100644
  #define CONF_PATHS(n)                           \
          CONF_PATHS_USR(n)                       \
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
index 1ed19358a151..24ae67b1d3cb 100644
--- a/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+++ b/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
@@ -1,7 +1,7 @@
-From 31732478745f7a200004fb8ec013f54dbc536f2e Mon Sep 17 00:00:00 2001
+From 26694b35de479577afb7456d2e74d2834645e123 Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Thu, 25 Jul 2019 20:45:55 +0300
-Subject: [PATCH 14/19] systemd-shutdown: execute scripts in
+Subject: [PATCH 14/22] systemd-shutdown: execute scripts in
  /etc/systemd/system-shutdown
 
 This is needed for NixOS to use such scripts as systemd directory is immutable.
@@ -23,5 +23,5 @@ index a98cfc4d8a..b0b34edda7 100644
          /* The log target defaults to console, but the original systemd process will pass its log target in through a
           * command line argument, which will override this default. Also, ensure we'll never log to the journal or
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
index 2777de09fadb..51c621c05b79 100644
--- a/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
+++ b/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
@@ -1,7 +1,7 @@
-From 3f2277b86f39cb55936ae11c2365feb283b547cb Mon Sep 17 00:00:00 2001
+From d605877fcbc9898db25f8af4c874aed244e57235 Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Thu, 25 Jul 2019 20:46:58 +0300
-Subject: [PATCH 15/19] systemd-sleep: execute scripts in
+Subject: [PATCH 15/22] systemd-sleep: execute scripts in
  /etc/systemd/system-sleep
 
 This is needed for NixOS to use such scripts as systemd directory is immutable.
@@ -22,5 +22,5 @@ index a3aeb24633..0ed6a34d79 100644
          };
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
index 6ef53e95d023..9fb6dc6553c9 100644
--- a/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
+++ b/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
@@ -1,7 +1,7 @@
-From 330490aa8a44206bc03205654680913ab01408a1 Mon Sep 17 00:00:00 2001
+From dffe9928bfa364ece8737157689e607510d18a59 Mon Sep 17 00:00:00 2001
 From: Florian Klink <flokli@flokli.de>
 Date: Sat, 7 Mar 2020 22:40:27 +0100
-Subject: [PATCH 16/19] kmod-static-nodes.service: Update ConditionFileNotEmpty
+Subject: [PATCH 16/22] kmod-static-nodes.service: Update ConditionFileNotEmpty
 
 On NixOS, kernel modules of the currently booted systems are located at
 /run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/.
@@ -23,5 +23,5 @@ index 777e82d16b..b6abc2bba0 100644
  [Service]
  Type=oneshot
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
index 775c8e098479..0a4a6ed2b276 100644
--- a/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
+++ b/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
@@ -1,7 +1,7 @@
-From 216018be7b422586b937dae8fd83f51989479a41 Mon Sep 17 00:00:00 2001
+From 9dcb52f782ddae2f6a1c00cdcf09053453acef14 Mon Sep 17 00:00:00 2001
 From: Florian Klink <flokli@flokli.de>
 Date: Sun, 8 Mar 2020 01:05:54 +0100
-Subject: [PATCH 17/19] path-util.h: add placeholder for DEFAULT_PATH_NORMAL
+Subject: [PATCH 17/22] path-util.h: add placeholder for DEFAULT_PATH_NORMAL
 
 This will be the $PATH used to lookup ExecStart= etc. options, which
 systemd itself uses extensively.
@@ -29,5 +29,5 @@ index 26e7362d1f..a8f8a863ec 100644
  #if HAVE_SPLIT_USR
  #  define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0019-pkg-config-derive-prefix-from-prefix.patch b/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch
similarity index 84%
rename from pkgs/os-specific/linux/systemd/0019-pkg-config-derive-prefix-from-prefix.patch
rename to pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch
index da071603557a..aa77b627e27d 100644
--- a/pkgs/os-specific/linux/systemd/0019-pkg-config-derive-prefix-from-prefix.patch
+++ b/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch
@@ -1,7 +1,7 @@
-From 2e7477dc29095141a0556ded11f0ee370d82bfbb Mon Sep 17 00:00:00 2001
+From dfcf361bed232d9cf8f7344872ca185e4d96a871 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
 Date: Sun, 6 Dec 2020 08:34:19 +0100
-Subject: [PATCH 19/19] pkg-config: derive prefix from --prefix
+Subject: [PATCH 18/22] pkg-config: derive prefix from --prefix
 
 Point prefix to the one configured, instead of `/usr` `systemd` has limited
 support for making the pkgconfig prefix overridable, and interpolates those
@@ -16,7 +16,7 @@ Co-Authored-By: Florian Klink <flokli@flokli.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
-index ded74ce50a..0262f53154 100644
+index 162432e77f..2fc20daf03 100644
 --- a/src/core/systemd.pc.in
 +++ b/src/core/systemd.pc.in
 @@ -11,7 +11,7 @@
@@ -29,5 +29,5 @@ index ded74ce50a..0262f53154 100644
  rootprefix=${root_prefix}
  sysconf_dir={{SYSCONF_DIR}}
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch b/pkgs/os-specific/linux/systemd/0019-core-respect-install_sysconfdir_samples-in-meson-fil.patch
similarity index 86%
rename from pkgs/os-specific/linux/systemd/0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch
rename to pkgs/os-specific/linux/systemd/0019-core-respect-install_sysconfdir_samples-in-meson-fil.patch
index 4567c2fa3164..0f82819947b7 100644
--- a/pkgs/os-specific/linux/systemd/0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch
+++ b/pkgs/os-specific/linux/systemd/0019-core-respect-install_sysconfdir_samples-in-meson-fil.patch
@@ -1,7 +1,7 @@
-From 1a2d24d210c9329e8b900fdb01576c57374581d8 Mon Sep 17 00:00:00 2001
+From 0ac75fbbf771dfbb368087f19b2ed61356f9367d Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Mon, 26 Jul 2021 16:57:43 +0200
-Subject: [PATCH 20/20] core: respect install_sysconfdir_samples in meson file
+Subject: [PATCH 19/22] core: respect install_sysconfdir_samples in meson file
 
 The refactoring done in e11a25cadbe caused the configuration files to be
 installed into the pkgsysconfdir regardless of the state of the
@@ -27,5 +27,5 @@ index f0d2c6f642..4ff7e00e36 100644
                  file,
                  input : file + '.in',
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch b/pkgs/os-specific/linux/systemd/0020-login-respect-install_sysconfdir_samples-in-meson-fi.patch
similarity index 87%
rename from pkgs/os-specific/linux/systemd/0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch
rename to pkgs/os-specific/linux/systemd/0020-login-respect-install_sysconfdir_samples-in-meson-fi.patch
index b048249e0519..ddb4e82a0685 100644
--- a/pkgs/os-specific/linux/systemd/0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch
+++ b/pkgs/os-specific/linux/systemd/0020-login-respect-install_sysconfdir_samples-in-meson-fi.patch
@@ -1,7 +1,7 @@
-From 189ba3af8b21cfc53527453907e800a2917b1bfd Mon Sep 17 00:00:00 2001
+From c12879d75c5ba7cd982993a815fc6540ae50a941 Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Mon, 26 Jul 2021 17:20:34 +0200
-Subject: [PATCH] login: respect install_sysconfdir_samples in meson file
+Subject: [PATCH 20/22] login: respect install_sysconfdir_samples in meson file
 
 The refactoring done in c900d89faa0 caused the configuration files to be
 installed into the pkgsysconfdir regardless of the state of the
@@ -25,5 +25,5 @@ index 8c20e6be65..b637adc9a2 100644
          ['71-seat.rules',      udevrulesdir,  enable_logind],
          ['73-seat-late.rules', udevrulesdir,  enable_logind],
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0022-core-Handle-lookup-paths-being-symlinks.patch b/pkgs/os-specific/linux/systemd/0021-core-handle-lookup-paths-being-symlinks.patch
similarity index 96%
rename from pkgs/os-specific/linux/systemd/0022-core-Handle-lookup-paths-being-symlinks.patch
rename to pkgs/os-specific/linux/systemd/0021-core-handle-lookup-paths-being-symlinks.patch
index c7d022b1ffde..4366999bee48 100644
--- a/pkgs/os-specific/linux/systemd/0022-core-Handle-lookup-paths-being-symlinks.patch
+++ b/pkgs/os-specific/linux/systemd/0021-core-handle-lookup-paths-being-symlinks.patch
@@ -1,7 +1,7 @@
-From 5f17b65d30480e489e135b403a072b38535b2911 Mon Sep 17 00:00:00 2001
+From 3e0e304959719958dee4d88ccbb9647ffb5797ef Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Wed, 18 Aug 2021 19:10:08 +0200
-Subject: [PATCH] core: handle lookup paths being symlinks
+Subject: [PATCH 21/22] core: handle lookup paths being symlinks
 
 With a recent change paths leaving the statically known lookup paths
 would be treated differently then those that remained within those. That
@@ -76,5 +76,5 @@ index 884a0674a9..3ae2a115d0 100644
                                          log_debug("%s: linked unit file: %s → %s",
                                                    __func__, filename, simplified);
 -- 
-2.32.0
+2.33.0
 
diff --git a/pkgs/os-specific/linux/systemd/0023-path-util-make-find_executable-work-without-proc-mounted.patch b/pkgs/os-specific/linux/systemd/0022-path-util-make-find_executable-work-without-proc-mou.patch
similarity index 73%
rename from pkgs/os-specific/linux/systemd/0023-path-util-make-find_executable-work-without-proc-mounted.patch
rename to pkgs/os-specific/linux/systemd/0022-path-util-make-find_executable-work-without-proc-mou.patch
index 026d0278797e..c0701a56d025 100644
--- a/pkgs/os-specific/linux/systemd/0023-path-util-make-find_executable-work-without-proc-mounted.patch
+++ b/pkgs/os-specific/linux/systemd/0022-path-util-make-find_executable-work-without-proc-mou.patch
@@ -1,7 +1,8 @@
-From 93413acd3ef3a637a0f31a1d133b103e1dc81fd6 Mon Sep 17 00:00:00 2001
+From 04eef1fb8e2a52277e051eb7980e96f9acc0afaa Mon Sep 17 00:00:00 2001
 From: Yu Watanabe <watanabe.yu+github@gmail.com>
 Date: Mon, 23 Aug 2021 06:16:48 +0900
-Subject: [PATCH] path-util: make find_executable() work without /proc mounted
+Subject: [PATCH 22/22] path-util: make find_executable() work without /proc
+ mounted
 
 Follow-up for 888f65ace6296ed61285d31db846babf1c11885e.
 
@@ -11,10 +12,10 @@ Hopefully fixes #20514.
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/basic/path-util.c b/src/basic/path-util.c
-index d11f254a9f6a..a21981616b59 100644
+index e5afb5f5f5..13d71ed1b6 100644
 --- a/src/basic/path-util.c
 +++ b/src/basic/path-util.c
-@@ -630,7 +630,11 @@ static int check_x_access(const char *path, int *ret_fd) {
+@@ -628,7 +628,11 @@ static int check_x_access(const char *path, int *ret_fd) {
                  return r;
  
          r = access_fd(fd, X_OK);
@@ -27,3 +28,6 @@ index d11f254a9f6a..a21981616b59 100644
                  return r;
  
          if (ret_fd)
+-- 
+2.33.0
+
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 6ca872a66574..15985f4d9e50 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -155,20 +155,20 @@ stdenv.mkDerivation {
     ./0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
     ./0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
     ./0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
-    ./0019-pkg-config-derive-prefix-from-prefix.patch
+    ./0018-pkg-config-derive-prefix-from-prefix.patch
 
     # In v249 a bunch of meson files had been touched as part of the migration to
     # jinja2 for templating. Unfortunately some of those files lost the `install_sysconfdir_samples` check.
     # The following two patches are part of a PR that was filed to fix those cases.
     # https://github.com/systemd/systemd/pull/20303
-    ./0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch
-    ./0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch
+    ./0019-core-respect-install_sysconfdir_samples-in-meson-fil.patch
+    ./0020-login-respect-install_sysconfdir_samples-in-meson-fi.patch
 
     # In v248 or v249 we started to get in trouble due to our /etc/systemd/sytem being
     # a symlink and thus being treated differently by systemd. With the below
     # patch we mitigate that effect by special casing all our root unit dirs
     # if they are symlinks. This does exactly what we need (AFAICT).
-    ./0022-core-Handle-lookup-paths-being-symlinks.patch
+    ./0021-core-handle-lookup-paths-being-symlinks.patch
 
     # The way files are being tested for being executable changed in v248/v249
     # which caused our confinement setup to fail as we do not mount /proc by
@@ -176,7 +176,7 @@ stdenv.mkDerivation {
     # The issue has been reported upstream and this patch carries the upstream
     # fix for the same. Upstream now has a test for this scenario.
     # https://github.com/systemd/systemd/issues/20514
-    ./0023-path-util-make-find_executable-work-without-proc-mounted.patch
+    ./0022-path-util-make-find_executable-work-without-proc-mou.patch
   ];
 
   postPatch = ''

From 1ee326f74d32f889611c0d0db05d9e27ad4c624a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Oct 2021 01:51:08 +0000
Subject: [PATCH 027/235] jicofo: 1.0-798 -> 1.0-813

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

diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix
index 823545fa7bf6..5657d6511323 100644
--- a/pkgs/servers/jicofo/default.nix
+++ b/pkgs/servers/jicofo/default.nix
@@ -2,10 +2,10 @@
 
 let
   pname = "jicofo";
-  version = "1.0-798";
+  version = "1.0-813";
   src = fetchurl {
     url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
-    sha256 = "55JagMfiBbBw0nqRxcMmfiwGF7B/1LA+pb5n6ZOZvag=";
+    sha256 = "MVlGD2l0e1a2AtYPU1fkBoEfdPhjf2nOehAcacQl4Jk=";
   };
 in
 stdenv.mkDerivation {

From 2736cee9aeaacb5e14ca519c70109c223fee4a57 Mon Sep 17 00:00:00 2001
From: Artturi <Artturin@artturin.com>
Date: Sat, 16 Oct 2021 20:11:28 +0300
Subject: [PATCH 028/235] waf: fix cross-compiling by not overriding python in
 all-packages.nix (#141821)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/tools/build-managers/waf/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix                       | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
index 4d4bb6957eaa..65ea525d5afa 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook
+{ lib, stdenv, fetchFromGitLab, python3, ensureNewerSourcesForZipFilesHook
 # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]`
 , withTools ? null
 }:
@@ -17,7 +17,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-WGGyhvQdFYmC0NOA5VVqCRMF1fvfPcTI42x1nHvz0W0=";
   };
 
-  buildInputs = [ python ensureNewerSourcesForZipFilesHook ];
+  nativeBuildInputs = [ python3 ensureNewerSourcesForZipFilesHook ];
+
+  # waf bin has #!/usr/bin/env python
+  buildInputs = [ python3 ];
 
   configurePhase = ''
     python waf-light configure
@@ -29,6 +32,8 @@ stdenv.mkDerivation rec {
     install -D waf $out/bin/waf
   '';
 
+  strictDeps = true;
+
   meta = with lib; {
     description = "Meta build system";
     homepage    = "https://waf.io";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b012558a2299..1c5573c2cb3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10561,7 +10561,7 @@ with pkgs;
 
   volumeicon = callPackage ../tools/audio/volumeicon { };
 
-  waf = callPackage ../development/tools/build-managers/waf { python = python3; };
+  waf = callPackage ../development/tools/build-managers/waf { };
   wafHook = callPackage ../development/tools/build-managers/wafHook { };
 
   wagyu = callPackage ../tools/misc/wagyu {

From 8524b11d557f17e66cd629b1f77527facd7abdf4 Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Sat, 16 Oct 2021 09:27:42 -0700
Subject: [PATCH 029/235] ibm-sw-tpm2: Fix build on RISC-V

---
 pkgs/tools/security/ibm-sw-tpm2/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix
index d556566a7d54..c5b738678aa2 100644
--- a/pkgs/tools/security/ibm-sw-tpm2/default.nix
+++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, openssl }:
+{ stdenv, fetchurl, fetchpatch, lib, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "ibm-sw-tpm2";
@@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-VRRZKK0rJPNL5qDqz5+0kuEODqkZuEKMch+pcOhdYUc=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/kgoldman/ibmswtpm2/commit/e6684009aff9c1bad38875e3319c2e02ef791424.patch";
+      sha256 = "1flzlri807c88agmpb0w8xvh5f16mmqv86xw4ic4z272iynzd40j";
+    })
+  ];
+
+  patchFlags = [ "-p2" ];
+
   buildInputs = [ openssl ];
 
   sourceRoot = "src";

From 2bba609ce82900df88864a2e151174ca30796029 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 16 Oct 2021 15:24:36 -0700
Subject: [PATCH 030/235] xfsprogs: fix musl build

---
 pkgs/tools/filesystems/xfsprogs/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index 85efb13b82ef..13d8bd094724 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "doc" ];
 
+  patches = [
+    # Fix musl build
+    (fetchpatch {
+      name = "missing-signal.h";
+      url = "https://git.alpinelinux.org/aports/plain/main/xfsprogs/missing-signal.h.patch?id=e0003b414d125ad32825014dcec2225df00f0a36";
+      sha256 = "0a5fxw59d38b0zh1xjliv37gwq4c3fxa21j5sgy79ir9p9zns7vw";
+    })
+  ];
+
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
     autoconf automake libtool gettext pkg-config

From 73239844dc5842693e27fdf84a1c92b0faa95516 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 16 Oct 2021 23:19:29 -0700
Subject: [PATCH 031/235] xfsprogs: 5.11.0 -> 5.13.0

Remove obsolete musl patch, upstreamed in v5.12
---
 pkgs/tools/filesystems/xfsprogs/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index 13d8bd094724..730932141b54 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -1,27 +1,18 @@
-{ lib, stdenv, buildPackages, fetchpatch, fetchurl, autoconf, automake, gettext, libtool, pkg-config
+{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, gettext, libtool, pkg-config
 , icu, libuuid, readline, inih
 }:
 
 stdenv.mkDerivation rec {
   pname = "xfsprogs";
-  version = "5.11.0";
+  version = "5.13.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
-    sha256 = "0lxks616nmdk8zkdbwpq5sf9zz19smgy5rpmp3hpk2mvrl7kk70f";
+    sha256 = "sha256-ThQtS6vghq35AW2MYGyAWCnaCORjiaRDP0A0YgT5DNs=";
   };
 
   outputs = [ "bin" "dev" "out" "doc" ];
 
-  patches = [
-    # Fix musl build
-    (fetchpatch {
-      name = "missing-signal.h";
-      url = "https://git.alpinelinux.org/aports/plain/main/xfsprogs/missing-signal.h.patch?id=e0003b414d125ad32825014dcec2225df00f0a36";
-      sha256 = "0a5fxw59d38b0zh1xjliv37gwq4c3fxa21j5sgy79ir9p9zns7vw";
-    })
-  ];
-
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
     autoconf automake libtool gettext pkg-config

From 9aba193fd9141fae975efe056f4d9b003fe9985c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 3 Sep 2021 11:33:14 +0200
Subject: [PATCH 032/235] libseccomp: 2.5.1 -> 2.5.2

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

diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 7ea7add23f3e..0a76e59e5b7c 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libseccomp";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchurl {
     url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
-    sha256 = "0m8dlg1v7kflcxvajs4p76p275qwsm2abbf5mfapkakp7hw7wc7f";
+    sha256 = "sha256-F6ZS37SR2Wvok5YOm3kZFJNu4WwTt3ejyvVi/kjLh98=";
   };
 
   outputs = [ "out" "lib" "dev" "man" "pythonsrc" ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "High level library for the Linux Kernel seccomp filter";
     homepage = "https://github.com/seccomp/libseccomp";
-    license = licenses.lgpl21;
+    license = licenses.lgpl21Only;
     platforms = platforms.linux;
     badPlatforms = [
       "alpha-linux"

From 2cc29125a722d913a80aaf94c51bdd72219aac07 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Sun, 17 Oct 2021 15:46:26 +0200
Subject: [PATCH 033/235] lvm2: package 2.02.x for musl

---
 pkgs/os-specific/linux/lvm2/2_02.nix                    | 4 ++++
 pkgs/os-specific/linux/lvm2/2_03.nix                    | 4 ++++
 pkgs/os-specific/linux/lvm2/{default.nix => common.nix} | 9 ++++++---
 pkgs/top-level/all-packages.nix                         | 9 +++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/os-specific/linux/lvm2/2_02.nix
 create mode 100644 pkgs/os-specific/linux/lvm2/2_03.nix
 rename pkgs/os-specific/linux/lvm2/{default.nix => common.nix} (94%)

diff --git a/pkgs/os-specific/linux/lvm2/2_02.nix b/pkgs/os-specific/linux/lvm2/2_02.nix
new file mode 100644
index 000000000000..3566a01178b2
--- /dev/null
+++ b/pkgs/os-specific/linux/lvm2/2_02.nix
@@ -0,0 +1,4 @@
+import ./common.nix {
+  version = "2.02.187";
+  sha256Hash = "sha256-Dg1SGoY6XbJEDy4edie6grcCc65KsLvhMIUdsNWOWvE=";
+}
diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix
new file mode 100644
index 000000000000..d6456b46e518
--- /dev/null
+++ b/pkgs/os-specific/linux/lvm2/2_03.nix
@@ -0,0 +1,4 @@
+import ./common.nix {
+  version = "2.03.12";
+  sha256Hash = "1shczwfd0888dchjiaqzd48ampm6f8y0ngsqd99fy4nxlbr5q1vn";
+}
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/common.nix
similarity index 94%
rename from pkgs/os-specific/linux/lvm2/default.nix
rename to pkgs/os-specific/linux/lvm2/common.nix
index fed7152d07ae..2d09c48073d1 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -1,3 +1,5 @@
+{ version, sha256Hash }:
+
 { lib, stdenv
 , fetchpatch
 , fetchurl
@@ -15,12 +17,12 @@
 assert enableDmeventd -> enableCmdlib;
 
 stdenv.mkDerivation rec {
-  pname = "lvm2" + lib.optionalString enableDmeventd "with-dmeventd";
-  version = "2.03.12";
+  pname = "lvm2" + lib.optionalString enableDmeventd "-with-dmeventd";
+  inherit version;
 
   src = fetchurl {
     url = "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${version}.tgz";
-    sha256 = "1shczwfd0888dchjiaqzd48ampm6f8y0ngsqd99fy4nxlbr5q1vn";
+    sha256 = sha256Hash;
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -60,6 +62,7 @@ stdenv.mkDerivation rec {
       --replace "(BINDIR)/systemd-run" /run/current-system/systemd/bin/systemd-run
 
     substituteInPlace make.tmpl.in --replace "@systemdsystemunitdir@" "$out/lib/systemd/system"
+  '' + lib.optionalString (lib.versionAtLeast version "2.03") ''
     substituteInPlace libdm/make.tmpl.in --replace "@systemdsystemunitdir@" "$out/lib/systemd/system"
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37ade6185a48..dd19bd524a07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21935,13 +21935,18 @@ with pkgs;
 
   lsscsi = callPackage ../os-specific/linux/lsscsi { };
 
-  lvm2 = callPackage ../os-specific/linux/lvm2 {
+  lvm2-2_03 = callPackage ../os-specific/linux/lvm2/2_03.nix {
     # udev is the same package as systemd which depends on cryptsetup
     # which depends on lvm2 again.  But we only need the libudev part
     # which does not depend on cryptsetup.
     udev = systemdMinimal;
   };
-  lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 {
+  lvm2-2_02 = callPackage ../os-specific/linux/lvm2/2_02.nix {
+    udev = systemdMinimal;
+  };
+  lvm2 = if stdenv.targetPlatform.isMusl then lvm2-2_02 else lvm2-2_03;
+
+  lvm2_dmeventd = lvm2.override {
     enableDmeventd = true;
     enableCmdlib = true;
   };

From ce8cd7cbe4a7b4d8de0ff08599a3d42c6c3e1ca2 Mon Sep 17 00:00:00 2001
From: Yuka <yuka@yuka.dev>
Date: Sun, 17 Oct 2021 21:00:43 +0200
Subject: [PATCH 034/235] libmediainfo: add musl patch (#141966)

---
 pkgs/development/libraries/libmediainfo/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 7fa7ce9482a7..2a74c79afaf0 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib, fetchpatch }:
 
 stdenv.mkDerivation rec {
   version = "21.09";
@@ -11,7 +11,15 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libzen zlib ];
 
-  sourceRoot = "./MediaInfoLib/Project/GNU/Library/";
+  patches = [
+    # fixes pkgsMusl.libmediainfo build
+    (fetchpatch {
+      url = "https://git.alpinelinux.org/aports/plain/community/libmediainfo/fix-include-signal.patch?id=b8d666a3d33575c184308e1176f4de9e519af577";
+      sha256 = "sha256-b3HoIwy/hKSh8jUakwVJpnPmYw5KUwZXgLW7IPMY4/c=";
+    })
+  ];
+
+  postPatch = "cd Project/GNU/Library";
 
   configureFlags = [ "--enable-shared" ];
 

From df17077dbafc2f570d2bdf5a7907d2e22806d236 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 17 Oct 2021 21:26:56 +0100
Subject: [PATCH 035/235] coreutils: enable parallel builds and tests

Tested on 16-core machine with 10 rebuilds:
    $ nix build -f. coreutils --repeat 10

No failures. Original failure is probably fixed upstream
with a69e54cfdf7 ("maint: fix dependency of man/arch.1".)
---
 pkgs/tools/misc/coreutils/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 16f3e4c721f7..f5e7ca8a25c0 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -121,9 +121,7 @@ stdenv.mkDerivation (rec {
   # Prevents attempts of running 'help2man' on cross-built binaries.
   PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing";
 
-  # Saw random failures like ‘help2man: can't get '--help' info from
-  # man/sha512sum.td/sha512sum’.
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   NIX_LDFLAGS = optionalString selinuxSupport "-lsepol";
   FORCE_UNSAFE_CONFIGURE = optionalString stdenv.hostPlatform.isSunOS "1";

From 921972d2280c9d0cf1d78dfc0dbbdc6a579b1f3c Mon Sep 17 00:00:00 2001
From: Yuka <yuka@yuka.dev>
Date: Sun, 17 Oct 2021 22:36:03 +0200
Subject: [PATCH 036/235] pkgsMusl.libgcc: fix build (#141993)

---
 pkgs/development/libraries/gcc/libgcc/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix
index ab62fdf3fa20..b9b7db729eba 100644
--- a/pkgs/development/libraries/gcc/libgcc/default.nix
+++ b/pkgs/development/libraries/gcc/libgcc/default.nix
@@ -22,6 +22,8 @@ stdenvNoLibs.mkDerivation rec {
     sourceRoot=$(readlink -e "./libgcc")
   '';
 
+  hardeningDisable = [ "pie" ];
+
   preConfigure = ''
     cd "$buildRoot"
   ''

From f378420360a278e317b6cb14bfce1a305acbbedb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sun, 17 Oct 2021 11:40:07 -0500
Subject: [PATCH 037/235] =?UTF-8?q?binutils:=202.35.1=20=E2=86=92=202.35.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CVEs:

- https://nvd.nist.gov/vuln/detail/CVE-2020-35448 (3.3 Low)
- https://nvd.nist.gov/vuln/detail/CVE-2021-20284 (5.5 Medium)
- https://nvd.nist.gov/vuln/detail/CVE-2021-20294 (7.8 High)
---
 pkgs/development/tools/misc/binutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 97f7a6dd8d03..f05e0e8f5945 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -27,7 +27,7 @@ assert gold -> execFormatIsELF stdenv.targetPlatform;
 let
   reuseLibs = enableShared && withAllTargets;
 
-  version = "2.35.1";
+  version = "2.35.2";
   basename = "binutils";
   # The targetPrefix prepended to binary names to allow multiple binuntils on the
   # PATH to both be usable.
@@ -42,7 +42,7 @@ let
   # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
   normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl {
     url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2";
-    sha256 = "sha256-Mg56HQ9G/Nn0E/EEbiFsviO7K85t62xqYzBEJeSLGUI=";
+    sha256 = "sha256-z6dkTb7PRZHhNutAfBwdoWV4vSsD8MLorNzroZS7nWE=";
   });
 in
 

From 745023e01a287d8833b6c95a7a12f675dfef6d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sun, 17 Oct 2021 16:19:06 -0500
Subject: [PATCH 038/235] binutils: patch CVE-2021-3487

---
 .../tools/misc/binutils/CVE-2021-3487.patch   | 73 +++++++++++++++++++
 .../tools/misc/binutils/default.nix           |  1 +
 2 files changed, 74 insertions(+)
 create mode 100644 pkgs/development/tools/misc/binutils/CVE-2021-3487.patch

diff --git a/pkgs/development/tools/misc/binutils/CVE-2021-3487.patch b/pkgs/development/tools/misc/binutils/CVE-2021-3487.patch
new file mode 100644
index 000000000000..004271bd45ab
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/CVE-2021-3487.patch
@@ -0,0 +1,73 @@
+From: Nick Clifton <nickc@redhat.com>
+Date: Thu, 26 Nov 2020 17:08:33 +0000 (+0000)
+Subject: Prevent a memory allocation failure when parsing corrupt DWARF debug sections.
+X-Git-Tag: binutils-2_36~485
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=647cebce12a6b0a26960220caff96ff38978cf24;hp=239ca5e497dda2c151009d664d500086a5c2173a
+
+Prevent a memory allocation failure when parsing corrupt DWARF debug sections.
+
+	PR 26946
+	* dwarf2.c (read_section): Check for debug sections with excessive
+	sizes.
+---
+
+diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
+index 977bf43a6a1..8bbfc81d3e7 100644
+--- a/bfd/dwarf2.c
++++ b/bfd/dwarf2.c
+@@ -531,22 +531,24 @@ read_section (bfd *	      abfd,
+ 	      bfd_byte **     section_buffer,
+ 	      bfd_size_type * section_size)
+ {
+-  asection *msec;
+   const char *section_name = sec->uncompressed_name;
+   bfd_byte *contents = *section_buffer;
+-  bfd_size_type amt;
+ 
+   /* The section may have already been read.  */
+   if (contents == NULL)
+     {
++      bfd_size_type amt;
++      asection *msec;
++      ufile_ptr filesize;
++
+       msec = bfd_get_section_by_name (abfd, section_name);
+-      if (! msec)
++      if (msec == NULL)
+ 	{
+ 	  section_name = sec->compressed_name;
+ 	  if (section_name != NULL)
+ 	    msec = bfd_get_section_by_name (abfd, section_name);
+ 	}
+-      if (! msec)
++      if (msec == NULL)
+ 	{
+ 	  _bfd_error_handler (_("DWARF error: can't find %s section."),
+ 			      sec->uncompressed_name);
+@@ -554,12 +556,23 @@ read_section (bfd *	      abfd,
+ 	  return FALSE;
+ 	}
+ 
+-      *section_size = msec->rawsize ? msec->rawsize : msec->size;
++      amt = bfd_get_section_limit_octets (abfd, msec);
++      filesize = bfd_get_file_size (abfd);
++      if (amt >= filesize)
++	{
++	  /* PR 26946 */
++	  _bfd_error_handler (_("DWARF error: section %s is larger than its filesize! (0x%lx vs 0x%lx)"),
++			      section_name, (long) amt, (long) filesize);
++	  bfd_set_error (bfd_error_bad_value);
++	  return FALSE;
++	}
++      *section_size = amt;
+       /* Paranoia - alloc one extra so that we can make sure a string
+ 	 section is NUL terminated.  */
+-      amt = *section_size + 1;
++      amt += 1;
+       if (amt == 0)
+ 	{
++	  /* Paranoia - this should never happen.  */
+ 	  bfd_set_error (bfd_error_no_memory);
+ 	  return FALSE;
+ 	}
+
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index f05e0e8f5945..a8c20bbd128f 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -84,6 +84,7 @@ stdenv.mkDerivation {
     ./gold-Update-GNU_PROPERTY_X86_XXX-macros.patch
 
     ./CVE-2020-35448.patch
+    ./CVE-2021-3487.patch
   ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch
     ++ # This patch was suggested by Nick Clifton to fix
        # https://sourceware.org/bugzilla/show_bug.cgi?id=16177

From ba0649790452a507c0972d788e551baad0ad18be Mon Sep 17 00:00:00 2001
From: Yuka <yuka@yuka.dev>
Date: Mon, 18 Oct 2021 08:53:36 +0200
Subject: [PATCH 039/235] glibcLocales: support building on musl (#141971)

---
 pkgs/development/libraries/glibc/common.nix  | 6 ++++--
 pkgs/development/libraries/glibc/locales.nix | 6 ++++--
 pkgs/top-level/all-packages.nix              | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 3f78ef4041a6..dbb9f3ffa877 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -37,6 +37,8 @@
 , profilingLibraries ? false
 , withGd ? false
 , meta
+, extraBuildInputs ? []
+, extraNativeBuildInputs ? []
 , ...
 } @ args:
 
@@ -189,8 +191,8 @@ stdenv.mkDerivation ({
   outputs = [ "out" "bin" "dev" "static" ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ bison python3Minimal ];
-  buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ];
+  nativeBuildInputs = [ bison python3Minimal ] ++ extraNativeBuildInputs;
+  buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ] ++ extraBuildInputs;
 
   # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to
   # prevent a retained dependency on the bootstrap tools in the stdenv-linux
diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix
index 208eedd71934..bada8b3f31f7 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
@@ -6,7 +6,7 @@
    https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED
 */
 
-{ lib, stdenv, buildPackages, callPackage, writeText
+{ lib, stdenv, buildPackages, callPackage, writeText, glibc
 , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ]
 }:
 
@@ -17,6 +17,8 @@ callPackage ./common.nix { inherit stdenv; } {
 
   outputs = [ "out" ];
 
+  extraNativeBuildInputs = [ glibc ];
+
   # Awful hack: `localedef' doesn't allow the path to `locale-archive'
   # to be overriden, but you *can* specify a prefix, i.e. it will use
   # <prefix>/<path-to-glibc>/lib/locale/locale-archive.  So we use
@@ -24,7 +26,7 @@ callPackage ./common.nix { inherit stdenv; } {
   # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive.
   buildPhase =
     ''
-      mkdir -p $TMPDIR/"${buildPackages.stdenv.cc.libc.out}/lib/locale"
+      mkdir -p $TMPDIR/"${buildPackages.glibc.out}/lib/locale"
 
       echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5be56dccff0e..a5bf68078618 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16250,8 +16250,8 @@ with pkgs;
 
   relibc = callPackage ../development/libraries/relibc { };
 
-  # Only supported on Linux, using glibc
-  glibcLocales = if stdenv.hostPlatform.libc == "glibc" then callPackage ../development/libraries/glibc/locales.nix { } else null;
+  # Only supported on Linux
+  glibcLocales = if stdenv.hostPlatform.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null;
 
   glibcInfo = callPackage ../development/libraries/glibc/info.nix { };
 

From 6b1bac2a236e0be200612cd1a4b7b9c757c9765d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 18 Oct 2021 13:15:55 +0200
Subject: [PATCH 040/235] systemd: fix typo in comment

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 15985f4d9e50..b99d872f2816 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -164,10 +164,11 @@ stdenv.mkDerivation {
     ./0019-core-respect-install_sysconfdir_samples-in-meson-fil.patch
     ./0020-login-respect-install_sysconfdir_samples-in-meson-fi.patch
 
-    # In v248 or v249 we started to get in trouble due to our /etc/systemd/sytem being
-    # a symlink and thus being treated differently by systemd. With the below
-    # patch we mitigate that effect by special casing all our root unit dirs
-    # if they are symlinks. This does exactly what we need (AFAICT).
+    # In v248 or v249 we started to get in trouble due to our
+    # /etc/systemd/system being a symlink and thus being treated differently by
+    # systemd. With the below patch we mitigate that effect by special casing
+    # all our root unit dirs if they are symlinks. This does exactly what we
+    # need (AFAICT).
     ./0021-core-handle-lookup-paths-being-symlinks.patch
 
     # The way files are being tested for being executable changed in v248/v249

From 722ffe0d53b7311747cefc50d579c60a58d2ccc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 18 Oct 2021 13:56:45 +0200
Subject: [PATCH 041/235] pcsclite: 1.9.1 -> 1.9.4

---
 pkgs/tools/security/pcsclite/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 71bd13c4a729..1488e6561c9a 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -2,6 +2,7 @@
 , lib
 , fetchurl
 , autoreconfHook
+, autoconf-archive
 , pkg-config
 , perl
 , python3
@@ -13,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pcsclite";
-  version = "1.9.1";
+  version = "1.9.4";
 
   outputs = [ "bin" "out" "dev" "doc" "man" ];
 
   src = fetchurl {
     url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2";
-    sha256 = "sha256-c8R4m3h2qDOnD0k82iFlXf6FaJ2bfilwHCQyduVeaDo=";
+    sha256 = "sha256:0jqwnpywk9ka3q88b1k93p8s0xhmx1isdpcqa80nd8p04z1am34a";
   };
 
   patches = [ ./no-dropdir-literals.patch ];
@@ -55,7 +56,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ autoreconfHook pkg-config perl ];
+  nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config perl ];
 
   buildInputs = [ python3 ]
     ++ lib.optionals stdenv.isLinux [ dbus polkit systemd ]

From 28e55bce8c23e86ae0382be2d9fe8875a487382e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 17 Oct 2021 20:12:37 +0000
Subject: [PATCH 042/235] systemd: 249.4 -> 249.5

Some of Andi's patches have been upstreamed, so we don't need to apply
them ourselves any more.
---
 ...ts-for-uninitialised-encrypted-devic.patch |  4 +--
 ...on-t-try-to-unmount-nix-or-nix-store.patch |  4 +--
 .../systemd/0003-Fix-NixOS-containers.patch   |  6 ++--
 ...004-Look-for-fsck-in-the-right-place.patch |  4 +--
 ...some-NixOS-specific-unit-directories.patch |  4 +--
 ...f-a-useless-message-in-user-sessions.patch |  4 +--
 ...d-timedated-disable-methods-that-cha.patch |  6 ++--
 .../linux/systemd/0008-Fix-hwdb-paths.patch   |  4 +--
 ...e-usr-share-zoneinfo-to-etc-zoneinfo.patch |  6 ++--
 ...calectl-use-etc-X11-xkb-for-list-x11.patch |  4 +--
 ...te-statedir-and-don-t-touch-prefixdi.patch |  8 ++---
 ...-environment-when-calling-generators.patch |  4 +--
 ...3-add-rootprefix-to-lookup-dir-paths.patch |  4 +--
 ...-execute-scripts-in-etc-systemd-syst.patch |  4 +--
 ...ecute-scripts-in-etc-systemd-system-.patch |  4 +--
 ...s.service-Update-ConditionFileNotEmp.patch |  4 +--
 ...-placeholder-for-DEFAULT_PATH_NORMAL.patch |  4 +--
 ...pkg-config-derive-prefix-from-prefix.patch |  4 +--
 ...-handle-lookup-paths-being-symlinks.patch} |  6 ++--
 ...tall_sysconfdir_samples-in-meson-fil.patch | 31 -----------------
 ...stall_sysconfdir_samples-in-meson-fi.patch | 29 ----------------
 ...ind_executable-work-without-proc-mou.patch | 33 -------------------
 pkgs/os-specific/linux/systemd/default.nix    | 21 ++----------
 23 files changed, 47 insertions(+), 155 deletions(-)
 rename pkgs/os-specific/linux/systemd/{0021-core-handle-lookup-paths-being-symlinks.patch => 0019-core-handle-lookup-paths-being-symlinks.patch} (95%)
 delete mode 100644 pkgs/os-specific/linux/systemd/0019-core-respect-install_sysconfdir_samples-in-meson-fil.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0020-login-respect-install_sysconfdir_samples-in-meson-fi.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/0022-path-util-make-find_executable-work-without-proc-mou.patch

diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
index d17db995ae94..dc7f2a2868e6 100644
--- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
+++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -1,7 +1,7 @@
-From 6c5d8677e1b3c18455066e55b65cf699d8db363b Mon Sep 17 00:00:00 2001
+From 06a8dbb65584b6f705fee8a486f32dab12f72082 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:46:30 +0100
-Subject: [PATCH 01/22] Start device units for uninitialised encrypted devices
+Subject: [PATCH 01/19] Start device units for uninitialised encrypted devices
 
 This is necessary because the NixOS service that initialises the
 filesystem depends on the appearance of the device unit.  Also, this
diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
index cb27db971ca9..51e934ef9831 100644
--- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
+++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
@@ -1,7 +1,7 @@
-From ce8c1905a81f143e2baa0f77f12753073b556d62 Mon Sep 17 00:00:00 2001
+From 2c98ff115f7027bebde14cf3e74f2c51b343874c Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Fri, 12 Apr 2013 13:16:57 +0200
-Subject: [PATCH 02/22] Don't try to unmount /nix or /nix/store
+Subject: [PATCH 02/19] Don't try to unmount /nix or /nix/store
 
 They'll still be remounted read-only.
 
diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
index 6892f8c9662f..194b3f5418a9 100644
--- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
@@ -1,7 +1,7 @@
-From 9d6a1dfefa2342cc466e4cdebb86da1b174ae962 Mon Sep 17 00:00:00 2001
+From 16f441b6495ff4c4d1d0b71a7f1650505147173d Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Wed, 16 Apr 2014 10:59:28 +0200
-Subject: [PATCH 03/22] Fix NixOS containers
+Subject: [PATCH 03/19] Fix NixOS containers
 
 In NixOS containers, the init script is bind-mounted into the
 container, so checking early whether it exists will fail.
@@ -10,7 +10,7 @@ container, so checking early whether it exists will fail.
  1 file changed, 2 insertions(+)
 
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 04685fecba..0e5ece5f91 100644
+index 575b9da447..438ca294db 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
 @@ -5590,6 +5590,7 @@ static int run(int argc, char *argv[]) {
diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
index d7576e0387dc..210382d92597 100644
--- a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
+++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
@@ -1,7 +1,7 @@
-From 9f3850d67c57c8e9912d2da0357b66d0d1d08d2f Mon Sep 17 00:00:00 2001
+From 261423bc039378115ad9223c2b6ede9c395847b2 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Thu, 1 May 2014 14:10:10 +0200
-Subject: [PATCH 04/22] Look for fsck in the right place
+Subject: [PATCH 04/19] Look for fsck in the right place
 
 ---
  src/fsck/fsck.c | 2 +-
diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
index 2969ecf1a38b..ba105424f6c8 100644
--- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
+++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
@@ -1,7 +1,7 @@
-From 04d3d52868f40b3401884b06c494f5dcfc85da3d Mon Sep 17 00:00:00 2001
+From 18b45c20499747bcc66714ee87edf34d4f6e3dca Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Fri, 19 Dec 2014 14:46:17 +0100
-Subject: [PATCH 05/22] Add some NixOS-specific unit directories
+Subject: [PATCH 05/19] Add some NixOS-specific unit directories
 
 Look in `/nix/var/nix/profiles/default/lib/systemd/{system,user}` for
 units provided by packages installed into the default profile via
diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
index 34a3b3edf1f6..c136bd8f4c80 100644
--- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
+++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
@@ -1,7 +1,7 @@
-From 22c7a75220bd3b9c535f7b589b88e755aad93040 Mon Sep 17 00:00:00 2001
+From 8b8f4168828a12cac17c3e8803cacebf31608c68 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Mon, 11 May 2015 15:39:38 +0200
-Subject: [PATCH 06/22] Get rid of a useless message in user sessions
+Subject: [PATCH 06/19] Get rid of a useless message in user sessions
 
 Namely lots of variants of
 
diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
index 440b38837c40..4f9f98ec8b35 100644
--- a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
+++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
@@ -1,7 +1,7 @@
-From e9c6714cce635ee4b302993a73c59e091f931952 Mon Sep 17 00:00:00 2001
+From e147e9defaf2bb5e8040566537661d90b4008daf Mon Sep 17 00:00:00 2001
 From: Gabriel Ebner <gebner@gebner.org>
 Date: Sun, 6 Dec 2015 14:26:36 +0100
-Subject: [PATCH 07/22] hostnamed, localed, timedated: disable methods that
+Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that
  change system settings.
 
 ---
@@ -35,7 +35,7 @@ index 36702f2fb0..669257ea2f 100644
  
          context_read_machine_info(c);
 diff --git a/src/locale/localed.c b/src/locale/localed.c
-index df0eb030d4..d026eae97e 100644
+index c228385d0e..942ccaa038 100644
 --- a/src/locale/localed.c
 +++ b/src/locale/localed.c
 @@ -360,6 +360,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
index b53630a32815..4ef72f0dccf6 100644
--- a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
+++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
@@ -1,7 +1,7 @@
-From 4561f306751256a77d4c78dddf5c3d3056825b7a Mon Sep 17 00:00:00 2001
+From 992d0e6abb09aacceee2f8646c4bcdacf7277dc7 Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Thu, 7 Jul 2016 02:47:13 +0300
-Subject: [PATCH 08/22] Fix hwdb paths
+Subject: [PATCH 08/19] Fix hwdb paths
 
 Patch by vcunat.
 ---
diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
index 6517279399f0..78ebcb50fccd 100644
--- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
@@ -1,7 +1,7 @@
-From d082d08ae0a4ffbefccf29065806ebc1821b5c67 Mon Sep 17 00:00:00 2001
+From 462bc01b3a38468fd617066a3d7f27b1acca9e0a Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Tue, 11 Oct 2016 13:12:08 +0300
-Subject: [PATCH 09/22] Change /usr/share/zoneinfo to /etc/zoneinfo
+Subject: [PATCH 09/19] Change /usr/share/zoneinfo to /etc/zoneinfo
 
 NixOS uses this path.
 ---
@@ -88,7 +88,7 @@ index 2cb4f80d5d..ebeaeac52f 100644
          (void) mkdir_parents(etc_localtime, 0755);
          if (symlink(e, etc_localtime) < 0)
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 0e5ece5f91..cc46435472 100644
+index 438ca294db..98bd110d92 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
 @@ -1887,8 +1887,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
index 038bdfcb114b..a956cceff550 100644
--- a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
+++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
@@ -1,7 +1,7 @@
-From bbfcc492757c2ea2c6452256c7040021b390a60a Mon Sep 17 00:00:00 2001
+From fbb302d00c63dc17a210f83648f24a1da983b2c0 Mon Sep 17 00:00:00 2001
 From: Imuli <i@imu.li>
 Date: Wed, 19 Oct 2016 08:46:47 -0400
-Subject: [PATCH 10/22] localectl: use /etc/X11/xkb for list-x11-*
+Subject: [PATCH 10/19] localectl: use /etc/X11/xkb for list-x11-*
 
 NixOS has an option to link the xkb data files to /etc/X11, but not to
 /usr/share/X11.
diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
index 77b03b413863..6b482eb8c9d7 100644
--- a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
+++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
@@ -1,17 +1,17 @@
-From 654ac88b9b6f6b6a13e8af57ef88844769e1408f Mon Sep 17 00:00:00 2001
+From b850dae349de8ac6906d4f920a21ef275cecb2de Mon Sep 17 00:00:00 2001
 From: Franz Pletz <fpletz@fnordicwalking.de>
 Date: Sun, 11 Feb 2018 04:37:44 +0100
-Subject: [PATCH 11/22] build: don't create statedir and don't touch prefixdir
+Subject: [PATCH 11/19] build: don't create statedir and don't touch prefixdir
 
 ---
  meson.build | 3 ---
  1 file changed, 3 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 738879eb21..453ee4b1c0 100644
+index b5a51b6d0d..99b071542c 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -3538,9 +3538,6 @@ install_data('LICENSE.GPL2',
+@@ -3540,9 +3540,6 @@ install_data('LICENSE.GPL2',
               'docs/GVARIANT-SERIALIZATION.md',
               install_dir : docdir)
  
diff --git a/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
index 5d0fddc0f680..ffe7b7467f50 100644
--- a/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
+++ b/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch
@@ -1,7 +1,7 @@
-From a716de6dc551008ffa6ce46686422d2fd9bc5397 Mon Sep 17 00:00:00 2001
+From beefb6d381286769cc47c71c82b831a37a405d90 Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Fri, 2 Nov 2018 21:15:42 +0100
-Subject: [PATCH 12/22] inherit systemd environment when calling generators.
+Subject: [PATCH 12/19] inherit systemd environment when calling generators.
 
 Systemd generators need access to the environment configured in
 stage-2-init.sh since it schedules fsck and mkfs executions based on
diff --git a/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
index 489f4dc2fdf7..086a20cabceb 100644
--- a/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
+++ b/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch
@@ -1,7 +1,7 @@
-From 0a71c96913eeadfb8db6b4cc1856120abd5f0bd3 Mon Sep 17 00:00:00 2001
+From 146b79d55cc4fdfdb5fd4978e68b21f5c1df1679 Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Thu, 9 May 2019 11:15:22 +0200
-Subject: [PATCH 13/22] add rootprefix to lookup dir paths
+Subject: [PATCH 13/19] add rootprefix to lookup dir paths
 
 systemd does not longer use the UDEVLIBEXEC directory as root for
 discovery default udev rules. By adding `$out/lib` to the lookup paths
diff --git a/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
index 24ae67b1d3cb..b3fafabb515e 100644
--- a/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+++ b/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
@@ -1,7 +1,7 @@
-From 26694b35de479577afb7456d2e74d2834645e123 Mon Sep 17 00:00:00 2001
+From 8edd810e74e2308f34eba6e8072e559e69307830 Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Thu, 25 Jul 2019 20:45:55 +0300
-Subject: [PATCH 14/22] systemd-shutdown: execute scripts in
+Subject: [PATCH 14/19] systemd-shutdown: execute scripts in
  /etc/systemd/system-shutdown
 
 This is needed for NixOS to use such scripts as systemd directory is immutable.
diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
index 51c621c05b79..ac40b8c1e258 100644
--- a/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
+++ b/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
@@ -1,7 +1,7 @@
-From d605877fcbc9898db25f8af4c874aed244e57235 Mon Sep 17 00:00:00 2001
+From 9ed24199dd3ce91d3f7fbfbdf823312c124aba56 Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
 Date: Thu, 25 Jul 2019 20:46:58 +0300
-Subject: [PATCH 15/22] systemd-sleep: execute scripts in
+Subject: [PATCH 15/19] systemd-sleep: execute scripts in
  /etc/systemd/system-sleep
 
 This is needed for NixOS to use such scripts as systemd directory is immutable.
diff --git a/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
index 9fb6dc6553c9..26e586c00af8 100644
--- a/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
+++ b/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
@@ -1,7 +1,7 @@
-From dffe9928bfa364ece8737157689e607510d18a59 Mon Sep 17 00:00:00 2001
+From 6db7ad4d5526a82e4ed9b135daf1054a8b71e1c7 Mon Sep 17 00:00:00 2001
 From: Florian Klink <flokli@flokli.de>
 Date: Sat, 7 Mar 2020 22:40:27 +0100
-Subject: [PATCH 16/22] kmod-static-nodes.service: Update ConditionFileNotEmpty
+Subject: [PATCH 16/19] kmod-static-nodes.service: Update ConditionFileNotEmpty
 
 On NixOS, kernel modules of the currently booted systems are located at
 /run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/.
diff --git a/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
index 0a4a6ed2b276..a47c6f51836e 100644
--- a/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
+++ b/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
@@ -1,7 +1,7 @@
-From 9dcb52f782ddae2f6a1c00cdcf09053453acef14 Mon Sep 17 00:00:00 2001
+From 160d32c336c96744bbfb618eae4c12cb90138644 Mon Sep 17 00:00:00 2001
 From: Florian Klink <flokli@flokli.de>
 Date: Sun, 8 Mar 2020 01:05:54 +0100
-Subject: [PATCH 17/22] path-util.h: add placeholder for DEFAULT_PATH_NORMAL
+Subject: [PATCH 17/19] path-util.h: add placeholder for DEFAULT_PATH_NORMAL
 
 This will be the $PATH used to lookup ExecStart= etc. options, which
 systemd itself uses extensively.
diff --git a/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch b/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch
index aa77b627e27d..3939a2ba15e0 100644
--- a/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch
+++ b/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch
@@ -1,7 +1,7 @@
-From dfcf361bed232d9cf8f7344872ca185e4d96a871 Mon Sep 17 00:00:00 2001
+From 777d61550f95b1dcf253e1d2132f9db7010a18f3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
 Date: Sun, 6 Dec 2020 08:34:19 +0100
-Subject: [PATCH 18/22] pkg-config: derive prefix from --prefix
+Subject: [PATCH 18/19] pkg-config: derive prefix from --prefix
 
 Point prefix to the one configured, instead of `/usr` `systemd` has limited
 support for making the pkgconfig prefix overridable, and interpolates those
diff --git a/pkgs/os-specific/linux/systemd/0021-core-handle-lookup-paths-being-symlinks.patch b/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch
similarity index 95%
rename from pkgs/os-specific/linux/systemd/0021-core-handle-lookup-paths-being-symlinks.patch
rename to pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch
index 4366999bee48..5820e7605c45 100644
--- a/pkgs/os-specific/linux/systemd/0021-core-handle-lookup-paths-being-symlinks.patch
+++ b/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch
@@ -1,7 +1,7 @@
-From 3e0e304959719958dee4d88ccbb9647ffb5797ef Mon Sep 17 00:00:00 2001
+From 273e706ff561f2164b84c714148346ac92dd8846 Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Wed, 18 Aug 2021 19:10:08 +0200
-Subject: [PATCH 21/22] core: handle lookup paths being symlinks
+Subject: [PATCH 19/19] core: handle lookup paths being symlinks
 
 With a recent change paths leaving the statically known lookup paths
 would be treated differently then those that remained within those. That
@@ -15,7 +15,7 @@ directory itself is already a symlink.
  1 file changed, 31 insertions(+), 2 deletions(-)
 
 diff --git a/src/basic/unit-file.c b/src/basic/unit-file.c
-index 884a0674a9..3ae2a115d0 100644
+index 0d58b1c4fe..7314f1245f 100644
 --- a/src/basic/unit-file.c
 +++ b/src/basic/unit-file.c
 @@ -254,6 +254,7 @@ int unit_file_build_name_map(
diff --git a/pkgs/os-specific/linux/systemd/0019-core-respect-install_sysconfdir_samples-in-meson-fil.patch b/pkgs/os-specific/linux/systemd/0019-core-respect-install_sysconfdir_samples-in-meson-fil.patch
deleted file mode 100644
index 0f82819947b7..000000000000
--- a/pkgs/os-specific/linux/systemd/0019-core-respect-install_sysconfdir_samples-in-meson-fil.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0ac75fbbf771dfbb368087f19b2ed61356f9367d Mon Sep 17 00:00:00 2001
-From: Andreas Rammhold <andreas@rammhold.de>
-Date: Mon, 26 Jul 2021 16:57:43 +0200
-Subject: [PATCH 19/22] core: respect install_sysconfdir_samples in meson file
-
-The refactoring done in e11a25cadbe caused the configuration files to be
-installed into the pkgsysconfdir regardless of the state of the
-install_sysconfdir_samples boolean that indicated whether or not the
-sample files should be installed.
----
- src/core/meson.build | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/core/meson.build b/src/core/meson.build
-index f0d2c6f642..4ff7e00e36 100644
---- a/src/core/meson.build
-+++ b/src/core/meson.build
-@@ -187,6 +187,10 @@ foreach item : in_files
-         file = item[0]
-         dir = item[1]
- 
-+        if not install_sysconfdir_samples and dir == pkgsysconfdir
-+                continue
-+        endif
-+
-         custom_target(
-                 file,
-                 input : file + '.in',
--- 
-2.33.0
-
diff --git a/pkgs/os-specific/linux/systemd/0020-login-respect-install_sysconfdir_samples-in-meson-fi.patch b/pkgs/os-specific/linux/systemd/0020-login-respect-install_sysconfdir_samples-in-meson-fi.patch
deleted file mode 100644
index ddb4e82a0685..000000000000
--- a/pkgs/os-specific/linux/systemd/0020-login-respect-install_sysconfdir_samples-in-meson-fi.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c12879d75c5ba7cd982993a815fc6540ae50a941 Mon Sep 17 00:00:00 2001
-From: Andreas Rammhold <andreas@rammhold.de>
-Date: Mon, 26 Jul 2021 17:20:34 +0200
-Subject: [PATCH 20/22] login: respect install_sysconfdir_samples in meson file
-
-The refactoring done in c900d89faa0 caused the configuration files to be
-installed into the pkgsysconfdir regardless of the state of the
-install_sysconfdir_samples boolean that indicates whether or not the
-sample files should be installed.
----
- src/login/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/login/meson.build b/src/login/meson.build
-index 8c20e6be65..b637adc9a2 100644
---- a/src/login/meson.build
-+++ b/src/login/meson.build
-@@ -67,7 +67,7 @@ pam_systemd_c = files('pam_systemd.c')
- 
- enable_logind = conf.get('ENABLE_LOGIND') == 1
- in_files = [
--        ['logind.conf',        pkgsysconfdir, enable_logind],
-+        ['logind.conf',        pkgsysconfdir, enable_logind and install_sysconfdir_samples],
-         ['70-uaccess.rules',   udevrulesdir,  enable_logind and conf.get('HAVE_ACL') == 1],
-         ['71-seat.rules',      udevrulesdir,  enable_logind],
-         ['73-seat-late.rules', udevrulesdir,  enable_logind],
--- 
-2.33.0
-
diff --git a/pkgs/os-specific/linux/systemd/0022-path-util-make-find_executable-work-without-proc-mou.patch b/pkgs/os-specific/linux/systemd/0022-path-util-make-find_executable-work-without-proc-mou.patch
deleted file mode 100644
index c0701a56d025..000000000000
--- a/pkgs/os-specific/linux/systemd/0022-path-util-make-find_executable-work-without-proc-mou.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 04eef1fb8e2a52277e051eb7980e96f9acc0afaa Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Mon, 23 Aug 2021 06:16:48 +0900
-Subject: [PATCH 22/22] path-util: make find_executable() work without /proc
- mounted
-
-Follow-up for 888f65ace6296ed61285d31db846babf1c11885e.
-
-Hopefully fixes #20514.
----
- src/basic/path-util.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/basic/path-util.c b/src/basic/path-util.c
-index e5afb5f5f5..13d71ed1b6 100644
---- a/src/basic/path-util.c
-+++ b/src/basic/path-util.c
-@@ -628,7 +628,11 @@ static int check_x_access(const char *path, int *ret_fd) {
-                 return r;
- 
-         r = access_fd(fd, X_OK);
--        if (r < 0)
-+        if (r == -ENOSYS) {
-+                /* /proc is not mounted. Fallback to access(). */
-+                if (access(path, X_OK) < 0)
-+                        return -errno;
-+        } else if (r < 0)
-                 return r;
- 
-         if (ret_fd)
--- 
-2.33.0
-
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index b99d872f2816..446aa73609ba 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -119,7 +119,7 @@ assert withHomed -> withCryptsetup;
 assert withCryptsetup -> (cryptsetup != null);
 let
   wantCurl = withRemote || withImportd;
-  version = "249.4";
+  version = "249.5";
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -130,7 +130,7 @@ stdenv.mkDerivation {
     owner = "systemd";
     repo = "systemd-stable";
     rev = "v${version}";
-    sha256 = "0pqi9gbk9kgwvd0idf13ybxz7s4h5przn01bwj6fna44jr0wy41c";
+    sha256 = "0bir2syy20rdi59sv8xp8nw1c92zl9z0wmv7ggsll8dca7niqwbp";
   };
 
   # If these need to be regenerated, `git am path/to/00*.patch` them into a
@@ -157,27 +157,12 @@ stdenv.mkDerivation {
     ./0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
     ./0018-pkg-config-derive-prefix-from-prefix.patch
 
-    # In v249 a bunch of meson files had been touched as part of the migration to
-    # jinja2 for templating. Unfortunately some of those files lost the `install_sysconfdir_samples` check.
-    # The following two patches are part of a PR that was filed to fix those cases.
-    # https://github.com/systemd/systemd/pull/20303
-    ./0019-core-respect-install_sysconfdir_samples-in-meson-fil.patch
-    ./0020-login-respect-install_sysconfdir_samples-in-meson-fi.patch
-
     # In v248 or v249 we started to get in trouble due to our
     # /etc/systemd/system being a symlink and thus being treated differently by
     # systemd. With the below patch we mitigate that effect by special casing
     # all our root unit dirs if they are symlinks. This does exactly what we
     # need (AFAICT).
-    ./0021-core-handle-lookup-paths-being-symlinks.patch
-
-    # The way files are being tested for being executable changed in v248/v249
-    # which caused our confinement setup to fail as we do not mount /proc by
-    # default.
-    # The issue has been reported upstream and this patch carries the upstream
-    # fix for the same. Upstream now has a test for this scenario.
-    # https://github.com/systemd/systemd/issues/20514
-    ./0022-path-util-make-find_executable-work-without-proc-mou.patch
+    ./0019-core-handle-lookup-paths-being-symlinks.patch
   ];
 
   postPatch = ''

From bf60e5144c8dd9f0cd92a92442e942de564dc334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 18 Oct 2021 16:13:14 +0200
Subject: [PATCH 043/235] unbound: use lib.optionalString

---
 pkgs/tools/networking/unbound/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 393756a9b2ab..bd994c2640f9 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
     "--with-libhiredis=${hiredis}"
   ];
 
-  PROTOC_C = if withDNSTAP then "${protobufc}/bin/protoc-c" else null;
+  PROTOC_C = lib.optionalString withDNSTAP "${protobufc}/bin/protoc-c";
 
   # Remove references to compile-time dependencies that are included in the configure flags
   postConfigure = let

From 38e49939da26fbe6b0315c65e1c65021ead382e8 Mon Sep 17 00:00:00 2001
From: Artur Cygan <arczicygan@gmail.com>
Date: Mon, 18 Oct 2021 17:41:19 +0200
Subject: [PATCH 044/235] protobuf: 3.18.0 -> 3.18.1

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

diff --git a/pkgs/development/libraries/protobuf/3.18.nix b/pkgs/development/libraries/protobuf/3.18.nix
index c670b56c7c5a..63fc9b218d30 100644
--- a/pkgs/development/libraries/protobuf/3.18.nix
+++ b/pkgs/development/libraries/protobuf/3.18.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }:
 
 callPackage ./generic-v3.nix {
-  version = "3.18.0";
-  sha256 = "0nhjw4m4dm6wqwwsi0b18js5wbh3ibrpsq195g6mk9cx54fx097f";
+  version = "3.18.1";
+  sha256 = "sha256-5PK0uuk7Du9hX/hHy0gninHIKu6b8THdfVh87Gn7y2Q=";
 }

From 2f0a0cb9741abc5d653d71e407ff2c1c033668e7 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Mon, 18 Oct 2021 23:34:22 +0000
Subject: [PATCH 045/235] glibc: 2.33-55 -> 2.33-56

---
 .../libraries/glibc/2.33-master.patch.gz      | Bin 62804 -> 63411 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 a5f8154dd823b5bb102939c3af48b6b9c0522140..3dc7774cf8416bfcb829fd28dc4c554295c1bdf8 100644
GIT binary patch
delta 1965
zcmcceih1*U<_+>6>LY`tEd}b@;tfA~Cn=osm^E1?`l)H!V=Z=#*>CbxXMf7ld!x%U
zrCnvi)W7d<x2L(;Srj>lHrracEuMDeZczRFsps`J@Ad4v?o#1em6&ouVA@mxNiWBj
zUmk^s994UHS7V2_(d%vjP1cW_yxztv37!!xH8FR6seM+XN6m%{+hyvX#D4rcLFtn@
zbFzKy$;+NovurBvr!y>$?r}P5n#}LXzM=S|oaV0=j}2b2XzIxvT~V3kla^kg_CU$K
z@q+343qkI)EPvSrM&$AJ_qm_G)gS6sJ)>vuKGT_dq`#|IoRT-+=$^A7qgm^ph~plP
zt~&u!LMp<q%GEjl_j<8OY-z!p`fiWbiSjIt%Yr7%bZ~!h@svprr@G^eRxAJ4OG|2a
zyNu?oIWf6d#ZYVg`ShNnH)g7SF1`QS@Jy&3n+jKc{EqC`FCvcW{o*u!zQlaS9$A^m
zeb#bc=9<@k+4b$*<Mlgkc2sfRFW7g1sjBd7M%2|$>2u>3vQ3-1QQ+Cc=UPvayOh?~
z2jtCQG16IZaN!3hdoiukDLnh#=I2lSk|3es`PKJ>qxx0jLx=9j%UPW{d@(C)g58Uv
zgf}Z~`dUtXv{7E;-pIc?PU8UAmzEyq-EHDAN9;<JCBmNa^h?ISWa%+adSd&V<+OhI
z<xPFd9~Sjpaqiu;>q^>jai{csLQ;DdZ{!wjW~i@><YDX8sF@)$>CERz9a}#=eXg<G
z<8;ZvUNauS)NV)4pJFdhaNM2q*wav0-01oa);j_YTh~m#cIbNQzKnwsHY{If`-h%+
z)%Hp#Y^N>HzEln4HbI4_x7YDLw6vVpD*JrRwh3iFERHUmuv6NhK4snV$4b6;4unqB
z-Wu+bDVN1Nt3Ku7ue!SF&u82VE&C_KZ*n1S-`kgw`y&ItbzM09aIN<K%YysjcX)~&
z|C#pxT$|Ihy;jmf7u51Ms888^TKvMC!dnINLfjYoxgEE)Q8cuC@x4t%I5$tijlCjU
zHpTD2A$0{#VHH=cz?}*f6RoQAZ@8*0a#M{w|HZMZU;a`5?cMk5r+Ef0i<;fI+<n3R
zr|kF3;;!@Lt=)4)oU2jy|JCl2uK!c6Z)kaB|2gRKQ=8dS!+-eO%|8EemgpbBoa$Y1
z&FeTUR|_rQy!qwLt4#@K)~{S}-u#dGWA57Wuvz?*)`z5Ya-@YEwv6dzYc<!rc=YJh
zJjtsWKfQOvE#3U{%_J^I7O8Lb>XGXgzI1t~{rq)!dh&L=prqyBPX;ZuI-%n?^|gE6
zm6uQA))ldat^DuNIoD2Q<C-83HFc3C0S>{uURRzZSggGLHO>2h_X@u0^V6TIK6d%r
z^uwb}Y+iiT@%MdxvYOk<-|umc-r_x#clYx4<BPW^`)yRc^Gb&~@fw>)jqime^Pkn<
zu)cPttiZzN=mXa0SGC<;s<q4O{}-Fgn<Mijb*@UBZ&69frM2(8`W$a;xD~>AB#S9V
zZS`!SQ~%yCy=&%YQPJJV9-HygSo`_!cPqXh`<W$fW+Tz#KWD$(^ViGtR8O~w^{Fnb
zGRS2;BdR`=OG)3`N>==g=~Bltla5#Jy?%Pn{raza=gq4;+)?0XwA6CnZgJ}i&eqy@
zii=IUo}bW6Ub}Tg>N&x~`;Cu&USNIhqN<kd^85QGk`?WX4Uc`QJD1d>TKhPOC-Q}_
z+|4Ymwzj5AZATVa^Zsj0vw!g8OU0FPzTLKbb+UZNmh*j+(0kLdX`{}yD>MG>s9v%v
zd1BM_gB&kc)Yoi%uJ5b0x_R5LiH#x(IkPXB9u}{wd3jRf){MSm1%CzBiT_Nz;A1b{
zW*q+J*uoD_kF{8=c`fgMWM0wUs6>8;wo6VLPsMgQG;s=gt+>?BrFz(8qE_c48%>wB
z8}9cn&1!DHu#f4T-@DTl@h#aO4jwVLO7ik%cYb=K&N*%gU+tRu4A;9iK9z)Sc%Qk(
z;gji&#X@qyVunIxX-rohxuhTBcUi%uUl@7#FWa#YpZw}~yTZBMs|*w$W%4`Dv%Vf7
z6Sko{^Xvky?W+pr2o}F8YqGf~c4p(YGXf$;2Ga^2bsTC)=PT(A4k-04=h}QYz2dlt
zZ|A!-=J)^C+|4q-?JjX@M!oR5UNe@ibE#fz(a%!mi}h?>bn$-d=6%-XM*E+eXZjs{
zH@7ruRhjV5L$5C9{bh)CVp}CJ>1&f&*_O!%6PEKXQM)vGyEsQEpQg^mz|iTY*TbK@
zHdeFn3-FxxSiB^IHSgkOr%lUL!+zWm7E(NR@!8}j!Z{VLQ&~0ZrIq%+a=rPlzM<*c
z#$eI(&C@J*i%oy4`eKHNf``kzC54yVCq)QdyWVm4tP9VMo7d$n&(AykE$*$a!Jqkk
zCoL5dHXU7cV*j#3R@o<KC~nRP%A0*`Q+v|RG?vw7J-XhlGd^2Zt6iSX`nLCD9h;k8
zz*V!BPj{Vz?+4c{XPdagaCzUW!ao+Py`Cu5`zL0cw&_Zqt5!E<6%)^W7tiqB6Pa#X
z6>nY?v2_(sCa>Kj-v!6#_fA_NY;bzZr#~_|%T@Sl&hrQ7D>u$Nx!q+!`o6`1(i0Dz
zoGvf9#oi)q+rI1_HZ~#i@@*}=%GRoE&B>AS4a@e;QOWI8{V%|)Q&!tMyIs-Xmsq(X
vXNTawAY~cTcii#G$&z8&VK*8cn6g^zdHTogvC0|Uzw#5hIHx~pW@Z2Y<%GTK

delta 1353
zcmdn|p83iv<_+>6>T~mNn+g1z^M~tf{4TY5+LIQ=-O6itE`FpTS$f)T-nU%6o0i;Y
zcq=jS_FCs}_sfr8UcGkNyD)JL+0VWz{(IV=e4OXCFKg!c*-w7BwDd0#zsK{gA*yh~
zLJ^1MPjw?FnRw<eesC=%%!pl+)zD&Dncp<+8PQ%7YwL{ubTCc)@xZaRev$V*%lrLo
zO7#<x-=we4usRw1bMbcOqJ%G;`3o1F%TRvFz^8XCb3uQ#jO3gP2U_zCwPr~j{wjNm
z<xP?ZN9YHxt87NI7ta@Jttx);)*|}azxdQ&Jd<nI$Fm%it`}G^)m|>?eCEMLM(ZD)
zztB0o%ynMilqdhzeKP(t>0fB|^tA!?T-B3y9x7a#dwXI;)0rEmj>@j}P@GzjVLfs2
zqtu07f0-Flx2)+n%sWY9Y5Un(HHKx^9)2r%U&>WH^$2(8nW~d#gl%7OpFdK2=){b#
zZU^6HtTJ3@FC}5V|J$yslaJ5;xIwUx(^aBAi*=Xv1oO2qe?#AdmoQ(h+4$hdx>T+w
z$wjgC+Jei3Z{6`+aFB1a%u7Q-*E`MilJoMH{yO+!(UNug2iSQ(rL!Ehk>KZj^e|(p
zX#r;hpIEihw-~jgE$J+^Dc%>V_?kl(9NqCeB)h`Vbx%uTOKa#ZH{-{9xe`AvldODi
z*YIm;R+Q*xlaS{gwjoVdqh|A-oYA!;fveozR#=OTv3`>hznF>6L<7y1iK(r63qSoT
zUZTAu^;Y0w<F<}1u6~@FUdbsXcV!kYjVRMkS^a@yhe|_MsMXrmyHo#OXeuw@_%M5o
z)-_k>P_C$Tz0>ngPL<p#c;UhBDCu3#m;Bb*Qs}qAb@AcP4bF#>FSmW{@bRuZX=IWc
zyhANK?2%rwyQV|^q)yG$KRf3p-wnU`jNK&TLi*3EbLU+?F=x|s%P^k3dMV2fFY!5J
z@M+JE%KGICC;VFH=gd@lB76HxgLRq=PkJu5eT>bMGM(*TouMfBg?;bFeZq5HQ+oI=
zWXq=b9XP~1p@qS7Vi1e?t+^f(_nN;`5)S0_^fTW3_|0GI_kW*$y`EYxWEI?)_Tc5k
zi}8OC>i5cXvuzKXvudux@oDv|+n;jnU&0=+@JH%wEgrLrR(Bsyuh@GxNka9D`kJ?;
z6%1=QEI$i{zutZI?mx%fhW0O-?Ebm_cNcka|J|iG{C*4dj9mHCcD3=gNH!hvn47Wv
z_UbUU-dFZcJL1=Ee_b8RQMF*<-zD{4=2MzIl2dK$q<RlmEjzMq-lU~6Rv%78a|Q2O
zcKhX#Fr6gE)j^fZj;!0KvXMp8Vxq7Suf~FvGpDauV9(c8b~nc0P0O7fHNs23KT&_B
z{-r<UtkY-j{9kFC3@mo<`Ij@tZqeFMvv+!Jmw&GH*VLOa^R`jO{H<m}@!8jx$ZxZ-
znp!_|t-Xx?hfhr(e{DT@=Ud<#{rzYECR~&MpwwADC&g%H>E{T)asjC=zVjMn)g4S{
zx)*8uo*#a7Ti~IKx^XryoKEjw|D@*j-0yik$FmY2|2r{Xa{v78*Vnd(tk2o<Xa(n0
z@ypNpcJ46{+LrB_xIFn#k*|ip<_~*f-(NPGfA5!_uYdiX#90M>!b>f`-R;(vSh!mG
z-A-M-uI(o@gD-CFFxvj&@czwC)fcpri~1L&f4o1{Q0$ZLRKscCbEg<i`!e;E#HJVX
z=7c12#qqLUXgjhfeCdB?*WV5QlC0z<4(Ijj?eBB{cj$ni^U=OIvsX!LrHw!A7M?iU
z)hMW0?^2-W#c5kTpW6Rede;8VGoF^Unz28B9da+~-kq0h^_NeaKQU@u$(y2InH6(a
hCS5L`@uZjY<5oR8vCle*QPcl3b?-8E`B%ft005*PsWkuq

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index dbb9f3ffa877..20e7c349dd18 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -44,7 +44,7 @@
 
 let
   version = "2.33";
-  patchSuffix = "-55";
+  patchSuffix = "-56";
   sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8=";
 in
 
@@ -63,7 +63,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-55-g4b95183785
+          glibc-2.33-56-g6090cf1330
           $ 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 dc55a32f1e68abbdfe7f27c4b9a9e6d84407e612 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Sep 2021 09:52:05 +0200
Subject: [PATCH 046/235] python3Packages.asgiref: 3.3.4 -> 3.4.1

---
 .../python-modules/asgiref/default.nix        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index f1128c010957..5eea9a5579a1 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -1,27 +1,29 @@
-{ stdenv
+{ lib
+, stdenv
 , async-timeout
 , buildPythonPackage
 , fetchFromGitHub
 , pytest-asyncio
 , pytestCheckHook
 , pythonOlder
-, lib
 }:
 
 buildPythonPackage rec {
-  version = "3.3.4";
+  version = "3.4.1";
   pname = "asgiref";
 
-  disabled = pythonOlder "3.5";
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "django";
     repo = pname;
     rev = version;
-    sha256 = "1rr76252l6p12yxc0q4k9wigg1jz8nsqga9c0nixy9q77zhvh9n2";
+    sha256 = "sha256-aXD46qH5sTTmp0rlzQGLAN+MfIz1u6obCwtfqoIYgBA=";
   };
 
-  propagatedBuildInputs = [ async-timeout ];
+  propagatedBuildInputs = [
+    async-timeout
+  ];
 
   checkInputs = [
     pytestCheckHook
@@ -32,9 +34,12 @@ buildPythonPackage rec {
     "test_multiprocessing"
   ];
 
+  pythonImportsCheck = [ "asgiref" ];
+
   meta = with lib; {
     description = "Reference ASGI adapters and channel layers";
-    license = licenses.bsd3;
     homepage = "https://github.com/django/asgiref";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
   };
 }

From 6ac494fefbf8837cb5f638266fb51db077374c17 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Fri, 15 Oct 2021 23:28:13 +0200
Subject: [PATCH 047/235] systemd: add musl patches

Fixes build of pkgsMusl.systemdMinimal (and pkgsMusl.systemd if combined with
other fixes).
These patches are applied conditionally on purpose: They are not checked to
be properly guarded. They should not block future systemd upgrades.
Also see the original RFC section around musl systemd:
https://github.com/NixOS/rfcs/blob/master/rfcs/0023-musl-libc.md#systemd
---
 pkgs/os-specific/linux/systemd/default.nix | 61 ++++++++++++++++++----
 pkgs/os-specific/linux/systemd/musl.diff   | 12 +++++
 2 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/os-specific/linux/systemd/musl.diff

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 446aa73609ba..036ea991ef6a 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -4,6 +4,7 @@
 , lib
 , fetchFromGitHub
 , fetchpatch
+, fetchzip
 , buildPackages
 , ninja
 , meson
@@ -75,24 +76,24 @@
 , withHomed ? false
 , withHostnamed ? true
 , withHwdb ? true
-, withImportd ? true
+, withImportd ? !stdenv.hostPlatform.isMusl
 , withLibBPF ? false # currently fails while generating BPF objects
 , withLocaled ? true
 , withLogind ? true
 , withMachined ? true
 , withNetworkd ? true
-, withNss ? true
+, withNss ? !stdenv.hostPlatform.isMusl
 , withOomd ? false
 , withPCRE2 ? true
 , withPolkit ? true
 , withPortabled ? false
-, withRemote ? true
+, withRemote ? !stdenv.hostPlatform.isMusl
 , withResolved ? true
 , withShellCompletions ? true
 , withTimedated ? true
 , withTimesyncd ? true
-, withTpm2Tss ? true
-, withUserDb ? true
+, withTpm2Tss ? !stdenv.hostPlatform.isMusl
+, withUserDb ? !stdenv.hostPlatform.isMusl
 , libfido2
 , p11-kit
 
@@ -163,7 +164,40 @@ stdenv.mkDerivation {
     # all our root unit dirs if they are symlinks. This does exactly what we
     # need (AFAICT).
     ./0019-core-handle-lookup-paths-being-symlinks.patch
-  ];
+  ] ++ lib.optional stdenv.hostPlatform.isMusl (let
+    oe-core = fetchzip {
+      url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-14c6e5a4b72d0e4665279158a0740dd1dc21f72f.tar.bz2";
+      sha256 = "1jixya4czkr5p5rdcw3d6ips8zzr82dvnanvzvgjh67730scflya";
+    };
+    musl-patches = oe-core + "/meta/recipes-core/systemd/systemd";
+  in [
+    (musl-patches + "/0002-don-t-use-glibc-specific-qsort_r.patch")
+    (musl-patches + "/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch")
+    (musl-patches + "/0004-add-fallback-parse_printf_format-implementation.patch")
+    (musl-patches + "/0005-src-basic-missing.h-check-for-missing-strndupa.patch")
+    (musl-patches + "/0006-Include-netinet-if_ether.h.patch")
+    (musl-patches + "/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch")
+    (musl-patches + "/0008-add-missing-FTW_-macros-for-musl.patch")
+    (musl-patches + "/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch")
+    (musl-patches + "/0010-Use-uintmax_t-for-handling-rlim_t.patch")
+    (musl-patches + "/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch")
+    (musl-patches + "/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch")
+    (musl-patches + "/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch")
+    (musl-patches + "/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch")
+    (musl-patches + "/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch")
+    (musl-patches + "/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch")
+    (musl-patches + "/0017-missing_type.h-add-__compar_d_fn_t-definition.patch")
+    (musl-patches + "/0018-avoid-redefinition-of-prctl_mm_map-structure.patch")
+    (musl-patches + "/0019-Handle-missing-LOCK_EX.patch")
+    (musl-patches + "/0021-test-json.c-define-M_PIl.patch")
+    (musl-patches + "/0022-do-not-disable-buffer-in-writing-files.patch")
+    (musl-patches + "/0025-Handle-__cpu_mask-usage.patch")
+    (musl-patches + "/0026-Handle-missing-gshadow.patch")
+    (musl-patches + "/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch")
+
+    # Being discussed upstream: https://lists.openembedded.org/g/openembedded-core/topic/86411771#157056
+    ./musl.diff
+  ]);
 
   postPatch = ''
     substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/"
@@ -443,7 +477,13 @@ stdenv.mkDerivation {
     "-Dnss-systemd=false"
   ] ++ lib.optionals withLibBPF [
     "-Dbpf-framework=true"
-  ] ++ lib.optional withTpm2Tss "-Dtpm2=true";
+  ] ++ lib.optionals withTpm2Tss [
+    "-Dtpm2=true"
+  ] ++ lib.optionals stdenv.hostPlatform.isMusl [
+    "-Dgshadow=false"
+    "-Dutmp=false"
+    "-Didn=false"
+  ];
 
   preConfigure = ''
     mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
@@ -505,7 +545,7 @@ stdenv.mkDerivation {
       --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
   '';
 
-  NIX_CFLAGS_COMPILE = toString [
+  NIX_CFLAGS_COMPILE = toString ([
     # Can't say ${polkit.bin}/bin/pkttyagent here because that would
     # lead to a cyclic dependency.
     "-UPOLKIT_AGENT_BINARY_PATH"
@@ -519,7 +559,10 @@ stdenv.mkDerivation {
 
     "-USYSTEMD_BINARY_PATH"
     "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
-  ];
+
+  ] ++ lib.optionals stdenv.hostPlatform.isMusl [
+    "-D__UAPI_DEF_ETHHDR=0"
+  ]);
 
   doCheck = false; # fails a bunch of tests
 
diff --git a/pkgs/os-specific/linux/systemd/musl.diff b/pkgs/os-specific/linux/systemd/musl.diff
new file mode 100644
index 000000000000..cab135dd8fc5
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl.diff
@@ -0,0 +1,12 @@
+diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
+index ef3527e..cc1ba23 100644
+--- a/src/shared/mount-setup.c
++++ b/src/shared/mount-setup.c
+@@ -32,6 +32,7 @@
+ #include "strv.h"
+ #include "user-util.h"
+ #include "virt.h"
++#include "missing_type.h"
+ 
+ typedef enum MountMode {
+         MNT_NONE           = 0,

From d4c85edba95350453e2f3ac225823d6404a5cfe2 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Wed, 20 Oct 2021 12:57:34 +0200
Subject: [PATCH 048/235] polkit: fix musl build

Update patches and make them unconditional to prevent rot.
Also do not make systemd support dependent on musl.
---
 pkgs/development/libraries/polkit/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index a8b012a20998..83f59d2041c6 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, pkg-config, glib, expat, pam, perl, fetchpatch
 , intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus
 , docbook_xml_dtd_412, gtk-doc, coreutils
-, useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind
+, useSystemd ? stdenv.isLinux, systemd, elogind
 # needed until gobject-introspection does cross-compile (https://github.com/NixOS/nixpkgs/pull/88222)
 , withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
 # A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault).
@@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
     sha256 = "0p0zzmr0kh3mpmqya4q27y4h9b920zp5ya0i8909ahp9hvdrymy8";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isMusl [
+  patches = [
     # 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.
     (fetchpatch {
       name = "make-innetgr-optional.patch";
-      url = "https://git.alpinelinux.org/aports/plain/main/polkit/make-innetgr-optional.patch?id=391e7de6ced1a96c2dac812e0b12f1d7e0ea705e";
-      sha256 = "1p9qqqhnrfyjvvd50qh6vpl256kyfblm1qnhz5pm09klrl1bh1n4";
+      url = "https://git.alpinelinux.org/aports/plain/community/polkit/make-innetgr-optional.patch?id=424ecbb6e9e3a215c978b58c05e5c112d88dddfc";
+      sha256 = "0iyiksqk29sizwaa4623bv683px1fny67639qpb1him89hza00wy";
     })
   ];
 

From 61bbda6c1ea3502c6b6e49f2795776c289dd4d8e Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Wed, 20 Oct 2021 14:48:46 +0200
Subject: [PATCH 049/235] gperftools: 2.8.1 -> 2.9.1

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

diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index bdb4e67f85fe..0ed2dea0c4c0 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gperftools";
-  version = "2.8.1";
+  version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "19bj2vlsbfwq7m826v2ccqg47kd7cb5vcz1yw2x0v5qzhaxbakk1";
+    sha256 = "sha256-loUlC6mtR3oyS5opSmicCnfUqcefSk8+kKDcHNmC/oo=";
   };
 
   patches = [

From 1bd288093e13d2239a45d596aefbff3bf09c8938 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Oct 2021 05:55:11 -0700
Subject: [PATCH 050/235] vim: 8.2.3337 -> 8.2.3451 (#138870)

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

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 89d49f5e6285..e068f7df50b4 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.2.3337";
+  version = "8.2.3451";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "sha256-iwSGcLeqXH0bVIXEI5OnotG88Uv8ntycisD9EcHjz/c=";
+    sha256 = "sha256-8OaEaFyOaL59j0EZkUY+kuR6si79H2dN09f8SnltxbQ=";
   };
 
   enableParallelBuilding = true;

From bc015c698a9e183dbe65c8427588267891d9a313 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 20 Oct 2021 17:30:14 +0100
Subject: [PATCH 051/235] portaudio: explicitly disable parallel building

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

diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 9a43d5a921e5..b0ab32c9e392 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -29,6 +29,13 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
 
+  # Disable parallel build as it fails as:
+  #   make: *** No rule to make target '../../../lib/libportaudio.la',
+  #     needed by 'libportaudiocpp.la'.  Stop.
+  # Next release should address it with
+  #     https://github.com/PortAudio/portaudio/commit/28d2781d9216115543aa3f0a0ffb7b4ee0fac551.patch
+  enableParallelBuilding = false;
+
   # not sure why, but all the headers seem to be installed by the make install
   installPhase = ''
     make install

From 0a33f548c8cb1d5d1a40710427576df5576ddaf8 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 20 Oct 2021 17:36:37 +0100
Subject: [PATCH 052/235] libomxil-bellagio: explicitly disable parallel
 building

---
 pkgs/development/libraries/libomxil-bellagio/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix
index 22a6de9fd956..e49473b79ede 100644
--- a/pkgs/development/libraries/libomxil-bellagio/default.nix
+++ b/pkgs/development/libraries/libomxil-bellagio/default.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
     ./fno-common.patch
   ];
 
+  # Disable parallel build as it fails as:
+  #    ld: cannot find -lomxil-bellagio
+  enableParallelBuilding = false;
+
   doCheck = false; # fails
 
   # Fix for #40213, probably permanent, because upstream doesn't seem to be

From 12e8c5898745c1a81b4420b60978c9b693d1ae42 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 21 Oct 2021 09:39:53 +0300
Subject: [PATCH 053/235] file: 5.40 -> 5.41

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

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 2c1e634023b6..cfe305632596 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,29 +1,21 @@
-{ lib, stdenv, fetchurl, file, zlib, libgnurx, fetchpatch }:
+{ lib, stdenv, fetchurl, file, zlib, libgnurx }:
 
 stdenv.mkDerivation rec {
   pname = "file";
-  version = "5.40";
+  version = "5.41";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz"
       "https://distfiles.macports.org/file/${pname}-${version}.tar.gz"
     ];
-    sha256 = "0myxlpj9gy2diqavx33vq88kpvr1k1bpzsm0d0zmb2hl7ks22wqn";
+    sha256 = "sha256-E+Uyx7Nk99V+I9/uoxRxAxUMuQWTpXr4bBDk9uQRYD8=";
   };
 
   nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
   buildInputs = [ zlib ]
     ++ lib.optional stdenv.hostPlatform.isWindows libgnurx;
 
-  patches = [
-    # Fix the mime type detection of xz file. Is merged in master.
-    (fetchpatch {
-      url = "https://github.com/file/file/commit/9b0459afab309a82aa4e46f73a4e50dd641f3d39.patch";
-      sha256 = "sha256-6vjyIn5gVbgmhUlfXJKFRVltm8YKATKmh0/X6+2lLnM=";
-    })
-  ];
-
   doCheck = true;
 
   makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file";

From 6594da569b741ebce4598177050cbcf9f6aacd7c Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Thu, 21 Oct 2021 21:54:50 +0200
Subject: [PATCH 054/235] rustc: 1.55.0 -> 1.56.0

---
 pkgs/development/compilers/rust/1_55.nix | 60 ------------------------
 pkgs/development/compilers/rust/1_56.nix | 60 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          | 10 ++--
 3 files changed, 65 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/development/compilers/rust/1_55.nix
 create mode 100644 pkgs/development/compilers/rust/1_56.nix

diff --git a/pkgs/development/compilers/rust/1_55.nix b/pkgs/development/compilers/rust/1_55.nix
deleted file mode 100644
index edd1f538e398..000000000000
--- a/pkgs/development/compilers/rust/1_55.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-# New rust versions should first go to staging.
-# Things to check after updating:
-# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
-#    i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
-#    This testing can be also done by other volunteers as part of the pull
-#    request review, in case platforms cannot be covered.
-# 2. The LLVM version used for building should match with rust upstream.
-#    Check the version number in the src/llvm-project git submodule in:
-#    https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
-# 3. Firefox and Thunderbird should still build on x86_64-linux.
-
-{ stdenv, lib
-, buildPackages
-, newScope, callPackage
-, CoreFoundation, Security, SystemConfiguration
-, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
-, makeRustPlatform
-, llvmPackages_11
-, llvmPackages_12, llvm_12
-} @ args:
-
-import ./default.nix {
-  rustcVersion = "1.55.0";
-  rustcSha256 = "07l28f7grdmi65naq71pbmvdd61hwcpi40ry7kp7dy7m233rldxj";
-
-  llvmSharedForBuild = pkgsBuildBuild.llvmPackages_12.libllvm.override { enableSharedLibraries = true; };
-  llvmSharedForHost = pkgsBuildHost.llvmPackages_12.libllvm.override { enableSharedLibraries = true; };
-  llvmSharedForTarget = pkgsBuildTarget.llvmPackages_12.libllvm.override { enableSharedLibraries = true; };
-
-  llvmBootstrapForDarwin = llvmPackages_11;
-
-  # For use at runtime
-  llvmShared = llvm_12.override { enableSharedLibraries = true; };
-
-  # Note: the version MUST be one version prior to the version we're
-  # building
-  bootstrapVersion = "1.54.0";
-
-  # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
-  bootstrapHashes = {
-    i686-unknown-linux-gnu = "1cd06090463711d50d98374ef52c1a84b9f4e3e35febaaef4890fb10536ceb3a";
-    x86_64-unknown-linux-gnu = "350354495b1d4b6dd2ec7cf96aa9bc61d031951cf667a31e8cf401dc508639e6";
-    x86_64-unknown-linux-musl = "3571db0018fcd32f3b579a32b2301826dbd1cce44b373aed8e8a31c2a6f52fe8";
-    arm-unknown-linux-gnueabihf = "77f4e4c2195f75466c6de0b1d8fd7fb8cef3d12666e3aae777dcfd0d71d080ca";
-    armv7-unknown-linux-gnueabihf = "dd01ccb6a53d5e895a6755a78c213ae601a347366688941d5c543b5af5835d6d";
-    aarch64-unknown-linux-gnu = "33a50c5366a57aaab43c1c19e4a49ab7d8ffcd99a72925c315fb1f9389139e6f";
-    aarch64-unknown-linux-musl = "49d94116a357ea13f5a3231de2472f59210028c3cf81f158b8a367c3155ac544";
-    x86_64-apple-darwin = "5eb27a4f5f7a4699bc70cf1848e340ddd74e151488bfcb26853fd584958e3d33";
-    aarch64-apple-darwin = "801b3b15b992b0321261de8b8ea2728e9a74822c6cb99bf978b34e217c7825ba";
-    powerpc64le-unknown-linux-gnu = "67cadf7ac5bd2e3d5fb4baede69846059f17c4e099f771329b266d08b875ed71";
-    riscv64gc-unknown-linux-gnu = "6113a6cce3500033d0dc0d170b54c5f22562ef3025fd58d804c822a2499c74d7";
-  };
-
-  selectRustPackage = pkgs: pkgs.rust_1_55;
-
-  rustcPatches = [
-  ];
-}
-
-(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_12" "llvm_12"])
diff --git a/pkgs/development/compilers/rust/1_56.nix b/pkgs/development/compilers/rust/1_56.nix
new file mode 100644
index 000000000000..a3ff30618e83
--- /dev/null
+++ b/pkgs/development/compilers/rust/1_56.nix
@@ -0,0 +1,60 @@
+# New rust versions should first go to staging.
+# Things to check after updating:
+# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
+#    i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
+#    This testing can be also done by other volunteers as part of the pull
+#    request review, in case platforms cannot be covered.
+# 2. The LLVM version used for building should match with rust upstream.
+#    Check the version number in the src/llvm-project git submodule in:
+#    https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
+# 3. Firefox and Thunderbird should still build on x86_64-linux.
+
+{ stdenv, lib
+, buildPackages
+, newScope, callPackage
+, CoreFoundation, Security, SystemConfiguration
+, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
+, makeRustPlatform
+, llvmPackages_11
+, llvmPackages_13, llvm_13
+} @ args:
+
+import ./default.nix {
+  rustcVersion = "1.56.0";
+  rustcSha256 = "0gzl5mzh9zm1ld6gkvlp0118d3qx4vw4n3wfq40k1swdd4nxf3yd";
+
+  llvmSharedForBuild = pkgsBuildBuild.llvmPackages_13.libllvm.override { enableSharedLibraries = true; };
+  llvmSharedForHost = pkgsBuildHost.llvmPackages_13.libllvm.override { enableSharedLibraries = true; };
+  llvmSharedForTarget = pkgsBuildTarget.llvmPackages_13.libllvm.override { enableSharedLibraries = true; };
+
+  llvmBootstrapForDarwin = llvmPackages_11;
+
+  # For use at runtime
+  llvmShared = llvm_13.override { enableSharedLibraries = true; };
+
+  # Note: the version MUST be one version prior to the version we're
+  # building
+  bootstrapVersion = "1.55.0";
+
+  # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
+  bootstrapHashes = {
+    i686-unknown-linux-gnu = "6e42b6c44d2eb4170f4144423fa3c33338d8d5c3ea00b03bbac200c877bc9e98";
+    x86_64-unknown-linux-gnu = "2080253a2ec36ac8ed6e060d30802d888533124b8d16545cfd4af898b365eaac";
+    x86_64-unknown-linux-musl = "f24f68587253c4bfbe59d3d10fe4897068d9130538de6b2d02097a25718030c2";
+    arm-unknown-linux-gnueabihf = "483444153d35cda51c6aec2c24bc4c97fa4fd30b28df4b60bf9763bd6e06da3a";
+    armv7-unknown-linux-gnueabihf = "8c72f0eb75b10db970fb546c3b41f5e97df294d5dbbf0b8fa96e17f2b281ee9c";
+    aarch64-unknown-linux-gnu = "eebdb2e659ed14884a49f0457d44e5e8c9f89fca3414533752c6dbb96232c156";
+    aarch64-unknown-linux-musl = "2ce36a7d34f1f2aa43b4cbc0b437d96eefb45743828bf9ae699ff581ae257f28";
+    x86_64-apple-darwin = "2e345ac7724c192c9487a2c6bd4f6c52c884d791981510288830d27d9a0bf2f3";
+    aarch64-apple-darwin = "70c71d30d0de76912fcd88d503a6cb4323cfe6250c1a255be7e0d4e644b3d40a";
+    powerpc64le-unknown-linux-gnu = "12bf6447d338cbe2b55539b84e6369b17e7eefe938d1ba7e3dd69781c9cc9812";
+    riscv64gc-unknown-linux-gnu = "effceb45346fef3b0b54b357336e6f374f788b803bb1bee4084f25eace8907f3";
+  };
+
+  selectRustPackage = pkgs: pkgs.rust_1_56;
+
+  rustcPatches = [
+  ];
+}
+
+(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_13" "llvm_13"])
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0dbf7db8cece..28ba311369c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12578,19 +12578,19 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
     llvm_10 = llvmPackages_10.libllvm;
   };
-  rust_1_55 = callPackage ../development/compilers/rust/1_55.nix {
+  rust_1_56 = callPackage ../development/compilers/rust/1_56.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
-    llvm_12 = llvmPackages_12.libllvm;
+    llvm_13 = llvmPackages_13.libllvm;
   };
-  rust = rust_1_55;
+  rust = rust_1_56;
 
   mrustc = callPackage ../development/compilers/mrustc { };
   mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
   mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
 
   rustPackages_1_45 = rust_1_45.packages.stable;
-  rustPackages_1_55 = rust_1_55.packages.stable;
-  rustPackages = rustPackages_1_55;
+  rustPackages_1_56 = rust_1_56.packages.stable;
+  rustPackages = rustPackages_1_56;
 
   inherit (rustPackages) cargo clippy rustc rustPlatform;
 

From 5cae5261e475c505eb5816f0aed326b2ec9b7484 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 22 Oct 2021 09:41:20 +0100
Subject: [PATCH 055/235] adns: explicitly disable parallel building

Fixing parallelism needs to get cross-header dependency right:
  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51329

Let's disable parallelism on this package until upstream comes up
with a fix.
---
 pkgs/development/libraries/adns/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
index 5f29e0411284..4b929cdb7f0f 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
   preConfigure =
     lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure";
 
+  # Autogenerated headers miss interdependencies in Makefile, fail parallel build:
+  #  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51329
+  enableParallelBuilding = false;
+
   # https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details.
   doCheck = false;
 

From 10ead2681239192330bce32330debe1f75c43c44 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 22 Oct 2021 10:41:40 +0100
Subject: [PATCH 056/235] cdparanoiaIII: disable parallel building

Manually written makefile relies on inplace re-execution to build
shared and static libraries. Then built in parallel it occasionally
causes build failures when partially overwritten file gets used by
linker.

Let's disable parallel builds.
---
 pkgs/applications/audio/cdparanoia/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index 36686655f369..10ff66de77ed 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -35,6 +35,15 @@ stdenv.mkDerivation rec {
     cp ${gnu-config}/config.guess configure.guess
   '';
 
+  # Build system reuses the same object file names for shared and static
+  # library. Occasionally fails in the middle:
+  #    gcc -O2 -fsigned-char -g -O2 -c scan_devices.c
+  #    rm  -f *.o core *~ *.out
+  #    gcc -O2 -fsigned-char -g -O2 -fpic -c scan_devices.c
+  #    gcc -fpic -shared -o libcdda_interface.so.0.10.2 ... scan_devices.o ...
+  #    scan_devices.o: file not recognized: file format not recognized
+  enableParallelBuilding = false;
+
   meta = with lib; {
     homepage = "https://xiph.org/paranoia";
     description = "A tool and library for reading digital audio from CDs";

From 622c2826d14e65d3f9d9885b1bf73f9c94f76626 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 22 Oct 2021 11:41:44 +0100
Subject: [PATCH 057/235] pth: disable parallel building

Manually written makefile relies on correct dependencies specificed
explicitly in the Makefile. Unfortunately they at least lack dependency
on common pre-generated 'pth_p.h' file.

Let's disable parallel build explicitly.
---
 pkgs/development/libraries/pth/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix
index 240c903a8a77..16235176d038 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/pkgs/development/libraries/pth/default.nix
@@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
     configureFlagsArray+=("ac_cv_check_sjlj=ssjlj")
   '';
 
+  # Fails parallel build due to missing dependency on autogenrated
+  # 'pth_p.h' file:
+  #     ./shtool scpp -o pth_p.h ...
+  #     ./libtool --mode=compile --quiet gcc -c -I. -O2 -pipe pth_uctx.c
+  #     pth_uctx.c:31:10: fatal error: pth_p.h: No such file
+  enableParallelBuilding = false;
+
   meta = with lib; {
     description = "The GNU Portable Threads library";
     homepage = "https://www.gnu.org/software/pth";

From 4b6d38e408f73877bc75bf579d1df4ee96dfb3be Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Fri, 22 Oct 2021 18:24:17 -0700
Subject: [PATCH 058/235] python3Packages.watchdog: remove argh dependency

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

diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index c68fc2980cee..de277749a6e7 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -2,7 +2,6 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
-, argh
 , pathtools
 , pyyaml
 , flaky
@@ -23,7 +22,6 @@ buildPythonPackage rec {
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 
   propagatedBuildInputs = [
-    argh
     pathtools
     pyyaml
   ];

From 3f0cbd266c7796fdd003b949664b553d600925cd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 23 Oct 2021 04:20:00 +0000
Subject: [PATCH 059/235] libvpx: 1.10.0 -> 1.11.0

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

diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index d538aa41bff3..9f916e283299 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -56,13 +56,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
 
 stdenv.mkDerivation rec {
   pname = "libvpx";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "webmproject";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-EZP33U10fchyqy7Jr26vHgUUfWR6xtG3fcMWUII0m9w=";
+    sha256 = "00f1jrclai2b6ys78dpsg6r1mvcyxlna93vxcz8zjyia24c2pjsb";
   };
 
   postPatch = ''
@@ -180,6 +180,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "WebM VP8/VP9 codec SDK";
     homepage    = "https://www.webmproject.org/";
+    changelog   = "https://github.com/webmproject/libvpx/raw/v${version}/CHANGELOG";
     license     = licenses.bsd3;
     maintainers = with maintainers; [ codyopel ];
     platforms   = platforms.all;

From 956e2c24755d7449fc106889c765a943bd3f50bc Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 23 Oct 2021 10:24:58 +0300
Subject: [PATCH 060/235] file: Add @doronbehar as maintainer

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

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index cfe305632596..f2f66beffea2 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://darwinsys.com/file";
     description = "A program that shows the type of files";
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ doronbehar ];
     license = licenses.bsd2;
     platforms = platforms.all;
   };

From 281f0f457602b4087cf38d8c3ff15728919fb10f Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 20 Oct 2021 23:09:30 +0100
Subject: [PATCH 061/235] ruby_2_7, ruby_3_0: use latest bison, not outdated
 bison_3_5

Upstream ported to latest bison starting frun ruby-2.7.
While at it use latest autoconf-2.70 as well.
---
 pkgs/top-level/all-packages.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc6fa973a14f..29f38e5448ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13503,8 +13503,6 @@ with pkgs;
   inherit (callPackage ../development/interpreters/ruby {
     inherit (darwin) libiconv libobjc libunwind;
     inherit (darwin.apple_sdk.frameworks) Foundation;
-    autoreconfHook = buildPackages.autoreconfHook269;
-    bison = buildPackages.bison_3_5;
   })
     ruby_2_7
     ruby_3_0;
@@ -13950,15 +13948,6 @@ with pkgs;
 
   bison = callPackage ../development/tools/parsing/bison { };
 
-  # Ruby fails to build with current bison
-  bison_3_5 = bison.overrideAttrs (oldAttrs: rec {
-    version = "3.5.4";
-    src = fetchurl {
-      url = "mirror://gnu/${oldAttrs.pname}/${oldAttrs.pname}-${version}.tar.gz";
-      sha256 = "0a2cbrqh7mgx2dwf5qm10v68iakv1i0dqh9di4x5aqxsz96ibpf0";
-    };
-  });
-
   bisoncpp = callPackage ../development/tools/parsing/bisonc++ { };
 
   black = with python3Packages; toPythonApplication black;

From df206b3f00d7a9c2094c084e8ace6d9816130dfb Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 23 Oct 2021 10:07:38 +0100
Subject: [PATCH 062/235] directfb: explicitly disable parallel building

Disable parallel building as parallel builds fail due to incomplete
depends between autogenerated CoreSlave.h and it's include sites:

```
   CC       prealloc_surface_pool_bridge.lo
   prealloc_surface_pool_bridge.c:41:10:
       fatal error: core/CoreSlave.h: No such file or directory
```

Dependencies are specified manually in src/core/Makefile.am. Instead
of fixing them one by one locally let's disable parallel builds until
upstream fixes them.
---
 pkgs/development/libraries/directfb/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix
index 1b0b50d28f00..0a06881b5806 100644
--- a/pkgs/development/libraries/directfb/default.nix
+++ b/pkgs/development/libraries/directfb/default.nix
@@ -48,6 +48,17 @@ stdenv.mkDerivation rec {
     "--with-smooth-scaling"
   ] ++ lib.optional enableX11 "--enable-x11";
 
+  # Disable parallel building as parallel builds fail due to incomplete
+  # depends between autogenerated CoreSlave.h and it's include sites:
+  #    CC       prealloc_surface_pool_bridge.lo
+  #    prealloc_surface_pool_bridge.c:41:10:
+  #        fatal error: core/CoreSlave.h: No such file or directory
+  #
+  # Dependencies are specified manually in src/core/Makefile.am. Instead
+  # of fixing them one by one locally let's disable parallel builds until
+  # upstream fixes them.
+  enableParallelBuilding = false;
+
   meta = with lib; {
     description = "Graphics and input library designed with embedded systems in mind";
     longDescription = ''

From 8daecb33b9061ae6a51daac7adaea4ffecc916c9 Mon Sep 17 00:00:00 2001
From: Yuka <yuka@yuka.dev>
Date: Sat, 23 Oct 2021 13:32:39 +0200
Subject: [PATCH 063/235] mesa: update musl patches (#141970)

Also remove a patch that was upstreamed
---
 pkgs/development/libraries/mesa/default.nix   | 22 ++++++++++++-------
 .../libraries/mesa/missing-includes.patch     | 22 -------------------
 2 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/libraries/mesa/missing-includes.patch

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index eb4c3ee89570..83deac7e247b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -54,16 +54,22 @@ self = stdenv.mkDerivation {
   #  revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved
   #  ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog
   patches = [
-    ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
+    # fixes pkgsMusl.mesa build
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/void-linux/void-packages/b9f58f303ae23754c95d5d1fe87a98b5a2d8f271/srcpkgs/mesa/patches/musl.patch";
+      sha256 = "sha256-Jyl7ILLhn8hBJG7afnEjE8H56Wz/1bxkvlqfrXK5U7I=";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/void-linux/void-packages/b9f58f303ae23754c95d5d1fe87a98b5a2d8f271/srcpkgs/mesa/patches/musl-endian.patch";
+      sha256 = "sha256-eRc91qCaFlVzrxFrNUPpAHd1gsqKsLCCN0IW8pBQcqk=";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/void-linux/void-packages/b9f58f303ae23754c95d5d1fe87a98b5a2d8f271/srcpkgs/mesa/patches/musl-stacksize.patch";
+      sha256 = "sha256-bEp0AWddsw1Pc3rxdKN8fsrX4x2TQEzMUa5afhLXGsg=";
+    })
+
     ./opencl.patch
     ./disk_cache-include-dri-driver-path-in-cache-key.patch
-    # Fix `-Werror=int-conversion` pthread warnings on musl.
-    # TODO: Remove when https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 is merged and available
-    (fetchpatch {
-      name = "nine_debug-Make-tid-more-type-correct";
-      url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch";
-      sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q";
-    })
   ] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [
     # Fix aarch64-darwin build, remove when upstreaam supports it out of the box.
     # See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020
diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch
deleted file mode 100644
index c17d54908553..000000000000
--- a/pkgs/development/libraries/mesa/missing-includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
-+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
-@@ -34,7 +34,7 @@
- #ifndef VMW_SCREEN_H_
- #define VMW_SCREEN_H_
- 
--
-+#include <sys/stat.h>
- #include "pipe/p_compiler.h"
- #include "pipe/p_state.h"
- 
---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-@@ -28,6 +28,8 @@
- #ifndef RADV_AMDGPU_WINSYS_H
- #define RADV_AMDGPU_WINSYS_H
-
-+#include <sys/types.h>
-+
- #include <amdgpu.h>
- #include <pthread.h>
- #include "util/list.h"

From 88bdfc3b6cdd489abf480880aa01d71b6965a53c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 10 Oct 2021 20:43:02 +0100
Subject: [PATCH 064/235] bison: 3.7.6 -> 3.8.2

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

diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index 1de45b08447b..7aa90d626fff 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bison";
-  version = "3.7.6";
+  version = "3.8.2";
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-adwLtG6o/DB9TKHgthyMNV6yB9Cwxp9PhGIyjnTXueo=";
+    sha256 = "sha256-BsnhO99+sk1M62tZIFpPZ8LH5yExGWREMP6C+9FKCrs=";
   };
 
   nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man;

From faf06a88de74364d4544e1ae8adbc5a31b51e4fe Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 10 Oct 2021 21:12:42 +0100
Subject: [PATCH 065/235] bison: enable tests, enable parallelism

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

diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index 7aa90d626fff..58e86331508e 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man;
   propagatedBuildInputs = [ m4 ];
 
-  doCheck = false; # fails
-  doInstallCheck = false; # fails
+  enableParallelBuilding = true;
+
+  doCheck = true;
+  doInstallCheck = true;
 
   meta = {
     homepage = "https://www.gnu.org/software/bison/";

From 10ac0a893783e2c1a100e68ae96a1fb8d349cd33 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 17 Oct 2021 14:48:19 +0100
Subject: [PATCH 066/235] pkgsMusl.bison: fix tests by adding iconv workaround
 for musl

gnulib relies on --host= to check if iconv() on the platform
might convert unsupported symbols to '*'. Noticed as failed tests.
---
 pkgs/development/tools/parsing/bison/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index 58e86331508e..3d2daba239a3 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-BsnhO99+sk1M62tZIFpPZ8LH5yExGWREMP6C+9FKCrs=";
   };
 
+  # gnulib relies on --host= to detect iconv() features on musl().
+  # Otherwise tests fail due to incorrect unicode symbol oconversion.
+  configurePlatforms = [ "build" "host" ];
+
   nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man;
   propagatedBuildInputs = [ m4 ];
 

From e8abd9cc1636f77173b3abdaf18543f3dfbcc052 Mon Sep 17 00:00:00 2001
From: Ivan Babrou <github@ivan.computer>
Date: Sat, 23 Oct 2021 11:45:33 -0700
Subject: [PATCH 067/235] gcc11: 11.1.0 -> 11.2.0

The cyclades patch has been applied upstream:

* https://github.com/gcc-mirror/gcc/commit/2bf34b9f4e4
---
 pkgs/development/compilers/gcc/11/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix
index 850b267441fd..f71f941540c4 100644
--- a/pkgs/development/compilers/gcc/11/default.nix
+++ b/pkgs/development/compilers/gcc/11/default.nix
@@ -57,7 +57,7 @@ with lib;
 with builtins;
 
 let majorVersion = "11";
-    version = "${majorVersion}.1.0";
+    version = "${majorVersion}.2.0";
 
     inherit (stdenv) buildPlatform hostPlatform targetPlatform;
 
@@ -78,9 +78,7 @@ let majorVersion = "11";
       })
 
       # Obtain latest patch with ../update-mcfgthread-patches.sh
-      ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch
-
-      ++ [ ../libsanitizer-no-cyclades.patch ];
+      ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch;
 
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
@@ -97,7 +95,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
-    sha256 = "1pwxrjhsymv90xzh0x42cxfnmhjinf2lnrrf3hj5jq1rm2w6yjjc";
+    sha256 = "sha256-0I7cU2tUw3KhAQ/2YZ3SdMDxYDqkkhK6IPeqLNo2+os=";
   };
 
   inherit patches;

From 0ac3f8a36cd2c57b67b4fca3a23adbf276c5b548 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 13 Oct 2021 07:52:48 +0100
Subject: [PATCH 068/235] plasma5Packages.sonnet: fix determinism (pull
 upstream patch)

---
 pkgs/development/libraries/kde-frameworks/sonnet.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix
index 2eff7bad2402..8647c8e0712c 100644
--- a/pkgs/development/libraries/kde-frameworks/sonnet.nix
+++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix
@@ -1,10 +1,18 @@
 { mkDerivation
+, fetchpatch
 , extra-cmake-modules
 , aspell, qtbase, qttools
 }:
 
 mkDerivation {
   name = "sonnet";
+  patches = [
+    # Pull upstream path to fix determinism.
+    (fetchpatch {
+      url = "https://invent.kde.org/frameworks/sonnet/-/commit/a01fc66b8affb01221d1fdf84146a78c172d4c6b.patch";
+      sha256 = "1jzd65rmgvfpcxrsnsmdz8ac1ldqs9rjfryy8fryy0ibzbhc1050";
+    })
+  ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ aspell qttools ];
   propagatedBuildInputs = [ qtbase ];

From 9fb1f66d3080309eccdbb8cd85b992ae45f044a1 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Fri, 8 Oct 2021 23:38:52 -0700
Subject: [PATCH 069/235] validatePkgConfig: fix cross-compilation

Fixes cross-compilation for duktape and pugixml
---
 pkgs/build-support/setup-hooks/validate-pkg-config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/validate-pkg-config.sh b/pkgs/build-support/setup-hooks/validate-pkg-config.sh
index ada1b56760d6..c212a1f5301a 100644
--- a/pkgs/build-support/setup-hooks/validate-pkg-config.sh
+++ b/pkgs/build-support/setup-hooks/validate-pkg-config.sh
@@ -7,7 +7,7 @@ _validatePkgConfig() {
     for pc in $(find "$prefix" -name '*.pc'); do
         # Do not fail immediately. It's nice to see all errors when
         # there are multiple pkgconfig files.
-        if ! pkg-config --validate "$pc"; then
+        if ! $PKG_CONFIG --validate "$pc"; then
             bail=1
         fi
     done

From 8cc5bdf807d63a0aadeabca17e4a449a2dbab60b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 20 Oct 2021 15:59:17 +0000
Subject: [PATCH 070/235] =?UTF-8?q?json-glib:=201.6.2=20=E2=86=92=201.6.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/json-glib/default.nix           | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 9ef66fd2ce69..e041908f3f48 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -9,22 +9,20 @@
 , withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
 , gobject-introspection
 , fixDarwinDylibNames
-, gtk-doc
-, docbook-xsl-nons
-, docbook_xml_dtd_43
+, gi-docgen
 , gnome
 }:
 
 stdenv.mkDerivation rec {
   pname = "json-glib";
-  version = "1.6.2";
+  version = "1.6.6";
 
   outputs = [ "out" "dev" ]
     ++ lib.optional withIntrospection "devdoc";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3";
+    sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4=";
   };
 
   strictDeps = true;
@@ -39,13 +37,11 @@ stdenv.mkDerivation rec {
     pkg-config
     gettext
     glib
-    docbook-xsl-nons
-    docbook_xml_dtd_43
   ] ++ lib.optional stdenv.hostPlatform.isDarwin [
     fixDarwinDylibNames
   ] ++ lib.optionals withIntrospection [
     gobject-introspection
-    gtk-doc
+    gi-docgen
   ];
 
   propagatedBuildInputs = [
@@ -54,12 +50,23 @@ stdenv.mkDerivation rec {
 
   mesonFlags = lib.optionals (!withIntrospection) [
     "-Dintrospection=disabled"
-    # doc gen uses introspection, doesn't work properly
+    # gi-docgen relies on introspection data
     "-Dgtk_doc=disabled"
   ];
 
   doCheck = true;
 
+  postFixup = ''
+    # Move developer documentation to devdoc output.
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    if [[ -d "$out/share/doc" ]]; then
+        find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \
+          | while IFS= read -r -d ''' file; do
+            moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc"
+        done
+    fi
+  '';
+
   passthru = {
     updateScript = gnome.updateScript {
       packageName = pname;

From 77c8341cdce5db14546729097f2bdb01216ebdb6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 20 Oct 2021 15:59:45 +0000
Subject: [PATCH 071/235] =?UTF-8?q?librsvg:=202.52.0=20=E2=86=92=202.52.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 03bd2eb96bc6..7cfa4a499f5a 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.52.0";
+  version = "2.52.2";
 
   outputs = [ "out" "dev" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "14zkdd7a9mymnfs3laqj0gr69c16nwixvbc5a4gvd534w6riz0mx";
+    sha256 = "A9KIfBj/uQbhpg+X/kanFp9pqijW210oV0jzYYsJNCc=";
   };
 
   nativeBuildInputs = [

From d2f5694571887d347eeab6a28e45cb636a246b65 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 20 Oct 2021 15:59:56 +0000
Subject: [PATCH 072/235] =?UTF-8?q?networkmanager:=201.32.10=20=E2=86=92?=
 =?UTF-8?q?=201.32.12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix
index 8a1a6dd8fa1b..3913cb0520b7 100644
--- a/pkgs/tools/networking/networkmanager/default.nix
+++ b/pkgs/tools/networking/networkmanager/default.nix
@@ -54,11 +54,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "networkmanager";
-  version = "1.32.10";
+  version = "1.32.12";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
-    sha256 = "sha256-PlzMZoBWWePxGnGOOlmflya3mgHW/xSBS+ati8Xai7g=";
+    sha256 = "sha256-qKs2oKUC/nPNjjustlhfl/u5Tr73nids268Rwz/49Us=";
   };
 
   outputs = [ "out" "dev" "devdoc" "man" "doc" ];

From be480f08dee8156ca1e99290be6b0696d049f0c6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 20 Oct 2021 16:00:13 +0000
Subject: [PATCH 073/235] =?UTF-8?q?vala:=200.54.1=20=E2=86=92=200.54.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index ba64e53876cb..8390ab0ae57e 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -134,8 +134,8 @@ in rec {
   };
 
   vala_0_54 = generic {
-    version = "0.54.1";
-    sha256 = "0jlhd6hr9mai7hhc2c78w6zmnzf7xncp7fhyiavkqqzhhsn7gpjx";
+    version = "0.54.2";
+    sha256 = "iE3nRTF9TVbk6M7emT3I8E1Qz8o2z2DS8vJ4wwwrExE=";
   };
 
   vala = vala_0_54;

From e388e5a012c26d90514381b99b31e9848df29560 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 20 Oct 2021 16:00:17 +0000
Subject: [PATCH 074/235] =?UTF-8?q?vala=5F0=5F52:=200.52.5=20=E2=86=92=200?=
 =?UTF-8?q?.52.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 8390ab0ae57e..ba9abc0def1d 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -129,8 +129,8 @@ in rec {
   };
 
   vala_0_52 = generic {
-    version = "0.52.5";
-    sha256 = "sha256-hKG7MSs+Xcrkt7JcRVmNN14stpIzzvtZoV0jUMdr3ZE=";
+    version = "0.52.6";
+    sha256 = "sha256-FNfrTZZLfDrcFuRTcTIIbdxmJO0eDruBEeKsgierOnI=";
   };
 
   vala_0_54 = generic {

From 483b98331b4ec5556bc1fc1014788e9458a12aa1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 24 Oct 2021 12:11:23 +0100
Subject: [PATCH 075/235] python3Packages.python_magic: pull upstream fix for
 file-5.41

Fixes build failure of form:

    $ nix build -f. python3Packages.python_magic
    ...
    python3.9-python-magic> FAIL: test_mime_types (__main__.MagicTest)
    ...
    python3.9-python-magic> AssertionError: 'application/x-bytecode.python' not found in ('application/octet-stream', 'text/x-bytecode.python')
---
 pkgs/development/python-modules/python-magic/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix
index 02f1cc691522..d8a0f638d968 100644
--- a/pkgs/development/python-modules/python-magic/default.nix
+++ b/pkgs/development/python-modules/python-magic/default.nix
@@ -3,6 +3,7 @@
 , python
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , substituteAll
 , file
 , glibcLocales
@@ -20,6 +21,13 @@ buildPythonPackage rec {
   };
 
   patches = [
+    # pull upstream patch to support file-5.41
+    (fetchpatch {
+      name = "file-5.41-compat.patch";
+      url = "https://github.com/ahupp/python-magic/commit/0ae7e7ceac0e80e03adc75c858bb378c0427331a.patch";
+      sha256 = "0vclaamb56nza1mcy88wjbkh81hnish2gzvl8visa2cknhgdmk50";
+    })
+
     (substituteAll {
       src = ./libmagic-path.patch;
       libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}";

From b42767202a04410f959957bc18f4d2313dcc1ee1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 24 Oct 2021 12:50:56 +0100
Subject: [PATCH 076/235] openjdk: expliictly mark as 'enableParallelBuilding =
 false;'

Note: this change does not make build sequential. Build system still
uses it's way to parallelize the build.

The only effect of this change is not to pass unsupported -j option
to Makefile when nixpkgs default will be switched to

    enableParallelBuilding = true;
---
 pkgs/development/compilers/openjdk/11.nix | 6 ++++++
 pkgs/development/compilers/openjdk/12.nix | 6 ++++++
 pkgs/development/compilers/openjdk/13.nix | 6 ++++++
 pkgs/development/compilers/openjdk/14.nix | 6 ++++++
 pkgs/development/compilers/openjdk/15.nix | 6 ++++++
 pkgs/development/compilers/openjdk/16.nix | 6 ++++++
 pkgs/development/compilers/openjdk/17.nix | 6 ++++++
 pkgs/development/compilers/openjdk/8.nix  | 6 ++++++
 8 files changed, 48 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 0f19b19b6049..6f4b78286d63 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -74,6 +74,12 @@ let
       "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
     ]);
 
+    # -j flag is explicitly rejected by the build system:
+    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
+    # Note: it does not make build sequential. Build system
+    # still runs in parallel.
+    enableParallelBuilding = false;
+
     buildFlags = [ "all" ];
 
     installPhase = ''
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
index 3bbe12477388..8f2b6d405462 100644
--- a/pkgs/development/compilers/openjdk/12.nix
+++ b/pkgs/development/compilers/openjdk/12.nix
@@ -83,6 +83,12 @@ let
       "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
     ];
 
+    # -j flag is explicitly rejected by the build system:
+    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
+    # Note: it does not make build sequential. Build system
+    # still runs in parallel.
+    enableParallelBuilding = false;
+
     buildFlags = [ "all" ];
 
     installPhase = ''
diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix
index ed79ceafc55e..7fb1c35cf9f5 100644
--- a/pkgs/development/compilers/openjdk/13.nix
+++ b/pkgs/development/compilers/openjdk/13.nix
@@ -83,6 +83,12 @@ let
       "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
     ]);
 
+    # -j flag is explicitly rejected by the build system:
+    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
+    # Note: it does not make build sequential. Build system
+    # still runs in parallel.
+    enableParallelBuilding = false;
+
     buildFlags = [ "all" ];
 
     installPhase = ''
diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix
index 247cf941f002..29a5c3cc5c31 100644
--- a/pkgs/development/compilers/openjdk/14.nix
+++ b/pkgs/development/compilers/openjdk/14.nix
@@ -78,6 +78,12 @@ let
       "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
     ]);
 
+    # -j flag is explicitly rejected by the build system:
+    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
+    # Note: it does not make build sequential. Build system
+    # still runs in parallel.
+    enableParallelBuilding = false;
+
     buildFlags = [ "all" ];
 
     installPhase = ''
diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix
index d41a245c5448..987d018cdf37 100644
--- a/pkgs/development/compilers/openjdk/15.nix
+++ b/pkgs/development/compilers/openjdk/15.nix
@@ -78,6 +78,12 @@ let
       "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
     ]);
 
+    # -j flag is explicitly rejected by the build system:
+    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
+    # Note: it does not make build sequential. Build system
+    # still runs in parallel.
+    enableParallelBuilding = false;
+
     buildFlags = [ "all" ];
 
     installPhase = ''
diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix
index df8a3a68f487..e6fd12a632b3 100644
--- a/pkgs/development/compilers/openjdk/16.nix
+++ b/pkgs/development/compilers/openjdk/16.nix
@@ -84,6 +84,12 @@ let
       "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
     ]);
 
+    # -j flag is explicitly rejected by the build system:
+    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
+    # Note: it does not make build sequential. Build system
+    # still runs in parallel.
+    enableParallelBuilding = false;
+
     buildFlags = [ "all" ];
 
     installPhase = ''
diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix
index 857f7c75c1d2..757fe8f101ed 100644
--- a/pkgs/development/compilers/openjdk/17.nix
+++ b/pkgs/development/compilers/openjdk/17.nix
@@ -86,6 +86,12 @@ let
       "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
     ]);
 
+    # -j flag is explicitly rejected by the build system:
+    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
+    # Note: it does not make build sequential. Build system
+    # still runs in parallel.
+    enableParallelBuilding = false;
+
     buildFlags = [ "images" ];
 
     installPhase = ''
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 7a69038d5e0a..8d68c2a6010e 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -155,6 +155,12 @@ let
       "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
     ]);
 
+    # -j flag is explicitly rejected by the build system:
+    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
+    # Note: it does not make build sequential. Build system
+    # still runs in parallel.
+    enableParallelBuilding = false;
+
     buildFlags = [ "all" ];
 
     doCheck = false; # fails with "No rule to make target 'y'."

From 226bc325359c2a24cb672e706167c7e016374972 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 24 Oct 2021 16:26:45 +0200
Subject: [PATCH 077/235] =?UTF-8?q?gi-docgen:=202021.7=20=E2=86=92=202021.?=
 =?UTF-8?q?8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gi-docgen/-/tags/2021.8
---
 pkgs/development/tools/documentation/gi-docgen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix
index 7e8c61e1c8d2..e10fc7f8bb26 100644
--- a/pkgs/development/tools/documentation/gi-docgen/default.nix
+++ b/pkgs/development/tools/documentation/gi-docgen/default.nix
@@ -7,7 +7,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gi-docgen";
-  version = "2021.7";
+  version = "2021.8";
 
   format = "other";
 
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "GNOME";
     repo = pname;
     rev = version;
-    sha256 = "i2s4JXg+D9sYq1QwVcDRLIr9qnRmzHC+cBInHv4SXHI=";
+    sha256 = "Y1IdCH6bytxbKIj48IAw/3XUQhoqwPshvdj/d1hRS3o=";
   };
 
   nativeBuildInputs = [

From 13c91e43401c24561adb33300b06d26ac099cdbb Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 24 Oct 2021 21:18:26 +0100
Subject: [PATCH 078/235] xalanc: explicitly disable parallel building

Parallel build fails due to incomplete dependencies between libraries
and headers within package. Let's disable parallel builds and try it on
in next release (it switched to cmake from auttools).
---
 pkgs/development/libraries/xalanc/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix
index b757b737f976..ba1e1a4c662d 100644
--- a/pkgs/development/libraries/xalanc/default.nix
+++ b/pkgs/development/libraries/xalanc/default.nix
@@ -22,6 +22,15 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ xercesc getopt ];
 
+  # Parallel build fails as:
+  #   c++ ... -c ... ExecutionContext.cpp
+  #   ProblemListenerBase.hpp:28:10: fatal error: LocalMsgIndex.hpp: No such file or directory
+  # The build failure happens due to missing intra-project dependencies
+  # against generated headers. Future 1.12 version dropped
+  # autotools-based build system. Let's disable parallel builds until
+  # next release.
+  enableParallelBuilding = false;
+
   meta = {
     homepage = "http://xalan.apache.org/";
     description = "A XSLT processor for transforming XML documents";

From a478a757255e118dc637820886d8feae58dc049e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 24 Oct 2021 19:02:45 +0100
Subject: [PATCH 079/235] libb64: enable parallel builds

Co-authored-by: Pavol Rusnak <pavol@rusnak.io>
---
 pkgs/development/libraries/libb64/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix
index 605faaebf696..81ba4263a1d6 100644
--- a/pkgs/development/libraries/libb64/default.nix
+++ b/pkgs/development/libraries/libb64/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "libb64";
@@ -11,6 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-9loDftr769qnIi00MueO86kjha2EiG9pnCLogp0Iq3c=";
   };
 
+  patches = [
+    # Fix parallel build failure: https://github.com/libb64/libb64/pull/9
+    #  make[1]: *** No rule to make target 'libb64.a', needed by 'c-example1'.  Stop.
+    (fetchpatch {
+      name = "parallel-make.patch";
+      url = "https://github.com/libb64/libb64/commit/4fe47c052e9123da8f751545deb48be08c3411f6.patch";
+      sha256 = "18b3np3gpyzimqmk6001riqv5n70wfbclky6zzsrvj5zl1dj4ljf";
+    })
+  ];
+
+  enableParallelBuilding = true;
+
   installPhase = ''
     mkdir -p $out $out/lib $out/bin $out/include
     cp -r include/* $out/include/

From 1a7300c3fb3844248230d5c02e69cea8a6e50b89 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 24 Oct 2021 21:03:33 +0100
Subject: [PATCH 080/235] m17n_lib: explicitly disable parallel building

Parallel build fails due to incomplete dependencies between libraries
within package. Let's fix it upstream first and meanwhile disable
parallel builds.
---
 pkgs/tools/inputmethods/m17n-lib/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix
index c80f97363116..8fb93c9c5f3a 100644
--- a/pkgs/tools/inputmethods/m17n-lib/default.nix
+++ b/pkgs/tools/inputmethods/m17n-lib/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ m17n_db ];
 
+  # Fails parallel build due to missing intra-package depends:
+  #   https://savannah.nongnu.org/bugs/index.php?61377
+  #     make[2]: *** No rule to make target '../src/libm17n-core.la', needed by 'libm17n.la'.  Stop.
+  enableParallelBuilding = false;
+
   meta = {
     homepage = "https://www.nongnu.org/m17n/";
     description = "Multilingual text processing library (runtime)";

From e23f40ce168133ece38d305254166067afb9bda5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Oct 2021 08:12:57 +0200
Subject: [PATCH 081/235] python3Packages.httplib2: 0.19.1 -> 0.20.1

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

diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index 756d3e4ddcc4..6494fee86c77 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "httplib2";
-  version = "0.19.1";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-e0Mq9AVJEWQ9GEtYFXk2fMIs7GtAUsyJN6XheqAnD3I=";
+    sha256 = "sha256-1zqs3YRVtm5DwewETLtRg5XhMJPJsMi0QLfeGirOURs=";
   };
 
   patches = [

From ed66694ebf16197195b3f9b4159ec7567b1c5508 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 25 Oct 2021 22:55:50 +0100
Subject: [PATCH 082/235] espeak-ng: explicitly disable parallel building

Current release lacks dependencies on local espeak-ng:

    cd dictsource && ESPEAK_DATA_PATH=/build/espeak-ng LD_LIBRARY_PATH=../src: \
        ../src/espeak-ng --compile=yue && cd ..
    bash: line 1: ../src/espeak-ng: No such file or directory

Should be fixed in next release: https://github.com/espeak-ng/espeak-ng/pull/1029
Can't apply patch as is as Makefile.am diverged quite a bit since 1.50
release.
---
 pkgs/applications/audio/espeak-ng/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 44d5a0aa15aa..e0f7822bcd71 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
     "--with-mbrola=${if mbrolaSupport then "yes" else "no"}"
   ];
 
+  # Current release lacks dependencies on local espeak-ng:
+  #  cd dictsource && ESPEAK_DATA_PATH=/build/espeak-ng LD_LIBRARY_PATH=../src: ../src/espeak-ng --compile=yue && cd ..
+  #  bash: line 1: ../src/espeak-ng: No such file or directory
+  # Should be fixed in next release: https://github.com/espeak-ng/espeak-ng/pull/1029
+  enableParallelBuilding = false;
+
   postInstall = lib.optionalString stdenv.isLinux ''
     patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng
   '';

From 45b312013ec00fd2b58bd687defe41d8b15506b1 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 16 Oct 2021 23:26:05 +0200
Subject: [PATCH 083/235] fluidsynth_1: remove at 1.1.11

* FluidSynth 1.1.11 was kept around as a dependency of some packages
  that hadn't yet adjusted to API breakages. All of these packages now
  use FluidSynth 2.x, so fluidsynth_1 can be removed. It has been broken
  ever since glib was updated to 2.70 and was affected by an unpatched
  CVE.

* Refactor expression a bit, use pname instead of name.

* Add changelog entry in case someone was using this downstream
  (accidentally?).

Fixes #141508.
Fixes #124624.
---
 .../from_md/release-notes/rl-2111.section.xml |  8 ++++++
 .../manual/release-notes/rl-2111.section.md   |  2 ++
 .../applications/audio/fluidsynth/default.nix | 26 ++++---------------
 pkgs/top-level/all-packages.nix               |  1 -
 4 files changed, 15 insertions(+), 22 deletions(-)

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 8389a203c028..bc9dc8fa9325 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
@@ -1160,6 +1160,14 @@ Superuser created successfully.
           will no longer work and must be updated.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The <literal>fluidsynth_1</literal> attribute has been
+          removed, as this legacy version is no longer needed in
+          nixpkgs. The actively maintained 2.x series is available as
+          <literal>fluidsynth</literal> unchanged.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-21.11-notable-changes">
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index ca8c9d14e05a..189ec520ce63 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -358,6 +358,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 - The `services.mosquitto` module has been rewritten to support multiple listeners and per-listener configuration.
   Module configurations from previous releases will no longer work and must be updated.
 
+- The `fluidsynth_1` attribute has been removed, as this legacy version is no longer needed in nixpkgs. The actively maintained 2.x series is available as `fluidsynth` unchanged.
+
 ## Other Notable Changes {#sec-release-21.11-notable-changes}
 
 
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index fa53bee5dc8d..0af7b6b1f959 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -1,33 +1,17 @@
 { stdenv, lib, fetchFromGitHub, pkg-config, cmake
 , alsa-lib, glib, libjack2, libsndfile, libpulseaudio
 , AudioUnit, CoreAudio, CoreMIDI, CoreServices
-, version ? "2"
 }:
 
-let
-  versionMap = {
-    "1" = {
-      fluidsynthVersion = "1.1.11";
-      sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
-    };
-    "2" = {
-      fluidsynthVersion = "2.2.3";
-      sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3";
-    };
-  };
-in
-
-with versionMap.${version};
-
-stdenv.mkDerivation  {
-  name = "fluidsynth-${fluidsynthVersion}";
-  version = fluidsynthVersion;
+stdenv.mkDerivation rec {
+  pname = "fluidsynth";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "FluidSynth";
     repo = "fluidsynth";
-    rev = "v${fluidsynthVersion}";
-    inherit sha256;
+    rev = "v${version}";
+    sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3";
   };
 
   nativeBuildInputs = [ pkg-config cmake ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7533920dfb1..bbdb6045e3a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24638,7 +24638,6 @@ with pkgs;
   fluidsynth = callPackage ../applications/audio/fluidsynth {
     inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
   };
-  fluidsynth_1 = fluidsynth.override { version = "1"; };
 
   fmit = libsForQt5.callPackage ../applications/audio/fmit { };
 

From 16f8f8300255a630de417ad9a765df7421daccc0 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 26 Oct 2021 09:44:12 +0000
Subject: [PATCH 084/235] perlPackages.X11XCB: pull upstream fix for parallel
 build (#142642)

Co-authored-by: Zak B. Elep <zakame@zakame.net>
---
 pkgs/top-level/perl-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2cc19753271a..eb24409e066b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -24512,6 +24512,13 @@ let
       url = "mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.18.tar.gz";
       sha256 = "1cjpghw7cnackw20lbd7yzm222kz5bnrwz52f8ay24d1f4pwrnxf";
     };
+    patches = [
+      # Pull upstream fix for parallel build failure
+      (fetchpatch {
+        url = "https://github.com/stapelberg/X11-XCB/commit/813608dacdae1ae35c9eb0f171a958617e014520.patch";
+        sha256 = "017f5r4fyryhzgp99lw3csrl21r27hmqv483vp9fdz9xkvrmh743";
+      })
+    ];
     AUTOMATED_TESTING = false;
     buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ];
     propagatedBuildInputs = [ DataDump MouseXNativeTraits XMLDescent XMLSimple ];

From 742101bf8a956a875cc69936afd944a81d8683e3 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 26 Oct 2021 11:37:52 +0000
Subject: [PATCH 085/235] perlPackages.libnet: fix Net/libnet.cfg determinism.
 (#142876)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/top-level/perl-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index eb24409e066b..70b272392899 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11776,6 +11776,13 @@ let
       url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.12.tar.gz";
       sha256 = "1px35q9qchzd7rxqldj87vbrall8v31blidhmh0d25d5hyq9lw25";
     };
+    patches = [
+      (fetchpatch {
+        name = "deterministic-libnet.cfg";
+        url = "https://github.com/steve-m-hay/perl-libnet/commit/7d076c4352f67ee4ed64092cfad3963a2321bd53.patch";
+        sha256 = "0pg9w2m08janqn5nrp4x9w5hbcsyxz87hfskd21zzfrzjk8z28qv";
+      })
+    ];
     meta = {
       description = "Collection of network protocol modules";
       license = with lib.licenses; [ artistic1 gpl1Plus ];

From 205b617053ad1f6a570719b8b7107ee6d0b5aae6 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Tue, 26 Oct 2021 08:16:42 +0000
Subject: [PATCH 086/235] ffmpeg_4: 4.4 -> 4.4.1

---
 pkgs/development/libraries/ffmpeg/4.nix       | 42 ++-----------------
 ...toolboxenc-define-TARGET_CPU_ARM64-t.patch | 35 ----------------
 2 files changed, 3 insertions(+), 74 deletions(-)
 delete mode 100644 pkgs/development/libraries/ffmpeg/v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch

diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index 14405f40f67d..516c7546f564 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -2,48 +2,12 @@
 # Darwin frameworks
 , Cocoa, CoreMedia, VideoToolbox
 , stdenv, lib
-, fetchpatch
 , ...
 }@args:
 
 callPackage ./generic.nix (rec {
-  version = "4.4";
-  branch = "4.4";
-  sha256 = "03kxc29y8190k4y8s8qdpsghlbpmchv1m8iqygq2qn0vfm4ka2a2";
+  version = "4.4.1";
+  branch = version;
+  sha256 = "0hmck0placn12kd9l0wam70mrpgfs2nlfmi8krd135gdql5g5jcg";
   darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
-
-  patches = [
-    (fetchpatch {
-      name = "CVE-2021-33815.patch";
-      url = "https://github.com/FFmpeg/FFmpeg/commit/26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777.patch";
-      sha256 = "0l8dqga5845f7d3wdbvd05i23saldq4pm2cyfdgszbr0c18sxagf";
-    })
-    (fetchpatch {
-      name = "CVE-2021-38114.patch";
-      url = "https://github.com/FFmpeg/FFmpeg/commit/7150f9575671f898382c370acae35f9087a30ba1.patch";
-      sha256 = "0gwkc7v1wsh4j0am2nnskhsca1b5aqzhcfd41sd9mh2swsdyf27i";
-    })
-    (fetchpatch {
-      name = "CVE-2021-38171.patch";
-      url = "https://github.com/FFmpeg/FFmpeg/commit/9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6.patch";
-      sha256 = "0b8hsb45izw7w1vb2b94k9f6kvn2shxrap5ip1krdxg6hs7an0x8";
-    })
-    (fetchpatch {
-      name = "CVE-2021-38291.patch";
-      url = "https://github.com/FFmpeg/FFmpeg/commit/e01d306c647b5827102260b885faa223b646d2d1.patch";
-      sha256 = "0p2p8gcnb5j469xa3czfssm09w3jk08kz8rnl8wi2l9aj9l08my9";
-    })
-    # 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)
diff --git a/pkgs/development/libraries/ffmpeg/v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch b/pkgs/development/libraries/ffmpeg/v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch
deleted file mode 100644
index c0c2c1fb23bb..000000000000
--- a/pkgs/development/libraries/ffmpeg/v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5b562aaddbc6e7a94a079c2e88230b205a7f4d73 Mon Sep 17 00:00:00 2001
-From: Zane van Iperen <zane@zanevaniperen.com>
-Date: Sat, 15 May 2021 19:33:52 +1000
-Subject: [PATCH v2] avcodec/videotoolboxenc: #define TARGET_CPU_ARM64 to 0 if
- not provided by the SDK
-
-Fixes build failure on older SDKs without it.
-
-Fixes #9242
-
-Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
----
- libavcodec/videotoolboxenc.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-NB: This is untested, I do not have a Mac to try it on.
-
-diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
-index 58239e0ab9..f063a86e73 100644
---- a/libavcodec/videotoolboxenc.c
-+++ b/libavcodec/videotoolboxenc.c
-@@ -50,6 +50,10 @@ enum { kCVPixelFormatType_420YpCbCr10BiPlanarFullRange = 'xf20' };
- enum { kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange = 'x420' };
- #endif
- 
-+#ifndef TARGET_CPU_ARM64
-+#   define TARGET_CPU_ARM64 0
-+#endif
-+
- typedef OSStatus (*getParameterSetAtIndex)(CMFormatDescriptionRef videoDesc,
-                                            size_t parameterSetIndex,
-                                            const uint8_t **parameterSetPointerOut,
--- 
-2.29.3
-

From ededca048a93974703a77b4bae84e4fc9f509580 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 27 Oct 2021 01:41:17 +0300
Subject: [PATCH 087/235] snappy: 1.1.8 -> 1.1.9 + add pkgconfig file

---
 pkgs/development/libraries/snappy/default.nix | 22 ++++++++++++++-----
 .../libraries/snappy/disable-benchmark.patch  |  5 -----
 2 files changed, 16 insertions(+), 11 deletions(-)
 delete mode 100644 pkgs/development/libraries/snappy/disable-benchmark.patch

diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index ece425e85c41..f2b83136cb23 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -4,17 +4,15 @@
 
 stdenv.mkDerivation rec {
   pname = "snappy";
-  version = "1.1.8";
+  version = "1.1.9";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "snappy";
     rev = version;
-    sha256 = "1j0kslq2dvxgkcxl1gakhvsa731yrcvcaipcp5k8k7ayicvkv9jv";
+    sha256 = "sha256-JXWl63KVP+CDNWIXYtz+EKqWLJbPKl3ifhr8dKAp/w8=";
   };
 
-  patches = [ ./disable-benchmark.patch ];
-
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ cmake ];
@@ -22,16 +20,28 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
     "-DCMAKE_SKIP_BUILD_RPATH=OFF"
+    "-DSNAPPY_BUILD_TESTS=OFF"
+    "-DSNAPPY_BUILD_BENCHMARKS=OFF"
   ];
 
   postInstall = ''
     substituteInPlace "$out"/lib/cmake/Snappy/SnappyTargets.cmake \
       --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES "'$dev'"'
+
+    mkdir -p $dev/lib/pkgconfig
+    cat <<EOF > $dev/lib/pkgconfig/snappy.pc
+      Name: snappy
+      Description: Fast compressor/decompressor library.
+      Version: ${version}
+      Libs: -L$out/lib -lsnappy
+      Cflags: -I$dev/include
+    EOF
   '';
 
-  checkTarget = "test";
+  #checkTarget = "test";
 
-  doCheck = true;
+  # requires gbenchmark and gtest but it also installs them out $dev
+  doCheck = false;
 
   meta = with lib; {
     homepage = "https://google.github.io/snappy/";
diff --git a/pkgs/development/libraries/snappy/disable-benchmark.patch b/pkgs/development/libraries/snappy/disable-benchmark.patch
deleted file mode 100644
index c891c13fe74c..000000000000
--- a/pkgs/development/libraries/snappy/disable-benchmark.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/snappy-test.cc
-+++ b/snappy-test.cc
-@@ -46 +46 @@
--DEFINE_bool(run_microbenchmarks, true,
-+DEFINE_bool(run_microbenchmarks, false,

From fc50030175bdac58ce4fe1c65da7dda3ea95a22e Mon Sep 17 00:00:00 2001
From: Artur Cygan <arczicygan@gmail.com>
Date: Sat, 23 Oct 2021 20:16:03 +0200
Subject: [PATCH 088/235] protobuf: 3.18.1 -> 3.19.0

---
 pkgs/development/libraries/protobuf/3.19.nix | 6 ++++++
 pkgs/top-level/all-packages.nix              | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/protobuf/3.19.nix

diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix
new file mode 100644
index 000000000000..727bf511d581
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.19.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+  version = "3.19.0";
+  sha256 = "0rx4r4d7hqr0gi3v90jbkm2lnkj9p37dhgwx9d0w7kgh3rvr4i7g";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98ff2b29f2de..d5f27c711df7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18837,8 +18837,9 @@ with pkgs;
 
   prospector = callPackage ../development/tools/prospector { };
 
-  protobuf = protobuf3_18;
+  protobuf = protobuf3_19;
 
+  protobuf3_19 = callPackage ../development/libraries/protobuf/3.19.nix { };
   protobuf3_18 = callPackage ../development/libraries/protobuf/3.18.nix { };
   protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { };
   protobuf3_16 = callPackage ../development/libraries/protobuf/3.16.nix { };

From 5a08a28803d56b241e8f8d693ba6d8f9dbafe847 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 26 Oct 2021 22:41:37 -0400
Subject: [PATCH 089/235] rustPlatform: add support for features

---
 pkgs/build-support/rust/default.nix               | 12 ++++++++++++
 pkgs/build-support/rust/hooks/cargo-build-hook.sh | 10 ++++++++++
 pkgs/build-support/rust/hooks/cargo-check-hook.sh | 11 ++++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 3d7057dd7d97..2cfd8d172869 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -36,6 +36,10 @@
 , cargoLock ? null
 , cargoVendorDir ? null
 , checkType ? buildType
+, buildNoDefaultFeatures ? false
+, checkNoDefaultFeatures ? buildNoDefaultFeatures
+, buildFeatures ? [ ]
+, checkFeatures ? buildFeatures
 , depsExtraArgs ? {}
 
 # Toggles whether a custom sysroot is created when the target is a .json file.
@@ -103,6 +107,14 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoLock" ]) // lib.o
 
   cargoCheckType = checkType;
 
+  cargoBuildNoDefaultFeatures = buildNoDefaultFeatures;
+
+  cargoCheckNoDefaultFeatures = checkNoDefaultFeatures;
+
+  cargoBuildFeatures = buildFeatures;
+
+  cargoCheckFeatures = checkFeatures;
+
   patchRegistryDeps = ./patch-registry-deps;
 
   nativeBuildInputs = nativeBuildInputs ++ [
diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
index c10120c5aa19..54ed765012b9 100644
--- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
@@ -13,6 +13,14 @@ cargoBuildHook() {
         cargoBuildProfileFlag="--${cargoBuildType}"
     fi
 
+    if [ -n "${cargoBuildNoDefaultFeatures-}" ]; then
+        cargoBuildNoDefaultFeaturesFlag=--no-default-features
+    fi
+
+    if [ -n "${cargoBuildFeatures-}" ]; then
+        cargoBuildFeaturesFlag="--features=${cargoBuildFeatures// /,}"
+    fi
+
     (
     set -x
     env \
@@ -24,6 +32,8 @@ cargoBuildHook() {
         --target @rustTargetPlatformSpec@ \
         --frozen \
         ${cargoBuildProfileFlag} \
+        ${cargoBuildNoDefaultFeaturesFlag} \
+        ${cargoBuildFeaturesFlag} \
         ${cargoBuildFlags}
     )
 
diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh
index 8a8e434f0ff6..57fc2779cfe9 100644
--- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh
@@ -20,7 +20,16 @@ cargoCheckHook() {
         cargoCheckProfileFlag="--${cargoCheckType}"
     fi
 
-    argstr="${cargoCheckProfileFlag} --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}";
+    if [ -n "${cargoCheckNoDefaultFeatures-}" ]; then
+        cargoCheckNoDefaultFeaturesFlag=--no-default-features
+    fi
+
+    if [ -n "${cargoCheckFeatures-}" ]; then
+        cargoCheckFeaturesFlag="--features=${cargoCheckFeatures// /,}"
+    fi
+
+    argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag}
+        --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}"
 
     (
         set -x

From 007c379becf8001728d56dd9bb45ac32194bb316 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 26 Oct 2021 22:43:09 -0400
Subject: [PATCH 090/235] ncspot: use buildFeatures

---
 pkgs/applications/audio/ncspot/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index d37cec15ffcb..29a244f19d7a 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -5,13 +5,6 @@
 , withMPRIS ? false, dbus ? null
 }:
 
-let
-  features = [ "cursive/pancurses-backend" ]
-    ++ lib.optional withALSA "alsa_backend"
-    ++ lib.optional withPulseAudio "pulseaudio_backend"
-    ++ lib.optional withPortAudio "portaudio_backend"
-    ++ lib.optional withMPRIS "mpris";
-in
 rustPlatform.buildRustPackage rec {
   pname = "ncspot";
   version = "0.9.0";
@@ -25,8 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0sdbba32f56z2q7kha5fxw2f00hikbz9sf4zl4wfl2i9b13j7mj0";
 
-  cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
-
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ ncurses openssl ]
@@ -36,6 +27,13 @@ rustPlatform.buildRustPackage rec {
     ++ lib.optional withPortAudio portaudio
     ++ lib.optional withMPRIS dbus;
 
+  buildNoDefaultFeatures = true;
+  buildFeatures = [ "cursive/pancurses-backend" ]
+    ++ lib.optional withALSA "alsa_backend"
+    ++ lib.optional withPulseAudio "pulseaudio_backend"
+    ++ lib.optional withPortAudio "portaudio_backend"
+    ++ lib.optional withMPRIS "mpris";
+
   doCheck = false;
 
   meta = with lib; {

From d7d45aadf296f2041dc4c0ca4052a662bef0c23e Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 27 Oct 2021 07:59:25 -0400
Subject: [PATCH 091/235] lucky-commit: use checkNoDefaultFeatures

---
 .../version-management/git-and-tools/lucky-commit/default.nix   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix
index 71c40e86aa97..b7a4d3d3762a 100644
--- a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   cargoBuildFlags = lib.optional (!withOpenCL) "--no-default-features";
 
   # disable tests that require gpu
-  cargoTestFlags = [ "--no-default-features" ];
+  checkNoDefaultFeatures = true;
 
   meta = with lib; {
     description = "Change the start of your git commit hashes to whatever you want";

From 62d502d7035d79165c8e4588dcae6ff35f296a2f Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 27 Oct 2021 09:24:19 -0400
Subject: [PATCH 092/235] doc/rust: add documentation for feature options

---
 doc/languages-frameworks/rust.section.md | 43 ++++++++++++++++++++----
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 26eb9e26bd00..19369a5d3f13 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -186,6 +186,33 @@ added. To find the correct hash, you can first use `lib.fakeSha256` or
 `lib.fakeHash` as a stub hash. Building the package (and thus the
 vendored dependencies) will then inform you of the correct hash.
 
+### Cargo features {#cargo-features}
+
+You can disable default features using `buildNoDefaultFeatures`, and
+extra features can be added with `buildFeatures`.
+
+If you want to use different features for check phase, you can use
+`checkNoDefaultFeatures` and `checkFeatures`. They are only passed to
+`cargo test` and not `cargo build`. If left unset, they default to
+`buildNoDefaultFeatures` and `buildFeatures`.
+
+For example:
+
+```nix
+rustPlatform.buildRustPackage rec {
+  pname = "myproject";
+  version = "1.0.0";
+
+  buildNoDefaultFeatures = true;
+  buildFeatures = [ "color" "net" ];
+
+  # disable network features in tests
+  checkFeatures = [ "color" ];
+
+  # ...
+}
+```
+
 ### Cross compilation {#cross-compilation}
 
 By default, Rust packages are compiled for the host platform, just like any
@@ -261,7 +288,7 @@ rustPlatform.buildRustPackage {
 Please note that the code will be compiled twice here: once in `release` mode
 for the `buildPhase`, and again in `debug` mode for the `checkPhase`.
 
-Test flags, e.g., `--features xxx/yyy`, can be passed to `cargo test` via the
+Test flags, e.g., `--package foo`, can be passed to `cargo test` via the
 `cargoTestFlags` attribute.
 
 Another attribute, called `checkFlags`, is used to pass arguments to the test
@@ -421,18 +448,20 @@ you of the correct hash.
 * `cargoBuildHook`: use Cargo to build a crate. If the crate to be
   built is a crate in e.g. a Cargo workspace, the relative path to the
   crate to build can be set through the optional `buildAndTestSubdir`
-  environment variable. Additional Cargo build flags can be passed
-  through `cargoBuildFlags`.
+  environment variable. Features can be specified with
+  `cargoBuildNoDefaultFeatures` and `cargoBuildFeatures`. Additional
+  Cargo build flags can be passed through `cargoBuildFlags`.
 * `maturinBuildHook`: use [Maturin](https://github.com/PyO3/maturin)
   to build a Python wheel. Similar to `cargoBuildHook`, the optional
   variable `buildAndTestSubdir` can be used to build a crate in a
   Cargo workspace. Additional maturin flags can be passed through
   `maturinBuildFlags`.
 * `cargoCheckHook`: run tests using Cargo. The build type for checks
-  can be set using `cargoCheckType`. Additional flags can be passed to
-  the tests using `checkFlags` and `checkFlagsArray`. By default,
-  tests are run in parallel. This can be disabled by setting
-  `dontUseCargoParallelTests`.
+  can be set using `cargoCheckType`. Features can be specified with
+  `cargoCheckNoDefaultFeaatures` and `cargoCheckFeatures`. Additional
+  flags can be passed to the tests using `checkFlags` and
+  `checkFlagsArray`. By default, tests are run in parallel. This can
+  be disabled by setting `dontUseCargoParallelTests`.
 * `cargoInstallHook`: install binaries and static/shared libraries
   that were built using `cargoBuildHook`.
 

From 4711d9ecf7eef45ded939bf8f384051609d27965 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 8 Oct 2021 23:20:16 +0200
Subject: [PATCH 093/235] kexec-tools: 2.0.20 -> 2.0.22

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 .../os-specific/linux/kexec-tools/default.nix | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/pkgs/os-specific/linux/kexec-tools/default.nix b/pkgs/os-specific/linux/kexec-tools/default.nix
index 6e6eecd49319..c2a99de3de27 100644
--- a/pkgs/os-specific/linux/kexec-tools/default.nix
+++ b/pkgs/os-specific/linux/kexec-tools/default.nix
@@ -1,8 +1,8 @@
-{ lib, stdenv, buildPackages, fetchurl, zlib, fetchpatch }:
+{ lib, stdenv, buildPackages, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "kexec-tools";
-  version = "2.0.20";
+  version = "2.0.22";
 
   src = fetchurl {
     urls = [
@@ -21,23 +21,6 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   buildInputs = [ zlib ];
 
-  patches = [
-    # fix build on i686
-    # See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
-    (fetchpatch {
-      name = "kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch";
-      url = "https://src.fedoraproject.org/rpms/kexec-tools/raw/cb1e5463b5298b064e9b6c86ad6fe3505fec9298/f/kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch";
-      sha256 = "1kzmcsbhwfdgxlc5s88ir0n494phww1j16yk0z42x09qlkxxkg0l";
-    })
-
-    (fetchpatch {
-      # upstream build fix against -fno-common compilers like >=gcc-10
-      name = "fno-common.patch";
-      url = "https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=cc087b11462af9f971a2c090d07e8d780a867b50";
-      sha256 = "043hcsy6m14h64p6b9w25c7a3y0f487322dj81l6mbm6sws6s9lv";
-    })
-  ];
-
   meta = with lib; {
     homepage = "http://horms.net/projects/kexec/kexec-tools";
     description = "Tools related to the kexec Linux feature";

From c9fbe0d98bd5fb47c15a3d7556b722cf47d42305 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 25 Oct 2021 00:15:56 +0200
Subject: [PATCH 094/235] nixos/kexec: fix test

---
 nixos/tests/kexec.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix
index ec0cd9796b0e..218683b4a665 100644
--- a/nixos/tests/kexec.nix
+++ b/nixos/tests/kexec.nix
@@ -4,12 +4,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
   name = "kexec";
   meta = with lib.maintainers; {
     maintainers = [ eelco ];
-    # Currently hangs forever; last output is:
-    #     machine # [   10.239914] dhcpcd[707]: eth0: adding default route via fe80::2
-    #     machine: waiting for the VM to finish booting
-    #     machine # Cannot find the ESP partition mount point.
-    #     machine # [   28.681197] nscd[692]: 692 checking for monitored file `/etc/netgroup': No such file or directory
-    broken = true;
   };
 
   machine = { ... }:
@@ -18,8 +12,11 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
   testScript =
     ''
       machine.wait_for_unit("multi-user.target")
-      machine.execute("systemctl kexec &")
+      machine.succeed('kexec --load /run/current-system/kernel --initrd /run/current-system/initrd --command-line "$(</proc/cmdline)"')
+      machine.succeed("systemctl kexec &")
       machine.connected = False
+      machine.connect()
       machine.wait_for_unit("multi-user.target")
+      machine.shutdown()
     '';
 })

From 6125e306bb1aba758f22b569232f258f4a6e0613 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 25 Oct 2021 00:20:46 +0200
Subject: [PATCH 095/235] nixos/tests: register `kexec' test

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

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b0623896a2da..9071430d1028 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -220,6 +220,7 @@ in
   kerberos = handleTest ./kerberos/default.nix {};
   kernel-generic = handleTest ./kernel-generic.nix {};
   kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix {};
+  kexec = handleTest ./kexec.nix {};
   keycloak = discoverTests (import ./keycloak.nix);
   keymap = handleTest ./keymap.nix {};
   knot = handleTest ./knot.nix {};

From 034fe8ef3ac5666516c2bacaaba38e14fa5e16a2 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 27 Oct 2021 00:11:27 +0100
Subject: [PATCH 096/235] diffoscope: adapt to file-5.41 failures

Pull in pustream fix for uImage diff test failure.
---
 pkgs/tools/misc/diffoscope/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index e07d03cddba2..43ff6ffaafce 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles
+{ lib, stdenv, fetchurl, fetchpatch, python3Packages, docutils, help2man, installShellFiles
 , abootimg, acl, apksigner, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
 , e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
 , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R
@@ -25,6 +25,13 @@ python3Packages.buildPythonApplication rec {
     # the version detection of LLVM is broken and the comparison result is compared against
     # the expected result from LLVM 10 (rather than 7 which is our default).
     ./fix-tests.patch
+
+    # Upstream uimage test fix for file-5.41 update.
+    (fetchpatch {
+      name = "fix-uimage-on-file-5.41.patch";
+      url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/74a59a8fb3327a320f45a7626e8e0d59b01896a2.patch";
+      sha256 = "sha256-7hmxSKmgaqJg4/gpaZYcNVo4dEMO658VSkSbxPq7WWo=";
+    })
   ];
 
   postPatch = ''

From f43dc5431ee188eef1dafb3792628a6fa739c445 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@users.noreply.github.com>
Date: Thu, 28 Oct 2021 04:27:12 +0200
Subject: [PATCH 097/235] graphviz: 2.47.3 -> 2.49.3 (#143231)

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/tools/graphics/graphviz/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 5031aad7480d..6dc9e1861ac8 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -1,5 +1,5 @@
 import ./base.nix rec {
-  rev = "887cd2207e6858ff2c0fe6e461dd309a435c8d5a"; # use rev as tags have disappeared before
-  version = "2.47.3";
-  sha256 = "sha256-WUu3eAycG/oHTnT7HiZvf0B45I8miYolwRi9fHfA3uA=";
- }
+  rev = "3425dae078262591d04fec107ec71ab010651852"; # use rev as tags have disappeared before
+  version = "2.49.3";
+  sha256 = "1qvyjly7r1ihacdvxq0r59l4csr09sc05palpshzqsiz2wb1izk0";
+}

From 074a88834ae9053d4c355333c48c9d8b99d088ac Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 19 Oct 2021 16:53:35 +0200
Subject: [PATCH 098/235] python3Packages.zopfli: 0.1.8 -> 0.1.9

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

diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix
index 9d6757793511..6a7808f4fe91 100644
--- a/pkgs/development/python-modules/zopfli/default.nix
+++ b/pkgs/development/python-modules/zopfli/default.nix
@@ -1,15 +1,17 @@
-{ lib, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }:
 
 buildPythonPackage rec {
   pname = "zopfli";
-  version = "0.1.8";
+  version = "0.1.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8b977dc07e3797907ab59e08096583bcd0b7e6c739849fbbeec09263f6356623";
+    sha256 = "78de3cc08a8efaa8013d61528907d91ac4d6cc014ffd8a41cc10ee75e9e60d7b";
     extension = "zip";
   };
 
+  nativeBuildInputs = [ setuptools-scm ];
+
   # doesn't work with pytestCheckHook
   checkInputs = [ pytest ];
 

From 51dd26733512b3d2393ab8ad307662ee64a5b29a Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 19 Oct 2021 16:57:37 +0200
Subject: [PATCH 099/235] python3Packages.zopfli: link against our zopfli
 instead of vendoring

https://github.com/fonttools/py-zopfli/pull/9
---
 pkgs/development/python-modules/zopfli/default.nix | 5 ++++-
 pkgs/top-level/python-packages.nix                 | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix
index 6a7808f4fe91..d7e9cf507f03 100644
--- a/pkgs/development/python-modules/zopfli/default.nix
+++ b/pkgs/development/python-modules/zopfli/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }:
+{ lib, buildPythonPackage, fetchPypi, setuptools-scm, zopfli, pytest }:
 
 buildPythonPackage rec {
   pname = "zopfli";
@@ -12,6 +12,9 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools-scm ];
 
+  buildInputs = [ zopfli ];
+  USE_SYSTEM_ZOPFLI = "True";
+
   # doesn't work with pytestCheckHook
   checkInputs = [ pytest ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd01245a1798..9ad592468f91 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10079,7 +10079,9 @@ in {
 
   zope_testrunner = callPackage ../development/python-modules/zope_testrunner { };
 
-  zopfli = callPackage ../development/python-modules/zopfli { };
+  zopfli = callPackage ../development/python-modules/zopfli {
+    inherit (pkgs) zopfli;
+  };
 
   zstandard = callPackage ../development/python-modules/zstandard { };
 

From df26a83f13ebabd49935773a7192c0fdadd2ecdd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Oct 2021 22:03:42 +0000
Subject: [PATCH 100/235] sstp: 1.0.15 -> 1.0.16

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

diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix
index 151538462a35..65449c203e1d 100644
--- a/pkgs/tools/networking/sstp/default.nix
+++ b/pkgs/tools/networking/sstp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sstp-client";
-  version = "1.0.15";
+  version = "1.0.16";
 
   src = fetchurl {
     url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz";
-    sha256 = "sha256-hISqUfv75Big661YrSCo7hxG7XH4AL4YvNI7Qua6rWQ=";
+    sha256 = "sha256-r74U/RIveHX0+tDtmC0XRRNtLmbMNrl/cu8aERF4TKE=";
   };
 
   postPatch = ''

From ce023d3cc6a6caf205d7c70adfe898c8562ed266 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Oct 2021 23:53:01 +0000
Subject: [PATCH 101/235] saml2aws: 2.32.0 -> 2.33.0

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

diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix
index bd49721a68a2..f710101ca967 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/pkgs/tools/security/saml2aws/default.nix
@@ -2,17 +2,17 @@
 
 buildGoModule rec {
   pname = "saml2aws";
-  version = "2.32.0";
+  version = "2.33.0";
 
   src = fetchFromGitHub {
     owner = "Versent";
     repo = "saml2aws";
     rev = "v${version}";
-    sha256 = "sha256-VMNK6kmMPe1Qwfb/NmMaBhtdqg59KmtiankVNZmhNdY=";
+    sha256 = "sha256-99URhGJJKO4l+ztMGljiuNKVTYIG2iyWUMBXG1WTPdI=";
   };
 
   runVend = true;
-  vendorSha256 = "sha256-2tu3wSp9N+icpKvDeUgzYRLc6jXivn1D0jX/5LSgwNw=";
+  vendorSha256 = "sha256-IycsQWT7Puw2n8osfm1bePIXS09G7gmGE+3imJUwZgc=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
 

From 1806fd639d1d0645126db045168a5412005ec808 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Oct 2021 01:01:30 +0000
Subject: [PATCH 102/235] rabbitmq-server: 3.9.6 -> 3.9.8

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

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 357fbe36b207..a8b837c8b3e7 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -27,12 +27,12 @@
 
 stdenv.mkDerivation rec {
   pname = "rabbitmq-server";
-  version = "3.9.6";
+  version = "3.9.8";
 
   # when updating, consider bumping elixir version in all-packages.nix
   src = fetchurl {
     url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-YCVOMVsbOMczpZi02Ywd6M+AXrd5AMweCYn1WcyRHSw=";
+    sha256 = "sha256-l77pOFNzw83Qj+MbnwGiClA7HIGvAtI0N/9k12GV7lU=";
   };
 
   nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ];

From aa8044d67372569159822bd8d3b480e39c99f290 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 29 Oct 2021 03:06:50 +0200
Subject: [PATCH 103/235] gi-docgen: fix some docs build failures

---
 .../tools/documentation/gi-docgen/default.nix          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix
index e10fc7f8bb26..ac715147dc3f 100644
--- a/pkgs/development/tools/documentation/gi-docgen/default.nix
+++ b/pkgs/development/tools/documentation/gi-docgen/default.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitLab
+, fetchpatch
 , meson
 , ninja
 , python3
@@ -19,6 +20,15 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "Y1IdCH6bytxbKIj48IAw/3XUQhoqwPshvdj/d1hRS3o=";
   };
 
+  patches = [
+    # Fix building docs of some packages (e.g. gnome-builder)
+    # https://gitlab.gnome.org/GNOME/gi-docgen/-/issues/111
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gi-docgen/-/commit/72f3c5dbe27aabb5f7a376afda23f3dfc3c2e212.patch";
+      sha256 = "iVXc3idmcjmFVZQdE2QX2V53YZ79lqxZid9nWdxAZ/Q=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja

From 035c7dc4fa713a5865f38045ad86a348343f065d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Oct 2021 02:23:56 +0000
Subject: [PATCH 104/235] bazarr: 0.9.9 -> 1.0.0

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

diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix
index e76d9d8cb5e3..5448898c5900 100644
--- a/pkgs/servers/bazarr/default.nix
+++ b/pkgs/servers/bazarr/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bazarr";
-  version = "0.9.9";
+  version = "1.0.0";
 
   sourceRoot = ".";
 
   src = fetchurl {
     url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
-    sha256 = "sha256-0Qfjo0hazbV5Oi5hDk8/zc1sReRMzhkjkEiLIRiUOtk=";
+    sha256 = "sha256-DDisK8friN3u+kNmjc9TjU0cZ/H0wf/Fu6JqZZkLdPU=";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

From 5f6bd8187b30cbb4c6ff512b7de16348b5638479 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Oct 2021 02:49:14 +0000
Subject: [PATCH 105/235] bcftools: 1.13 -> 1.14

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

diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index d0196c0e25a5..f6aa5e8892ac 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bcftools";
-  version = "1.13";
+  version = "1.14";
 
   src = fetchurl {
     url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-E7+h2ipe3aj6URlqR6C0r7P+8XUWRR5PDnhHfz3TC5A=";
+    sha256 = "sha256-t++Iron8tVZYxb6i6MuOdWsFXhOGADbWvhN1Z4KqGcs=";
   };
 
   nativeBuildInputs = [

From a5403b9a36f69ed5d350f889f19af576aa0f8c3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Oct 2021 03:59:24 +0000
Subject: [PATCH 106/235] scotch: 6.0.4 -> 6.1.1

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

diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix
index b6613f25cbc7..1eb057cfc7c5 100644
--- a/pkgs/applications/science/math/scotch/default.nix
+++ b/pkgs/applications/science/math/scotch/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, bison, mpi, flex, zlib}:
 
 stdenv.mkDerivation rec {
-  version = "6.0.4";
+  version = "6.1.1";
   pname = "scotch";
   src_name = "scotch_${version}";
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz";
-    sha256 = "f53f4d71a8345ba15e2dd4e102a35fd83915abf50ea73e1bf6efe1bc2b4220c7";
+    sha256 = "sha256-OQUvWf9HSkppzvwlzzyvhClACIneugEO5kA8oYj4sxE=";
   };
 
   sourceRoot = "${src_name}/src";

From eb37e25c2d334e4f3371b4b5db61134adbb88f94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Oct 2021 05:11:53 +0000
Subject: [PATCH 107/235] calamares: 3.2.43 -> 3.2.44.3

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

diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index 094b9453358a..2c7c2282b41e 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -6,12 +6,12 @@
 
 mkDerivation rec {
   pname = "calamares";
-  version = "3.2.43";
+  version = "3.2.44.3";
 
   # release including submodule
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-68mt+bkdEBUODvyf3hh09snL+ecMfmSqNlVleOOJ2K8=";
+    sha256 = "sha256-p3ctULrzXPt9dNs8Ckb7cqdOBpp4qOmEwu0dEVq8lEw=";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];

From f35024ee2c969c1c18a4a69b86f0cfc159edca71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Oct 2021 08:30:10 +0000
Subject: [PATCH 108/235] coredns: 1.8.5 -> 1.8.6

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

diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index e41118e37064..09991c781452 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "coredns";
-  version = "1.8.5";
+  version = "1.8.6";
 
   src = fetchFromGitHub {
     owner = "coredns";
     repo = "coredns";
     rev = "v${version}";
-    sha256 = "sha256-Tegpc6SspDoVPVD6fXNciVEp4/X1z3HMRWxfjc463PM=";
+    sha256 = "sha256-0R/HqwZA/ZK9f0i01anIjwnW0JCfsbQpTBMF68CNRUI=";
   };
 
-  vendorSha256 = "sha256-fWK8sGd3yycgFz4ipAmYJ3ye4OtbjpSzuK4fwIjfor8=";
+  vendorSha256 = "sha256-MiTg1GHeqNJcQSaqWXW/nW4ZdNzoLTgNlLbbn1bm7aA=";
 
   doCheck = false;
 

From 12e2e0ee71f33c58ab1da8d8b544ac35e8d08278 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 29 Oct 2021 11:13:54 +0000
Subject: [PATCH 109/235] =?UTF-8?q?glib:=202.70.0=20=E2=86=92=202.70.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 4825dd98976c..a3513542fdeb 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -45,11 +45,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "glib";
-  version = "2.70.0";
+  version = "2.70.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0hh7hk02fkm1bn48k4z8f3kgv9qbni5z22gizd567fn527w7s390";
+    sha256 = "+be85/UXU6H0OFO7ysqL8J4V6ZQmjinP16dvZWNiY8A=";
   };
 
   patches = optionals stdenv.isDarwin [

From 3a7be2087f46d564f0be23a113107aed20d765f9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 29 Oct 2021 11:14:52 +0000
Subject: [PATCH 110/235] =?UTF-8?q?libsoup:=202.74.0=20=E2=86=92=202.74.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index f902d3203776..95926f54f947 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libsoup";
-  version = "2.74.0";
+  version = "2.74.1";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-M7HU4NY5RWxnXCJ4d+lKgHjXMSM+LVdonBGrzvfTxI4=";
+    sha256 = "sha256-3CejuPowvI/5ULWnWVh1fSJC4+UeTi2cTmI+9195O/g=";
   };
 
   nativeBuildInputs = [

From 7cfa3de9ec1ac2bce3721f2cd88982541dcd2109 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 29 Oct 2021 11:16:01 +0000
Subject: [PATCH 111/235] =?UTF-8?q?librsvg:=202.52.2=20=E2=86=92=202.52.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 7cfa4a499f5a..3b80817fcb9f 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.52.2";
+  version = "2.52.3";
 
   outputs = [ "out" "dev" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "A9KIfBj/uQbhpg+X/kanFp9pqijW210oV0jzYYsJNCc=";
+    sha256 = "Nuf1vIjXhgjqf2wF5K/krMFga5rxPChF1DhQc9CCuKQ=";
   };
 
   nativeBuildInputs = [

From 0e66b23a75b3f00825f7541e977a0df5a0849f12 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 29 Oct 2021 11:16:01 +0000
Subject: [PATCH 112/235] =?UTF-8?q?libsoup=5F3:=203.0.1=20=E2=86=92=203.0.?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/libsoup/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix
index b958ba307674..623100266be9 100644
--- a/pkgs/development/libraries/libsoup/3.x.nix
+++ b/pkgs/development/libraries/libsoup/3.x.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libsoup";
-  version = "3.0.1";
+  version = "3.0.2";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-bwwxbRD4RYuW9WTHZEvjwgEb11rVBUyNsmr7DJqRvEc=";
+    sha256 = "sha256-mO9T7ZtIFewFIyFVNxr4A6mSj0ZSrMaF/wIIa+FqP/U=";
   };
 
   nativeBuildInputs = [

From e9a1ba099fb3bf722fdc1bb8ddc1998ff0ec830a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 14 Oct 2021 16:27:54 -0700
Subject: [PATCH 113/235] linuxPackages_5_10_hardened: fix patching conflict
 with patchShebang

---
 pkgs/os-specific/linux/kernel/manual-config.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index d9a959c50bc9..421b234b6341 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -126,7 +126,11 @@ let
         # See also https://kernelnewbies.org/BuildId
         sed -i Makefile -e 's|--build-id=[^ ]*|--build-id=none|'
 
-        patchShebangs scripts
+        # Some linux-hardened patches now remove certain files in the scripts directory, so we cannot
+        # patch all scripts until after patches are applied.
+        # However, scripts/ld-version.sh is still ran when generating a configfile for a kernel, so it needs
+        # to be patched prior to patchPhase
+        patchShebangs scripts/ld-version.sh
       '';
 
       postPatch = ''
@@ -140,6 +144,8 @@ let
             --replace NIXOS_RANDSTRUCT_SEED \
             $(echo ${randstructSeed}${src} ${configfile} | sha256sum | cut -d ' ' -f 1 | tr -d '\n')
         fi
+
+        patchShebangs scripts
       '';
 
       configurePhase = ''

From 933460bf46c642f1a5aafe59e7fbdeb2b41db019 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 20:59:22 -0600
Subject: [PATCH 114/235] python3Packages.brotlipy: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/brotlipy/default.nix b/pkgs/development/python-modules/brotlipy/default.nix
index f914d2d6c97c..2cc918b288ce 100644
--- a/pkgs/development/python-modules/brotlipy/default.nix
+++ b/pkgs/development/python-modules/brotlipy/default.nix
@@ -19,6 +19,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ cffi enum34 construct ];
 
+  propagatedNativeBuildInputs = [ cffi ];
+
   checkInputs = [ pytest hypothesis ];
 
   checkPhase = ''

From adfa2f5577e3686b665b375bbab6ce78e6882ea6 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 21:28:23 -0600
Subject: [PATCH 115/235] python3Packages.liquidctl: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix
index 9ac682b42422..c37183e22ec0 100644
--- a/pkgs/development/python-modules/liquidctl/default.nix
+++ b/pkgs/development/python-modules/liquidctl/default.nix
@@ -35,6 +35,10 @@ buildPythonPackage rec {
     colorlog
   ];
 
+  propagatedNativeBuildInputs = [
+    smbus-cffi
+  ];
+
   outputs = [ "out" "man" ];
 
   postInstall = ''

From 8b57030f53700784333ed260228301524da5b333 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 21:34:26 -0600
Subject: [PATCH 116/235] python3Packages.misaka: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/misaka/default.nix b/pkgs/development/python-modules/misaka/default.nix
index 07f251f75b5f..e4c807a5bf5e 100644
--- a/pkgs/development/python-modules/misaka/default.nix
+++ b/pkgs/development/python-modules/misaka/default.nix
@@ -8,6 +8,8 @@ buildPythonPackage rec {
     sha256 = "1mzc29wwyhyardclj1vg2xsfdibg2lzb7f1azjcxi580ama55wv2";
   };
 
+  propagatedNativeBuildInputs = [ cffi ];
+
   propagatedBuildInputs = [ cffi ];
 
   # The tests require write access to $out

From bcae2af56c86e3242585e9fbbc54e060cdf2f5d4 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 21:57:05 -0600
Subject: [PATCH 117/235] python3Packages.pycmarkgfm: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/pycmarkgfm/default.nix b/pkgs/development/python-modules/pycmarkgfm/default.nix
index 36b171c22b12..348bca8d49e7 100644
--- a/pkgs/development/python-modules/pycmarkgfm/default.nix
+++ b/pkgs/development/python-modules/pycmarkgfm/default.nix
@@ -10,6 +10,8 @@ buildPythonPackage rec {
     sha256 = "694cb242f4961437c30b5b015dfbce9d1a1fa48305c2e39f902ce7c65b4cbe0e";
   };
 
+  propagatedNativeBuildInputs = [ cffi ];
+
   propagatedBuildInputs = [ cffi ];
 
   # I would gladly use pytestCheckHook, but pycmarkgfm relies on a native

From 4242f3f1979d5fd41186b7dc8ae186238964f073 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 21:58:50 -0600
Subject: [PATCH 118/235] python3Packages.pygit2: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index d0cd948bdcde..27bfcff16d81 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -21,6 +21,8 @@ buildPythonPackage rec {
     cached-property
   ] ++ lib.optional (!isPyPy) cffi;
 
+  propagatedNativeBuildInputs = lib.optional (!isPyPy) cffi;
+
   checkInputs = [ pytestCheckHook ];
 
   preCheck = ''

From 69e1dd893b1bb924c91a1ed74994b36e9d85178f Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 22:06:02 -0600
Subject: [PATCH 119/235] python3Packages.python-olm: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix
index 2a8295a65bf7..d38c33df8c81 100644
--- a/pkgs/development/python-modules/python-olm/default.nix
+++ b/pkgs/development/python-modules/python-olm/default.nix
@@ -17,6 +17,10 @@ buildPythonPackage {
     future
   ] ++ lib.optionals (!isPy3k) [ typing ];
 
+  propagatedNativeBuildInputs = [
+    cffi
+  ];
+
   # Some required libraries for testing are not packaged yet.
   doCheck = false;
   pythonImportsCheck = [ "olm" ];

From 4740e8d49034058d19d1d1d7b3b3b40d3f299d93 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 22:15:20 -0600
Subject: [PATCH 120/235] python3Packages.reflink: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/reflink/default.nix b/pkgs/development/python-modules/reflink/default.nix
index 9f5024daf7e8..cb0a9fb5856a 100644
--- a/pkgs/development/python-modules/reflink/default.nix
+++ b/pkgs/development/python-modules/reflink/default.nix
@@ -3,7 +3,6 @@
 , fetchPypi
 , lib
 , pytestCheckHook
-, pytest-runner
 }:
 
 buildPythonPackage rec {
@@ -15,10 +14,17 @@ buildPythonPackage rec {
     sha256 = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo=";
   };
 
-  propagatedBuildInputs = [ cffi pytest-runner ];
+  propagatedBuildInputs = [ cffi ];
+
+  propagatedNativeBuildInputs = [ cffi ];
 
   checkInputs = [ pytestCheckHook ];
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "pytest-runner" ""
+  '';
+
   # FIXME: These do not work, and I have been unable to figure out why.
   doCheck = false;
 

From 15018497c40cbfa0efef4e9985273a60c2bfd479 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 22:18:03 -0600
Subject: [PATCH 121/235] python3Packages.smbus-cffi: fix cross-compilation

---
 pkgs/development/python-modules/smbus-cffi/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/smbus-cffi/default.nix b/pkgs/development/python-modules/smbus-cffi/default.nix
index 6715cfd60d95..ffb22d1c4b42 100644
--- a/pkgs/development/python-modules/smbus-cffi/default.nix
+++ b/pkgs/development/python-modules/smbus-cffi/default.nix
@@ -24,6 +24,8 @@ buildPythonPackage rec {
     })
   ];
 
+  propagatedNativeBuildInputs = [ cffi ];
+
   propagatedBuildInputs = [ cffi ];
 
   installCheckPhase = ''

From aec7556c765e11b17cfd68bf5e610145df741e5e Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 22:28:46 -0600
Subject: [PATCH 122/235] python3Packages.soundfile: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix
index dea0e345a999..9a1d614062b7 100644
--- a/pkgs/development/python-modules/soundfile/default.nix
+++ b/pkgs/development/python-modules/soundfile/default.nix
@@ -21,6 +21,7 @@ buildPythonPackage rec {
 
     checkInputs = [ pytest ];
     propagatedBuildInputs = [ numpy libsndfile cffi ];
+    propagatedNativeBuildInputs = [ cffi ];
 
     meta = {
       description = "An audio library based on libsndfile, CFFI and NumPy";

From 8f645199b5e1ff954f978289c179cbf70f1613a4 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 22:36:12 -0600
Subject: [PATCH 123/235] python3Packages.zstandard: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix
index 724a5d9d6794..2796edfb0acb 100755
--- a/pkgs/development/python-modules/zstandard/default.nix
+++ b/pkgs/development/python-modules/zstandard/default.nix
@@ -14,6 +14,8 @@ buildPythonPackage rec {
     sha256 = "52de08355fd5cfb3ef4533891092bb96229d43c2069703d4aff04fdbedf9c92f";
   };
 
+  propagatedNativeBuildInputs = [ cffi ];
+
   propagatedBuildInputs = [ cffi ];
 
   checkInputs = [ hypothesis ];

From bed3e18ffe8853a8f1dafd7311ea90edbdfd6c84 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 22:38:09 -0600
Subject: [PATCH 124/235] python3Packages.editdistance-s: fix cross-compilation

---
 pkgs/development/python-modules/editdistance-s/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/editdistance-s/default.nix b/pkgs/development/python-modules/editdistance-s/default.nix
index 8d9be707f9b4..548da09b993d 100644
--- a/pkgs/development/python-modules/editdistance-s/default.nix
+++ b/pkgs/development/python-modules/editdistance-s/default.nix
@@ -16,6 +16,8 @@ buildPythonPackage rec {
     sha256 = "0w2qd5b6a3c3ahd0xy9ykq4wzqk0byqwdqrr26dyn8j2425j46lg";
   };
 
+  propagatedNativeBuildInputs = [ cffi ];
+
   propagatedBuildInputs = [ cffi ];
 
   checkInputs = [ pytestCheckHook ];

From a8170920d5edf480f551302f534a5ce93082e5b9 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 22:39:44 -0600
Subject: [PATCH 125/235] python3Packages.miniaudio: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix
index 2056bbb0b946..0f3372a6048c 100644
--- a/pkgs/development/python-modules/miniaudio/default.nix
+++ b/pkgs/development/python-modules/miniaudio/default.nix
@@ -19,9 +19,8 @@ buildPythonPackage rec {
     sha256 = "1yx4n4zax103fmjzdiqzw37zibsh68b2p2l5qvgcnx2zrrjd31yl";
   };
 
-  propagatedBuildInputs = [
-    cffi
-  ];
+  propagatedNativeBuildInputs = [ cffi ];
+  propagatedBuildInputs = [ cffi ];
 
   checkInputs = [
     pytestCheckHook

From fdb9a4ea7965e865b77091b5b470ea9b05f2ecf9 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 22:47:54 -0600
Subject: [PATCH 126/235] python3Packages.brotlicffi: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix
index 06cb2bf75805..f78598b751a6 100644
--- a/pkgs/development/python-modules/brotlicffi/default.nix
+++ b/pkgs/development/python-modules/brotlicffi/default.nix
@@ -22,6 +22,10 @@ buildPythonPackage rec {
     brotli
   ];
 
+  propagatedNativeBuildInputs = [
+    cffi
+  ];
+
   propagatedBuildInputs = [
     cffi
   ];

From 49cbdcff9157454c2903235808855a4f735e499b Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 22:51:21 -0600
Subject: [PATCH 127/235] python3Packages.xpybutil: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/xpybutil/default.nix b/pkgs/development/python-modules/xpybutil/default.nix
index 07cfc96e7fdd..af8fda8a7d2c 100644
--- a/pkgs/development/python-modules/xpybutil/default.nix
+++ b/pkgs/development/python-modules/xpybutil/default.nix
@@ -13,7 +13,9 @@ buildPythonPackage rec {
   };
 
   # pillow is a dependency in image.py which is not listed in setup.py
-  propagatedBuildInputs = [ xcffib pillow ];
+  propagatedBuildInputs = [ pillow xcffib ];
+
+  propagatedNativeBuildInputs = [ xcffib ];
 
   checkInputs = [ nose ];
 

From 0fe2522fd29fa8394118944dabda791049046333 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 22:52:38 -0600
Subject: [PATCH 128/235] python3Packages.xcffib: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix
index 59a2c8d7c1bc..cb9e1ddf921c 100644
--- a/pkgs/development/python-modules/xcffib/default.nix
+++ b/pkgs/development/python-modules/xcffib/default.nix
@@ -23,6 +23,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ cffi six ];
 
+  propagatedNativeBuildInputs = [ cffi ];
+
   checkInputs = [ nose ];
 
   pythonImportsCheck = [ "xcffib" ];

From f632423c61ccf143828e515836bf0b514d810ea8 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 23:02:18 -0600
Subject: [PATCH 129/235] python3Packages.pykeepass: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix
index 5d23949eba62..cb893c98ac92 100644
--- a/pkgs/development/python-modules/pykeepass/default.nix
+++ b/pkgs/development/python-modules/pykeepass/default.nix
@@ -24,6 +24,8 @@ buildPythonPackage rec {
     argon2_cffi python-dateutil future
   ];
 
+  propagatedNativeBuildInputs = [ argon2_cffi ];
+
   checkPhase = ''
     ${python.interpreter} -m unittest tests.tests
   '';

From c294812a103569611b2407e9d799089ee9c76037 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 23:05:44 -0600
Subject: [PATCH 130/235] python3Packages.prox-tv: fix cross-compilation

---
 pkgs/development/python-modules/prox-tv/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix
index 1cc2ab89360f..1af942b92675 100644
--- a/pkgs/development/python-modules/prox-tv/default.nix
+++ b/pkgs/development/python-modules/prox-tv/default.nix
@@ -28,6 +28,8 @@ buildPythonPackage {
     cffi
   ];
 
+  propagatedNativeBuildInputs = [ cffi ];
+
   buildInputs = [ blas lapack ];
 
   enableParallelBuilding = true;

From 6265b71ecd7b11261392a8175255878cc45a5b2c Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 23:09:24 -0600
Subject: [PATCH 131/235] python3Packages.fastpbkdf2: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix
index e154471d7a88..51669f90345d 100644
--- a/pkgs/development/python-modules/fastpbkdf2/default.nix
+++ b/pkgs/development/python-modules/fastpbkdf2/default.nix
@@ -16,6 +16,7 @@ buildPythonPackage rec {
   buildInputs = [ openssl ];
   checkInputs = [ pytest ];
   propagatedBuildInputs = [ cffi six ];
+  propagatedNativeBuildInputs = [ cffi ];
 
   meta = with lib; {
     homepage = "https://github.com/Ayrx/python-fastpbkdf2";

From 2700a57e95d504b0c78d2ba1b37efbad54ecedd2 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Tue, 19 Oct 2021 23:10:45 -0600
Subject: [PATCH 132/235] python3Packages.cmarkgfm: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix
index 42fff42458b3..1085f4030c1e 100644
--- a/pkgs/development/python-modules/cmarkgfm/default.nix
+++ b/pkgs/development/python-modules/cmarkgfm/default.nix
@@ -14,6 +14,8 @@ buildPythonPackage rec {
     sha256 = "ec2bf8d5799c4b5bbfbae30a4a1dfcb06512f2e17e9ee60ba7e1d390318582fc";
   };
 
+  propagatedNativeBuildInputs = [ cffi ];
+
   propagatedBuildInputs = [ cffi ];
 
   checkInputs = [ pytestCheckHook ];

From 770c364217bad9abc8cc9d1793de99539bc1f22b Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Thu, 21 Oct 2021 06:50:16 -0600
Subject: [PATCH 133/235] python3Packages.pynacl: add cffi dependency also at
 runtime

---
 pkgs/development/python-modules/bcrypt/default.nix | 2 ++
 pkgs/development/python-modules/pynacl/default.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index cfd17262a2b3..d6347b179046 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -15,6 +15,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi;
 
+  propagatedNativeBuildInputs = lib.optional (!isPyPy) cffi;
+
   meta = with lib; {
     maintainers = with maintainers; [ domenkozar ];
     description = "Modern password hashing for your software and your servers";
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
index 8c5c239aeb41..91a197e7cf66 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -6,6 +6,7 @@
 , libsodium
 , cffi
 , hypothesis
+, stdenv
 , six
 }:
 
@@ -29,6 +30,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
+    cffi
     six
   ];
 

From 4ebd9ffc5b11cff884cbc05fc2008f2fe9fe18be Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Wed, 20 Oct 2021 19:04:16 -0600
Subject: [PATCH 134/235] python3Packages.cairocffi: fix cross-compilation,
 patch out unneeded tests

---
 .../python-modules/cairocffi/default.nix           |  1 -
 .../python-modules/cairocffi/generic.nix           | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index 9b64dbeb66c1..8e26517ba218 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -8,7 +8,6 @@
 , makeFontsConf
 , freefont_ttf
 , pytest
-, pytest-runner
 , glibcLocales
 , cairo
 , cffi
diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix
index cdcdbad3395d..004cf8ae7841 100644
--- a/pkgs/development/python-modules/cairocffi/generic.nix
+++ b/pkgs/development/python-modules/cairocffi/generic.nix
@@ -23,8 +23,20 @@ buildPythonPackage rec {
     fontDirectories = [ freefont_ttf ];
   };
 
-  checkInputs = [ numpy pytest pytest-runner glibcLocales ];
   propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib;
+  propagatedNativeBuildInputs = [ cffi ];
+
+  # pytestCheckHook does not work
+  checkInputs = [ numpy pytest glibcLocales ];
+
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "pytest-runner" "" \
+      --replace "pytest-cov" "" \
+      --replace "pytest-flake8" "" \
+      --replace "pytest-isort" "" \
+      --replace "--flake8 --isort" ""
+  '';
 
   checkPhase = ''
     py.test $out/${python.sitePackages}

From 55e1a4074c392e53efe3b967cca4e13543d43608 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Wed, 20 Oct 2021 19:04:28 -0600
Subject: [PATCH 135/235] python3Packages.cairosvg: fix cross-compilation,
 patch out unneeded tests

---
 .../python-modules/cairosvg/default.nix       | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix
index 5e8e8d985aab..df6600e3faac 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/pkgs/development/python-modules/cairosvg/default.nix
@@ -8,9 +8,6 @@
 , pillow
 , tinycss2
 , pytestCheckHook
-, pytest-runner
-, pytest-flake8
-, pytest-isort
 }:
 
 buildPythonPackage rec {
@@ -23,11 +20,21 @@ buildPythonPackage rec {
     sha256 = "sha256-sLmSnPXboAUXjXRqgDb88AJVUPSYylTbYYczIjhHg7w=";
   };
 
-  nativeBuildInputs = [ pytest-runner ];
-
   propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
 
-  checkInputs = [ pytestCheckHook pytest-flake8 pytest-isort ];
+  propagatedNativeBuildInputs = [ cairocffi ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "pytest-runner" "" \
+      --replace "pytest-flake8" "" \
+      --replace "pytest-isort" "" \
+      --replace "pytest-cov" "" \
+      --replace "--flake8" "" \
+      --replace "--isort" ""
+  '';
 
   pytestFlagsArray = [
     "cairosvg/test_api.py"

From e8bb837cda040f3878d2e145f8726543fe569d75 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Wed, 20 Oct 2021 19:05:04 -0600
Subject: [PATCH 136/235] python3Packages.tinycss2: 1.0.2 -> 1.1.0 + enable
 tests

---
 .../python-modules/tinycss2/default.nix       | 44 ++++++++-----------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix
index 05ca81772d81..7e49433bc2f3 100644
--- a/pkgs/development/python-modules/tinycss2/default.nix
+++ b/pkgs/development/python-modules/tinycss2/default.nix
@@ -1,44 +1,36 @@
 { lib
 , buildPythonPackage
 , pythonOlder
-, fetchPypi
-, fetchpatch
+, fetchFromGitHub
 , webencodings
-# Check inputs
-, pytest
-, pytest-runner
-, pytest-cov
-, pytest-flake8
-, pytest-isort
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "tinycss2";
-  version = "1.0.2";
+  version = "1.1.0";
   disabled = pythonOlder "3.5";
+  format = "flit";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1kw84y09lggji4krkc58jyhsfj31w8npwhznr7lf19d0zbix09v4";
+  src = fetchFromGitHub {
+    owner = "kozea";
+    repo = "tinycss2";
+    rev = "v${version}";
+    # for tests
+    fetchSubmodules = true;
+    sha256 = "sha256-WA88EYolL76WqeA1UKR3Sfw11j8NuOGOxPezujYizH8=";
   };
 
-  patches = [
-    (
-      fetchpatch {
-        name = "tinycss2-fix-pytest-flake8-fail.patch";
-        url = "https://github.com/Kozea/tinycss2/commit/6556604fb98c2153412384d6f0f705db2da1aa60.patch";
-        sha256 = "1srvdzg1bak65fawd611rlskcgn5abmwmyjnk8qrrrasr554bc59";
-      }
-    )
-  ];
-
   propagatedBuildInputs = [ webencodings ];
 
-  checkInputs = [ pytest pytest-runner pytest-cov pytest-flake8 pytest-isort ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  # https://github.com/PyCQA/pycodestyle/issues/598
-  preCheck = ''
-    printf "[flake8]\nignore=W504,E741,E126" >> setup.cfg
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "'pytest-cov', 'pytest-flake8', 'pytest-isort', 'coverage[toml]'" "" \
+      --replace "--isort --flake8 --cov" ""
   '';
 
   meta = with lib; {

From ab17d96342013d99de1c117ff4c65dd2dfbbbcf7 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Fri, 22 Oct 2021 06:59:06 -0600
Subject: [PATCH 137/235] python3Packages.argon2_cffi: fix cross-compilation,
 20.1.0 -> 21.1.0

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

diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix
index eec01adfebca..a40fb806845e 100644
--- a/pkgs/development/python-modules/argon2_cffi/default.nix
+++ b/pkgs/development/python-modules/argon2_cffi/default.nix
@@ -8,19 +8,25 @@
 , fetchPypi
 , isPy3k
 , lib
+, stdenv
 }:
 
 buildPythonPackage rec {
   pname = "argon2_cffi";
-  version = "20.1.0";
+  version = "21.1.0";
 
   src = fetchPypi {
     pname = "argon2-cffi";
     inherit version;
-    sha256 = "0zgr4mnnm0p4i99023safb0qb8cgvl202nly1rvylk2b7qnrn0nq";
+    sha256 = "sha256-9xC2EQPRofaSyj7L0Tc+KKpeVFrGJboGf/L+yhsruHA=";
   };
 
   propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34;
+
+  propagatedNativeBuildInputs = [ cffi ];
+
+  ARGON2_CFFI_USE_SSE2 = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) "0";
+
   checkInputs = [ hypothesis pytest wheel ];
   checkPhase = ''
     pytest tests

From 1cb011217d68bb068a9b9a03f6330d5778c86738 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Sat, 23 Oct 2021 07:08:31 -0600
Subject: [PATCH 138/235] python3Packages.passlib: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index 316abb2ac32c..c4bcfaf85932 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -16,6 +16,7 @@ buildPythonPackage rec {
 
   checkInputs = [ nose ];
   propagatedBuildInputs = [ bcrypt argon2_cffi ];
+  propagatedNativeBuildInputs = [ argon2_cffi ];
 
   meta = {
     description = "A password hashing library for Python";

From b045be89944305859ed37ca6ddfcaa3bb1b00a2a Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Wed, 27 Oct 2021 10:14:54 -0600
Subject: [PATCH 139/235] python3Packages.pycares: fix cross-compilation

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

diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix
index 305c2e01c566..868dbeca6c6c 100644
--- a/pkgs/development/python-modules/pycares/default.nix
+++ b/pkgs/development/python-modules/pycares/default.nix
@@ -24,6 +24,10 @@ buildPythonPackage rec {
     idna
   ];
 
+  propagatedNativeBuildInputs = [
+    cffi
+  ];
+
   # Requires network access
   doCheck = false;
 

From 8475a67e7d18b3a0344e26441dd2df8168b0c3d2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 29 Oct 2021 14:22:06 -0500
Subject: [PATCH 140/235] qtbase: bootstrap with syncqt.pl

---
 pkgs/development/libraries/qt-5/modules/qtbase.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 0d82acc70929..53c55863f6f3 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -115,6 +115,8 @@ stdenv.mkDerivation {
     sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake
     sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in
     sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+
+    patchShebangs ./bin
   '' + (
     if stdenv.isDarwin then ''
         sed -i \
@@ -149,6 +151,10 @@ stdenv.mkDerivation {
     ''}
 
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
+
+    ${lib.optionalString (compareVersion "5.15.0" >= 0) ''
+    ./bin/syncqt.pl -version $version
+    ''}
   '';
 
   postConfigure = ''

From 42f44590e08670f7b78c152f6825ccd0350d40c3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 29 Oct 2021 15:24:36 -0500
Subject: [PATCH 141/235] qtModule: say the magic words

---
 pkgs/development/libraries/qt-5/qtModule.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index 767cbc91142d..245d94f909d2 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -31,6 +31,23 @@ mkDerivation (args // {
     ${args.preConfigure or ""}
 
     fixQtBuiltinPaths . '*.pr?'
+  '' + lib.optionalString (builtins.compareVersions "5.15.0" version <= 0)
+  # Note: We use ${version%%-*} to remove any tag from the end of the version
+  # string. Version tags are added by Nixpkgs maintainers and not reflected in
+  # the source version.
+  ''
+    if [[ -z "$dontCheckQtModuleVersion" ]] \
+        && grep -q '^MODULE_VERSION' .qmake.conf 2>/dev/null \
+        && ! grep -q -F "''${version%%-*}" .qmake.conf 2>/dev/null
+    then
+      echo >&2 "error: could not find version ''${version%%-*} in .qmake.conf"
+      echo >&2 "hint: check .qmake.conf and update the package version in Nixpkgs"
+      exit 1
+    fi
+
+    if [[ -z "$dontSyncQt" ]] && [[ -f sync.profile ]]; then
+      syncqt.pl -version "''${version%%-*}"
+    fi
   '';
 
   dontWrapQtApps = args.dontWrapQtApps or true;

From 9e65eb4cee6aea2f96e6593d0990481b44ff5ff7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 29 Oct 2021 09:34:03 -0500
Subject: [PATCH 142/235] qt515: 5.15.2 -> 5.15.3

Qt 5.15.3 does not have an official open source release, but the KDE team
maintains a collection of patches (pulled from Qt upstream) that they expect us
to carry.
---
 .../libraries/qt-5/5.15/default.nix           | 118 +++---
 pkgs/development/libraries/qt-5/5.15/fetch.sh |  61 +++-
 .../libraries/qt-5/5.15/patches.nix           |  43 +++
 pkgs/development/libraries/qt-5/5.15/srcs.nix | 342 ------------------
 .../libraries/qt-5/5.15/srcs/default.nix      |  43 +++
 .../libraries/qt-5/5.15/srcs/qt3d.json        |   9 +
 .../libraries/qt-5/5.15/srcs/qtactiveqt.json  |   9 +
 .../qt-5/5.15/srcs/qtandroidextras.json       |   9 +
 .../libraries/qt-5/5.15/srcs/qtbase.json      |   9 +
 .../libraries/qt-5/5.15/srcs/qtcharts.json    |   9 +
 .../qt-5/5.15/srcs/qtconnectivity.json        |   9 +
 .../libraries/qt-5/5.15/srcs/qtdatavis3d.json |   9 +
 .../qt-5/5.15/srcs/qtdeclarative.json         |   9 +
 .../libraries/qt-5/5.15/srcs/qtdoc.json       |   9 +
 .../libraries/qt-5/5.15/srcs/qtgamepad.json   |   9 +
 .../qt-5/5.15/srcs/qtgraphicaleffects.json    |   9 +
 .../qt-5/5.15/srcs/qtimageformats.json        |   9 +
 .../libraries/qt-5/5.15/srcs/qtlocation.json  |   9 +
 .../libraries/qt-5/5.15/srcs/qtlottie.json    |   9 +
 .../libraries/qt-5/5.15/srcs/qtmacextras.json |   9 +
 .../qt-5/5.15/srcs/qtmultimedia.json          |   9 +
 .../qt-5/5.15/srcs/qtnetworkauth.json         |   9 +
 .../qt-5/5.15/srcs/qtpurchasing.json          |   9 +
 .../libraries/qt-5/5.15/srcs/qtquick3d.json   |   9 +
 .../qt-5/5.15/srcs/qtquickcontrols.json       |   9 +
 .../qt-5/5.15/srcs/qtquickcontrols2.json      |   9 +
 .../qt-5/5.15/srcs/qtquicktimeline.json       |   9 +
 .../qt-5/5.15/srcs/qtremoteobjects.json       |   9 +
 .../libraries/qt-5/5.15/srcs/qtscript.json    |   9 +
 .../libraries/qt-5/5.15/srcs/qtscxml.json     |   9 +
 .../libraries/qt-5/5.15/srcs/qtsensors.json   |   9 +
 .../libraries/qt-5/5.15/srcs/qtserialbus.json |   9 +
 .../qt-5/5.15/srcs/qtserialport.json          |   9 +
 .../libraries/qt-5/5.15/srcs/qtspeech.json    |   9 +
 .../libraries/qt-5/5.15/srcs/qtsvg.json       |   9 +
 .../libraries/qt-5/5.15/srcs/qttools.json     |   9 +
 .../qt-5/5.15/srcs/qttranslations.json        |   9 +
 .../qt-5/5.15/srcs/qtvirtualkeyboard.json     |   9 +
 .../libraries/qt-5/5.15/srcs/qtwayland.json   |   9 +
 .../qt-5/5.15/srcs/qtwebchannel.json          |   9 +
 .../qt-5/5.15/srcs/qtwebglplugin.json         |   9 +
 .../qt-5/5.15/srcs/qtwebsockets.json          |   9 +
 .../libraries/qt-5/5.15/srcs/qtwebview.json   |   9 +
 .../libraries/qt-5/5.15/srcs/qtwinextras.json |   9 +
 .../libraries/qt-5/5.15/srcs/qtx11extras.json |   9 +
 .../qt-5/5.15/srcs/qtxmlpatterns.json         |   9 +
 46 files changed, 569 insertions(+), 407 deletions(-)
 mode change 100644 => 100755 pkgs/development/libraries/qt-5/5.15/fetch.sh
 create mode 100644 pkgs/development/libraries/qt-5/5.15/patches.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qttools.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index a1d5be70c012..4db08b32b80c 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -2,15 +2,8 @@
 
 # Updates
 
-Before a major version update, make a copy of this directory. (We like to
-keep the old version around for a short time after major updates.) Add a
-top-level attribute to `top-level/all-packages.nix`.
-
-1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
-2. From the top of the Nixpkgs tree, run
-   `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`.
-3. Check that the new packages build correctly.
-4. Commit the changes and open a pull request.
+Run `./fetch.sh` to update package sources from Git.
+Check for any minor version changes.
 
 */
 
@@ -33,52 +26,61 @@ let
   stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
 
   mirror = "https://download.qt.io";
-  srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
-    # qtwebkit does not have an official release tarball on the qt mirror and is
-    # mostly maintained by the community.
-    qtwebkit = rec {
-      src = fetchFromGitHub {
-        owner = "qt";
-        repo = "qtwebkit";
-        rev = "v${version}";
-        sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
-      };
-      version = "5.212.0-alpha4";
-    };
-    qtwebengine =
-      let
-        branchName = "5.15.6";
-        rev = "v${branchName}-lts";
-      in
-      {
-        version = "${branchName}-${lib.substring 0 7 rev}";
-
-        src = fetchgit {
-          url = "https://github.com/qt/qtwebengine.git";
-          sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
-          inherit rev branchName;
-          fetchSubmodules = true;
-          leaveDotGit = true;
-          name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz";
-          postFetch = ''
-            # remove submodule .git directory
-            rm -rf "$out/src/3rdparty/.git"
-
-            # compress to not exceed the 2GB output limit
-            # try to make a deterministic tarball
-            tar -I 'gzip -n' \
-              --sort=name \
-              --mtime=1970-01-01 \
-              --owner=root --group=root \
-              --numeric-owner --mode=go=rX,u+rw,a-s \
-              --transform='s@^@source/@' \
-              -cf temp  -C "$out" .
-            rm -r "$out"
-            mv temp "$out"
-          '';
+  srcs =
+    lib.mapAttrs
+      (name: attrs:
+        {
+          inherit (attrs) version;
+          src = fetchgit (lib.importJSON attrs.json);
+        }
+      )
+      (import ./srcs)
+    // {
+      # qtwebkit does not have an official release tarball on the qt mirror and is
+      # mostly maintained by the community.
+      qtwebkit = rec {
+        src = fetchFromGitHub {
+          owner = "qt";
+          repo = "qtwebkit";
+          rev = "v${version}";
+          sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
         };
+        version = "5.212.0-alpha4";
       };
-  };
+      qtwebengine =
+        let
+          branchName = "5.15.6";
+          rev = "v${branchName}-lts";
+        in
+        {
+          version = "${branchName}-${lib.substring 0 7 rev}";
+
+          src = fetchgit {
+            url = "https://github.com/qt/qtwebengine.git";
+            sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
+            inherit rev branchName;
+            fetchSubmodules = true;
+            leaveDotGit = true;
+            name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz";
+            postFetch = ''
+              # remove submodule .git directory
+              rm -rf "$out/src/3rdparty/.git"
+
+              # compress to not exceed the 2GB output limit
+              # try to make a deterministic tarball
+              tar -I 'gzip -n' \
+                --sort=name \
+                --mtime=1970-01-01 \
+                --owner=root --group=root \
+                --numeric-owner --mode=go=rX,u+rw,a-s \
+                --transform='s@^@source/@' \
+                -cf temp  -C "$out" .
+              rm -r "$out"
+              mv temp "$out"
+            '';
+          };
+        };
+    };
 
   patches = {
     qtbase = lib.optionals stdenv.isDarwin [
@@ -107,16 +109,6 @@ let
       ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch
       ./qtbase.patch.d/0010-qtbase-assert.patch
       ./qtbase.patch.d/0011-fix-header_module.patch
-      (fetchpatch { # This can be removed when https://codereview.qt-project.org/c/qt/qtbase/+/339323 is included in an release.
-        name = "0014-gcc11-compat.patch";
-        url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=049e14870c13235cd066758f29c42dc96c1ccdf8";
-        sha256 = "1cb2hwi859hds0fa2cbap014qaa7mah9p0rcxcm2cvj2ybl33qfc";
-      })
-      (fetchpatch { # This can be removed when https://codereview.qt-project.org/c/qt/qtbase/+/363880/3 is included in an release.
-        name = "qtbase-mysql-version-vs-functionality-check.patch";
-        url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=211369133cf40b2f522caaff259c19069ed23ca4";
-        sha256 = "19kq9h10qm344fpdqa9basrbzh1y5kr48c6jzz3nvk61pk4ja1k4";
-      })
     ];
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh
old mode 100644
new mode 100755
index 81ceb3ef77ea..e2c0d36903f7
--- a/pkgs/development/libraries/qt-5/5.15/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh
@@ -1,2 +1,59 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/ \
-            -A '*.tar.xz' )
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix-prefetch-scripts jq
+
+set -x -e -o pipefail
+
+module_list=( \
+    qt3d \
+    qtactiveqt \
+    qtandroidextras \
+    qtbase \
+    qtcharts \
+    qtconnectivity \
+    qtdatavis3d \
+    qtdeclarative \
+    qtdoc \
+    qtgamepad \
+    qtgraphicaleffects \
+    qtimageformats \
+    qtlocation \
+    qtlottie \
+    qtmacextras \
+    qtmultimedia \
+    qtnetworkauth \
+    qtpurchasing \
+    qtquick3d \
+    qtquickcontrols \
+    qtquickcontrols2 \
+    qtquicktimeline \
+    qtremoteobjects \
+    qtscript \
+    qtscxml \
+    qtsensors \
+    qtserialbus \
+    qtserialport \
+    qtspeech \
+    qtsvg \
+    qttools \
+    qttranslations \
+    qtvirtualkeyboard \
+    qtwayland \
+    qtwebchannel \
+    qtwebglplugin \
+    qtwebsockets \
+    qtwebview \
+    qtwinextras \
+    qtx11extras \
+    qtxmlpatterns \
+    )
+
+srcs="$(dirname "${BASH_SOURCE[0]}")/srcs"
+mkdir -p "$srcs"
+
+for module in "${module_list[@]}"
+do
+    url="https://invent.kde.org/qt/qt/${module}.git"
+    nix-prefetch-git --url $url --rev refs/heads/kde/5.15 \
+        | jq '{url,rev,sha256,fetchLFS,fetchSubmodules,deepClone,leaveDotGit}' \
+        > "${srcs}/${module}.json"
+done
diff --git a/pkgs/development/libraries/qt-5/5.15/patches.nix b/pkgs/development/libraries/qt-5/5.15/patches.nix
new file mode 100644
index 000000000000..e3a08769e8c5
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/patches.nix
@@ -0,0 +1,43 @@
+{
+qt3d = {name="qt3d-5.15.patch";url="https://invent.kde.org/qt/qt/qt3d.git";fromRev="34171b1d99f55fde1627df3c57eed50480ab2ae7";toRev="7edec6e014de27b9dd03f63875c471aac606a918";sha256="12hrq0arwhfk8blqjrb24rcka9cy2asg0mpfck63khcmjhqyaic9";};
+qtactiveqt = {name="qtactiveqt-5.15.patch";url="https://invent.kde.org/qt/qt/qtactiveqt.git";fromRev="0c62d8262fb2a4779e05e95d112f08125031b640";toRev="f0d03da0e37a84029a4eae1733813521482ac1fb";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
+qtandroidextras = {name="qtandroidextras-5.15.patch";url="https://invent.kde.org/qt/qt/qtandroidextras.git";fromRev="505be55243ba1600f62f47f9be3011a717841096";toRev="8cce1098c59534352aa0f343ea73861f603ac04a";sha256="1zjinv99mh2w49nshprdssl1ybjb7av7m6i85pd2gc97shvn6g77";};
+qtbase = {name="qtbase-5.15.patch";url="https://invent.kde.org/qt/qt/qtbase.git";fromRev="40143c189b7c1bf3c2058b77d00ea5c4e3be8b28";toRev="c9fde86b0a2440133bc08f4811b6ca793be47f0a";sha256="0rax1ic031b14456sz3a5v2m3h6yarfv0nlfw27k41d43wrbbg1x";};
+qtcharts = {name="qtcharts-5.15.patch";url="https://invent.kde.org/qt/qt/qtcharts.git";fromRev="a67f812548b008e3eedcd2bb9313828a195fd23b";toRev="130463160b4923069eb98da49edaf7d93180f4f8";sha256="0va2ykp4lcni7xxlmpjqlwsjbal48sbwmx7kfswm7z0a9ps4py3d";};
+qtconnectivity = {name="qtconnectivity-5.15.patch";url="https://invent.kde.org/qt/qt/qtconnectivity.git";fromRev="ca6cc606d9fc0947ea6c27738a1ca8f12f3258ea";toRev="69a87a9b831e36a578594a0a13130c384ad03121";sha256="1kjw83h66hfg2qbfcw5xnr1x5cicp2snmgz5wjqg45z5bkk517bs";};
+qtdatavis3d = {name="qtdatavis3d-5.15.patch";url="https://invent.kde.org/qt/qt/qtdatavis3d.git";fromRev="1168c788a117e4556e6cd0ba1e267a86ef62b0c4";toRev="c085311c02dd216e5a041b90c164d55b3cf3ce92";sha256="16vzmdcfd8r4h7k28b7k48nlzn4smzf0903qjfy565ydpmwnhm07";};
+qtdeclarative = {name="qtdeclarative-5.15.patch";url="https://invent.kde.org/qt/qt/qtdeclarative.git";fromRev="104eae5b17b0ec700391e9539ee3a4f638588194";toRev="55324650f9e759a43dce927f823c9858574106c3";sha256="0jb0bcg4r8sry3dcx5am9w4qcn1zx1a30lwyr3wxry11m81lsbd0";};
+qtdoc = {name="qtdoc-5.15.patch";url="https://invent.kde.org/qt/qt/qtdoc.git";fromRev="2d00e0060b2894481c8f46577ac995aeda4a7641";toRev="897e90fe304d844beaf694b82a93a50237fa8b9e";sha256="0qfvcy6lj7fb3fazg6q6j05qdank6ba5najz3sw4m7r6dybf8nwl";};
+qtgamepad = {name="qtgamepad-5.15.patch";url="https://invent.kde.org/qt/qt/qtgamepad.git";fromRev="ff933a4e72826a77c81c4153f1adcf765ead35f0";toRev="64afa18a0a1e9588060e2e6d917bb01ccdd48a81";sha256="1gcas9mxs409rzsmmi40gf16vcy4kv17hd1sf1h7k315inixyppk";};
+qtgraphicaleffects = {name="qtgraphicaleffects-5.15.patch";url="https://invent.kde.org/qt/qt/qtgraphicaleffects.git";fromRev="66b7fbaca4b323dce337e87e3093c8836577c561";toRev="c36998dc1581167b12cc3de8e4ac68c2a5d9f76e";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
+qtimageformats = {name="qtimageformats-5.15.patch";url="https://invent.kde.org/qt/qt/qtimageformats.git";fromRev="74a5bc4a45195b876454e596e76cb23aeb365410";toRev="cb82c74310837fe4e832c8ab72176a5d63e4355f";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
+qtlocation = {name="qtlocation-5.15.patch";url="https://invent.kde.org/qt/qt/qtlocation.git";fromRev="02a21217a9706402802f38c646797be8eccb86e4";toRev="861e372b6ad81570d4f496e42fb25a6699b72f2f";sha256="144bz04071dcdhqi0z1yzpsbkzj634vdig11hv3y6ykh3400x606";};
+qtlottie = {name="qtlottie-5.15.patch";url="https://invent.kde.org/qt/qt/qtlottie.git";fromRev="b182dcd78a35b4667b2568857b7719d555c7fddb";toRev="fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4";sha256="0s6p3gs8mrc824699wrbazkfl169midmnyzvp4cnml8grfl89azj";};
+qtmacextras = {name="qtmacextras-5.15.patch";url="https://invent.kde.org/qt/qt/qtmacextras.git";fromRev="65f500c488c593486c6c390f53497dfbce1b58a6";toRev="e72896968697e2a8af16a312e1560948e4c40f30";sha256="10bqq6msnryqr8ald4hlhga4f6qhmrkl6ygwpnkqgyq577n4jz0p";};
+qtmultimedia = {name="qtmultimedia-5.15.patch";url="https://invent.kde.org/qt/qt/qtmultimedia.git";fromRev="fd30913d4601d12437404e1d20113a1ed6364ccc";toRev="bd29c87027637a013f2c5e3b549fcda84e4d7545";sha256="15kvask4kabpnmwpyc1rbr8ybhnmzdycznb5r72n4f4scznzjmi8";};
+qtnetworkauth = {name="qtnetworkauth-5.15.patch";url="https://invent.kde.org/qt/qt/qtnetworkauth.git";fromRev="fb2d6d47a0c961278d63309789a1141c3734818b";toRev="53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a";sha256="0s6p3gs8mrc824699wrbazkfl169midmnyzvp4cnml8grfl89azj";};
+qtpurchasing = {name="qtpurchasing-5.15.patch";url="https://invent.kde.org/qt/qt/qtpurchasing.git";fromRev="ddfa4d16243128d2871a51c513e025d518151b17";toRev="cbf444fb570ca4f4ca21d963d2ae4010f10d473e";sha256="0z1dax7g5p1dza5d96aayvi9chzmkrl6s3yfr3xn7jhxwf0r51fp";};
+qtquick3d = {name="qtquick3d-5.15.patch";url="https://invent.kde.org/qt/qt/qtquick3d.git";fromRev="2e05e6d6546635a8f25882c5140fb17697be0062";toRev="3e3e53c834b25dc2959dd30f319d12d6f84ee1e3";sha256="0kckgix393qqcpz5wlpvpkfmrj921bvnjzp13ka7dn1ys5rzac4z";};
+qtquickcontrols = {name="qtquickcontrols-5.15.patch";url="https://invent.kde.org/qt/qt/qtquickcontrols.git";fromRev="7c29283041a50def3ceca7de4471f211c9b30d4e";toRev="cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420";sha256="0843jcggynzgv3ymvnkhgvfs44z56bmg7n2gl8f75nziwn5yi840";};
+qtquickcontrols2 = {name="qtquickcontrols2-5.15.patch";url="https://invent.kde.org/qt/qt/qtquickcontrols2.git";fromRev="16f27dfa3588c2bf377568ce00bf534af48c9558";toRev="be66bf9a5618c745d2a6ee2262967af6307b3b07";sha256="1jjbvp9cwdxqy8lm1jm9b20w1jxl4f15sn2m0sz38bnch5n3s3kv";};
+qtquicktimeline = {name="qtquicktimeline-5.15.patch";url="https://invent.kde.org/qt/qt/qtquicktimeline.git";fromRev="147ad75c589fc4804429710fdb177cc48a80dbea";toRev="67503cdadea43b95ddad0de1a04951aff0ce1a07";sha256="0c2cdvb2l488qzpaymfl1yik21iydqrdqjf95cdjif6pnb42xwxi";};
+qtremoteobjects = {name="qtremoteobjects-5.15.patch";url="https://invent.kde.org/qt/qt/qtremoteobjects.git";fromRev="8e889442508e284691c923470eb4552c96afdfe3";toRev="4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735";sha256="11f65d8bfkj7k9jfq780hki9kwndwgvnj355w4xbfs0icm4l7ggn";};
+qtscript = {name="qtscript-5.15.patch";url="https://invent.kde.org/qt/qt/qtscript.git";fromRev="5da7de1800eee3d604eb7e787b114479b61ffc93";toRev="5cec94b2c1503f106f4ef4778d016410ebb86211";sha256="0nndn6aia39m9zfydg471fxiyjwfayvygzh600aqnl2h8d912n1x";};
+qtscxml = {name="qtscxml-5.15.patch";url="https://invent.kde.org/qt/qt/qtscxml.git";fromRev="95aa78be795a862b95371afa75e1417029ec0a16";toRev="7a15000f42c7a3171719727cd056f82a78244ed7";sha256="0b7xqd5lpkjsgivi58g7f09i9rv1dpl1b4wrfgbxlff2scfy0vjh";};
+qtsensors = {name="qtsensors-5.15.patch";url="https://invent.kde.org/qt/qt/qtsensors.git";fromRev="5618198e6df5e0224f79f786a44af7527b431545";toRev="921a31375f29e429e95352b08b2b9dbfea663cb1";sha256="1xjdw99fvnp4pb9qgj32rpj3zfh6nkb8k4ax9c8z1yk04ra0rq3n";};
+qtserialbus = {name="qtserialbus-5.15.patch";url="https://invent.kde.org/qt/qt/qtserialbus.git";fromRev="1aa9b03756baead139943712839af5ecedeb2989";toRev="8884c5e43df846deac5a0c7c290eeb633d6bfe32";sha256="05dl7xkxwxs42shrykpq8jz9a8b9l60anp965cv4qb19zglwvcfm";};
+qtserialport = {name="qtserialport-5.15.patch";url="https://invent.kde.org/qt/qt/qtserialport.git";fromRev="192e376b01e65e7277772bdc94106613c22cf531";toRev="941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
+qtspeech = {name="qtspeech-5.15.patch";url="https://invent.kde.org/qt/qt/qtspeech.git";fromRev="84dd22a080014cb99a7dff7772990787a04ca533";toRev="a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b";sha256="1vspazk7lh6idwnmh935fhjxa2f8yp3h7vyb3chli99ygh0386vx";};
+qtsvg = {name="qtsvg-5.15.patch";url="https://invent.kde.org/qt/qt/qtsvg.git";fromRev="52d3788c7b0116ea3db232dccca5f1e3f1e229ac";toRev="24128cdf8bef53eddf31a5709bbbc46293006b1c";sha256="018a1w6k7911ydim7h2z8mg1dqrfvllr874jqr9kylp2ymq95hhv";};
+qttools = {name="qttools-5.15.patch";url="https://invent.kde.org/qt/qt/qttools.git";fromRev="cc52debd905e0ed061290d6fd00a5f1ab67478a5";toRev="33693a928986006d79c1ee743733cde5966ac402";sha256="0hwpr3qalzn9hljakicpdwqd66mxghzqhi4896kscqy41db3mym3";};
+qttranslations = {name="qttranslations-5.15.patch";url="https://invent.kde.org/qt/qt/qttranslations.git";fromRev="cb1857418b36780b0444333f3aa6250ca3780f19";toRev="8fbbdf21f127197f97b58c7d80d2fa2a59135638";sha256="0p47ima4dn8sjhhg6c0qr0jip0q4akvi5xm2wxj62dlzr8d0zv14";};
+qtvirtualkeyboard = {name="qtvirtualkeyboard-5.15.patch";url="https://invent.kde.org/qt/qt/qtvirtualkeyboard.git";fromRev="7b90415c58dd02c682a9ba317f273d7b3398ff88";toRev="353b75b2e34bdae901625bbddf5c5e3f3e6c0de5";sha256="19azki7yi83dkc05asclrkj0lf14x927l30xpg5lj2p2mz1cf1mr";};
+qtwayland = {name="qtwayland-5.15.patch";url="https://invent.kde.org/qt/qt/qtwayland.git";fromRev="3cc17177b1b03053276eb6236fda137c588261a7";toRev="992833ca741efe8f533c61abfaf129a1d8bfcfee";sha256="072zp6fksjig1y1cw4jm7wv60qd9hdci7cx1hxhfw1r4c7k012wp";};
+qtwebchannel = {name="qtwebchannel-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebchannel.git";fromRev="90cffd49575b075b0dc28440c693753d860fee87";toRev="47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38";sha256="0irxngxg23kwf7zmbr5k5lzqfbyf1zh5smjkpl3dvx444qqxgrdl";};
+qtwebglplugin = {name="qtwebglplugin-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebglplugin.git";fromRev="5e41e564aaf96b7e49403af5099995efbe4cac8e";toRev="550a8cee241bbf8c11863dec9587d579dcb1108b";sha256="12iv161qmapakrb4awkpqzwq4r366fbgm344p0b3zsw7jzkqigw8";};
+qtwebsockets = {name="qtwebsockets-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebsockets.git";fromRev="f73735911b2124ef16aa39228bf8f89ee900ba5d";toRev="e7883bc64440b1ff4666272ac6eb710ee4bc221b";sha256="0sjg8m2sd6rlg5asjb6ddh8rd6c0pp7l1532al1br00b861al5yi";};
+qtwebview = {name="qtwebview-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebview.git";fromRev="800926cc4e0ecfdb37a3b34486403354b66a37a4";toRev="920de5f1cd9f9001cfef1bfd2c19e6720793362f";sha256="10bqq6msnryqr8ald4hlhga4f6qhmrkl6ygwpnkqgyq577n4jz0p";};
+qtwinextras = {name="qtwinextras-5.15.patch";url="https://invent.kde.org/qt/qt/qtwinextras.git";fromRev="41f2492a30be21f28c8b0b7b932b886536fc9916";toRev="3df03dab21f3e84d5a7274c64dd879854ca1bfe7";sha256="10bqq6msnryqr8ald4hlhga4f6qhmrkl6ygwpnkqgyq577n4jz0p";};
+qtx11extras = {name="qtx11extras-5.15.patch";url="https://invent.kde.org/qt/qt/qtx11extras.git";fromRev="9bb0adeac84da6723cf57a2bb0d0c3b405691a15";toRev="3898f5484fd4864b047729bfeda9a1222f32364f";sha256="0al27mckfgfcrqvf0x3didaina2rj4xi3hp6vdpz5i6p3z4ws8wq";};
+qtxmlpatterns = {name="qtxmlpatterns-5.15.patch";url="https://invent.kde.org/qt/qt/qtxmlpatterns.git";fromRev="50421402f05b3ee3c76c6cff455a69efaf576b6d";toRev="189e28d0aff1f3d7960228ba318b83e3cadac98c";sha256="0hxsxk6l4x8h6q053lm65wxkl3di3qx9z8rjn0w1nxs051q1szch";};
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
deleted file mode 100644
index 70e9c3a80225..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ /dev/null
@@ -1,342 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.15
-{ fetchurl, mirror }:
-
-{
-  qt3d = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz";
-      sha256 = "03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d";
-      name = "qt3d-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtactiveqt = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtactiveqt-everywhere-src-5.15.2.tar.xz";
-      sha256 = "868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c";
-      name = "qtactiveqt-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtandroidextras = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtandroidextras-everywhere-src-5.15.2.tar.xz";
-      sha256 = "5813278690d89a9c232eccf697fc280034de6f9f02a7c40d95ad5fcf8ac8dabd";
-      name = "qtandroidextras-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtbase = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz";
-      sha256 = "909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8";
-      name = "qtbase-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtcharts = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz";
-      sha256 = "e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11";
-      name = "qtcharts-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtconnectivity = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz";
-      sha256 = "0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0";
-      name = "qtconnectivity-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtdatavis3d = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdatavis3d-everywhere-src-5.15.2.tar.xz";
-      sha256 = "226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd";
-      name = "qtdatavis3d-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtdeclarative = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz";
-      sha256 = "c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651";
-      name = "qtdeclarative-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtdoc = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdoc-everywhere-src-5.15.2.tar.xz";
-      sha256 = "a47809f00f1bd690ca4e699cb32ffe7717d43da84e0167d1f562210da7714ce4";
-      name = "qtdoc-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtgamepad = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz";
-      sha256 = "c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c";
-      name = "qtgamepad-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtgraphicaleffects = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz";
-      sha256 = "ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4";
-      name = "qtgraphicaleffects-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtimageformats = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz";
-      sha256 = "bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7";
-      name = "qtimageformats-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtlocation = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz";
-      sha256 = "984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0";
-      name = "qtlocation-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtlottie = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz";
-      sha256 = "cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517";
-      name = "qtlottie-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtmacextras = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmacextras-everywhere-src-5.15.2.tar.xz";
-      sha256 = "6959b0f2cec71cd66800f36cab797430860e55fa33c9c23698d6a08fc2b8776e";
-      name = "qtmacextras-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtmultimedia = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz";
-      sha256 = "0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5";
-      name = "qtmultimedia-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtnetworkauth = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtnetworkauth-everywhere-src-5.15.2.tar.xz";
-      sha256 = "fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85";
-      name = "qtnetworkauth-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtpurchasing = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtpurchasing-everywhere-src-5.15.2.tar.xz";
-      sha256 = "87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227";
-      name = "qtpurchasing-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtquick3d = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquick3d-everywhere-src-5.15.2.tar.xz";
-      sha256 = "5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb";
-      name = "qtquick3d-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtquickcontrols = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz";
-      sha256 = "c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5";
-      name = "qtquickcontrols-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtquickcontrols2 = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz";
-      sha256 = "671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919";
-      name = "qtquickcontrols2-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtquicktimeline = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz";
-      sha256 = "b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28";
-      name = "qtquicktimeline-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtremoteobjects = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz";
-      sha256 = "6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2";
-      name = "qtremoteobjects-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtscript = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz";
-      sha256 = "a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e";
-      name = "qtscript-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtscxml = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz";
-      sha256 = "60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc";
-      name = "qtscxml-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtsensors = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz";
-      sha256 = "3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839";
-      name = "qtsensors-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtserialbus = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz";
-      sha256 = "aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88";
-      name = "qtserialbus-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtserialport = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz";
-      sha256 = "59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d";
-      name = "qtserialport-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtspeech = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtspeech-everywhere-src-5.15.2.tar.xz";
-      sha256 = "c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5";
-      name = "qtspeech-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtsvg = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz";
-      sha256 = "8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e";
-      name = "qtsvg-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qttools = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz";
-      sha256 = "c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc";
-      name = "qttools-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qttranslations = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttranslations-everywhere-src-5.15.2.tar.xz";
-      sha256 = "d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8";
-      name = "qttranslations-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtvirtualkeyboard = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz";
-      sha256 = "9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55";
-      name = "qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwayland = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz";
-      sha256 = "193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5";
-      name = "qtwayland-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwebchannel = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz";
-      sha256 = "127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1";
-      name = "qtwebchannel-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwebengine = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz";
-      sha256 = "c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0";
-      name = "qtwebengine-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwebglplugin = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebglplugin-everywhere-src-5.15.2.tar.xz";
-      sha256 = "81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446";
-      name = "qtwebglplugin-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwebsockets = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz";
-      sha256 = "a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f";
-      name = "qtwebsockets-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwebview = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz";
-      sha256 = "be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7";
-      name = "qtwebview-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwinextras = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwinextras-everywhere-src-5.15.2.tar.xz";
-      sha256 = "65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e";
-      name = "qtwinextras-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtx11extras = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz";
-      sha256 = "7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e";
-      name = "qtx11extras-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtxmlpatterns = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz";
-      sha256 = "76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa";
-      name = "qtxmlpatterns-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/default.nix b/pkgs/development/libraries/qt-5/5.15/srcs/default.nix
new file mode 100644
index 000000000000..929ab60d4d66
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/default.nix
@@ -0,0 +1,43 @@
+{
+  qt3d = { version = "5.15.3"; json = ./qt3d.json; };
+  qtactiveqt = { version = "5.15.3"; json = ./qtactiveqt.json; };
+  qtandroidextras = { version = "5.15.3"; json = ./qtandroidextras.json; };
+  qtbase = { version = "5.15.3"; json = ./qtbase.json; };
+  qtcharts = { version = "5.15.3"; json = ./qtcharts.json; };
+  qtconnectivity = { version = "5.15.3"; json = ./qtconnectivity.json; };
+  qtdatavis3d = { version = "5.15.3"; json = ./qtdatavis3d.json; };
+  qtdeclarative = { version = "5.15.3"; json = ./qtdeclarative.json; };
+  qtdoc = { version = "5.15.3"; json = ./qtdoc.json; };
+  qtgamepad = { version = "5.15.3"; json = ./qtgamepad.json; };
+  qtgraphicaleffects = { version = "5.15.3"; json = ./qtgraphicaleffects.json; };
+  qtimageformats = { version = "5.15.3"; json = ./qtimageformats.json; };
+  qtlocation = { version = "5.15.3"; json = ./qtlocation.json; };
+  qtlottie = { version = "5.15.3"; json = ./qtlottie.json; };
+  qtmacextras = { version = "5.15.3"; json = ./qtmacextras.json; };
+  qtmultimedia = { version = "5.15.3"; json = ./qtmultimedia.json; };
+  qtnetworkauth = { version = "5.15.3"; json = ./qtnetworkauth.json; };
+  qtpurchasing = { version = "5.15.3"; json = ./qtpurchasing.json; };
+  qtquick3d = { version = "5.15.3"; json = ./qtquick3d.json; };
+  qtquickcontrols = { version = "5.15.3"; json = ./qtquickcontrols.json; };
+  qtquickcontrols2 = { version = "5.15.3"; json = ./qtquickcontrols2.json; };
+  qtquicktimeline = { version = "5.15.3"; json = ./qtquicktimeline.json; };
+  qtremoteobjects = { version = "5.15.3"; json = ./qtremoteobjects.json; };
+  qtscript = { version = "5.15.4"; json = ./qtscript.json; };
+  qtscxml = { version = "5.15.3"; json = ./qtscxml.json; };
+  qtsensors = { version = "5.15.3"; json = ./qtsensors.json; };
+  qtserialbus = { version = "5.15.3"; json = ./qtserialbus.json; };
+  qtserialport = { version = "5.15.3"; json = ./qtserialport.json; };
+  qtspeech = { version = "5.15.3"; json = ./qtspeech.json; };
+  qtsvg = { version = "5.15.3"; json = ./qtsvg.json; };
+  qttools = { version = "5.15.3"; json = ./qttools.json; };
+  qttranslations = { version = "5.15.3"; json = ./qttranslations.json; };
+  qtvirtualkeyboard = { version = "5.15.3"; json = ./qtvirtualkeyboard.json; };
+  qtwayland = { version = "5.15.3"; json = ./qtwayland.json; };
+  qtwebchannel = { version = "5.15.3"; json = ./qtwebchannel.json; };
+  qtwebglplugin = { version = "5.15.3"; json = ./qtwebglplugin.json; };
+  qtwebsockets = { version = "5.15.3"; json = ./qtwebsockets.json; };
+  qtwebview = { version = "5.15.3"; json = ./qtwebview.json; };
+  qtwinextras = { version = "5.15.3"; json = ./qtwinextras.json; };
+  qtx11extras = { version = "5.15.3"; json = ./qtx11extras.json; };
+  qtxmlpatterns = { version = "5.15.3"; json = ./qtxmlpatterns.json; };
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json b/pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json
new file mode 100644
index 000000000000..2beb42f0fe96
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qt3d.git",
+  "rev": "7edec6e014de27b9dd03f63875c471aac606a918",
+  "sha256": "0qv4vhciigqd8bnqzrs7y71ls7jx1p9cal2rh78m42qgskk1ci59",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json
new file mode 100644
index 000000000000..01e514ebb66d
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
+  "rev": "f0d03da0e37a84029a4eae1733813521482ac1fb",
+  "sha256": "0llk76lf0mh4mzj7pwd8cs55wpmfq8v1bsdzvizb1sx0vfbjh8g6",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json
new file mode 100644
index 000000000000..62ceb5aa8f98
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
+  "rev": "8cce1098c59534352aa0f343ea73861f603ac04a",
+  "sha256": "130a1yda2m7pa10as3rccz84m3617422n6s51pdn4kp8p8rk7cs6",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json
new file mode 100644
index 000000000000..37e249040f14
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtbase.git",
+  "rev": "c9fde86b0a2440133bc08f4811b6ca793be47f0a",
+  "sha256": "1fqhdkv3sp3nbzqi2a5wvxn5d4v0xcrq2bl609bdyj4nx367a8wp",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json
new file mode 100644
index 000000000000..560489a6e217
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtcharts.git",
+  "rev": "130463160b4923069eb98da49edaf7d93180f4f8",
+  "sha256": "19g35cddbfh307mk76wac1ps03warynlsj7xi8i596bxiaf7i4pw",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json
new file mode 100644
index 000000000000..c606975bfe51
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
+  "rev": "69a87a9b831e36a578594a0a13130c384ad03121",
+  "sha256": "0ph07rdf9qfxnw3z2nqbmh6na65z0p2snmlzdw80amd7s0g255kw",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json
new file mode 100644
index 000000000000..278e3ec4df62
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
+  "rev": "c085311c02dd216e5a041b90c164d55b3cf3ce92",
+  "sha256": "0xya1m2csb42yisl90s9822p9q92n7ags909nlbapfsb49qwsqnj",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json
new file mode 100644
index 000000000000..868c49c5a2ea
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
+  "rev": "55324650f9e759a43dce927f823c9858574106c3",
+  "sha256": "0cxz4pqvb8l0wqpc4hr0xmc72csqf7dpbbzdqgil9nyyg21ihkz0",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json
new file mode 100644
index 000000000000..c00f65fd10d3
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtdoc.git",
+  "rev": "897e90fe304d844beaf694b82a93a50237fa8b9e",
+  "sha256": "1c4m9vlgg6bfw7hwzanl5s4vslg0r7xiz50lanhqrlcrr9i36xs1",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json
new file mode 100644
index 000000000000..f3cbee2dedc7
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtgamepad.git",
+  "rev": "64afa18a0a1e9588060e2e6d917bb01ccdd48a81",
+  "sha256": "1h9yb0asprynnb2qyjbmyglrkk9f9v19g6zzpk0gmixrp0h8gk46",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json
new file mode 100644
index 000000000000..c78f288919f9
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
+  "rev": "c36998dc1581167b12cc3de8e4ac68c2a5d9f76e",
+  "sha256": "0x11n2fym765z3gyb4xnfl7v6zrip1wjkkl6nx1bxaya173fvdw8",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json
new file mode 100644
index 000000000000..28795710b1e9
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtimageformats.git",
+  "rev": "cb82c74310837fe4e832c8ab72176a5d63e4355f",
+  "sha256": "0j4cv5sa6mm3adcjw8cv6kbzrslmhjc1rgxqgc130l8vm3vmgbkr",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json
new file mode 100644
index 000000000000..4ed826b65562
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtlocation.git",
+  "rev": "861e372b6ad81570d4f496e42fb25a6699b72f2f",
+  "sha256": "1g24pg9v6sv5zf80r48innp3h4g0hss69hnr7ygfzfvfnmmn6g52",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json
new file mode 100644
index 000000000000..ed255997b77b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtlottie.git",
+  "rev": "fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4",
+  "sha256": "1xgykaw8qjnaip6h9jx0nfadc9amb6aclk758vm5pp43dvs5j96r",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json
new file mode 100644
index 000000000000..9aa1128ce26e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtmacextras.git",
+  "rev": "e72896968697e2a8af16a312e1560948e4c40f30",
+  "sha256": "1hndpbr1nnybn7frg76q99bk1c8fhvra6wjm0q78p4a8pinrvcms",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json
new file mode 100644
index 000000000000..93b26b6734eb
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
+  "rev": "bd29c87027637a013f2c5e3b549fcda84e4d7545",
+  "sha256": "11pz9zzrhsr3n78ga7l3kp3gi20rpxsa4iz3wclhcbcm2xr3nd94",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json
new file mode 100644
index 000000000000..fa0c49185f52
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
+  "rev": "53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a",
+  "sha256": "0idaysqpwrghih7ijrm9hagj9jw3fy9nw539fr4d9rmcggnkkzn2",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json
new file mode 100644
index 000000000000..90c086794cbe
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
+  "rev": "cbf444fb570ca4f4ca21d963d2ae4010f10d473e",
+  "sha256": "1cki7n62wqm3xxn36mka0y67ngn7jvjkrvr08vsassbjb7kfsmxp",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json
new file mode 100644
index 000000000000..3cb8d7dcc809
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtquick3d.git",
+  "rev": "3e3e53c834b25dc2959dd30f319d12d6f84ee1e3",
+  "sha256": "1b1khfg26zl3p28yvhwjfldqy3flh10pb5hm5z0av03rz7jy7l8s",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json
new file mode 100644
index 000000000000..6bd93cf62c32
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
+  "rev": "cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420",
+  "sha256": "1vxp0kwigwhqyyfm0xg8llyd1l1f4l18hmk6xqkm57xpi15x55bc",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json
new file mode 100644
index 000000000000..fcacda36609f
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
+  "rev": "be66bf9a5618c745d2a6ee2262967af6307b3b07",
+  "sha256": "11h3f3rb2kqgsw7njzhjwazw1k03v12i83irjndylafiaqw6c6ks",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json
new file mode 100644
index 000000000000..3a99df32920b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
+  "rev": "67503cdadea43b95ddad0de1a04951aff0ce1a07",
+  "sha256": "0h4b3ibcf6rsmqmcfbwbk9pbvw3b9cac8nx2538aqvnpyyp1vhid",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json
new file mode 100644
index 000000000000..5b1aefb8d40a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
+  "rev": "4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735",
+  "sha256": "1zbxl5jk7x8qklrnbbaikymyviigqdq7vf0wc8gzls4126vcx146",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json
new file mode 100644
index 000000000000..3aefd77854c5
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtscript.git",
+  "rev": "5cec94b2c1503f106f4ef4778d016410ebb86211",
+  "sha256": "1xdri98cw7m78k9kfb53cgh8wyz98q3i623jhhcv01rvy1zsf8m1",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json
new file mode 100644
index 000000000000..b792b71119cf
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtscxml.git",
+  "rev": "7a15000f42c7a3171719727cd056f82a78244ed7",
+  "sha256": "1i2ajsj9pb1s4lk4djj1h1ay9mkz1z3m75a747cspyc1p1iymipq",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json
new file mode 100644
index 000000000000..2d2e1c7ea689
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtsensors.git",
+  "rev": "921a31375f29e429e95352b08b2b9dbfea663cb1",
+  "sha256": "1ijayk6lf34nwv7s3ib3cfqx9sjrmr1c6jnziwmxa1l6fy3ik4g8",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json
new file mode 100644
index 000000000000..cea79ff4c553
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtserialbus.git",
+  "rev": "8884c5e43df846deac5a0c7c290eeb633d6bfe32",
+  "sha256": "1ydb5x21j26pl58mr6klnwixkqx8h119nvnzvyawz83gji3ay3a5",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json
new file mode 100644
index 000000000000..a4e09c149052
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtserialport.git",
+  "rev": "941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4",
+  "sha256": "0x7ly67gddmz0hqls9109bk4rgaa97ksyv24qk4brrhzkpr7q9cx",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json
new file mode 100644
index 000000000000..317bafe92c16
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtspeech.git",
+  "rev": "a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b",
+  "sha256": "1ljf45f65pfp8x367qnzl0ssz7n17cxhk29qvqpz9z7rh65zqix5",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json
new file mode 100644
index 000000000000..9e4d5b2ea870
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtsvg.git",
+  "rev": "24128cdf8bef53eddf31a5709bbbc46293006b1c",
+  "sha256": "0vinjcbq4saxhlmvb5i93bzgg30qc3j8r2qfwrzaxc4vmfhfgi56",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qttools.json b/pkgs/development/libraries/qt-5/5.15/srcs/qttools.json
new file mode 100644
index 000000000000..9045142a54ee
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qttools.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qttools.git",
+  "rev": "33693a928986006d79c1ee743733cde5966ac402",
+  "sha256": "02n0lppsp6g4s9bdvnfxpf7ndkbs9bzm0clcwvirwf2cd8q95a4n",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json b/pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json
new file mode 100644
index 000000000000..09e8ac32031a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qttranslations.git",
+  "rev": "8fbbdf21f127197f97b58c7d80d2fa2a59135638",
+  "sha256": "06r2jb2fsdr5fvxs748war0lr4mm3l3d3b37xc4n73y294vwrmn7",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json
new file mode 100644
index 000000000000..76a20b6ca5d5
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
+  "rev": "353b75b2e34bdae901625bbddf5c5e3f3e6c0de5",
+  "sha256": "12nv773zc05yrbai1z6i481yinih0kxcjzgm9pa0580qz69gd9a5",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json
new file mode 100644
index 000000000000..25b267c66c1f
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtwayland.git",
+  "rev": "992833ca741efe8f533c61abfaf129a1d8bfcfee",
+  "sha256": "1w8mq38k6s0fncqv113bw1pc7g10ysfmsbyg23hxh9fr5q4ia4q7",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json
new file mode 100644
index 000000000000..fa6ac0bd1b74
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
+  "rev": "47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38",
+  "sha256": "167rp43c86xr4grzxs4bl46y6sf1q9xa0641mgp4r94g2ipxyc1d",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json
new file mode 100644
index 000000000000..386a8aa143d2
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
+  "rev": "550a8cee241bbf8c11863dec9587d579dcb1108b",
+  "sha256": "0p1y0b8zsm7rrkhhylndp282ghgki2cjrgc4n5zhjn732ahxg515",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json
new file mode 100644
index 000000000000..23c2c9ae5384
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
+  "rev": "e7883bc64440b1ff4666272ac6eb710ee4bc221b",
+  "sha256": "1rj99y1f0wn6g1m2k53xkni5v79zgq25yv8b9wx2bz0n2r9iasca",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json
new file mode 100644
index 000000000000..27a93a97da54
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtwebview.git",
+  "rev": "920de5f1cd9f9001cfef1bfd2c19e6720793362f",
+  "sha256": "04hnqalabhypkd2hgl45jxf9p1p6dgjwlc5b7gs4f6588lafgd3f",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json
new file mode 100644
index 000000000000..30847e67e560
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtwinextras.git",
+  "rev": "3df03dab21f3e84d5a7274c64dd879854ca1bfe7",
+  "sha256": "12dkw982xcm7hxw3lxhg34wny4srbickxm9s3nz7bdyp9dmqnygx",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json
new file mode 100644
index 000000000000..4c4d665e287a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtx11extras.git",
+  "rev": "3898f5484fd4864b047729bfeda9a1222f32364f",
+  "sha256": "04rp8arml19b03iybd7sa78dsdv7386m9ymmgqciwl13dhwjssra",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json
new file mode 100644
index 000000000000..6363cb262967
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
+  "rev": "189e28d0aff1f3d7960228ba318b83e3cadac98c",
+  "sha256": "0vs9j2i1dnlivcrzz175zz66ql1m8mrdqkglvyqjqv6cb7mpskrq",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}

From ae842d0f746fadb1d59c9c1f407ae1329033ee8a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 30 Oct 2021 09:05:21 +0100
Subject: [PATCH 143/235] python3Packages.httplib2: drop upstreamed patch
 (fails to apply)

```
$ nix build -f.  python3Packages.httplib2 -L
...
python3.9-httplib2> patching sources
python3.9-httplib2> applying patch /nix/store/gbpay7j261cbshpnkfgvp3lbnwa41p89-08d6993b69256fbc6c0b1c615c24910803c4d610.patch
python3.9-httplib2> patching file tests/test_http.py
python3.9-httplib2> Reversed (or previously applied) patch detected!  Assume -R? [n]
python3.9-httplib2> Apply anyway? [n]
python3.9-httplib2> Skipping patch.
python3.9-httplib2> 1 out of 1 hunk ignored -- saving rejects to file tests/test_http.py.rej
```
---
 pkgs/development/python-modules/httplib2/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index 6494fee86c77..c39904981619 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -2,7 +2,6 @@
 , stdenv
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , isPy27
 , mock
 , pyparsing
@@ -25,14 +24,6 @@ buildPythonPackage rec {
     sha256 = "sha256-1zqs3YRVtm5DwewETLtRg5XhMJPJsMi0QLfeGirOURs=";
   };
 
-  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 f0bb568b74c4a5fe2b897286fe05c10a9b929075 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 1 Oct 2021 18:44:47 +0100
Subject: [PATCH 144/235] pytest: new hook to delete pytest bytecode

In https://github.com/NixOS/nixpkgs/issues/139292 we found out that
pytest leaves pytest-generated bytecode in install directory
(as tests are ran after install). That bytecode is:
- non-deterministic (was copied from cpython before cpython got
  support for deterministic bytecode)
- unneeded after test run

The change cleans bytecode up and provides a hook variable to avoid it
if needed.

Tested on `python39Packages.pytest-xdist` and `python27Packages.flaky` as:

    $ nix build -f. python39Packages.pytest-xdist
    $ nix build -f. python39Packages.pytest-xdist --rebuild

    $ nix build -f. python27Packages.flaky
    $ nix build -f. python27Packages.flaky --rebuild

Closes: https://github.com/NixOS/nixpkgs/issues/139292
---
 pkgs/development/python-modules/pytest/4.nix       | 13 +++++++++++++
 pkgs/development/python-modules/pytest/5.nix       | 13 +++++++++++++
 pkgs/development/python-modules/pytest/default.nix | 13 +++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix
index fd6d3507afb8..0a0ae571ba01 100644
--- a/pkgs/development/python-modules/pytest/4.nix
+++ b/pkgs/development/python-modules/pytest/4.nix
@@ -43,6 +43,19 @@ buildPythonPackage rec {
     }
 
     preDistPhases+=" pytestcachePhase"
+
+    # pytest generates it's own bytecode files to improve assertion messages.
+    # These files similar to cpython's bytecode files but are never laoded
+    # by python interpreter directly. We remove them for a few reasons:
+    # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292
+    #   (file headers are generatedt by pytest directly and contain timestamps)
+    # - files are not needed after tests are finished
+    pytestRemoveBytecodePhase () {
+        # suffix is defined at:
+        #    https://github.com/pytest-dev/pytest/blob/4.6.11/src/_pytest/assertion/rewrite.py#L32-L47
+        find $out -name "*-PYTEST.py[co]" -delete
+    }
+    preDistPhases+=" pytestRemoveBytecodePhase"
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix
index b38c1a759fe3..8df7c02b1774 100644
--- a/pkgs/development/python-modules/pytest/5.nix
+++ b/pkgs/development/python-modules/pytest/5.nix
@@ -70,6 +70,19 @@ buildPythonPackage rec {
         find $out -name .pytest_cache -type d -exec rm -rf {} +
     }
     preDistPhases+=" pytestcachePhase"
+
+    # pytest generates it's own bytecode files to improve assertion messages.
+    # These files similar to cpython's bytecode files but are never laoded
+    # by python interpreter directly. We remove them for a few reasons:
+    # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292
+    #   (file headers are generatedt by pytest directly and contain timestamps)
+    # - files are not needed after tests are finished
+    pytestRemoveBytecodePhase () {
+        # suffix is defined at:
+        #    https://github.com/pytest-dev/pytest/blob/5.4.3/src/_pytest/assertion/rewrite.py#L42-L45
+        find $out -name "*-pytest-*.py[co]" -delete
+    }
+    preDistPhases+=" pytestRemoveBytecodePhase"
   '';
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index f2438622f6a6..ac036936b991 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -82,6 +82,19 @@ buildPythonPackage rec {
         find $out -name .pytest_cache -type d -exec rm -rf {} +
     }
     preDistPhases+=" pytestcachePhase"
+
+    # pytest generates it's own bytecode files to improve assertion messages.
+    # These files similar to cpython's bytecode files but are never laoded
+    # by python interpreter directly. We remove them for a few reasons:
+    # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292
+    #   (file headers are generatedt by pytest directly and contain timestamps)
+    # - files are not needed after tests are finished
+    pytestRemoveBytecodePhase () {
+        # suffix is defined at:
+        #    https://github.com/pytest-dev/pytest/blob/6.2.5/src/_pytest/assertion/rewrite.py#L51-L53
+        find $out -name "*-pytest-*.py[co]" -delete
+    }
+    preDistPhases+=" pytestRemoveBytecodePhase"
   '';
 
   pythonImportsCheck = [

From e6ca3a37f13ab997bf66e3f00af01ee9851ba00e Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 30 Oct 2021 16:55:53 -0700
Subject: [PATCH 145/235] libselinux: fix cross-compilation from x86_32

libselinux incorrectly initializes the host platform's arch using uname -m,
which actually returns the build platform's arch. This results in an invalid
compile flag (-mno-tls-direct-seg-refs) when compiling from x86_32.
So we need to set the host arch variable explicitly.
---
 pkgs/os-specific/linux/libselinux/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index fbf7e4bd995a..fcea787ed79c 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
     "SHLIBDIR=$(out)/lib"
 
     "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a"
+    "ARCH=${stdenv.hostPlatform.linuxArch}"
   ] ++ optionals enablePython [
     "PYTHON=${python3.pythonForBuild.interpreter}"
     "PYTHONLIBDIR=$(py)/${python3.sitePackages}"

From e6b079612981bbe3e294d72a8cdc530cb224f18a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 30 Oct 2021 07:39:01 +0200
Subject: [PATCH 146/235] polkit: format the expression

Use lib.optionals instead of lib.optional, move phases to the bottom, have one input per line.
---
 pkgs/development/libraries/polkit/default.nix | 113 ++++++++++++------
 1 file changed, 74 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 83f59d2041c6..2f0195f053c5 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,7 +1,24 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, expat, pam, perl, fetchpatch
-, intltool, spidermonkey_78, gobject-introspection, libxslt, docbook_xsl, dbus
-, docbook_xml_dtd_412, gtk-doc, coreutils
-, useSystemd ? stdenv.isLinux, systemd, elogind
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, glib
+, expat
+, pam
+, perl
+, fetchpatch
+, intltool
+, spidermonkey_78
+, gobject-introspection
+, libxslt
+, docbook-xsl-nons
+, dbus
+, docbook_xml_dtd_412
+, gtk-doc
+, coreutils
+, useSystemd ? stdenv.isLinux
+, systemd
+, elogind
 # needed until gobject-introspection does cross-compile (https://github.com/NixOS/nixpkgs/pull/88222)
 , withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
 # A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault).
@@ -12,16 +29,15 @@
 }:
 
 let
-
   system = "/run/current-system/sw";
   setuid = "/run/wrappers/bin";
-
 in
-
 stdenv.mkDerivation rec {
   pname = "polkit";
   version = "0.119";
 
+  outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
+
   src = fetchurl {
     url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.gz";
     sha256 = "0p0zzmr0kh3mpmqya4q27y4h9b920zp5ya0i8909ahp9hvdrymy8";
@@ -38,25 +54,65 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postPatch = lib.optionalString stdenv.isDarwin ''
-    sed -i -e "s/-Wl,--as-needed//" configure.ac
-  '';
+  nativeBuildInputs = [
+    glib
+    gtk-doc
+    pkg-config
+    intltool
+    perl
 
-  outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
+    # man pages
+    libxslt
+    docbook-xsl-nons
+    docbook_xml_dtd_412
+  ];
 
-  nativeBuildInputs =
-    [ glib gtk-doc pkg-config intltool perl ]
-    ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
-  buildInputs =
-    [ expat pam spidermonkey_78 ]
+  buildInputs = [
+    expat
+    pam
+    spidermonkey_78
+  ] ++ lib.optionals stdenv.isLinux [
     # On Linux, fall back to elogind when systemd support is off.
-    ++ lib.optional stdenv.isLinux (if useSystemd then systemd else elogind)
-    ++ lib.optional withIntrospection gobject-introspection;
+    (if useSystemd then systemd else elogind)
+  ] ++ lib.optionals withIntrospection [
+    gobject-introspection
+  ];
 
   propagatedBuildInputs = [
     glib # in .pc Requires
   ];
 
+  checkInputs = [
+    dbus
+  ];
+
+  configureFlags = [
+    "--datadir=${system}/share"
+    "--sysconfdir=/etc"
+    "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
+    "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser
+    "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS
+    (if withIntrospection then "--enable-introspection" else "--disable-introspection")
+  ] ++ lib.optionals (!doCheck) [
+    "--disable-test"
+  ];
+
+  makeFlags = [
+    "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0"
+    "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
+  ];
+
+  installFlags = [
+    "datadir=${placeholder "out"}/share"
+    "sysconfdir=${placeholder "out"}/etc"
+  ];
+
+  inherit doCheck;
+
+  postPatch = lib.optionalString stdenv.isDarwin ''
+    sed -i -e "s/-Wl,--as-needed//" configure.ac
+  '';
+
   preConfigure = ''
     chmod +x test/mocklibc/bin/mocklibc{,-test}.in
     patchShebangs .
@@ -74,27 +130,6 @@ stdenv.mkDerivation rec {
     sed '/libsystemd autoconfigured/s/.*/:/' -i configure
   '';
 
-  configureFlags = [
-    "--datadir=${system}/share"
-    "--sysconfdir=/etc"
-    "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
-    "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser
-    "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS
-    (if withIntrospection then "--enable-introspection" else "--disable-introspection")
-  ] ++ lib.optional (!doCheck) "--disable-test";
-
-  makeFlags = [
-    "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0"
-    "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
-  ];
-
-  installFlags = [
-    "datadir=${placeholder "out"}/share"
-    "sysconfdir=${placeholder "out"}/etc"
-  ];
-
-  inherit doCheck;
-  checkInputs = [ dbus ];
   checkPhase = ''
     runHook preCheck
 

From 54417ca86353be6292c4198957eb0c467493211b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 30 Oct 2021 07:45:28 +0200
Subject: [PATCH 147/235] =?UTF-8?q?polkit:=200.119=20=E2=86=92=200.120?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://lists.freedesktop.org/archives/polkit-devel/2021-October/000608.html
---
 pkgs/development/libraries/polkit/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 2f0195f053c5..a0a612257be2 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -7,7 +7,7 @@
 , pam
 , perl
 , fetchpatch
-, intltool
+, gettext
 , spidermonkey_78
 , gobject-introspection
 , libxslt
@@ -34,13 +34,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "polkit";
-  version = "0.119";
+  version = "0.120";
 
   outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.gz";
-    sha256 = "0p0zzmr0kh3mpmqya4q27y4h9b920zp5ya0i8909ahp9hvdrymy8";
+    sha256 = "7npZmoUxF78nNUhyVxn6kvq9LxNpFcekkGzumFZ67gM=";
   };
 
   patches = [
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     glib
     gtk-doc
     pkg-config
-    intltool
+    gettext
     perl
 
     # man pages

From 527b98a125d381a1f03c2fa8393f80205c6dd052 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 30 Oct 2021 13:28:44 +0200
Subject: [PATCH 148/235] polkit: port to Meson

Autotools build will be removed in the next release.

Examples are no longer installed.

Musl patch does not work.
---
 pkgs/development/libraries/polkit/default.nix | 101 ++++++++++++------
 1 file changed, 66 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index a0a612257be2..b2d1b35f05e1 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,11 +1,15 @@
 { lib
 , stdenv
-, fetchurl
+, fetchFromGitLab
 , pkg-config
 , glib
 , expat
 , pam
+, meson
+, ninja
 , perl
+, rsync
+, python3
 , fetchpatch
 , gettext
 , spidermonkey_78
@@ -38,12 +42,16 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
 
-  src = fetchurl {
-    url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.gz";
-    sha256 = "7npZmoUxF78nNUhyVxn6kvq9LxNpFcekkGzumFZ67gM=";
+  # Tarballs do not contain subprojects.
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "polkit";
+    repo = "polkit";
+    rev = version;
+    sha256 = "oEaRf1g13zKMD+cP1iwIA6jaCDwvNfGy2i8xY8vuVSo=";
   };
 
-  patches = [
+  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.
@@ -59,7 +67,17 @@ stdenv.mkDerivation rec {
     gtk-doc
     pkg-config
     gettext
+    meson
+    ninja
     perl
+    rsync
+    (python3.withPackages (pp: with pp; [
+      dbus-python
+      (python-dbusmock.overridePythonAttrs (attrs: {
+        # Avoid dependency cycle.
+        doCheck = false;
+      }))
+    ]))
 
     # man pages
     libxslt
@@ -86,36 +104,33 @@ stdenv.mkDerivation rec {
     dbus
   ];
 
-  configureFlags = [
+  mesonFlags = [
     "--datadir=${system}/share"
     "--sysconfdir=/etc"
-    "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
-    "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser
-    "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS
-    (if withIntrospection then "--enable-introspection" else "--disable-introspection")
-  ] ++ lib.optionals (!doCheck) [
-    "--disable-test"
+    "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
+    "-Dpolkitd_user=polkituser" #TODO? <nixos> config.ids.uids.polkituser
+    "-Dos_type=redhat" # only affects PAM includes
+    "-Dintrospection=${lib.boolToString withIntrospection}"
+    "-Dtests=${lib.boolToString doCheck}"
+    "-Dgtk_doc=${lib.boolToString true}"
+    "-Dman=true"
+  ] ++ lib.optionals stdenv.isLinux [
+    "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}"
   ];
 
-  makeFlags = [
-    "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0"
-    "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
-  ];
-
-  installFlags = [
-    "datadir=${placeholder "out"}/share"
-    "sysconfdir=${placeholder "out"}/etc"
-  ];
+  # HACK: We want to install policy files files to $out/share but polkit
+  # should read them from /run/current-system/sw/share on a NixOS system.
+  # Similarly for config files in /etc.
+  # With autotools, it was possible to override Make variables
+  # at install time but Meson does not support this
+  # so we need to convince it to install all files to a temporary
+  # location using DESTDIR and then move it to proper one in postInstall.
+  DESTDIR = "${placeholder "out"}/dest";
 
   inherit doCheck;
 
-  postPatch = lib.optionalString stdenv.isDarwin ''
-    sed -i -e "s/-Wl,--as-needed//" configure.ac
-  '';
-
-  preConfigure = ''
-    chmod +x test/mocklibc/bin/mocklibc{,-test}.in
-    patchShebangs .
+  postPatch = ''
+    patchShebangs test/polkitbackend/polkitbackendjsauthoritytest-wrapper.py
 
     # ‘libpolkit-agent-1.so’ should call the setuid wrapper on
     # NixOS.  Hard-coding the path is kinda ugly.  Maybe we can just
@@ -125,24 +140,40 @@ stdenv.mkDerivation rec {
     substituteInPlace test/data/etc/polkit-1/rules.d/10-testing.rules \
       --replace   /bin/true ${coreutils}/bin/true \
       --replace   /bin/false ${coreutils}/bin/false
+  '';
 
-  '' + lib.optionalString useSystemd /* bogus chroot detection */ ''
-    sed '/libsystemd autoconfigured/s/.*/:/' -i configure
+  postConfigure = ''
+    # Unpacked by meson
+    chmod +x subprojects/mocklibc-1.0/bin/mocklibc
+    patchShebangs subprojects/mocklibc-1.0/bin/mocklibc
   '';
 
   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'
+    dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS meson test --print-errorlogs'
 
     runHook postCheck
   '';
 
+  postInstall = ''
+    # Move stuff from DESTDIR to proper location.
+    # We use rsync to merge the directories.
+    rsync --archive "${DESTDIR}/etc" "$out"
+    rm --recursive "${DESTDIR}/etc"
+    rsync --archive "${DESTDIR}${system}"/* "$out"
+    rm --recursive "${DESTDIR}${system}"/*
+    rmdir --parents --ignore-fail-on-non-empty "${DESTDIR}${system}"
+    for o in $outputs; do
+        rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")"
+        rm --recursive "${DESTDIR}/''${!o}"
+    done
+    # Ensure the DESTDIR is removed.
+    destdirContainer="$(dirname "${DESTDIR}")"
+    pushd "$destdirContainer"; rmdir --parents "''${DESTDIR##$destdirContainer/}${builtins.storeDir}"; popd
+  '';
+
   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";

From 1b2e909bb635b5c8cb1561c6ddbd67a743b98110 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 31 Oct 2021 04:20:00 +0000
Subject: [PATCH 149/235] icu70: init at 70.1

---
 pkgs/development/libraries/icu/70.nix | 4 ++++
 pkgs/top-level/all-packages.nix       | 5 +++++
 2 files changed, 9 insertions(+)
 create mode 100644 pkgs/development/libraries/icu/70.nix

diff --git a/pkgs/development/libraries/icu/70.nix b/pkgs/development/libraries/icu/70.nix
new file mode 100644
index 000000000000..955bbcac02f8
--- /dev/null
+++ b/pkgs/development/libraries/icu/70.nix
@@ -0,0 +1,4 @@
+import ./base.nix {
+  version = "70.1";
+  sha256 = "1m9zgkaf5lyh65nyc6n0n5bs2f5k53nnj1ih6nskpwbvq4l5884d";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98bb7c5e63c9..5f92816f16dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16856,6 +16856,11 @@ with pkgs;
   } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
       stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
     }));
+  icu70 = callPackage ../development/libraries/icu/70.nix ({
+    nativeBuildRoot = buildPackages.icu70.override { buildRootOnly = true; };
+  } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
+      stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
+    }));
 
   icu = icu69;
 

From ab9ac19435f01fd1eb6b9a664b4e8bd94b8840e1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 31 Oct 2021 04:20:00 +0000
Subject: [PATCH 150/235] icu: 69.1 -> 70.1

---
 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 5f92816f16dd..efb1ac8541de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16862,7 +16862,7 @@ with pkgs;
       stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
     }));
 
-  icu = icu69;
+  icu = icu70;
 
   id3lib = callPackage ../development/libraries/id3lib { };
 

From 89dc75eec5a612cbe70cff7e461324b4a0b695ab Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 31 Oct 2021 04:20:00 +0000
Subject: [PATCH 151/235] icu: update homepage

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

diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix
index 47eea8ba1af1..e1b2ccda3552 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -43,7 +43,7 @@ let
 
     meta = with lib; {
       description = "Unicode and globalization support library";
-      homepage = "http://site.icu-project.org/";
+      homepage = "https://icu.unicode.org/";
       maintainers = with maintainers; [ raskin ];
       platforms = platforms.all;
     };

From 999557e8ef79f0a52455fae9f8519ce801f9dabd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 08:26:42 -0500
Subject: [PATCH 152/235] sddm: fix build with Qt 5.15.3

---
 pkgs/applications/display-managers/sddm/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 029501c7787a..091498fae003 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -25,6 +25,12 @@ in mkDerivation {
       url = "https://github.com/sddm/sddm/commit/e1dedeeab6de565e043f26ac16033e613c222ef9.patch";
       sha256 = "sha256-OPyrUI3bbH+PGDBfoL4Ohb4wIvmy9TeYZhE0JxR/D58=";
     })
+    # Fix build with Qt 5.15.3
+    # See: https://github.com/sddm/sddm/pull/1325
+    (fetchpatch {
+      url = "https://github.com/sddm/sddm/commit/e93bf95c54ad8c2a1604f8d7be05339164b19308.patch";
+      sha256 = "sha256:1rh6sdvzivjcl5b05fczarvxhgpjhi7019hvf2gadnwgwdg104r4";
+    })
   ];
 
   postPatch =

From 965fcab9693908b1ae657b7e64f7adb73355432f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 10:53:48 -0500
Subject: [PATCH 153/235] qt515: combine source locks into single JSON file

---
 .../libraries/qt-5/5.15/default.nix           |   9 +-
 pkgs/development/libraries/qt-5/5.15/fetch.sh |  60 +----
 pkgs/development/libraries/qt-5/5.15/modules  |  41 ++++
 .../libraries/qt-5/5.15/srcs-generated.json   | 207 ++++++++++++++++++
 pkgs/development/libraries/qt-5/5.15/srcs.nix |  25 +++
 .../libraries/qt-5/5.15/srcs/default.nix      |  43 ----
 .../libraries/qt-5/5.15/srcs/qt3d.json        |   9 -
 .../libraries/qt-5/5.15/srcs/qtactiveqt.json  |   9 -
 .../qt-5/5.15/srcs/qtandroidextras.json       |   9 -
 .../libraries/qt-5/5.15/srcs/qtbase.json      |   9 -
 .../libraries/qt-5/5.15/srcs/qtcharts.json    |   9 -
 .../qt-5/5.15/srcs/qtconnectivity.json        |   9 -
 .../libraries/qt-5/5.15/srcs/qtdatavis3d.json |   9 -
 .../qt-5/5.15/srcs/qtdeclarative.json         |   9 -
 .../libraries/qt-5/5.15/srcs/qtdoc.json       |   9 -
 .../libraries/qt-5/5.15/srcs/qtgamepad.json   |   9 -
 .../qt-5/5.15/srcs/qtgraphicaleffects.json    |   9 -
 .../qt-5/5.15/srcs/qtimageformats.json        |   9 -
 .../libraries/qt-5/5.15/srcs/qtlocation.json  |   9 -
 .../libraries/qt-5/5.15/srcs/qtlottie.json    |   9 -
 .../libraries/qt-5/5.15/srcs/qtmacextras.json |   9 -
 .../qt-5/5.15/srcs/qtmultimedia.json          |   9 -
 .../qt-5/5.15/srcs/qtnetworkauth.json         |   9 -
 .../qt-5/5.15/srcs/qtpurchasing.json          |   9 -
 .../libraries/qt-5/5.15/srcs/qtquick3d.json   |   9 -
 .../qt-5/5.15/srcs/qtquickcontrols.json       |   9 -
 .../qt-5/5.15/srcs/qtquickcontrols2.json      |   9 -
 .../qt-5/5.15/srcs/qtquicktimeline.json       |   9 -
 .../qt-5/5.15/srcs/qtremoteobjects.json       |   9 -
 .../libraries/qt-5/5.15/srcs/qtscript.json    |   9 -
 .../libraries/qt-5/5.15/srcs/qtscxml.json     |   9 -
 .../libraries/qt-5/5.15/srcs/qtsensors.json   |   9 -
 .../libraries/qt-5/5.15/srcs/qtserialbus.json |   9 -
 .../qt-5/5.15/srcs/qtserialport.json          |   9 -
 .../libraries/qt-5/5.15/srcs/qtspeech.json    |   9 -
 .../libraries/qt-5/5.15/srcs/qtsvg.json       |   9 -
 .../libraries/qt-5/5.15/srcs/qttools.json     |   9 -
 .../qt-5/5.15/srcs/qttranslations.json        |   9 -
 .../qt-5/5.15/srcs/qtvirtualkeyboard.json     |   9 -
 .../libraries/qt-5/5.15/srcs/qtwayland.json   |   9 -
 .../qt-5/5.15/srcs/qtwebchannel.json          |   9 -
 .../qt-5/5.15/srcs/qtwebglplugin.json         |   9 -
 .../qt-5/5.15/srcs/qtwebsockets.json          |   9 -
 .../libraries/qt-5/5.15/srcs/qtwebview.json   |   9 -
 .../libraries/qt-5/5.15/srcs/qtwinextras.json |   9 -
 .../libraries/qt-5/5.15/srcs/qtx11extras.json |   9 -
 .../qt-5/5.15/srcs/qtxmlpatterns.json         |   9 -
 47 files changed, 283 insertions(+), 471 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.15/modules
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs-generated.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qttools.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 4db08b32b80c..1659dc51ae27 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -27,14 +27,7 @@ let
 
   mirror = "https://download.qt.io";
   srcs =
-    lib.mapAttrs
-      (name: attrs:
-        {
-          inherit (attrs) version;
-          src = fetchgit (lib.importJSON attrs.json);
-        }
-      )
-      (import ./srcs)
+    import ./srcs.nix { inherit lib fetchgit; }
     // {
       # qtwebkit does not have an official release tarball on the qt mirror and is
       # mostly maintained by the community.
diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh
index e2c0d36903f7..e97dee310d07 100755
--- a/pkgs/development/libraries/qt-5/5.15/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh
@@ -3,57 +3,15 @@
 
 set -x -e -o pipefail
 
-module_list=( \
-    qt3d \
-    qtactiveqt \
-    qtandroidextras \
-    qtbase \
-    qtcharts \
-    qtconnectivity \
-    qtdatavis3d \
-    qtdeclarative \
-    qtdoc \
-    qtgamepad \
-    qtgraphicaleffects \
-    qtimageformats \
-    qtlocation \
-    qtlottie \
-    qtmacextras \
-    qtmultimedia \
-    qtnetworkauth \
-    qtpurchasing \
-    qtquick3d \
-    qtquickcontrols \
-    qtquickcontrols2 \
-    qtquicktimeline \
-    qtremoteobjects \
-    qtscript \
-    qtscxml \
-    qtsensors \
-    qtserialbus \
-    qtserialport \
-    qtspeech \
-    qtsvg \
-    qttools \
-    qttranslations \
-    qtvirtualkeyboard \
-    qtwayland \
-    qtwebchannel \
-    qtwebglplugin \
-    qtwebsockets \
-    qtwebview \
-    qtwinextras \
-    qtx11extras \
-    qtxmlpatterns \
-    )
+here="$(dirname "${BASH_SOURCE[0]}")"
+modules="${here}/modules"
+srcs="${here}/srcs-generated.json"
 
-srcs="$(dirname "${BASH_SOURCE[0]}")/srcs"
-mkdir -p "$srcs"
-
-for module in "${module_list[@]}"
-do
+while read -r module; do
+    if [[ -z "$module" ]]; then continue; fi
     url="https://invent.kde.org/qt/qt/${module}.git"
     nix-prefetch-git --url $url --rev refs/heads/kde/5.15 \
-        | jq '{url,rev,sha256,fetchLFS,fetchSubmodules,deepClone,leaveDotGit}' \
-        > "${srcs}/${module}.json"
-done
+        | jq "{key: \"${module}\", value: {url,rev,sha256}}"
+done < "$modules" | jq -s 'from_entries' > "${srcs}.tmp"
+
+mv "${srcs}.tmp" "$srcs"
diff --git a/pkgs/development/libraries/qt-5/5.15/modules b/pkgs/development/libraries/qt-5/5.15/modules
new file mode 100644
index 000000000000..d6ce8822d541
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/modules
@@ -0,0 +1,41 @@
+qt3d
+qtactiveqt
+qtandroidextras
+qtbase
+qtcharts
+qtconnectivity
+qtdatavis3d
+qtdeclarative
+qtdoc
+qtgamepad
+qtgraphicaleffects
+qtimageformats
+qtlocation
+qtlottie
+qtmacextras
+qtmultimedia
+qtnetworkauth
+qtpurchasing
+qtquick3d
+qtquickcontrols
+qtquickcontrols2
+qtquicktimeline
+qtremoteobjects
+qtscript
+qtscxml
+qtsensors
+qtserialbus
+qtserialport
+qtspeech
+qtsvg
+qttools
+qttranslations
+qtvirtualkeyboard
+qtwayland
+qtwebchannel
+qtwebglplugin
+qtwebsockets
+qtwebview
+qtwinextras
+qtx11extras
+qtxmlpatterns
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
new file mode 100644
index 000000000000..76c4237dcaf7
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
@@ -0,0 +1,207 @@
+{
+  "qt3d": {
+    "url": "https://invent.kde.org/qt/qt/qt3d.git",
+    "rev": "7edec6e014de27b9dd03f63875c471aac606a918",
+    "sha256": "0qv4vhciigqd8bnqzrs7y71ls7jx1p9cal2rh78m42qgskk1ci59"
+  },
+  "qtactiveqt": {
+    "url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
+    "rev": "f0d03da0e37a84029a4eae1733813521482ac1fb",
+    "sha256": "0llk76lf0mh4mzj7pwd8cs55wpmfq8v1bsdzvizb1sx0vfbjh8g6"
+  },
+  "qtandroidextras": {
+    "url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
+    "rev": "8cce1098c59534352aa0f343ea73861f603ac04a",
+    "sha256": "130a1yda2m7pa10as3rccz84m3617422n6s51pdn4kp8p8rk7cs6"
+  },
+  "qtbase": {
+    "url": "https://invent.kde.org/qt/qt/qtbase.git",
+    "rev": "c9fde86b0a2440133bc08f4811b6ca793be47f0a",
+    "sha256": "1fqhdkv3sp3nbzqi2a5wvxn5d4v0xcrq2bl609bdyj4nx367a8wp"
+  },
+  "qtcharts": {
+    "url": "https://invent.kde.org/qt/qt/qtcharts.git",
+    "rev": "130463160b4923069eb98da49edaf7d93180f4f8",
+    "sha256": "19g35cddbfh307mk76wac1ps03warynlsj7xi8i596bxiaf7i4pw"
+  },
+  "qtconnectivity": {
+    "url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
+    "rev": "69a87a9b831e36a578594a0a13130c384ad03121",
+    "sha256": "0ph07rdf9qfxnw3z2nqbmh6na65z0p2snmlzdw80amd7s0g255kw"
+  },
+  "qtdatavis3d": {
+    "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
+    "rev": "c085311c02dd216e5a041b90c164d55b3cf3ce92",
+    "sha256": "0xya1m2csb42yisl90s9822p9q92n7ags909nlbapfsb49qwsqnj"
+  },
+  "qtdeclarative": {
+    "url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
+    "rev": "55324650f9e759a43dce927f823c9858574106c3",
+    "sha256": "0cxz4pqvb8l0wqpc4hr0xmc72csqf7dpbbzdqgil9nyyg21ihkz0"
+  },
+  "qtdoc": {
+    "url": "https://invent.kde.org/qt/qt/qtdoc.git",
+    "rev": "897e90fe304d844beaf694b82a93a50237fa8b9e",
+    "sha256": "1c4m9vlgg6bfw7hwzanl5s4vslg0r7xiz50lanhqrlcrr9i36xs1"
+  },
+  "qtgamepad": {
+    "url": "https://invent.kde.org/qt/qt/qtgamepad.git",
+    "rev": "64afa18a0a1e9588060e2e6d917bb01ccdd48a81",
+    "sha256": "1h9yb0asprynnb2qyjbmyglrkk9f9v19g6zzpk0gmixrp0h8gk46"
+  },
+  "qtgraphicaleffects": {
+    "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
+    "rev": "c36998dc1581167b12cc3de8e4ac68c2a5d9f76e",
+    "sha256": "0x11n2fym765z3gyb4xnfl7v6zrip1wjkkl6nx1bxaya173fvdw8"
+  },
+  "qtimageformats": {
+    "url": "https://invent.kde.org/qt/qt/qtimageformats.git",
+    "rev": "cb82c74310837fe4e832c8ab72176a5d63e4355f",
+    "sha256": "0j4cv5sa6mm3adcjw8cv6kbzrslmhjc1rgxqgc130l8vm3vmgbkr"
+  },
+  "qtlocation": {
+    "url": "https://invent.kde.org/qt/qt/qtlocation.git",
+    "rev": "861e372b6ad81570d4f496e42fb25a6699b72f2f",
+    "sha256": "1g24pg9v6sv5zf80r48innp3h4g0hss69hnr7ygfzfvfnmmn6g52"
+  },
+  "qtlottie": {
+    "url": "https://invent.kde.org/qt/qt/qtlottie.git",
+    "rev": "fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4",
+    "sha256": "1xgykaw8qjnaip6h9jx0nfadc9amb6aclk758vm5pp43dvs5j96r"
+  },
+  "qtmacextras": {
+    "url": "https://invent.kde.org/qt/qt/qtmacextras.git",
+    "rev": "e72896968697e2a8af16a312e1560948e4c40f30",
+    "sha256": "1hndpbr1nnybn7frg76q99bk1c8fhvra6wjm0q78p4a8pinrvcms"
+  },
+  "qtmultimedia": {
+    "url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
+    "rev": "bd29c87027637a013f2c5e3b549fcda84e4d7545",
+    "sha256": "11pz9zzrhsr3n78ga7l3kp3gi20rpxsa4iz3wclhcbcm2xr3nd94"
+  },
+  "qtnetworkauth": {
+    "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
+    "rev": "53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a",
+    "sha256": "0idaysqpwrghih7ijrm9hagj9jw3fy9nw539fr4d9rmcggnkkzn2"
+  },
+  "qtpurchasing": {
+    "url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
+    "rev": "cbf444fb570ca4f4ca21d963d2ae4010f10d473e",
+    "sha256": "1cki7n62wqm3xxn36mka0y67ngn7jvjkrvr08vsassbjb7kfsmxp"
+  },
+  "qtquick3d": {
+    "url": "https://invent.kde.org/qt/qt/qtquick3d.git",
+    "rev": "3e3e53c834b25dc2959dd30f319d12d6f84ee1e3",
+    "sha256": "1b1khfg26zl3p28yvhwjfldqy3flh10pb5hm5z0av03rz7jy7l8s"
+  },
+  "qtquickcontrols": {
+    "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
+    "rev": "cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420",
+    "sha256": "1vxp0kwigwhqyyfm0xg8llyd1l1f4l18hmk6xqkm57xpi15x55bc"
+  },
+  "qtquickcontrols2": {
+    "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
+    "rev": "be66bf9a5618c745d2a6ee2262967af6307b3b07",
+    "sha256": "11h3f3rb2kqgsw7njzhjwazw1k03v12i83irjndylafiaqw6c6ks"
+  },
+  "qtquicktimeline": {
+    "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
+    "rev": "67503cdadea43b95ddad0de1a04951aff0ce1a07",
+    "sha256": "0h4b3ibcf6rsmqmcfbwbk9pbvw3b9cac8nx2538aqvnpyyp1vhid"
+  },
+  "qtremoteobjects": {
+    "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
+    "rev": "4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735",
+    "sha256": "1zbxl5jk7x8qklrnbbaikymyviigqdq7vf0wc8gzls4126vcx146"
+  },
+  "qtscript": {
+    "url": "https://invent.kde.org/qt/qt/qtscript.git",
+    "rev": "5cec94b2c1503f106f4ef4778d016410ebb86211",
+    "sha256": "1xdri98cw7m78k9kfb53cgh8wyz98q3i623jhhcv01rvy1zsf8m1"
+  },
+  "qtscxml": {
+    "url": "https://invent.kde.org/qt/qt/qtscxml.git",
+    "rev": "7a15000f42c7a3171719727cd056f82a78244ed7",
+    "sha256": "1i2ajsj9pb1s4lk4djj1h1ay9mkz1z3m75a747cspyc1p1iymipq"
+  },
+  "qtsensors": {
+    "url": "https://invent.kde.org/qt/qt/qtsensors.git",
+    "rev": "921a31375f29e429e95352b08b2b9dbfea663cb1",
+    "sha256": "1ijayk6lf34nwv7s3ib3cfqx9sjrmr1c6jnziwmxa1l6fy3ik4g8"
+  },
+  "qtserialbus": {
+    "url": "https://invent.kde.org/qt/qt/qtserialbus.git",
+    "rev": "8884c5e43df846deac5a0c7c290eeb633d6bfe32",
+    "sha256": "1ydb5x21j26pl58mr6klnwixkqx8h119nvnzvyawz83gji3ay3a5"
+  },
+  "qtserialport": {
+    "url": "https://invent.kde.org/qt/qt/qtserialport.git",
+    "rev": "941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4",
+    "sha256": "0x7ly67gddmz0hqls9109bk4rgaa97ksyv24qk4brrhzkpr7q9cx"
+  },
+  "qtspeech": {
+    "url": "https://invent.kde.org/qt/qt/qtspeech.git",
+    "rev": "a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b",
+    "sha256": "1ljf45f65pfp8x367qnzl0ssz7n17cxhk29qvqpz9z7rh65zqix5"
+  },
+  "qtsvg": {
+    "url": "https://invent.kde.org/qt/qt/qtsvg.git",
+    "rev": "24128cdf8bef53eddf31a5709bbbc46293006b1c",
+    "sha256": "0vinjcbq4saxhlmvb5i93bzgg30qc3j8r2qfwrzaxc4vmfhfgi56"
+  },
+  "qttools": {
+    "url": "https://invent.kde.org/qt/qt/qttools.git",
+    "rev": "33693a928986006d79c1ee743733cde5966ac402",
+    "sha256": "02n0lppsp6g4s9bdvnfxpf7ndkbs9bzm0clcwvirwf2cd8q95a4n"
+  },
+  "qttranslations": {
+    "url": "https://invent.kde.org/qt/qt/qttranslations.git",
+    "rev": "8fbbdf21f127197f97b58c7d80d2fa2a59135638",
+    "sha256": "06r2jb2fsdr5fvxs748war0lr4mm3l3d3b37xc4n73y294vwrmn7"
+  },
+  "qtvirtualkeyboard": {
+    "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
+    "rev": "353b75b2e34bdae901625bbddf5c5e3f3e6c0de5",
+    "sha256": "12nv773zc05yrbai1z6i481yinih0kxcjzgm9pa0580qz69gd9a5"
+  },
+  "qtwayland": {
+    "url": "https://invent.kde.org/qt/qt/qtwayland.git",
+    "rev": "992833ca741efe8f533c61abfaf129a1d8bfcfee",
+    "sha256": "1w8mq38k6s0fncqv113bw1pc7g10ysfmsbyg23hxh9fr5q4ia4q7"
+  },
+  "qtwebchannel": {
+    "url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
+    "rev": "47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38",
+    "sha256": "167rp43c86xr4grzxs4bl46y6sf1q9xa0641mgp4r94g2ipxyc1d"
+  },
+  "qtwebglplugin": {
+    "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
+    "rev": "550a8cee241bbf8c11863dec9587d579dcb1108b",
+    "sha256": "0p1y0b8zsm7rrkhhylndp282ghgki2cjrgc4n5zhjn732ahxg515"
+  },
+  "qtwebsockets": {
+    "url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
+    "rev": "e7883bc64440b1ff4666272ac6eb710ee4bc221b",
+    "sha256": "1rj99y1f0wn6g1m2k53xkni5v79zgq25yv8b9wx2bz0n2r9iasca"
+  },
+  "qtwebview": {
+    "url": "https://invent.kde.org/qt/qt/qtwebview.git",
+    "rev": "920de5f1cd9f9001cfef1bfd2c19e6720793362f",
+    "sha256": "04hnqalabhypkd2hgl45jxf9p1p6dgjwlc5b7gs4f6588lafgd3f"
+  },
+  "qtwinextras": {
+    "url": "https://invent.kde.org/qt/qt/qtwinextras.git",
+    "rev": "3df03dab21f3e84d5a7274c64dd879854ca1bfe7",
+    "sha256": "12dkw982xcm7hxw3lxhg34wny4srbickxm9s3nz7bdyp9dmqnygx"
+  },
+  "qtx11extras": {
+    "url": "https://invent.kde.org/qt/qt/qtx11extras.git",
+    "rev": "3898f5484fd4864b047729bfeda9a1222f32364f",
+    "sha256": "04rp8arml19b03iybd7sa78dsdv7386m9ymmgqciwl13dhwjssra"
+  },
+  "qtxmlpatterns": {
+    "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
+    "rev": "189e28d0aff1f3d7960228ba318b83e3cadac98c",
+    "sha256": "0vs9j2i1dnlivcrzz175zz66ql1m8mrdqkglvyqjqv6cb7mpskrq"
+  }
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
new file mode 100644
index 000000000000..9527b8aa4071
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -0,0 +1,25 @@
+{ lib, fetchgit }:
+
+let
+  version = "5.15.3";
+  overrides = {
+    qtscript.version = "5.15.4";
+  };
+
+  mk = name: args:
+    let
+      override = overrides.${name} or {};
+    in
+    {
+      version = override.version or version;
+      src = override.src or
+        fetchgit {
+          inherit (args) url rev sha256;
+          fetchLFS = false;
+          fetchSubmodules = false;
+          deepClone = false;
+          leaveDotGit = false;
+        };
+    };
+in
+lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/default.nix b/pkgs/development/libraries/qt-5/5.15/srcs/default.nix
deleted file mode 100644
index 929ab60d4d66..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  qt3d = { version = "5.15.3"; json = ./qt3d.json; };
-  qtactiveqt = { version = "5.15.3"; json = ./qtactiveqt.json; };
-  qtandroidextras = { version = "5.15.3"; json = ./qtandroidextras.json; };
-  qtbase = { version = "5.15.3"; json = ./qtbase.json; };
-  qtcharts = { version = "5.15.3"; json = ./qtcharts.json; };
-  qtconnectivity = { version = "5.15.3"; json = ./qtconnectivity.json; };
-  qtdatavis3d = { version = "5.15.3"; json = ./qtdatavis3d.json; };
-  qtdeclarative = { version = "5.15.3"; json = ./qtdeclarative.json; };
-  qtdoc = { version = "5.15.3"; json = ./qtdoc.json; };
-  qtgamepad = { version = "5.15.3"; json = ./qtgamepad.json; };
-  qtgraphicaleffects = { version = "5.15.3"; json = ./qtgraphicaleffects.json; };
-  qtimageformats = { version = "5.15.3"; json = ./qtimageformats.json; };
-  qtlocation = { version = "5.15.3"; json = ./qtlocation.json; };
-  qtlottie = { version = "5.15.3"; json = ./qtlottie.json; };
-  qtmacextras = { version = "5.15.3"; json = ./qtmacextras.json; };
-  qtmultimedia = { version = "5.15.3"; json = ./qtmultimedia.json; };
-  qtnetworkauth = { version = "5.15.3"; json = ./qtnetworkauth.json; };
-  qtpurchasing = { version = "5.15.3"; json = ./qtpurchasing.json; };
-  qtquick3d = { version = "5.15.3"; json = ./qtquick3d.json; };
-  qtquickcontrols = { version = "5.15.3"; json = ./qtquickcontrols.json; };
-  qtquickcontrols2 = { version = "5.15.3"; json = ./qtquickcontrols2.json; };
-  qtquicktimeline = { version = "5.15.3"; json = ./qtquicktimeline.json; };
-  qtremoteobjects = { version = "5.15.3"; json = ./qtremoteobjects.json; };
-  qtscript = { version = "5.15.4"; json = ./qtscript.json; };
-  qtscxml = { version = "5.15.3"; json = ./qtscxml.json; };
-  qtsensors = { version = "5.15.3"; json = ./qtsensors.json; };
-  qtserialbus = { version = "5.15.3"; json = ./qtserialbus.json; };
-  qtserialport = { version = "5.15.3"; json = ./qtserialport.json; };
-  qtspeech = { version = "5.15.3"; json = ./qtspeech.json; };
-  qtsvg = { version = "5.15.3"; json = ./qtsvg.json; };
-  qttools = { version = "5.15.3"; json = ./qttools.json; };
-  qttranslations = { version = "5.15.3"; json = ./qttranslations.json; };
-  qtvirtualkeyboard = { version = "5.15.3"; json = ./qtvirtualkeyboard.json; };
-  qtwayland = { version = "5.15.3"; json = ./qtwayland.json; };
-  qtwebchannel = { version = "5.15.3"; json = ./qtwebchannel.json; };
-  qtwebglplugin = { version = "5.15.3"; json = ./qtwebglplugin.json; };
-  qtwebsockets = { version = "5.15.3"; json = ./qtwebsockets.json; };
-  qtwebview = { version = "5.15.3"; json = ./qtwebview.json; };
-  qtwinextras = { version = "5.15.3"; json = ./qtwinextras.json; };
-  qtx11extras = { version = "5.15.3"; json = ./qtx11extras.json; };
-  qtxmlpatterns = { version = "5.15.3"; json = ./qtxmlpatterns.json; };
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json b/pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json
deleted file mode 100644
index 2beb42f0fe96..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qt3d.git",
-  "rev": "7edec6e014de27b9dd03f63875c471aac606a918",
-  "sha256": "0qv4vhciigqd8bnqzrs7y71ls7jx1p9cal2rh78m42qgskk1ci59",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json
deleted file mode 100644
index 01e514ebb66d..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
-  "rev": "f0d03da0e37a84029a4eae1733813521482ac1fb",
-  "sha256": "0llk76lf0mh4mzj7pwd8cs55wpmfq8v1bsdzvizb1sx0vfbjh8g6",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json
deleted file mode 100644
index 62ceb5aa8f98..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
-  "rev": "8cce1098c59534352aa0f343ea73861f603ac04a",
-  "sha256": "130a1yda2m7pa10as3rccz84m3617422n6s51pdn4kp8p8rk7cs6",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json
deleted file mode 100644
index 37e249040f14..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtbase.git",
-  "rev": "c9fde86b0a2440133bc08f4811b6ca793be47f0a",
-  "sha256": "1fqhdkv3sp3nbzqi2a5wvxn5d4v0xcrq2bl609bdyj4nx367a8wp",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json
deleted file mode 100644
index 560489a6e217..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtcharts.git",
-  "rev": "130463160b4923069eb98da49edaf7d93180f4f8",
-  "sha256": "19g35cddbfh307mk76wac1ps03warynlsj7xi8i596bxiaf7i4pw",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json
deleted file mode 100644
index c606975bfe51..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
-  "rev": "69a87a9b831e36a578594a0a13130c384ad03121",
-  "sha256": "0ph07rdf9qfxnw3z2nqbmh6na65z0p2snmlzdw80amd7s0g255kw",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json
deleted file mode 100644
index 278e3ec4df62..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
-  "rev": "c085311c02dd216e5a041b90c164d55b3cf3ce92",
-  "sha256": "0xya1m2csb42yisl90s9822p9q92n7ags909nlbapfsb49qwsqnj",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json
deleted file mode 100644
index 868c49c5a2ea..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
-  "rev": "55324650f9e759a43dce927f823c9858574106c3",
-  "sha256": "0cxz4pqvb8l0wqpc4hr0xmc72csqf7dpbbzdqgil9nyyg21ihkz0",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json
deleted file mode 100644
index c00f65fd10d3..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtdoc.git",
-  "rev": "897e90fe304d844beaf694b82a93a50237fa8b9e",
-  "sha256": "1c4m9vlgg6bfw7hwzanl5s4vslg0r7xiz50lanhqrlcrr9i36xs1",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json
deleted file mode 100644
index f3cbee2dedc7..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtgamepad.git",
-  "rev": "64afa18a0a1e9588060e2e6d917bb01ccdd48a81",
-  "sha256": "1h9yb0asprynnb2qyjbmyglrkk9f9v19g6zzpk0gmixrp0h8gk46",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json
deleted file mode 100644
index c78f288919f9..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
-  "rev": "c36998dc1581167b12cc3de8e4ac68c2a5d9f76e",
-  "sha256": "0x11n2fym765z3gyb4xnfl7v6zrip1wjkkl6nx1bxaya173fvdw8",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json
deleted file mode 100644
index 28795710b1e9..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtimageformats.git",
-  "rev": "cb82c74310837fe4e832c8ab72176a5d63e4355f",
-  "sha256": "0j4cv5sa6mm3adcjw8cv6kbzrslmhjc1rgxqgc130l8vm3vmgbkr",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json
deleted file mode 100644
index 4ed826b65562..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtlocation.git",
-  "rev": "861e372b6ad81570d4f496e42fb25a6699b72f2f",
-  "sha256": "1g24pg9v6sv5zf80r48innp3h4g0hss69hnr7ygfzfvfnmmn6g52",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json
deleted file mode 100644
index ed255997b77b..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtlottie.git",
-  "rev": "fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4",
-  "sha256": "1xgykaw8qjnaip6h9jx0nfadc9amb6aclk758vm5pp43dvs5j96r",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json
deleted file mode 100644
index 9aa1128ce26e..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtmacextras.git",
-  "rev": "e72896968697e2a8af16a312e1560948e4c40f30",
-  "sha256": "1hndpbr1nnybn7frg76q99bk1c8fhvra6wjm0q78p4a8pinrvcms",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json
deleted file mode 100644
index 93b26b6734eb..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
-  "rev": "bd29c87027637a013f2c5e3b549fcda84e4d7545",
-  "sha256": "11pz9zzrhsr3n78ga7l3kp3gi20rpxsa4iz3wclhcbcm2xr3nd94",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json
deleted file mode 100644
index fa0c49185f52..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
-  "rev": "53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a",
-  "sha256": "0idaysqpwrghih7ijrm9hagj9jw3fy9nw539fr4d9rmcggnkkzn2",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json
deleted file mode 100644
index 90c086794cbe..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
-  "rev": "cbf444fb570ca4f4ca21d963d2ae4010f10d473e",
-  "sha256": "1cki7n62wqm3xxn36mka0y67ngn7jvjkrvr08vsassbjb7kfsmxp",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json
deleted file mode 100644
index 3cb8d7dcc809..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtquick3d.git",
-  "rev": "3e3e53c834b25dc2959dd30f319d12d6f84ee1e3",
-  "sha256": "1b1khfg26zl3p28yvhwjfldqy3flh10pb5hm5z0av03rz7jy7l8s",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json
deleted file mode 100644
index 6bd93cf62c32..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
-  "rev": "cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420",
-  "sha256": "1vxp0kwigwhqyyfm0xg8llyd1l1f4l18hmk6xqkm57xpi15x55bc",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json
deleted file mode 100644
index fcacda36609f..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
-  "rev": "be66bf9a5618c745d2a6ee2262967af6307b3b07",
-  "sha256": "11h3f3rb2kqgsw7njzhjwazw1k03v12i83irjndylafiaqw6c6ks",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json
deleted file mode 100644
index 3a99df32920b..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
-  "rev": "67503cdadea43b95ddad0de1a04951aff0ce1a07",
-  "sha256": "0h4b3ibcf6rsmqmcfbwbk9pbvw3b9cac8nx2538aqvnpyyp1vhid",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json
deleted file mode 100644
index 5b1aefb8d40a..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
-  "rev": "4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735",
-  "sha256": "1zbxl5jk7x8qklrnbbaikymyviigqdq7vf0wc8gzls4126vcx146",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json
deleted file mode 100644
index 3aefd77854c5..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtscript.git",
-  "rev": "5cec94b2c1503f106f4ef4778d016410ebb86211",
-  "sha256": "1xdri98cw7m78k9kfb53cgh8wyz98q3i623jhhcv01rvy1zsf8m1",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json
deleted file mode 100644
index b792b71119cf..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtscxml.git",
-  "rev": "7a15000f42c7a3171719727cd056f82a78244ed7",
-  "sha256": "1i2ajsj9pb1s4lk4djj1h1ay9mkz1z3m75a747cspyc1p1iymipq",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json
deleted file mode 100644
index 2d2e1c7ea689..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtsensors.git",
-  "rev": "921a31375f29e429e95352b08b2b9dbfea663cb1",
-  "sha256": "1ijayk6lf34nwv7s3ib3cfqx9sjrmr1c6jnziwmxa1l6fy3ik4g8",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json
deleted file mode 100644
index cea79ff4c553..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtserialbus.git",
-  "rev": "8884c5e43df846deac5a0c7c290eeb633d6bfe32",
-  "sha256": "1ydb5x21j26pl58mr6klnwixkqx8h119nvnzvyawz83gji3ay3a5",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json
deleted file mode 100644
index a4e09c149052..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtserialport.git",
-  "rev": "941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4",
-  "sha256": "0x7ly67gddmz0hqls9109bk4rgaa97ksyv24qk4brrhzkpr7q9cx",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json
deleted file mode 100644
index 317bafe92c16..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtspeech.git",
-  "rev": "a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b",
-  "sha256": "1ljf45f65pfp8x367qnzl0ssz7n17cxhk29qvqpz9z7rh65zqix5",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json
deleted file mode 100644
index 9e4d5b2ea870..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtsvg.git",
-  "rev": "24128cdf8bef53eddf31a5709bbbc46293006b1c",
-  "sha256": "0vinjcbq4saxhlmvb5i93bzgg30qc3j8r2qfwrzaxc4vmfhfgi56",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qttools.json b/pkgs/development/libraries/qt-5/5.15/srcs/qttools.json
deleted file mode 100644
index 9045142a54ee..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qttools.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qttools.git",
-  "rev": "33693a928986006d79c1ee743733cde5966ac402",
-  "sha256": "02n0lppsp6g4s9bdvnfxpf7ndkbs9bzm0clcwvirwf2cd8q95a4n",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json b/pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json
deleted file mode 100644
index 09e8ac32031a..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qttranslations.git",
-  "rev": "8fbbdf21f127197f97b58c7d80d2fa2a59135638",
-  "sha256": "06r2jb2fsdr5fvxs748war0lr4mm3l3d3b37xc4n73y294vwrmn7",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json
deleted file mode 100644
index 76a20b6ca5d5..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
-  "rev": "353b75b2e34bdae901625bbddf5c5e3f3e6c0de5",
-  "sha256": "12nv773zc05yrbai1z6i481yinih0kxcjzgm9pa0580qz69gd9a5",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json
deleted file mode 100644
index 25b267c66c1f..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtwayland.git",
-  "rev": "992833ca741efe8f533c61abfaf129a1d8bfcfee",
-  "sha256": "1w8mq38k6s0fncqv113bw1pc7g10ysfmsbyg23hxh9fr5q4ia4q7",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json
deleted file mode 100644
index fa6ac0bd1b74..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
-  "rev": "47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38",
-  "sha256": "167rp43c86xr4grzxs4bl46y6sf1q9xa0641mgp4r94g2ipxyc1d",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json
deleted file mode 100644
index 386a8aa143d2..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
-  "rev": "550a8cee241bbf8c11863dec9587d579dcb1108b",
-  "sha256": "0p1y0b8zsm7rrkhhylndp282ghgki2cjrgc4n5zhjn732ahxg515",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json
deleted file mode 100644
index 23c2c9ae5384..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
-  "rev": "e7883bc64440b1ff4666272ac6eb710ee4bc221b",
-  "sha256": "1rj99y1f0wn6g1m2k53xkni5v79zgq25yv8b9wx2bz0n2r9iasca",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json
deleted file mode 100644
index 27a93a97da54..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtwebview.git",
-  "rev": "920de5f1cd9f9001cfef1bfd2c19e6720793362f",
-  "sha256": "04hnqalabhypkd2hgl45jxf9p1p6dgjwlc5b7gs4f6588lafgd3f",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json
deleted file mode 100644
index 30847e67e560..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtwinextras.git",
-  "rev": "3df03dab21f3e84d5a7274c64dd879854ca1bfe7",
-  "sha256": "12dkw982xcm7hxw3lxhg34wny4srbickxm9s3nz7bdyp9dmqnygx",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json
deleted file mode 100644
index 4c4d665e287a..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtx11extras.git",
-  "rev": "3898f5484fd4864b047729bfeda9a1222f32364f",
-  "sha256": "04rp8arml19b03iybd7sa78dsdv7386m9ymmgqciwl13dhwjssra",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json
deleted file mode 100644
index 6363cb262967..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
-  "rev": "189e28d0aff1f3d7960228ba318b83e3cadac98c",
-  "sha256": "0vs9j2i1dnlivcrzz175zz66ql1m8mrdqkglvyqjqv6cb7mpskrq",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}

From b9331fbad9226b825f46c2f52db4528eb4e4b897 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 10:59:30 -0500
Subject: [PATCH 154/235] qt515: consolidate extra package sources

---
 .../libraries/qt-5/5.15/default.nix           | 52 +------------------
 pkgs/development/libraries/qt-5/5.15/srcs.nix | 49 ++++++++++++++++-
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 1659dc51ae27..183311c5f18a 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -21,60 +21,12 @@ Check for any minor version changes.
 
 let
 
+  srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; };
+
   qtCompatVersion = srcs.qtbase.version;
 
   stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
 
-  mirror = "https://download.qt.io";
-  srcs =
-    import ./srcs.nix { inherit lib fetchgit; }
-    // {
-      # qtwebkit does not have an official release tarball on the qt mirror and is
-      # mostly maintained by the community.
-      qtwebkit = rec {
-        src = fetchFromGitHub {
-          owner = "qt";
-          repo = "qtwebkit";
-          rev = "v${version}";
-          sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
-        };
-        version = "5.212.0-alpha4";
-      };
-      qtwebengine =
-        let
-          branchName = "5.15.6";
-          rev = "v${branchName}-lts";
-        in
-        {
-          version = "${branchName}-${lib.substring 0 7 rev}";
-
-          src = fetchgit {
-            url = "https://github.com/qt/qtwebengine.git";
-            sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
-            inherit rev branchName;
-            fetchSubmodules = true;
-            leaveDotGit = true;
-            name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz";
-            postFetch = ''
-              # remove submodule .git directory
-              rm -rf "$out/src/3rdparty/.git"
-
-              # compress to not exceed the 2GB output limit
-              # try to make a deterministic tarball
-              tar -I 'gzip -n' \
-                --sort=name \
-                --mtime=1970-01-01 \
-                --owner=root --group=root \
-                --numeric-owner --mode=go=rX,u+rw,a-s \
-                --transform='s@^@source/@' \
-                -cf temp  -C "$out" .
-              rm -r "$out"
-              mv temp "$out"
-            '';
-          };
-        };
-    };
-
   patches = {
     qtbase = lib.optionals stdenv.isDarwin [
       ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
index 9527b8aa4071..e254912b6009 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -1,4 +1,4 @@
-{ lib, fetchgit }:
+{ lib, fetchgit, fetchFromGitHub }:
 
 let
   version = "5.15.3";
@@ -23,3 +23,50 @@ let
     };
 in
 lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
+// {
+  # qtwebkit does not have an official release tarball on the qt mirror and is
+  # mostly maintained by the community.
+  qtwebkit = rec {
+    src = fetchFromGitHub {
+      owner = "qt";
+      repo = "qtwebkit";
+      rev = "v${version}";
+      sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
+    };
+    version = "5.212.0-alpha4";
+  };
+
+  qtwebengine =
+    let
+      branchName = "5.15.6";
+      rev = "v${branchName}-lts";
+    in
+    {
+      version = "${branchName}-${lib.substring 0 7 rev}";
+
+      src = fetchgit {
+        url = "https://github.com/qt/qtwebengine.git";
+        sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
+        inherit rev branchName;
+        fetchSubmodules = true;
+        leaveDotGit = true;
+        name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz";
+        postFetch = ''
+          # remove submodule .git directory
+          rm -rf "$out/src/3rdparty/.git"
+
+          # compress to not exceed the 2GB output limit
+          # try to make a deterministic tarball
+          tar -I 'gzip -n' \
+            --sort=name \
+            --mtime=1970-01-01 \
+            --owner=root --group=root \
+            --numeric-owner --mode=go=rX,u+rw,a-s \
+            --transform='s@^@source/@' \
+            -cf temp  -C "$out" .
+          rm -r "$out"
+          mv temp "$out"
+        '';
+      };
+    };
+}

From 940e66891492e03b8144c76cf68173335f779049 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 11:33:31 -0500
Subject: [PATCH 155/235] qt515: remove unused file

---
 .../libraries/qt-5/5.15/patches.nix           | 43 -------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/patches.nix

diff --git a/pkgs/development/libraries/qt-5/5.15/patches.nix b/pkgs/development/libraries/qt-5/5.15/patches.nix
deleted file mode 100644
index e3a08769e8c5..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/patches.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-qt3d = {name="qt3d-5.15.patch";url="https://invent.kde.org/qt/qt/qt3d.git";fromRev="34171b1d99f55fde1627df3c57eed50480ab2ae7";toRev="7edec6e014de27b9dd03f63875c471aac606a918";sha256="12hrq0arwhfk8blqjrb24rcka9cy2asg0mpfck63khcmjhqyaic9";};
-qtactiveqt = {name="qtactiveqt-5.15.patch";url="https://invent.kde.org/qt/qt/qtactiveqt.git";fromRev="0c62d8262fb2a4779e05e95d112f08125031b640";toRev="f0d03da0e37a84029a4eae1733813521482ac1fb";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
-qtandroidextras = {name="qtandroidextras-5.15.patch";url="https://invent.kde.org/qt/qt/qtandroidextras.git";fromRev="505be55243ba1600f62f47f9be3011a717841096";toRev="8cce1098c59534352aa0f343ea73861f603ac04a";sha256="1zjinv99mh2w49nshprdssl1ybjb7av7m6i85pd2gc97shvn6g77";};
-qtbase = {name="qtbase-5.15.patch";url="https://invent.kde.org/qt/qt/qtbase.git";fromRev="40143c189b7c1bf3c2058b77d00ea5c4e3be8b28";toRev="c9fde86b0a2440133bc08f4811b6ca793be47f0a";sha256="0rax1ic031b14456sz3a5v2m3h6yarfv0nlfw27k41d43wrbbg1x";};
-qtcharts = {name="qtcharts-5.15.patch";url="https://invent.kde.org/qt/qt/qtcharts.git";fromRev="a67f812548b008e3eedcd2bb9313828a195fd23b";toRev="130463160b4923069eb98da49edaf7d93180f4f8";sha256="0va2ykp4lcni7xxlmpjqlwsjbal48sbwmx7kfswm7z0a9ps4py3d";};
-qtconnectivity = {name="qtconnectivity-5.15.patch";url="https://invent.kde.org/qt/qt/qtconnectivity.git";fromRev="ca6cc606d9fc0947ea6c27738a1ca8f12f3258ea";toRev="69a87a9b831e36a578594a0a13130c384ad03121";sha256="1kjw83h66hfg2qbfcw5xnr1x5cicp2snmgz5wjqg45z5bkk517bs";};
-qtdatavis3d = {name="qtdatavis3d-5.15.patch";url="https://invent.kde.org/qt/qt/qtdatavis3d.git";fromRev="1168c788a117e4556e6cd0ba1e267a86ef62b0c4";toRev="c085311c02dd216e5a041b90c164d55b3cf3ce92";sha256="16vzmdcfd8r4h7k28b7k48nlzn4smzf0903qjfy565ydpmwnhm07";};
-qtdeclarative = {name="qtdeclarative-5.15.patch";url="https://invent.kde.org/qt/qt/qtdeclarative.git";fromRev="104eae5b17b0ec700391e9539ee3a4f638588194";toRev="55324650f9e759a43dce927f823c9858574106c3";sha256="0jb0bcg4r8sry3dcx5am9w4qcn1zx1a30lwyr3wxry11m81lsbd0";};
-qtdoc = {name="qtdoc-5.15.patch";url="https://invent.kde.org/qt/qt/qtdoc.git";fromRev="2d00e0060b2894481c8f46577ac995aeda4a7641";toRev="897e90fe304d844beaf694b82a93a50237fa8b9e";sha256="0qfvcy6lj7fb3fazg6q6j05qdank6ba5najz3sw4m7r6dybf8nwl";};
-qtgamepad = {name="qtgamepad-5.15.patch";url="https://invent.kde.org/qt/qt/qtgamepad.git";fromRev="ff933a4e72826a77c81c4153f1adcf765ead35f0";toRev="64afa18a0a1e9588060e2e6d917bb01ccdd48a81";sha256="1gcas9mxs409rzsmmi40gf16vcy4kv17hd1sf1h7k315inixyppk";};
-qtgraphicaleffects = {name="qtgraphicaleffects-5.15.patch";url="https://invent.kde.org/qt/qt/qtgraphicaleffects.git";fromRev="66b7fbaca4b323dce337e87e3093c8836577c561";toRev="c36998dc1581167b12cc3de8e4ac68c2a5d9f76e";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
-qtimageformats = {name="qtimageformats-5.15.patch";url="https://invent.kde.org/qt/qt/qtimageformats.git";fromRev="74a5bc4a45195b876454e596e76cb23aeb365410";toRev="cb82c74310837fe4e832c8ab72176a5d63e4355f";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
-qtlocation = {name="qtlocation-5.15.patch";url="https://invent.kde.org/qt/qt/qtlocation.git";fromRev="02a21217a9706402802f38c646797be8eccb86e4";toRev="861e372b6ad81570d4f496e42fb25a6699b72f2f";sha256="144bz04071dcdhqi0z1yzpsbkzj634vdig11hv3y6ykh3400x606";};
-qtlottie = {name="qtlottie-5.15.patch";url="https://invent.kde.org/qt/qt/qtlottie.git";fromRev="b182dcd78a35b4667b2568857b7719d555c7fddb";toRev="fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4";sha256="0s6p3gs8mrc824699wrbazkfl169midmnyzvp4cnml8grfl89azj";};
-qtmacextras = {name="qtmacextras-5.15.patch";url="https://invent.kde.org/qt/qt/qtmacextras.git";fromRev="65f500c488c593486c6c390f53497dfbce1b58a6";toRev="e72896968697e2a8af16a312e1560948e4c40f30";sha256="10bqq6msnryqr8ald4hlhga4f6qhmrkl6ygwpnkqgyq577n4jz0p";};
-qtmultimedia = {name="qtmultimedia-5.15.patch";url="https://invent.kde.org/qt/qt/qtmultimedia.git";fromRev="fd30913d4601d12437404e1d20113a1ed6364ccc";toRev="bd29c87027637a013f2c5e3b549fcda84e4d7545";sha256="15kvask4kabpnmwpyc1rbr8ybhnmzdycznb5r72n4f4scznzjmi8";};
-qtnetworkauth = {name="qtnetworkauth-5.15.patch";url="https://invent.kde.org/qt/qt/qtnetworkauth.git";fromRev="fb2d6d47a0c961278d63309789a1141c3734818b";toRev="53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a";sha256="0s6p3gs8mrc824699wrbazkfl169midmnyzvp4cnml8grfl89azj";};
-qtpurchasing = {name="qtpurchasing-5.15.patch";url="https://invent.kde.org/qt/qt/qtpurchasing.git";fromRev="ddfa4d16243128d2871a51c513e025d518151b17";toRev="cbf444fb570ca4f4ca21d963d2ae4010f10d473e";sha256="0z1dax7g5p1dza5d96aayvi9chzmkrl6s3yfr3xn7jhxwf0r51fp";};
-qtquick3d = {name="qtquick3d-5.15.patch";url="https://invent.kde.org/qt/qt/qtquick3d.git";fromRev="2e05e6d6546635a8f25882c5140fb17697be0062";toRev="3e3e53c834b25dc2959dd30f319d12d6f84ee1e3";sha256="0kckgix393qqcpz5wlpvpkfmrj921bvnjzp13ka7dn1ys5rzac4z";};
-qtquickcontrols = {name="qtquickcontrols-5.15.patch";url="https://invent.kde.org/qt/qt/qtquickcontrols.git";fromRev="7c29283041a50def3ceca7de4471f211c9b30d4e";toRev="cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420";sha256="0843jcggynzgv3ymvnkhgvfs44z56bmg7n2gl8f75nziwn5yi840";};
-qtquickcontrols2 = {name="qtquickcontrols2-5.15.patch";url="https://invent.kde.org/qt/qt/qtquickcontrols2.git";fromRev="16f27dfa3588c2bf377568ce00bf534af48c9558";toRev="be66bf9a5618c745d2a6ee2262967af6307b3b07";sha256="1jjbvp9cwdxqy8lm1jm9b20w1jxl4f15sn2m0sz38bnch5n3s3kv";};
-qtquicktimeline = {name="qtquicktimeline-5.15.patch";url="https://invent.kde.org/qt/qt/qtquicktimeline.git";fromRev="147ad75c589fc4804429710fdb177cc48a80dbea";toRev="67503cdadea43b95ddad0de1a04951aff0ce1a07";sha256="0c2cdvb2l488qzpaymfl1yik21iydqrdqjf95cdjif6pnb42xwxi";};
-qtremoteobjects = {name="qtremoteobjects-5.15.patch";url="https://invent.kde.org/qt/qt/qtremoteobjects.git";fromRev="8e889442508e284691c923470eb4552c96afdfe3";toRev="4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735";sha256="11f65d8bfkj7k9jfq780hki9kwndwgvnj355w4xbfs0icm4l7ggn";};
-qtscript = {name="qtscript-5.15.patch";url="https://invent.kde.org/qt/qt/qtscript.git";fromRev="5da7de1800eee3d604eb7e787b114479b61ffc93";toRev="5cec94b2c1503f106f4ef4778d016410ebb86211";sha256="0nndn6aia39m9zfydg471fxiyjwfayvygzh600aqnl2h8d912n1x";};
-qtscxml = {name="qtscxml-5.15.patch";url="https://invent.kde.org/qt/qt/qtscxml.git";fromRev="95aa78be795a862b95371afa75e1417029ec0a16";toRev="7a15000f42c7a3171719727cd056f82a78244ed7";sha256="0b7xqd5lpkjsgivi58g7f09i9rv1dpl1b4wrfgbxlff2scfy0vjh";};
-qtsensors = {name="qtsensors-5.15.patch";url="https://invent.kde.org/qt/qt/qtsensors.git";fromRev="5618198e6df5e0224f79f786a44af7527b431545";toRev="921a31375f29e429e95352b08b2b9dbfea663cb1";sha256="1xjdw99fvnp4pb9qgj32rpj3zfh6nkb8k4ax9c8z1yk04ra0rq3n";};
-qtserialbus = {name="qtserialbus-5.15.patch";url="https://invent.kde.org/qt/qt/qtserialbus.git";fromRev="1aa9b03756baead139943712839af5ecedeb2989";toRev="8884c5e43df846deac5a0c7c290eeb633d6bfe32";sha256="05dl7xkxwxs42shrykpq8jz9a8b9l60anp965cv4qb19zglwvcfm";};
-qtserialport = {name="qtserialport-5.15.patch";url="https://invent.kde.org/qt/qt/qtserialport.git";fromRev="192e376b01e65e7277772bdc94106613c22cf531";toRev="941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
-qtspeech = {name="qtspeech-5.15.patch";url="https://invent.kde.org/qt/qt/qtspeech.git";fromRev="84dd22a080014cb99a7dff7772990787a04ca533";toRev="a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b";sha256="1vspazk7lh6idwnmh935fhjxa2f8yp3h7vyb3chli99ygh0386vx";};
-qtsvg = {name="qtsvg-5.15.patch";url="https://invent.kde.org/qt/qt/qtsvg.git";fromRev="52d3788c7b0116ea3db232dccca5f1e3f1e229ac";toRev="24128cdf8bef53eddf31a5709bbbc46293006b1c";sha256="018a1w6k7911ydim7h2z8mg1dqrfvllr874jqr9kylp2ymq95hhv";};
-qttools = {name="qttools-5.15.patch";url="https://invent.kde.org/qt/qt/qttools.git";fromRev="cc52debd905e0ed061290d6fd00a5f1ab67478a5";toRev="33693a928986006d79c1ee743733cde5966ac402";sha256="0hwpr3qalzn9hljakicpdwqd66mxghzqhi4896kscqy41db3mym3";};
-qttranslations = {name="qttranslations-5.15.patch";url="https://invent.kde.org/qt/qt/qttranslations.git";fromRev="cb1857418b36780b0444333f3aa6250ca3780f19";toRev="8fbbdf21f127197f97b58c7d80d2fa2a59135638";sha256="0p47ima4dn8sjhhg6c0qr0jip0q4akvi5xm2wxj62dlzr8d0zv14";};
-qtvirtualkeyboard = {name="qtvirtualkeyboard-5.15.patch";url="https://invent.kde.org/qt/qt/qtvirtualkeyboard.git";fromRev="7b90415c58dd02c682a9ba317f273d7b3398ff88";toRev="353b75b2e34bdae901625bbddf5c5e3f3e6c0de5";sha256="19azki7yi83dkc05asclrkj0lf14x927l30xpg5lj2p2mz1cf1mr";};
-qtwayland = {name="qtwayland-5.15.patch";url="https://invent.kde.org/qt/qt/qtwayland.git";fromRev="3cc17177b1b03053276eb6236fda137c588261a7";toRev="992833ca741efe8f533c61abfaf129a1d8bfcfee";sha256="072zp6fksjig1y1cw4jm7wv60qd9hdci7cx1hxhfw1r4c7k012wp";};
-qtwebchannel = {name="qtwebchannel-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebchannel.git";fromRev="90cffd49575b075b0dc28440c693753d860fee87";toRev="47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38";sha256="0irxngxg23kwf7zmbr5k5lzqfbyf1zh5smjkpl3dvx444qqxgrdl";};
-qtwebglplugin = {name="qtwebglplugin-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebglplugin.git";fromRev="5e41e564aaf96b7e49403af5099995efbe4cac8e";toRev="550a8cee241bbf8c11863dec9587d579dcb1108b";sha256="12iv161qmapakrb4awkpqzwq4r366fbgm344p0b3zsw7jzkqigw8";};
-qtwebsockets = {name="qtwebsockets-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebsockets.git";fromRev="f73735911b2124ef16aa39228bf8f89ee900ba5d";toRev="e7883bc64440b1ff4666272ac6eb710ee4bc221b";sha256="0sjg8m2sd6rlg5asjb6ddh8rd6c0pp7l1532al1br00b861al5yi";};
-qtwebview = {name="qtwebview-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebview.git";fromRev="800926cc4e0ecfdb37a3b34486403354b66a37a4";toRev="920de5f1cd9f9001cfef1bfd2c19e6720793362f";sha256="10bqq6msnryqr8ald4hlhga4f6qhmrkl6ygwpnkqgyq577n4jz0p";};
-qtwinextras = {name="qtwinextras-5.15.patch";url="https://invent.kde.org/qt/qt/qtwinextras.git";fromRev="41f2492a30be21f28c8b0b7b932b886536fc9916";toRev="3df03dab21f3e84d5a7274c64dd879854ca1bfe7";sha256="10bqq6msnryqr8ald4hlhga4f6qhmrkl6ygwpnkqgyq577n4jz0p";};
-qtx11extras = {name="qtx11extras-5.15.patch";url="https://invent.kde.org/qt/qt/qtx11extras.git";fromRev="9bb0adeac84da6723cf57a2bb0d0c3b405691a15";toRev="3898f5484fd4864b047729bfeda9a1222f32364f";sha256="0al27mckfgfcrqvf0x3didaina2rj4xi3hp6vdpz5i6p3z4ws8wq";};
-qtxmlpatterns = {name="qtxmlpatterns-5.15.patch";url="https://invent.kde.org/qt/qt/qtxmlpatterns.git";fromRev="50421402f05b3ee3c76c6cff455a69efaf576b6d";toRev="189e28d0aff1f3d7960228ba318b83e3cadac98c";sha256="0hxsxk6l4x8h6q053lm65wxkl3di3qx9z8rjn0w1nxs051q1szch";};
-}

From de97acd19010c1b47b6b427e955555f5b24133e0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 11:37:54 -0500
Subject: [PATCH 156/235] qt515: consolidate bash set short options

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/libraries/qt-5/5.15/fetch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh
index e97dee310d07..dcada3649078 100755
--- a/pkgs/development/libraries/qt-5/5.15/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p nix-prefetch-scripts jq
 
-set -x -e -o pipefail
+set -eox pipefail
 
 here="$(dirname "${BASH_SOURCE[0]}")"
 modules="${here}/modules"

From 27b6cf2445196ed10fbe06c2c9f64331ac0ac291 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 11:38:56 -0500
Subject: [PATCH 157/235] qtModule: combine conditionals inside evaluation
 brackets

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/libraries/qt-5/qtModule.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index 245d94f909d2..12a9a85c7b79 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -45,7 +45,7 @@ mkDerivation (args // {
       exit 1
     fi
 
-    if [[ -z "$dontSyncQt" ]] && [[ -f sync.profile ]]; then
+    if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
       syncqt.pl -version "''${version%%-*}"
     fi
   '';

From 5b22f14d3818c7e20d349f2f399bf85d063413a7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 11:58:38 -0500
Subject: [PATCH 158/235] qtbase: avoid rebuilding versions < 5.15

---
 pkgs/development/libraries/qt-5/modules/qtbase.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 53c55863f6f3..44f08699824f 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -115,7 +115,7 @@ stdenv.mkDerivation {
     sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake
     sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in
     sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-
+  '' + lib.optionalString (compareVersion "5.15.0" >= 0) ''
     patchShebangs ./bin
   '' + (
     if stdenv.isDarwin then ''
@@ -151,10 +151,8 @@ stdenv.mkDerivation {
     ''}
 
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
-
-    ${lib.optionalString (compareVersion "5.15.0" >= 0) ''
+  '' + lib.optionalString (compareVersion "5.15.0" >= 0) ''
     ./bin/syncqt.pl -version $version
-    ''}
   '';
 
   postConfigure = ''

From bb3f1c9c9e0ab86cd890c980a1bfe09a30726895 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 1 Nov 2021 07:41:56 +0000
Subject: [PATCH 159/235] mtr: fix build against upcoming ncurses-6.3

On ncurses-6.3 with extra printf() annotations gcc now detects
use of user input in place of format strings:

    ui/curses.c:765:42:
      error: format not a string literal and no format arguments [-Werror=format-security]
      765 |         mvprintw(rowstat - 1, startstat, msg);
          |                                          ^~~
---
 pkgs/tools/networking/mtr/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix
index 1257c167e768..3e11d8eac085 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/pkgs/tools/networking/mtr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config
+{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config
 , libcap, ncurses
 , withGtk ? false, gtk3 }:
 
@@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
     sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6";
   };
 
+  patches = [
+    # pull patch to fix build failure against ncurses-6.3:
+    #  https://github.com/traviscross/mtr/pull/411
+    (fetchpatch {
+      name = "ncurses-6.3.patch";
+      url = "https://github.com/traviscross/mtr/commit/aeb493e08eabcb4e6178bda0bb84e9cd01c9f213.patch";
+      sha256 = "1qk8lf4sha18g36mr84vbdvll2s8khgbzyyq0as3ifx44lv0qlf2";
+    })
+  ];
+
   # we need this before autoreconfHook does its thing
   postPatch = ''
     echo ${version} > .tarball-version

From 3a0f6d4e3df333b408e30d88a929ce7016a895ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 29 Oct 2021 13:26:03 +0200
Subject: [PATCH 160/235] python310Packages.ruamel-yaml-clib: 0.2.0 -> 0.2.4,
 add SuperSandro2000 as maintainer

---
 .../python-modules/ruamel_yaml_clib/default.nix    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
index c403239d5525..c3d752bb55ef 100644
--- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
@@ -1,28 +1,28 @@
 { lib
 , buildPythonPackage
 , fetchhg
-, ruamel_base
-, ruamel_ordereddict ? null
-, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "ruamel.yaml.clib";
-  version = "0.2.0";
+  version = "0.2.4";
 
   src = fetchhg {
     url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code";
     rev = version;
-    sha256 = "0kq6zi96qlm72lzj90fc2rfk6nm5kqhk6qxdl8wl9s3a42b0v6wl";
+    sha256 = "sha256-HQZY1opUvVQdXUHmsZmcYX2vfgjKsl6xATmVIXjnBlc=";
   };
 
-  # outputs match wheel
+  # no tests
   doCheck = false;
 
+  # circular depedency with ruamel-yaml
+  # pythonImportsCheck = [ "_ruamel_yaml" ];
+
   meta = with lib; {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
     homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/";
     license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }

From 418bbe4a6c127d7dd2a43e02d8b23ba4c80cb4dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 1 Nov 2021 11:20:56 +0100
Subject: [PATCH 161/235] python39Packages.ruamel_yaml: remove python2
 compatility from python3 file, add SuperSandro2000 as maintainer

---
 pkgs/development/python-modules/ruamel_yaml/0.16.nix   | 10 +++++-----
 .../development/python-modules/ruamel_yaml/default.nix |  9 ++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/ruamel_yaml/0.16.nix b/pkgs/development/python-modules/ruamel_yaml/0.16.nix
index ed2ddf330659..b4734d0a53cc 100644
--- a/pkgs/development/python-modules/ruamel_yaml/0.16.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/0.16.nix
@@ -2,9 +2,9 @@
 , buildPythonPackage
 , fetchPypi
 , ruamel_base
-, ruamel_ordereddict ? null
+, ruamel_ordereddict
 , ruamel_yaml_clib ? null
-, isPy3k
+, isPy27
 , isPyPy
 }:
 
@@ -21,11 +21,11 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ ruamel_base ]
-    ++ lib.optional (!isPy3k) ruamel_ordereddict
+    ++ lib.optional isPy27 ruamel_ordereddict
     ++ lib.optional (!isPyPy) ruamel_yaml_clib;
 
   # causes namespace clash on py27
-  dontUsePythonImportsCheck = !isPy3k;
+  dontUsePythonImportsCheck = isPy27;
   pythonImportsCheck = [
     "ruamel.yaml"
     "ruamel.base"
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
     homepage = "https://sourceforge.net/projects/ruamel-yaml/";
     license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }
diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix
index efd418e454d4..eeb200b57b47 100644
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/default.nix
@@ -2,9 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , ruamel_base
-, ruamel_ordereddict ? null
-, ruamel_yaml_clib ? null
-, isPy3k
+, ruamel_yaml_clib
 , isPyPy
 }:
 
@@ -21,11 +19,8 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ ruamel_base ]
-    ++ lib.optional (!isPy3k) ruamel_ordereddict
     ++ lib.optional (!isPyPy) ruamel_yaml_clib;
 
-  # causes namespace clash on py27
-  dontUsePythonImportsCheck = !isPy3k;
   pythonImportsCheck = [
     "ruamel.yaml"
     "ruamel.base"
@@ -35,6 +30,6 @@ buildPythonPackage rec {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
     homepage = "https://sourceforge.net/projects/ruamel-yaml/";
     license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }

From 595c25f10535b4cde8b15109f8f36e387cce58c6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 1 Nov 2021 14:51:12 +0100
Subject: [PATCH 162/235] polkit: Fix regression in paths in pkg-config file

resulting from discrepancy between Meson and Autotools build systems.
---
 pkgs/development/libraries/polkit/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index b2d1b35f05e1..623da157a633 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -51,7 +51,14 @@ stdenv.mkDerivation rec {
     sha256 = "oEaRf1g13zKMD+cP1iwIA6jaCDwvNfGy2i8xY8vuVSo=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isMusl [
+  patches = [
+    # Allow changing base for paths in pkg-config file as before.
+    # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/100
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/7ba07551dfcd4ef9a87b8f0d9eb8b91fabcb41b3.patch";
+      sha256 = "1iyiksqk29sizwaa4623bv683px1fny67639qpb1him89hza00wy";
+    })
+  ] ++ 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.

From 3b916a6b78e41f488a02fd32c2f8b8816993f789 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 1 Nov 2021 14:53:13 +0100
Subject: [PATCH 163/235] polkit: fix hash

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

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 623da157a633..bd731e7b0517 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/100
     (fetchpatch {
       url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/7ba07551dfcd4ef9a87b8f0d9eb8b91fabcb41b3.patch";
-      sha256 = "1iyiksqk29sizwaa4623bv683px1fny67639qpb1him89hza00wy";
+      sha256 = "ebbLILncq1hAZTBMsLm+vDGw6j0iQ0crGyhzyLZQgKA=";
     })
   ] ++ lib.optionals stdenv.hostPlatform.isMusl [
     # Make netgroup support optional (musl does not have it)

From 84f58338db389dfa85bd8d8236ad48d8124aa260 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Mon, 1 Nov 2021 14:59:44 +0200
Subject: [PATCH 164/235] gtk3: restore x11 support on darwin

---
 pkgs/development/libraries/gtk/3.x.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index 499615a79c1c..6fce8ca78e81 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -148,6 +148,8 @@ stdenv.mkDerivation rec {
     "-Dtests=false"
     "-Dtracker3=${lib.boolToString trackerSupport}"
     "-Dbroadway_backend=${lib.boolToString broadwaySupport}"
+    "-Dx11_backend=${lib.boolToString x11Support}"
+    "-Dquartz_backend=${lib.boolToString (stdenv.isDarwin && !x11Support)}"
   ];
 
   doCheck = false; # needs X11
@@ -159,6 +161,10 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
 
   postPatch = ''
+    # See https://github.com/NixOS/nixpkgs/issues/132259
+    substituteInPlace meson.build \
+      --replace "x11_enabled = false" ""
+
     files=(
       build-aux/meson/post-install.py
       demos/gtk-demo/geninclude.py

From 0a10f96f8abd0518718b4665d0d33b7143e7fb26 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sat, 31 Jul 2021 22:00:34 +0300
Subject: [PATCH 165/235] keybinder3: use gtk-x11 on darwin

---
 pkgs/development/libraries/keybinder3/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix
index 78755a87919d..94f10426c715 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/pkgs/development/libraries/keybinder3/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "Library for registering global key bindings";
     homepage = "https://github.com/kupferlauncher/keybinder/";
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.cstrahan ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62e580034d89..f2651476465c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17002,6 +17002,7 @@ with pkgs;
   };
 
   keybinder3 = callPackage ../development/libraries/keybinder3 {
+    gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3;
     automake = automake111x;
   };
 

From 222e9b518f33b1f0872c296b3044f2574b1d42ce Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 1 Nov 2021 16:23:30 +0000
Subject: [PATCH 166/235] rust: 1.56.0 -> 1.56.1

I've tested building fd on x86_64-linux.  Because this release is so
tiny[1], I'm confident skipping the usual, bigger, tests we do for
Rust.

[1]: https://github.com/rust-lang/rust/compare/1.56.0...1.56.1
---
 pkgs/development/compilers/rust/1_56.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/rust/1_56.nix b/pkgs/development/compilers/rust/1_56.nix
index a3ff30618e83..b1d8167b9a05 100644
--- a/pkgs/development/compilers/rust/1_56.nix
+++ b/pkgs/development/compilers/rust/1_56.nix
@@ -20,8 +20,8 @@
 } @ args:
 
 import ./default.nix {
-  rustcVersion = "1.56.0";
-  rustcSha256 = "0gzl5mzh9zm1ld6gkvlp0118d3qx4vw4n3wfq40k1swdd4nxf3yd";
+  rustcVersion = "1.56.1";
+  rustcSha256 = "04cmqx7nn63hzz7z27b2b0dj2qx18rck9ifvip43s6dampx8v2f3";
 
   llvmSharedForBuild = pkgsBuildBuild.llvmPackages_13.libllvm.override { enableSharedLibraries = true; };
   llvmSharedForHost = pkgsBuildHost.llvmPackages_13.libllvm.override { enableSharedLibraries = true; };

From 4471cbc26d8cbcd7ab8edb65ac8feaac0ab8afa2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 1 Nov 2021 21:15:03 +0100
Subject: [PATCH 167/235] clang-analyzer: Fix the build with LLVM 13

We changed the source structure ("src") by switching from individual
source tarballs to the mono repository. Therefore we have to prepend
"clang/" now.
---
 ...scan-build-to-use-NIX_CFLAGS_COMPILE.patch | 20 +++++++++----------
 .../tools/analysis/clang-analyzer/default.nix | 12 +++++++----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch b/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch
index 16470740877e..87d79a070cd0 100644
--- a/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch
+++ b/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch
@@ -1,21 +1,22 @@
-From 40239d92957f1969652cdd41d6d2749c41ac4338 Mon Sep 17 00:00:00 2001
+From 99a7e55a60c8d96e160f9104a3dd31b7914d3488 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
 Date: Fri, 31 Jul 2020 09:22:03 +0100
-Subject: [PATCH] [PATCH] Fix scan-build to use NIX_CFLAGS_COMPILE
+Subject: [PATCH] Fix scan-build to use NIX_CFLAGS_COMPILE
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
 ---
- tools/scan-build/libexec/ccc-analyzer | 8 ++++++++
+ clang/tools/scan-build/libexec/ccc-analyzer | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/tools/scan-build/libexec/ccc-analyzer b/tools/scan-build/libexec/ccc-analyzer
-index 800f38b5..0fb50fb3 100755
---- a/tools/scan-build/libexec/ccc-analyzer
-+++ b/tools/scan-build/libexec/ccc-analyzer
-@@ -246,6 +246,14 @@ sub Analyze {
+diff --git a/clang/tools/scan-build/libexec/ccc-analyzer
+b/clang/tools/scan-build/libexec/ccc-analyzer
+index ed0d4d3d73f3..2d5113435ca5 100755
+--- a/clang/tools/scan-build/libexec/ccc-analyzer
++++ b/clang/tools/scan-build/libexec/ccc-analyzer
+@@ -249,6 +249,14 @@ sub Analyze {
        push @Args, "-target", $AnalyzerTarget;
      }
  
@@ -31,5 +32,4 @@ index 800f38b5..0fb50fb3 100755
      @CmdArgs = @$AnalysisArgs;
    }
 -- 
-2.27.0
-
+2.33.0
diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix
index 4752b31649d3..46e04aaf389f 100644
--- a/pkgs/development/tools/analysis/clang-analyzer/default.nix
+++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/share/scan-view $out/bin
-    cp -R tools/scan-view/share/* $out/share/scan-view
-    cp -R tools/scan-view/bin/* $out/bin/scan-view
-    cp -R tools/scan-build/* $out
+    cp -R clang/tools/scan-view/share/* $out/share/scan-view
+    cp -R clang/tools/scan-view/bin/* $out/bin/scan-view
+    cp -R clang/tools/scan-build/* $out
 
     rm $out/bin/*.bat $out/libexec/*.bat $out/CMakeLists.txt
 
@@ -26,7 +26,11 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Clang Static Analyzer";
-    homepage    = "http://clang-analyzer.llvm.org";
+    longDescription = ''
+      The Clang Static Analyzer is a source code analysis tool that finds bugs
+      in C, C++, and Objective-C programs.
+    '';
+    homepage    = "https://clang-analyzer.llvm.org/";
     license     = lib.licenses.bsd3;
     platforms   = lib.platforms.unix;
     maintainers = [ lib.maintainers.thoughtpolice ];

From 6817f26c3560e7f31bc21319f3fb1b99c5d2dc92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 1 Nov 2021 21:58:01 +0100
Subject: [PATCH 168/235] python39Packages.ruamel-base: normalise name, adopt

---
 .../{ruamel_base => ruamel-base}/default.nix         | 12 +++++++++---
 pkgs/development/python-modules/ruamel_yaml/0.16.nix |  4 ++--
 .../python-modules/ruamel_yaml/default.nix           |  4 ++--
 pkgs/top-level/python-aliases.nix                    |  1 +
 pkgs/top-level/python-packages.nix                   |  3 +--
 5 files changed, 15 insertions(+), 9 deletions(-)
 rename pkgs/development/python-modules/{ruamel_base => ruamel-base}/default.nix (63%)

diff --git a/pkgs/development/python-modules/ruamel_base/default.nix b/pkgs/development/python-modules/ruamel-base/default.nix
similarity index 63%
rename from pkgs/development/python-modules/ruamel_base/default.nix
rename to pkgs/development/python-modules/ruamel-base/default.nix
index 1f829bb4e0ba..2db8a335e895 100644
--- a/pkgs/development/python-modules/ruamel_base/default.nix
+++ b/pkgs/development/python-modules/ruamel-base/default.nix
@@ -4,18 +4,24 @@
 }:
 
 buildPythonPackage rec {
-  pname = "ruamel.base";
+  pname = "ruamel-base";
   version = "1.0.0";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "ruamel.base";
+    inherit version;
     sha256 = "1wswxrn4givsm917mfl39rafgadimf1sldpbjdjws00g1wx36hf0";
   };
 
+  # no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "ruamel.base" ];
+
   meta = with lib; {
     description = "Common routines for ruamel packages";
     homepage = "https://sourceforge.net/projects/ruamel-base/";
     license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }
diff --git a/pkgs/development/python-modules/ruamel_yaml/0.16.nix b/pkgs/development/python-modules/ruamel_yaml/0.16.nix
index b4734d0a53cc..f2d68f519e4b 100644
--- a/pkgs/development/python-modules/ruamel_yaml/0.16.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/0.16.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, ruamel_base
+, ruamel-base
 , ruamel_ordereddict
 , ruamel_yaml_clib ? null
 , isPy27
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # Tests use relative paths
   doCheck = false;
 
-  propagatedBuildInputs = [ ruamel_base ]
+  propagatedBuildInputs = [ ruamel-base ]
     ++ lib.optional isPy27 ruamel_ordereddict
     ++ lib.optional (!isPyPy) ruamel_yaml_clib;
 
diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix
index eeb200b57b47..84f139619468 100644
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, ruamel_base
+, ruamel-base
 , ruamel_yaml_clib
 , isPyPy
 }:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # Tests use relative paths
   doCheck = false;
 
-  propagatedBuildInputs = [ ruamel_base ]
+  propagatedBuildInputs = [ ruamel-base ]
     ++ lib.optional (!isPyPy) ruamel_yaml_clib;
 
   pythonImportsCheck = [
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 9197d3f0d54c..88c60c9da149 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -79,6 +79,7 @@ mapAliases ({
   qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
   requests_toolbelt = requests-toolbelt; # added 2017-09-26
   rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
+  ruamel_base = ruamel-base; # added 2021-11-01
   scikitlearn = scikit-learn; # added 2021-07-21
   selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
   setuptools_scm = setuptools-scm; # added 2021-06-03
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d476b718e25d..e9adf60c6818 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8202,8 +8202,7 @@ in {
 
   rtslib = callPackage ../development/python-modules/rtslib { };
 
-  ruamel-base = self.ruamel_base;
-  ruamel_base = callPackage ../development/python-modules/ruamel_base { };
+  ruamel-base = callPackage ../development/python-modules/ruamel-base { };
 
   ruamel-yaml = self.ruamel_yaml;
   ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { };

From f083f92c1fa3a43c0301e176f1daa053109e80be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 2 Nov 2021 11:05:31 +0100
Subject: [PATCH 169/235] gnutls: avoid the (check-time) cacert dependency

The point is to reduce rebuild amount when updating cacert/nss,
though at *this* point it remains quite high - before & after:

Estimating rebuild amount by counting changed Hydra jobs (parallel=unset).
  13109 x86_64-darwin
  21567 x86_64-linux
Estimating rebuild amount by counting changed Hydra jobs (parallel=unset).
  13109 x86_64-darwin
  17141 x86_64-linux
---
 pkgs/development/libraries/gnutls/default.nix |  8 ++--
 pkgs/development/libraries/gnutls/dummy.crt   | 45 +++++++++++++++++++
 2 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/gnutls/dummy.crt

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 4c4094987dde..ace18afdeed8 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -1,6 +1,6 @@
 { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip
 , perl, gmp, autoconf, automake, libidn, p11-kit, libiconv
-, unbound, dns-root-data, gettext, cacert, util-linux
+, unbound, dns-root-data, gettext, util-linux
 , guileBindings ? config.gnutls.guile or false, guile
 , tpmSupport ? false, trousers, which, nettools, libunistring
 , withSecurity ? false, Security  # darwin Security.framework
@@ -77,9 +77,9 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ nettle ];
 
   inherit doCheck;
-  # stdenv's `NIX_SSL_CERT_FILE=/no-cert-file.crt` broke tests with:
-  #   Error setting the x509 trust file: Error while reading file.
-  checkInputs = [ cacert ];
+  # stdenv's `NIX_SSL_CERT_FILE=/no-cert-file.crt` breaks tests.
+  # Also empty files won't work, and we want to avoid potentially impure /etc/
+  preCheck = "NIX_SSL_CERT_FILE=${./dummy.crt}";
 
   # Fixup broken libtool and pkg-config files
   preFixup = lib.optionalString (!isDarwin) ''
diff --git a/pkgs/development/libraries/gnutls/dummy.crt b/pkgs/development/libraries/gnutls/dummy.crt
new file mode 100644
index 000000000000..77300f6376b2
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/dummy.crt
@@ -0,0 +1,45 @@
+ACCVRAIZ1
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE
+AwwJQUNDVlJBSVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQsw
+CQYDVQQGEwJFUzAeFw0xMTA1MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQ
+BgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwHUEtJQUNDVjENMAsGA1UECgwEQUND
+VjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCb
+qau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gMjmoY
+HtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWo
+G2ioPej0RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpA
+lHPrzg5XPAOBOp0KoVdDaaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhr
+IA8wKFSVf+DuzgpmndFALW4ir50awQUZ0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/
+0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDGWuzndN9wrqODJerWx5eH
+k6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs78yM2x/47
+4KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMO
+m3WR5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpa
+cXpkatcnYGMN285J9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPl
+uUsXQA+xtrn13k/c4LOsOxFwYIRKQ26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYI
+KwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRwOi8vd3d3LmFjY3YuZXMvZmls
+ZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEuY3J0MB8GCCsG
+AQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeT
+VfZW6oHlNsyMHj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIG
+CCsGAQUFBwICMIIBFB6CARAAQQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUA
+cgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBhAO0AegAgAGQAZQAgAGwAYQAgAEEA
+QwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUAYwBuAG8AbABvAGcA
+7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBjAHQA
+cgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAA
+QwBQAFMAIABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUA
+czAwBggrBgEFBQcCARYkaHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2Mu
+aHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRt
+aW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2MV9kZXIuY3JsMA4GA1Ud
+DwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZIhvcNAQEF
+BQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdp
+D70ER9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gU
+JyCpZET/LtZ1qmxNYEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+m
+AM/EKXMRNt6GGT6d7hmKG9Ww7Y49nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepD
+vV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJTS+xJlsndQAJxGJ3KQhfnlms
+tn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3sCPdK6jT2iWH
+7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szA
+h1xA2syVP1XgNce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xF
+d3+YJ5oyXSrjhO7FmGYvliAd3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2H
+pPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3pEfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----

From 503a76e4f8e77d36799dde7b00feb6b0543c93c0 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 29 Oct 2021 11:42:32 -0400
Subject: [PATCH 170/235] synth: 0.6.0 -> 0.6.1

---
 pkgs/tools/misc/synth/default.nix | 14 ++++++++++----
 pkgs/top-level/all-packages.nix   |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix
index 0249491fbde6..1a66669b41c3 100644
--- a/pkgs/tools/misc/synth/default.nix
+++ b/pkgs/tools/misc/synth/default.nix
@@ -4,25 +4,31 @@
 , pkg-config
 , openssl
 , stdenv
+, CoreFoundation
 , Security
+, SystemConfiguration
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "synth";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "getsynth";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-i5X2HUOCgY2znH4rDzhFpsPXsFeM7GR4soAO/rFDjjo=";
+    sha256 = "sha256-VsvGrlFmn8Q7dhvo3Buy8G0oeNErtBT4lZ8k8WFC8Zo=";
   };
 
-  cargoSha256 = "sha256-47i46Y6JjTGWC7mfMd2x2k8v0SY1o2UHdEU4rF0VrsY=";
+  cargoSha256 = "sha256-10b2n7wMuBt90GZ6AVnSMT7r2501tounw13eJhyrmS4=";
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
+    CoreFoundation
+    Security
+    SystemConfiguration
+  ];
 
   # requires unstable rust features
   RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 098feeee7836..043edd8b4f5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3534,7 +3534,7 @@ with pkgs;
   sydbox = callPackage ../os-specific/linux/sydbox { };
 
   synth = callPackage ../tools/misc/synth {
-    inherit (darwin.apple_sdk.frameworks) Security;
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
   };
 
   syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};

From f7586b23f910bb9ae2559f461b4bfc323e63b2b4 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 29 Oct 2021 14:15:19 -0400
Subject: [PATCH 171/235] epick: 0.5.1 -> 0.6.0

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

diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix
index f70f072aeaf7..563853f8f5a8 100644
--- a/pkgs/applications/graphics/epick/default.nix
+++ b/pkgs/applications/graphics/epick/default.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "epick";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "vv9k";
     repo = pname;
     rev = version;
-    sha256 = "0l7m45bqx62nrwi0r4pdwxcq37s7h3nnawk9nq2zpvl9wcgnx3gc";
+    sha256 = "sha256-x1C8kY9VpMg7aXgC/jRsLCeUV8uRLobgjSAQdK2/sHk=";
   };
 
-  cargoSha256 = "sha256-LERV3+zwt5oVfyueGfxM7HsOha4cuWTkPyvPQwHSZqo=";
+  cargoSha256 = "sha256-KgQOlvKRt47lg7NteqBa2DLKkDf93JTzp9EIHn3clxY=";
 
   nativeBuildInputs = lib.optional stdenv.isLinux python3;
 

From 52a9acab7c85f84a19c2feec631e63be3ca55816 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 22 Oct 2021 21:26:15 -0400
Subject: [PATCH 172/235] menyoki: 1.5.3 -> 1.5.5

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

diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix
index 0b4b80d648ac..c454fc2ad611 100644
--- a/pkgs/applications/graphics/menyoki/default.nix
+++ b/pkgs/applications/graphics/menyoki/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "menyoki";
-  version = "1.5.3";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = pname;
     rev = "v${version}";
-    sha256 = "050c6c60il6cy0a8d3nw4z2cyp043912a7n4n44yjpmx047w7kc7";
+    sha256 = "sha256-wEPt96z/odQ05hosN+GB5KLsCu8onR9WWamofJayhwU=";
   };
 
-  cargoSha256 = "0wwcda2w8jg3q132cvhdgfmjc0rz93fx6fai93g5w8br98aq9qzx";
+  cargoSha256 = "sha256-nwxBreouL3Z47zHSH+Y/ej7KU2/bXyMQ+Tb7R4U+yKk=";
 
   nativeBuildInputs = [ installShellFiles ]
     ++ lib.optional stdenv.isLinux pkg-config;
@@ -37,8 +37,8 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Screen{shot,cast} and perform ImageOps on the command line";
     homepage = "https://menyoki.cli.rs/";
+    changelog = "https://github.com/orhun/menyoki/blob/v${version}/CHANGELOG.md";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ figsoda ];
-    broken = stdenv.isDarwin;
   };
 }

From e91d4957d0b58f46761d8b1d4d245cdc14c1e34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 1 Nov 2021 21:58:48 +0100
Subject: [PATCH 173/235] python39Packages.ruamel-ordereddict: normalise name,
 adopt

---
 .../{ruamel_ordereddict => ruamel-ordereddict}/default.nix | 7 ++++---
 pkgs/development/python-modules/ruamel_yaml/0.16.nix       | 4 ++--
 pkgs/top-level/python2-packages.nix                        | 3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/development/python-modules/{ruamel_ordereddict => ruamel-ordereddict}/default.nix (76%)

diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/pkgs/development/python-modules/ruamel-ordereddict/default.nix
similarity index 76%
rename from pkgs/development/python-modules/ruamel_ordereddict/default.nix
rename to pkgs/development/python-modules/ruamel-ordereddict/default.nix
index 98c36221dcd5..987680ad596f 100644
--- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix
+++ b/pkgs/development/python-modules/ruamel-ordereddict/default.nix
@@ -6,12 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  pname = "ruamel.ordereddict";
+  pname = "ruamel-ordereddict";
   version = "0.4.15";
   disabled = isPy3k || isPyPy;
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "ruamel.ordereddict";
+    inherit version;
     sha256 = "d7d9cf8b11e7662deb460260cf062980cd84b87a1d0457132060ab9d44e0a5f4";
   };
 
@@ -19,6 +20,6 @@ buildPythonPackage rec {
     description = "A version of dict that keeps keys in insertion resp. sorted order";
     homepage = "https://sourceforge.net/projects/ruamel-ordereddict/";
     license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }
diff --git a/pkgs/development/python-modules/ruamel_yaml/0.16.nix b/pkgs/development/python-modules/ruamel_yaml/0.16.nix
index f2d68f519e4b..c7ac112f3a2c 100644
--- a/pkgs/development/python-modules/ruamel_yaml/0.16.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/0.16.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , ruamel-base
-, ruamel_ordereddict
+, ruamel-ordereddict
 , ruamel_yaml_clib ? null
 , isPy27
 , isPyPy
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ ruamel-base ]
-    ++ lib.optional isPy27 ruamel_ordereddict
+    ++ lib.optional isPy27 ruamel-ordereddict
     ++ lib.optional (!isPyPy) ruamel_yaml_clib;
 
   # causes namespace clash on py27
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 927827b66e50..781fdff6dc9c 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -528,8 +528,7 @@ with self; with super; {
 
   robotframework-ride = callPackage ../development/python-modules/robotframework-ride { };
 
-  ruamel-ordereddict = self.ruamel_ordereddict;
-  ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { };
+  ruamel-ordereddict = callPackage ../development/python-modules/ruamel-ordereddict { };
 
   ruamel_yaml = self.ruamel-yaml;
   ruamel-yaml = callPackage ../development/python-modules/ruamel_yaml/0.16.nix { };

From b2767b69ddc702eb926633a5f2336534352cb7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 1 Nov 2021 21:59:40 +0100
Subject: [PATCH 174/235] python39Packages.ruamel-yaml: normalise name, adopt

---
 pkgs/development/python-modules/Nikola/default.nix     |  4 ++--
 pkgs/development/python-modules/conda/default.nix      |  4 ++--
 pkgs/development/python-modules/construct/2.10.54.nix  |  4 ++--
 pkgs/development/python-modules/construct/default.nix  |  4 ++--
 pkgs/development/python-modules/dateparser/0.x.nix     |  4 ++--
 pkgs/development/python-modules/dateparser/default.nix |  4 ++--
 pkgs/development/python-modules/drf-yasg/default.nix   |  4 ++--
 pkgs/development/python-modules/jc/default.nix         |  4 ++--
 .../python-modules/jupyter-repo2docker/default.nix     |  4 ++--
 .../python-modules/jupyter-telemetry/default.nix       |  4 ++--
 pkgs/development/python-modules/mautrix/default.nix    |  4 ++--
 pkgs/development/python-modules/maya/default.nix       |  4 ++--
 pkgs/development/python-modules/mitmproxy/default.nix  |  4 ++--
 pkgs/development/python-modules/monty/default.nix      |  4 ++--
 .../python-modules/ntc-templates/default.nix           |  4 ++--
 pkgs/development/python-modules/prance/default.nix     |  4 ++--
 .../python-modules/pre-commit-hooks/default.nix        |  4 ++--
 pkgs/development/python-modules/pymatgen/default.nix   |  4 ++--
 pkgs/development/python-modules/python-box/default.nix |  4 ++--
 pkgs/development/python-modules/pyuavcan/default.nix   |  4 ++--
 .../{ruamel_yaml => ruamel-yaml}/0.16.nix              | 10 ++++------
 .../{ruamel_yaml => ruamel-yaml}/default.nix           | 10 ++++------
 .../python-modules/schema-salad/default.nix            |  4 ++--
 pkgs/development/python-modules/strictyaml/default.nix |  4 ++--
 pkgs/development/python-modules/yamale/default.nix     |  4 ++--
 pkgs/development/tools/dt-schema/default.nix           |  4 ++--
 pkgs/development/tools/fdroidserver/default.nix        |  2 +-
 pkgs/development/tools/misc/replacement/default.nix    |  2 +-
 pkgs/top-level/python-aliases.nix                      |  1 +
 pkgs/top-level/python-packages.nix                     |  3 +--
 pkgs/top-level/python2-packages.nix                    |  3 +--
 31 files changed, 61 insertions(+), 66 deletions(-)
 rename pkgs/development/python-modules/{ruamel_yaml => ruamel-yaml}/0.16.nix (87%)
 rename pkgs/development/python-modules/{ruamel_yaml => ruamel-yaml}/default.nix (85%)

diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
index ae18ce5dc319..364e50c1024c 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -30,7 +30,7 @@
 , pytestCheckHook
 , pythonOlder
 , requests
-, ruamel_yaml
+, ruamel-yaml
 , stdenv
 , toml
 , typogrify
@@ -75,7 +75,7 @@ buildPythonPackage rec {
     pyphen
     PyRSS2Gen
     requests
-    ruamel_yaml
+    ruamel-yaml
     toml
     typogrify
     unidecode
diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix
index b097805292e9..5f1b56cbcde4 100644
--- a/pkgs/development/python-modules/conda/default.nix
+++ b/pkgs/development/python-modules/conda/default.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , pycosat
 , requests
-, ruamel_yaml
+, ruamel-yaml
 , isPy3k
 , enum34
 }:
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     sha256 = "a91ef821343dea3ba9670f3d10b36c1ace4f4c36d70c175d8fc8886e94285953";
   };
 
-  propagatedBuildInputs = [ pycosat requests ruamel_yaml ] ++ lib.optional (!isPy3k) enum34;
+  propagatedBuildInputs = [ pycosat requests ruamel-yaml ] ++ lib.optional (!isPy3k) enum34;
 
   # No tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/construct/2.10.54.nix b/pkgs/development/python-modules/construct/2.10.54.nix
index 6bb279490ab2..b4eaeaec3910 100644
--- a/pkgs/development/python-modules/construct/2.10.54.nix
+++ b/pkgs/development/python-modules/construct/2.10.54.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
-, six, pytestCheckHook, pytest-benchmark, enum34, numpy, arrow, ruamel_yaml
+, six, pytestCheckHook, pytest-benchmark, enum34, numpy, arrow, ruamel-yaml
 }:
 
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "1mqspsn6bf3ibvih1zna2glkg8iw7vy5zg9gzg0d1m8zcndk2c48";
   };
 
-  checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy arrow ruamel_yaml ];
+  checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy arrow ruamel-yaml ];
 
   disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ];
 
diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
index 4ad78ddad3b6..47ae573e24c2 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
-, six, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel_yaml
+, six, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel-yaml
 , lz4, cloudpickle
 }:
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     lz4
   ];
 
-  checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml cloudpickle ];
+  checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel-yaml cloudpickle ];
 
   disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ];
 
diff --git a/pkgs/development/python-modules/dateparser/0.x.nix b/pkgs/development/python-modules/dateparser/0.x.nix
index 2aab262e64d2..35125453e786 100644
--- a/pkgs/development/python-modules/dateparser/0.x.nix
+++ b/pkgs/development/python-modules/dateparser/0.x.nix
@@ -11,7 +11,7 @@
 , convertdate
 , umalqurra
 , jdatetime
-, ruamel_yaml
+, ruamel-yaml
 }:
 
 buildPythonPackage rec {
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     # install_requires
     python-dateutil pytz regex tzlocal
     # extra_requires
-    convertdate umalqurra jdatetime ruamel_yaml
+    convertdate umalqurra jdatetime ruamel-yaml
   ];
 
   pythonImportsCheck = [ "dateparser" ];
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix
index e1f2f9336877..f75a355c2184 100644
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@@ -14,7 +14,7 @@
 , parameterized
 , pytestCheckHook
 , GitPython
-, ruamel_yaml
+, ruamel-yaml
 }:
 
 buildPythonPackage rec {
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     parameterized
     pytestCheckHook
     GitPython
-    ruamel_yaml
+    ruamel-yaml
   ];
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix
index 45842fb809cc..4b55a08f842d 100644
--- a/pkgs/development/python-modules/drf-yasg/default.nix
+++ b/pkgs/development/python-modules/drf-yasg/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , inflection
-, ruamel_yaml
+, ruamel-yaml
 , setuptools-scm
 , six
 , coreapi
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     six
     inflection
-    ruamel_yaml
+    ruamel-yaml
     coreapi
     djangorestframework
   ];
diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index 93fd8d516051..3a9d24c29dd8 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, ruamel_yaml
+, ruamel-yaml
 , xmltodict
 , pygments
 , pytestCheckHook
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     sha256 = "sha256-ISggj6oOF0B7TKIQAlZtauRrDAWP88OOFezLJK6edjI=";
   };
 
-  propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];
+  propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
 
   checkInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
index f4eb9190aa4b..b59b9adb2484 100644
--- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix
+++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
@@ -5,7 +5,7 @@
 , pkgs-docker
 , python-json-logger
 , pyyaml
-, ruamel_yaml
+, ruamel-yaml
 , semver
 , toml
 , traitlets
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     jinja2
     pkgs-docker
     python-json-logger
-    ruamel_yaml
+    ruamel-yaml
     semver
     toml
     traitlets
diff --git a/pkgs/development/python-modules/jupyter-telemetry/default.nix b/pkgs/development/python-modules/jupyter-telemetry/default.nix
index 9dddd8ec5684..f7efc0a1598c 100644
--- a/pkgs/development/python-modules/jupyter-telemetry/default.nix
+++ b/pkgs/development/python-modules/jupyter-telemetry/default.nix
@@ -4,7 +4,7 @@
 , pythonOlder
 , python-json-logger
 , jsonschema
-, ruamel_yaml
+, ruamel-yaml
 , traitlets
 }:
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    python-json-logger jsonschema ruamel_yaml traitlets
+    python-json-logger jsonschema ruamel-yaml traitlets
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 4619b1096fd1..90000de8985c 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, aiohttp, pythonOlder
-, sqlalchemy, ruamel_yaml, CommonMark, lxml
+, sqlalchemy, ruamel-yaml, CommonMark, lxml
 }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
     # defined in optional-requirements.txt
     sqlalchemy
-    ruamel_yaml
+    ruamel-yaml
     CommonMark
     lxml
   ];
diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix
index 4a751a188c24..baa95f7c7de2 100644
--- a/pkgs/development/python-modules/maya/default.nix
+++ b/pkgs/development/python-modules/maya/default.nix
@@ -1,5 +1,5 @@
 { lib, fetchPypi, fetchpatch, buildPythonPackage
-, dateparser, humanize, pendulum, ruamel_yaml, tzlocal }:
+, dateparser, humanize, pendulum, ruamel-yaml, tzlocal }:
 
 buildPythonPackage rec {
   pname = "maya";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = [ dateparser humanize pendulum ruamel_yaml tzlocal ];
+  propagatedBuildInputs = [ dateparser humanize pendulum ruamel-yaml tzlocal ];
 
   # No tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix
index 4f31c512197d..bc5835fac539 100644
--- a/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/pkgs/development/python-modules/mitmproxy/default.nix
@@ -24,7 +24,7 @@
 , pyopenssl
 , pyparsing
 , pyperclip
-, ruamel_yaml
+, ruamel-yaml
 , setuptools
 , sortedcontainers
 , tornado
@@ -78,7 +78,7 @@ buildPythonPackage rec {
     pyopenssl
     pyparsing
     pyperclip
-    ruamel_yaml
+    ruamel-yaml
     sortedcontainers
     tornado
     urwid
diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix
index 73325c24d94c..9f275a99c748 100644
--- a/pkgs/development/python-modules/monty/default.nix
+++ b/pkgs/development/python-modules/monty/default.nix
@@ -8,7 +8,7 @@
 , pandas
 , pydantic
 , pymongo
-, ruamel_yaml
+, ruamel-yaml
 , tqdm
 }:
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [
-    ruamel_yaml
+    ruamel-yaml
     tqdm
     msgpack
   ];
diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix
index d7b3db1f452a..c04d0e2df088 100644
--- a/pkgs/development/python-modules/ntc-templates/default.nix
+++ b/pkgs/development/python-modules/ntc-templates/default.nix
@@ -5,7 +5,7 @@
 , poetry-core
 , textfsm
 , pytestCheckHook
-, ruamel_yaml
+, ruamel-yaml
 , yamllint
 }:
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     pytestCheckHook
-    ruamel_yaml
+    ruamel-yaml
     yamllint
   ];
 
diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix
index 105fa9e180b7..cbc931d5c59e 100644
--- a/pkgs/development/python-modules/prance/default.nix
+++ b/pkgs/development/python-modules/prance/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , chardet
 , requests
-, ruamel_yaml
+, ruamel-yaml
 , six
 , semver
 , pytestCheckHook
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     chardet
     requests
-    ruamel_yaml
+    ruamel-yaml
     six
     semver
   ];
diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix
index 212fdf6a721a..530cf826917b 100644
--- a/pkgs/development/python-modules/pre-commit-hooks/default.nix
+++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix
@@ -4,7 +4,7 @@
 , git
 , pythonOlder
 , pytestCheckHook
-, ruamel_yaml
+, ruamel-yaml
 , toml
 }:
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    ruamel_yaml
+    ruamel-yaml
     toml
   ];
 
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index cc262e004fd3..f4eb29bedc0b 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -10,7 +10,7 @@
 , plotly
 , pydispatcher
 , requests
-, ruamel_yaml
+, ruamel-yaml
 , scipy
 , six
 , spglib
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     plotly
     pydispatcher
     requests
-    ruamel_yaml
+    ruamel-yaml
     scipy
     six
     spglib
diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix
index 6410bbadd27e..0edf2b695807 100644
--- a/pkgs/development/python-modules/python-box/default.nix
+++ b/pkgs/development/python-modules/python-box/default.nix
@@ -5,7 +5,7 @@
 , pytestCheckHook
 , pythonOlder
 , pyyaml
-, ruamel_yaml
+, ruamel-yaml
 , toml
 }:
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     msgpack
     pyyaml
-    ruamel_yaml
+    ruamel-yaml
     toml
   ];
 
diff --git a/pkgs/development/python-modules/pyuavcan/default.nix b/pkgs/development/python-modules/pyuavcan/default.nix
index ff01ea90e227..c3823a6c3c09 100644
--- a/pkgs/development/python-modules/pyuavcan/default.nix
+++ b/pkgs/development/python-modules/pyuavcan/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, nunavut
-, pyserial , pytest, ruamel_yaml}:
+, pyserial , pytest, ruamel-yaml}:
 
  buildPythonPackage rec {
   pname = "pyuavcan";
@@ -18,7 +18,7 @@
     nunavut
     pyserial
     pytest
-    ruamel_yaml
+    ruamel-yaml
   ];
 
   # allow for writable directory for darwin
diff --git a/pkgs/development/python-modules/ruamel_yaml/0.16.nix b/pkgs/development/python-modules/ruamel-yaml/0.16.nix
similarity index 87%
rename from pkgs/development/python-modules/ruamel_yaml/0.16.nix
rename to pkgs/development/python-modules/ruamel-yaml/0.16.nix
index c7ac112f3a2c..b5ca3fb6e78d 100644
--- a/pkgs/development/python-modules/ruamel_yaml/0.16.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/0.16.nix
@@ -9,11 +9,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "ruamel.yaml";
+  pname = "ruamel-yaml";
   version = "0.16.13";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "ruamel.yaml";
+    inherit version;
     sha256 = "0hm9yg785f46bkrgqknd6fdvmkby9dpzjnm0b63qf0i748acaj5v";
   };
 
@@ -26,10 +27,7 @@ buildPythonPackage rec {
 
   # causes namespace clash on py27
   dontUsePythonImportsCheck = isPy27;
-  pythonImportsCheck = [
-    "ruamel.yaml"
-    "ruamel.base"
-  ];
+  pythonImportsCheck = [ "ruamel.yaml" ];
 
   meta = with lib; {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix
similarity index 85%
rename from pkgs/development/python-modules/ruamel_yaml/default.nix
rename to pkgs/development/python-modules/ruamel-yaml/default.nix
index 84f139619468..1d7773be0bf3 100644
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/default.nix
@@ -7,11 +7,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "ruamel.yaml";
+  pname = "ruamel-yaml";
   version = "0.17.16";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "ruamel.yaml";
+    inherit version;
     sha256 = "1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33";
   };
 
@@ -21,10 +22,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ ruamel-base ]
     ++ lib.optional (!isPyPy) ruamel_yaml_clib;
 
-  pythonImportsCheck = [
-    "ruamel.yaml"
-    "ruamel.base"
-  ];
+  pythonImportsCheck = [ "ruamel.yaml" ];
 
   meta = with lib; {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index 4e778054875e..97367349112a 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -6,7 +6,7 @@
 , mistune
 , rdflib
 , rdflib-jsonld
-, ruamel_yaml
+, ruamel-yaml
 , pytestCheckHook
 }:
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     mistune
     rdflib
     rdflib-jsonld
-    ruamel_yaml
+    ruamel-yaml
   ];
 
   checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix
index d85113b50d2e..9b76edc1bae5 100644
--- a/pkgs/development/python-modules/strictyaml/default.nix
+++ b/pkgs/development/python-modules/strictyaml/default.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchPypi
 , isPy27
-, ruamel_yaml
+, ruamel-yaml
 , python-dateutil
 }:
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
       --replace "ruamel.yaml==0.17.4" "ruamel.yaml"
   '';
 
-  propagatedBuildInputs = [ ruamel_yaml python-dateutil ];
+  propagatedBuildInputs = [ ruamel-yaml python-dateutil ];
 
   # Library tested with external tool
   # https://hitchdev.com/approach/contributing-to-hitch-libraries/
diff --git a/pkgs/development/python-modules/yamale/default.nix b/pkgs/development/python-modules/yamale/default.nix
index f590e8d896c0..fce4e9d38c55 100644
--- a/pkgs/development/python-modules/yamale/default.nix
+++ b/pkgs/development/python-modules/yamale/default.nix
@@ -4,7 +4,7 @@
 , pythonOlder
 , pytestCheckHook
 , pyyaml
-, ruamel_yaml
+, ruamel-yaml
 }:
 
 buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     pyyaml
-    ruamel_yaml
+    ruamel-yaml
   ];
 
   checkInputs = [
diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix
index 6ee649595ae2..a5445c8e021d 100644
--- a/pkgs/development/tools/dt-schema/default.nix
+++ b/pkgs/development/tools/dt-schema/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , git
-, ruamel_yaml
+, ruamel-yaml
 , jsonschema
 , rfc3987
 , setuptools
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools-scm git ];
   propagatedBuildInputs = [
     setuptools
-    ruamel_yaml
+    ruamel-yaml
     jsonschema
     rfc3987
   ];
diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix
index 5977d0c28d17..328860385596 100644
--- a/pkgs/development/tools/fdroidserver/default.nix
+++ b/pkgs/development/tools/fdroidserver/default.nix
@@ -44,7 +44,7 @@ python.pkgs.buildPythonApplication rec {
     pyyaml
     qrcode
     requests
-    ruamel_yaml
+    ruamel-yaml
     yamllint
   ];
 
diff --git a/pkgs/development/tools/misc/replacement/default.nix b/pkgs/development/tools/misc/replacement/default.nix
index 3d0218ffab23..cbdd8e37c5cd 100644
--- a/pkgs/development/tools/misc/replacement/default.nix
+++ b/pkgs/development/tools/misc/replacement/default.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   };
 
   propagatedBuildInputs = with python3Packages; [
-    ruamel_yaml
+    ruamel-yaml
   ];
 
   checkInputs = with python3Packages; [
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 88c60c9da149..8fdf532415e2 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -80,6 +80,7 @@ mapAliases ({
   requests_toolbelt = requests-toolbelt; # added 2017-09-26
   rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
   ruamel_base = ruamel-base; # added 2021-11-01
+  ruamel_yaml = ruamel-yaml; # added 2021-11-01
   scikitlearn = scikit-learn; # added 2021-07-21
   selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
   setuptools_scm = setuptools-scm; # added 2021-06-03
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e9adf60c6818..ce39b368af54 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8204,8 +8204,7 @@ in {
 
   ruamel-base = callPackage ../development/python-modules/ruamel-base { };
 
-  ruamel-yaml = self.ruamel_yaml;
-  ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { };
+  ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml { };
 
   ruamel-yaml-clib = self.ruamel_yaml_clib;
   ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { };
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 781fdff6dc9c..bafb05515feb 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -530,8 +530,7 @@ with self; with super; {
 
   ruamel-ordereddict = callPackage ../development/python-modules/ruamel-ordereddict { };
 
-  ruamel_yaml = self.ruamel-yaml;
-  ruamel-yaml = callPackage ../development/python-modules/ruamel_yaml/0.16.nix { };
+  ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml/0.16.nix { };
 
   runsnakerun = callPackage ../development/python-modules/runsnakerun { };
 

From b592957ea148b619abca944c8a2a772809f51416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 1 Nov 2021 22:00:09 +0100
Subject: [PATCH 175/235] python39Packages.ruamel-yaml-clib: normalise name,
 adopt

---
 .../{ruamel_yaml_clib => ruamel-yaml-clib}/default.nix        | 2 +-
 pkgs/development/python-modules/ruamel-yaml/0.16.nix          | 4 ++--
 pkgs/development/python-modules/ruamel-yaml/default.nix       | 4 ++--
 pkgs/top-level/python-aliases.nix                             | 1 +
 pkgs/top-level/python-packages.nix                            | 3 +--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/development/python-modules/{ruamel_yaml_clib => ruamel-yaml-clib}/default.nix (95%)

diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
similarity index 95%
rename from pkgs/development/python-modules/ruamel_yaml_clib/default.nix
rename to pkgs/development/python-modules/ruamel-yaml-clib/default.nix
index c3d752bb55ef..b12920fc7640 100644
--- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "ruamel.yaml.clib";
+  pname = "ruamel-yaml-clib";
   version = "0.2.4";
 
   src = fetchhg {
diff --git a/pkgs/development/python-modules/ruamel-yaml/0.16.nix b/pkgs/development/python-modules/ruamel-yaml/0.16.nix
index b5ca3fb6e78d..0d9b1b4a1637 100644
--- a/pkgs/development/python-modules/ruamel-yaml/0.16.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/0.16.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , ruamel-base
 , ruamel-ordereddict
-, ruamel_yaml_clib ? null
+, ruamel-yaml-clib ? null
 , isPy27
 , isPyPy
 }:
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ ruamel-base ]
     ++ lib.optional isPy27 ruamel-ordereddict
-    ++ lib.optional (!isPyPy) ruamel_yaml_clib;
+    ++ lib.optional (!isPyPy) ruamel-yaml-clib;
 
   # causes namespace clash on py27
   dontUsePythonImportsCheck = isPy27;
diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix
index 1d7773be0bf3..2a30bd95f968 100644
--- a/pkgs/development/python-modules/ruamel-yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , ruamel-base
-, ruamel_yaml_clib
+, ruamel-yaml-clib
 , isPyPy
 }:
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ ruamel-base ]
-    ++ lib.optional (!isPyPy) ruamel_yaml_clib;
+    ++ lib.optional (!isPyPy) ruamel-yaml-clib;
 
   pythonImportsCheck = [ "ruamel.yaml" ];
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 8fdf532415e2..613593ecab75 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -81,6 +81,7 @@ mapAliases ({
   rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
   ruamel_base = ruamel-base; # added 2021-11-01
   ruamel_yaml = ruamel-yaml; # added 2021-11-01
+  ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01
   scikitlearn = scikit-learn; # added 2021-07-21
   selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
   setuptools_scm = setuptools-scm; # added 2021-06-03
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ce39b368af54..45f5b1f505f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8206,8 +8206,7 @@ in {
 
   ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml { };
 
-  ruamel-yaml-clib = self.ruamel_yaml_clib;
-  ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { };
+  ruamel-yaml-clib = callPackage ../development/python-modules/ruamel-yaml-clib { };
 
   rubymarshal = callPackage ../development/python-modules/rubymarshal { };
 

From 4cb7820ac9d46ffa20024350a208c66344958c7c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 Nov 2021 01:50:49 +0000
Subject: [PATCH 176/235] elan: 1.3.0 -> 1.3.1

---
 pkgs/applications/science/logic/elan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index fb636da0ec41..a5709b69fbb8 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -7,16 +7,16 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "elan";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "leanprover";
     repo = "elan";
     rev = "v${version}";
-    sha256 = "0gql015zb3y95v68kmv2dscz7fnh89x1shrqxxqk5a0jhd2z93n1";
+    sha256 = "sha256-QNVzpnT77+9PXhq4Yz0q3o+GiQTVy7dOrg2yBTscoek=";
   };
 
-  cargoSha256 = "sha256-rL++3RstCSBMYFj9BeOo6gepfId/sje4ES3Wm+Mb4cQ=";
+  cargoSha256 = "sha256-G70QopoMqFrkOnuui3+3cEHYvmnf0meX1Ecv4q8FCpM=";
 
   nativeBuildInputs = [ pkg-config makeWrapper ];
 

From 10d3b3c3fa78a999423b65d01ab44f79bc8f39a8 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 2 Nov 2021 22:29:49 -0400
Subject: [PATCH 177/235] cargo-about: 0.3.0 -> 0.4.1

---
 .../package-management/cargo-about/default.nix     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix
index d2acffc2009b..cf72bd85c083 100644
--- a/pkgs/tools/package-management/cargo-about/default.nix
+++ b/pkgs/tools/package-management/cargo-about/default.nix
@@ -1,23 +1,23 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }:
+{ lib, rustPlatform, fetchFromGitHub }:
+
 rustPlatform.buildRustPackage rec {
   pname = "cargo-about";
-  version = "0.3.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-about";
     rev = version;
-    sha256 = "sha256-MsXNneKj2xCci1guj1TKcIrX7XByJ5/lWUmjxAsgzPY=";
+    sha256 = "sha256-Am0VwF37fYsZvUogxnSlP/kwy20J7maFu3Is8f/1b1E=";
   };
 
-  cargoSha256 = "sha256-ssAmY+o+/2+C9sol+PeFlpNwVuN5JNoofgkr3cUW+S4=";
-
-  buildInputs = lib.optional stdenv.isDarwin libiconv;
+  cargoSha256 = "sha256-gf5OtRGjXmGbnXA4ZYOys6JU+JkF+rYnRSnjy3JE7c0=";
 
   meta = with lib; {
     description = "Cargo plugin to generate list of all licenses for a crate";
     homepage = "https://github.com/EmbarkStudios/cargo-about";
+    changelog = "https://github.com/EmbarkStudios/cargo-about/blob/${version}/CHANGELOG.md";
     license = with licenses; [ mit /* or */ asl20 ];
-    maintainers = with maintainers; [ evanjs ];
+    maintainers = with maintainers; [ evanjs figsoda ];
   };
 }

From b5cfd8dd69a7fe789aa5d253ce452c5cb13256a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 3 Nov 2021 11:10:50 +0100
Subject: [PATCH 178/235] treewide: remove python39Packages.ruamel_yaml aliases

---
 pkgs/applications/audio/whipper/default.nix   | 2 +-
 pkgs/applications/misc/khard/default.nix      | 2 +-
 pkgs/applications/video/corrscope/default.nix | 2 +-
 pkgs/servers/home-assistant/default.nix       | 2 +-
 pkgs/servers/mautrix-facebook/default.nix     | 2 +-
 pkgs/servers/mautrix-signal/default.nix       | 2 +-
 pkgs/servers/mautrix-telegram/default.nix     | 2 +-
 pkgs/tools/admin/awscli2/default.nix          | 2 +-
 pkgs/tools/backup/borgmatic/default.nix       | 2 +-
 pkgs/tools/misc/bkyml/default.nix             | 2 +-
 pkgs/tools/misc/ntfy/default.nix              | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix
index d66c161664f3..a7a8f054172c 100644
--- a/pkgs/applications/audio/whipper/default.nix
+++ b/pkgs/applications/audio/whipper/default.nix
@@ -42,7 +42,7 @@ in python3.pkgs.buildPythonApplication rec {
     mutagen
     pycdio
     pygobject3
-    ruamel_yaml
+    ruamel-yaml
     discid
     pillow
   ];
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 64e41eaa3d25..2c596aaa8d49 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
     atomicwrites
     configobj
     vobject
-    ruamel_yaml
+    ruamel-yaml
     ruamel_base
     unidecode
   ];
diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix
index 727541e3b53d..c1d6669c8c2f 100644
--- a/pkgs/applications/video/corrscope/default.nix
+++ b/pkgs/applications/video/corrscope/default.nix
@@ -34,7 +34,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
 
   buildInputs = [ ffmpeg qtbase ];
 
-  propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy pyqt5 ruamel_yaml ];
+  propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy pyqt5 ruamel-yaml ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index cf22845108e1..b089dcfd2ec2 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -220,7 +220,7 @@ in with py.pkgs; buildPythonApplication rec {
     pytz
     pyyaml
     requests
-    ruamel_yaml
+    ruamel-yaml
     voluptuous
     voluptuous-serialize
     yarl
diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix
index b9e86f01fbdb..2967af52740e 100644
--- a/pkgs/servers/mautrix-facebook/default.nix
+++ b/pkgs/servers/mautrix-facebook/default.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonPackage rec {
     pycryptodome
     python-olm
     python_magic
-    ruamel_yaml
+    ruamel-yaml
     unpaddedbase64
     yarl
   ] ++ lib.optional enableSystemd systemd;
diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix
index 46f9bccceff6..012f54361f98 100644
--- a/pkgs/servers/mautrix-signal/default.nix
+++ b/pkgs/servers/mautrix-signal/default.nix
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonPackage rec {
     python-olm
     python_magic
     qrcode
-    ruamel_yaml
+    ruamel-yaml
     unpaddedbase64
     yarl
   ];
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index 87c13e972f5d..ab0564b2cf19 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -47,7 +47,7 @@ in python.pkgs.buildPythonPackage rec {
     mautrix
     sqlalchemy
     CommonMark
-    ruamel_yaml
+    ruamel-yaml
     python_magic
     telethon
     telethon-session-sqlalchemy
diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index cf765a53c53f..e0db6c87929d 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -82,7 +82,7 @@ with py.pkgs; buildPythonApplication rec {
     prompt-toolkit
     pyyaml
     rsa
-    ruamel_yaml
+    ruamel-yaml
     s3transfer
     six
     wcwidth
diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix
index 2fe7d0866745..904e64704c90 100644
--- a/pkgs/tools/backup/borgmatic/default.nix
+++ b/pkgs/tools/backup/borgmatic/default.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
     borgbackup
     colorama
     jsonschema
-    ruamel_yaml
+    ruamel-yaml
     requests
     setuptools
   ];
diff --git a/pkgs/tools/misc/bkyml/default.nix b/pkgs/tools/misc/bkyml/default.nix
index aea83e7c99ff..16af495b9345 100644
--- a/pkgs/tools/misc/bkyml/default.nix
+++ b/pkgs/tools/misc/bkyml/default.nix
@@ -32,7 +32,7 @@ buildPythonApplication rec {
   pythonImportsCheck = [ "bkyml" ];
 
   propagatedBuildInputs = [
-    ruamel_yaml
+    ruamel-yaml
     setuptools
   ];
 
diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix
index 3f85e7f01a4b..4a2af4895ac4 100644
--- a/pkgs/tools/misc/ntfy/default.nix
+++ b/pkgs/tools/misc/ntfy/default.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python3Packages; [
-    requests ruamel_yaml appdirs
+    requests ruamel-yaml appdirs
     sleekxmpp dnspython
     emoji
     psutil

From 8e5abca4058999d118da146884ec496cafebaa88 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Thu, 4 Nov 2021 01:13:44 -0700
Subject: [PATCH 179/235] python3Packages.click: 8.0.2 -> 8.0.3

Also fix unmatched substitute call, which has been failing since the
code was formatted with black for v7.1.
---
 pkgs/development/python-modules/click/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index a9e83804f707..3e2e8b6e24f1 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "click";
-  version = "8.0.2";
+  version = "8.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7027bc7bbafaab8b2c2816861d8eb372429ee3c02e193fc2f93d6c4ab9de49c5";
+    sha256 = "sha256-QQ6TKwUPXu13PEzalN51lxyJzbMVWnKggxE5p55ey1s=";
   };
 
   postPatch = ''
     substituteInPlace src/click/_unicodefun.py \
-      --replace "'locale'" "'${locale}/bin/locale'"
+      --replace '"locale"' "'${locale}/bin/locale'"
   '';
 
   propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [

From eae534c584ac21a613702e3f53259dfceb993ed7 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 4 Nov 2021 08:34:18 +0000
Subject: [PATCH 180/235] pkgsMusl.dbus: enable systemd support

We previously weren't able to build systemd for Musl, but now we
can!  (But not statically.)  So there's no longer any reason to have
systemd support in D-Bus disabled by default for pkgsMusl.
---
 pkgs/development/libraries/dbus/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 1d1df0d24fc7..a1e42a435ab4 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 , pkg-config
 , expat
-, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
+, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic
 , systemd
 , audit
 , libapparmor

From a2e92ff6ad2c0040ccfbd712e2088fc4010c53eb Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 4 Nov 2021 08:41:13 +0000
Subject: [PATCH 181/235] pkgsMusl.redis: enable systemd support

We previously weren't able to build systemd for Musl, but now we
can!  (But not statically.)  So there's no longer any reason to have
systemd support in Redis disabled by default for pkgsMusl.
---
 pkgs/servers/nosql/redis/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 351a2cb3c2a4..af1d1d371062 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, lua, pkg-config, nixosTests
-, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, systemd
+, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd
 # dependency ordering is broken at the moment when building with openssl
 , tlsSupport ? !stdenv.hostPlatform.isStatic, openssl
 }:

From eef72d8f9c0f311234db01e0edd9a45e9fd34642 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 4 Nov 2021 08:45:07 +0000
Subject: [PATCH 182/235] pkgsMusl.cups: enable systemd support

We previously weren't able to build systemd for Musl, but now we
can!  (But not statically.)  So there's no longer any reason to have
systemd support in CUPS disabled by default for pkgsMusl.
---
 pkgs/misc/cups/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index e1a4e733d6e9..1d467f0a5347 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -8,7 +8,7 @@
 , libtiff
 , pam
 , dbus
-, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
+, enableSystemd ? stdenv.isLinux
 , systemd
 , acl
 , gmp

From 555aa76120a4ebb5139704276ee7dd0b8c3cd520 Mon Sep 17 00:00:00 2001
From: linj <linj.dev@outlook.com>
Date: Thu, 4 Nov 2021 18:54:34 +0800
Subject: [PATCH 183/235] linux: enable TCP_CONG_ADVANCED

TCP_CONG_ADVANCED is enabled by default on x86_64[1] in the upstream.
Although it is not the case for aarch64[2], many distributions, such as
Debian[3], Fedora[4] and Gentoo[5], choose to enable it in their
distribution kernel.

With this patch, aarch64 users can choose many other TCP congestion
algorithms, which may improve their network performance.

[1]: https://github.com/torvalds/linux/blob/7ddb58cb0ecae8e8b6181d736a87667cc9ab8389/arch/x86/configs/x86_64_defconfig#L71
[2]: https://github.com/torvalds/linux/blob/7ddb58cb0ecae8e8b6181d736a87667cc9ab8389/arch/arm64/configs/defconfig
[3]: https://salsa.debian.org/kernel-team/linux/-/blob/e2d14375d74cdcb2cfed6518d7a5ad784c30df1a/debian/config/config#L7063
[4]: https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config
[5]: https://github.com/gentoo/gentoo/blob/5808eb2f066ea2ece19c35a1978b7f79077a467b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.77.ebuild#L27
---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index f591910f560b..7eb871c30dbe 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -129,6 +129,7 @@ let
       XDP_SOCKETS        = whenAtLeast "4.19" yes;
       XDP_SOCKETS_DIAG   = whenAtLeast "5.1" yes;
       WAN                = yes;
+      TCP_CONG_ADVANCED  = yes;
       TCP_CONG_CUBIC     = yes; # This is the default congestion control algorithm since 2.6.19
       # Required by systemd per-cgroup firewalling
       CGROUP_BPF                  = option yes;

From 6a584e15fb0de8397568322ccd14286848f8cc58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 5 Nov 2021 21:04:52 +0100
Subject: [PATCH 184/235] khard: fix eval, add import check

---
 pkgs/applications/misc/khard/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 2c596aaa8d49..f098cd6dbfb6 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -17,10 +17,9 @@ python3.pkgs.buildPythonApplication rec {
   propagatedBuildInputs = with python3.pkgs; [
     atomicwrites
     configobj
-    vobject
     ruamel-yaml
-    ruamel_base
     unidecode
+    vobject
   ];
 
   postInstall = ''
@@ -32,6 +31,8 @@ python3.pkgs.buildPythonApplication rec {
     export COLUMNS=80
   '';
 
+  pythonImportsCheck = [ "khard" ];
+
   meta = {
     homepage = "https://github.com/scheibler/khard";
     description = "Console carddav client";

From b427f9a5bf48e69c7b21704be2b0429c7855e798 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 5 Nov 2021 16:20:10 -0400
Subject: [PATCH 185/235] kmon: 1.5.5 -> 1.6.0, clarify license

---
 pkgs/tools/system/kmon/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix
index 7bf2c810298b..36181b371eaf 100644
--- a/pkgs/tools/system/kmon/default.nix
+++ b/pkgs/tools/system/kmon/default.nix
@@ -1,31 +1,32 @@
-{ lib, fetchFromGitHub, rustPlatform, python3, libxcb }:
+{ lib, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb }:
 
 rustPlatform.buildRustPackage rec {
   pname = "kmon";
-  version = "1.5.5";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-x4P9p2zXthGtokfKcWR/xaX/E7a9mEuQiK6cjFw4nS8=";
+    sha256 = "sha256-0sjRTbTLtBUTyx6+HnihL9TggoeIOqX9zKRaXjBUfE0=";
   };
 
-  cargoSha256 = "sha256-ZAHp7eR2pu+xEP9NZOLoczEF8QSFA5Z/8bKsCYqk4Ww=";
+  cargoSha256 = "sha256-QMJ3Rpgcfrza2zFiA5LFBuYedn+VnffzpyzAGeC0PSM=";
 
-  nativeBuildInputs = [ python3 ];
+  nativeBuildInputs = [ installShellFiles python3 ];
 
   buildInputs = [ libxcb ];
 
   postInstall = ''
-    install -D man/kmon.8 -t $out/share/man/man8/
+    installManPage man/kmon.8
   '';
 
   meta = with lib; {
     description = "Linux Kernel Manager and Activity Monitor";
     homepage = "https://github.com/orhun/kmon";
-    license = with licenses; [ gpl3 ];
+    changelog = "https://github.com/orhun/kmon/blob/v${version}/CHANGELOG.md";
+    license = licenses.gpl3Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ misuzu ];
+    maintainers = with maintainers; [ figsoda misuzu ];
   };
 }

From df9f3896e798f2698274eb181ad076ba27cff644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 5 Nov 2021 19:18:06 -0600
Subject: [PATCH 186/235] =?UTF-8?q?kexec-tools:=202.0.22=20=E2=86=92=202.0?=
 =?UTF-8?q?.23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/os-specific/linux/kexec-tools/default.nix b/pkgs/os-specific/linux/kexec-tools/default.nix
index c2a99de3de27..0631e1da2b1b 100644
--- a/pkgs/os-specific/linux/kexec-tools/default.nix
+++ b/pkgs/os-specific/linux/kexec-tools/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "kexec-tools";
-  version = "2.0.22";
+  version = "2.0.23";
 
   src = fetchurl {
     urls = [
       "mirror://kernel/linux/utils/kernel/kexec/${pname}-${version}.tar.xz"
       "http://horms.net/projects/kexec/kexec-tools/${pname}-${version}.tar.xz"
     ];
-    sha256 = "1j7qlhxk1rbv9jbj8wd6hb7zl8p2mp29ymrmccgmsi0m0dzhgn6s";
+    sha256 = "qmPNbH3ZWwbOumJAp/3GeSeJytp1plXmcUmHF1IkJBs=";
   };
 
   hardeningDisable = [ "format" "pic" "relro" "pie" ];

From a8d1f24ac291f5a0bc0c3f0b965d6360d6ea47d3 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 6 Nov 2021 16:23:08 -0400
Subject: [PATCH 187/235] synth: fix darwin build

---
 pkgs/tools/misc/synth/default.nix | 6 ++----
 pkgs/top-level/all-packages.nix   | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix
index 1a66669b41c3..1b1efb36fe53 100644
--- a/pkgs/tools/misc/synth/default.nix
+++ b/pkgs/tools/misc/synth/default.nix
@@ -4,9 +4,8 @@
 , pkg-config
 , openssl
 , stdenv
-, CoreFoundation
+, AppKit
 , Security
-, SystemConfiguration
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -25,9 +24,8 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
-    CoreFoundation
+    AppKit
     Security
-    SystemConfiguration
   ];
 
   # requires unstable rust features
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b3362b861d8..c6498a7fab1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3544,7 +3544,7 @@ with pkgs;
   sydbox = callPackage ../os-specific/linux/sydbox { };
 
   synth = callPackage ../tools/misc/synth {
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
+    inherit (darwin.apple_sdk.frameworks) AppKit Security;
   };
 
   syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};

From f3de64943da6e67f6d00e36a0a97f057065c2fb6 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 6 Nov 2021 15:29:49 -0700
Subject: [PATCH 188/235] snappy: fix build on x86_64-darwin

Needs patch for compatibility with clang 7
---
 pkgs/development/libraries/snappy/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index f2b83136cb23..71209295b9fd 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -1,4 +1,5 @@
 { lib, stdenv, fetchFromGitHub, cmake
+, fetchpatch
 , static ? stdenv.hostPlatform.isStatic
 }:
 
@@ -13,6 +14,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-JXWl63KVP+CDNWIXYtz+EKqWLJbPKl3ifhr8dKAp/w8=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "clang-7-compat.patch";
+      url = "https://github.com/google/snappy/pull/142/commits/658cb2fcf67b626fff2122a3dbf7a3560c58f7ee.patch";
+      sha256 = "1kg3lxjwmhc7gjx36nylilnf444ddbnr3px1wpvyc6l1nh6zh4al";
+    })
+  ];
+
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ cmake ];

From 5e2b2752dad4b893d05fdf8e1b9fe836c2ca486e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 7 Nov 2021 10:38:39 +0000
Subject: [PATCH 189/235] diffoscope: drop upstreamed
 fix-uimage-on-file-5.41.patch patch

diffoscope-190 already contains the fix:

    applying patch /nix/store/icfygfs9d249x7if0w7004vimzkj4082-fix-uimage-on-file-5.41.patch
    patching file tests/comparators/test_uimage.py
    Hunk #1 FAILED at 98.
    1 out of 1 hunk FAILED -- saving rejects to file tests/comparators/test_uimage.py.re
---
 pkgs/tools/misc/diffoscope/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 9f2ebe4245c8..b1390fefb33c 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, python3Packages, docutils, help2man, installShellFiles
+{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles
 , abootimg, acl, apksigner, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
 , e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
 , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R
@@ -25,13 +25,6 @@ python3Packages.buildPythonApplication rec {
     # the version detection of LLVM is broken and the comparison result is compared against
     # the expected result from LLVM 10 (rather than 7 which is our default).
     ./fix-tests.patch
-
-    # Upstream uimage test fix for file-5.41 update.
-    (fetchpatch {
-      name = "fix-uimage-on-file-5.41.patch";
-      url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/74a59a8fb3327a320f45a7626e8e0d59b01896a2.patch";
-      sha256 = "sha256-7hmxSKmgaqJg4/gpaZYcNVo4dEMO658VSkSbxPq7WWo=";
-    })
   ];
 
   postPatch = ''

From 108b850b8e030b431646d1a8ad41000f40317c7c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 9 Nov 2021 14:35:51 +0000
Subject: [PATCH 190/235] zellij: 0.19.0 -> 0.20.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 fcf2caf277a0..2371b7c82fb2 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.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "zellij-org";
     repo = "zellij";
     rev = "v${version}";
-    sha256 = "sha256-/1ngmthzWp9K7pBBOBiSMUv0yC66K3Tg2g2PoBskpTU=";
+    sha256 = "022bxird7jblxix7h2fk91090c87033a1j6hf4wvckwpqywm0wac";
   };
 
-  cargoSha256 = "sha256-eFWsqjXO6QFTO26ppZ4tiJXc/PEYD+5ZdbTBMoDoLFI=";
+  cargoSha256 = "04fyq0n4v01rsx6xw5raf139ml3nq6casz2nyk23zp3349kb8vad";
 
   nativeBuildInputs = [
     installShellFiles

From f55e76a50251b2017c3896627162dc3e26c14ade Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 9 Nov 2021 13:40:39 -0500
Subject: [PATCH 191/235] helix: 0.4.1 -> 0.5.0

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

diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix
index a46124daab2a..c0c8e2a57b36 100644
--- a/pkgs/applications/editors/helix/default.nix
+++ b/pkgs/applications/editors/helix/default.nix
@@ -2,17 +2,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "helix";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "helix-editor";
     repo = pname;
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-lScMHZ/pLcHkuvv8kSKnYK5AFVxyhOUMFdsu3nlDVD0=";
+    sha256 = "sha256-NoVg/8oJIgMQtxlCSjrLnYCG8shigYqZzWAQwmiqxgA=";
   };
 
-  cargoSha256 = "sha256-N5vlPoYyksHEZsyia8u8qtoEBY6qsXqO9CRBFaTQmiw=";
+  cargoSha256 = "sha256-kqPI8WpGpr0VL7CbBTSsjKl3xqJrv/6Qjr6UFnIgaVo=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 30a48de7db53ceb6d270e394eac3ef323d5af919 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 9 Nov 2021 17:16:52 -0500
Subject: [PATCH 192/235] starship: 0.58.0 -> 1.0.0

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

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 5202527b8c0d..47a81989cde6 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.58.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-s84fIpCyTF7FrJZGATjIJHt/+aknlhlz1V9s+c4f+Ig=";
+    sha256 = "sha256-KU9IbvQ6qPbSoHVRN/g7iETV47Y4wMMESzpRHMQ0Uxw=";
   };
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     done
   '';
 
-  cargoSha256 = "sha256-5YOF0nXn4rdp3uxatzdvaqdAbLlHK6nq5H4+ZX/7joM=";
+  cargoSha256 = "sha256-IzTRvvQ1uHS2WY2Cf8VQOq423PjwXYNW4bub0ZyvTIE=";
 
   preCheck = ''
     HOME=$TMPDIR

From 322ae11b186b5fed38fecccb927143cee64f39a2 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Wed, 10 Nov 2021 12:33:57 -0500
Subject: [PATCH 193/235] zellij: 0.20.0 -> 0.20.1

---
 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 2371b7c82fb2..480334514edd 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.20.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "zellij-org";
     repo = "zellij";
     rev = "v${version}";
-    sha256 = "022bxird7jblxix7h2fk91090c87033a1j6hf4wvckwpqywm0wac";
+    sha256 = "sha256-VeFKUNAOhNvNAqIp4yg0dulIVC6vCvD3ClYjMg1vM1g=";
   };
 
-  cargoSha256 = "04fyq0n4v01rsx6xw5raf139ml3nq6casz2nyk23zp3349kb8vad";
+  cargoSha256 = "sha256-qZjyl+irC5Cj3tpUs97jLxs1UB+7E1xZKbnF3TPFhKE=";
 
   nativeBuildInputs = [
     installShellFiles

From 7b25314c0aeceedd99dc96259964293754b6a2bc Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Fri, 12 Nov 2021 00:28:56 +1000
Subject: [PATCH 194/235] fiji: init at 20201104-1356

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

diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix
new file mode 100644
index 000000000000..18fdc2c55ac1
--- /dev/null
+++ b/pkgs/applications/graphics/fiji/default.nix
@@ -0,0 +1,77 @@
+{ stdenv
+, lib
+, fetchurl
+, makeWrapper
+, autoPatchelfHook
+, jdk11
+, makeDesktopItem
+, copyDesktopItems
+, runtimeShell
+}:
+stdenv.mkDerivation rec {
+  pname = "fiji";
+  version = "20201104-1356";
+
+  src = fetchurl {
+    url = "https://downloads.imagej.net/${pname}/archive/${version}/${pname}-nojre.tar.gz";
+    sha256 = "1jv4wjjkpid5spr2nk5xlvq3hg687qx1n5zh8zlw48y1y09c4q7a";
+  };
+
+  dontBuild = true;
+
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems ];
+  buildInputs = [ stdenv.cc.cc.lib ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "fiji";
+      exec = "fiji %F";
+      icon = "fiji";
+      mimeType = "image/*;";
+      comment = "Scientific Image Analysis";
+      desktopName = "Fiji Is Just ImageJ";
+      genericName = "Fiji Is Just ImageJ";
+      categories = "Education;Science;ImageProcessing;";
+      terminal = false;
+      startupNotify = true;
+      extraEntries = ''
+        Version=1.0
+        TryExec=fiji
+        X-GNOME-FullName=Fiji Is Just ImageJ
+        StartupWMClass=fiji-Main
+      '';
+    })
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,fiji,share/pixmaps}
+
+    cp -R * $out/fiji
+    rm -f $out/fiji/jars/imagej-updater-*.jar
+
+    # Disgusting hack to stop a local desktop entry being created
+    cat <<EOF > $out/bin/.fiji-launcher-hack
+    #!${runtimeShell}
+    exec \$($out/fiji/ImageJ-linux64 --dry-run "\$@")
+    EOF
+    chmod +x $out/bin/.fiji-launcher-hack
+
+    makeWrapper $out/bin/.fiji-launcher-hack $out/bin/fiji \
+      --prefix PATH : ${lib.makeBinPath [ jdk11 ]} \
+      --set JAVA_HOME ${jdk11.home}
+
+    ln $out/fiji/images/icon.png $out/share/pixmaps/fiji.png
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://imagej.net/software/fiji/";
+    description = "batteries-included distribution of ImageJ2, bundling a lot of plugins which facilitate scientific image analysis";
+    platforms = [ "x86_64-linux" ];
+    license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ];
+    maintainers = with maintainers; [ zane ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab07fff7e6c1..0e658e58de08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25818,6 +25818,8 @@ with pkgs;
 
   imagej = callPackage ../applications/graphics/imagej { };
 
+  fiji = callPackage ../applications/graphics/fiji { };
+
   imagemagick6_light = imagemagick6.override {
     bzip2 = null;
     zlib = null;

From 02a4ff26cad00dd6218f98739657ed0263f6adc7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 12 Nov 2021 10:01:27 +0100
Subject: [PATCH 195/235] python3Packages.bond-api: 0.1.14 -> 0.1.15

---
 pkgs/development/python-modules/bond-api/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/bond-api/default.nix b/pkgs/development/python-modules/bond-api/default.nix
index 35634b1e2417..b230491de8c5 100644
--- a/pkgs/development/python-modules/bond-api/default.nix
+++ b/pkgs/development/python-modules/bond-api/default.nix
@@ -5,17 +5,21 @@
 , aioresponses
 , pytest-asyncio
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "bond-api";
-  version = "0.1.14";
+  version = "0.1.15";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "prystupa";
     repo = "bond-api";
     rev = "v${version}";
-    sha256 = "0s7an6kbib1immrbwrh4pzj812zwf8kj3kgky5k3qwxzrj0iv6ak";
+    sha256 = "sha256-Uoz5knqRAtQkD7u/4oylXC60dR2ZU3AuMJNhmvB8fP4=";
   };
 
   propagatedBuildInputs = [
@@ -28,7 +32,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "bond_api" ];
+  pythonImportsCheck = [
+    "bond_api"
+  ];
 
   meta = with lib; {
     description = "Asynchronous Python wrapper library over Bond Local API";

From f59cf0990f1ebbbcefb37fa68747f50e0a4bda10 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 2 Nov 2021 20:58:31 +0100
Subject: [PATCH 196/235] octoprint.python.pkgs.octoprint-pisupport: 2021.8.2
 -> 2021.10.28

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

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 85ddbdccef7b..d3ad9cbdbd51 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -159,14 +159,14 @@ let
           self: super: {
             octoprint-pisupport = self.buildPythonPackage rec {
               pname = "OctoPrint-PiSupport";
-              version = "2021.8.2";
+              version = "2021.10.28";
               format = "setuptools";
 
               src = fetchFromGitHub {
                 owner = "OctoPrint";
                 repo = "OctoPrint-PiSupport";
                 rev = version;
-                sha256 = "07akx61wadxhs0545pqa9gzjnaz9742bq710f8f4zs5x6sacjzbc";
+                sha256 = "01bpvv1sn3113fdpw6b90c2rj8lqay118x609yy64z9ccm93khl9";
               };
 
               # requires octoprint itself during tests

From 8817170fd3239a6c6131b527212a77974bc4d36b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 2 Nov 2021 21:13:42 +0100
Subject: [PATCH 197/235] octoprint.python.pkgs.octoprint-firmwarecheck:
 2021.8.11 -> 2021.10.11

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

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index d3ad9cbdbd51..582da5476025 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -142,13 +142,13 @@ let
           self: super: {
             octoprint-firmwarecheck = self.buildPythonPackage rec {
               pname = "OctoPrint-FirmwareCheck";
-              version = "2021.8.11";
+              version = "2021.10.11";
 
               src = fetchFromGitHub {
                 owner = "OctoPrint";
                 repo = "OctoPrint-FirmwareCheck";
                 rev = version;
-                sha256 = "sha256-WzVjHgjF12iJ642AFaFd86GSU90XyPzKhi1CSreynW4=";
+                sha256 = "0hl0612x0h4pcwsrga5il5x3m04j37cmyzh2dg1kl971cvrw79n2";
               };
               doCheck = false;
             };

From fa88683e1ed54797f7a4e838c96d34b87aa0d0a3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 2 Nov 2021 21:33:17 +0100
Subject: [PATCH 198/235] octoprint: 1.6.1 -> 1.7.2

---
 pkgs/applications/misc/octoprint/default.nix | 33 +++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 582da5476025..e8f28479a3bc 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , lib
 , fetchFromGitHub
-, python38
+, python3
 , substituteAll
 , nix-update-script
   # To include additional plugins, pass them here as an overlay.
@@ -21,7 +21,7 @@ let
     );
   };
 
-  py = python38.override {
+  py = python3.override {
     self = py;
     packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) (
       [
@@ -33,17 +33,15 @@ let
         (mkOverride "jinja2" "2.11.3" "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6")
         (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a")
         (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b")
-        (mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s")
-        (mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409")
 
         # Requires flask<2, cannot mkOverride because tests need to be disabled
         (
           self: super: {
             flask = super.flask.overridePythonAttrs (oldAttrs: rec {
-              version = "1.1.2";
+              version = "1.1.4";
               src = oldAttrs.src.override {
                 inherit version;
-                sha256 = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060";
+                sha256 = "15ni4xlm57a15f5hipp8w0c9zba20179bvfns2392fiq1lcbdghg";
               };
               doCheck = false;
             });
@@ -84,13 +82,18 @@ let
           self: super: {
             websocket-client = super.websocket-client.overridePythonAttrs (
               oldAttrs: rec {
-                version = "0.58.0";
+                version = "0.59.0";
                 src = oldAttrs.src.override {
-                  pname = "websocket_client";
                   inherit version;
-                  sha256 = "63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f";
+                  sha256 = "0p0cz2mdissq7iw1n7jrmsfir0jfmgs1dvnpnrx477ffx9hbsxnk";
                 };
-                propagatedBuildInputs = [ self.six ];
+                propagatedBuildInputs = with self; [
+                  six
+                  pysocks
+                ];
+                disabledTests = [
+                  "testConnect"  # requires network access
+                ];
               }
             );
           }
@@ -179,19 +182,20 @@ let
           self: super: {
             octoprint = self.buildPythonPackage rec {
               pname = "OctoPrint";
-              version = "1.6.1";
+              version = "1.7.2";
 
               src = fetchFromGitHub {
                 owner = "OctoPrint";
                 repo = "OctoPrint";
                 rev = version;
-                sha256 = "sha256-3b3k9h8H9Spf/P3/pXpCANnSGOgbUw/EWISJbrSoPBM=";
+                sha256 = "sha256-jCfzUx3LQ7TlXKQU8qbhyS1P4Wew/SSgJHVSc1VLdx4=";
               };
 
               propagatedBuildInputs = with super; [
                 blinker
                 cachelib
                 click
+                colorlog
                 emoji
                 feedparser
                 filetype
@@ -211,6 +215,7 @@ let
                 octoprint-filecheck
                 octoprint-firmwarecheck
                 octoprint-pisupport
+                pathvalidate
                 pkginfo
                 pip
                 psutil
@@ -252,10 +257,14 @@ let
 
               postPatch = let
                 ignoreVersionConstraints = [
+                  "cachelib"
+                  "colorlog"
                   "emoji"
                   "immutabledict"
                   "sentry-sdk"
                   "watchdog"
+                  "wrapt"
+                  "zeroconf"
                 ];
               in
                 ''

From 084da134e9b1bb9130eb7da660d58ee63e3ea419 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Fri, 12 Nov 2021 13:38:40 +0800
Subject: [PATCH 199/235] libreoffice-still: 7.1.6.2 -> 7.1.7.2

This contains the fix for build error with bision 3.8.
See https://gerrit.libreoffice.org/c/core/+/122082
---
 .../applications/office/libreoffice/src-still/primary.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix
index df6dcb58e9ea..9ce1d26c1478 100644
--- a/pkgs/applications/office/libreoffice/src-still/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-still/primary.nix
@@ -8,7 +8,7 @@ rec {
 
   major = "7";
   minor = "1";
-  patch = "6";
+  patch = "7";
   tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
@@ -17,13 +17,13 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "1g1nlnmgxka1xj3800ra7j28y08k1irz7a24awx1gyjs9fci58qq";
+    sha256 = "T98ICdiAM4i9E6zis0V/Cmq5+e98mNb0bMZA//xelLo=";
   };
 
   # FIXME rename
   translations = fetchSrc {
     name = "translations";
-    sha256 = "0kblfwcnsc0pz96wxmkghmchjd31h0w1wjxlqxqbqqpz3vbr61k3";
+    sha256 = "g8skm02R5nRyF09ZbL9kJqMxRqaQ0AfpletDK3AAggk=";
   };
 
   # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@@ -31,6 +31,6 @@ rec {
 
   help = fetchSrc {
     name = "help";
-    sha256 = "1b28xqgvfnx62zgnxfisi58r7nhixvz35pmq8cb20ayxhdfg6v31";
+    sha256 = "jAFrO4RyONhPH3H5QW0SL8Id53bBvJ7AYxSNtLhG4rQ=";
   };
 }

From b3fd89bb20a53b83447910030dd64fd9982fa108 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Sat, 13 Nov 2021 22:43:42 +0800
Subject: [PATCH 200/235] libreoffice*: skip test to fix build with icu70

---
 .../office/libreoffice/default.nix            |  2 ++
 .../skip-failed-test-with-icu70.patch         | 29 +++++++++++++++++++
 .../office/libreoffice/src-still/override.nix |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index f94beabd1f90..fb3a6c005b71 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -78,6 +78,8 @@ in (mkDrv rec {
     tar -xf ${srcs.translations}
   '';
 
+  patches = [ ./skip-failed-test-with-icu70.patch ];
+
   ### QT/KDE
   #
   # We have to resort to the ugly patching of configure.ac as it assumes that
diff --git a/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch b/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch
new file mode 100644
index 000000000000..d3ae91835ada
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch
@@ -0,0 +1,29 @@
+--- a/i18npool/qa/cppunit/test_breakiterator.cxx
++++ b/i18npool/qa/cppunit/test_breakiterator.cxx
+@@ -35,7 +35,7 @@ public:
+     void testWeak();
+     void testAsian();
+     void testThai();
+-#if (U_ICU_VERSION_MAJOR_NUM > 51)
++#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70)
+     void testLao();
+ #ifdef TODO
+     void testNorthernThai();
+@@ -52,7 +52,7 @@ public:
+     CPPUNIT_TEST(testWeak);
+     CPPUNIT_TEST(testAsian);
+     CPPUNIT_TEST(testThai);
+-#if (U_ICU_VERSION_MAJOR_NUM > 51)
++#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70)
+     CPPUNIT_TEST(testLao);
+ #ifdef TODO
+     CPPUNIT_TEST(testKhmer);
+@@ -843,7 +843,7 @@ void TestBreakIterator::testAsian()
+     }
+ }
+ 
+-#if (U_ICU_VERSION_MAJOR_NUM > 51)
++#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70)
+ //A test to ensure that our Lao word boundary detection is useful
+ void TestBreakIterator::testLao()
+ {
diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix
index 746e7679f380..186f4b17d6aa 100644
--- a/pkgs/applications/office/libreoffice/src-still/override.nix
+++ b/pkgs/applications/office/libreoffice/src-still/override.nix
@@ -9,5 +9,5 @@ attrs:
     "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
     "--without-system-qrcodegen"
   ];
-  patches = [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2
+  patches = attrs.patches or [] ++ [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2
 }

From f857492a193ead51cc40d2f453fde94168bf3ddc Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Sat, 13 Nov 2021 21:32:18 +0800
Subject: [PATCH 201/235] firefox: use rustc.llvmPackages.stdenv with bintools

Currently `clangUseLLVM` is broken since it uses libcxx and compiler-rt but
also specifies `--gcc-toolchain`, which leads to weird compile errors when
including C++ headers.
---
 pkgs/applications/networking/browsers/firefox/common.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index c99d1c10a12c..0326e2f0ecaf 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -110,7 +110,10 @@ let
   # When LTO for Darwin is fixed, the following will need updating as lld
   # doesn't work on it. For now it is fine since ltoSupport implies no Darwin.
   buildStdenv = if ltoSupport
-                then overrideCC stdenv llvmPackages.clangUseLLVM
+                # LTO requires LLVM bintools including ld.lld and llvm-ar.
+                then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {
+                  inherit (llvmPackages) bintools;
+                })
                 else stdenv;
 
   # --enable-release adds -ffunction-sections & LTO that require a big amount of

From 2774c726b4d8a922de19add521ae904673b07ebb Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Sat, 13 Nov 2021 07:33:44 +0800
Subject: [PATCH 202/235] firefox: add a patch fixing deadlock

---
 pkgs/applications/networking/browsers/firefox/common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 0326e2f0ecaf..1c0832e32ca2 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -134,6 +134,12 @@ buildStdenv.mkDerivation ({
   ] ++
   lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++
   lib.optional (lib.versionAtLeast version "90") ./no-buildconfig-ffx90.patch ++
+  # This fixes a race condition causing deadlock.
+  # https://phabricator.services.mozilla.com/D128657
+  lib.optional (lib.versionAtLeast version "94") (fetchpatch {
+    url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/9c7f25d45bb1dd6b1a865780bc249cdaa619aa83/trunk/0002-Bug-1735905-Upgrade-cubeb-pulse-to-fix-a-race-condit.patch";
+    sha256 = "l4bMK/YDXcDpIjPy9DPuUSFyDpzVQca201A4h9eav5g=";
+  }) ++
   patches;
 
   # Ignore trivial whitespace changes in patches, this fixes compatibility of

From 2331190cd2fe09f54515d2188c83d026a2b26757 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 14 Nov 2021 00:39:02 +0100
Subject: [PATCH 203/235] rocksdb: 6.25.3 -> 6.26.0

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

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index c1c57c60786f..83cdeecab2eb 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rocksdb";
-  version = "6.25.3";
+  version = "6.26.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-9Fs+znK7oEEBoPbRhNdVHuangBpuIVEvlxJNeNoEJZA=";
+    sha256 = "1nd8ixj249qiw089piw28aly0zmlla2k62gd6axd0bs2wfc4zma8";
   };
 
   nativeBuildInputs = [ cmake ninja ];

From 2dafedfda4752387675482c1cd557276097c6be7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 14 Nov 2021 03:20:02 +0000
Subject: [PATCH 204/235] k3s: 1.22.2+k3s2 -> 1.22.3+k3s1

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

diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index 77a9ef70dbe7..f3b5e4cd70c9 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -42,9 +42,9 @@ with lib;
 # Those pieces of software we entirely ignore upstream's handling of, and just
 # make sure they're in the path if desired.
 let
-  k3sVersion = "1.22.2+k3s2";     # k3s git tag
-  k3sCommit = "3f5774b41eb475eb10c93bb0ce58459a6f777c5f"; # k3s git commit at the above version
-  k3sRepoSha256 = "1kjf2zkm5d3s1aj4w9gzsc3ms3a0cm900fyi9899ijczw1cbrc61";
+  k3sVersion = "1.22.3+k3s1";     # k3s git tag
+  k3sCommit = "61a2aab25eeb97c26fa3f2b177e4355a7654c991"; # k3s git commit at the above version
+  k3sRepoSha256 = "0lz5hr3c86gxm9w5jy3g26n6a26m8k0y559hv6220rsi709j7ma9";
 
   traefikChartVersion = "10.3.0"; # taken from ./manifests/traefik.yaml at spec.version
   traefikChartSha256 = "0y6wr64xp7bgx24kqil0x6myr3pnfrg8rw0d1h5zd2n5a8nfd73f";

From 91e0710aa22aff25fa7d529ed78581a647966034 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 14 Nov 2021 08:05:18 +0000
Subject: [PATCH 205/235] python38Packages.aioconsole: 0.3.2 -> 0.3.3

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

diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index f56d31b034dd..795b50d81166 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -16,14 +16,14 @@
 # wrapped to be able to find aioconsole and any other packages.
 buildPythonPackage rec {
   pname = "aioconsole";
-  version = "0.3.2";
+  version = "0.3.3";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "vxgmichel";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0bximaalakw1dxan1lxar33l8hnmxqn0fg62hmdmprmra72z4bm8";
+    sha256 = "1hjdhj1y9xhq1i36r7g2lccsicbvgm7lzkyrxygs16dw11ah46mx";
   };
 
   checkInputs = [

From 05ec5f664fade58dd0a7bd81fdb428f8bd4f8928 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 14 Nov 2021 10:16:50 +0100
Subject: [PATCH 206/235] oauth2-proxy: 7.0.1 -> 7.2.0

Fixes CVE-2021-21411.
https://github.com/oauth2-proxy/oauth2-proxy/security/advisories/GHSA-652x-m2gr-hppm
---
 pkgs/servers/oauth2-proxy/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix       | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix
index dfc1756b3746..8e5f8cfc4903 100644
--- a/pkgs/servers/oauth2-proxy/default.nix
+++ b/pkgs/servers/oauth2-proxy/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "oauth2-proxy";
-  version = "7.0.1";
+  version = "7.2.0";
 
   src = fetchFromGitHub {
     repo = pname;
     owner = "oauth2-proxy";
-    sha256 = "sha256-PvoCR+JYaQeHlnO6H75LcY7Lszi1nNNe6SCd3sJJ6R4=";
+    sha256 = "1awqada8vwyz3aj1ip9jgmf84hb60jai16in6yhn4b42x9qj8m08";
     rev = "v${version}";
   };
 
-  vendorSha256 = "sha256-kclpoZ33JOciP2IUCQZB5idA7rgbWxPPFNwZU+pEJFU=";
+  vendorSha256 = "1k6ak175z1qikicmqb6c8sc3dnwghpy9rv7ayl8mpq50y3ighwqi";
 
   # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile
   ldflags = [ "-X main.VERSION=${version}" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 869f73f5e93d..cb16468da146 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20940,9 +20940,7 @@ with pkgs;
 
   nsq = callPackage ../servers/nsq { };
 
-  oauth2-proxy = callPackage ../servers/oauth2-proxy {
-    buildGoModule = buildGo115Module;
-  };
+  oauth2-proxy = callPackage ../servers/oauth2-proxy { };
 
   openbgpd = callPackage ../servers/openbgpd { };
 

From c03e11252f4b65da9a17cb9c3514f6e3d1f9efc3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 14 Nov 2021 11:33:28 +0100
Subject: [PATCH 207/235] python3Packages.pyezviz: 0.1.9.4 -> 0.1.9.9

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

diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix
index fc6c92ae388e..53adc24e3331 100644
--- a/pkgs/development/python-modules/pyezviz/default.nix
+++ b/pkgs/development/python-modules/pyezviz/default.nix
@@ -11,14 +11,16 @@
 
 buildPythonPackage rec {
   pname = "pyezviz";
-  version = "0.1.9.4";
+  version = "0.1.9.9";
+  format = "setuptools";
+
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "baqs";
     repo = "pyEzviz";
     rev = version;
-    sha256 = "sha256-MS4icrTjjcPx3Pb8fpcKAd/JXWqknqp9wb4lQmRwFls=";
+    sha256 = "sha256-dhYzzsGNVS8qFymBhFWWacWBXVS7fZHZYtQTeTecYsk=";
   };
 
   propagatedBuildInputs = [
@@ -32,7 +34,9 @@ buildPythonPackage rec {
   # Project has no tests. test_cam_rtsp.py is more a sample for using the module
   doCheck = false;
 
-  pythonImportsCheck = [ "pyezviz" ];
+  pythonImportsCheck = [
+    "pyezviz"
+  ];
 
   meta = with lib; {
     description = "Python interface for for Ezviz cameras";

From 30e1b0bd69e43bb9ad9fba81c3ecbb4fd5d5be21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 14 Nov 2021 11:32:36 +0100
Subject: [PATCH 208/235] Revert "metrics: drop requiredSystemFeatures; /cc
 #76776"

This reverts commit c7aef6dedb29392ef2aad8fe70fa9745597c84ea.

I believe it should work again since today, though I'm being a bit
conservative, pushing to `staging-next` instead of `master`.
---
 pkgs/top-level/metrics.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix
index 1decb810f973..d413b881eaa7 100644
--- a/pkgs/top-level/metrics.nix
+++ b/pkgs/top-level/metrics.nix
@@ -4,8 +4,7 @@ with pkgs;
 
 runCommand "nixpkgs-metrics"
   { nativeBuildInputs = with pkgs.lib; map getBin [ nix time jq ];
-    #FIXME: the job doesn't work, see issue #76776
-    #requiredSystemFeatures = [ "benchmark" ]; # dedicated machine, by @vcunat last time
+    requiredSystemFeatures = [ "benchmark" ]; # dedicated `t2a` machine, by @vcunat
   }
   ''
     export NIX_STORE_DIR=$TMPDIR/store

From 7c7a25a5a9f0581f6a5bd638fd837a3c132e83a5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 14 Nov 2021 11:42:21 +0100
Subject: [PATCH 209/235] checkov: 2.0.568 -> 2.0.571

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

diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 7a6ced8b3062..3118946c6bf0 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -56,13 +56,13 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "checkov";
-  version = "2.0.568";
+  version = "2.0.571";
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = pname;
     rev = version;
-    sha256 = "sha256-V1YHD0+gXx5wLfhrfze6kAgF1egxXbjf4c2zEc/oT1A=";
+    sha256 = "sha256-cmSZHqR1BfVWXoUSJ3Et5TTdeUWklNA4egKLP4xKjw8=";
   };
 
   nativeBuildInputs = with py.pkgs; [
@@ -115,6 +115,8 @@ buildPythonApplication rec {
     # https://github.com/bridgecrewio/checkov/blob/f03a4204d291cf47e3753a02a9b8c8d805bbd1be/.github/workflows/build.yml
     "integration_tests/"
     "tests/terraform/"
+    # Performance tests have no value for us
+    "performance_tests/test_checkov_performance.py"
   ];
 
   pythonImportsCheck = [
@@ -129,6 +131,6 @@ buildPythonApplication rec {
       Kubernetes, Serverless framework and other infrastructure-as-code-languages.
     '';
     license = licenses.asl20;
-    maintainers = with maintainers; [ anhdle14 ];
+    maintainers = with maintainers; [ anhdle14 fab ];
   };
 }

From 0fd0f7db54332e4bddae2b156cbb213fabfe7f20 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 14 Nov 2021 12:40:34 +0100
Subject: [PATCH 210/235] python3Packages.pymysensors: 0.22.0 -> 0.22.1

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

diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix
index 1deb464ea633..9506e1504836 100644
--- a/pkgs/development/python-modules/pymysensors/default.nix
+++ b/pkgs/development/python-modules/pymysensors/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pymysensors";
-  version = "0.22.0";
+  version = "0.22.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "theolind";
     repo = pname;
     rev = version;
-    sha256 = "sha256-tDetHSpA5ZRvJoThI1zY6NPiDJHfWZbiMM5AF+xCNgk=";
+    sha256 = "sha256-n4khOQspJBeq0w+epdXYZh6I1lI1drB1JewZ6GfzVHs=";
   };
 
   propagatedBuildInputs = [

From 82ec1bcecbdc46543a04ffa2bad887f13c34f84a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 14 Nov 2021 13:09:12 +0100
Subject: [PATCH 211/235] python3Packages.zeroconf: 0.36.12 -> 0.36.13

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

diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index fee7a9ff9a9b..a6adbe7e597d 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -10,16 +10,16 @@
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.36.12";
+  version = "0.36.13";
   format = "setuptools";
+
   disabled = pythonOlder "3.6";
 
-  # no tests in pypi sdist
   src = fetchFromGitHub {
     owner = "jstasiak";
     repo = "python-zeroconf";
     rev = version;
-    sha256 = "sha256-W66tL5uVcOhdahtYDYS8WYKXiz58UL6yEUp0uL9u5SI=";
+    sha256 = "sha256-aYNb67ESyz2Q2CKLhG+/Z8Xtt0Js8uf+xrVSEpY0X8c=";
   };
 
   propagatedBuildInputs = [

From d90a4496724c6a95d00c131e11c07aeaf2018453 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 14 Nov 2021 13:22:07 +0100
Subject: [PATCH 212/235] python3Packages.pywemo: 0.6.7 -> 0.6.8

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

diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix
index 878611d8e3fd..c26e01d20eda 100644
--- a/pkgs/development/python-modules/pywemo/default.nix
+++ b/pkgs/development/python-modules/pywemo/default.nix
@@ -13,15 +13,16 @@
 
 buildPythonPackage rec {
   pname = "pywemo";
-  version = "0.6.7";
+  version = "0.6.8";
   format = "pyproject";
+
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-g3/xMCCCsn2EY1DsRuZAcfUIsdkP3mEkYlI+KjYKXOk=";
+    sha256 = "sha256-4EvS1f9l1HXf+b/t4NavIxUsBkFomEqZgpumM+O8RZg=";
   };
 
   nativeBuildInputs = [
@@ -40,7 +41,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "pywemo" ];
+  pythonImportsCheck = [
+    "pywemo"
+  ];
 
   meta = with lib; {
     description = "Python module to discover and control WeMo devices";

From 1e16eb5ea6354953ab88bcaed1a6daaab9e4f7f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 14 Nov 2021 14:00:13 +0000
Subject: [PATCH 213/235] python38Packages.coveralls: 3.2.0 -> 3.3.1

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

diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix
index 0c16d2d9aca2..72e8f6d45a72 100644
--- a/pkgs/development/python-modules/coveralls/default.nix
+++ b/pkgs/development/python-modules/coveralls/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "coveralls";
-  version = "3.2.0";
+  version = "3.3.1";
   disabled = isPy27;
 
   # wanted by tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15a987d9df877fff44cd81948c5806ffb6eafb757b3443f737888358e96156ee";
+    sha256 = "b32a8bb5d2df585207c119d6c01567b81fba690c9c10a753bfe27a335bfc43ea";
   };
 
   checkInputs = [

From 39f5afa229022679454f471a41f692bb8689a387 Mon Sep 17 00:00:00 2001
From: tu-maurice <valentin.gehrke@zom.bi>
Date: Sun, 14 Nov 2021 18:42:06 +0100
Subject: [PATCH 214/235] xed-editor: 2.8.4 -> 3.0.2

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

diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix
index d7b0703b8d5e..b2539e7dac5d 100644
--- a/pkgs/applications/editors/xed-editor/default.nix
+++ b/pkgs/applications/editors/xed-editor/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xed-editor";
-  version = "2.8.4";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xed";
     rev = version;
-    sha256 = "1hqr4157kp110p01jygqnnzj86zxlfiq4b53j345vqpx0f80c340";
+    sha256 = "sha256-VIudVgENibOz8RK0oK80U74wy592q3vKEnl3zuS7oSI=";
   };
 
   nativeBuildInputs = [

From f82b8909cbc0c4613d2e7232732ef5898e5cf241 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 14 Nov 2021 19:10:29 +0000
Subject: [PATCH 215/235] =?UTF-8?q?texlab:=203.3.0=20=E2=86=92=203.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix
index 4fe721d9193f..5f969721aaf7 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@@ -6,20 +6,21 @@
 , libiconv
 , Security
 , CoreServices
+, nix-update-script
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "texlab";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "latex-lsp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-QLrmUlgrys+Bd2hiaPcfDUtn75XdaMhVThsDRq/ijQQ=";
+    sha256 = "sha256-HX1Mnzq+GsRnUsJERK5gPI5x4op885t+9Vn6vogSK1o=";
   };
 
-  cargoSha256 = "sha256-Xw0/vEL50vc9ktwjTz09160Fo7rXRVgeRo/EnWJ2PH0=";
+  cargoSha256 = "sha256-AdzaLqwONI7WEcL8U0OGuyX/pg+BpZbJz9aaSClo47Q=";
 
   outputs = [ "out" "man" ];
 
@@ -38,6 +39,10 @@ rustPlatform.buildRustPackage rec {
     rmdir "$out/lib"
   '';
 
+  passthru.updateScript = nix-update-script {
+    attrPath = pname;
+  };
+
   meta = with lib; {
     description = "An implementation of the Language Server Protocol for LaTeX";
     homepage = "https://texlab.netlify.app";

From 42adeef9ec4e1f73a65ec07baa50cfe26818b92a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 14 Nov 2021 15:39:19 +0000
Subject: [PATCH 216/235] nixos/qemu-guest-agent: use qemu_kvm

Since e791519f0fb ("nixos/qemu-vm: use qemu_kvm"), VMs generated with
nixos-rebuild build-vm use the qemu_kvm package instead of the qemu
package.  (The difference between them is that qemu_kvm is only built
with support for the host architecture, not all architectures.)

But with this change, nixos-rebuild build-vm would now depend on
_both_ QEMUs, because the guest agent module was still using the one
from the full QEMU package.  There's no need for it to use this
instead of the lighter qemu_kvm, because the guest agent shouldn't be
affected by which platforms QEMU can emulate.
---
 nixos/modules/virtualisation/qemu-guest-agent.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-guest-agent.nix b/nixos/modules/virtualisation/qemu-guest-agent.nix
index 37a93a29976b..39273e523e8f 100644
--- a/nixos/modules/virtualisation/qemu-guest-agent.nix
+++ b/nixos/modules/virtualisation/qemu-guest-agent.nix
@@ -14,8 +14,8 @@ in {
       };
       package = mkOption {
         type = types.package;
-        default = pkgs.qemu.ga;
-        defaultText = literalExpression "pkgs.qemu.ga";
+        default = pkgs.qemu_kvm.ga;
+        defaultText = literalExpression "pkgs.qemu_kvm.ga";
         description = "The QEMU guest agent package.";
       };
   };

From c77b50b90824af9546749cce6bd6c78ff508499b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Nov 2021 01:41:05 +0000
Subject: [PATCH 217/235] python38Packages.pex: 2.1.54 -> 2.1.55

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

diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 92ea0ddfca9a..8a95acc211d2 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "pex";
-  version = "2.1.54";
+  version = "2.1.55";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5878d97e4b6df920cb7b4a45254501746945193289c934c707e36107594c0982";
+    sha256 = "1f6b60b9c50996ec3476e36dddff34afa98dc2d68fa73ed121d3c41232df1379";
   };
 
   nativeBuildInputs = [

From db746798a8f7590f5e0588443f3dffcbf19d5985 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Nov 2021 01:54:53 +0000
Subject: [PATCH 218/235] python38Packages.plaid-python: 8.5.0 -> 8.6.0

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

diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix
index fbdd7e73e1f4..2f07117a460b 100644
--- a/pkgs/development/python-modules/plaid-python/default.nix
+++ b/pkgs/development/python-modules/plaid-python/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "plaid-python";
-  version = "8.5.0";
+  version = "8.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f3c5abe66b72760da955d22933e1e3203413a5fab817ebbec64818706479278b";
+    sha256 = "da3570fedbc096aa058affa72fc71905401b373a5b0d28b7c27e7af7998859d9";
   };
 
   propagatedBuildInputs = [

From e9e3b968873f83002128831b60d632203622c086 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Nov 2021 02:32:31 +0000
Subject: [PATCH 219/235] python38Packages.py3status: 3.39 -> 3.40

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

diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index e027aaeb294b..160c5763995e 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -24,11 +24,11 @@
 
 buildPythonPackage rec {
   pname = "py3status";
-  version = "3.39";
+  version = "3.40";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d2a11dde0cc82d0eb5e938fe624f223d852ed848c57299ff562827bc4557375f";
+    sha256 = "9eb6f721f94f28a17a8599ca2743a2bedd58c16cfe74e9817ffa948c13dbb79c";
   };
 
   doCheck = false;

From 4a0e59511deff2d295a640920599009918500e55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Nov 2021 02:52:45 +0000
Subject: [PATCH 220/235] python38Packages.pycollada: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix
index 49dfbf030966..06daa9194610 100644
--- a/pkgs/development/python-modules/pycollada/default.nix
+++ b/pkgs/development/python-modules/pycollada/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pycollada";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1rp4wlvfywgk3v6l3hnhjx61x9yqawvvivpq4dig2jj71k3mpsyj";
+    sha256 = "70a2630ed499bdab718c0e61a3e6ae3698130d7e4654e89cdecde51bfdaea56f";
   };
 
   propagatedBuildInputs = [ numpy python-dateutil ];

From a01d9a406fa59f3d70642efd4d43569f42119125 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Nov 2021 03:45:08 +0000
Subject: [PATCH 221/235] python38Packages.pykrakenapi: 0.2.1 -> 0.2.2

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

diff --git a/pkgs/development/python-modules/pykrakenapi/default.nix b/pkgs/development/python-modules/pykrakenapi/default.nix
index 5a17e40be564..2a569eadd82c 100644
--- a/pkgs/development/python-modules/pykrakenapi/default.nix
+++ b/pkgs/development/python-modules/pykrakenapi/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "pykrakenapi";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "dominiktraxl";
     repo = "pykrakenapi";
     rev = "v${version}";
-    sha256 = "0byqa4qk6a8ww1y822izpcfscv4frcfjysw6lx1pqyqjr23bfnbh";
+    sha256 = "047v0pkkwsd219lwc3hamdaz1nngxr2nbb7hh8n4xkyicm2axha6";
   };
 
   propagatedBuildInputs = [

From 814552782e1f83ee9ad6dcf8d517a8f7897742e9 Mon Sep 17 00:00:00 2001
From: flurie <flurie@gmail.com>
Date: Sat, 13 Nov 2021 23:25:08 -0500
Subject: [PATCH 222/235] blitz: fix build for darwin

---
 pkgs/development/libraries/blitz/default.nix | 27 ++++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index 0b06bfd64834..c4a983d879ce 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/pkgs/development/libraries/blitz/default.nix
@@ -1,13 +1,20 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, gfortran, texinfo, python, boost
-# Select SIMD alignment width (in bytes) for vectorization.
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkg-config
+, gfortran
+, texinfo
+, python
+, boost
+  # Select SIMD alignment width (in bytes) for vectorization.
 , simdWidth ? 1
-# Pad arrays to simdWidth by default?
-# Note: Only useful if simdWidth > 1
+  # Pad arrays to simdWidth by default?
+  # Note: Only useful if simdWidth > 1
 , enablePadding ? false
-# Activate serialization through Boost.Serialize?
+  # Activate serialization through Boost.Serialize?
 , enableSerialization ? true
-# Activate test-suite?
-# WARNING: Some of the tests require up to 1700MB of memory to compile.
+  # Activate test-suite?
+  # WARNING: Some of the tests require up to 1700MB of memory to compile.
 , doCheck ? true
 }:
 
@@ -29,7 +36,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ gfortran texinfo boost ];
 
   configureFlags =
-    [ "--enable-shared"
+    [
+      "--enable-shared"
       "--disable-static"
       "--enable-fortran"
       "--enable-optimize"
@@ -45,6 +53,9 @@ stdenv.mkDerivation rec {
     ++ optional enableSerialization "--enable-serialization"
     ++ optional stdenv.is64bit "--enable-64bit";
 
+  # skip broken library name detection
+  ax_boost_user_serialization_lib = lib.optionalString stdenv.isDarwin "boost_serialization";
+
   enableParallelBuilding = true;
 
   inherit doCheck;

From 9c542ec266ba2d6a9e5bdffcd955d9addd4b3032 Mon Sep 17 00:00:00 2001
From: Ivv <41924494+IvarWithoutBones@users.noreply.github.com>
Date: Mon, 15 Nov 2021 06:11:03 +0100
Subject: [PATCH 223/235] raylib: 3.7.0 -> 4.0.0 (#146051)

---
 pkgs/development/libraries/raylib/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix
index c8465dbf297b..3843cea9d98d 100644
--- a/pkgs/development/libraries/raylib/default.nix
+++ b/pkgs/development/libraries/raylib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake,
+{ stdenv, lib, fetchFromGitHub, cmake,
   mesa, libGLU, glfw,
   libX11, libXi, libXcursor, libXrandr, libXinerama,
   alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib,
@@ -9,23 +9,15 @@
 
 stdenv.mkDerivation rec {
   pname = "raylib";
-  version = "3.7.0";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "raysan5";
     repo = pname;
     rev = version;
-    sha256 = "1w8v747hqy0ils6zmy8sm056f24ybjhn9bamqzlxvbqhvh9vvly1";
+    sha256 = "1mszf5v7qy38cv1fisq6xd9smb765hylhkv1ms9y7shmdl2ni6b7";
   };
 
-  patches = [
-    # fixes incorrect version being set by cmake
-    (fetchpatch {
-      url = "https://github.com/raysan5/raylib/commit/204aa4c46fdd6986aa0130eeba658562c540759f.patch";
-      sha256 = "10pl7828iy4kadach0wy4fs95vr7k08z3mxw90j8dm9xak1ri8fz";
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     mesa libGLU glfw libX11 libXi libXcursor libXrandr libXinerama

From fbe394aad2f57f17e16991e409c4f1afe48badc4 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sun, 14 Nov 2021 21:16:34 -0800
Subject: [PATCH 224/235] btop: 1.0.24 -> 1.1.0

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

diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix
index 09e965583adb..131b5a8af106 100644
--- a/pkgs/tools/system/btop/default.nix
+++ b/pkgs/tools/system/btop/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "btop";
-  version = "1.0.24";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "aristocratos";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Vl62v92TmXNR6x7LDmNpiOlOgNNm0WuZva1SCKqqvbQ=";
+    sha256 = "sha256-VA5n2gIFRUUsp4jBG1j5dqH5/tP5VAChm5kqexdD24k=";
   };
 
   installFlags = [ "PREFIX=$(out)" ];

From 9c33e5aad9fbae6b716afb1e196ed32171beed40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Nov 2021 06:14:43 +0000
Subject: [PATCH 225/235] python38Packages.qcs-api-client: 0.15.0 -> 0.16.0

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

diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix
index e1f09a28c23c..8477ce29b745 100644
--- a/pkgs/development/python-modules/qcs-api-client/default.nix
+++ b/pkgs/development/python-modules/qcs-api-client/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "qcs-api-client";
-  version = "0.15.0";
+  version = "0.16.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-NzfHemIYQq2quYs3RNKF7NHfR6Vi8Sx4eRTVT2pTEYk=";
+    sha256 = "4ac6cf55e414494095ac1e1258f5700fed8eefa37d3b8da80264bd674cbfac43";
   };
 
   propagatedBuildInputs = [

From 91e808c099d0348bf27b30d4014cb5cffd3f0de1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 Nov 2021 06:43:23 +0000
Subject: [PATCH 226/235] kapp: 0.40.0 -> 0.42.0

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

diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix
index cb568d4182ab..115c162e0d29 100644
--- a/pkgs/tools/networking/kapp/default.nix
+++ b/pkgs/tools/networking/kapp/default.nix
@@ -1,19 +1,23 @@
 { lib, buildGoModule, fetchFromGitHub, installShellFiles }:
 buildGoModule rec {
   pname = "kapp";
-  version = "0.40.0";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "carvel-kapp";
     rev = "v${version}";
-    sha256 = "sha256-9nvYxLE35IwmVB1Dzw7t3DZw4/kSiMPIqzl2PUKODtU=";
+    sha256 = "sha256-unjfUecfvuobhvsSGSqMAs19ncOLkaJZ2uJv5uVcHr0=";
   };
 
   vendorSha256 = null;
 
   subPackages = [ "cmd/kapp" ];
 
+  ldflags = [
+    "-X github.com/k14s/kapp/pkg/kapp/version.Version=${version}"
+  ];
+
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''

From 7b284a8bd5ffcc177b742cde598874c56a20dc58 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sun, 14 Nov 2021 22:46:40 -0800
Subject: [PATCH 227/235] tree-sitter-grammars: add recurseIntoAttrs for
 tree-sitter.builtGrammars

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1f8b3c91315..d2f7eae9c905 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15352,6 +15352,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars;
+
   trellis = callPackage ../development/embedded/fpga/trellis { };
 
   ttyd = callPackage ../servers/ttyd { };

From 796118237d3e3193404e2934e5ec7782cb85dc3f Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sun, 14 Nov 2021 22:37:42 -0800
Subject: [PATCH 228/235] tree-sitter: update grammars

---
 .../tree-sitter/grammars/tree-sitter-beancount.json       | 8 ++++----
 .../parsing/tree-sitter/grammars/tree-sitter-haskell.json | 8 ++++----
 .../parsing/tree-sitter/grammars/tree-sitter-python.json  | 8 ++++----
 .../tree-sitter/grammars/tree-sitter-typescript.json      | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
index efd10efd90fb..254e657260a3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/polarmutex/tree-sitter-beancount",
-  "rev": "79ae7c1f2654a2a6936b0f37bf754e5ff59c9186",
-  "date": "2021-09-07T00:09:23-04:00",
-  "path": "/nix/store/adv2yl8kr4pk6430iclkppirhb5ibcqc-tree-sitter-beancount",
-  "sha256": "1g2p2dnxm50l7npg2cbycwcfz9c9682bj02nrlycyjhwl4may9dn",
+  "rev": "78b8ddca3ab774573a4e3bf64eabd79e9452cea9",
+  "date": "2021-11-11T10:25:06-05:00",
+  "path": "/nix/store/lzvc19ky1wxbc1cjf2zr351hbdfq22mm-tree-sitter-beancount",
+  "sha256": "19s1fgn1vgxz5q6qvcfdr1lqj1vnkjrwlkl9chapbdaliw0dy110",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
index e6bc3a784224..230c534ce950 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-haskell",
-  "rev": "6668085e7d3dc6205a3ef27e6293988cf4a10419",
-  "date": "2021-11-08T00:39:03+01:00",
-  "path": "/nix/store/srhxv4hmg6if8diww64fi9spaanfkpy2-tree-sitter-haskell",
-  "sha256": "0bw0hszac5krw52ywzdvgb9jm2s8669ym7sb6vivxihr46inwkr2",
+  "rev": "d72f2e42c0d5ccf8e8b1c39e3642428317e8fe02",
+  "date": "2021-11-14T23:21:37+01:00",
+  "path": "/nix/store/n36iwva3hk2045wx87mahbsfrqhx6mbw-tree-sitter-haskell",
+  "sha256": "0clqyd1mnfz8xcpsr90nzh6j37pdgbgrr4jqf9ifn6m851k4f09g",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index 5a597fffb7f6..548764811a55 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-python",
-  "rev": "8600d7fadf5a51b9396eacbc6d105d0649b4c6f6",
-  "date": "2021-09-30T09:07:59-07:00",
-  "path": "/nix/store/0m86a8y8p8cxq616gacd5wydhayl8g70-tree-sitter-python",
-  "sha256": "0ydiizy1jhmfv0kr7xw9k57jgfpkda95nc1rawzqmsxd7nixnrkp",
+  "rev": "24b530ca158d2782ea9046e756057a412e16b52f",
+  "date": "2021-11-11T20:37:43-08:00",
+  "path": "/nix/store/1fqgxgb3l6wxvsvzaa2f26h5ywiyxz5h-tree-sitter-python",
+  "sha256": "1d8d66v64jwwk73y8q94n80w0f0cs7wjnww49b0sbmpa9d3hsfl6",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index 68241bab540a..063ecbbb57e3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-typescript",
-  "rev": "cc745b774e3986aa3a7dfd6b7a0fc01ddc853bf8",
-  "date": "2021-10-29T14:55:07-07:00",
-  "path": "/nix/store/c0a2j72pfsb7zw44jqlk73vrhvkzk2db-tree-sitter-typescript",
-  "sha256": "0nc8wr04h0wz169p60x4zai37yd351qj9mim7099g1fmbd1w7hq9",
+  "rev": "111b07762e86efab9a918b7c721f720c37e76b0a",
+  "date": "2021-11-09T11:34:06-08:00",
+  "path": "/nix/store/kndz7jkpl2adcaac64j7y9sb6zd7mp5h-tree-sitter-typescript",
+  "sha256": "1364bm3wbqqzvp03cvpx1w89bbqynb1v62i46gy7f6rhib9bf63a",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

From 6997347f4542417bc03eab9a0dbe83498b9e07ac Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 15 Nov 2021 08:47:22 +0100
Subject: [PATCH 229/235] python3Packages.environs: 9.3.4 -> 9.3.5

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

diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix
index bc63d577a7ef..04bb5dda00ea 100644
--- a/pkgs/development/python-modules/environs/default.nix
+++ b/pkgs/development/python-modules/environs/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "environs";
-  version = "9.3.4";
+  version = "9.3.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "sloria";
     repo = pname;
     rev = version;
-    sha256 = "0n0l9jici2d1pck5pf1c96jj3lhw91jki9nsgxzpikvpyvsw7wga";
+    sha256 = "sha256-4jyqdA/xoIEsfouIneGs3A9++sNG2kRUhDzteN0Td6w=";
   };
 
   propagatedBuildInputs = [

From 45b87c0cc214298a6063f85a8dd95a17dabb87ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Nov 2021 07:59:30 +0000
Subject: [PATCH 230/235] python38Packages.samsungtvws: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix
index 31fa56a34726..bf2e4ef620f6 100644
--- a/pkgs/development/python-modules/samsungtvws/default.nix
+++ b/pkgs/development/python-modules/samsungtvws/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "samsungtvws";
-  version = "1.6.0";
+  version = "1.7.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09nls4n0lbnr8nj8105lagr9h2my8lb1s2k285kmsbli36ywd8lj";
+    sha256 = "431af8348164cbb56b62492c3fde7ab81911b7905c8009580ccc54bd3f50f7ee";
   };
 
   propagatedBuildInputs = [

From fe6e74ead973beb3fc508385bbd25ce2142405a1 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 14 Nov 2021 09:00:10 +1000
Subject: [PATCH 231/235] gvproxy: 0.2.0 -> 0.3.0

https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.3.0
---
 pkgs/tools/networking/gvproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/tools/networking/gvproxy/default.nix
index 535e8d6bdfbf..f7a6ee5b3cb0 100644
--- a/pkgs/tools/networking/gvproxy/default.nix
+++ b/pkgs/tools/networking/gvproxy/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "gvproxy";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "gvisor-tap-vsock";
     rev = "v${version}";
-    sha256 = "sha256-iRFjELJCgxPvqkhBvJqCFapQrHLL3uRpKsJ/DaXSKnw=";
+    sha256 = "sha256-xoPqgt/d0RyDqkRY+ZhP02nKr3uEu8be0Go2H7JRg3k=";
   };
 
   vendorSha256 = null;

From baa566f5a5827a280dbdb590603ae3e202132ad6 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 14 Nov 2021 09:06:29 +1000
Subject: [PATCH 232/235] cri-o: 1.22.0 -> 1.22.1

https://github.com/cri-o/cri-o/releases/tag/v1.22.1
---
 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 bc7e25d93dd7..75a3dbf37462 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.22.0";
+  version = "1.22.1";
 
   src = fetchFromGitHub {
     owner = "cri-o";
     repo = "cri-o";
     rev = "v${version}";
-    sha256 = "sha256-lY/kHvJBN7idFn3YUEHMR4w+M3F89RKMsvvyHmH/EPc=";
+    sha256 = "sha256-x1bnDksmEjKuzjwPBENP9xpQbzo8HAW+0i2l2Ra/48Y=";
   };
   vendorSha256 = null;
 

From 7ccb24d9a4fdc1dbba396196f7b34014b195f1a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Nov 2021 09:05:20 +0000
Subject: [PATCH 233/235] python38Packages.sopel: 7.1.5 -> 7.1.6

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

diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix
index 09becb972360..4f9fe7c39e10 100644
--- a/pkgs/development/python-modules/sopel/default.nix
+++ b/pkgs/development/python-modules/sopel/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "sopel";
-  version = "7.1.5";
+  version = "7.1.6";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9511dce6d23abdaa47d39d8e222c6b49206bf92e19f4acaf4966b2d402bb6541";
+    sha256 = "ebd3b2aa9230835f8a68ea7f5a10324ddf35d70d89a9c92c8cba81c558565efb";
   };
 
   propagatedBuildInputs = [

From deafbbf343ae621fa5a15b39d97ceb3a8a9723fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Nov 2021 10:07:08 +0000
Subject: [PATCH 234/235] python38Packages.tempest: 29.0.0 -> 29.2.0

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

diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix
index c85e4f5b29fe..5fa1ad4c539b 100644
--- a/pkgs/development/python-modules/tempest/default.nix
+++ b/pkgs/development/python-modules/tempest/default.nix
@@ -29,11 +29,11 @@
 
 buildPythonApplication rec {
   pname = "tempest";
-  version = "29.0.0";
+  version = "29.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2045963560f91241c56940af741f081e59212c65c9867dfcdabfe07f9dd4d255";
+    sha256 = "0521d3042360c0fb469b16f99174a9abddbae8a2d2a81268cfc664f1ccfdd0f9";
   };
 
   propagatedBuildInputs = [

From 2813d6194b512b9d5aabdf586b96019863318085 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sat, 13 Nov 2021 22:11:48 -0500
Subject: [PATCH 235/235] ocamlPackages.bistro: unstable-2021-07-13 ->
 unstable-2021-11-13

---
 .../ocaml-modules/bistro/default.nix          | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix
index 87ab3d409e07..348d1bb97d47 100644
--- a/pkgs/development/ocaml-modules/bistro/default.nix
+++ b/pkgs/development/ocaml-modules/bistro/default.nix
@@ -15,25 +15,27 @@
 
 buildDunePackage rec {
   pname = "bistro";
-  version = "unstable-2021-07-13";
+  version = "unstable-2021-11-13";
 
   useDune2 = true;
 
   src = fetchFromGitHub {
     owner = "pveber";
     repo = pname;
-    rev = "4ce8d98f34f15ebf63ececccc9c763fec2b5fa6d";
-    sha256 = "sha256:16vxcdsj4dmswgm6igshs3hirz8jrg8l5b2xgcnxxgvsrc9sxljs";
+    rev = "fb285b2c6d8adccda3c71e2293bceb01febd6624";
+    sha256 = "sha256-JChDU1WH8W9Czkppx9SHiVIu9/7QFWJy2A89oksp0Ek=";
   };
 
-  # Fix build with ppxlib 0.23
-  postPatch = ''
-    substituteInPlace ppx/bistro_script.ml \
-      --replace 'Parser.parse_expression' 'Ocaml_common.Parser.parse_expression'
-  '';
-
   propagatedBuildInputs = [
-    base64 bos core lwt_react ocamlgraph ppx_sexp_conv rresult sexplib tyxml
+    base64
+    bos
+    core
+    lwt_react
+    ocamlgraph
+    ppx_sexp_conv
+    rresult
+    sexplib
+    tyxml
   ];
 
   minimalOCamlVersion = "4.12";
@@ -43,7 +45,5 @@ buildDunePackage rec {
     description = "Build and execute typed scientific workflows";
     maintainers = [ lib.maintainers.vbgl ];
     license = lib.licenses.gpl2;
-    # ppx-related build failure; see https://github.com/pveber/bistro/issues/49:
-    broken = lib.versionAtLeast ocaml.version "4.13";
   };
 }