From ad241745c3d72d13f7c2f2a273fb93a4f181830d Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Tue, 17 May 2022 17:11:09 +0200
Subject: [PATCH 01/36] mangohud: 0.6.5 -> 0.6.7-1

Updated patches and added new dependency on spdlog
---
 pkgs/tools/graphics/mangohud/default.nix      |  7 +-
 .../mangohud/hardcode-dependencies.patch      | 74 ++++++++++++-------
 .../mangohud/opengl32-nix-workaround.patch    | 12 +++
 3 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix
index 6c5da89b85b7..cdbe39ee38cf 100644
--- a/pkgs/tools/graphics/mangohud/default.nix
+++ b/pkgs/tools/graphics/mangohud/default.nix
@@ -26,6 +26,7 @@
 , vulkan-loader
 , libXNVCtrl
 , wayland
+, spdlog
 , addOpenGLRunpath
 }:
 
@@ -46,14 +47,14 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "mangohud";
-  version = "0.6.5";
+  version = "0.6.7-1";
 
   src = fetchFromGitHub {
     owner = "flightlessmango";
     repo = "MangoHud";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-RRtti0VnB6SXrpFYaEqANvpgvP/Dkvc+x/I40AXaspU=";
+    sha256 = "sha256-60cZYo+d679KRggLBGbpLYM5Iu1XySEEGp+MxZs6wF0=";
   };
 
   outputs = [ "out" "doc" "man" ];
