From 167f5fba6feffd5025ea3917f99ea795ed3aac2b Mon Sep 17 00:00:00 2001
From: Ivan Kovnatsky <75213+ivankovnatsky@users.noreply.github.com>
Date: Wed, 5 Apr 2023 11:38:24 +0300
Subject: stc: init at 1.4

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

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/stc/default.nix b/pkgs/applications/networking/stc/default.nix
new file mode 100644
index 0000000000000..85dadfee73a2b
--- /dev/null
+++ b/pkgs/applications/networking/stc/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "stc";
+  version = "1.4";
+
+  src = fetchFromGitHub {
+    owner = "tenox7";
+    repo = pname;
+    rev = "${version}";
+    sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U=";
+  };
+
+  vendorSha256 = "sha256-0OsxCGCJT5k5bHXNSIL6QiJXj72bzYCZiI03gvHQuR8=";
+
+  meta = with lib; {
+    description = "Syncthing CLI Tool";
+    homepage = "https://github.com/tenox7/stc";
+    changelog = "https://github.com/tenox7/stc/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ivankovnatsky ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbc9d709ada42..e1953e7866508 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36390,6 +36390,8 @@ with pkgs;
 
   starspace = callPackage ../applications/science/machine-learning/starspace { };
 
+  stc = callPackage ../applications/networking/stc { };
+
   stockfish = callPackage ../games/stockfish { };
 
   steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam {
-- 
cgit 1.4.1


From 30767056805d785f7e9f30856d6e618d48f46866 Mon Sep 17 00:00:00 2001
From: Ivan Kovnatsky <75213+ivankovnatsky@users.noreply.github.com>
Date: Wed, 5 Apr 2023 21:05:29 +0300
Subject: syncthing-cli: rename the package

---
 pkgs/applications/networking/stc/default.nix       | 23 ----------------------
 .../networking/syncthing-cli/default.nix           | 23 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                    |  4 ++--
 3 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/applications/networking/stc/default.nix
 create mode 100644 pkgs/applications/networking/syncthing-cli/default.nix

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/stc/default.nix b/pkgs/applications/networking/stc/default.nix
deleted file mode 100644
index 85dadfee73a2b..0000000000000
--- a/pkgs/applications/networking/stc/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  pname = "stc";
-  version = "1.4";
-
-  src = fetchFromGitHub {
-    owner = "tenox7";
-    repo = pname;
-    rev = "${version}";
-    sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U=";
-  };
-
-  vendorSha256 = "sha256-0OsxCGCJT5k5bHXNSIL6QiJXj72bzYCZiI03gvHQuR8=";
-
-  meta = with lib; {
-    description = "Syncthing CLI Tool";
-    homepage = "https://github.com/tenox7/stc";
-    changelog = "https://github.com/tenox7/stc/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ivankovnatsky ];
-  };
-}
diff --git a/pkgs/applications/networking/syncthing-cli/default.nix b/pkgs/applications/networking/syncthing-cli/default.nix
new file mode 100644
index 0000000000000..85dadfee73a2b
--- /dev/null
+++ b/pkgs/applications/networking/syncthing-cli/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "stc";
+  version = "1.4";
+
+  src = fetchFromGitHub {
+    owner = "tenox7";
+    repo = pname;
+    rev = "${version}";
+    sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U=";
+  };
+
+  vendorSha256 = "sha256-0OsxCGCJT5k5bHXNSIL6QiJXj72bzYCZiI03gvHQuR8=";
+
+  meta = with lib; {
+    description = "Syncthing CLI Tool";
+    homepage = "https://github.com/tenox7/stc";
+    changelog = "https://github.com/tenox7/stc/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ivankovnatsky ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1953e7866508..13993771bc6ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33811,6 +33811,8 @@ with pkgs;
     syncthing-discovery
     syncthing-relay;
 
+  syncthing-cli = callPackage ../applications/networking/syncthing-cli { };
+
   syncthing-tray = callPackage ../applications/misc/syncthing-tray { };
 
   syncthingtray = libsForQt5.callPackage ../applications/misc/syncthingtray { };
@@ -36390,8 +36392,6 @@ with pkgs;
 
   starspace = callPackage ../applications/science/machine-learning/starspace { };
 
-  stc = callPackage ../applications/networking/stc { };
-
   stockfish = callPackage ../games/stockfish { };
 
   steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam {
-- 
cgit 1.4.1


From 293ca686108c85dc0b2e78f661e32593db595088 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 26 Apr 2023 21:04:02 +0200
Subject: yubikey-manager: 5.0.1 -> 5.1.1

---
 pkgs/tools/misc/yubikey-manager/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix
index 5487d9835cd51..9a01d6cef340d 100644
--- a/pkgs/tools/misc/yubikey-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-manager/default.nix
@@ -3,14 +3,14 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "yubikey-manager";
-  version = "5.0.1";
+  version = "5.1.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
-    repo = "yubikey-manager";
-    rev = "refs/tags/${version}";
     owner = "Yubico";
-    sha256 = "sha256-Dj3ftyFeVgM0YMFI8cbiH5dmc8SKi2SBbScnc0+ad0M=";
+    repo = "yubikey-manager";
+    rev = version;
+    hash = "sha256-rF1oOhlZP1EKiqErJ4L/otkoEvW0iA2P4g5MWCKrCO4=";
   };
 
   postPatch = ''
-- 
cgit 1.4.1


From 8b5b0ca9ffe7be40994943395383691d5e8f4d60 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Mon, 1 May 2023 13:02:47 +0300
Subject: zmusic: 1.1.11 -> 1.1.12

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

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/development/libraries/zmusic/default.nix
index 1b5ac51b120d5..e950c6ed3d7f8 100644
--- a/pkgs/development/libraries/zmusic/default.nix
+++ b/pkgs/development/libraries/zmusic/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zmusic";
-  version = "1.1.11";
+  version = "1.1.12";
 
   src = fetchFromGitHub {
     owner = "ZDoom";
     repo = "ZMusic";
     rev = version;
-    hash = "sha256-QvP8ranwBs8VupBie4vrHdm517OOpCuV3Rbjeb/L9PY=";
+    hash = "sha256-waxgn4Dg8One2Hv7J2efMoYo5mmaMSMiPQSNq57kbvE=";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1


From 85c17404e46684845525d6d524d23b04f12262f9 Mon Sep 17 00:00:00 2001
From: Nicholas Sielicki <git@opensource.nslick.com>
Date: Thu, 4 May 2023 07:06:37 +0000
Subject: mutagen: 0.16 -> 0.17

https://github.com/mutagen-io/mutagen/compare/v0.16.0...v0.17.0
---
 pkgs/tools/misc/mutagen/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix
index a543278922eff..07616169932b7 100644
--- a/pkgs/tools/misc/mutagen/default.nix
+++ b/pkgs/tools/misc/mutagen/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "mutagen";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "mutagen-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-nKt/A1LIr+cPWASWFYiOebxsuWcbzd23CQ32GgnWvLA=";
+    sha256 = "sha256-Dfs7hgyTjl3jU28YSd1XEe0wNKQxKgLLMKcrKSEvc4w=";
   };
 
-  vendorSha256 = "sha256-feQOrZmJ656yD3HsxnN8JFXoP/XM2Gobyzj5MHyH/Xw=";
+  vendorSha256 = "sha256-kfzT+230KY2TJVc0qKMi4TysmltZSgF/OvL5nPLPcbM=";
 
   agents = fetchzip {
     name = "mutagen-agents-${version}";
@@ -21,7 +21,7 @@ buildGoModule rec {
     postFetch = ''
       rm $out/mutagen # Keep only mutagen-agents.tar.gz.
     '';
-    sha256 = "sha256-QkleSf/Npbqrx2049tKxxwJk+996gM5AU/BIoyplDYo=";
+    sha256 = "sha256-kQdlwNsZd/YrH5XagtQRA/1WFhw4fLmqQW+kZ4ykxfc=";
   };
 
   doCheck = false;
-- 
cgit 1.4.1


From 4a58cb90e999fcbbb2100796889d91b23464d2b2 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 6 May 2023 13:23:23 +0100
Subject: csound: drop override for JACK_HEADER

The header works as is without the override.

`diffoscope` shows no difference before and after on x86_64-linux.
---
 pkgs/applications/audio/csound/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 6afddb467d0d3..ac8303955f9e3 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
   };
 
   cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
-    ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib"
-    ++ lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h";
+    ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib";
 
   nativeBuildInputs = [ cmake flex bison gettext ];
   buildInputs = [ libsndfile libsamplerate boost ]
-- 
cgit 1.4.1


From 36af1fea0601a24173cae578d743b759bbecd891 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 May 2023 00:42:38 +0000
Subject: cgal_5: 5.5.1 -> 5.5.2

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

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 3b6e5f2498d54..9d9233aad20e4 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cgal";
-  version = "5.5.1";
+  version = "5.5.2";
 
   src = fetchFromGitHub {
     owner = "CGAL";
     repo = "releases";
     rev = "CGAL-${version}";
-    sha256 = "sha256-ISmuxvCLb2ueG3FeBzJ7R+LievfXefG3ZQbyAboIv+A=";
+    sha256 = "sha256-olMPT/8Q0bf+rooJoNc0k8NrO//O7z0yqBoP8KX39yQ=";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;
-- 
cgit 1.4.1


From c72178cf2bcccb31c0709488ebd3ec3f5b62bd0d Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sun, 7 May 2023 18:38:32 +0200
Subject: boost165: remove unused pkg

---
 pkgs/development/libraries/boost/1.65.nix    | 12 ------------
 pkgs/development/libraries/boost/default.nix |  1 -
 pkgs/top-level/all-packages.nix              |  1 -
 3 files changed, 14 deletions(-)
 delete mode 100644 pkgs/development/libraries/boost/1.65.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix
deleted file mode 100644
index 6238a88424ff5..0000000000000
--- a/pkgs/development/libraries/boost/1.65.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "1.65.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
-    # SHA256 from http://www.boost.org/users/history/version_1_65_1.html
-    sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
-  };
-
-})
diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index b9b2c8ff7e6b9..b759e5b123ebb 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -16,7 +16,6 @@ let
       }
     );
 in {
-  boost165 = makeBoost ./1.65.nix;
   boost166 = makeBoost ./1.66.nix;
   boost167 = makeBoost ./1.67.nix;
   boost168 = makeBoost ./1.68.nix;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17d65f3e74381..80e80b2ed9a04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19584,7 +19584,6 @@ with pkgs;
   boolstuff = callPackage ../development/libraries/boolstuff { };
 
   inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; })
-    boost165
     boost166
     boost168
     boost169
-- 
cgit 1.4.1


From 61e3deefae49a0320f84986fb4d58fc42d207682 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sun, 7 May 2023 18:38:50 +0200
Subject: boost166: remove unused pkg

