From feee7e0357a74ab0510b2d113a3bdede1d509759 Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Tue, 13 Dec 2022 01:37:50 +0000
Subject: [PATCH 01/38] trust-dns: init at 0.22.0

[trust-dns](https://github.com/bluejekyll/trust-dns/) is a Rust-based
DNS client/server/resolver. the server uses .zone files that are largely
compatible with bind. i've had a server deployed to `ns{1,2}.uninsane.org`
for about a week using this derivation: seems to be stable enough for
casual use.

this package also ships a DNS client and a resolver. BIND also ships a
dig-like client but lives in pkgs/servers/dns. so i'm replicating that
convention.
---
 pkgs/servers/dns/trust-dns/default.nix | 33 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/servers/dns/trust-dns/default.nix

diff --git a/pkgs/servers/dns/trust-dns/default.nix b/pkgs/servers/dns/trust-dns/default.nix
new file mode 100644
index 000000000000..de21bdf252c1
--- /dev/null
+++ b/pkgs/servers/dns/trust-dns/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, fetchFromGitHub
+, openssl
+, pkg-config
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "trust-dns";
+  version = "0.22.0";
+
+  src = fetchFromGitHub {
+    owner = "bluejekyll";
+    repo = "trust-dns";
+    rev = "v${version}";
+    sha256 = "sha256-b9tK1JbTwB3ZuRPh0wb3cOFj9dMW7URXIaFzUq0Yipw=";
+  };
+  cargoHash = "sha256-mpobdeTRWJzIEmhwtcM6UE66qRD5ot/0yLeQM6Tec+0=";
+
+  buildInputs = [ openssl ];
+  nativeBuildInputs = [ pkg-config ];
+
+  # tests expect internet connectivity to query real nameservers like 8.8.8.8
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A Rust based DNS client, server, and resolver";
+    homepage = "https://trust-dns.org/";
+    maintainers = with maintainers; [ colinsane ];
+    platforms = platforms.linux;
+    license = with licenses; [ asl20 mit ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c5966cb7eb4..7907ca2a2e2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26079,6 +26079,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  trust-dns = callPackage ../servers/dns/trust-dns { };
+
   tunctl = callPackage ../os-specific/linux/tunctl { };
 
   twa = callPackage ../tools/networking/twa { };

From a53b77bf60fabb5a86586f396bc7e1a95d10f542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com>
Date: Wed, 14 Dec 2022 08:11:09 +0300
Subject: [PATCH 02/38] android-tools: 33.0.3p1 -> 33.0.3p2

---
 pkgs/tools/misc/android-tools/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix
index f8ab129f789b..18d7bf02ed83 100644
--- a/pkgs/tools/misc/android-tools/default.nix
+++ b/pkgs/tools/misc/android-tools/default.nix
@@ -9,21 +9,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "android-tools";
-  version = "33.0.3p1";
+  version = "33.0.3p2";
 
   src = fetchurl {
     url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
-    hash = "sha256-viBHzyVgUWdK9a60u/7SdpiVEvgNEZHihkyRkGH5Ydg=";
+    hash = "sha256-a/a1LXOJ55/JK2PMIGRR7kL8T32naddpIhk+mNdfVgQ=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "add-macos-platform.patch";
-      url = "https://github.com/nmeum/android-tools/commit/a1ab35b31525966e0f0770047cd82accb36d025b.patch";
-      hash = "sha256-6O3ekDf0qPdzcfINFF8Ae4XOYgnQWTBhvu9SCFSHkXY=";
-    })
-  ];
-
   nativeBuildInputs = [ cmake pkg-config perl go ];
   buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ];
   propagatedBuildInputs = [ pythonEnv ];

From 26f9d69af3b1973125d38c03665e8bd8cf7537d7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 18 Jan 2023 02:00:06 +0100
Subject: [PATCH 03/38] openai-whisper: unstable-2022-09-30 -> 20230117

Diff: https://github.com/openai/whisper/compare/refs/tags/vunstable-2022-09-30...v20230117
---
 pkgs/development/python-modules/openai-whisper/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix
