From 52ab3fa6bbe47a8e6c08945ff321e50bf2772f45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 Sep 2022 08:18:44 +0000
Subject: [PATCH 01/25] dprint: 0.31.1 -> 0.32.1

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

diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix
index c6e18c16c5e7..da8ee030fad2 100644
--- a/pkgs/development/tools/dprint/default.nix
+++ b/pkgs/development/tools/dprint/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dprint";
-  version = "0.31.1";
+  version = "0.32.1";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-NgUc3QrH7y72DS01ypfnifHzQeFCogPa+8+Kzv4i4xE=";
+    sha256 = "sha256-CZSGE9HsxBX7vqLLPTLWFi/NGHa1FXA6YWqFHvzVeAQ=";
   };
 
-  cargoSha256 = "sha256-0BIkO9sMQbQTONSsNgR5UFPIkA0mzADqHxlEhHlIG0Y=";
+  cargoSha256 = "sha256-vYiCSU02mHUKKe0tyB+byhNZhZ+d8yhQf8IKI5r/qYU=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 

From ff33fc8e786c590d0c5b5f80a8ab1c2d42813c37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 Sep 2022 08:38:52 +0000
Subject: [PATCH 02/25] devspace: 6.1.0 -> 6.1.1

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

diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix
index 827a3bd4d536..8ff854d31965 100644
--- a/pkgs/development/tools/misc/devspace/default.nix
+++ b/pkgs/development/tools/misc/devspace/default.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "devspace";
-  version = "6.1.0";
+  version = "6.1.1";
 
   src = fetchFromGitHub {
     owner = "loft-sh";
     repo = "devspace";
     rev = "v${version}";
-    sha256 = "sha256-pbI49oklxTu02YNIA1uxcDqWwGf3LaKipErDHCVxRRc=";
+    sha256 = "sha256-2LSRmTWbG7sxV5e6N44HAPdqIL/O2UxcnuHXmbTooWs=";
   };
 
   vendorSha256 = null;

From ac6786d8dc264c11a32a885dc53b621b1fa19e57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 Sep 2022 20:26:24 +0000
Subject: [PATCH 03/25] kddockwidgets: 1.5.0 -> 1.6.0

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

diff --git a/pkgs/development/libraries/kddockwidgets/default.nix b/pkgs/development/libraries/kddockwidgets/default.nix
index c91cf6ecffa6..3102c8847259 100644
--- a/pkgs/development/libraries/kddockwidgets/default.nix
+++ b/pkgs/development/libraries/kddockwidgets/default.nix
@@ -8,13 +8,13 @@
 
 mkDerivation rec {
   pname = "KDDockWidgets";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "KDAB";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-7jC0zl5ESwqZXzvFJYmPvRhwFitse05NuYoTgFWiHac=";
+    sha256 = "sha256-rAv0P7tRcgCTB/ZM93wKF8oRZc7KqPyoDcnRn5Rel/k=";
   };
 
   nativeBuildInputs = [ cmake ];

From f00d5620804f700b05b8cb913ac10ef3ddcaa068 Mon Sep 17 00:00:00 2001
From: Tako Marks <me@github.tako.mx>
Date: Tue, 6 Sep 2022 20:40:30 +0200
Subject: [PATCH 04/25] libvirtd: use nix paths for zfs userspace tools

Libvirt zfs storage driver makes use of zfs userspace tools to get the
neccesary information. This patch sets correct nix store paths for these
tools.
---
 ...02-substitute-zfs-and-zpool-commands.patch | 27 +++++++++++++++++++
 .../development/libraries/libvirt/default.nix |  6 +++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch

diff --git a/pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch b/pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch
new file mode 100644
index 000000000000..9f380533ee45
--- /dev/null
+++ b/pkgs/development/libraries/libvirt/0002-substitute-zfs-and-zpool-commands.patch
@@ -0,0 +1,27 @@
+From dc5e3df2fd29a547ef0f9545e190a0ce3a73c95c Mon Sep 17 00:00:00 2001
+From: Tako Marks <me@github.tako.mx>
+Date: Tue, 6 Sep 2022 20:19:26 +0200
+Subject: [PATCH] substitute zfs and zpool commands
+
+---
+ src/storage/storage_backend_zfs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c
+index 2a5d74357d..460b3025c4 100644
+--- a/src/storage/storage_backend_zfs.c
++++ b/src/storage/storage_backend_zfs.c
+@@ -33,8 +33,8 @@
+ 
+ VIR_LOG_INIT("storage.storage_backend_zfs");
+ 
+-#define ZFS "zfs"
+-#define ZPOOL "zpool"
++#define ZFS "@zfs@"
++#define ZPOOL "@zpool@"
+ 
+ /*
+  * Some common flags of zfs and zpool commands we use:
+-- 
+2.36.2
+
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index e1ae4527715e..548671c852ce 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -33,6 +33,7 @@
 , readline
 , rpcsvc-proto
 , stdenv
+, substituteAll
 , xhtml1
 , yajl
 , writeScript
@@ -126,6 +127,11 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
+    (substituteAll {
+      src = ./0002-substitute-zfs-and-zpool-commands.patch;
+      zfs = "${zfs}/bin/zfs";
+      zpool = "${zfs}/bin/zpool";
+    })
   ];
 
   # remove some broken tests

From a0f2ca21dabd29e3490075f87c6ce1184a3a623e Mon Sep 17 00:00:00 2001
From: Tako Marks <me@github.tako.mx>
Date: Fri, 16 Sep 2022 21:52:00 +0200
Subject: [PATCH 05/25] libvirtd: add zfs storage driver tests

---
 nixos/tests/libvirtd.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/tests/libvirtd.nix b/nixos/tests/libvirtd.nix
index 1ab082c1e9d1..ce122682da73 100644
--- a/nixos/tests/libvirtd.nix
+++ b/nixos/tests/libvirtd.nix
@@ -12,6 +12,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
 
           libvirtd.enable = true;
         };
+        boot.supportedFilesystems = [ "zfs" ];
+        networking.hostId = "deadbeef"; # needed for zfs
         networking.nameservers = [ "192.168.122.1" ];
         security.polkit.enable = true;
         environment.systemPackages = with pkgs; [ virt-manager ];
@@ -37,6 +39,13 @@ import ./make-test-python.nix ({ pkgs, ... }: {
       virthost.succeed("virsh vol-create-as foo loop0p1 25MB")
       virthost.succeed("virsh vol-create-as foo loop0p2 50MB")
 
+    with subtest("check if virsh zfs pools work"):
+      virthost.succeed("fallocate -l100m /tmp/zfs; losetup /dev/loop1 /tmp/zfs;")
+      virthost.succeed("zpool create zfs_loop /dev/loop1")
+      virthost.succeed("virsh pool-define-as --name zfs_storagepool --source-name zfs_loop --type zfs")
+      virthost.succeed("virsh pool-start zfs_storagepool")
+      virthost.succeed("virsh vol-create-as zfs_storagepool disk1 25MB")
+
     with subtest("check if nixos install iso boots and network works"):
       virthost.succeed(
         "virt-install -n nixos --osinfo=nixos-unstable --ram=1024 --graphics=none --disk=`find ${nixosInstallISO}/iso -type f | head -n1`,readonly=on --import --noautoconsole"

From ccff7afc7968f18357c34f9ab5814f56c118a4ff Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 17 Sep 2022 11:20:46 +0800
Subject: [PATCH 06/25] SDL_compat: 1.2.52 -> 1.2.56

---
 pkgs/development/libraries/SDL_compat/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix
index be88ddd95fd5..d2c9958b9c28 100644
--- a/pkgs/development/libraries/SDL_compat/default.nix
+++ b/pkgs/development/libraries/SDL_compat/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , pkg-config
 , SDL2
@@ -19,25 +18,15 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "SDL_compat";
-  version = "1.2.52";
+  version = "1.2.56";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl12-compat";
     rev = "release-" + version;
-    hash = "sha256-PDGlMI8q74JaqMQ5oX9Zt5CEr7frFQWECbuwq5g25eg=";
+    hash = "sha256-qd+hdJygJ+D2Ult6kmhUJmoPjasOFnBziTI8QtNiclI=";
   };
 
-  patches = optionals stdenv.hostPlatform.isDarwin [
-    # Fix broken install name in dylib, https://github.com/libsdl-org/sdl12-compat/issues/194
-    # Remove when bump > 1.2.52
-    (fetchpatch {
-      name = "SDL_compat-fix-install-name.patch";
-      url = "https://github.com/libsdl-org/sdl12-compat/commit/5642d47ae489f2eb362cece2464ecc466a700ed5.patch";
-      sha256 = "sha256-kQ5H8gXjTZVHHRF6UpgXKl3NIy87iULcc2iCsYt5Hqo=";
-    })
-  ];
-
   nativeBuildInputs = [ cmake pkg-config ];
 
   propagatedBuildInputs = [ SDL2 ]

From 2472a4484e86340246b7a13fff832712126c5899 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 17 Sep 2022 11:20:55 +0800
Subject: [PATCH 07/25] openxcom: fix missing dependency

---
 pkgs/games/openxcom/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 61f209aae4dc..661cf394e523 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , cmake
+, pkg-config
 , libGLU
 , libGL
 , zlib
@@ -25,7 +26,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-APv49ZT94oeM4KVKGtUdoQ1t8Ly8lsocr+FqXiRXbk0=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake pkg-config ];
+
   buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU libGL openssl zlib ];
 
   meta = with lib; {

From 8cb099e355b94cd1fa3264ca94f013eb3f3701fd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 17 Sep 2022 04:20:00 +0000
Subject: [PATCH 08/25] actionlint: 1.6.17 -> 1.6.18

https://github.com/rhysd/actionlint/releases/tag/v1.6.18
---
 pkgs/development/tools/analysis/actionlint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix
index 1eae87f25f26..03a6d1e06c78 100644
--- a/pkgs/development/tools/analysis/actionlint/default.nix
+++ b/pkgs/development/tools/analysis/actionlint/default.nix
@@ -10,7 +10,7 @@
 
 buildGoModule rec {
   pname = "actionlint";
-  version = "1.6.17";
+  version = "1.6.18";
 
   subPackages = [ "cmd/actionlint" ];
 
@@ -18,7 +18,7 @@ buildGoModule rec {
     owner = "rhysd";
     repo = "actionlint";
     rev = "v${version}";
-    sha256 = "sha256-Nt8t+tI4FjNLEo2zEkC7NNVH/hBsxXZmSUqr4KIh1wo=";
+    sha256 = "sha256-tRR7Pjxo4UdKklTMFDRW6Xi81IhH+NV3BbgWpgFd1zY=";
   };
 
   vendorSha256 = "sha256-icl6z41Y5H47U3EgFHL9/xJrfdk43ZfAPbWkKM73sa0=";

From cddc669b0bb16545546b131fcfe8d7d711262bb4 Mon Sep 17 00:00:00 2001
From: Moritz 'e1mo' Fromm <git@e1mo.de>
Date: Sat, 17 Sep 2022 10:31:38 +0200
Subject: [PATCH 09/25] prometheus-xmpp-alerts: Fix build by removing
 unittestCheckHook argument

In #185430 the `unittestCheckHook` argument was introduced, causing the
derivation to fail building since the `unittestCheckHook` is not passed.
However the original PR already used the `unittestCheckHook` from
`python3Packages`.
---
 pkgs/servers/monitoring/prometheus/xmpp-alerts.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
index 437856c0350c..f34d22a5faa8 100644
--- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
+++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
@@ -2,7 +2,6 @@
 , fetchFromGitHub
 , python3Packages
 , prometheus-alertmanager
-, unittestCheckHook
 }:
 
 python3Packages.buildPythonApplication rec {

From eaa981dcdcf2ce3789132ed04cb8d7279854526c Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Sat, 17 Sep 2022 12:21:09 +0100
Subject: [PATCH 10/25] mutt-with-sidebar: remove, mutt provides sidebar

The sidebar patch has been included since 1.7.0 and is enabled by
default in regular mutt. Move mutt-with-sidebar to aliases and let it
provide regular mutt.
---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6abfacc7d726..0df3ba637ae4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -913,6 +913,7 @@ mapAliases ({
   multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08
   mumble_git = pkgs.mumble; # Added 2019-08-01
   murmur_git = pkgs.murmur; # Added 2019-08-01
+  mutt-with-sidebar = mutt; # Added 2022-09-17
   mysql-client = hiPrio mariadb.client;
   mysql = mariadb; # moved from top-level 2021-03-14
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c094df38748b..93f189bb3aa8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29838,9 +29838,7 @@ with pkgs;
 
   mmh = callPackage ../applications/networking/mailreaders/mmh { };
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
-  mutt-with-sidebar = mutt.override {
-    withSidebar = true;
-  };
+
   mutt-wizard = callPackage ../tools/misc/mutt-wizard { };
 
   mutt-ics = callPackage ../tools/networking/mutt-ics { };

From 12cbb4cd549a008a14f654e9f60d047ea4a2d7c0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 17 Sep 2022 15:20:46 +0200
Subject: [PATCH 11/25] python310Packages.pyvicare: 2.16.4 -> 2.17.0

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

diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix
index 7d75cf359d18..7a919bf0ec49 100644
--- a/pkgs/development/python-modules/pyvicare/default.nix
+++ b/pkgs/development/python-modules/pyvicare/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyvicare";
-  version = "2.16.4";
+  version = "2.17.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "somm15";
     repo = "PyViCare";
     rev = version;
-    sha256 = "sha256-RFnQKGISPMrC53yAv3fu7FpbDNugLPQILXCPi5ik2qU=";
+    sha256 = "sha256-MlGohD9W1HNLz6ZPawt55127S3zPSA1tFLNs2gu7hLk=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 8280e0ab55deb655ffeb405f7f05da2aa14b41c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Sep 2022 14:29:22 +0000
Subject: [PATCH 12/25] instaloader: 4.9.3 -> 4.9.4

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

diff --git a/pkgs/tools/misc/instaloader/default.nix b/pkgs/tools/misc/instaloader/default.nix
index ef7e62e263d6..4c3216e26a5c 100644
--- a/pkgs/tools/misc/instaloader/default.nix
+++ b/pkgs/tools/misc/instaloader/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "instaloader";
-  version = "4.9.3";
+  version = "4.9.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "instaloader";
     repo = "instaloader";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-lxfnVqAFlMNjtuqtq2iJ2QwPrWskxNCRIAWEwVGr33s=";
+    sha256 = "sha256-R26+ZvbUs4b5X1+wn6V7K7JqJsP31x7x5HVh+aPi8VU=";
   };
 
   propagatedBuildInputs = [

From 889080f4fd203cd4abfa9d45f4d408d94fb620a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Sep 2022 16:07:08 +0000
Subject: [PATCH 13/25] minio-client: 2022-08-28T20-08-11Z ->
 2022-09-16T09-16-47Z

---
 pkgs/tools/networking/minio-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 8111a0a46aa2..8b11514b1085 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "minio-client";
-  version = "2022-08-28T20-08-11Z";
+  version = "2022-09-16T09-16-47Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "sha256-1Cwvuyy0TRKNnhkpuXdr6ZenDa5pNjsOJA8/sczM22A=";
+    sha256 = "sha256-8oy61ueCXJTV58CxtsB8uiKS5NVaomICu8yQ1wSxl7s=";
   };
 
-  vendorSha256 = "sha256-rGIy+qw+n/WCJ/3rviYjz9uffSP/rcJRvPda+Hm1G3s=";
+  vendorSha256 = "sha256-1jws2is/n3+l7ULTgBfO2glq4l9GzOP5AJ2wwhluQb8=";
 
   subPackages = [ "." ];
 

From 4de579f8c8b192e3a875ae84407076423f56953e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 17 Sep 2022 18:20:04 +0200
Subject: [PATCH 14/25] lnav: 0.10.1 -> 0.11.0

ChangeLog: https://github.com/tstack/lnav/releases/tag/v0.11.0
---
 pkgs/tools/misc/lnav/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix
index d88ea9b750a3..bad9b5a3ceb5 100644
--- a/pkgs/tools/misc/lnav/default.nix
+++ b/pkgs/tools/misc/lnav/default.nix
@@ -15,19 +15,19 @@
 
 stdenv.mkDerivation rec {
   pname = "lnav";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "tstack";
     repo = "lnav";
     rev = "v${version}";
-    sha256 = "sha256-1b4mVKIUotMSK/ADHnpiM42G98JF0abL8sXXGFyS3sw=";
+    sha256 = "sha256-SkaJvIfFKD7xzxm3qnYUltKEpQRNNn6KkRwMP6eWte4=";
   };
 
   patches = [ ./0001-Forcefully-disable-docs-build.patch ];
   postPatch = ''
     substituteInPlace Makefile.am \
-      --replace "SUBDIRS = src test" "SUBDIRS = src"
+      --replace "SUBDIRS = tools src test" "SUBDIRS = tools src"
   '';
 
   enableParallelBuilding = true;

From 59f8ea7f9623f22ffd5bcf10bd1d2d5ecbac4fd1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 17 Sep 2022 19:45:28 +0200
Subject: [PATCH 15/25] element-{web,desktop}: 1.11.4 -> 1.11.5

ChangeLogs:
* https://github.com/vector-im/element-desktop/releases/tag/v1.11.5
* https://github.com/vector-im/element-web/releases/tag/v1.11.5
---
 .../networking/instant-messengers/element/pin.json     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json
index e204b13b90b3..6896b1b41f52 100644
--- a/pkgs/applications/networking/instant-messengers/element/pin.json
+++ b/pkgs/applications/networking/instant-messengers/element/pin.json
@@ -1,7 +1,7 @@
 {
-  "version": "1.11.4",
-  "desktopSrcHash": "lIyx1gpPkuOGzHTbkHKNiGsVKEkKUIz/8sj/KZ9XK9o=",
-  "desktopYarnHash": "0m0zzq2wbk7h7anjmj586089j2qgsd5cj99rmi2hmsmssq63fmwk",
-  "webSrcHash": "bZ5SKydrQE+qLQEZ5qS7F1RC33nHZneUd8OwrV1H2T4=",
-  "webYarnHash": "1yji94xcigz54bbhvssj2pgncw9fgal7mzw9h9bfwmny0pjh8c4p"
+  "version": "1.11.5",
+  "desktopSrcHash": "JbkB+J2KgHcT8rYv8ovC1r325U5NIHo8Wkh0BogLB+w=",
+  "desktopYarnHash": "1bfpd4a0xrlhm7zq2xz5f184mfp6w4glgyfm4r0y3bi06i4my8vc",
+  "webSrcHash": "XOFgJGnQ85bvkqnwke5Hww658bpBXkUspk46cqvf5AY=",
+  "webYarnHash": "0ab49y2xj8cy4ibcckvd6xhhvkv3fa8kwwlmhxvas2racx51wfnh"
 }

From 68fcdc4bc6f3dac1f64a45327eae1a0320b9059a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 17 Sep 2022 20:18:31 +0200
Subject: [PATCH 16/25] python310Packages.pep440: 0.1.1 -> 0.1.2

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

diff --git a/pkgs/development/python-modules/pep440/default.nix b/pkgs/development/python-modules/pep440/default.nix
index 2bb4cdde5d20..ebaade39ce99 100644
--- a/pkgs/development/python-modules/pep440/default.nix
+++ b/pkgs/development/python-modules/pep440/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pep440";
-  version = "0.1.1";
+  version = "0.1.2";
   format = "flit";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-E9F4mHaavQKK8PYnRcnOdfW7mXcBKn1dTInCknLeNO4=";
+    hash = "sha256-WLNyRswrE/7hyio8CSyzcE0h7PYhpb27Fo5E5pf20E0=";
   };
 
   nativeBuildInputs = [
@@ -26,6 +26,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # Don't run CLI tests
+    "tests/test_cli.py"
+  ];
+
   pythonImportsCheck = [
     "pep440"
   ];

From fc05358607f15bb0e4704cf926df66a4b7610baf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Sep 2022 18:19:06 +0000
Subject: [PATCH 17/25] otpauth: 0.4.3 -> 0.5.0

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

diff --git a/pkgs/tools/security/otpauth/default.nix b/pkgs/tools/security/otpauth/default.nix
index 1d93647ed493..b5678dff7d84 100644
--- a/pkgs/tools/security/otpauth/default.nix
+++ b/pkgs/tools/security/otpauth/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "otpauth";
-  version = "0.4.3";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "dim13";
     repo = "otpauth";
     rev = "v${version}";
-    sha256 = "sha256-x5/OVUxuNjK05D8n1l5F6qT/wmrBYnOSEoSL0c0fsqc=";
+    sha256 = "sha256-toFBkUssU10ejoZzWnrm5o2P0p5Oq8kKP4vb2ASDC0s=";
   };
 
   vendorSha256 = "sha256-jnIq7Zc2MauJReJ9a8TeqXXsvHixsBB+znmXAxcpqUQ=";

From 9025c5f406d4f3967191a7a7de65102c4cf0765d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Sep 2022 18:56:45 +0000
Subject: [PATCH 18/25] pocketbase: 0.7.2 -> 0.7.3

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

diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix
index aaacf7ef6891..4d9e18ab895f 100644
--- a/pkgs/servers/pocketbase/default.nix
+++ b/pkgs/servers/pocketbase/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "pocketbase";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-T7gK3UycEUVKKNklLzcH1ST0x4KzqOUGz8zJCimNcjY=";
+    sha256 = "sha256-SWVmcNL/Ye7eLVXIi6wDYabACYLaEaYYH68M6L9JCQI=";
   };
 
   vendorSha256 = "sha256-Ty06TegTT4BILgH0MpnxINxBQMW0zi0ItptHmDqKW1k=";

From ab25e0d3ca02db6f847bf1647ffa464de38f2132 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 17 Sep 2022 21:55:06 +0200
Subject: [PATCH 19/25] python310Packages.aioecowitt: 2022.08.3 -> 2022.09.2

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

diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix
index 02a4ff0e0ede..4c60de1180ec 100644
--- a/pkgs/development/python-modules/aioecowitt/default.nix
+++ b/pkgs/development/python-modules/aioecowitt/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aioecowitt";
-  version = "2022.08.3";
+  version = "2022.09.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-rJcSw0umUVj7kPzc8tUidEWV91wkK19rFJY+Gi/NyH0=";
+    hash = "sha256-U9Qg0kOeqLihw5YAZSy7zk39NKj48nOiwqIlHqffZi0=";
   };
 
   propagatedBuildInputs = [

From 6a149eeef35471de4466820de236af8ab1724db0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 17 Sep 2022 23:28:28 +0200
Subject: [PATCH 20/25] python310Packages.crownstone-sse: 2.0.3 -> 2.0.4

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

diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix
index 2c4226c6a3ef..7bde66a8a37e 100644
--- a/pkgs/development/python-modules/crownstone-sse/default.nix
+++ b/pkgs/development/python-modules/crownstone-sse/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "crownstone-sse";
-  version = "2.0.3";
+  version = "2.0.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "crownstone";
     repo = "crownstone-lib-python-sse";
     rev = version;
-    sha256 = "sha256-O1joOH7HCXYCro26p6foMMpg0UXfOgXD0BXuN50OK7U=";
+    sha256 = "sha256-z/z8MmydHkHubwuX02gGbOcOEZ+FHX4i82vAK5gAl+c=";
   };
 
   propagatedBuildInputs = [

From 01462a9e8b0183759760cef16922365e79f4b2cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Sep 2022 01:18:36 +0000
Subject: [PATCH 21/25] python310Packages.gehomesdk: 0.5.6 -> 0.5.7

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

diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix
index 0acd9b6f104e..d1a9f146db79 100644
--- a/pkgs/development/python-modules/gehomesdk/default.nix
+++ b/pkgs/development/python-modules/gehomesdk/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "gehomesdk";
-  version = "0.5.6";
+  version = "0.5.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-EW26TzmD+F2IkzJkcoUdfYIJ3vkBYQhIFiEqnfDSmiw=";
+    sha256 = "sha256-FmCoryNX1DnqMlGalad5iWO2ZRZwXgWgARQMYlJ6yVo=";
   };
 
   propagatedBuildInputs = [

From 241f31a0a7d9318e56af4a2ecbb10011203760ef Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Tue, 6 Sep 2022 12:09:36 +0200
Subject: [PATCH 22/25] nixos/matrix-synapse: fix link to install instructions

---
 nixos/modules/services/matrix/synapse.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/matrix/synapse.xml b/nixos/modules/services/matrix/synapse.xml
index 65bc53d33ac3..40ad72173a53 100644
--- a/nixos/modules/services/matrix/synapse.xml
+++ b/nixos/modules/services/matrix/synapse.xml
@@ -30,7 +30,7 @@
    synapse server for the <literal>example.org</literal> domain, served from
    the host <literal>myhostname.example.org</literal>. For more information,
    please refer to the
-   <link xlink:href="https://github.com/matrix-org/synapse#synapse-installation">
+   <link xlink:href="https://matrix-org.github.io/synapse/latest/setup/installation.html">
    installation instructions of Synapse </link>.
 <programlisting>
 { pkgs, lib, config, ... }:

From f12d2f016b6c69b702d89cc29eb50567d1088831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vladimir.cunat@nic.cz>
Date: Sun, 18 Sep 2022 08:25:17 +0200
Subject: [PATCH 23/25] bpftools: decouple version from linux_latest

bpftools causes way too many rebuilds nowadays,
so its updates are not suitable for merging directly to nixpkgs master.
We want to update linux_latest faster than that.
---
 pkgs/os-specific/linux/bpftools/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix
index 5a02a1022d59..b042654fede1 100644
--- a/pkgs/os-specific/linux/bpftools/default.nix
+++ b/pkgs/os-specific/linux/bpftools/default.nix
@@ -1,14 +1,19 @@
-{ lib, stdenv
+{ lib, stdenv, fetchurl
 , libopcodes, libopcodes_2_38
 , libbfd, libbfd_2_38
 , elfutils, readline
-, linuxPackages_latest, zlib
+, zlib
 , python3, bison, flex
 }:
 
 stdenv.mkDerivation rec {
   pname = "bpftools";
-  inherit (linuxPackages_latest.kernel) version src;
+  version = "5.19.9";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
+    sha256 = "0dvzjbyknzlx4ndz77fsm6v28fj2chxbq1z85fbc3bckcscbbm8a";
+  };
 
   nativeBuildInputs = [ python3 bison flex ];
   buildInputs = (if (lib.versionAtLeast version "5.20")

From 192b63e2250cf015e3c0cb86f271b9732333fe31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vladimir.cunat@nic.cz>
Date: Sun, 18 Sep 2022 08:26:51 +0200
Subject: [PATCH 24/25] bpftools: revert version to the one that's fully
 rebuilt

That's before 9f80f6bfa96d (PR #191364).
---
 pkgs/os-specific/linux/bpftools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix
index b042654fede1..640ab5f76a96 100644
--- a/pkgs/os-specific/linux/bpftools/default.nix
+++ b/pkgs/os-specific/linux/bpftools/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bpftools";
-  version = "5.19.9";
+  version = "5.19.8";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0dvzjbyknzlx4ndz77fsm6v28fj2chxbq1z85fbc3bckcscbbm8a";
+    sha256 = "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1";
   };
 
   nativeBuildInputs = [ python3 bison flex ];

From 34b08c6c3413bfbbd98453b5b5a298ede27bc084 Mon Sep 17 00:00:00 2001
From: Guanpeng Xu <herberteuler@gmail.com>
Date: Sun, 18 Sep 2022 14:08:51 +0800
Subject: [PATCH 25/25] mathematica: 13.0.1 -> 13.1.0

---
 pkgs/applications/science/math/mathematica/generic.nix  | 4 ++++
 pkgs/applications/science/math/mathematica/versions.nix | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix
index b081640c97d5..f8e6555d7632 100644
--- a/pkgs/applications/science/math/mathematica/generic.nix
+++ b/pkgs/applications/science/math/mathematica/generic.nix
@@ -41,6 +41,8 @@
 , pciutils
 , tre
 , unixODBC
+, xcbutilimage
+, xcbutilkeysyms
 , xkeyboard_config
 , xorg
 , zlib
@@ -94,6 +96,8 @@ in stdenv.mkDerivation {
     pciutils
     tre
     unixODBC
+    xcbutilimage
+    xcbutilkeysyms
     xkeyboard_config
   ] ++ (with xorg; [
     libICE
diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix
index 8f056a234270..225ceb6e3b2d 100644
--- a/pkgs/applications/science/math/mathematica/versions.nix
+++ b/pkgs/applications/science/math/mathematica/versions.nix
@@ -1,6 +1,13 @@
 { lib, requireFile }:
 
 let versions = [
+  {
+    version = "13.1.0";
+    lang = "en";
+    language = "English";
+    sha256 = "sha256-LIpGAJ3uTkZgjc0YykwusyyHQKlCnTvrZGStFfSOz60=";
+    installer = "Mathematica_13.1.0_BNDL_LINUX.sh";
+  }
   {
     version = "13.0.1";
     lang = "en";