---
 pkgs/development/libraries/boost/1.66.nix    | 11 -----------
 pkgs/development/libraries/boost/default.nix |  1 -
 pkgs/top-level/all-packages.nix              |  1 -
 3 files changed, 13 deletions(-)
 delete mode 100644 pkgs/development/libraries/boost/1.66.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix
deleted file mode 100644
index 5bc3dcbff5acd..0000000000000
--- a/pkgs/development/libraries/boost/1.66.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "1.66.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
-    # SHA256 from http://www.boost.org/users/history/version_1_66_0.html
-    sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
-  };
-})
diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index b759e5b123ebb..3457e8d1fdbb3 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -16,7 +16,6 @@ let
       }
     );
 in {
-  boost166 = makeBoost ./1.66.nix;
   boost167 = makeBoost ./1.67.nix;
   boost168 = makeBoost ./1.68.nix;
   boost169 = makeBoost ./1.69.nix;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80e80b2ed9a04..31990d6633049 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19584,7 +19584,6 @@ with pkgs;
   boolstuff = callPackage ../development/libraries/boolstuff { };
 
   inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; })
-    boost166
     boost168
     boost169
     boost170
-- 
cgit 1.4.1


From 74dd873c11179fb83a38d4d55da43d6de0355c37 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sun, 7 May 2023 19:53:05 +0300
Subject: shod: 2.5.0 -> 2.6.2

---
 pkgs/applications/window-managers/shod/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/window-managers/shod/default.nix b/pkgs/applications/window-managers/shod/default.nix
index c2f0158a3b5ac..1ed5b6e13a7fd 100644
--- a/pkgs/applications/window-managers/shod/default.nix
+++ b/pkgs/applications/window-managers/shod/default.nix
@@ -5,29 +5,29 @@
 , fontconfig
 , libX11
 , libXft
-, libXinerama
 , libXpm
+, libXrandr
 , libXrender
 , conf ? null
 }:
 
 stdenv.mkDerivation rec {
   pname = "shod";
-  version = "2.5.0";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "phillbush";
     repo = "shod";
     rev = "v${version}";
-    sha256 = "sha256-hunHcYWxboCWM+SYH5u09MKP0b7U/9CVfhC6vLVpc3Q=";
+    hash = "sha256-0bKp1BTIdYVBDVdeGnTVo76UtBxa4UbXLZihdjHS/og=";
   };
 
   buildInputs = [
     fontconfig
     libX11
     libXft
-    libXinerama
     libXpm
+    libXrandr
     libXrender
   ];
 
-- 
cgit 1.4.1


From 5fbb31c71e185160200afddc802d04409768c4e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 May 2023 17:54:29 +0000
Subject: python310Packages.pure-protobuf: 2.2.3 -> 2.3.0

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

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix
index afd2835475cbf..a8ef34342bf2d 100644
--- a/pkgs/development/python-modules/pure-protobuf/default.nix
+++ b/pkgs/development/python-modules/pure-protobuf/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pure-protobuf";
-  version = "2.2.3";
+  version = "2.3.0";
 
   format = "pyproject";
   disabled = pythonOlder "3.7";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eigenein";
     repo = "protobuf";
-    rev = version;
-    hash = "sha256-FsVWlYPav4uusdEPXc5hScLeNJWfbSjGOLuZ7yZXyCw=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-nJ3F8dUrqMeWqTV9ErGqrMvofJwBKwNUDfxWIqFh4nY=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
-- 
cgit 1.4.1


From cf729a4690b4de9a2a5cd2ecfe9efe3d1bf8a073 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 7 May 2023 20:03:29 +0200
Subject: metasploit: 6.3.14 -> 6.3.15

---
 pkgs/tools/security/metasploit/Gemfile      |  2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 22 ++++++++++-----------
 pkgs/tools/security/metasploit/default.nix  |  4 ++--
 pkgs/tools/security/metasploit/gemset.nix   | 30 ++++++++++++++---------------
 4 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 6ab06373d7977..de75819f84f03 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.14"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.15"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 27470a4b58f64..b93d8ea4e8bb0 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 44a9a761be544d3435963076dcbbeb8a4fa0e47f
-  ref: refs/tags/6.3.14
+  revision: 8db3c3e84af5de45ffb00fa478d2c972d1c8fd6a
+  ref: refs/tags/6.3.15
   specs:
-    metasploit-framework (6.3.14)
+    metasploit-framework (6.3.15)
       actionpack (~> 7.0)
       activerecord (~> 7.0)
       activesupport (~> 7.0)
@@ -33,11 +33,11 @@ GIT
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 2.0.127)
+      metasploit-payloads (= 2.0.130)
       metasploit_data_models
       metasploit_payloads-mettle (= 1.0.20)
       mqtt
-      msgpack
+      msgpack (~> 1.6.0)
       nessus_rest
       net-ldap
       net-smtp
@@ -130,13 +130,13 @@ GEM
     arel-helpers (2.14.0)
       activerecord (>= 3.1.0, < 8)
     aws-eventstream (1.2.0)
-    aws-partitions (1.759.0)
-    aws-sdk-core (3.171.0)
+    aws-partitions (1.760.0)
+    aws-sdk-core (3.171.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-ec2 (1.377.0)
+    aws-sdk-ec2 (1.379.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-iam (1.77.0)
@@ -145,7 +145,7 @@ GEM
     aws-sdk-kms (1.64.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.121.0)
+    aws-sdk-s3 (1.122.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -241,7 +241,7 @@ GEM
       activemodel (~> 7.0)
       activesupport (~> 7.0)
       railties (~> 7.0)
-    metasploit-payloads (2.0.127)
+    metasploit-payloads (2.0.130)
     metasploit_data_models (6.0.2)
       activerecord (~> 7.0)
       activesupport (~> 7.0)
@@ -257,7 +257,7 @@ GEM
     mini_portile2 (2.8.2)
     minitest (5.18.0)
     mqtt (0.6.0)
-    msgpack (1.7.0)
+    msgpack (1.6.1)
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 4c1037ae2da31..b7b9cba66fbfd 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -15,13 +15,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "6.3.14";
+  version = "6.3.15";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "sha256-4gmzR3Ulz8lDwoSRUhPoOdMXtBio5iTJw4FWbs1znqs=";
+    sha256 = "sha256-cfrMVtQQKk7hFnSYAGd5dmWqGGlqtx05yv0lTSnce0Q=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index 5d1ae9fc169c7..f47ceddd969b4 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -104,30 +104,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rrfwdzv8xpyjg52xvyabqxvcahk77ag2cfgpxky4w1jsv8khwv9";
+      sha256 = "1sa8zambx28rgn1a609g9z6sygawxh273l7n4q93ch3x787sgak0";
       type = "gem";
     };
-    version = "1.759.0";
+    version = "1.760.0";
   };
   aws-sdk-core = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0732vv8zi67z25fss1sdvqx0vv1ap3w6hz1avxzwznkjp002vj39";
+      sha256 = "1xkxrj5hrrdp2d3r7r5dfbyjjjw1irh0dsj1zq8fniprd9sxhpv1";
       type = "gem";
     };
-    version = "3.171.0";
+    version = "3.171.1";
   };
   aws-sdk-ec2 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06l027yxps5lar958qszjls9whv39wwm22v91898lpj82v2c974r";
+      sha256 = "0sdjlc95q5x8cfs4j6l2fz23q4i35hnn0g9lsq7kxzlw21sfawwh";
       type = "gem";
     };
-    version = "1.377.0";
+    version = "1.379.0";
   };
   aws-sdk-iam = {
     groups = ["default"];
@@ -154,10 +154,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1s5v3799pi7ik53gv7dl02am5pngv6x4azzwx9my09nll4q3lfk8";
+      sha256 = "01cryf8kfkmlsxb327szcwcagsp7lss5gmk6zxlgap65lv8bc7rx";
       type = "gem";
     };
-    version = "1.121.0";
+    version = "1.122.0";
   };
   aws-sigv4 = {
     groups = ["default"];
@@ -624,12 +624,12 @@
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "44a9a761be544d3435963076dcbbeb8a4fa0e47f";
-      sha256 = "1awyfg6nwml1qg4j9rm832s1glrrx09m54c4q91wkkr5fm3v62g2";
+      rev = "8db3c3e84af5de45ffb00fa478d2c972d1c8fd6a";
+      sha256 = "0i3vvhlls9gxr8wivdvad4calrbng5kh163l2vhlwahhsibcryki";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.3.14";
+    version = "6.3.15";
   };
   metasploit-model = {
     groups = ["default"];
@@ -646,10 +646,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zb15r1m4lnqh91cw7nly800xv1b85437hszyfpxj687ldklm9j7";
+      sha256 = "0za8dc6frc48m60m5m8pdpczmv9s0lgafhqkxaswdlhjjpd4swx3";
       type = "gem";
     };