index 73327d314af1..2e48666a1be6 100644
--- a/pkgs/development/python-modules/openai-whisper/default.nix
+++ b/pkgs/development/python-modules/openai-whisper/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "whisper";
-  version = "unstable-2022-09-30";
+  version = "20230117";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = pname;
-    rev = "60132ade70e00b843d93542fcb37b58c0d8bf9e7";
-    hash = "sha256-4mhlCvewA0bVo5bq2sbSEKHq99TQ6jUauiCUkdRSdas=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-DVYQw+h5xsgWLA6dD+qg4ud0pqFOn6oVAzTqRywE30g=";
   };
 
   patches = [

From ac5c59f0b210b24a3f5a09d03c1d013877090bc5 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Thu, 19 Jan 2023 22:32:42 +0100
Subject: [PATCH 04/38] AusweisApp2: 1.26.1 -> 1.26.2

https://github.com/Governikus/AusweisApp2/releases/tag/1.26.2
---
 pkgs/applications/misc/ausweisapp2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix
index eb773b3c812e..8758e5fe92f6 100644
--- a/pkgs/applications/misc/ausweisapp2/default.nix
+++ b/pkgs/applications/misc/ausweisapp2/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "AusweisApp2";
-  version = "1.26.1";
+  version = "1.26.2";
 
   src = fetchFromGitHub {
     owner = "Governikus";
     repo = "AusweisApp2";
     rev = version;
-    sha256 = "sha256-Q+ZWnbYH80FMazKB1iSTh9cuYvuPom+qDjMZvC1gUoY=";
+    hash = "sha256-jN4xKgdNO+LyDy+ySM13M5YCaijDq8zAxS+x4Io1ThE=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 1f7c5db15d23a8c5ac6a03a6c9eb4f5b71569e0e Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Fri, 20 Jan 2023 01:10:24 +0100
Subject: [PATCH 05/38] dasel: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix
index d69073d710e8..3f613041ff93 100644
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@@ -5,19 +5,19 @@
 
 buildGoModule rec {
   pname = "dasel";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "TomWright";
     repo = "dasel";
     rev = "v${version}";
-    sha256 = "sha256-7JGafJE9nwZ95bOWUyVw2uWA2LltE9HxolHGYU079to=";
+    sha256 = "sha256-27tQEWnirDhqYt5smRFwADa9wKXSk6yXR8+mXvJVtYI=";
   };
 
   vendorHash = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE=";
 
   ldflags = [
-    "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}"
+    "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}"
   ];
 
   doInstallCheck = true;

From 87cda273e5e865df53eb3c2130f904bb91d43123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 22 Jan 2023 09:50:26 -0800
Subject: [PATCH 06/38] python310Packages.pycaption: 2.1.0 -> 2.1.1

https://github.com/pbs/pycaption/releases/tag/2.1.1
---
 pkgs/development/python-modules/pycaption/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index c9dc3bf8e112..ad1c7c1cec50 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@@ -5,13 +5,14 @@
 , beautifulsoup4
 , lxml
 , cssutils
+, nltk
 , pytest-lazy-fixture
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "pycaption";
-  version = "2.1.0";
+  version = "2.1.1";
 
   disabled = pythonOlder "3.6";
 
@@ -19,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mV//EYdP7wKYD3Vc49z6LQVQeOuhzNKFZLf28RYdABk=";
+    hash = "sha256-B+uIh8WTPPeNVU3yP8FEGc8OinY0MpJb9dHLC+nhi4I=";
   };
 
   propagatedBuildInputs = [
@@ -28,6 +29,10 @@ buildPythonPackage rec {
     cssutils
   ];
 
+  passthru.optional-dependencies = {
+    transcript = [ nltk ];
+  };
+
   nativeCheckInputs = [
     pytest-lazy-fixture
     pytestCheckHook

From 00a6553266333d01236d4ebeaf769a1802c4e85a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 23 Jan 2023 11:59:57 +0800
Subject: [PATCH 07/38] nixos/gnome-documents: remove

We disabled this in gnome module starting from dcbad82
and the package was removed e84c8d6.
---
 nixos/modules/module-list.nix              |  1 -
 nixos/modules/programs/gnome-documents.nix | 54 ----------------------
 nixos/modules/rename.nix                   |  1 +
 3 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 nixos/modules/programs/gnome-documents.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 45a7acdedc41..cccd28d7c3c7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -172,7 +172,6 @@
   ./programs/geary.nix
   ./programs/git.nix
   ./programs/gnome-disks.nix
-  ./programs/gnome-documents.nix
   ./programs/gnome-terminal.nix
   ./programs/gnupg.nix
   ./programs/gpaste.nix
diff --git a/nixos/modules/programs/gnome-documents.nix b/nixos/modules/programs/gnome-documents.nix
deleted file mode 100644
index 2831ac9aff2e..000000000000
--- a/nixos/modules/programs/gnome-documents.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-# GNOME Documents.
-
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-{
-
-  meta = {
-    maintainers = teams.gnome.members;
-  };
-
-  # Added 2019-08-09
-  imports = [
-    (mkRenamedOptionModule
-      [ "services" "gnome" "gnome-documents" "enable" ]
-      [ "programs" "gnome-documents" "enable" ])
-  ];
-
-  ###### interface
-
-  options = {
-
-    programs.gnome-documents = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = lib.mdDoc ''
-          Whether to enable GNOME Documents, a document
-          manager application for GNOME.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.programs.gnome-documents.enable {
-
-    environment.systemPackages = [ pkgs.gnome.gnome-documents ];
-
-    services.dbus.packages = [ pkgs.gnome.gnome-documents ];
-
-    services.gnome.gnome-online-accounts.enable = true;
-
-    services.gnome.gnome-online-miners.enable = true;
-
-  };
-
-}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index d88baac7a5d4..b92561ed4859 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -36,6 +36,7 @@ with lib;
     '')
     (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.")
     (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.")
+    (mkRemovedOptionModule [ "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
       "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))

From c89e19eefed61f165b83eab32c59c046b8099a04 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Mon, 23 Jan 2023 10:55:21 +0100
Subject: [PATCH 08/38] peering-manager: 1.7.3 -> 1.7.4

---
 .../web-apps/peering-manager/default.nix      |  8 +---
 .../peering-manager/redis-unix-sock.patch     | 47 -------------------
 2 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch

diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/servers/web-apps/peering-manager/default.nix
index dd60980e3290..8b6e77ec0f1f 100644
--- a/pkgs/servers/web-apps/peering-manager/default.nix
+++ b/pkgs/servers/web-apps/peering-manager/default.nix
@@ -32,19 +32,15 @@ let
 
 in py.pkgs.buildPythonApplication rec {
   pname = "peering-manager";
-  version = "1.7.3";
+  version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-vrRMdqEpsps4ZKgunMhznJr/TQ9+WVMNYFu76ZU7iMI=";
+    sha256 = "sha256-mXva4c5Rtjq/jFJl3yGGlVrggzGJ3awN0+xoDnDWBSA=";
   };
 
-  patches = [
-    ./redis-unix-sock.patch
-  ];
-
   format = "other";
 
   propagatedBuildInputs = with py.pkgs; [
diff --git a/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch b/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch
deleted file mode 100644
index 5db0d0dd0125..000000000000
--- a/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit 1e64a7f6ca456249305f6a3c90f9acf84af194db
-Author: Yureka <yuka@yuka.dev>
-Date:   Tue Nov 29 14:03:08 2022 +0100
-
-    support unix sockets for redis connections
-
-diff --git a/peering_manager/settings.py b/peering_manager/settings.py
-index 739d6ff..b5edf4d 100644
---- a/peering_manager/settings.py
-+++ b/peering_manager/settings.py
-@@ -270,6 +270,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get("PASSWORD", "")
- TASKS_REDIS_DATABASE = TASKS_REDIS.get("DATABASE", 0)
- TASKS_REDIS_DEFAULT_TIMEOUT = TASKS_REDIS.get("DEFAULT_TIMEOUT", 300)
- TASKS_REDIS_SSL = TASKS_REDIS.get("SSL", False)
-+TASKS_REDIS_UNIX_SOCKET_PATH = TASKS_REDIS.get("UNIX_SOCKET_PATH", "")
- if "DEFAULT_TIMEOUT" in TASKS_REDIS:
-     warnings.warn(
-         "DEFAULT_TIMEOUT is no longer supported under REDIS configuration. Set RQ_DEFAULT_TIMEOUT instead."
-@@ -294,6 +295,7 @@ CACHING_REDIS_PASSWORD = CACHING_REDIS.get("PASSWORD", "")
- CACHING_REDIS_DATABASE = CACHING_REDIS.get("DATABASE", 0)
- CACHING_REDIS_DEFAULT_TIMEOUT = CACHING_REDIS.get("DEFAULT_TIMEOUT", 300)
- CACHING_REDIS_SSL = CACHING_REDIS.get("SSL", False)
-+CACHING_REDIS_UNIX_SOCKET_PATH = CACHING_REDIS.get("UNIX_SOCKET_PATH", "")
- 
- if CACHING_REDIS_USING_SENTINEL:
-     CACHEOPS_SENTINEL = {
-@@ -301,6 +303,8 @@ if CACHING_REDIS_USING_SENTINEL:
-         "service_name": CACHING_REDIS_SENTINEL_SERVICE,
-         "db": CACHING_REDIS_DATABASE,
-     }
-+elif CACHING_REDIS_UNIX_SOCKET_PATH != "":
-+    CACHEOPS_REDIS = f"unix://{CACHING_REDIS_UNIX_SOCKET_PATH}?db={CACHING_REDIS_DATABASE}"
- else:
-     REDIS_CACHE_CON_STRING = "rediss://" if CACHING_REDIS_SSL else "redis://"
-     if CACHING_REDIS_PASSWORD:
-@@ -334,6 +338,11 @@ if TASKS_REDIS_USING_SENTINEL:
-         "SOCKET_TIMEOUT": None,
-         "CONNECTION_KWARGS": {"socket_connect_timeout": TASKS_REDIS_DEFAULT_TIMEOUT},
-     }
-+elif TASKS_REDIS_UNIX_SOCKET_PATH != "":
-+    RQ_PARAMS = {
-+        "UNIX_SOCKET_PATH": TASKS_REDIS_UNIX_SOCKET_PATH,
-+        "DB": TASKS_REDIS_DATABASE,
-+    }
- else:
-     RQ_PARAMS = {
-         "HOST": TASKS_REDIS_HOST,

From 3cde183232d75b8b1c286dc44c934cb55bafab18 Mon Sep 17 00:00:00 2001
From: deinferno <14363193+deinferno@users.noreply.github.com>
Date: Mon, 23 Jan 2023 20:11:07 +0500
Subject: [PATCH 09/38] autorandr: 1.13.1 -> 1.13.2

---
 pkgs/tools/misc/autorandr/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index bffb09c098da..85808e43c49c 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -4,14 +4,15 @@
 , fetchFromGitHub
 , systemd
 , xrandr
-, installShellFiles }:
+, installShellFiles
+, desktop-file-utils }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "autorandr";
-  version = "1.13.1";
+  version = "1.13.2";
   format = "other";
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [ installShellFiles desktop-file-utils ];
   propagatedBuildInputs = [ python3Packages.packaging ];
 
   buildPhase = ''
@@ -59,7 +60,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "phillipberndt";
     repo = "autorandr";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-702x4O0rHW/VZIfu1+5G1gBSDQYVoAx167igz/M3Ea4=";
+    sha256 = "sha256-Yn950V7DgLhwYSoGyUvjTH0Vwg/FodxhKsBP5iLTgqA=";
   };
 
   meta = with lib; {

From bf58eaf728fce6092ab1b9dc2391be23cbcc0618 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 23 Jan 2023 16:35:14 -0500
Subject: [PATCH 10/38] hck: 0.7.5 -> 0.8.2

Diff: https://github.com/sstadick/hck/compare/v0.7.5...v0.8.2

Changelog: https://github.com/sstadick/hck/blob/v0.8.2/CHANGELOG.md
---
 pkgs/tools/text/hck/default.nix | 13 +++++++------
 pkgs/top-level/all-packages.nix |  4 +---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/text/hck/default.nix b/pkgs/tools/text/hck/default.nix
index a888e7655241..c94580588056 100644
--- a/pkgs/tools/text/hck/default.nix
+++ b/pkgs/tools/text/hck/default.nix
@@ -3,26 +3,27 @@
 , fetchFromGitHub
 , cmake
 , stdenv
-, CoreFoundation
-, Security
+, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "hck";
-  version = "0.7.5";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "sstadick";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-29uxcbqAnWCdxKqVdrMVtorXvSLUC+jlt4YwE19Gh+A=";
+    sha256 = "sha256-66wunZuRAJ6QVWgBUy2+HGaow33F5+16LitGSQC4kCE=";
   };
 
-  cargoSha256 = "sha256-VHuzv6Zq83byXDEEyYDtlaPC4DZ3GNJaJfO0ACrrqO8=";
+  cargoSha256 = "sha256-4CAj94wm9qxr9wejD2ffKSdRV1UeofMhxNxLi++At+I=";
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
 
   # link System as a dylib instead of a framework on macos
   postPatch = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d7229e7d07b..2912b9ff2ded 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37205,9 +37205,7 @@ with pkgs;
 
   gummy = callPackage ../tools/misc/gummy { };
 
-  hck = callPackage ../tools/text/hck {
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
-  };
+  hck = callPackage ../tools/text/hck { };
 
   helm = callPackage ../applications/audio/helm { };
 

From 25b73ca0bac9c866060531dbee84f8caf2239d23 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Tue, 24 Jan 2023 09:00:10 +0000
Subject: [PATCH 11/38] protoscope: unstable-2022-10-04 -> unstable-2022-11-09

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

diff --git a/pkgs/development/tools/protoscope/default.nix b/pkgs/development/tools/protoscope/default.nix
index 12c120196f23..70eeab5f1575 100644
--- a/pkgs/development/tools/protoscope/default.nix
+++ b/pkgs/development/tools/protoscope/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "protoscope";
-  version = "unstable-2022-10-04";
+  version = "unstable-2022-11-09";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protoscope";
-    rev = "8b1d63939ee1a5d922b38f3976e1e58cae525163";
-    sha256 = "sha256-/vt02rvKVsryJZ+Bw4QLaGzDErGI04/4NUbSBkbbN3Y=";
+    rev = "8e7a6aafa2c9958527b1e0747e66e1bfff045819";
+    hash = "sha256-+VIy+CD6bKJzwtpHXRr9MqmsPE2MJ1dRdtvSMUkCh5I=";
   };
 
-  vendorSha256 = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik=";
+  vendorHash = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik=";
 
   ldflags = [ "-s" "-w" ];
 

From bdcb0559d05344f7a5383e4dc59abd34d97f31c1 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Thu, 19 Jan 2023 08:58:43 +0000
Subject: [PATCH 12/38] txtpbfmt: unstable-2022-06-08 -> unstable-2023-01-18

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

diff --git a/pkgs/development/tools/txtpbfmt/default.nix b/pkgs/development/tools/txtpbfmt/default.nix
index 3f1c9eab0475..a4e26cfb4cb6 100644
--- a/pkgs/development/tools/txtpbfmt/default.nix
+++ b/pkgs/development/tools/txtpbfmt/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "txtpbfmt";
-  version = "unstable-2022-06-08";
+  version = "unstable-2023-01-18";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "txtpbfmt";
-    rev = "fc78c767cd6a4e6e3953f5d72f1e0e4c5811990b";
-    sha256 = "sha256-5Pj2REFrzWCzrqdplNlyfX+sJqPjXEld6MFNy0S3MFM=";
+    rev = "fcc1fa29197ce17bc56812f84f5ff311f767fcd1";
+    hash = "sha256-U+Kk2tQw+rJX7Xa8b5Hd7x0xY/6PN6TTYsLJkpB1Osg=";
   };
 
-  vendorSha256 = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g=";
+  vendorHash = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g=";
 
   ldflags = [ "-s" "-w" ];
 

From 3f21979fb1a04b5aff86cf1fc60d880e334130a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Jan 2023 09:30:48 +0000
Subject: [PATCH 13/38] rasdaemon: 0.6.8 -> 0.7.0

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

diff --git a/pkgs/os-specific/linux/rasdaemon/default.nix b/pkgs/os-specific/linux/rasdaemon/default.nix
index cccd91fff8e1..35201d49b7f0 100644
--- a/pkgs/os-specific/linux/rasdaemon/default.nix
+++ b/pkgs/os-specific/linux/rasdaemon/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rasdaemon";
-  version = "0.6.8";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "mchehab";
     repo = "rasdaemon";
     rev = "v${version}";
-    sha256 = "sha256-gcwoc9lIJyqUiCSAHf1U8geLG58CxzjMFYFl8moaA2Q=";
+    sha256 = "sha256-oLwR+bNgKceVgLTOLYiKHNUkRmLouaQshdp/8UJnfqg=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From ea0e8794bd4dd6a22419614ca4d04b73a3714b95 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Fri, 20 Jan 2023 13:16:01 -0500
Subject: [PATCH 14/38] dqlite: add adamcstephens as maintainer

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

diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
index 07d753dd8333..ef1d0a1fab10 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://dqlite.io/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ joko ];
+    maintainers = with maintainers; [ joko adamcstephens ];
     platforms = platforms.linux;
   };
 }

From dfd1bf80ad829c05537a9f3909c10b87c26f9515 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Fri, 20 Jan 2023 13:16:29 -0500
Subject: [PATCH 15/38] dqlite: 1.9.0 -> 1.13.0

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

diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
index ef1d0a1fab10..331fe93e90de 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dqlite";
-  version = "1.9.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "0zalsvr0vy7632nhm96a29lrfy18iqsmbxpyz2lvq80mrjlbrzsn";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-KVQa11gw/8h3Be+52V44W2M+fd7sB35emrS/aUEUGl0=";
   };
 
   nativeBuildInputs = [ autoreconfHook file pkg-config ];

From 37cab2f8e793e2038ea6019d5787482b09f01a37 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 24 Jan 2023 10:26:00 -0500
Subject: [PATCH 16/38] panamax: 1.0.3 -> 1.0.6

---
 .../tools/rust/panamax/default.nix            | 25 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  4 +--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix
index 0d040afd421d..6dd1d5e32bd8 100644
--- a/pkgs/development/tools/rust/panamax/default.nix
+++ b/pkgs/development/tools/rust/panamax/default.nix
@@ -1,19 +1,34 @@
-{ lib, rustPlatform, fetchCrate, pkg-config, openssl, stdenv, Security }:
+{ lib
+, rustPlatform
+, fetchCrate
+, pkg-config
+, libgit2
+, openssl
+, zlib
+, stdenv
+, darwin
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "panamax";
-  version = "1.0.3";
+  version = "1.0.6";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-w4waFdzd/Ps0whOp39QLBE/YF2eyc4t2Ili7FskUt1M=";
+    sha256 = "sha256-/JW2QB5PtwKo0TLU/QmkgsE6/ne+51EVmWyGn7Lljdw=";
   };
 
-  cargoSha256 = "sha256-52snmkTFHI26xJo9qJkmqh1M5lLzhDxw8WT6uFd57aw=";
+  cargoSha256 = "sha256-aKdDismdPcExqznS6S2LvAij6gv9/Hw2FBvkhr9rJGo=";
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
+  buildInputs = [
+    libgit2
+    openssl
+    zlib
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
 
   meta = with lib; {
     description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71d2342c0224..f08278b93d2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15719,9 +15719,7 @@ with pkgs;
   maturin = callPackage ../development/tools/rust/maturin {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  panamax = callPackage ../development/tools/rust/panamax {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  panamax = callPackage ../development/tools/rust/panamax { };
 
   ograc = callPackage ../development/tools/rust/ograc { };
 

From 6fe502f5bc5f8577ebd2401a32fdfe2d55a9b046 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 24 Jan 2023 16:48:59 +0100
Subject: [PATCH 17/38] flexoptix-app: 5.13.1 -> 5.13.3

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

diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix
index b7318c119dac..50f51cfd7119 100644
--- a/pkgs/tools/misc/flexoptix-app/default.nix
+++ b/pkgs/tools/misc/flexoptix-app/default.nix
@@ -1,11 +1,11 @@
 { lib, appimageTools, fetchurl, nodePackages }: let
   pname = "flexoptix-app";
-  version = "5.13.1";
+  version = "5.13.3";
 
   src = fetchurl {
     name = "${pname}-${version}.AppImage";
     url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
-    hash = "sha256-+rHktjZd6P4JGYRhEXdZYVI64XMYc7cBGojAQNd8Mq8=";
+    hash = "sha256-kDw9+Llqvq4NgN89Cw/HwEqYlv42wLbho1eHjI6wVSQ=";
   };
 
   udevRules = fetchurl {

From 9cf3592d15d148df8f9674bcc1857f10d051e908 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 24 Jan 2023 23:44:19 +0800
Subject: [PATCH 18/38] pantheon.elementary-mail: try-catch GLib.Uri.parse

By using a merged patch.
---
 pkgs/desktops/pantheon/apps/elementary-mail/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
index c984824a8c52..31cf6d12eb89 100644
--- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
     # build: support webkit2gtk-4.1
     # https://github.com/elementary/mail/pull/794
     (fetchpatch {
-      url = "https://github.com/elementary/mail/commit/7d4878543b27251664852c708d54abc1e4580eab.patch";
-      sha256 = "sha256-yl6Bzjinp+ti/aX+t22GibGeQFtharZNk3MmbuJm0Tk=";
+      url = "https://github.com/elementary/mail/commit/9e6eb73a8420c9bf327e59c25e7e6d8fa87d480a.patch";
+      sha256 = "sha256-idkVymePLa7vgfuou0HIrbWRCaWAgZliDcp4HyZBArs=";
     })
   ];
 

From 4197cbd946e6dbe6067d0fbc7dc70a46a297ffac Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 24 Jan 2023 23:47:11 +0800
Subject: [PATCH 19/38] pantheon.switchboard-plug-onlineaccounts: try-catch
 GLib.Uri.parse

By using a merged patch.
---
 .../apps/switchboard-plugs/onlineaccounts/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index 52c92888f97f..11268ab814b4 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -28,10 +28,10 @@ stdenv.mkDerivation rec {
 
   patches = [
     # build: support evolution-data-server 3.45
-    # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/244
+    # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/248
     (fetchpatch {
-      url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch";
-      sha256 = "sha256-C7woN4shPrVlSWZeW0Fz+xFi5CTQd2K5BsF5YeI9x0Y=";
+      url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/08faf7b4241547b7900596af12a03d816712a808.patch";
+      sha256 = "sha256-QLe+NPHuo3hLM9n1f4hT5IK4nkWtYSe91L1wVSBzw6k=";
     })
   ];
 

From 18fc8858b740b00554ef6b916ff0b7c21e49a21a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Jan 2023 18:04:46 +0100
Subject: [PATCH 20/38] python310Packages.pip-tools: update format

---
 pkgs/development/python-modules/pip-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 48818a594059..406378adddd9 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -17,7 +17,7 @@
 buildPythonPackage rec {
   pname = "pip-tools";
   version = "6.12.1";
-  format = "setuptools";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 

From 61eba16e9a8bec2702ec2d4a39eb30a3e741a22e Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alexander.sieg@cyberus-technology.de>
Date: Tue, 24 Jan 2023 18:06:52 +0100
Subject: [PATCH 21/38] bibata-extra-cursors: mark as broken

Project is unable to be build with clickgen version 2.x and upstream
archived it on Nov 9, 2022.
---
 pkgs/data/icons/bibata-cursors/extra.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix
index 15a746eabffb..ed9a70a6d321 100644
--- a/pkgs/data/icons/bibata-cursors/extra.nix
+++ b/pkgs/data/icons/bibata-cursors/extra.nix
@@ -50,5 +50,7 @@ stdenvNoCC.mkDerivation rec {
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ dtzWill AdsonCicilioti ];
+    # unmaintained as of Nov 9, 2022. unable to be build with clickgen version 2.x
+    broken = true;
   };
 }

From 2c3e1e15271759534b7b4a8d569c93fb2fe5c1ba Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Jan 2023 18:12:11 +0100
Subject: [PATCH 22/38] python310Packages.particle: add changelog to meta

---
 .../python-modules/particle/default.nix       | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix
index 1564a4c21761..42896aeb0e60 100644
--- a/pkgs/development/python-modules/particle/default.nix
+++ b/pkgs/development/python-modules/particle/default.nix
@@ -19,6 +19,7 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "sha256-SDdIg05+gfLNaQ+glitTf3Z/6K9HBci62mjIu9rIoX0=";
   };
+
   nativeBuildInputs = [
     setuptools-scm
   ];
@@ -29,6 +30,12 @@ buildPythonPackage rec {
     hepunits
   ];
 
+  nativeCheckInputs = [
+    pytestCheckHook
+    tabulate
+    pandas
+  ];
+
   pythonImportsCheck = [
     "particle"
   ];
@@ -41,16 +48,13 @@ buildPythonPackage rec {
     rm tests/particle/test_performance.py
   '';
 
-  nativeCheckInputs = [
-    pytestCheckHook
-    tabulate
-    pandas
-  ];
 
-  meta = {
-    description = "Package to deal with particles, the PDG particle data table, PDGIDs, etc.";
+
+  meta = with lib; {
+    description = "Package to deal with particles, the PDG particle data table and others";
     homepage = "https://github.com/scikit-hep/particle";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ doronbehar ];
+    changelog = "https://github.com/scikit-hep/particle/releases/tag/v${version}";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ doronbehar ];
   };
 }

From d737af5de8759fc835e54b339bed703cb1198856 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Jan 2023 18:18:47 +0100
Subject: [PATCH 23/38] python310Packages.particle: 0.21.0 -> 0.21.1

Changelog: https://github.com/scikit-hep/particle/releases/tag/v0.21.1
---
 .../python-modules/particle/default.nix       | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix
index 42896aeb0e60..aaa62ada8ba3 100644
--- a/pkgs/development/python-modules/particle/default.nix
+++ b/pkgs/development/python-modules/particle/default.nix
@@ -1,32 +1,44 @@
 { lib
+, attrs
 , buildPythonPackage
 , fetchFromGitHub
 , fetchPypi
-, setuptools-scm
-, attrs
-, deprecated
+, hatch-vcs
+, hatchling
 , hepunits
-, pytestCheckHook
-, tabulate
 , pandas
+, pytestCheckHook
+, pythonOlder
+, setuptools-scm
+, tabulate
 }:
 
 buildPythonPackage rec {
   pname = "particle";
-  version = "0.21.0";
+  version = "0.21.1";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-SDdIg05+gfLNaQ+glitTf3Z/6K9HBci62mjIu9rIoX0=";
+    hash = "sha256-Mw9IVQoXZU8ByU6OI2Wtmo3PJuVz6KzzH7I+pPYkssQ=";
   };
 
+  postPatch = ''
+    # Disable benchmark tests, so we won't need pytest-benchmark and pytest-cov
+    # as dependencies
+    substituteInPlace pyproject.toml \
+      --replace '"--benchmark-disable",' ""
+  '';
+
   nativeBuildInputs = [
-    setuptools-scm
+    hatch-vcs
+    hatchling
   ];
 
   propagatedBuildInputs = [
     attrs
-    deprecated
     hepunits
   ];
 
@@ -40,15 +52,9 @@ buildPythonPackage rec {
     "particle"
   ];
 
-  preCheck = ''
-    # Disable benchmark tests, so we won't need pytest-benchmark and pytest-cov
-    # as dependencies
-    substituteInPlace pyproject.toml \
-      --replace '"--benchmark-disable", ' ""
-    rm tests/particle/test_performance.py
-  '';
-
-
+  disabledTestPaths = [
+    "tests/particle/test_performance.py"
+  ];
 
   meta = with lib; {
     description = "Package to deal with particles, the PDG particle data table and others";

From 12b6fb8670331848b490a40ef606dba0dc4528e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Jan 2023 19:53:15 +0100
Subject: [PATCH 24/38] python310Packages.python-redis-lock: adjust inputs

---
 .../python-redis-lock/default.nix             | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix
index 263e01bafd78..103349f7b65f 100644
--- a/pkgs/development/python-modules/python-redis-lock/default.nix
+++ b/pkgs/development/python-modules/python-redis-lock/default.nix
@@ -1,28 +1,39 @@
 { lib
 , stdenv
 , buildPythonPackage
+, eventlet
 , fetchPypi
-, redis
-, pytestCheckHook
-, process-tests
+, gevent
 , pkgs
-, withDjango ? false, django-redis
+, process-tests
+, pytestCheckHook
+, pythonOlder
+, redis
+, withDjango ? false
+, django-redis
 }:
 
 buildPythonPackage rec {
   pname = "python-redis-lock";
   version = "4.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo=";
+    hash = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo=";
   };
 
   propagatedBuildInputs = [
     redis
-  ] ++ lib.optional withDjango django-redis;
+  ] ++ lib.optional withDjango [
+    django-redis
+  ];
 
   nativeCheckInputs = [
+    eventlet
+    gevent
     pytestCheckHook
     process-tests
     pkgs.redis
@@ -37,10 +48,15 @@ buildPythonPackage rec {
     "test_reset_all_signalizes"
   ];
 
+  pythonImportsCheck = [
+    "redis_lock"
+  ];
+
   meta = with lib; {
+    changelog = "https://github.com/ionelmc/python-redis-lock/blob/v${version}/CHANGELOG.rst";
+    description = "Lock context manager implemented via redis SETNX/BLPOP";
     homepage = "https://github.com/ionelmc/python-redis-lock";
     license = licenses.bsd2;
-    description = "Lock context manager implemented via redis SETNX/BLPOP";
     maintainers = with maintainers; [ vanschelven ];
   };
 }

From c73fbbd79ee5875eea13d80b1cae00f6e8db44e3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Jan 2023 20:45:14 +0100
Subject: [PATCH 25/38] python310Packages.python-stdnum: add changelog to meta

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

diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix
index 14efde9224b5..1ed3ffd6649b 100644
--- a/pkgs/development/python-modules/python-stdnum/default.nix
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@@ -28,6 +28,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module to handle standardized numbers and codes";
     homepage = "https://arthurdejong.org/python-stdnum/";
+    changelog = "https://github.com/arthurdejong/python-stdnum/blob/${version}/ChangeLog";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ johbo ];
   };

From 3c86e6f249181d80c53fa5ca1db974523ffcfb77 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Jan 2023 20:49:02 +0100
Subject: [PATCH 26/38] python310Packages.python-stdnum: remove coverage

- add optional-dependencies
---
 .../python-modules/python-stdnum/default.nix         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix
index 1ed3ffd6649b..19142bc13fb8 100644
--- a/pkgs/development/python-modules/python-stdnum/default.nix
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , pytestCheckHook
 , pythonOlder
+, zeep
 }:
 
 buildPythonPackage rec {
@@ -17,10 +18,21 @@ buildPythonPackage rec {
     hash = "sha256-vMdj2cSa4j2l0remhtX9He7J2QUTQRYKENGscjomvsA=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace " --cov=stdnum --cov-report=term-missing:skip-covered --cov-report=html" ""
+  '';
+
   nativeCheckInputs = [
     pytestCheckHook
   ];
 
+  passthru.optional-dependencies = {
+    SOAP = [
+      zeep
+    ];
+  };
+
   pythonImportsCheck = [
     "stdnum"
   ];

From 46faa4a1731027411b4b4f6c78e406493a27296b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Jan 2023 20:26:56 +0000
Subject: [PATCH 27/38] python310Packages.google-cloud-error-reporting: 1.8.0
 -> 1.8.1

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

diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
index e0b495b92af6..5a062f4a85c2 100644
--- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
+++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-error-reporting";
-  version = "1.8.0";
+  version = "1.8.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XFOgoe6xphHyp/zbd+RR+9dXebMcU7/c2ETFGy+lg3U=";
+    hash = "sha256-Xl+Jc05daQZPh4xggf/JYYlJ5Lx6LafqWhMcVdk/r6o=";
   };
 
   propagatedBuildInputs = [

From 18616e4869ceb28021515f2942ad9d944cc3ec57 Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Tue, 24 Jan 2023 13:09:06 -0800
Subject: [PATCH 28/38] parsec-bin: 150_28 -> 150_86e

---
 pkgs/applications/misc/parsec/bin.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix
index b15ee2644a74..7aae31152f7f 100644
--- a/pkgs/applications/misc/parsec/bin.nix
+++ b/pkgs/applications/misc/parsec/bin.nix
@@ -12,11 +12,11 @@
 
 stdenvNoCC.mkDerivation {
   pname = "parsec-bin";
-  version = "150_28";
+  version = "150_86e";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20220622215230id_/https://builds.parsecgaming.com/package/parsec-linux.deb";
-    sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc";
+    url = "https://web.archive.org/web/20230124210253/https://builds.parsecgaming.com/package/parsec-linux.deb";
+    sha256 = "sha256-wwBy86TdrHaH9ia40yh24yd5G84WTXREihR+9I6o6uU=";
   };
 
   unpackPhase = ''
@@ -76,6 +76,7 @@ stdenvNoCC.mkDerivation {
 
   meta = with lib; {
     homepage = "https://parsecgaming.com/";
+    changelog = "https://parsec.app/changelog";
     description = "Remote streaming service client";
     license = licenses.unfree;
     maintainers = with maintainers; [ arcnmx ];

From 9064fe2bd099d49818295f38a6d245b6151bae4f Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 24 Jan 2023 18:03:08 -0500
Subject: [PATCH 29/38] cargo-semver-checks: 0.15.2 -> 0.16.2

Diff: https://github.com/obi1kenobi/cargo-semver-checks/compare/v0.15.2...v0.16.2
---
 pkgs/development/tools/rust/cargo-semver-checks/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix
index 30fda10323eb..71a340564343 100644
--- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix
+++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-semver-checks";
-  version = "0.15.2";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "obi1kenobi";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-+YRyShALdDQDfh5XDY36R29SzbBjlT8mCIucwJ++KrQ=";
+    sha256 = "sha256-2t3LWb2oeCYDAePXX1YuIN0o4LLEL58Hxt/1sNeuD3M=";
   };
 
-  cargoSha256 = "sha256-wwsFqoQXasCKfnCBF4qGFIoD7Kj53K9IKQ1auuqTPAM=";
+  cargoSha256 = "sha256-K+eLQ7zGEGkh4vMABWucY/Ho2id/afwl4FSo5+Ca1Ec=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 5fd6c8467bcb2340e9e8490ddfc7541e033755ea Mon Sep 17 00:00:00 2001
From: John Shaffer <jdsha@proton.me>
Date: Tue, 24 Jan 2023 18:41:42 -0600
Subject: [PATCH 30/38] srvc: 0.10.1 -> 0.13.0

---
 pkgs/applications/version-management/srvc/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix
index 763c60f654bb..cba7be953173 100644
--- a/pkgs/applications/version-management/srvc/default.nix
+++ b/pkgs/applications/version-management/srvc/default.nix
@@ -1,23 +1,23 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, webfs }:
+{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, git }:
 
 rustPlatform.buildRustPackage rec {
   pname = "srvc";
-  version = "0.10.1";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "insilica";
     repo = "rs-srvc";
     rev = "v${version}";
-    sha256 = "sha256-yeyAorVMHFl9wm57gmK6ZAI1w5daN2xl29Gqq0DsTtc=";
+    sha256 = "sha256-m4mN+vDEKPHRavtI9CbszOOdJcLYa+XqlzEyPvPXE0g=";
   };
 
-  cargoHash = "sha256-/1TL0lWb4I9h6nGV7exx7U6ACrieN0EULTWg7Weexeg=";
+  cargoHash = "sha256-USOYXb6/hEE9HVz5YcNZPY5yuvDxbrH4YyZxY7XNAto=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     Security
   ];
 
-  nativeCheckInputs = [ webfs ];
+  nativeCheckInputs = [ git ];
 
   # remove timeouts in tests to make them less flaky
   TEST_SRVC_DISABLE_TIMEOUT = 1;

From a2aee0de1e62cf4f9b9a3df0c143413a251277c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Jan 2023 02:14:16 +0000
Subject: [PATCH 31/38] python310Packages.whois: 0.9.23 -> 0.9.24

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

diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix
index 78368377fac4..7ec9251eb0ee 100644
--- a/pkgs/development/python-modules/whois/default.nix
+++ b/pkgs/development/python-modules/whois/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "whois";
-  version = "0.9.23";
+  version = "0.9.24";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "DannyCork";
     repo = "python-whois";
     rev = "refs/tags/${version}";
-    hash = "sha256-HYzCdWX0gz1W73ZPlrdt+kqUPbBRrDnkGJE56nQ3UVc=";
+    hash = "sha256-DxjfRBJh/qLafxXN2VcXHTWuajDg6lvmJ5U86Na3L5g=";
   };
 
   propagatedBuildInputs = [

From c72d62afa2defef10e44bc4f679e56bda01ece34 Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 25 Jan 2023 10:48:59 +0800
Subject: [PATCH 32/38] trashy: 1.0.3 -> 2.0.0

---
 pkgs/tools/misc/trashy/default.nix        | 10 +++++++---
 pkgs/tools/misc/trashy/lock-version.patch | 13 +++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/misc/trashy/lock-version.patch

diff --git a/pkgs/tools/misc/trashy/default.nix b/pkgs/tools/misc/trashy/default.nix
index 7d3b3952a7ca..fb42a886fee5 100644
--- a/pkgs/tools/misc/trashy/default.nix
+++ b/pkgs/tools/misc/trashy/default.nix
@@ -2,16 +2,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "trashy";
-  version = "1.0.3";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "oberblastmeister";
     repo = "trashy";
     rev = "v${version}";
-    sha256 = "sha256-b50Q7knJzXKDfM1kw6wLvXunhgOXVs+zYvZx/NYqMdk=";
+    sha256 = "sha256-xYSk0M8oNwbwZbKWDXMQlnt7vKi0p3+2Tr4eXCvtHEM=";
   };
 