@@ -103,6 +104,7 @@ in stdenv.mkDerivation rec {
     "-Duse_system_vulkan=enabled"
     "-Dvulkan_datadir=${vulkan-headers}/share"
     "-Dwith_wayland=enabled"
+    "-Duse_system_spdlog=enabled"
   ];
 
   nativeBuildInputs = [
@@ -122,6 +124,7 @@ in stdenv.mkDerivation rec {
     libX11
     libXNVCtrl
     wayland
+    spdlog
   ];
 
   # Support 32bit Vulkan applications by linking in 32bit Vulkan layer
diff --git a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
index 2ee5e2dd5477..379e1dd7ba23 100644
--- a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
+++ b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
@@ -1,57 +1,75 @@
+From 56a191f6db6d530c2bc89d9d3395b4c9768d108f Mon Sep 17 00:00:00 2001
+From: Atemu <atemu.main@gmail.com>
+Date: Tue, 17 May 2022 16:58:08 +0200
+Subject: [PATCH 1/2] hardcode dependencies
+
+---
+ src/dbus.cpp               | 2 +-
+ src/loaders/loader_x11.cpp | 2 +-
+ src/logging.cpp            | 7 +++++++
+ src/pci_ids.cpp            | 6 ++----
+ 4 files changed, 11 insertions(+), 6 deletions(-)
+
 diff --git a/src/dbus.cpp b/src/dbus.cpp
-index 44ffafc..9baf57b 100644
+index 3b3cccb..1405725 100644
 --- a/src/dbus.cpp
 +++ b/src/dbus.cpp
-@@ -162,7 +162,7 @@ bool dbus_manager::init(const std::string& requested_player) {
-         return true;
-     }
+@@ -152,7 +152,7 @@ bool dbus_manager::get_media_player_metadata(metadata& meta, std::string name) {
+ }
  
+ bool dbus_manager::init_internal() {
 -    if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("libdbus-1.so.3")) {
 +    if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("@libdbus@/lib/libdbus-1.so.3")) {
-         std::cerr << "MANGOHUD: Could not load libdbus-1.so.3\n";
+         SPDLOG_ERROR("Could not load libdbus-1.so.3");
          return false;
      }
 diff --git a/src/loaders/loader_x11.cpp b/src/loaders/loader_x11.cpp
-index 25c65bf..87488d5 100644
+index 4db6f78..c60d08c 100644
 --- a/src/loaders/loader_x11.cpp
 +++ b/src/loaders/loader_x11.cpp
-@@ -88,4 +88,4 @@ void libx11_loader::CleanUp(bool unload) {
+@@ -89,4 +89,4 @@ void libx11_loader::CleanUp(bool unload) {
  
  }
  
 -std::shared_ptr<libx11_loader> g_x11(new libx11_loader("libX11.so.6"));
 +std::shared_ptr<libx11_loader> g_x11(new libx11_loader("@libX11@/lib/libX11.so.6"));
 diff --git a/src/logging.cpp b/src/logging.cpp
-index ee8600b..c7c91a0 100644
+index b27f21e..48f5e03 100644
 --- a/src/logging.cpp
 +++ b/src/logging.cpp
-@@ -19,7 +19,10 @@ string exec(string command) {
- #ifdef __gnu_linux__
- 
-    // Open pipe to file
-+   char* originalPath = getenv("PATH");
-+   setenv("PATH", "@path@", 1);
-    FILE* pipe = popen(command.c_str(), "r");
-+   setenv("PATH", originalPath, 1);
-    if (!pipe) {
+@@ -22,7 +22,14 @@ string exec(string command) {
+ #endif
+     std::array<char, 128> buffer;
+     std::string result;
++
++    char* originalPath = getenv("PATH");
++    setenv("PATH", "@path@", 1);
++
+     std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(command.c_str(), "r"), pclose);
++
++    setenv("PATH", originalPath, 1);
++
+     if (!pipe) {
        return "popen failed!";
-    }
+     }
 diff --git a/src/pci_ids.cpp b/src/pci_ids.cpp
-index 4e2a6d2..9490869 100644
+index feec222..6baa707 100644
 --- a/src/pci_ids.cpp
 +++ b/src/pci_ids.cpp
-@@ -22,12 +22,9 @@ std::istream& get_uncommented_line(std::istream& is, std::string &line)
- 
+@@ -24,11 +24,9 @@ std::istream& get_uncommented_line(std::istream& is, std::string &line)
  void parse_pciids()
  {
--    std::ifstream file("/usr/share/hwdata/pci.ids");
-+    std::ifstream file("@hwdata@/share/hwdata/pci.ids");
-     if(file.fail()){
--        std::ifstream file("/usr/share/misc/pci.ids");
+     std::ifstream file;
+-    file.open("/usr/share/hwdata/pci.ids");
++    file.open("@hwdata@/share/hwdata/pci.ids");
+     if (file.fail()){
+-        file.open("/usr/share/misc/pci.ids");
 -        if (file.fail())
--            printf("MANGOHUD: can't find file pci.ids\n");
--        
-+        printf("MANGOHUD: can't find file pci.ids\n");
+-            SPDLOG_ERROR("can't find file pci.ids");
++        SPDLOG_ERROR("can't find file pci.ids");
      }
  
      std::string line;
+-- 
+2.36.0
+
diff --git a/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch b/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch
index 4c6561180a13..f4f2e112d945 100644
--- a/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch
+++ b/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch
@@ -1,3 +1,12 @@
+From 1ac93cbf0eed951af6967a81f731a0f418ea0b3d Mon Sep 17 00:00:00 2001
+From: Atemu <atemu.main@gmail.com>
+Date: Tue, 17 May 2022 16:58:45 +0200
+Subject: [PATCH 2/2] opengl32 nix workaround
+
+---
+ bin/mangohud.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/bin/mangohud.in b/bin/mangohud.in
 index 8ec21de..f65304a 100755
 --- a/bin/mangohud.in
@@ -10,3 +19,6 @@ index 8ec21de..f65304a 100755
 +LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@:@mangohud32@/lib/mangohud"
  
  exec env MANGOHUD=1 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LD_PRELOAD="${LD_PRELOAD}" "$@"
+-- 
+2.36.0
+

From cf608e1b5d5657a61d6678bdec809e30edb278ee Mon Sep 17 00:00:00 2001
From: Khushraj Rathod <khushraj.rathod@gmail.com>
Date: Mon, 2 May 2022 22:40:03 +0530
Subject: [PATCH 02/36] bootstrap-studio: init at 6.0.1

---
 .../web/bootstrap-studio/default.nix          | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/web/bootstrap-studio/default.nix

diff --git a/pkgs/development/web/bootstrap-studio/default.nix b/pkgs/development/web/bootstrap-studio/default.nix
new file mode 100644
index 000000000000..34b169b88c6f
--- /dev/null
+++ b/pkgs/development/web/bootstrap-studio/default.nix
@@ -0,0 +1,36 @@
+{ lib, fetchurl, appimageTools }:
+
+let
+  pname = "bootstrap-studio";
+  version = "6.0.1";
+  name = "bootstrap-studio-${version}";
+  nameExecutable = pname;
+  src = fetchurl {
+    url = "https://bootstrapstudio.io/releases/desktop/${version}/Bootstrap%20Studio.AppImage";
+    sha256 = "sha256-piRqIB/bCF0IBZfXdlXrc7gmPTIUDbk8xhP7X5ozyWg=";
+  };
+  appimageContents = appimageTools.extractType2 { inherit name src; };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  extraInstallCommands = ''
+    mv $out/bin/${name} $out/bin/${pname}
+
+    install -m 444 -D ${appimageContents}/bstudio.desktop -t $out/share/applications
+
+    substituteInPlace $out/share/applications/bstudio.desktop \
+      --replace 'Exec=AppRun' 'Exec=${pname}'
+
+    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/0x0/apps/bstudio.png \
+      $out/share/icons/hicolor/512x512/apps/bstudio.png
+  '';
+
+  meta = with lib; {
+    description = "Drag-and-drop designer for bootstrap";
+    homepage = "https://bootstrapstudio.io/";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ khushraj ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09612b03e61f..3695101fe3c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -253,6 +253,8 @@ with pkgs;
 
   bingo = callPackage ../development/tools/bingo {};
 
+  bootstrap-studio = callPackage ../development/web/bootstrap-studio {};
+
   breakpad = callPackage ../development/misc/breakpad { };
 
   buf = callPackage ../development/tools/buf { };

From 84c3b4f9859770fd411f19a654a8b515dce55ce6 Mon Sep 17 00:00:00 2001
From: Khushraj Rathod <khushraj.rathod@gmail.com>
Date: Mon, 2 May 2022 22:41:00 +0530
Subject: [PATCH 03/36] maintainers: update khushraj

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 868a343fc449..b776718efcc1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6551,7 +6551,7 @@
   };
   khushraj = {
     email = "khushraj.rathod@gmail.com";
-    github = "KhushrajRathod";
+    github = "khrj";
     githubId = 44947946;
     name = "Khushraj Rathod";
     keys = [{

From 60be290e1f3e198ae04713aa10684b9d8e17b9d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 May 2022 00:29:32 +0000
Subject: [PATCH 04/36] python310Packages.google-cloud-logging: 3.0.0 -> 3.1.1

---
 .../python-modules/google-cloud-logging/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix
index dc60abddb6df..7902b129c663 100644
--- a/pkgs/development/python-modules/google-cloud-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-logging/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-logging";
-  version = "3.0.0";
+  version = "3.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-RS42Hh3Lwo8iCMCAXBp8usAwdkVWcD2XZW0FIYuTNwg=";
+    sha256 = "sha256-YjR2pdEWEWh84nixN/lDO4HssDlNN8CfhX1TOmBnsQs=";
   };
 
   postPatch = ''

From acf69be9516bf81faaf251e280449ed9854c2106 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 May 2022 09:54:02 +0200
Subject: [PATCH 05/36] python310Packages.google-cloud-logging: disable on
 older Python releases

---
 .../python-modules/google-cloud-logging/default.nix   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix
index 7902b129c663..3d07a80cce40 100644
--- a/pkgs/development/python-modules/google-cloud-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-logging/default.nix
@@ -12,22 +12,21 @@
 , proto-plus
 , pytestCheckHook
 , pytest-asyncio
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-logging";
   version = "3.1.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-YjR2pdEWEWh84nixN/lDO4HssDlNN8CfhX1TOmBnsQs=";
+    hash = "sha256-YjR2pdEWEWh84nixN/lDO4HssDlNN8CfhX1TOmBnsQs=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "google-cloud-appengine-logging >= 0.1.0, < 1.0.0dev" "google-cloud-appengine-logging >= 0.1.0"
-  '';
-
   propagatedBuildInputs = [
     google-api-core
     google-cloud-appengine-logging

From 1eb6d6e5a25136f356e8dcd63574b6429d7bdec6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 25 May 2022 04:20:00 +0000
Subject: [PATCH 06/36] gallery-dl: 1.21.2 -> 1.22.0

https://github.com/mikf/gallery-dl/releases/tag/v1.22.0
---
 pkgs/applications/misc/gallery-dl/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index 0d563da0eddf..b97a78a682de 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,20 +2,24 @@
 
 buildPythonApplication rec {
   pname = "gallery_dl";
-  version = "1.21.2";
+  version = "1.22.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-xn+Y8WOIH6zkExO3ZNya3ZBwh90oSjSk00xfO0c23To=";
+    sha256 = "sha256-7gslntYAjH2nSyVKjofC2utjpzQo3aNVD1w5StHk288=";
   };
 
   propagatedBuildInputs = [ requests yt-dlp ];
 
   checkInputs = [ pytestCheckHook ];
+
   pytestFlagsArray = [
     # requires network access
     "--ignore=test/test_results.py"
     "--ignore=test/test_downloader.py"
+
+    # incompatible with pytestCheckHook
+    "--ignore=test/test_ytdl.py"
   ];
 
   meta = with lib; {

From 9102b1cc65c05edb0ada9b1391c942bb3862dfd4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 May 2022 16:13:40 +0200
Subject: [PATCH 07/36] python39Packages.graspologic: mark as broken

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

diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix
index 1a246461e5f7..f16ba5fc4c77 100644
--- a/pkgs/development/python-modules/graspologic/default.nix
+++ b/pkgs/development/python-modules/graspologic/default.nix
@@ -45,5 +45,7 @@ buildPythonPackage rec {
     description = "A package for graph statistical algorithms";
     license = licenses.asl20;  # changing to `licenses.mit` in next release
     maintainers = with maintainers; [ bcdarwin ];
+    # graspologic-native is not available
+    broken = true;
   };
 }

From 3654935a3ac72bd472f7ff09dfc22f321259f24b Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <atry@fb.com>
Date: Thu, 26 May 2022 00:25:32 +0000
Subject: [PATCH 08/36] libdwarf_0_4: init at 0.4.0

---
 maintainers/maintainer-list.nix             |  6 ++++++
 pkgs/development/libraries/libdwarf/0.4.nix | 24 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  1 +
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/libdwarf/0.4.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a5913541c407..a05c08c59799 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1170,6 +1170,12 @@
     githubId = 706854;
     name = "Etienne Laurin";
   };
+  atry = {
+    name = "Bo Yang";
+    email = "atry@fb.com";
+    github = "Atry";
+    githubId = 601530;
+  };
   attila-lendvai = {
     name = "Attila Lendvai";
     email = "attila@lendvai.name";
diff --git a/pkgs/development/libraries/libdwarf/0.4.nix b/pkgs/development/libraries/libdwarf/0.4.nix
new file mode 100644
index 000000000000..147bf3644879
--- /dev/null
+++ b/pkgs/development/libraries/libdwarf/0.4.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchurl, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "libdwarf";
+  version = "0.4.0";
+
+  src = fetchurl {
+    url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
+    sha512 = "30e5c6c1fc95aa28a014007a45199160e1d9ba870b196d6f98e6dd21a349e9bb31bba1bd6817f8ef9a89303bed0562182a7d46fcbb36aedded76c2f1e0052e1e";
+  };
+
+  configureFlags = [ "--enable-shared" "--disable-nonshared" ];
+
+  buildInputs = [ zlib ];
+
+  outputs = [ "bin" "lib" "dev" "out" ];
+
+  meta = {
+    homepage = "https://github.com/davea42/libdwarf-code";
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = [ lib.maintainers.atry ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9a20d8406cd..fb123ffd2026 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18429,6 +18429,7 @@ with pkgs;
 
   inherit (callPackage ../development/libraries/libdwarf { })
     libdwarf dwarfdump;
+  libdwarf_0_4 = callPackage ../development/libraries/libdwarf/0.4.nix { };
 
   libe57format = callPackage ../development/libraries/libe57format { };
 

From 94026f2b20855f921e7cbcfbf394f0552a9f391a Mon Sep 17 00:00:00 2001
From: Khushraj Rathod <khushraj.rathod@gmail.com>
Date: Thu, 26 May 2022 15:06:55 +0530
Subject: [PATCH 09/36] bootstrap-studio: Use pname and version without
 declaring name

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/web/bootstrap-studio/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/web/bootstrap-studio/default.nix b/pkgs/development/web/bootstrap-studio/default.nix
index 34b169b88c6f..988c27981460 100644
--- a/pkgs/development/web/bootstrap-studio/default.nix
+++ b/pkgs/development/web/bootstrap-studio/default.nix
@@ -3,19 +3,17 @@
 let
   pname = "bootstrap-studio";
   version = "6.0.1";
-  name = "bootstrap-studio-${version}";
-  nameExecutable = pname;
   src = fetchurl {
     url = "https://bootstrapstudio.io/releases/desktop/${version}/Bootstrap%20Studio.AppImage";
     sha256 = "sha256-piRqIB/bCF0IBZfXdlXrc7gmPTIUDbk8xhP7X5ozyWg=";
   };
-  appimageContents = appimageTools.extractType2 { inherit name src; };
+  appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
 appimageTools.wrapType2 {
   inherit pname version src;
 
   extraInstallCommands = ''
-    mv $out/bin/${name} $out/bin/${pname}
+    mv $out/bin/${pname}-${version} $out/bin/${pname}
 
     install -m 444 -D ${appimageContents}/bstudio.desktop -t $out/share/applications
 

From 835df2aea7935db33410b789d4f2c80b112853fa Mon Sep 17 00:00:00 2001
From: Shane Sveller <shane@sveller.dev>
Date: Thu, 26 May 2022 10:12:31 -0500
Subject: [PATCH 10/36] nushell: 0.62.0 -> 0.63.0

---
 pkgs/shells/nushell/default.nix              | 11 +++++++---
 pkgs/shells/nushell/use-system-zstd-lib.diff | 22 ++++++++++----------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 9da58871672d..b096301f0e63 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -14,20 +14,22 @@
 , nghttp2
 , libgit2
 , withExtraFeatures ? true
+, testers
+, nushell
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell";
-  version = "0.62.0";
+  version = "0.63.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-fEwsoAbrV4fSreyB4+xcN8PGDlkLyaK+ptwgZrsBuLk=";
+    sha256 = "sha256-4thvUSOSvH/bv0aW7hGGQMvtXdS+yDfZzPRLZmPZQMQ=";
   };
 
-  cargoSha256 = "sha256-C4Eynvk3ogIl/RDwyA28hYKlkHA2eMYSCyIvAbp+NQo=";
+  cargoSha256 = "sha256-ALUp6sPcmnJy/A078umyKg8KBv23P0vv8mwoO9OU+DQ=";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
@@ -74,5 +76,8 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     shellPath = "/bin/nu";
+    tests.version = testers.testVersion {
+      package = nushell;
+    };
   };
 }
diff --git a/pkgs/shells/nushell/use-system-zstd-lib.diff b/pkgs/shells/nushell/use-system-zstd-lib.diff
index 232ee9420104..6b0831cd9fbc 100644
--- a/pkgs/shells/nushell/use-system-zstd-lib.diff
+++ b/pkgs/shells/nushell/use-system-zstd-lib.diff
@@ -1,8 +1,8 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index 4261c06..6d6e537 100644
+index 6cebf66d..b6e40cd9 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -2166,6 +2166,7 @@ dependencies = [
+@@ -2443,6 +2443,7 @@ dependencies = [
   "rstest",
   "serial_test",
   "tempfile",
@@ -10,23 +10,23 @@ index 4261c06..6d6e537 100644
  ]
  
  [[package]]
-@@ -4962,4 +4963,5 @@ checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8"
+@@ -5365,4 +5366,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
  dependencies = [
   "cc",
   "libc",
 + "pkg-config",
  ]
 diff --git a/Cargo.toml b/Cargo.toml
-index e214da1..b78919a 100644
+index 0791d462..d520d9ae 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -67,6 +69,9 @@ hamcrest2 = "0.3.0"
- rstest = "0.12.0"
- itertools = "0.10.3"
+@@ -58,6 +58,9 @@ rayon = "1.5.1"
+ reedline = { version = "0.6.0", features = ["bashisms"]}
+ is_executable = "1.0.1"
  
 +# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library
-+zstd-sys = { version = "1", features = [ "pkg-config" ] }
++zstd-sys = { version = "2", features = [ "pkg-config" ] }
 +
- [target.'cfg(windows)'.build-dependencies]
- embed-resource = "1"
- 
+ [dev-dependencies]
+ nu-test-support = { path="./crates/nu-test-support", version = "0.63.0"  }
+ tempfile = "3.2.0"

From 22f3d34c933cd86db10bc4886e8dbca473d522a3 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Thu, 26 May 2022 20:48:42 +0200
Subject: [PATCH 11/36] python3Packages.python-louvain: fix test karate

Also add pandas, scipy to checkInputs
---
 .../python-modules/python-louvain/default.nix      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/python-modules/python-louvain/default.nix b/pkgs/development/python-modules/python-louvain/default.nix
index 262370f6109d..699fc97f58e2 100644
--- a/pkgs/development/python-modules/python-louvain/default.nix
+++ b/pkgs/development/python-modules/python-louvain/default.nix
@@ -1,7 +1,10 @@
 { lib
 , fetchPypi
 , buildPythonPackage
+, fetchpatch
 , networkx
+, pandas
+, scipy
 , numpy }:
 
 buildPythonPackage rec {
@@ -13,10 +16,21 @@ buildPythonPackage rec {
     sha256 = "sha256-t7ot9QAv0o0+54mklTK6rRH+ZI5PIRfPB5jnUgodpWs=";
   };
 
+  patches = [
+    # Fix test_karate
+    (fetchpatch {
+      name = "fix-karate-test-networkx-2.7.patch";
+      url = "https://github.com/taynaud/python-louvain/pull/95/commits/c95d767e72f580cb15319fe08d72d87c9976640b.patch";
+      sha256 = "sha256-9oJ9YvKl2sI8oGhfyauNS+HT4kXsDt0L8S2owluWdj0=";
+    })
+  ];
+
   propagatedBuildInputs = [ networkx numpy ];
 
   pythonImportsCheck = [ "community" ];
 
+  checkInputs = [ pandas scipy ];
+
   meta = with lib; {
     homepage = "https://github.com/taynaud/python-louvain";
     description = "Louvain Community Detection";

From 5d60882a1e836656541ac53ec9276fdc8715d71a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 20 May 2022 10:42:51 +0800
Subject: [PATCH 12/36] yubikey-touch-detector: add missing systemd units and
 docs

---
 pkgs/tools/security/yubikey-touch-detector/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/tools/security/yubikey-touch-detector/default.nix
index 5ea91c3012fd..e728b1b62c41 100644
--- a/pkgs/tools/security/yubikey-touch-detector/default.nix
+++ b/pkgs/tools/security/yubikey-touch-detector/default.nix
@@ -16,6 +16,15 @@ buildGoModule rec {
 
   buildInputs = [ libnotify ];
 
+  postInstall = ''
+    install -Dm444 -t $out/share/doc/${pname} *.md
+
+    install -Dm444 -t $out/lib/systemd/user *.{service,socket}
+
+    substituteInPlace $out/lib/systemd/user/*.service \
+      --replace /usr/bin/yubikey-touch-detector "$out/bin/yubikey-touch-detector --libnotify"
+  '';
+
   meta = with lib; {
     description = "A tool to detect when your YubiKey is waiting for a touch (to send notification or display a visual indicator on the screen).";
     homepage = "https://github.com/maximbaz/yubikey-touch-detector";

From 73a4c001d42c1f924c988c0c5a92f4c1e2388297 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:06:36 +0800
Subject: [PATCH 13/36] SDL_compat: init at 1.2.52

---
 .../libraries/SDL_compat/default.nix          | 52 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/SDL_compat/default.nix

diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix
new file mode 100644
index 000000000000..2ba0a095f688
--- /dev/null
+++ b/pkgs/development/libraries/SDL_compat/default.nix
@@ -0,0 +1,52 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, SDL2
+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
+, openglSupport ? libGLSupported
+, libGL
+, libGLU
+}:
+
+let
+  inherit (lib) optionals makeLibraryPath;
+
+in
+stdenv.mkDerivation rec {
+  pname = "SDL_compat";
+  version = "1.2.52";
+
+  src = fetchFromGitHub {
+    owner = "libsdl-org";
+    repo = "sdl12-compat";
+    rev = "release-" + version;
+    hash = "sha256-PDGlMI8q74JaqMQ5oX9Zt5CEr7frFQWECbuwq5g25eg=";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  propagatedBuildInputs = [ SDL2 ]
+    ++ optionals openglSupport [ libGL libGLU ];
+
+  enableParallelBuilding = true;
+
+  setupHook = ../SDL/setup-hook.sh;
+
+  postFixup = ''
+    for lib in $out/lib/*.so* ; do
+      if [[ -L "$lib" ]]; then
+        patchelf --set-rpath "$(patchelf --print-rpath $lib):${makeLibraryPath propagatedBuildInputs}" "$lib"
+      fi
+    done
+  '';
+
+  meta = with lib; {
+    description = "A cross-platform multimedia library - build SDL 1.2 applications against 2.0";
+    homepage = "https://www.libsdl.org/";
+    license = licenses.zlib;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f4597100d21..c5eb06ce8478 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20436,13 +20436,17 @@ with pkgs;
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  SDL = callPackage ../development/libraries/SDL ({
+  SDL_classic = callPackage ../development/libraries/SDL ({
     inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT;
   } // lib.optionalAttrs stdenv.hostPlatform.isAndroid {
     # libGLU doesn’t work with Android’s SDL
     libGLU = null;
   });
 
+  SDL_compat = callPackage ../development/libraries/SDL_compat { };
+
+  SDL = SDL_classic;
+
   SDL_audiolib = callPackage ../development/libraries/SDL_audiolib { };
 
   SDL_sixel = callPackage ../development/libraries/SDL_sixel { };

From 12f36a7cffcd003c3ad93817b16f8426e7d8ba24 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:26 +0800
Subject: [PATCH 14/36] tree-wide: SDL may not have a .dev

---
 pkgs/applications/emulators/retroarch/cores.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index b553640d144e..9a2f7e07102f 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -672,7 +672,7 @@ in
     license = "MAME";
 
     extraBuildInputs = [ libpng SDL ];
-    SDL_CONFIG = "${SDL.dev}/bin/sdl-config";
+    SDL_CONFIG = "${lib.getDev SDL}/bin/sdl-config";
     dontAddPrefix = true;
     configurePlatforms = [ ];
     makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ];

From 658ee2d45bd7933850ab629e9ad11477e80f6104 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:26 +0800
Subject: [PATCH 15/36] tree-wide: SDL may not have a .dev

---
 pkgs/development/guile-modules/guile-sdl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix
index c6e250e6d717..f91f8cd01881 100644
--- a/pkgs/development/guile-modules/guile-sdl/default.nix
+++ b/pkgs/development/guile-modules/guile-sdl/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
   buildInputs = [
-    SDL.dev
+    (lib.getDev SDL)
     SDL_image
     SDL_mixer
     SDL_ttf

From f011faaede09aedd5c768b03c88b45ebffa0cbe5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:27 +0800
Subject: [PATCH 16/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix
index b671f47bf8cc..03af2e40fa3a 100644
--- a/pkgs/development/libraries/smpeg/default.nix
+++ b/pkgs/development/libraries/smpeg/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/bin/smpeg-config \
       --prefix PATH ":" "${pkg-config}/bin" \
-      --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig"
+      --prefix PKG_CONFIG_PATH ":" "${lib.getDev SDL}/lib/pkgconfig"
   '';
 
   NIX_LDFLAGS = "-lX11";

From 47240a3e310355c7d4f6b852a954eac50c5b3514 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:27 +0800
Subject: [PATCH 17/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix
index 891c9a40ec12..e5b0f838be1a 100644
--- a/pkgs/games/brogue/default.nix
+++ b/pkgs/games/brogue/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     sed -i Makefile -e 's,LIBTCODDIR=.*,LIBTCODDIR=${libtcod},g' \
-                    -e 's,sdl-config,${SDL.dev}/bin/sdl-config,g'
+                    -e 's,sdl-config,${lib.getDev SDL}/bin/sdl-config,g'
     sed -i src/platform/tcod-platform.c -e "s,fonts/font,$out/share/brogue/fonts/font,g"
     make clean
     rm -rf src/libtcod*

From 7317302c7775de8094472cd8cfd8a0ee062ae2f2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:27 +0800
Subject: [PATCH 18/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix
index bd592dbc55d9..64841fbfea77 100644
--- a/pkgs/games/gargoyle/default.nix
+++ b/pkgs/games/gargoyle/default.nix
@@ -6,7 +6,7 @@ let
   jamenv = ''
     unset AR
   '' + (if stdenv.isDarwin then ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${lib.getDev SDL}/include/SDL"
     export GARGLKINI="$out/Applications/Gargoyle.app/Contents/Resources/garglk.ini"
   '' else ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/libexec/gargoyle"

From 8eacd0777633e8102e839d98c7a83e9b03068008 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:27 +0800
Subject: [PATCH 19/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix
index 0397bb474da3..c1a3eddd25f4 100644
--- a/pkgs/games/hyperrogue/default.nix
+++ b/pkgs/games/hyperrogue/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0bijgbqpc867pq8lbwwvcnc713gm51mmz625xb5br0q2qw09nkyh";
   };
 
-  CPPFLAGS = "-I${SDL.dev}/include/SDL";
+  CPPFLAGS = "-I${lib.getDev SDL}/include/SDL";
 
   buildInputs = [ autoreconfHook SDL SDL_ttf SDL_gfx SDL_mixer libpng glew ];
 

From a0156e7048cbd8bea5c8774599530c9d23d8da80 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:27 +0800
Subject: [PATCH 20/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 827c7d696c77..e012886c884d 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ;
 
   # To avoid problems finding SDL_types.h.
-  configureFlags = [ "CFLAGS=-I${SDL.dev}/include/SDL" ];
+  configureFlags = [ "CFLAGS=-I${lib.getDev SDL}/include/SDL" ];
 
   meta = with lib; {
     description = "Quick tactics game";

From 35bed20020c2ceb112307bb65a5414171e87396d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:27 +0800
Subject: [PATCH 21/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix
index e7dd1bee70c9..c7631f2370db 100644
--- a/pkgs/games/meritous/default.nix
+++ b/pkgs/games/meritous/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   prePatch = ''
     substituteInPlace Makefile \
       --replace "CPPFLAGS +=" "CPPFLAGS += -DSAVES_IN_HOME -DDATADIR=\\\"$out/share/meritous\\\"" \
-      --replace sld-config ${SDL.dev}/bin/sdl-config
+      --replace sld-config ${lib.getDev SDL}/bin/sdl-config
     substituteInPlace src/audio.c \
       --replace "filename[64]" "filename[256]"
   '';

From c9fa7f876d0fa156a81f302b133c93d036f0a35e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:27 +0800
Subject: [PATCH 22/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix
index ffae1b5cd8f6..f07b2a614d48 100644
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@@ -59,7 +59,7 @@ mkDerivation rec {
     "pokerth.pro"
   ];
 
-  NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL";
+  NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL}/include/SDL";
 
   meta = with lib; {
     homepage = "https://www.pokerth.net";

From fed7f8de86da092da18aae5a84ae580b29fbf2ad Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:27 +0800
Subject: [PATCH 23/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix
index 26a327dd3f52..d0e50a361582 100644
--- a/pkgs/games/quantumminigolf/default.nix
+++ b/pkgs/games/quantumminigolf/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   ];
 
   preBuild = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL -I${SDL_ttf}/include/SDL"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${lib.getDev SDL}/include/SDL -I${SDL_ttf}/include/SDL"
 
     sed -re 's@"(gfx|fonts|tracks)/@"'"$out"'/share/quantumminigolf/\1/@g' -i *.cpp
   '';

From 5f7a454b3edc9d725463dff3e47d145d691c2886 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:27 +0800
Subject: [PATCH 24/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix
index 3a87fc0523c7..9c6252a6dda3 100644
--- a/pkgs/games/rili/default.nix
+++ b/pkgs/games/rili/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  CPPFLAGS = "-I${SDL.dev}/include -I${SDL.dev}/include/SDL -I${SDL_mixer}/include";
+  CPPFLAGS = "-I${lib.getDev SDL}/include -I${lib.getDev SDL}/include/SDL -I${SDL_mixer}/include";
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ SDL SDL_mixer ];

From ce0f3b159db50221588199a4ba0df59e7a9c8eb2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:27 +0800
Subject: [PATCH 25/36] tree-wide: SDL may not have a .dev

---
 pkgs/games/wargus/stratagus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/wargus/stratagus.nix b/pkgs/games/wargus/stratagus.nix
index f029e284f336..aa050442bfdb 100644
--- a/pkgs/games/wargus/stratagus.nix
+++ b/pkgs/games/wargus/stratagus.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     zlib bzip2 libpng
     lua5_1 toluapp
-    SDL.dev SDL_image SDL_mixer libGL
+    (lib.getDev SDL) SDL_image SDL_mixer libGL
   ];
   cmakeFlags = [
     "-DCMAKE_CXX_FLAGS=-Wno-error=format-overflow"

From 112e6456a3003b8faf23aae044244fe93c24b54b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:27 +0800
Subject: [PATCH 26/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix
index 1925d6417175..323f49219a2d 100644
--- a/pkgs/games/zaz/default.nix
+++ b/pkgs/games/zaz/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
   buildInputs = [
-    SDL.dev
+    (lib.getDev SDL)
     SDL_image
     mesa
     libtheora
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   ];
 
   # Fix SDL include problems
-  NIX_CFLAGS_COMPILE="-I${SDL.dev}/include/SDL -I${SDL_image}/include/SDL";
+  NIX_CFLAGS_COMPILE="-I${lib.getDev SDL}/include/SDL -I${SDL_image}/include/SDL";
   # Fix linking errors
   makeFlags = [
     "ZAZ_LIBS+=-lSDL"

From 30d5b538fa5671564d3e0d737d1c017674623006 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:27 +0800
Subject: [PATCH 27/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix
index 6ad0262da3a1..0cf407faa0dc 100644
--- a/pkgs/tools/graphics/quirc/default.nix
+++ b/pkgs/tools/graphics/quirc/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   buildInputs = [ SDL SDL_gfx libjpeg libpng opencv ];
 
   makeFlags = [ "PREFIX=$(out)" ];
-  NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL -I${SDL_gfx}/include/SDL";
+  NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL}/include/SDL -I${SDL_gfx}/include/SDL";
 
   # Disable building of linux-only demos on darwin systems
   patches = lib.optionals stdenv.isDarwin [ ./0001-dont-build-demos.patch ];

From 3ca3a12ffce22623673dc600312e0999ca1cfc09 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:28 +0800
Subject: [PATCH 28/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index 4d9fdfd7820e..b9b1b228efa5 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libdv libjpeg libpng ]
               ++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ];
 
-  NIX_CFLAGS_COMPILE = lib.optionalString (!withMinimal) "-I${SDL.dev}/include/SDL";
+  NIX_CFLAGS_COMPILE = lib.optionalString (!withMinimal) "-I${lib.getDev SDL}/include/SDL";
 
   postPatch = ''
     sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure

From 579e722117596d27c879e83cfbe975fe2accc363 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 13:09:28 +0800
Subject: [PATCH 29/36] tree-wide: SDL may not have a .dev

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3ccfac4d0cfe..a0eafedf2fb6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -330,7 +330,7 @@ let
 
     installPhase = "./Build install --prefix $out";
 
-    SDL_INST_DIR = pkgs.SDL.dev;
+    SDL_INST_DIR = lib.getDev pkgs.SDL;
     buildInputs = [ pkgs.SDL ArchiveExtract ArchiveZip TextPatch ];
     propagatedBuildInputs = [ CaptureTiny FileShareDir FileWhich ];
 

From 1f12226231e5edfeec31d67e6a58c6d0d4afa885 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 10 May 2022 16:42:52 +0800
Subject: [PATCH 30/36] rott: build with SDL_compat

---
 pkgs/games/rott/default.nix     | 55 +++++++++++++++++++++++----------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/pkgs/games/rott/default.nix b/pkgs/games/rott/default.nix
index b3a517dab02b..131745ac03eb 100644
--- a/pkgs/games/rott/default.nix
+++ b/pkgs/games/rott/default.nix
@@ -1,5 +1,26 @@
-{stdenv, lib, fetchurl, SDL, SDL_mixer, makeDesktopItem, copyDesktopItems, runtimeShell, buildShareware ? false}:
+{ stdenv
+, lib
+, fetchurl
+, writeShellScript
+, SDL
+, SDL_mixer
+, makeDesktopItem
+, copyDesktopItems
+, runtimeShell
+, buildShareware ? false
+}:
 
+let
+  # Allow the game to be launched from a user's PATH and load the game data from the user's home directory.
+  launcher = writeShellScript "rott" ''
+    set -eEuo pipefail
+    dir=$HOME/.rott/data
+    test -e $dir || mkdir -p $dir
+    cd $dir
+    exec @out@/libexec/rott "$@"
+  '';
+
+in
 stdenv.mkDerivation rec {
   pname = "rott";
   version = "1.1.2";
@@ -10,27 +31,27 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ copyDesktopItems ];
+
   buildInputs = [ SDL SDL_mixer ];
 
-  preBuild = ''
-    cd rott
-    make clean
-    make SHAREWARE=${if buildShareware then "1" else "0"}
-  '';
+  sourceRoot = "rott-${version}/rott";
 
-  # Include a wrapper script to allow the game to be launched from a user's PATH and load the game data from the user's home directory.
+  makeFlags = [
+    "SHAREWARE=${if buildShareware then "1" else "0"}"
+  ];
+
+  # when using SDL_compat instead of SDL_classic, SDL_mixer isn't correctly
+  # detected, but there is no harm just specifying it
+  NIX_CFLAGS_COMPILE = [
+    "-I${lib.getDev SDL_mixer}/include/SDL"
+  ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp rott $out/bin
+    runHook preInstall
 
-    cat > $out/bin/launch-rott <<EOF
-    #! ${runtimeShell} -e
-    cd ~/.rott/data
-    exec $out/bin/rott
-    EOF
-
-    chmod +x $out/bin/launch-rott
+    install -Dm555 -t $out/libexec rott
+    install -Dm555 ${launcher} $out/bin/${launcher.name}
+    substituteInPlace $out/bin/rott --subst-var out
 
     runHook postInstall
   '';
@@ -38,7 +59,7 @@ stdenv.mkDerivation rec {
   desktopItems = [
     (makeDesktopItem {
       name = "rott";
-      exec = "launch-rott";
+      exec = "rott";
       desktopName = "Rise of the Triad: ${if buildShareware then "The HUNT Begins" else "Dark War"}";
       categories = [ "Game" ];
     })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5eb06ce8478..a9d332acf927 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32137,7 +32137,7 @@ with pkgs;
 
   rocksndiamonds = callPackage ../games/rocksndiamonds { };
 
-  rott = callPackage ../games/rott { };
+  rott = callPackage ../games/rott { SDL = SDL_compat; };
 
   rott-shareware = rott.override {
     buildShareware = true;

From d9e295cdefe01ac9b447ac5b0b3c30978a2c972b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 23 May 2022 09:11:59 +0800
Subject: [PATCH 31/36] openxcom: build with SDL_compat

---
 pkgs/games/openxcom/default.nix | 34 ++++++++++++++++++++++-----------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index b877c3aac2fd..61f209aae4dc 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -1,26 +1,38 @@
-{lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib, openssl, libyamlcpp, boost
-, SDL, SDL_image, SDL_mixer, SDL_gfx }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, libGLU
+, libGL
+, zlib
+, openssl
+, libyamlcpp
+, boost
+, SDL
+, SDL_image
+, SDL_mixer
+, SDL_gfx
+}:
 
-let version = "1.0.0.2019.10.18"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "openxcom";
-  inherit version;
+  version = "1.0.0.2019.10.18";
+
   src = fetchFromGitHub {
     owner = "OpenXcom";
     repo = "OpenXcom";
     rev = "f9853b2cb8c8f741ac58707487ef493416d890a3";
-    sha256 = "0kbfawj5wsp1mwfcm5mwpkq6s3d13pailjm5w268gqpxjksziyq0";
+    hash = "sha256-APv49ZT94oeM4KVKGtUdoQ1t8Ly8lsocr+FqXiRXbk0=";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU libGL openssl zlib ];
 
-  meta = {
+  meta = with lib; {
     description = "Open source clone of UFO: Enemy Unknown";
     homepage = "https://openxcom.org";
-    maintainers = [ lib.maintainers.cpages ];
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl3;
+    maintainers = with maintainers; [ cpages ];
+    platforms = platforms.linux;
+    license = licenses.gpl3;
   };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9d332acf927..7f86640f9c6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32033,7 +32033,7 @@ with pkgs;
 
   opentyrian = callPackage ../games/opentyrian { };
 
-  openxcom = callPackage ../games/openxcom { };
+  openxcom = callPackage ../games/openxcom { SDL = SDL_compat; };
 
   openxray = callPackage ../games/openxray { };
 

From a64bf222306eef963fe971d8d979ebd2f1e6fdf9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 May 2022 14:42:03 +0000
Subject: [PATCH 32/36] vorta: 0.8.4 -> 0.8.6

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

diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix
index 8e551f3db034..235827eb8335 100644
--- a/pkgs/applications/backup/vorta/default.nix
+++ b/pkgs/applications/backup/vorta/default.nix
@@ -8,13 +8,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "vorta";
-  version = "0.8.4";
+  version = "0.8.6";
 
   src = fetchFromGitHub {
     owner = "borgbase";
     repo = "vorta";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-eS/+7s9KgGCEhA6NgIzPlGM1daP+Ir2d1mmqse4YbIE=";
+    sha256 = "sha256-J/Cl+et4AS44PPG2SmOHosKVw0XtOyNL0qJk68OHwQc=";
   };
 
   nativeBuildInputs = [ wrapQtAppsHook ];

From 15367160c946373660b7517a7eb5179acae00746 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 May 2022 01:09:53 +0000
Subject: [PATCH 33/36] aliyun-cli: 3.0.119 -> 3.0.121

---
 pkgs/tools/admin/aliyun-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix
index 69caf1871397..e2359bd5e117 100644
--- a/pkgs/tools/admin/aliyun-cli/default.nix
+++ b/pkgs/tools/admin/aliyun-cli/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "aliyun-cli";
-  version = "3.0.119";
+  version = "3.0.121";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "aliyun";
     repo = pname;
     fetchSubmodules = true;
-    sha256 = "sha256-vvQevEEVu8ySnbSXoFxQZLa+yqml18duilmnefDsR+I=";
+    sha256 = "sha256-1D1JZZ/KMC4oZRaYvWpUazTk7llvX5WHPBxWEGCiKrI=";
   };
 
   vendorSha256 = "sha256-f3GXkAvTe8rPFWCR5TM4mDK/VOQWt2lrZrfJ/Wvw8Uc=";

From 6117b71f31705a351c2f70a650c1ea36a9bef4db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 27 May 2022 01:09:44 +0000
Subject: [PATCH 34/36] python3Packages.wandb: hardcode git path

---
 .../python-modules/wandb/default.nix          | 18 ++--
 .../wandb/hardcode-git-path.patch             | 83 +++++++++++++++++++
 2 files changed, 91 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/python-modules/wandb/hardcode-git-path.patch

diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index 615b4e64aa4c..44b85624cf3f 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -32,6 +32,7 @@
 , setproctitle
 , setuptools
 , shortuuid
+, substituteAll
 , tqdm
 }:
 
@@ -49,6 +50,13 @@ buildPythonPackage rec {
     hash = "sha256-ZY7nTj93piTEeHhW+H+nQ+ws2dDmmY6u3p7uz296PbA=";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./hardcode-git-path.patch;
+      git = "${lib.getBin git}/bin/git";
+    })
+  ];
+
   # setuptools is necessary since pkg_resources is required at runtime.
   propagatedBuildInputs = [
     click
@@ -67,16 +75,6 @@ buildPythonPackage rec {
     shortuuid
   ];
 
-  # wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf
-  # for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128.
-  # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to
-  # why we don't put it in propagatedBuildInputs. Note that this is difficult to
-  # test offline due to https://github.com/wandb/client/issues/3519.
-  postInstall = ''
-    mkdir -p $out/bin
-    ln -s ${git}/bin/git $out/bin/git
-  '';
-
   preCheck = ''
     export HOME=$(mktemp -d)
   '';
diff --git a/pkgs/development/python-modules/wandb/hardcode-git-path.patch b/pkgs/development/python-modules/wandb/hardcode-git-path.patch
new file mode 100644
index 000000000000..6d91add9d383
--- /dev/null
+++ b/pkgs/development/python-modules/wandb/hardcode-git-path.patch
@@ -0,0 +1,83 @@
+diff --git a/functional_tests/kfp/wandb_probe.py b/functional_tests/kfp/wandb_probe.py
+index 82fadfe1..25c1454c 100644
+--- a/functional_tests/kfp/wandb_probe.py
++++ b/functional_tests/kfp/wandb_probe.py
+@@ -5,7 +5,7 @@ import subprocess
+ def wandb_probe_package():
+     if not os.environ.get("WB_PROBE_PACKAGE"):
+         return
+-    s, o = subprocess.getstatusoutput("git rev-parse HEAD")
++    s, o = subprocess.getstatusoutput("@git@ rev-parse HEAD")
+     if s:
+         return
+     wandb_local = f"git+https://github.com/wandb/client.git@{o}#egg=wandb"
+diff --git a/wandb/cli/cli.py b/wandb/cli/cli.py
+index 5767e61c..56009fec 100644
+--- a/wandb/cli/cli.py
++++ b/wandb/cli/cli.py
+@@ -1745,7 +1745,7 @@ def restore(ctx, run, no_git, branch, project, entity):
+     commit, json_config, patch_content, metadata = api.run_config(
+         project, run=run, entity=entity
+     )
+-    repo = metadata.get("git", {}).get("repo")
++    repo = metadata.get("@git@", {}).get("repo")
+     image = metadata.get("docker")
+     restore_message = (
+         """`wandb restore` needs to be run from the same git repository as the original run.
+@@ -1764,7 +1764,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""
+ 
+     if commit and api.git.enabled:
+         wandb.termlog(f"Fetching origin and finding commit: {commit}")
+-        subprocess.check_call(["git", "fetch", "--all"])
++        subprocess.check_call(["@git@", "fetch", "--all"])
+         try:
+             api.git.repo.commit(commit)
+         except ValueError:
+@@ -1818,7 +1818,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""
+             # --reject is necessary or else this fails any time a binary file
+             # occurs in the diff
+             exit_code = subprocess.call(
+-                ["git", "apply", "--reject", patch_rel_path], cwd=root
++                ["@git@", "apply", "--reject", patch_rel_path], cwd=root
+             )
+             if exit_code == 0:
+                 wandb.termlog("Applied patch")
+diff --git a/wandb/sdk/internal/internal_api.py b/wandb/sdk/internal/internal_api.py
+index 612220b9..b761bfbd 100644
+--- a/wandb/sdk/internal/internal_api.py
++++ b/wandb/sdk/internal/internal_api.py
+@@ -660,7 +660,7 @@ class Api:
+         )
+         patch = BytesIO()
+         if self.git.dirty:
+-            self.git.repo.git.execute(["git", "diff"], output_stream=patch)
++            self.git.repo.git.execute(["@git@", "diff"], output_stream=patch)
+             patch.seek(0)
+         cwd = "."
+         if self.git.enabled:
+diff --git a/wandb/sdk/internal/meta.py b/wandb/sdk/internal/meta.py
+index 6c53f750..c385951a 100644
+--- a/wandb/sdk/internal/meta.py
++++ b/wandb/sdk/internal/meta.py
+@@ -125,7 +125,7 @@ class Meta:
+         logger.debug("save patches")
+         try:
+             root = self._git.root
+-            diff_args = ["git", "diff"]
++            diff_args = ["@git@", "diff"]
+             if self._git.has_submodule_diff:
+                 diff_args.append("--submodule=diff")
+ 
+diff --git a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py b/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py
+index 614df9f5..38db460b 100644
+--- a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py
++++ b/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py
+@@ -67,7 +67,7 @@ def get_git_changeset():
+     repo_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+     try:
+         git_log = subprocess.Popen(
+-            'git log --pretty=format:%ct --quiet -1 HEAD',
++            '@git@ log --pretty=format:%ct --quiet -1 HEAD',
+             stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+             shell=True, cwd=repo_dir, universal_newlines=True,
+         )

From 03eb4fd7ae049f4db4c196956b33afbe0a9ceaae Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Fri, 27 May 2022 00:04:14 +0200
Subject: [PATCH 35/36] mastodon: 3.5.2 -> 3.5.3

---
 pkgs/servers/mastodon/default.nix |   2 +-
 pkgs/servers/mastodon/gemset.nix  | 143 +++++++++++++-----------------
 pkgs/servers/mastodon/source.nix  |   4 +-
 pkgs/servers/mastodon/version.nix |   2 +-
 4 files changed, 65 insertions(+), 86 deletions(-)

diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix
index 075389e325a4..0b7304a32edd 100644
--- a/pkgs/servers/mastodon/default.nix
+++ b/pkgs/servers/mastodon/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    sha256 = "sha256-FCwyJJwZ3/CVPT8LUid+KJcWCmFQet8Cftl7DVYhZ6I=";
+    sha256 = "sha256-2NSibx026ENAqphGGhNoLwUldWTEPbDBrYu3hgeRlnM=";
   };
 
   mastodon-gems = bundlerEnv {
diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix
index a6deedbcb81c..bdfd11d5ce3e 100644
--- a/pkgs/servers/mastodon/gemset.nix
+++ b/pkgs/servers/mastodon/gemset.nix
@@ -5,10 +5,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0znrdixzpbr7spr4iwp19z3r2f2klggh9pmnsiix8qrvccc5lsdl";
+      sha256 = "0p8zkh5ww16y8n1jp12y1gjrmll7m7305c91p419f10qrw4x8cgc";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   actionmailbox = {
     dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@@ -16,10 +16,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17mcv2qfjkix1q18nj6kidrhdwxd0rdzssdkdanrpp905z0sx0mw";
+      sha256 = "0z52r7k3ig09zjvfcb8xnrl9vl0ssii22c2h7gx26nq8wb7yjkwq";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   actionmailer = {
     dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
@@ -27,10 +27,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1084nk3fzq76gzl6kc9dwb586g3kcj1kmp8w1nsrhpl523ljgl1s";
+      sha256 = "186bkhrp8j81nrw5xznbi0nyhk49gdv6ynd80pcyk5lxhfkiw1wc";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   actionpack = {
     dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@@ -38,10 +38,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1b2vxprwfkza3h6z3pq508hsjh1hz9f8d7739j469mqlxsq5jh1l";
+      sha256 = "1walbq04v4qvgnz39cbfhz9bzhsf14q1h7gd0kgjy3frld6ysrhb";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   actiontext = {
     dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
@@ -49,10 +49,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ld6x9x05b1n40rjp83hsi4byp15zvb3lmvfk2h8jgxfrpb47c6j";
+      sha256 = "0s6v0vnnm8zrxc3pr058r8bvgs6fxgjhadbc5r1sv1mrbyvvm1h0";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   actionview = {
     dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -60,10 +60,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0y54nw3x38lj0qh36hlzjw82px328k01fyrk21d6xlpn1w0j98gv";
+      sha256 = "05r0h7pvc0szqmgnra0j3j8ap7dmiyw9s6qksx41v5cxknmfi0h3";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   active_model_serializers = {
     dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"];
@@ -92,10 +92,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1i6s8ppwnf0zcz466i5qi2gd7fdgxkl22db50mxkyfnbwnzbfw49";
+      sha256 = "0gjvxrzdbg0dsyqx7wsmxqfvlpl37zvzq3d1cylhb5qslsw6ml05";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   activemodel = {
     dependencies = ["activesupport"];
@@ -103,10 +103,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01bbxwbih29qcmqrrvqymlc6hjf0r38rpwdfgaimisp5vms3xxsn";
+      sha256 = "1f0ai51icvvx5q0jd1l89k0dlwzpsrkqlj6x43f8qc4bd1ya9glx";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   activerecord = {
     dependencies = ["activemodel" "activesupport"];
@@ -114,10 +114,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yscjy5766g67ip3g7614b0hhrpgz5qk22nj8ghzcjqh3fj2k2n0";
+      sha256 = "0khjnkvmiyap1g3rvw9hp16mzai4smqcg5hxhq28pll25ljzxdbp";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   activestorage = {
     dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
@@ -125,10 +125,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1m0m7k0p5b7dfpmh9aqfs5fapaymkml3gspirpaq6w9w55ahf6pv";
+      sha256 = "03w600j4jzgfycy2xm6cxry3q5rpvx1jvr7msy1jx65sa2shgjha";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   activesupport = {
     dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@@ -136,10 +136,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ylj0nwk9y5hbgv93wk8kkbg9z9bv1052ic37n9ib34w0bkgrzw4";
+      sha256 = "08wzpwgdm03vzb8gqr8bvfdarb89g5ah0skvwqk6qv87p55xqkyw";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   addressable = {
     dependencies = ["public_suffix"];
@@ -250,10 +250,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1afpq7sczg91xx5xi4xlgcwrrhmy3k6mrk60ph8avbfiyxgw27pc";
+      sha256 = "0vqb2bfq5db7x66f4n4z30c953y5q8pwwl2067nxhz6j0c486pzm";
       type = "gem";
     };
-    version = "1.582.0";
+    version = "1.587.0";
   };
   aws-sdk-core = {
     dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -283,10 +283,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17pc197a6axmnj6rbhgsvks2w0mv2mmr2bwh1k4mazbfp72ss87i";
+      sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf";
       type = "gem";
     };
-    version = "1.113.2";
+    version = "1.114.0";
   };
   aws-sigv4 = {
     dependencies = ["aws-eventstream"];
@@ -379,10 +379,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bk1xz5w29cq84svnrlgcrwvy1lpkwqrv6cmkkivs3yrym09av14";
+      sha256 = "1m188ypcl2lb1hin21fmyk9d4fbjw4w7cr2k6l37jasw3rmgnvjv";
       type = "gem";
     };
-    version = "5.2.2";
+    version = "5.2.3";
   };
   browser = {
     groups = ["default"];
@@ -508,10 +508,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dv75hs45456mi76h720gxk959gpg4f6091hmk42y0ln6kp2x7i0";
+      sha256 = "05df76mfhfab6d7ir0qy5xf1ad6kqdh2p6vfqv7nhlx45k1y4ysg";
       type = "gem";
     };
-    version = "3.36.0";
+    version = "3.37.1";
   };
   case_transform = {
     dependencies = ["activesupport"];
@@ -775,16 +775,6 @@
     };
     version = "2.7.6";
   };
-  e2mmap = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
   ed25519 = {
     groups = ["default"];
     platforms = [];
@@ -895,10 +885,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1694ndj701a8q4c4bwxz53kx94ih1rr4pgr4gk7a6c8k4jsbjgwi";
+      sha256 = "025lapimxw0db74gf2yd6zypqq1yvfblhk7wkd6h3r1szk7k8r8p";
       type = "gem";
     };
-    version = "2.20.0";
+    version = "2.21.0";
   };
   faraday = {
     dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
@@ -1312,10 +1302,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hiblss98hmybs82xsaavhz1cwlhhx92jzlx8ypkriylxhhwmigk";
+      sha256 = "03frq52fad0qs2gy7769nywv7bnspxccbsv10akzgx7icfjsjldv";
       type = "gem";
     };
-    version = "1.0.9";
+    version = "1.0.10";
   };
   idn-ruby = {
     groups = ["default"];
@@ -1545,10 +1535,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fpx5p8n0jq4bdazb2vn19sqkmh398rk9b2pa3gdi43snfn485cr";
+      sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1";
       type = "gem";
     };
-    version = "2.17.0";
+    version = "2.18.0";
   };
   mail = {
     dependencies = ["mini_mime"];
@@ -1762,10 +1752,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd";
+      sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi";
       type = "gem";
     };
-    version = "1.13.4";
+    version = "1.13.6";
   };
   nsa = {
     dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"];
@@ -1899,10 +1889,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";
+      sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d";
       type = "gem";
     };
-    version = "3.1.1.0";
+    version = "3.1.2.0";
   };
   parslet = {
     groups = ["default"];
@@ -2036,10 +2026,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+      sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
       type = "gem";
     };
-    version = "4.0.6";
+    version = "4.0.7";
   };
   puma = {
     dependencies = ["nio4r"];
@@ -2154,10 +2144,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08a9wl2g4q403jc9iziqh37c64yccp6rzxz6avy0l7ydslpxggv8";
+      sha256 = "06wzq30c2f9jhsbkxwg9n18xwyh66fnpbndkrvq1c4mrl2rx478z";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   rails-controller-testing = {
     dependencies = ["actionpack" "actionview" "activesupport"];
@@ -2220,10 +2210,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lirp0g1n114gwkqbqki2fjqwnbyzhn30z97jhikqldd0r54f4b9";
+      sha256 = "16dyjmy42v51acmx1ba2xxncvx368ss5rww6bsf1lwgyk4vqn41h";
       type = "gem";
     };
-    version = "6.1.5.1";
+    version = "6.1.6";
   };
   rainbow = {
     groups = ["default" "development" "test"];
@@ -2293,10 +2283,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k";
+      sha256 = "01rmdc7ryjyajk3a4mdn68y4bvp3ly9xv610wia3291hsiqncrb6";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
   };
   request_store = {
     dependencies = ["rack"];
@@ -2453,10 +2443,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk";
+      sha256 = "0k2wp9sxqpdyc12kp8qafls0yn44vq90zxd830s7y7rxp9xq3018";
       type = "gem";
     };
-    version = "1.27.0";
+    version = "1.29.1";
   };
   rubocop-ast = {
     dependencies = ["parser"];
@@ -2464,10 +2454,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx";
+      sha256 = "1b3p4wy68jkyq8vhm5y568wlhsihy3ilnp2c6ig18xcw1slnkypl";
       type = "gem";
     };
-    version = "1.17.0";
+    version = "1.18.0";
   };
   rubocop-rails = {
     dependencies = ["activesupport" "rack" "rubocop"];
@@ -2581,10 +2571,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fq3nxpj1c9s2bi056p9cldb7zy45bgdkjq8721zypw1pkvllb7f";
+      sha256 = "0b06kw7frd8hrb7373pvfd39qap00ykkvipgymgwxfjzrgz0ag0d";
       type = "gem";
     };
-    version = "6.4.1";
+    version = "6.4.2";
   };
   sidekiq-bulk = {
     dependencies = ["sidekiq"];
@@ -2598,15 +2588,15 @@
     version = "0.2.0";
   };
   sidekiq-scheduler = {
-    dependencies = ["e2mmap" "redis" "rufus-scheduler" "sidekiq" "thwait" "tilt"];
+    dependencies = ["redis" "rufus-scheduler" "sidekiq" "tilt"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ncly0glyvcx8cm976c811iw70y5wyix6iwfsmmgfvi0jmy1h4v3";
+      sha256 = "0kn0zzpl778345a9pc3dfc7lkgr8h1gwajs6miylmyd9krkh0yfm";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "4.0.0";
   };
   sidekiq-unique-jobs = {
     dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"];
@@ -2614,10 +2604,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ibrdlpvlra8wxkhapiipwrx8v9y6wpmxlfn5r53swvhmlkrjqgq";
+      sha256 = "170i40s7rsw66cplq2akia409vxnb8i34ypy99qpx0pxs8rp4c4d";
       type = "gem";
     };
-    version = "7.1.21";
+    version = "7.1.22";
   };
   simple-navigation = {
     dependencies = ["activesupport"];
@@ -2740,10 +2730,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ixpwp14hrygif8c1wn05gh4d4nq1940p3grh95r4dqmpjdqn0sr";
+      sha256 = "1628qf2ynldqz20h5lkaivk166qknk15gxg130n9pvz568k1sdp8";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "3.0.0";
   };
   strong_migrations = {
     dependencies = ["activerecord"];
@@ -2809,17 +2799,6 @@
     };
     version = "1.2.1";
   };
-  thwait = {
-    dependencies = ["e2mmap"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0q0fqlh0668j66z0g3s5yhqs39368az2ycxyphsx4c5nib5r4kak";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
   tilt = {
     groups = ["default"];
     platforms = [];
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index 6d4dc034ff65..151782e479fe 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -2,8 +2,8 @@
 { fetchgit, applyPatches }: let
   src = fetchgit {
     url = "https://github.com/mastodon/mastodon.git";
-    rev = "v3.5.2";
-    sha256 = "03sk0rzf7zy0vpq6f5f909hx5gbnan5b5h068grgzv2v7lj11was";
+    rev = "v3.5.3";
+    sha256 = "1z0fgyvzz7nlbg2kaxsh53c4bq4y6n5f9r8lyfa7vzvz9nwrkqiq";
   };
 in applyPatches {
   inherit src;
diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix
index 843ef5820f92..d23f68c28be8 100644
--- a/pkgs/servers/mastodon/version.nix
+++ b/pkgs/servers/mastodon/version.nix
@@ -1 +1 @@
-"3.5.2"
+"3.5.3"

From c7acf6a4ac8477b23f97bb51c57b57cc671d206d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 May 2022 03:38:48 +0000
Subject: [PATCH 36/36] gnome.gedit: 42.0 -> 42.1

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

diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix
index 3269739df9af..dc5059901bb8 100644
--- a/pkgs/desktops/gnome/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome/apps/gedit/default.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gedit";
-  version = "42.0";
+  version = "42.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "qHmR9Clh609qvNuqu3hHYMI66u765jY9PiGmHpxFhDc=";
+    sha256 = "fx/UPfURDUw33mVBmT9B8PvD78eQkA6SBTR5ugaZIOk=";
   };
 
   patches = [