-    version = "2.0.127";
+    version = "2.0.130";
   };
   metasploit_data_models = {
     groups = ["default"];
@@ -716,10 +716,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "172ky0r1jfcm3xyg067pia7k1lhc15vw9svv93max120gcdbrvji";
+      sha256 = "1jr9grsdnlb8wgd9by7mhsc9c1wixijh9an4m4yq1ph0jg26x9rk";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "1.6.1";
   };
   multi_json = {
     groups = ["default"];
-- 
cgit 1.4.1


From cad2dad05ee21f3196fce29249df82987931a40f Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 7 May 2023 14:47:31 -0400
Subject: jql: 6.0.6 -> 6.0.7

Diff: https://github.com/yamafaktory/jql/compare/jql-v6.0.6...jql-v6.0.7

Changelog: https://github.com/yamafaktory/jql/releases/tag/jql-v6.0.7
---
 pkgs/development/tools/jql/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix
index 758e5c9120ecb..cac016eb2761b 100644
--- a/pkgs/development/tools/jql/default.nix
+++ b/pkgs/development/tools/jql/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jql";
-  version = "6.0.6";
+  version = "6.0.7";
 
   src = fetchFromGitHub {
     owner = "yamafaktory";
     repo = pname;
     rev = "jql-v${version}";
-    hash = "sha256-0Tg8vqlTngLfmp0HDxR5ymmLXw16J9pQJfOCOZrRreE=";
+    hash = "sha256-/H4FkrwJ8xB5qiiewEmTwCwgbJRMdfHZ6ppn5+370Kk=";
   };
 
-  cargoHash = "sha256-w51soAdIdNuJzQpvQZQZuxbxlClEWYdT/v0ZOnVvsTA=";
+  cargoHash = "sha256-2TKwy983Ys9aSm8+jsUKv0nE3mV1h+uE4Xrch08dPMc=";
 
   meta = with lib; {
     description = "A JSON Query Language CLI tool built with Rust";
-- 
cgit 1.4.1


From a8da2a5714befb418b9ee287f39b04ad1ac6d429 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 May 2023 18:53:32 +0000
Subject: python310Packages.pynamodb: 5.4.1 -> 5.5.0

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

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix
index f0d3436f354b8..e52cb5da77fc8 100644
--- a/pkgs/development/python-modules/pynamodb/default.nix
+++ b/pkgs/development/python-modules/pynamodb/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pynamodb";
-  version = "5.4.1";
+  version = "5.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "pynamodb";
     repo = "PynamoDB";
     rev = "refs/tags/${version}";
-    hash = "sha256-C44jMn8kwoM/dO43g9aQyqKGTrGV8oHrMhd8SZRpc/s=";
+    hash = "sha256-sbGrFTpupBP0VQWR9gUVoCiw6D61s6GsmBvjgD1u99g=";
   };
 
   propagatedBuildInputs = [
-- 
cgit 1.4.1


From 3f229e3f9db391a03b5c0b122eb4a34cf5bfe134 Mon Sep 17 00:00:00 2001
From: Goetz <goetz-dev@web.de>
Date: Sun, 7 May 2023 16:27:23 +0200
Subject: texstudio: 4.5.1 -> 4.5.2

---
 pkgs/applications/editors/texstudio/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index d162261116c0b..35b06fde1f2c8 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -1,22 +1,20 @@
-{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtscript, qtsvg,
+{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtscript, qtsvg,
   wrapQtAppsHook, poppler, zlib, pkg-config }:
 
 mkDerivation rec {
   pname = "texstudio";
-  version = "4.5.1";
+  version = "4.5.2";
 
   src = fetchFromGitHub {
     owner = "${pname}-org";
     repo = pname;
     rev = version;
-    hash = "sha256-QBPWelCqh8Ggp0IjH37QGYGu5Ya2fpsiSEkKh3Ee7PM=";
+    hash = "sha256-L+q4+k4XWywnxIvhfXPCBeCqnGj4E9BhAmgcAZhm7S8=";
   };
 
-  nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];
+  nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ];
   buildInputs = [ qtbase qtscript qtsvg poppler zlib ];
 
-  qmakeFlags = [ "NO_APPDATA=True" ];
-
   meta = with lib; {
     description = "TeX and LaTeX editor";
     longDescription=''
-- 
cgit 1.4.1


From a30bcb5d38bd42fe125920790104d58aebb9e9b4 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sun, 7 May 2023 19:18:34 +0200
Subject: boost: Remove references to unsupported versions

---
 pkgs/development/libraries/boost/1.59.nix    | 23 ----------------
 pkgs/development/libraries/boost/1.60.nix    | 11 --------
 pkgs/development/libraries/boost/default.nix |  2 --
 pkgs/development/libraries/boost/generic.nix | 40 +++++-----------------------
 4 files changed, 7 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/development/libraries/boost/1.59.nix
 delete mode 100644 pkgs/development/libraries/boost/1.60.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix
deleted file mode 100644
index a417f3e263923..0000000000000
--- a/pkgs/development/libraries/boost/1.59.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ callPackage, fetchurl, fetchpatch, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "1.59.0";
-
-  boostBuildPatches = [
-    # Fixes a segfault on aarch64-darwin from an implicitly defined varargs function.
-    # https://github.com/boostorg/build/pull/238
-    (fetchpatch {
-      url = "https://github.com/boostorg/build/commit/48e9017139dd94446633480661e5447c7e0d8b1b.diff";
-      excludes = [
-        # Doesn't apply, isn't critical.
-        "src/engine/filesys.h"
-      ];
-      sha256 = "sha256-/HLOJKBcGqcK9yBYKSRCSMmTNhCH3sSpK1s3OzkIqx8";
-    })
-  ];
-
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
-    sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj";
-  };
-})
diff --git a/pkgs/development/libraries/boost/1.60.nix b/pkgs/development/libraries/boost/1.60.nix
deleted file mode 100644
index 0cf81a0602935..0000000000000
--- a/pkgs/development/libraries/boost/1.60.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "1.60.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
-    sha256 = "0fzx6dwqbrkd4bcd8pjv0fpapwmrxxwr8yx9g67lihlsk3zzysk8";
-  };
-
-})
diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index 3457e8d1fdbb3..27069b1ac03aa 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -16,11 +16,9 @@ let
       }
     );
 in {
-  boost167 = makeBoost ./1.67.nix;
   boost168 = makeBoost ./1.68.nix;
   boost169 = makeBoost ./1.69.nix;
   boost170 = makeBoost ./1.70.nix;
-  boost171 = makeBoost ./1.71.nix;
   boost172 = makeBoost ./1.72.nix;
   boost173 = makeBoost ./1.73.nix;
   boost174 = makeBoost ./1.74.nix;
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 2b7047026137d..7d8aee067c86b 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -53,26 +53,12 @@ let
   # To avoid library name collisions
   layout = if taggedLayout then "tagged" else "system";
 
-  # Versions of b2 before 1.65 have job limits; specifically:
-  #   - Versions before 1.58 support up to 64 jobs[0]
-  #   - Versions before 1.65 support up to 256 jobs[1]
-  #
-  # [0]: https://github.com/boostorg/build/commit/0ef40cb86728f1cd804830fef89a6d39153ff632
-  # [1]: https://github.com/boostorg/build/commit/316e26ca718afc65d6170029284521392524e4f8
-  jobs =
-    if lib.versionOlder version "1.58" then
-      "$(($NIX_BUILD_CORES<=64 ? $NIX_BUILD_CORES : 64))"
-    else if lib.versionOlder version "1.65" then
-      "$(($NIX_BUILD_CORES<=256 ? $NIX_BUILD_CORES : 256))"
-    else
-      "$NIX_BUILD_CORES";
-
   needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.isDarwin && enableShared);
 
   b2Args = lib.concatStringsSep " " ([
     "--includedir=$dev/include"
     "--libdir=$out/lib"
-    "-j${jobs}"
+    "-j$NIX_BUILD_CORES"
     "--layout=${layout}"
     "variant=${variant}"
     "threading=${threading}"
@@ -122,22 +108,14 @@ stdenv.mkDerivation {
   patches = patches
   ++ lib.optional stdenv.isDarwin ./darwin-no-system-python.patch
   # Fix boost-context segmentation faults on ppc64 due to ABI violation
-  ++ lib.optional (lib.versionAtLeast version "1.61" &&
-               lib.versionOlder version "1.71") (fetchpatch {
+  ++ lib.optional (lib.versionOlder version "1.71") (fetchpatch {
     url = "https://github.com/boostorg/context/commit/2354eca9b776a6739112833f64754108cc0d1dc5.patch";
     sha256 = "067m4bjpmcanqvg28djax9a10avmdwhlpfx6gn73kbqqq70dnz29";
     stripLen = 1;
     extraPrefix = "libs/context/";
   })
-  # Fix compiler warning with GCC >= 8; TODO: patch may apply to older versions
-  ++ lib.optional (lib.versionAtLeast version "1.65" && lib.versionOlder version "1.67")
-    (fetchpatch {
-      url = "https://github.com/boostorg/mpl/commit/f48fd09d021db9a28bd7b8452c175897e1af4485.patch";
-      sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0";
-      stripLen = 1;
-    })
-  ++ lib.optional (lib.versionAtLeast version "1.65" && lib.versionOlder version "1.70") (fetchpatch {
-    # support for Mips64n64 appeared in boost-context 1.70; this patch won't apply to pre-1.65 cleanly
+  ++ lib.optional (lib.versionOlder version "1.70") (fetchpatch {
+    # support for Mips64n64 appeared in boost-context 1.70
     url = "https://github.com/boostorg/context/commit/e3f744a1862164062d579d1972272d67bdaa9c39.patch";
     sha256 = "sha256-qjQy1b4jDsIRrI+UYtcguhvChrMbGWO0UlEzEJHYzRI=";
     stripLen = 1;
@@ -156,18 +134,14 @@ stdenv.mkDerivation {
     description = "Collection of C++ libraries";
     license = licenses.boost;
     platforms = platforms.unix ++ platforms.windows;
-    badPlatforms = optional (versionOlder version "1.59") "aarch64-linux"
-                 ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"
-                 ++ optionals (versionOlder version "1.73") platforms.riscv;
+    badPlatforms = optionals (versionOlder version "1.73") platforms.riscv;
     maintainers = with maintainers; [ hjones2199 ];
 
     broken =
       # boost-context lacks support for the N32 ABI on mips64.  The build
       # will succeed, but packages depending on boost-context will fail with
       # a very cryptic error message.
-      stdenv.hostPlatform.isMips64n32 ||
-      # the patch above does not apply cleanly to pre-1.65 boost
-      (stdenv.hostPlatform.isMips64n64 && (versionOlder version "1.65"));
+      stdenv.hostPlatform.isMips64n32;
   };
 
   passthru = {
@@ -227,7 +201,7 @@ stdenv.mkDerivation {
     ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs = [ expat zlib bzip2 libiconv ]
     ++ lib.optional (lib.versionAtLeast version "1.69") zstd
-    ++ lib.optional (lib.versionAtLeast version "1.65") xz
+    ++ [ xz ]
     ++ lib.optional enableIcu icu
     ++ lib.optionals enablePython [ libxcrypt python ]
     ++ lib.optional enableNumpy python.pkgs.numpy;
-- 
cgit 1.4.1


From e4bb50499d104e1218bd6c711442f2e1273780b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 May 2023 19:56:46 +0000
Subject: symfony-cli: 5.5.4 -> 5.5.5

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

(limited to 'pkgs')

diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix
index 7224d98e9f82b..7187285288b71 100644
--- a/pkgs/development/tools/symfony-cli/default.nix
+++ b/pkgs/development/tools/symfony-cli/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "symfony-cli";
-  version = "5.5.4";
+  version = "5.5.5";
   vendorHash = "sha256-hDr/ByBCjKE+B698IXzDFq1ovS6Nfs4O32aF7HKmrcY=";
 
   src = fetchFromGitHub {
     owner = "symfony-cli";
     repo = "symfony-cli";
     rev = "v${version}";
-    sha256 = "sha256-9ywxYOvI3D2aRHk9MEVZ4zWgfGsRDz3wbMO006VJPL0=";
+    sha256 = "sha256-bieFHg3hO8bQuA3yvhQVpG8hVdvQ29RVG7wAPhE0lpQ=";
   };
 
   ldflags = [
-- 
cgit 1.4.1


From 448dcd5acd77c35ee9cdffcd2d0301a756ad7bf1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 May 2023 20:01:59 +0000
Subject: obs-studio-plugins.obs-move-transition: 2.8.0 -> 2.9.0

---
 pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
index 0f8eddaebd172..03f4b8e97ef10 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-move-transition";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-move-transition";
     rev = version;
-    sha256 = "sha256-v4mAv4dqurM2S4/vM1APge0xoMLnOaigGU15vjNxxSo=";
+    sha256 = "sha256-RwWd5O1PW93mGZRmopZn8HAVNb7cSUvnSPslRSXPzrM=";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
cgit 1.4.1


From 477143726308da9543b6e1f87bef971a3717f782 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 7 May 2023 22:02:41 +0200
Subject: python310Packages.pure-protobuf: add changelog to meta

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

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix
index a8ef34342bf2d..c2d7f7e3d8ad1 100644
--- a/pkgs/development/python-modules/pure-protobuf/default.nix
+++ b/pkgs/development/python-modules/pure-protobuf/default.nix
@@ -17,7 +17,6 @@ buildPythonPackage rec {
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
-  # PyPi lacks tests.
   src = fetchFromGitHub {
     owner = "eigenein";
     repo = "protobuf";
@@ -44,6 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python implementation of Protocol Buffers with dataclass-based schemas";
     homepage = "https://github.com/eigenein/protobuf";
+    changelog = "https://github.com/eigenein/protobuf/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ chuangzhu ];
   };
-- 
cgit 1.4.1


From 3f4dcd381a157002199dc11238ce9efba5bce593 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sun, 7 May 2023 23:00:53 +0200
Subject: libgcrypt: Use pname in changelog url

to specify project for gitweb.
---
 pkgs/development/libraries/libgcrypt/1.8.nix     | 2 +-
 pkgs/development/libraries/libgcrypt/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/libgcrypt/1.8.nix b/pkgs/development/libraries/libgcrypt/1.8.nix
index cce79780f1cbe..1cbbafe403192 100644
--- a/pkgs/development/libraries/libgcrypt/1.8.nix
+++ b/pkgs/development/libraries/libgcrypt/1.8.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://www.gnu.org/software/libgcrypt/";
-    changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}";
+    changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=${pname}.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}";
     description = "General-purpose cryptographic library";
     license = licenses.lgpl2Plus;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index fe2f428986d7a..23e11f0970543 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://www.gnu.org/software/libgcrypt/";
-    changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}";
+    changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=${pname}.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}";
     description = "General-purpose cryptographic library";
     license = licenses.lgpl2Plus;
     platforms = platforms.all;
-- 
cgit 1.4.1


From c09feb83e0c31c31cec291bc6ecc05a659a76c12 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sun, 7 May 2023 23:02:07 +0200
Subject: gnupg: Add changelog

---
 pkgs/tools/security/gnupg/22.nix | 1 +
 pkgs/tools/security/gnupg/24.nix | 1 +
 2 files changed, 2 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 8a2cfeae06e5b..6c2ffe1235480 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -84,6 +84,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://gnupg.org";
+    changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=${pname}.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}";
     description = "LTS release of the GNU Privacy Guard, a GPL OpenPGP implementation";
     license = licenses.gpl3Plus;
     longDescription = ''
diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix
index f92a61f3ac4ed..691c7c5a720cc 100644
--- a/pkgs/tools/security/gnupg/24.nix
+++ b/pkgs/tools/security/gnupg/24.nix
@@ -89,6 +89,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://gnupg.org";
+    changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=${pname}.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}";
     description = "Modern release of the GNU Privacy Guard, a GPL OpenPGP implementation";
     license = licenses.gpl3Plus;
     longDescription = ''
-- 
cgit 1.4.1


From 50eb1f9a976b6e8b118e54dc39766d2d3456b628 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 May 2023 22:04:19 +0000
Subject: arti: 1.1.3 -> 1.1.4

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

(limited to 'pkgs')

diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix
index 434933862b3b3..bdd7bf39548d7 100644
--- a/pkgs/tools/security/arti/default.nix
+++ b/pkgs/tools/security/arti/default.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "arti";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitLab {
     domain = "gitlab.torproject.org";
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
     owner = "core";
     repo = "arti";
     rev = "arti-v${version}";
-    sha256 = "sha256-hh1RJjCmKHI7fR5gxoyGj6nVX6/a2ZzMjp5li6hGbn0=";
+    sha256 = "sha256-+gd/3CKdZkH/zDqGGTna7S7LkadfpzfHlX2XfemZpoE=";
   };
 
-  cargoHash = "sha256-vgrwjmJ/S5xqYzMZGMXjIC4szSRcSeBcTQoYIiuaUNI=";
+  cargoHash = "sha256-YD7KAiZM3iG9FXXHo5c1WanF7tsJBAnGvb36gxEcV5k=";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
 
-- 
cgit 1.4.1


From 19a98ed8c33d72db8623de4c93c7ed9ceb684944 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 May 2023 22:32:53 +0000
Subject: python310Packages.xmlschema: 2.2.1 -> 2.2.3

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

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
index d306f83220e8c..a651ed624d4ed 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "xmlschema";
-  version = "2.2.1";
+  version = "2.2.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "xmlschema";
     rev = "refs/tags/v${version}";
-    hash = "sha256-yF2L5VxUkqJjen5JeCQis4Q1o1KCJtRJ+S52wnS5VQg=";
+    hash = "sha256-KTxVUYdflHiC96tALFcMA0JnLt0vj/nSD3ie53lMi50=";
   };
 
   propagatedBuildInputs = [
-- 
cgit 1.4.1


From 2f34bfa4098e85b82a80b4764556310326b6e62a Mon Sep 17 00:00:00 2001
From: Woze Parrot <wozeparrot@gmail.com>
Date: Sun, 7 May 2023 18:35:46 -0400
Subject: seaweedfs: 3.48 -> 3.49

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

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix
index d0c8ca784e690..2d83e0ab35801 100644
--- a/pkgs/applications/networking/seaweedfs/default.nix
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "seaweedfs";
-  version = "3.48";
+  version = "3.49";
 
   src = fetchFromGitHub {
     owner = "seaweedfs";
     repo = "seaweedfs";
     rev = version;
-    hash = "sha256-yD9GZnx4OvzI4Jo5BJPRsZEDeUg9pUxg1cxfCCiS6AU=";
+    hash = "sha256-KmgElp+vnVWLFG+ZuxRmULg2VmbpKbgciCYA2pEQDRE=";
   };
 
-  vendorHash = "sha256-xmo82HgPRnrR53zKfKPadmut/vuNEM9jqbnqj0cTAuM=";
+  vendorHash = "sha256-bOBKtsZIVAwTmvjld2SccfqLQaLTW2vV0AXVGYLamFQ=";
 
   subPackages = [ "weed" ];
 
-- 
cgit 1.4.1


From d1cdbd59ff13fd9e5d2e1b44f8b089c6e3806994 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 8 May 2023 01:35:25 +0200
Subject: python310Packages.urlman: init at 2.0.1

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

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/urlman/default.nix b/pkgs/development/python-modules/urlman/default.nix
new file mode 100644
index 0000000000000..8bc7ce028299d
--- /dev/null
+++ b/pkgs/development/python-modules/urlman/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "urlman";
+  version = "2.0.1";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "andrewgodwin";
+    repo = "urlman";
+    rev = version;
+    hash = "sha256-p6lRuMHM2xJrlY5LDa0XLCGQPDE39UwCouK6e0U9zJE=";
+  };
+
+  pythonImportsCheck = [
+    "urlman"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    description = "Django URL pattern helpers";
+    homepage = "https://github.com/andrewgodwin/urlman";
+    changelog = "https://github.com/andrewgodwin/urlman/blob/${src.rev}/CHANGELOG";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1df7f1a0dd0cc..56ca1fe7f0343 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12458,6 +12458,8 @@ self: super: with self; {
 
   urllib3 = callPackage ../development/python-modules/urllib3 { };
 
+  urlman = callPackage ../development/python-modules/urlman { };
+
   urlpy = callPackage ../development/python-modules/urlpy { };
 
   urwid = callPackage ../development/python-modules/urwid { };
-- 
cgit 1.4.1


From 059eb9dd2a2c85c7e26dffc43c8265f3b9da61da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 May 2023 00:37:50 +0000
Subject: whois: 5.5.16 -> 5.5.17

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

(limited to 'pkgs')

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index f8004cfd465c2..f4fa1e9c475e8 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }:
 
 stdenv.mkDerivation rec {
-  version = "5.5.16";
+  version = "5.5.17";
   pname = "whois";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "sha256-5SmybO8aZgimjCps8huSU6h1sKskSSENK2VCWt3ltgA=";
+    sha256 = "sha256-Nqnbi2nS95nzyzFNdahSKY/Om30sZXRJhoCSrzRiD9c=";
   };
 
   nativeBuildInputs = [ perl gettext pkg-config ];
-- 
cgit 1.4.1


From 34752a7cbc870e0849f653dc8d744bcb23084794 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 May 2023 01:04:31 +0000
Subject: python310Packages.oci: 2.93.0 -> 2.100.0

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

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix
index 7b1232decd614..b145d6c399e2d 100644
--- a/pkgs/development/python-modules/oci/default.nix
+++ b/pkgs/development/python-modules/oci/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "oci";
-  version = "2.93.0";
+  version = "2.100.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "oracle";
     repo = "oci-python-sdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-yH9SCrTASP+O9VLVs6tliteCOWi+Pc7nDOgiboHQE4s=";
+    hash = "sha256-hzuuYRf9D0nWSyAPC66umDD2fKYZ+khHd6281UW6u9M=";
   };
 
   pythonRelaxDeps = [
-- 
cgit 1.4.1


From 4148410a8d92f370cd03172934e19bd12ca612cf Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Mon, 8 May 2023 02:34:07 +0000
Subject: exploitdb: 2023-05-06 -> 2023-05-08

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

(limited to 'pkgs')

diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index 3a3d722eadb15..bd733d59f71be 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2023-05-06";
+  version = "2023-05-08";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-Aib0RmWZOYxd8lI6u7tPcM7FTreCrWxaYYZlbOF3a78=";
+    hash = "sha256-MbSPBlepTQXCnPT9Yl/mB3N7HzJj8HwV3+ENOKdfYHo=";
   };
 
   nativeBuildInputs = [
-- 
cgit 1.4.1


From ccdcf369264e16f35b7bbdbc5b3e0332a38c7e15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 May 2023 05:30:58 +0000
Subject: hyprpaper: 0.1.0 -> 0.2.0

---
 pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
index 1b42f03c787af..8905be07b1aa9 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprpaper";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = finalAttrs.pname;
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/Kz4Qy+jx1+bfSq6e2W3MbyODkhs6GqKiiybNtqzvbc=";
+    hash = "sha256-rAKfgQJQRsw4QMOXdxfHIh/d5LPY6HHKBX1KtaPs2No=";
   };
 
   nativeBuildInputs = [
-- 
cgit 1.4.1


From 9d1a27e2fdd970acd629ac0f3b14bcf0ee0a4c7f Mon Sep 17 00:00:00 2001
From: Renato Garcia <fgarcia.renato@gmail.com>
Date: Mon, 8 May 2023 03:05:40 -0300
Subject: snakemake: 7.14.2 -> 7.25.3 (#230524)

---
 .../science/misc/snakemake/default.nix             | 15 ++++----
 .../development/python-modules/reretry/default.nix | 18 ++++++++++
 .../python-modules/throttler/default.nix           | 42 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix                 |  4 +++
 4 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/python-modules/reretry/default.nix
 create mode 100644 pkgs/development/python-modules/throttler/default.nix

(limited to 'pkgs')

diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix
index f162e2329a74d..f38281761319f 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "snakemake";
-  version = "7.14.2";
+  version = "7.25.3";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-4XduybmDmlux3zvjbN1ouaJ1PkNO8h6vHuxgZ3YLBrw=";
+    hash = "sha256-KrstajTocVX5Tw7aiPoJ9vxJ0nKF+jqJcYJKrJvBt0Q=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -21,22 +21,20 @@ python3.pkgs.buildPythonApplication rec {
     connection-pool
     datrie
     docutils
-    filelock
     gitpython
+    humanfriendly
     jinja2
     jsonschema
     nbformat
-    networkx
     psutil
     pulp
-    pygraphviz
     pyyaml
-    ratelimiter
     requests
-    retry
+    reretry
     smart-open
     stopit
     tabulate
+    throttler
     toposort
     wrapt
     yte
@@ -44,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
 
   # See
   # https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99
-  # for the current basic test suite. Tibanna and Tes require extra
+  # for the current basic test suite. Slurm, Tibanna and Tes require extra
   # setup.
 
   nativeCheckInputs = with python3.pkgs; [
@@ -54,6 +52,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   disabledTestPaths = [
+    "tests/test_slurm.py"
     "tests/test_tes.py"
     "tests/test_tibanna.py"
     "tests/test_linting.py"
diff --git a/pkgs/development/python-modules/reretry/default.nix b/pkgs/development/python-modules/reretry/default.nix
new file mode 100644
index 0000000000000..c4c6928af0420
--- /dev/null
+++ b/pkgs/development/python-modules/reretry/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "reretry";
+  version = "0.11.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-8nkfzr5RLqLx0VOih0d4UjqAZIYLWRzZCvwhqL7UMuM=";
+  };
+
+  meta = with lib; {
+    description = "An easy to use retry decorator.";
+    homepage = "https://github.com/leshchenko1979/reretry";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ renatoGarcia ];
+  };
+}
diff --git a/pkgs/development/python-modules/throttler/default.nix b/pkgs/development/python-modules/throttler/default.nix
new file mode 100644
index 0000000000000..2742cdaa29350
--- /dev/null
+++ b/pkgs/development/python-modules/throttler/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, aiohttp
+, codecov
+, flake8
+, pytest
+, pytest-asyncio
+, pytest-cov
+}:
+
+buildPythonPackage rec {
+  pname = "throttler";
+  version = "1.2.2";
+
+  src = fetchFromGitHub {
+    owner = "uburuntu";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-fE35zPjBUn4e1VRkkIUMtYJ/+LbnUxnxyfnU+UEPwr4=";
+  };
+
+  checkInputs = [
+    aiohttp
+    codecov
+    flake8
+    pytest
+    pytest-asyncio
+    pytest-cov
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [ "tests/" ];
+
+  meta = with lib; {
+    description = "Zero-dependency Python package for easy throttling with asyncio support.";
+    homepage = "https://github.com/uburuntu/throttler";
+    license = licenses.mit;
+    maintainers = with maintainers; [ renatoGarcia ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1df7f1a0dd0cc..1d84808578190 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10366,6 +10366,8 @@ self: super: with self; {
 
   requirements-parser = callPackage ../development/python-modules/requirements-parser { };
 
+  reretry = callPackage ../development/python-modules/reretry { };
+
   resampy = callPackage ../development/python-modules/resampy { };
 
   resolvelib = callPackage ../development/python-modules/resolvelib { };
@@ -11881,6 +11883,8 @@ self: super: with self; {
 
   thriftpy2 = callPackage ../development/python-modules/thriftpy2 { };
 
+  throttler = callPackage ../development/python-modules/throttler { };
+
   thumborPexif = callPackage ../development/python-modules/thumborpexif { };
 
   tkinter = callPackage ../development/python-modules/tkinter {
-- 
cgit 1.4.1


From 0f1a8bbf31e16352b0a4dd17e4b9e3668ec48558 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 May 2023 06:14:59 +0000
Subject: s2n-tls: 1.3.42 -> 1.3.43

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

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix
index 2cf41f1d63b0c..604e8c96bdbd1 100644
--- a/pkgs/development/libraries/s2n-tls/default.nix
+++ b/pkgs/development/libraries/s2n-tls/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "s2n-tls";
-  version = "1.3.42";
+  version = "1.3.43";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-rk9LIliZnMr/uF+JgXzpXwqFno8WSNhb5BoCeeUlUlU=";
+    sha256 = "sha256-o2e2AWCQ4IGDfdQ6zvAddKs40/BENj1Xbrw8IKNytCw=";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
cgit 1.4.1


From 0c10795b203d345ae2922e6ec0c8e12448b28540 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 May 2023 07:55:24 +0000
Subject: iosevka-bin: 22.1.0 -> 22.1.1

---
 pkgs/data/fonts/iosevka/bin.nix      |   2 +-
 pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++++++------------------
 2 files changed, 93 insertions(+), 93 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 33458c428d2ec..875f7cb71d17d 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -11,7 +11,7 @@ let
     (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
 in stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "22.1.0";
+  version = "22.1.1";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix
index b8a40ce5e869e..7085b5d9d381b 100644
--- a/pkgs/data/fonts/iosevka/variants.nix
+++ b/pkgs/data/fonts/iosevka/variants.nix
@@ -1,95 +1,95 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  iosevka = "1f0l3d6j936799szy243k58rk28qbrgvgi35g0w6bfsra25lycq2";
-  iosevka-aile = "0prhfpz0ib7cbpi1kznb6yrp0wqjnsh39hymzha6lm0pa7py1r36";
-  iosevka-curly = "0yzdm4ypfk60zvl54fhsmi9xs1bg08pac0srs9nggicp5zswixb3";
-  iosevka-curly-slab = "175d96yzrqdjg7ic88dacvs7hz8daskn1a9vrqks132rr6a26xvw";
-  iosevka-etoile = "1n5xcnq6vbks53vfaxkm1ykpfcsbw1q3zmkrlrwsdd0zdxjsy1fx";
-  iosevka-slab = "07z3r27px5hsnz9rac290f2xraavflxqnd2ppmjiwz1yg9ch80d9";
-  iosevka-ss01 = "1fd5pjyxrqna98nghsp6rxbaqhmxch89s3jdvqdmpwj87jb6dkcc";
-  iosevka-ss02 = "13i8cqdh8g3wv8686g09aazjly157wvzgf5a6n1az4kcax9cawi3";
-  iosevka-ss03 = "1l1dkk6321czqrd7if4wwmps9r6in88952i1hqgjqr3r797x4k8p";
-  iosevka-ss04 = "1798nzr27pv9dpmjgp9bbivg9dcnk3cz603k3n3igmp8rb4rhz5f";
-  iosevka-ss05 = "0csxpmh6ymkgfhzl5x370y4qdl92cjhas25782n8carg16bc854f";
-  iosevka-ss06 = "12kmb4g0f31jr0d2gr66xjcjjqsmbr5hs0ynqbcsdpk4x58lv4y7";
-  iosevka-ss07 = "1fwdiyzs5prggzld9zip2bqzhngljwsy33cdbfq9526qakbxi67g";
-  iosevka-ss08 = "0yha45vyl0kdl593f04m26sl92vhklr1afd7yhmlkmhhhqp6bs9n";
-  iosevka-ss09 = "0av1npxxky47239x64rbrv7q7gb2lrgyzkaw1mqhafg6yzjn9iq5";
-  iosevka-ss10 = "0w3j04sjkrsd91vl7gyxbjjm76xx64p7b5c97p04xsa09gaig7i9";
-  iosevka-ss11 = "1vv20s4kp3mhngdpxzxwa1hldahxm1cxybnf1hzgd79a1162blhx";
-  iosevka-ss12 = "1yh200azn914s8lyzv8ga68ixxrqhcxx1rywxm3cpmm8iisvjf4y";
-  iosevka-ss13 = "0yvnzz53x0np7w53r5989chs9fcv81mckbf41z519r8l30m31bbj";
-  iosevka-ss14 = "17cv02gbzn0v8c8apdh7dd5s3y2qb9cydr8g5rbczzpvywixxrwr";
-  iosevka-ss15 = "04iqvjx0nkzikar4ivi7zswqvpcd954khmjjx8vicq3x56wggj8z";
-  iosevka-ss16 = "1q3krbi3vh8ry35s24cja77a8430x4n8i4anf8v7rh45sns37fmj";
-  iosevka-ss17 = "0vyzhix547j7yq717ffns6pd5mgis5sbxl85c1qf3nhij8czqg6l";
-  iosevka-ss18 = "0qikq8p8kvxw9lmrgzlm1g26bz3lppbc8jcgl8417jz400npfqg9";
-  sgr-iosevka = "095nwxsgwj671m962ix8qva5himdva0iqv9b5lapgb7acidrj8m7";
-  sgr-iosevka-aile = "1fkl0v7rclia5lwfm7f3vc3gkgnd88gf00icm6qka1xylzk8z83l";
-  sgr-iosevka-curly = "0q7dakcldx7j2cvn8hz079j81y5ab6ziqz6jr51w1whzb46al7rq";
-  sgr-iosevka-curly-slab = "0pw3fbygsgdw0isnv18axh49yxyfjdav6xizrvg6x4y8hispx0xp";
-  sgr-iosevka-etoile = "1fs22ap272hkf1wfymhbvgdpsrnxwadp8z6lv2hv5wy8ibc0ccia";
-  sgr-iosevka-fixed = "0bgag04jidcdj0gmsppc2lhvawpvylxs645sgxjj8bljy6480s96";
-  sgr-iosevka-fixed-curly = "0hgablbcb0wrpdkxw78pyvyni7dh457nwb10acwjxy6lbsshd88z";
-  sgr-iosevka-fixed-curly-slab = "1nb3izaq3slaxypylz3l6r8xjg7yy0yan08nsw8zny5lp0kaiqw9";
-  sgr-iosevka-fixed-slab = "16cc32ysmvifx736alp8bmcb9sjs1426sv72qydy99dafw34xhmm";
-  sgr-iosevka-fixed-ss01 = "0vvjj3dsfj8a60pg1qf7hcm6livsjc40xr0sfc9z1hx3dwjqpvlh";
-  sgr-iosevka-fixed-ss02 = "1yy9hqfdb897wi3nl5ny5j5i56jggbppx4ddckfa62a4jxvfks58";
-  sgr-iosevka-fixed-ss03 = "0qhk1w3gsd3qriyk9k33sfq46h9hn5zy9zk9cpd429z0xdps49kc";
-  sgr-iosevka-fixed-ss04 = "02psmn72r1mkza8n7p4sgrag7iz5zylnw03hnq6fnc4bqnn29gph";
-  sgr-iosevka-fixed-ss05 = "1w3jjjr8vvzjihpai9mivkcm2wngag6iva120zsqgb2n2k1z31bp";
-  sgr-iosevka-fixed-ss06 = "1icabqjnnsj59m4lg3qk820kdsq7hhl3gngfm5x4br43h031cdc7";
-  sgr-iosevka-fixed-ss07 = "0j9l18w7xxdgnw728zyphb52a76rbhb8cv388yc94wldzcmsk1jb";
-  sgr-iosevka-fixed-ss08 = "0js9pf92pgd944dywya1yjdx99sz56ra0nwxs9n9g0zn1rj5czwv";
-  sgr-iosevka-fixed-ss09 = "06bnyhx5rhkqjiwkjy1rxx6mby16wkyb1r4l3lkln5v6v0sfixfp";
-  sgr-iosevka-fixed-ss10 = "13y3vvcrm2v78bmadk051zr3izl0hpcxmfag34cikapzmf9vzxn3";
-  sgr-iosevka-fixed-ss11 = "1rwjzdz2ab90rv5p8hh870x9knhilqh0iiwfkyx8kjp7s9shhncp";
-  sgr-iosevka-fixed-ss12 = "0fj2szv0g2dclf7yhi8xc9hkgz1mw7kpc62hcvs3044ciga9cxrv";
-  sgr-iosevka-fixed-ss13 = "1z6rpf9l6yadzqgrdcyi75vd8mh75b6dx7d9bh06n8sjr5amhav5";
-  sgr-iosevka-fixed-ss14 = "0cp58j9c7fkm0q0ym99rhg7ljvzympwks4wk7l8vhh0wp2hfw78h";
-  sgr-iosevka-fixed-ss15 = "1fzs0c12abrf81yy1254nfiaq5q2rgvnv1yhqh985jmwcr010n83";
-  sgr-iosevka-fixed-ss16 = "16wffgq3b9d290kkbb6xa6z9aphn2d1wzqsqfr4mrkbhpwchbh0i";
-  sgr-iosevka-fixed-ss17 = "030l59270vyjhik8cn2jphdvd6vphr9ac8kqzx3bdbf1wgsr4sir";
-  sgr-iosevka-fixed-ss18 = "06qym0ffxy6j9hagpd3vrf6j5bd83ch150wkqg9rkg1i26q71v36";
-  sgr-iosevka-slab = "0mbdgpxkb3s4a8x0dvnjwqg3za0hl73n3a5vrmy8p694bnx1mi7r";
-  sgr-iosevka-ss01 = "0ilr1jiqmjmjfv4py1q3pdn3j20nh8j99629gq9g1zb82x1c9g9l";
-  sgr-iosevka-ss02 = "0l4cbx4v8zffbbq1lklk8knn0w6j9gjdp1f780k6x0z0jz3dxvdw";
-  sgr-iosevka-ss03 = "0dpl84ybj2h6nv03yy4vrwwksx4zms1c8fgr238w1nbhd7lnlyrv";
-  sgr-iosevka-ss04 = "0xlyjxsz6zc3gljvw0rsfgyv9xg1kvgsy2ibd2950vlxk2c597jb";
-  sgr-iosevka-ss05 = "02vfkdjq01jxjcvcnxs8g2snmq2gg56448yk0l0gna9mi1hagsk3";
-  sgr-iosevka-ss06 = "0b75h0al34f6w0s94i5c88pzs4zjl2iinkwjx855a036mdcqkz1l";
-  sgr-iosevka-ss07 = "1grqjqn9gckpgrrch9xa05ljpwr1rdr4lczsn89irhjz102s0bik";
-  sgr-iosevka-ss08 = "1mzbaslpy7pscmyiiz0k7czw3kjjc9an7mdb4yh99bpxwaskiv3k";
-  sgr-iosevka-ss09 = "1d7r2cv1w9q5h1frvzylizwimp8r6bdpg3fckcrdrfxsl0xfdffc";
-  sgr-iosevka-ss10 = "1jr01z6s476aggnnki0q4x24z35jx03fl4fh1l44pf3rckz7c0m9";
-  sgr-iosevka-ss11 = "05kybk7wskrg2i58h9n31sj1g6m93dcbbxr38y9nfcxb02cdbxp3";
-  sgr-iosevka-ss12 = "0pzrn3b5qj2q7k7slwvvz31j566l8xbmgk6kv324r3r19xcmsx31";
-  sgr-iosevka-ss13 = "1cgn33g39pnjkh452r396cyw00iskrr73k2jghw2ywb8ard024gc";
-  sgr-iosevka-ss14 = "0q74z4p3ybhaha4z6myasxyidy464vmccqk0bji6ks6fdklh2l3m";
-  sgr-iosevka-ss15 = "13gcgv08pwsbnr51b67w5hb9x5vcz7ridxjzwcnjhavssq3qn02x";
-  sgr-iosevka-ss16 = "1lkxrvd328ww8xi2189333p40awk7bb4d5k0mpcibp1r2hqbhx3x";
-  sgr-iosevka-ss17 = "0q4j381k2nz88y2nszd90ynmqyzna5il7j5illhdjk9dyp936f1p";
-  sgr-iosevka-ss18 = "16hdbvx9pa5z03i3dv8x40x6d8nvgxn4vga8sgdgpd2d5k8ibcq5";
-  sgr-iosevka-term = "0a16brmr2xsm48bcd5rrsv1c7b4yhvnkrlqp14p0fawyfs05bk5v";
-  sgr-iosevka-term-curly = "0a53j231zd1nkirp3fg6m72455gmkn0ipvdqswkkipxp5llbxkhx";
-  sgr-iosevka-term-curly-slab = "1ypbffwg7pihq5ywy59y3f2d8dw8p5lzk2284336z3a7i8kzmhpq";
-  sgr-iosevka-term-slab = "0rcf9i8fibrvmhzmm192crl7jlv7bwda7b12865w4g719a8ksdsv";
-  sgr-iosevka-term-ss01 = "0h12vz7qkl6xflffiqjqqkd1ziqkg2pi1s8pk28ak706fv4k203n";
-  sgr-iosevka-term-ss02 = "19d3hqlwv7pi9xyh9amshirbj6ypg6ka5g6hz9dmmh0pmwhcvpjs";
-  sgr-iosevka-term-ss03 = "09b3ghyvrjx8dnh8i9ly3cmkbpl10gn1283q9bjamcc8niva6g36";
-  sgr-iosevka-term-ss04 = "0l27i49myv81x09bj8ii732zc6473psa58ls2zgvd7yz2bihi3ar";
-  sgr-iosevka-term-ss05 = "0421p4y94zxwvc7qyl4zgxld3jrx12wsjirmvfxvfndn0f4dwqyk";
-  sgr-iosevka-term-ss06 = "0dl62wnqfqrryp0hrj073yvvy225swv9kcldhygapi16mw97v30b";
-  sgr-iosevka-term-ss07 = "03sipvjji22g0gajj0vxkmsc81fd173bb816vjv56fh489g04hn3";
-  sgr-iosevka-term-ss08 = "0j0y2dzn6a8r0yg40kajzrhyvl5yf2b8hm7n9970h0gl3rrk5pxa";
-  sgr-iosevka-term-ss09 = "1y37cr436hwb1iqqsybg0w595kbn0373hm0zmwcsmsxb25166lcf";
-  sgr-iosevka-term-ss10 = "1ngyppn90nn8f59xkh63ifl077w0zldjxzxjw8skx2jhj2kis537";
-  sgr-iosevka-term-ss11 = "193snjki9wd6cjpd754g7pvhlyg3yizlcjhcw9x0zx60830xcbd3";
-  sgr-iosevka-term-ss12 = "000maksimlm3gapp8d3cwymkmkg4n0dcwxvlxwgi2a6f5rwgfm8n";
-  sgr-iosevka-term-ss13 = "09yfj7kxd0p2w1dd1n8hwr3j2plqiq7l17rhh0lys1clyw1jrph8";
-  sgr-iosevka-term-ss14 = "16fipp8pka2187mclsf24sxx7idcqh4nn4z63glrg6695g8r0vd0";
-  sgr-iosevka-term-ss15 = "0yaj5all8jljzyhd5qmgvmiwv7whx4f9zvxgv3l53xxww5i5yhiz";
-  sgr-iosevka-term-ss16 = "163g9mj2n8z21nr5yslnq8m4m7j4aq7q918zs8nd5hggjzhqpy9y";
-  sgr-iosevka-term-ss17 = "07zicd0f8bclwxfkvxy6x6bhccz3334wmgfxqpzx36sshyhvfihg";
-  sgr-iosevka-term-ss18 = "1qwxyyqv483p05mvkar9vb2m349is0qgdijri8ipran73w363fhc";
+  iosevka = "1j9yn7kb7g2yyw1dm9bmgblarfaf8fb4vdm7i7iif0kplxr7dgqj";
+  iosevka-aile = "0babmr9gjsgcmlag0pay7dg954h3x9d7g43c8kzgzwsl6xvsgwhn";
+  iosevka-curly = "0xjwk30df2dczypnqzs0jdvdn0wm9x5jb9akqcgm45dpbjmsy2cm";
+  iosevka-curly-slab = "12m6avk1wpajjqfs0wabgjkgmyp72nsx1wb4pa87hi6xrs0z55gs";
+  iosevka-etoile = "1a7ag0xk0vc1rsiys7j9pmrfg8ayrg9wqglmqq3gzdnl9z71hhzn";
+  iosevka-slab = "142k5acg3c67jgprdxj7nhhg6blwj781w655452l3h9i6pvzvqd2";
+  iosevka-ss01 = "01l1a2hqn2rnhyg5dv1nvqpx638dbvqsc1fm969ki03zfxq6q1qq";
+  iosevka-ss02 = "02cfy693p283k6w80fkmsldmnqa34rb1pf5mvnx7712gqksc2wd7";
+  iosevka-ss03 = "102aaypkayj87x7qfswqm6298dvqnjj5rcwmfwb8vnjaisk7rdaw";
+  iosevka-ss04 = "0fc7hd1xjlbm8yknbdmxjhz29bmmpyj8c36ziz2wbbn5f2zf26j3";
+  iosevka-ss05 = "0imsnl012ga9vsri3ghi060h2xpmcv846ap2w2j26rwgknii10gk";
+  iosevka-ss06 = "02yf2vgxgqzx9hjwyvkvwvmyjna12d3sd9h7gfmph9sk0p0m7mss";
+  iosevka-ss07 = "1w1ssy096h9jfhxmwa7gnhrgnvlqvacfb1nip2995v82h44q2fi6";
+  iosevka-ss08 = "1ijy9lm1wm3ckyh17kvcycgpxqnjdyqz52w0q9pw7lqdfgpdq1ai";
+  iosevka-ss09 = "0wymk5gahkr0dv1b0zxkifx4lah0468lrz2k7j919pg93j2ab1an";
+  iosevka-ss10 = "064sqi7y3ypbs7j4cay37hk14qflmmgvpnwrpm637bgnxdh9pd6i";
+  iosevka-ss11 = "15wlc86mnnkfhj66l1j3fvd74ks0ag74zss4893bghiaj3wcfnzx";
+  iosevka-ss12 = "1al9rskiqcsh978x9fgpzrd4zayr6a8bias520gch3vid16mq776";
+  iosevka-ss13 = "0vbjvx0rkzs6wdpb8y35z7a4v6gj06zn5jcbpma6r849kkj1iy0a";
+  iosevka-ss14 = "1qchkd15l532i7y1mwqvsapa7yfh4i393ix5yp4w7hwhf81jd4j5";
+  iosevka-ss15 = "11x4cfqs4ra9xz284s293bzm8x3mwf0sm0bbv4jgz72ab34qbbix";
+  iosevka-ss16 = "1gp7zhlf3mrmrp9vr1yzkwwn86iyvi7fhgb494lyzvivvlrd88hy";
+  iosevka-ss17 = "0i2fnn7afxmngfma0baarp9116sk36h7nx9g8ij1lkp4z2p16bnm";
+  iosevka-ss18 = "1lwj3qz9127z7qqbgls9bswbknzk931yb2akacz64x3qgbm93d5w";
+  sgr-iosevka = "02mzydyy7waihfgwsm2pycn3k75qvdb5q376rn4qb7ibzyv7kvi0";
+  sgr-iosevka-aile = "0l0vipmx0bvqs05wp61ar2nkq3lx2ihkrvskgkdh68v6rxg2na4g";
+  sgr-iosevka-curly = "0bgzaja7nx4p44cs681k1jkffq0pwpc738gh3vjqqcccwhdicg79";
+  sgr-iosevka-curly-slab = "04adkwr6gb1ca9f8a64ai7wlfiy8j198zwfxka64rm19mdv1gva7";
+  sgr-iosevka-etoile = "14svwdrczyphmp97ka0w6496dwym6dkasmqvqqyd51f2crzb76mb";
+  sgr-iosevka-fixed = "1h6w0p8hv8ipkxmyky7frfykakwhkbqkylzbfgiikaad41q230sh";
+  sgr-iosevka-fixed-curly = "1xhgllg93z4x7s623hyl4537v2cqd1z1p8bskxrfg2fhms2848la";
+  sgr-iosevka-fixed-curly-slab = "09zzgia019r5szlcyqv79kka0p76d1gxdnqmpg8nzkw9m3xwps7g";
+  sgr-iosevka-fixed-slab = "0ikzn6vmsdkd737g337kga81pa079bx467rq4ql81ydd66v0dxd9";
+  sgr-iosevka-fixed-ss01 = "1srb1ncmk9zffkwap0qa2n7dyam73qymlxm12kq1x3f26c4j48rd";
+  sgr-iosevka-fixed-ss02 = "0668b6r722qbgnm1mb3grx4psczs1lfvjca2lvqw32rc1fjksr1n";
+  sgr-iosevka-fixed-ss03 = "09irdlxjg0c85vbcmr8jpb1n51ml6kkbq3hmv6rzh2y737if13bm";
+  sgr-iosevka-fixed-ss04 = "07r37m809z45hqv97zpdrhrfdbc1rn5jx1375wf3nrdl14y08d5b";
+  sgr-iosevka-fixed-ss05 = "0in2f0999jh3zks8ymppqsxmk8fhlyixpf6lyjlxrli5g4ls63jm";
+  sgr-iosevka-fixed-ss06 = "1rcjp005wa1qhz1lbp95gjxynqbsaa5y3lcxjrlyp5117xrbckwl";
+  sgr-iosevka-fixed-ss07 = "1whn6mhlz5y6p0pz5a24r2avdxgknkd09iiksq5z55l3jifq6w5a";
+  sgr-iosevka-fixed-ss08 = "18k50bf3ki5kwrlm7i81ycyhgibps1abfddv6431sidb953dw5h4";
+  sgr-iosevka-fixed-ss09 = "1gxiipbqnvq4l9i5z9jvrkha6d15pdnnyzv8dpgr2wb90d9kkc6y";
+  sgr-iosevka-fixed-ss10 = "1d81qgylgq1jgasi5spahazjw0pkid1w0hanxbj0yrmmd2w7r8h7";
+  sgr-iosevka-fixed-ss11 = "19qjs9gars612792mg163smmggbyrmbrnz94ixiy40k321zr29sa";
+  sgr-iosevka-fixed-ss12 = "0ys5piwqsvmln1h4wp1dminhparcba7z08p91vvdwnzdkgywqnlh";
+  sgr-iosevka-fixed-ss13 = "19br5vfwngnwg7y00iidw3ga9brabd5xppbwiqs5zysdlybb4pwp";
+  sgr-iosevka-fixed-ss14 = "1nshbbap612f2x4b6m3bj1d99rwym5nxi0a2rajpg8mxf4ha5w57";
+  sgr-iosevka-fixed-ss15 = "1zyv1prndjm6bixqr0pzhw0j86jg75ldxppyxf9r0ybw3pm132nv";
+  sgr-iosevka-fixed-ss16 = "0b7f29hg4jzzi63xbb78m8rrf2kavvlp4nfgl2rnm7gckk5yfl70";
+  sgr-iosevka-fixed-ss17 = "1vhfa79bjvpig6vbnmr52lmpsn5kkqcib4gqz875sgj4q557plxk";
+  sgr-iosevka-fixed-ss18 = "1s3k12xz2506bi545nb9b9g6wd6jhlp1jf5sf40my2b8j721dr6s";
+  sgr-iosevka-slab = "18f14g3yhs9rzj3njxn99m6zilp5xh3xdmycqza3cpcm9bxy61qp";
+  sgr-iosevka-ss01 = "1rnnaxla2q0wd2wgn4ixg6z0n3yhaw0fwxxii1pip8bnvmfhg1hv";
+  sgr-iosevka-ss02 = "0mkrvc2kjindvjnvp009b3b8z0ci0v5x5rjk94ynwnxw0yi0d209";
+  sgr-iosevka-ss03 = "1h2ygx71ajx56p14xr8y0rw13dm6aml2r7whi0nicx67q3yqmmxg";
+  sgr-iosevka-ss04 = "1h0ji0lpadfhx8sir9m19zjykqqlvgvq7cg37a4l6xxf716bh2l2";
+  sgr-iosevka-ss05 = "1f8j8zjr5ja9x444pcrwimzv46sp5kls1k6ca9q8lax2jj4dpx32";
+  sgr-iosevka-ss06 = "05l5i76lv8w5qdwwbn05r4zykaczgq940jcrw49f7kjc47rvd8mi";
+  sgr-iosevka-ss07 = "03833pxrczwy8c38sqgbpszq5s5s9kpfmamjb9qjgnfcpzy99w60";
+  sgr-iosevka-ss08 = "02iihwlkm4jasmwa33waxa8pj032w2xviw84ffgh4qvl3qhric22";
+  sgr-iosevka-ss09 = "04cf7hgghd32wv21x9f8rrb9kfn9d3542rjfsqj5ydh68rq2jz66";
+  sgr-iosevka-ss10 = "1g4i2h024jw93n7q6qacsnhhbrin7m8amqvp6535d51j74rblbxy";
+  sgr-iosevka-ss11 = "0az3drdy6b812zkjp6if78v3952sxjyk2ncpsi7riij84ckb35p4";
+  sgr-iosevka-ss12 = "1f5zhsxa68jhvv07s4g2clk7bs5gfhfwg4cpand1w6pk263bvzhx";
+  sgr-iosevka-ss13 = "0sdrxyf7kr6ys3zpb4vrfkhr0dx2na9ip9dj43sh55ld6ppbh0r0";
+  sgr-iosevka-ss14 = "09pwhq09mml5la4dhd0xyl0nm63rdl30chcyzj2d7j6i0qfih3z6";
+  sgr-iosevka-ss15 = "08mjhs9g2yxy7drl8jn2f7qw66vmh4i61x5c6n22bml8y67cfzfc";
+  sgr-iosevka-ss16 = "0wq6d7fsy7rdhdms83401srm0ij11yk2458fgxmgr9cj8nfykzpm";
+  sgr-iosevka-ss17 = "0v04afwg8qryh2s3096amh7mj9cnn112j4wgx3jgqqhwmsb0h6s0";
+  sgr-iosevka-ss18 = "0mczg8glhvvfin2q62vcpxci0pgmh5f9mswn8ys3fh7mkk4hag7x";
+  sgr-iosevka-term = "15yb718fb6f3ywc32875zd7pglnlrnmh9hzrhynl1lba71pq59c4";
+  sgr-iosevka-term-curly = "1fs4infd0ps4v3fcij9c8jw1nz48rblq2hq2v5f8qsj1xn2k69x4";
+  sgr-iosevka-term-curly-slab = "0na07g2bcd173j6gzwlqziw4blbf92j0kx4m1y2x1k4ss606fzd5";
+  sgr-iosevka-term-slab = "125wvyrf8mly7a51p705df4nryzh17rm7pc9zhydngxfmmaxrmcw";
+  sgr-iosevka-term-ss01 = "1lmb0b2wzwq298kww3d3656xr67dmn8gz43582y3armggdxsgp8x";
+  sgr-iosevka-term-ss02 = "06mfxiazkab55ddqxd3k3mklwcjavn9567b4bk5n6n38krilmfd4";
+  sgr-iosevka-term-ss03 = "1if3kxas3j287x0pl5q18j255c30rv24fbv8500s4a0min8n5315";
+  sgr-iosevka-term-ss04 = "1q5zxhgzsgg2fzyjmp4mp63957jhf6xp66qlkp59iwzixc46lk8a";
+  sgr-iosevka-term-ss05 = "1vln43l0sps02badcvfpxkr9vy80fzy7bcknza4axihf5dsfl233";
+  sgr-iosevka-term-ss06 = "1z2i26qh5krp4y0nh3hvlf60wnwzkkvh2b9q69f1pqlxmhnc3c2f";
+  sgr-iosevka-term-ss07 = "1zx71hyygg2f7pma65zdymvdz4lbqzh9iiflpl4a2knhl50s3wk2";
+  sgr-iosevka-term-ss08 = "08wqn6pqrmr5523nshvmlwmlkv4x4chbp2inr5n6v1wpsr7m3zfz";
+  sgr-iosevka-term-ss09 = "1iqicymw6dwxanrv9xb2jcnxw84bj5v4bk9gzc33l3mf5kqfywi7";
+  sgr-iosevka-term-ss10 = "1hl06vryvfy69b5q2rdhxv8acz8haj076xlicg8wpvmiwnbli6p8";
+  sgr-iosevka-term-ss11 = "1nzd49866v43zm1hv1bb5pn9gf0mhk1ay2c90jl32s1yk0lj3drr";
+  sgr-iosevka-term-ss12 = "0y356mvs29yz8kxh32w39hv8vm9c6m6i4hmkic4hnxdm13qbq32i";
+  sgr-iosevka-term-ss13 = "094scl6hhdm7kpkmlv9r7ss1f0w4dn621iz179lg4kx7h7a1x018";
+  sgr-iosevka-term-ss14 = "06dr1sbb5awzncgk84bi2l1649ssnb8h8zzydgg040v5jc2y63v4";
+  sgr-iosevka-term-ss15 = "0bksrj3xkhy5w0d4nv86lbc2pjx3fm8sjpkc86ybda958s8kw4ks";
+  sgr-iosevka-term-ss16 = "0bqr23cpa3a6vid1hr9dxn0fg69900hdlyr84lcyv49qmppls9ix";
+  sgr-iosevka-term-ss17 = "0mawzcb1474k4x67y4rs6q1mf3dch3mm7is5zj7shmm5gchf4v70";
+  sgr-iosevka-term-ss18 = "1afzrxw9clmi77rczd4rx6i1c3548wci13m66r69j6a5rcxyzk2b";
 }
-- 
cgit 1.4.1


From d384201cb94d570153f6e470bbf143c5345b6632 Mon Sep 17 00:00:00 2001
From: Ivan Kovnatsky <75213+ivankovnatsky@users.noreply.github.com>
Date: Mon, 8 May 2023 11:26:22 +0300
Subject: stc-cli: init at 1.4

---
 pkgs/applications/networking/stc-cli/default.nix   | 23 ++++++++++++++++++++++
 .../networking/syncthing-cli/default.nix           | 23 ----------------------
 pkgs/top-level/all-packages.nix                    |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/applications/networking/stc-cli/default.nix
 delete mode 100644 pkgs/applications/networking/syncthing-cli/default.nix

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/stc-cli/default.nix b/pkgs/applications/networking/stc-cli/default.nix
new file mode 100644
index 0000000000000..85dadfee73a2b
--- /dev/null
+++ b/pkgs/applications/networking/stc-cli/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "stc";
+  version = "1.4";
+
+  src = fetchFromGitHub {
+    owner = "tenox7";
+    repo = pname;
+    rev = "${version}";
+    sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U=";
+  };
+
+  vendorSha256 = "sha256-0OsxCGCJT5k5bHXNSIL6QiJXj72bzYCZiI03gvHQuR8=";
+
+  meta = with lib; {
+    description = "Syncthing CLI Tool";
+    homepage = "https://github.com/tenox7/stc";
+    changelog = "https://github.com/tenox7/stc/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ivankovnatsky ];
+  };
+}
diff --git a/pkgs/applications/networking/syncthing-cli/default.nix b/pkgs/applications/networking/syncthing-cli/default.nix
deleted file mode 100644
index 85dadfee73a2b..0000000000000
--- a/pkgs/applications/networking/syncthing-cli/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  pname = "stc";
-  version = "1.4";
-
-  src = fetchFromGitHub {
-    owner = "tenox7";
-    repo = pname;
-    rev = "${version}";
-    sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U=";
-  };
-
-  vendorSha256 = "sha256-0OsxCGCJT5k5bHXNSIL6QiJXj72bzYCZiI03gvHQuR8=";
-
-  meta = with lib; {
-    description = "Syncthing CLI Tool";
-    homepage = "https://github.com/tenox7/stc";
-    changelog = "https://github.com/tenox7/stc/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ivankovnatsky ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13993771bc6ca..cca7ffd1ac1e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33811,7 +33811,7 @@ with pkgs;
     syncthing-discovery
     syncthing-relay;
 
-  syncthing-cli = callPackage ../applications/networking/syncthing-cli { };
+  stc-cli = callPackage ../applications/networking/stc-cli { };
 
   syncthing-tray = callPackage ../applications/misc/syncthing-tray { };
 
-- 
cgit 1.4.1


From 62621d615af8147bbd9449c81c37dde12ee6a85a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 8 May 2023 10:26:53 +0200
Subject: python310Packages.aioesphomeapi: 13.7.3 -> 13.7.4

Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v13.7.4
---
 pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index cd0e447db7bfd..cccf249b1f7a3 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "13.7.3";
+  version = "13.7.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Ywa3m/aUp+CBRdA80a9P2eDwlZfsVYFGbE7ZLggVfwM=";
+    hash = "sha256-licFBWT6CBYHgzVj2dza5gusjapABJWgsfHO/HJafnA=";
   };
 
   propagatedBuildInputs = [
-- 
cgit 1.4.1


From 86cf3fca1f540e42a9c4f106b60553abbfadaf03 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 8 May 2023 10:29:54 +0200
Subject: python310Packages.fakeredis: 2.11.2 -> 2.12.0

Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.12.0
---
 pkgs/development/python-modules/fakeredis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index e64464a2cfc1b..9f2ee8f0d7604 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "2.11.2";
+  version = "2.12.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-MjyLyIcf0NmQMHWEN/IMq68UIrkj1VgVW5RrxZe36gc=";
+    hash = "sha256-D38EORmhPPN+iTggIF9JIRDR4+zCwE6JP8X+IVfdE7o=";
   };
 
   nativeBuildInputs = [
-- 
cgit 1.4.1


From 227778a165cc77815bebe8a9d0db9ecf32279da7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 8 May 2023 01:29:48 +0200
Subject: python310Packages.rules: init at 3.3.0

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

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/rules/default.nix b/pkgs/development/python-modules/rules/default.nix
new file mode 100644
index 0000000000000..3563b76affe75
--- /dev/null
+++ b/pkgs/development/python-modules/rules/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# tests
+, django
+, djangorestframework
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "rules";
+  version = "3.3.0";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "dfunckt";
+    repo = "django-rules";
+    rev = "v${version}";
+    hash = "sha256-UFRfRwcvxEn0fD3ScJJ7f/EHd93BOpY3cEF9QDryJZY=";
+  };
+
+  pythonImportsCheck = [
+    "rules"
+  ];
+
+  nativeCheckInputs = [
+    django
+    djangorestframework
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} tests/manage.py test testsuite -v2
+    runHook postCheck
+  '';
+
+  meta = with lib; {
+    description = "Awesome Django authorization, without the database";
+    homepage = "https://github.com/dfunckt/django-rules";
+    changelog = "https://github.com/dfunckt/django-rules/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1df7f1a0dd0cc..f038ab99be6ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10588,6 +10588,8 @@ self: super: with self; {
 
   ruffus = callPackage ../development/python-modules/ruffus { };
 
+  rules = callPackage ../development/python-modules/rules { };
+
   ruuvitag-ble = callPackage ../development/python-modules/ruuvitag-ble { };
 
   ruyaml = callPackage ../development/python-modules/ruyaml { };
-- 
cgit 1.4.1


From ae2c8327978b46425d49000af2fc6773a32e296c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 May 2023 10:32:08 +0000
Subject: buf: 1.17.0 -> 1.18.0

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

(limited to 'pkgs')

diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix
index bb305154dc4de..3b3e4a21fbcda 100644
--- a/pkgs/development/tools/buf/default.nix
+++ b/pkgs/development/tools/buf/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "buf";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-GvWbezfRPdZqd53GcBNHca9yYt0a5WLBXNgahKGQaUI=";
+    hash = "sha256-wMYl9TlOQ4h5MFNNWaGkou7YIBSsMfhV70ABgKkC7xo=";
   };
 
-  vendorHash = "sha256-ajSWq58KUX5Qi36jlV3ftIrK7XWjLAusf4BPkQy6EPU=";
+  vendorHash = "sha256-pyhK0tHpHrEkGRkWgzTFg9FNNBx3SwoWUfw+2zk7nAs=";
 
   patches = [
     # Skip a test that requires networking to be available to work.
-- 
cgit 1.4.1


From 7911717ffb070b5a950fd523bb8483b2b10d3f66 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <github@anymore.nl>
Date: Mon, 8 May 2023 11:27:44 +0200
Subject: davmail: 6.0.1 -> 6.1.0

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

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
index 5826c94f4bb8c..5f5283738c062 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -14,7 +14,7 @@
 }:
 
 let
-  rev = 3390;
+  rev = 3423;
   jre' = if preferZulu then zulu else jre;
   gtk' = if preferGtk3 then gtk3 else gtk2;
 
@@ -23,11 +23,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "davmail";
-  version = "6.0.1";
+  version = "6.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip";
-    sha256 = "1i1z1kdglccg7pyidlfbagdhgs0wqvybl8dwxcpglh2hkvi0dba0";
+    sha256 = "sha256-/JsJFtGalNuOz21eeCPR/LvLueMtQAR7VSKN8SpnPvA=";
   };
 
   postPatch = ''
-- 
cgit 1.4.1


From a265d187c92952c0dcc625957f1a18a0db5023c3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 8 May 2023 11:35:04 +0300
Subject: hyprpaper: mark as broken on darwin

---
 pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs')

diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
index 8905be07b1aa9..5b7435a2e42ba 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
@@ -59,5 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.bsd3;
     maintainers = with maintainers; [ wozeparrot fufexan ];
     inherit (wayland.meta) platforms;
+    broken = stdenv.isDarwin;
   };
 })
-- 
cgit 1.4.1


From 4cdf91c85b11bb534e0e46d17e1e5aadb2c1d1ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 May 2023 19:06:56 +0000
Subject: free42: 3.0.17 -> 3.0.20

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

(limited to 'pkgs')

diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix
index 71145c6809f64..ce86dfdea9796 100644
--- a/pkgs/applications/misc/free42/default.nix
+++ b/pkgs/applications/misc/free42/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "free42";
-  version = "3.0.17";
+  version = "3.0.20";
 
   src = fetchFromGitHub {
     owner = "thomasokken";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-3G2vRPupZtZKF1VazNQGa1AplqFzhI5M+olyeJ26kXo=";
+    hash = "sha256-Dqrys7bAkSnpbOF0D17RDYi7q47ExlM75d5OOAnHCVU=";
   };
 
   nativeBuildInputs = [
-- 
cgit 1.4.1