-  cargoSha256 = "sha256-2hNNLXuAHd1bquhHimniqryTVMfBmPAOossggICScqQ=";
+  cargoSha256 = "sha256-ZWqWtWzb+CLH1ravBb/oV+aPxplEyiC1wEFhvchcLqg=";
+
+  # this patch must be removed after oberblastmeister/trashy#70 is solved or new
+  # version is released.
+  cargoPatches = [ ./lock-version.patch ];
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/tools/misc/trashy/lock-version.patch b/pkgs/tools/misc/trashy/lock-version.patch
new file mode 100644
index 000000000000..3e95a3fbfdda
--- /dev/null
+++ b/pkgs/tools/misc/trashy/lock-version.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 7af0268..dc197a0 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -889,7 +889,7 @@ dependencies = [
+ 
+ [[package]]
+ name = "trashy"
+-version = "1.0.3"
++version = "2.0.0"
+ dependencies = [
+  "aho-corasick",
+  "ansi_term",

From 52351987d61583ad150dc63a4e0ca08d62b45f96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Jan 2023 02:52:21 +0000
Subject: [PATCH 33/38] treesheets: unstable-2023-01-20 -> unstable-2023-01-23

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

diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
index 926e97af80b3..5566906919a8 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "treesheets";
-  version = "unstable-2023-01-20";
+  version = "unstable-2023-01-23";
 
   src = fetchFromGitHub {
     owner = "aardappel";
     repo = "treesheets";
-    rev = "4d48bbe730b19963efeb3bb6f59e92aa3968b229";
-    sha256 = "03REE7/jn1uuU89DKkGD1QqqzOt+DR6qmoyyaf8042c=";
+    rev = "f676cba7f9749825744ec705ee58b9fbea47db51";
+    sha256 = "Zx1fGicCuX+HJm2QFSYQhcd9Ibg3qj5h9NPlSNNVLag=";
   };
 
   nativeBuildInputs = [

From 61202db804d52d24aa2edcd82ed4bca4244f4729 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 24 Jan 2023 22:02:59 -0500
Subject: [PATCH 34/38] cargo-hack: 0.5.26 -> 0.5.27

Changelog: https://github.com/taiki-e/cargo-hack/blob/v0.5.27/CHANGELOG.md
---
 pkgs/development/tools/rust/cargo-hack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix
index a63af2476557..61bc71374870 100644
--- a/pkgs/development/tools/rust/cargo-hack/default.nix
+++ b/pkgs/development/tools/rust/cargo-hack/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-hack";
-  version = "0.5.26";
+  version = "0.5.27";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-ZVR3bycEWpOV4T/85OsERNjKooz2rwBF5kMSEfHnmEI=";
+    sha256 = "sha256-oiCZiwJr1BqMCWCNUOTQT3XPX0QZRr0wLewf8OU6lHA=";
   };
 
-  cargoSha256 = "sha256-4TChr6dKxUerpuaX63WShrWyXTLH4m85P6E30a5rmH8=";
+  cargoSha256 = "sha256-g5O51V4BPNqzsQo1prLIpamqwcOy+SJat2Rb5UDHRLc=";
 
   # some necessary files are absent in the crate version
   doCheck = false;

From 91bd7af0a516c39d07f0de5dcf753a641486b2e6 Mon Sep 17 00:00:00 2001
From: 360ied <19516527+360ied@users.noreply.github.com>
Date: Tue, 24 Jan 2023 22:23:07 -0500
Subject: [PATCH 35/38] classicube: 1.3.4 -> 1.3.5

changelog: https://github.com/UnknownShadow200/ClassiCube/releases/tag/1.3.5

changes in nixpkgs build:
- skins work again
- build no longer use SDL2 (libXi no longer has problems now)
---
 pkgs/games/classicube/default.nix       | 13 +++++--------
 pkgs/games/classicube/fix-linking.patch |  2 +-
 pkgs/games/classicube/use-sdl.patch     | 13 -------------
 3 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/games/classicube/use-sdl.patch

diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix
index 06c914e56f1b..ec2490196abb 100644
--- a/pkgs/games/classicube/default.nix
+++ b/pkgs/games/classicube/default.nix
@@ -5,7 +5,8 @@
 , makeWrapper
 , makeDesktopItem
 , copyDesktopItems
-, SDL2
+, libX11
+, libXi
 , libGL
 , curl
 , openal
@@ -14,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ClassiCube";
-  version = "1.3.4";
+  version = "1.3.5";
 
   src = fetchFromGitHub {
     owner = "UnknownShadow200";
     repo = "ClassiCube";
     rev = version;
-    sha256 = "sha256-m7pg9OL2RuCVKgFD3hMtIeY0XdJ1YviXBFVJH8/T5gI=";
+    sha256 = "sha256-anBi9hPwX1AAIc8dXsKyX4u7UbkKqC1P+7f7wdKWAig=";
   };
 
   nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ];
@@ -46,12 +47,8 @@ stdenv.mkDerivation rec {
   patches = [
     # Fix hardcoded font paths
     ./font-location.patch
-    # ClassiCube doesn't compile with its X11 backend
-    # because of issues with libXi.
-    ./use-sdl.patch
     # For some reason, the Makefile doesn't link
     # with libcurl and openal when ClassiCube requires them.
-    # Also links with SDL2 instead of libX11 and libXi.
     ./fix-linking.patch
   ];
 
@@ -71,7 +68,7 @@ stdenv.mkDerivation rec {
       --replace 'JOBS=1' "JOBS=$NIX_BUILD_CORES"
   '';
 
-  buildInputs = [ SDL2 libGL curl openal liberation_ttf ];
+  buildInputs = [ libX11 libXi libGL curl openal liberation_ttf ];
 
   preBuild = "cd src";
 
diff --git a/pkgs/games/classicube/fix-linking.patch b/pkgs/games/classicube/fix-linking.patch
index 987c882367ee..197a3ab694e0 100644
--- a/pkgs/games/classicube/fix-linking.patch
+++ b/pkgs/games/classicube/fix-linking.patch
@@ -7,7 +7,7 @@ index 83188ce..3439cdb 100644
  
  ifeq ($(PLAT),linux)
 -LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl
-+LIBS=-lSDL2 -lpthread -lGL -lm -ldl -lcurl -lopenal
++LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -lcurl -lopenal
  endif
  
  ifeq ($(PLAT),sunos)
diff --git a/pkgs/games/classicube/use-sdl.patch b/pkgs/games/classicube/use-sdl.patch
deleted file mode 100644
index 3456ef8b6469..000000000000
--- a/pkgs/games/classicube/use-sdl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Core.h b/src/Core.h
-index e94a39e..96527d0 100644
---- a/src/Core.h
-+++ b/src/Core.h
-@@ -170,7 +170,7 @@ Thus it is **NOT SAFE** to allocate a string on the stack. */
- #define CC_BUILD_LINUX
- #define CC_BUILD_POSIX
- #define CC_BUILD_GL
--#define CC_BUILD_X11
-+#define CC_BUILD_SDL
- #define CC_BUILD_CURL
- #define CC_BUILD_OPENAL
- #if defined CC_BUILD_RPI

From c367b917a529ef1bc0eac2aab225949fc43ad63a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 25 Jan 2023 03:06:26 +0000
Subject: [PATCH 36/38] =?UTF-8?q?terraform-providers.cloudflare:=203.32.0?=
 =?UTF-8?q?=20=E2=86=92=203.33.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 81d6f0e90494..9ff03dc88d8f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -222,13 +222,13 @@
     "vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ="
   },
   "cloudflare": {
-    "hash": "sha256-X7rNVMl5K/Z0w/N6+5fuODjR08gF9s3jQ1HqCo3b1WU=",
+    "hash": "sha256-Y48H7P69ORr8U0yXf1HEBqh//oOmWn3Uj8GQ12PsV/M=",
     "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
     "owner": "cloudflare",
     "repo": "terraform-provider-cloudflare",
-    "rev": "v3.32.0",
+    "rev": "v3.33.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-7X2T3C775Nq5jc7n41nBREUsOa+EYmBsfBJM5YIo9xI="
+    "vendorHash": "sha256-3JH+4ExREL3vtq6CiQN0G0x08ScrzOf2pTAnsWcGgq8="
   },
   "cloudfoundry": {
     "hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=",

From a5d2865e622a93f2a92949eaf002fd62a50147af Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 25 Jan 2023 03:09:45 +0000
Subject: [PATCH 37/38] =?UTF-8?q?terraform-providers.spotinst:=201.95.2=20?=
 =?UTF-8?q?=E2=86=92=201.96.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 9ff03dc88d8f..69bb9b2e3851 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1050,13 +1050,13 @@
     "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
   },
   "spotinst": {
-    "hash": "sha256-JT+kWE6k22qp905soDbnptr7gJZiZ8uRZ4+ZBw++8Mo=",
+    "hash": "sha256-2w4Qh9S0YxvcNdgtPLsNEumZiJn3+VH80zwamJW1FWQ=",
     "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
     "owner": "spotinst",
     "repo": "terraform-provider-spotinst",
-    "rev": "v1.95.2",
+    "rev": "v1.96.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-vW+1tH+3bT70RrHOTKemM23e0EoX3AO5AMXOAuyyKPA="
+    "vendorHash": "sha256-SRQWZGyQDbESrpu0tsy6EBfvjY/l89fQexCdhSYPzGI="
   },
   "stackpath": {
     "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=",

From c52e921894b8817d68fa88db3429e6119d8f55d7 Mon Sep 17 00:00:00 2001
From: SubhrajyotiSen <subhrajyoti12@gmail.com>
Date: Wed, 25 Jan 2023 09:43:42 +0530
Subject: [PATCH 38/38] maestro: 1.19.5 -> 1.20.0

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

diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix
index 3a39735aea60..778fddc8c3bb 100644
--- a/pkgs/development/mobile/maestro/default.nix
+++ b/pkgs/development/mobile/maestro/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "maestro";
-  version = "1.19.5";
+  version = "1.20.0";
 
   src = fetchurl {
     url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
-    sha256 = "1chrfwpxbnbn6k6ciwbflz1b8d7sd3r945m5g2d9gz1r1nn6d4v1";
+    sha256 = "0hrfnx66yr1q57875m3ff4b2blq0k641iqjxjys8kwzp3nix34w2";
   };
 
   dontUnpack = true;