From eddeb83f1ca86ebad92e112da94e6751d9de304c Mon Sep 17 00:00:00 2001
From: Archit Gupta <archit@accelbread.com>
Date: Sat, 1 Jul 2023 00:00:33 -0700
Subject: [PATCH 01/64] shattered-pixel-dungeon: include XDG desktop and icon
 files

---
 .../games/shattered-pixel-dungeon/default.nix | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix
index 9ad8deea78f..07c486c4547 100644
--- a/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/default.nix
@@ -6,6 +6,8 @@
 , perl
 , jre
 , libpulseaudio
+, makeDesktopItem
+, copyDesktopItems
 }:
 
 let
@@ -52,26 +54,52 @@ let
     outputHash = "sha256-i4k5tdo07E1NJwywroaGvRjZ+/xrDp6ra+GTYwTB7uk=";
   };
 
+  desktopItem = makeDesktopItem {
+    name = "shattered-pixel-dungeon";
+    desktopName = "Shattered Pixel Dungeon";
+    comment = "An open-source traditional roguelike dungeon crawler";
+    icon = "shattered-pixel-dungeon";
+    exec = "shattered-pixel-dungeon";
+    terminal = false;
+    categories = [ "Game" "AdventureGame" ];
+    keywords = [ "roguelike" "dungeon" "crawler" ];
+  };
+
 in stdenv.mkDerivation rec {
   inherit pname version src patches postPatch;
 
-  nativeBuildInputs = [ gradle perl makeWrapper ];
+  nativeBuildInputs = [ gradle perl makeWrapper copyDesktopItems ];
+
+  desktopItems = [ desktopItem ];
 
   buildPhase = ''
+    runHook preBuild
+
     export GRADLE_USER_HOME=$(mktemp -d)
     # https://github.com/gradle/gradle/issues/4426
     ${lib.optionalString stdenv.isDarwin "export TERM=dumb"}
     # point to offline repo
     sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle
     gradle --offline --no-daemon desktop:release
+
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
+
     install -Dm644 desktop/build/libs/desktop-${version}.jar $out/share/shattered-pixel-dungeon.jar
     mkdir $out/bin
     makeWrapper ${jre}/bin/java $out/bin/shattered-pixel-dungeon \
       --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \
       --add-flags "-jar $out/share/shattered-pixel-dungeon.jar"
+
+    for s in 16 32 48 64 128 256; do
+      install -Dm644 desktop/src/main/assets/icons/icon_$s.png \
+        $out/share/icons/hicolor/''${s}x$s/apps/shattered-pixel-dungeon.png
+    done
+
+    runHook postInstall
   '';
 
   passthru.tests = {

From f53b5bd71f3e7f31eca09af8c510da7744b0f3a8 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Mon, 3 Jul 2023 17:48:19 +0900
Subject: [PATCH 02/64] python310Packages.python-pushover: remove

It is unmaintained and broken.
---
 .../python-modules/pushover/default.nix       | 25 -------------------
 .../poetry2nix/overrides/build-systems.json   |  3 ---
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 4 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pushover/default.nix

diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix
deleted file mode 100644
index 0f8a5f2779c..00000000000
--- a/pkgs/development/python-modules/pushover/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi
-, requests }:
-
-buildPythonPackage rec {
-  pname = "python-pushover";
-  version = "0.4";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "dee1b1344fb8a5874365fc9f886d9cbc7775536629999be54dfa60177cf80810";
-  };
-
-  propagatedBuildInputs = [ requests ];
-
-  # tests require network
-  doCheck = false;
-
-  meta = with lib; {
-    broken = true; # Relies on 2to3 via setuptools
-    description = "Bindings and command line utility for the Pushover notification service";
-    homepage = "https://github.com/Thibauth/python-pushover";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
index 3da1a791863..b212fffc1b1 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
@@ -14823,9 +14823,6 @@
   "python-ptrace": [
     "setuptools"
   ],
-  "python-pushover": [
-    "setuptools"
-  ],
   "python-rabbitair": [
     "setuptools"
   ],
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index aaaa6b6e50c..9c3dc60956a 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -269,6 +269,7 @@ mapAliases ({
   python_mimeparse = python-mimeparse; # added 2021-10-31
   python-language-server = throw "python-language-server is no longer maintained, use the python-lsp-server community fork instead."; # Added 2022-08-03
   python-Levenshtein = levenshtein;
+  python-pushover = throw "python-pushover has been removed, since it is unmaintained and is broken"; # added 2023-07-03
   python-subunit = subunit; # added 2021-09-10
   pytest_xdist = pytest-xdist; # added 2021-01-04
   python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6997607a818..7ea124e7ddb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10116,8 +10116,6 @@ self: super: with self; {
 
   python-ptrace = callPackage ../development/python-modules/python-ptrace { };
 
-  python-pushover = callPackage ../development/python-modules/pushover { };
-
   python-rapidjson = callPackage ../development/python-modules/python-rapidjson { };
 
   python-rabbitair = callPackage ../development/python-modules/python-rabbitair { };

From 5cb8a0fec32c8bd9ed93fcf0ada12305942248fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Jul 2023 04:23:33 +0000
Subject: [PATCH 03/64] cf-terraforming: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix
index 7774d0513f5..05f8586a145 100644
--- a/pkgs/tools/misc/cf-terraforming/default.nix
+++ b/pkgs/tools/misc/cf-terraforming/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "cf-terraforming";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cf-terraforming";
     rev = "v${version}";
-    sha256 = "sha256-HCJYLU3eo1C06qp8sb2MsDoLrD0bDeu5WEeGCrOucn4=";
+    sha256 = "sha256-s2xsFJ+8ivkdG2F52iRdTbJDEw8ALmFDR7Ct6d84p+s=";
   };
 
-  vendorHash = "sha256-HLKk64PcJUjKfY4pIwI2OXnjqFF1EkYlWOi0aWOVSbk=";
+  vendorHash = "sha256-pe5ieCstUe3ZHlJs83lzwNS2qAIhIGJG9E5P4Ri3E/s=";
   ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ];
 
   # The test suite insists on downloading a binary release of Terraform from

From 58cef3a80050379c9d952b9b9e645494e9a75e2b Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Thu, 6 Jul 2023 23:54:04 +0900
Subject: [PATCH 04/64] docker-compose-language-service: 0.1.3 -> 0.2.0

Diff: https://github.com/microsoft/compose-language-service/compare/v0.1.3...v0.2.0

Changelog: https://github.com/microsoft/compose-language-service/releases/tag/v0.2.0
---
 .../docker-compose-language-service/default.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix b/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix
index f765cf84e02..e699d8a26df 100644
--- a/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix
+++ b/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix
@@ -5,16 +5,16 @@
 
 buildNpmPackage rec {
   pname = "docker-compose-language-service";
-  version = "0.1.3";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "compose-language-service";
     rev = "v${version}";
-    hash = "sha256-faQvUHzqtCipceGnamVQIlAWCDpo7oX01/zGz9RLjMY=";
+    hash = "sha256-UBnABi7DMKrAFkRA8H6us/Oq4yM0mJ+kwOm0Rt8XnGw=";
   };
 
-  npmDepsHash = "sha256-gWaZMsI1HVIXKZInfgzfH8syzOwU2C6kcKvB2M6KLX4=";
+  npmDepsHash = "sha256-G1X9WrnwN6wM9S76PsGrPTmmiMBUKu4T2Al3HH3Wo+w=";
 
   meta = with lib; {
     description = "Language service for Docker Compose documents";

From dcc8eff86a186045500f1c79a26bbe95481f674d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Jul 2023 13:20:00 +0000
Subject: [PATCH 05/64] python310Packages.pvlib: 0.10.0 -> 0.10.1

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

diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index 8f07f7bf0be..07f408919df 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -18,12 +18,12 @@
 
 buildPythonPackage rec {
   pname = "pvlib";
-  version = "0.10.0";
+  version = "0.10.1";
   format = "pyproject";
 
   src = fetchPypi{
     inherit pname version;
-    hash = "sha256-K/f6tjBznXYJz+Y5tVS1Bj+DKcPtCPlwiKe/YTEsGSI=";
+    hash = "sha256-H3wiNCmnZ6+GjXMhDbeOL98Yy7V6s2oOFAKWJCb8XCk=";
   };
 
   nativeBuildInputs = [

From 082e402751233816462c4394a936fc82aae5a6d7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 7 Jul 2023 18:19:32 +0200
Subject: [PATCH 06/64] python311Packages.pvlib: add changelog to meta

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

diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index 07f408919df..748910e3c66 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -51,6 +51,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://pvlib-python.readthedocs.io";
     description = "Simulate the performance of photovoltaic energy systems";
+    changelog = "https://pvlib-python.readthedocs.io/en/v${version}/whatsnew.html";
     license = licenses.bsd3;
     maintainers = with maintainers; [ jluttine ];
   };

From 804d6dbb72faafea2325a06debb9179560bb9a42 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 7 Jul 2023 18:20:58 +0200
Subject: [PATCH 07/64] python311Packages.pvlib: disable on unsupported Python
 releases

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

diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index 748910e3c66..1842d5beb2c 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -9,6 +9,7 @@
 , pytest-remotedata
 , pytest-rerunfailures
 , pytest-timeout
+, pythonOlder
 , pytz
 , requests
 , requests-mock
@@ -21,6 +22,8 @@ buildPythonPackage rec {
   version = "0.10.1";
   format = "pyproject";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchPypi{
     inherit pname version;
     hash = "sha256-H3wiNCmnZ6+GjXMhDbeOL98Yy7V6s2oOFAKWJCb8XCk=";

From 3f7a3526de6868e337c8f7a9a97818232faa265c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 7 Jul 2023 18:22:42 +0200
Subject: [PATCH 08/64] python311Packages.pvlib: add pythonImportsCheck

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

diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index 1842d5beb2c..8f7c58a3dfd 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -51,6 +51,10 @@ buildPythonPackage rec {
     requests-mock
   ];
 
+  pythonImportsCheck = [
+    "pvlib"
+  ];
+
   meta = with lib; {
     homepage = "https://pvlib-python.readthedocs.io";
     description = "Simulate the performance of photovoltaic energy systems";

From 86ae36f64e6a20f49ca0fbc6fd8a304b09c4b7b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Jul 2023 19:01:53 +0000
Subject: [PATCH 09/64] doppler: 3.63.0 -> 3.63.1

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

diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix
index 840ca066f65..56b5884b047 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/tools/security/doppler/default.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "doppler";
-  version = "3.63.0";
+  version = "3.63.1";
 
   src = fetchFromGitHub {
     owner = "dopplerhq";
     repo = "cli";
     rev = version;
-    sha256 = "sha256-7M/ZdeaiOWJEXEhZ0Sj8oxvMgo0mgSNmpUBWm9qxafA=";
+    sha256 = "sha256-ESh35VSxFeg8d9cu4FJZi4m1/3cb2iRkngUDrInljV4=";
   };
 
   vendorHash = "sha256-yuGjaUHfXCJnMvxfaSwbVAApflwfsvX2W7iEZdruMDE=";

From ab0bc61e840afc0b6ab7662329ef853221ddde17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Jul 2023 19:03:57 +0000
Subject: [PATCH 10/64] networkmanager_dmenu: 2.1.0 -> 2.3.0

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

diff --git a/pkgs/tools/networking/networkmanager/dmenu/default.nix b/pkgs/tools/networking/networkmanager/dmenu/default.nix
index 741c7349433..7af0be41835 100644
--- a/pkgs/tools/networking/networkmanager/dmenu/default.nix
+++ b/pkgs/tools/networking/networkmanager/dmenu/default.nix
@@ -4,13 +4,13 @@
 let inherit (python3Packages) python pygobject3;
 in stdenv.mkDerivation rec {
   pname = "networkmanager_dmenu";
-  version = "2.1.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "networkmanager-dmenu";
     rev = "v${version}";
-    sha256 = "sha256-btwiKxmb1xDtPSTOIvpHJDQ5SY1gnBWlKnYOzzSLDEY=";
+    sha256 = "sha256-cJeDYk2BQv2ZWGC96I7lXFFYgseWj68ZfvE7ATW46U0=";
   };
 
   buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ];

From ef15695178bb2376773479b98db346d0584d10fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Jul 2023 22:01:38 +0000
Subject: [PATCH 11/64] murex: 4.2.5110 -> 4.3.3200

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

diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix
index 519369e28d1..8e3792e5b13 100644
--- a/pkgs/shells/murex/default.nix
+++ b/pkgs/shells/murex/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "murex";
-  version = "4.2.5110";
+  version = "4.3.3200";
 
   src = fetchFromGitHub {
     owner = "lmorg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-qUnOHnYEzkEQyAn1S2dWXWJIDs0UBtPXIufCzQAtZw8=";
+    sha256 = "sha256-W0P/WZ+GC0on7ZKjGNq6UQO9iAMIo7vODn9JltfK5XY=";
   };
 
   vendorHash = "sha256-eQfffqNxt6es/3/H59FC5mLn1IU3oMpY/quzgNOgOaU=";

From 46e5e292b72df2305a80fe2519e86a4effa4d545 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 02:40:49 +0000
Subject: [PATCH 12/64] python310Packages.datashader: 0.15.0 -> 0.15.1

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

diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix
index 3382b4c99e9..919565bb9e4 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "datashader";
-  version = "0.15.0";
+  version = "0.15.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-gbBIGnVTDnE8+s9CHaXgYspXkYMkZph/cLWXJMwDhy8=";
+    hash = "sha256-vkgfO9WGKMuaL5SxcwMQWKG6FEYxLgRbkvftUkMwg4s=";
   };
 
   propagatedBuildInputs = [

From 17701c72a3b6298a3ca32cdc208fbbc63631a522 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 04:49:45 +0000
Subject: [PATCH 13/64] cudatext-qt: 1.195.0 -> 1.196.0

---
 pkgs/applications/editors/cudatext/default.nix | 4 ++--
 pkgs/applications/editors/cudatext/deps.json   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index ec7d4e24976..3a178930f51 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cudatext";
-  version = "1.195.0";
+  version = "1.196.0";
 
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
     rev = version;
-    hash = "sha256-7KAT7rWq4jjSz/oxw8K+WrWwJWf0Dq8cR0oyHtA4R9g=";
+    hash = "sha256-O037+Pm/aq/9ZPMYpWlNPa9tEilatN8OJ3oBAuk4UTs=";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json
index 763a29a503a..d7f06d94fc3 100644
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@@ -16,8 +16,8 @@
   },
   "ATSynEdit": {
     "owner": "Alexey-T",
-    "rev": "2023.05.31",
-    "hash": "sha256-N+ypCg9Tmg+/Y7KMXTZR4aiRqbsHZwKIUidVPthEJvI="
+    "rev": "2023.07.05",
+    "hash": "sha256-+FZjmrB8t7WM3XALqT+jvTSbBYIVLav4zSSCvMr5r+U="
   },
   "ATSynEdit_Cmp": {
     "owner": "Alexey-T",
@@ -31,8 +31,8 @@
   },
   "ATSynEdit_Ex": {
     "owner": "Alexey-T",
-    "rev": "2023.05.31",
-    "hash": "sha256-z0RGk0/oWTPpp/VSM4PBPLWIIQ5cVkQXlQyciW++SH0="
+    "rev": "2023.07.05",
+    "hash": "sha256-dvo4lariMl/FMSp6VJEAk/Zhaz2fdBxe7aKw229DxKw="
   },
   "Python-for-Lazarus": {
     "owner": "Alexey-T",

From 47d5bee54372d0c563b35c62f07290b3876021e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 07:27:05 +0000
Subject: [PATCH 14/64] veryfasttree: 4.0 -> 4.0.1

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

diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/applications/science/biology/veryfasttree/default.nix
index a5d54edce52..6f46524a5ba 100644
--- a/pkgs/applications/science/biology/veryfasttree/default.nix
+++ b/pkgs/applications/science/biology/veryfasttree/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname   = "veryfasttree";
-  version = "4.0";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "citiususc";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ue3/2UTIQA6av+66xvGApLi9x0kM5vAmGHHTrboOaeQ=";
+    hash = "sha256-fv5ovi180Osok5GYJEidjMqmL8gZKUcxrcCQ/00lvi4=";
   };
 
   nativeBuildInputs = [ cmake ];

From bab312ab3c55269822a2a4f052112dae7f42909e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 07:31:39 +0000
Subject: [PATCH 15/64] temporal: 1.21.0 -> 1.21.1

---
 pkgs/applications/networking/cluster/temporal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix
index 44ba2491588..72a8f8c23ff 100644
--- a/pkgs/applications/networking/cluster/temporal/default.nix
+++ b/pkgs/applications/networking/cluster/temporal/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "temporal";
-  version = "1.21.0";
+  version = "1.21.1";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "temporal";
     rev = "v${version}";
-    hash = "sha256-PhJLO+0JoSGS/aN6ZZoCwSypm8hihwAjsav+l4NSNZo=";
+    hash = "sha256-fa8UQk3E1XhMqd7E9VRYOv6RLQW8smSUw48FeYBqmSU=";
   };
 
   vendorHash = "sha256-rgUdoFR7Qcp1h7v63DAWwx6NWSwWrJ6C6/b2tx2kCCw=";

From cb704c2196fc04e27c89a967734d0ca33389920f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 07:38:43 +0000
Subject: [PATCH 16/64] zarf: 0.28.0 -> 0.28.1

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

diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix
index a51e439439b..3c6f1275a29 100644
--- a/pkgs/applications/networking/cluster/zarf/default.nix
+++ b/pkgs/applications/networking/cluster/zarf/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "zarf";
-  version = "0.28.0";
+  version = "0.28.1";
 
   src = fetchFromGitHub {
     owner = "defenseunicorns";
     repo = "zarf";
     rev = "v${version}";
-    hash = "sha256-TE7XP+qZkFxmms1iWDH8ziO8Rvkuo8cz8NdnMC/VU4s=";
+    hash = "sha256-TgrYDLlbaYQwRpG4Vy9sZGWawbN4iS9YFVEjlB3JVfY=";
   };
 
-  vendorHash = "sha256-5HIRwOTZwElU2Ej8EhwmTtqtL6r+Hc7Vp8XjqCulo34=";
+  vendorHash = "sha256-dIQ+6aWI47zI++4skMFnyDYpQPcHEHSwUS9aXatY43g=";
   proxyVendor = true;
 
   preBuild = ''

From 2dbe69614efde5c71c586dd98eb66c666297b555 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 08:20:01 +0000
Subject: [PATCH 17/64] steampipe: 0.20.7 -> 0.20.8

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

diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix
index 9291d32972e..e903b064d02 100644
--- a/pkgs/tools/misc/steampipe/default.nix
+++ b/pkgs/tools/misc/steampipe/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "steampipe";
-  version = "0.20.7";
+  version = "0.20.8";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe";
     rev = "v${version}";
-    sha256 = "sha256-t9RNrbW7wR2WiUacf6/U4qtcR7ZvDZ+duRQ282ScRmU=";
+    sha256 = "sha256-neHcLO64Ik61P6R6rFL3kuKi9qRQ64f1xEqUrgUKeCg=";
   };
 
   vendorHash = "sha256-VuUzo+afUazXH7jaR4Qm5Kfr6qiyHqdGLJWS3MX8oOA=";

From b23da2b3fe3ca6d347a044a73b6a0527e567b573 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 08:21:16 +0000
Subject: [PATCH 18/64] netmaker: 0.20.2 -> 0.20.3

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

diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix
index 61180ba9be6..2bc25913e0b 100644
--- a/pkgs/applications/networking/netmaker/default.nix
+++ b/pkgs/applications/networking/netmaker/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "netmaker";
-  version = "0.20.2";
+  version = "0.20.3";
 
   src = fetchFromGitHub {
     owner = "gravitl";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-oxXGNmec5s4yN2SAjAUrvF2gJ9XkafwK98kDroIIssQ=";
+    hash = "sha256-S4j9JoY3e763Jw46nCfJYdmZd8Ryao5v/zSiP1Cz9Pc=";
   };
 
-  vendorHash = "sha256-p/MnieYNLq+mleqhqCYL9PBV2dVm+Zs945RwbdKjrus=";
+  vendorHash = "sha256-BkBS1Gd9aZFIc1bTujYn2694SvRMF3nNCBg5i1NRwns=";
 
   inherit subPackages;
 

From 3f861fb6b67e89485e11a7c701477b16744d725d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 12:14:19 +0000
Subject: [PATCH 19/64] cpp-utilities: 5.23.0 -> 5.24.0

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

diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index 001a1ee7eac..45a87690e19 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cpp-utilities";
-  version = "5.23.0";
+  version = "5.24.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-gZF+dsj+KYrFklnJHT04XSGLdlEdslFmxeStz6jVl24=";
+    sha256 = "sha256-krskfuoCRxYcAIDqrae4+yEABXXZ9Nv0BjBVwSMjC7g=";
   };
 
   nativeBuildInputs = [ cmake ];

From 3ab7b000bc5b32b6f517e0b0235b106569a622ca Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sat, 8 Jul 2023 12:58:40 +0000
Subject: [PATCH 20/64] kaf: 0.2.3 -> 0.2.6

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

diff --git a/pkgs/development/tools/kaf/default.nix b/pkgs/development/tools/kaf/default.nix
index 5c0f2116b84..5b9a1bfc7d5 100644
--- a/pkgs/development/tools/kaf/default.nix
+++ b/pkgs/development/tools/kaf/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kaf";
-  version = "0.2.3";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "birdayz";
     repo = "kaf";
     rev = "v${version}";
-    sha256 = "sha256-5wSxaryaQ8jXwpzSltMmFRVrvaA9JMSrh8VBCnquLXE=";
+    hash = "sha256-BH956k2FU855cKT+ftFOtRR2IjQ4sViiGy0tvrMWpEQ=";
   };
 
-  vendorSha256 = "sha256-Jpv02h+EeRhVdi/raStTEfHitz0A71dHpWdF/zcVJVU=";
+  vendorHash = "sha256-Y8jma4M+7ndJARfLmGCUmkIL+Pkey599dRO7M4iXU2Y=";
 
   # Many tests require a running Kafka instance
   doCheck = false;

From 469b7f7b2b5eb5244711fe187cb837bbe19112d1 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sat, 8 Jul 2023 16:10:48 +0200
Subject: [PATCH 21/64] iina: 1.3.1 -> 1.3.2

https://github.com/iina/iina/releases/tag/v1.3.2
---
 pkgs/applications/video/iina/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/iina/default.nix b/pkgs/applications/video/iina/default.nix
index 6377b953d5e..08df0a5a655 100644
--- a/pkgs/applications/video/iina/default.nix
+++ b/pkgs/applications/video/iina/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iina";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchurl {
     url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg";
-    sha256 = "sha256-xkZkKiiEywUWkiFw4PbUmQsStB1iRLCNU/MY27lRjC8=";
+    hash = "sha256-yieAcMc3rqoURsAcc8iAbe1pohlAU3r76FsgUeiNTP8=";
   };
 
   nativeBuildInputs = [ undmg ];

From 26cbcfeb589c016b69b9bda99a54feec3009cbd5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 14:46:47 +0000
Subject: [PATCH 22/64] syncthing-discovery: 1.23.5 -> 1.23.6

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 9475b3cfdb7..134c3733ead 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -13,16 +13,16 @@ let
   common = { stname, target, postInstall ? "" }:
     buildGoModule rec {
       pname = stname;
-      version = "1.23.5";
+      version = "1.23.6";
 
       src = fetchFromGitHub {
         owner = "syncthing";
         repo = "syncthing";
         rev = "v${version}";
-        hash = "sha256-IdzgbgPpwgSDbGc2sDlQAPRWEYBRgrxs4ldP404n9FQ=";
+        hash = "sha256-1NULZ3i3gR5RRegHJHH3OmxXU0d293GSTcky9+B4mJ4=";
       };
 
-      vendorHash = "sha256-/mRuwBS05+6ugXNdfHJIhuOJWY7zcKvdvUdcpq4rVQ0=";
+      vendorHash = "sha256-sj0XXEkcTfv24OuUeOoOLKHjaYMEuoh1Vg8k8T1Fp1o=";
 
       nativeBuildInputs = lib.optionals stdenv.isDarwin [
         # Recent versions of macOS seem to require binaries to be signed when

From e3340263050b0e4cf409ab329396268e4716e794 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 15:23:18 +0000
Subject: [PATCH 23/64] theforceengine: 1.09.200 -> 1.09.300

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

diff --git a/pkgs/games/theforceengine/default.nix b/pkgs/games/theforceengine/default.nix
index 08209ac28c5..023acc0e06d 100644
--- a/pkgs/games/theforceengine/default.nix
+++ b/pkgs/games/theforceengine/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "theforceengine";
-  version = "1.09.200";
+  version = "1.09.300";
 
   src = fetchFromGitHub {
     owner = "luciusDXL";
     repo = "TheForceEngine";
     rev = "v${version}";
-    sha256 = "sha256-r3fNhiPl6fjrIbdLoNIyTETw3lpPZCQYlTA2QJgiDgw=";
+    sha256 = "sha256-nf5fhP68AgBESiJleeZOLXkAajS+JmHUqyj4vAt2wl4=";
   };
 
   nativeBuildInputs = [

From ead7b7800d7401f09017aa7f8079e782a78838a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 16:03:30 +0000
Subject: [PATCH 24/64] nest-mpi: 3.4 -> 3.5

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

diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix
index 912fecff177..90fa6981247 100644
--- a/pkgs/applications/science/biology/nest/default.nix
+++ b/pkgs/applications/science/biology/nest/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nest";
-  version = "3.4";
+  version = "3.5";
 
   src = fetchFromGitHub {
     owner = "nest";
     repo = "nest-simulator";
     rev = "v${version}";
-    hash = "sha256-+wjsZxW2l0WGyGTm/6vyzPEeqCfyxJml9oP/zn6W1L0=";
+    hash = "sha256-PPUIXlU6noJRAa/twNSKVxPgIvbWl0OillEJRDzt+4s=";
   };
 
   postPatch = ''

From ccd91f8c8df4f5d8ec049a25b3412f10597676c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 16:23:29 +0000
Subject: [PATCH 25/64] python310Packages.ytmusicapi: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix
index 4c43febd19d..72d5e403551 100644
--- a/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "ytmusicapi";
-  version = "1.1.0";
+  version = "1.1.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MobeeelKkU5KFIFP/+Ny0ktzTnhKzX+fpzTuODrfjG0=";
+    hash = "sha256-UCWNub0FErdmF3kGSIJlpIcKdPZdPzJ5y8yx9ZPBUlw=";
   };
 
   nativeBuildInputs = [

From 788704d97495c47adbf4e06c4ef43dbc32814688 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 17:20:53 +0000
Subject: [PATCH 26/64] ser2net: 4.3.12 -> 4.3.13

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

diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix
index f75e9465acc..29e24077584 100644
--- a/pkgs/servers/ser2net/default.nix
+++ b/pkgs/servers/ser2net/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ser2net";
-  version = "4.3.12";
+  version = "4.3.13";
 
   src = fetchFromGitHub {
     owner = "cminyard";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-jF1tk/JeZ3RGHol+itwtkTF/cn5FHm/vhUgXJzi9J9E=";
+    hash = "sha256-SAyZ1Ob6swF6i1LFLpwyfMVSi/tOAfz6aiUNOVeJIa0=";
   };
 
   passthru = {

From be39519da74af2cbb4fa9e4b47baa06dcd289292 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 18:58:40 +0000
Subject: [PATCH 27/64] abcmidi: 2023.05.30 -> 2023.06.25

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

diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index 045d6674262..96a37cfa47f 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "abcMIDI";
-  version = "2023.05.30";
+  version = "2023.06.25";
 
   src = fetchzip {
     url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
-    hash = "sha256-aiwObK/5UhvLMPMWNlO5GaYJH9z9RHTTrRQL1IGI7i4=";
+    hash = "sha256-Fn10QcwqKPerMh3OMJTMUQZ6nUMgBysXmxCbEOXSG0k=";
   };
 
   meta = with lib; {

From 2fb26348bab1669cf22149d47e14d1237cc3f315 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 8 Jul 2023 23:44:01 +0300
Subject: [PATCH 28/64] libsForQt5.qtutilities: 6.12.2 -> 6.13.0

Diff: https://github.com/Martchus/qtutilities/compare/v6.12.2...v6.13.0
---
 pkgs/development/libraries/qtutilities/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix
index d63227ef9fc..9b866a26e69 100644
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtutilities";
-  version = "6.12.2";
+  version = "6.13.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-YYuTDUBTNKLmieb/pDljiN0T8NdaOb2aRmwkD85ZF38=";
+    hash = "sha256-gfGVVjtzpBGrPrp2k3fOIh54EAMSicyikF1CtaO74y8=";
   };
 
   buildInputs = [ qtbase cpp-utilities ];

From 79982e885c17c7252603c99d73f662fecab87e07 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 8 Jul 2023 23:44:13 +0300
Subject: [PATCH 29/64] syncthingtray: 1.4.3 -> 1.4.4

Diff: https://github.com/Martchus/syncthingtray/compare/v1.4.3...v1.4.4
---
 pkgs/applications/misc/syncthingtray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index d1a9d184083..96e77baf302 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -30,14 +30,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */
 }:
 
 mkDerivation rec {
-  version = "1.4.3";
+  version = "1.4.4";
   pname = "syncthingtray";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "syncthingtray";
     rev = "v${version}";
-    sha256 = "sha256-6J/P/DDD17QtXAISQn77EDIYqQu1hY7EnIX0FC6H/20=";
+    sha256 = "sha256-i13Mt4xASneE4sBIt9fbdoFV1KnoVfaGRwQXX+1NgI4=";
   };
 
   buildInputs = [

From 8b41523f78426529d8766058e918f2f038521c62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 21:27:50 +0000
Subject: [PATCH 30/64] python310Packages.django-rosetta: 0.9.8 -> 0.9.9

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

diff --git a/pkgs/development/python-modules/django-rosetta/default.nix b/pkgs/development/python-modules/django-rosetta/default.nix
index 7279e34dff7..b44852b473f 100644
--- a/pkgs/development/python-modules/django-rosetta/default.nix
+++ b/pkgs/development/python-modules/django-rosetta/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "django-rosetta";
-  version = "0.9.8";
+  version = "0.9.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "mbi";
     repo = "django-rosetta";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3AXwRxNWVkqW65xdqUwjHM1W5qhHXTjapqaM0Wmsebw=";
+    hash = "sha256-OuKgqGYBlzQNKKAJYFhNi+LnONB/mxINMj4VBAVWjqI=";
   };
 
   propagatedBuildInputs = [

From cc8fda9e12e9cb68f460d4b763994e041c35c3ef Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 8 Jul 2023 21:28:00 +0000
Subject: [PATCH 31/64] python310Packages.django-rosetta: fix changelog

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

diff --git a/pkgs/development/python-modules/django-rosetta/default.nix b/pkgs/development/python-modules/django-rosetta/default.nix
index b44852b473f..d9337081ba3 100644
--- a/pkgs/development/python-modules/django-rosetta/default.nix
+++ b/pkgs/development/python-modules/django-rosetta/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Rosetta is a Django application that facilitates the translation process of your Django projects";
     homepage = "https://github.com/mbi/django-rosetta";
-    changelog = "https://github.com/jazzband/django-rosetta/releases/tag/v${version}";
+    changelog = "https://github.com/mbi/django-rosetta/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ derdennisop ];
   };

From 93d9c279dc585e9577980ee002b35baec73ea808 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 21:32:22 +0000
Subject: [PATCH 32/64] vkbasalt: 0.3.2.9 -> 0.3.2.10

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

diff --git a/pkgs/tools/graphics/vkbasalt/default.nix b/pkgs/tools/graphics/vkbasalt/default.nix
index 4bfeed0bc12..937166ae9f4 100644
--- a/pkgs/tools/graphics/vkbasalt/default.nix
+++ b/pkgs/tools/graphics/vkbasalt/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vkbasalt";
-  version = "0.3.2.9";
+  version = "0.3.2.10";
 
   src = fetchFromGitHub {
     owner = "DadSchoorse";
     repo = "vkBasalt";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-IVlZ6o+1EEEh547rFPN7z+W+EY7MrIM/yUh6+PPkNeI=";
+    hash = "sha256-GC6JKYnsfcUBg+CX6v7MyE4FeLmjadFwighaiyureDg=";
   };
 
   nativeBuildInputs = [ glslang meson ninja pkg-config ];

From 7100097e78fe50379cbd29276b03a25438c620f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 21:52:43 +0000
Subject: [PATCH 33/64] a2ps: 4.15.4 -> 4.15.5

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

diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix
index 3adb802aad4..dd4b7b2ca97 100644
--- a/pkgs/tools/text/a2ps/default.nix
+++ b/pkgs/tools/text/a2ps/default.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "a2ps";
-  version = "4.15.4";
+  version = "4.15.5";
 
   src = fetchurl {
     url = "mirror://gnu/a2ps/a2ps-${version}.tar.gz";
-    hash = "sha256-SgY/hLqJ2GvhSmcEyjX9EwCDtXLxN2tDmht5tnsgbdc=";
+    hash = "sha256-gbsbQQTnwmOXYkUe3JeG2vPf6ziErfx9xqydII8w2n8=";
   };
 
   postPatch = ''

From 7d7c7bc3f6698d784d33df8bca8fa50eab15d610 Mon Sep 17 00:00:00 2001
From: squalus <squalus@squalus.net>
Date: Sat, 8 Jul 2023 14:54:19 -0700
Subject: [PATCH 34/64] librewolf: 114.0.2-1 -> 115.0-1

---
 .../networking/browsers/librewolf/src.json             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index 0208b62f414..f3fde597491 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "114.0.2-1",
+  "packageVersion": "115.0-1",
   "source": {
-    "rev": "114.0.2-1",
-    "sha256": "0snwwr15kd69p6xjbwcika8w04q0qgx6qmv5gy01y9gjc0hcv10q"
+    "rev": "115.0-1",
+    "sha256": "0bnimayxsd1f2h2jx123w3kwmvyw3yp0r25714bfaf70njnrzlmw"
   },
   "firefox": {
-    "version": "114.0.2",
-    "sha512": "1d514d09c6b964b96c6d52d54b89a89a92d53a6fe669e16a6370346c980db4d0ac6c502fa89219c71b680566b9eb982e9b3191c21f81d7326f34f6c837c0a872"
+    "version": "115.0",
+    "sha512": "ed5d150e4dfdc01026beb3ae502a0b04321dd130084fdef63afce79a8a7a4898741d08f77716ba720c24f31b9c732c00ad0f1cd408b35b5eb6601a10014fb1a2"
   }
 }

From 55fca2c9c94e3762b150b7d229f88cd71db5e43d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 21:58:20 +0000
Subject: [PATCH 35/64] snd: 23.4 -> 23.5

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

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index f8600fe7823..434b8942aa8 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "snd";
-  version = "23.4";
+  version = "23.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
-    sha256 = "sha256-1D/j/im1Xlx689k8zgnaRzJJYWHNviVhxyVzmLlfJps=";
+    sha256 = "sha256-ZbGrxy494BH6QIj2sYAUEiNBsbNJHXtAVRLPVFwAcQM=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 3ab10e0c19b97902220136616d824dae5a0eac31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 22:13:14 +0000
Subject: [PATCH 36/64] photofield: 0.10.3 -> 0.10.4

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

diff --git a/pkgs/servers/photofield/default.nix b/pkgs/servers/photofield/default.nix
index 68c6ba15e79..d5862cd38af 100644
--- a/pkgs/servers/photofield/default.nix
+++ b/pkgs/servers/photofield/default.nix
@@ -9,13 +9,13 @@
 
 let
   pname = "photofield-ui";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "SmilyOrg";
     repo = "photofield";
     rev = "v${version}";
-    hash = "sha256-OrLsthhnjX6LWehwiBDRzhCmTp3IBsbu9WKVu0zhgaQ=";
+    hash = "sha256-kcKnE4U+XWYfKw5nZSk+xCtYdagHBMZS3hvukEL8p4M=";
   };
 
   webui = buildNpmPackage {

From 576367be5a8e43f7be1fddfb0c23ab092db99648 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Sun, 9 Jul 2023 09:08:11 +1000
Subject: [PATCH 37/64] entwine: 2022-08-03 -> 2023-04-27

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

diff --git a/pkgs/applications/graphics/entwine/default.nix b/pkgs/applications/graphics/entwine/default.nix
index f9378c06ea4..908d5cc0818 100644
--- a/pkgs/applications/graphics/entwine/default.nix
+++ b/pkgs/applications/graphics/entwine/default.nix
@@ -7,15 +7,15 @@
 , openssl
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "entwine";
-  version = "unstable-2022-08-03";
+  version = "unstable-2023-04-27";
 
   src = fetchFromGitHub {
     owner = "connormanning";
     repo = "entwine";
-    rev = "c776d51fd6ab94705b74f78b26de7f853e6ceeae";
-    sha256 = "sha256-dhYJhXtfMmqQLWuV3Dux/sGTsVxCI7RXR2sPlwIry0g=";
+    rev = "8bd179c38e6da1688f42376b88ff30427672c4e3";
+    sha256 = "sha256-RlNxTtqxQoniI1Ugj5ot0weu7ji3WqDJZpMu2n8vBkw=";
   };
 
   buildInputs = [

From c222707a5ba1ba1b1fc2b1ffc9019339210e35ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 23:13:31 +0000
Subject: [PATCH 38/64] bun: 0.6.12 -> 0.6.13

---
 pkgs/development/web/bun/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix
index f7fe5bdc328..72a85fb5b4a 100644
--- a/pkgs/development/web/bun/default.nix
+++ b/pkgs/development/web/bun/default.nix
@@ -12,7 +12,7 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "0.6.12";
+  version = "0.6.13";
   pname = "bun";
 
   src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
-        sha256 = "CCfBRrvG1OFThIQ/udmXK/civUFPow7aXlrJO1o00Cg=";
+        sha256 = "6d4pDuAJCgUIFpmp8gGLn2rHvpQ54I6vCXU2WmIYe0M=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
-        sha256 = "V5csrlGcxwUsKu078vIMgbWkxBa8OvFUeCvPFhcTOPE=";
+        sha256 = "Hr3c0840fz47jDNjigTsz7HEUSP6btXVDFUUtDtdO5I=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
-        sha256 = "GSzjmoBhCXj6LOUoviRhbJtftWXIYXcc6HWx9N4npMY=";
+        sha256 = "H7pjr6ySoxYOGrOpLjzMb/b3BiG50XSmMi6atQooRN4=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
-        sha256 = "M/YDVAOXK7TUbrcey+J7plrTzTXPBOps7JPBioGew7E=";
+        sha256 = "f3VysZdTfs4G4a48AahbaEACVpiKPG7OfbAYTCGHi1k=";
       };
     };
     updateScript = writeShellScript "update-bun" ''

From 009a073bbe5b188e1d0263c75757bbb54c0b2270 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 23:15:05 +0000
Subject: [PATCH 39/64] kubecfg: 0.29.2 -> 0.30.0

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

diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index fb555545c04..dc8c507670f 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubecfg";
-  version = "0.29.2";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "kubecfg";
     repo = "kubecfg";
     rev = "v${version}";
-    hash = "sha256-toB0rRkqRTjf51g+BcMZiHjlG/slMyzA5OfO4DbTCH8=";
+    hash = "sha256-sIT5vqcKMZvx+6rvUzH3l7aOXMWJq81Lwl9YsGwE66w=";
   };
 
-  vendorHash = "sha256-sntlF8VCOtIB6kFJZaDs2Uu8zWZwMLcnHWuZy2D30Zg=";
+  vendorHash = "sha256-cJFAI/W5ImWcaU6cf/BFt78qES7wQtYnR863UvGP4aM=";
 
   ldflags = [
     "-s"

From 48469f8286a31ff58b2f398a0fcecd0793a93b04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 23:26:42 +0000
Subject: [PATCH 40/64] pocketbase: 0.16.5 -> 0.16.7

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

diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix
index e75a1f2e33a..43ef21b9ac8 100644
--- a/pkgs/servers/pocketbase/default.nix
+++ b/pkgs/servers/pocketbase/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "pocketbase";
-  version = "0.16.5";
+  version = "0.16.7";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-tjrc6JF8oVqyKgiRUT7nlsuMFSSpSJnSY4pELk3csYY=";
+    sha256 = "sha256-ZP1NaxQ7avg4ftLh9PXIEAN8iLrjsc+LcJlrIguIEN0=";
   };
 
-  vendorHash = "sha256-4h3Q8w7emjfZkVr0xujoOUjipXnDQfHOn8Ii19cNllI=";
+  vendorHash = "sha256-d1YGRULQh1LwQaH/44ZrBq2p8E63BhqnWzvpv7RVaqw=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];

From 17e26fcf49a6aa8fb0f87d113a24a7a5d242cef6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Jul 2023 23:52:44 +0000
Subject: [PATCH 41/64] ft2-clone: 1.67 -> 1.68

---
 pkgs/applications/audio/ft2-clone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index 845e7f248a7..5dd1d5c376d 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ft2-clone";
-  version = "1.67";
+  version = "1.68";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
     rev = "v${version}";
-    sha256 = "sha256-v/yGHWd/hhE2jDdAQhyQbZOuHSS0FSG4WlVe8Oc6tMc=";
+    sha256 = "sha256-mO8GrLyO7Zr9+lRy2WQ4OeRWDGmo22mPnZbajL78hJ8=";
   };
 
   # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)

From a987b671bb86d9ed94904e5a77d10e60d87d3268 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 01:00:40 +0000
Subject: [PATCH 42/64] earthly: 0.7.9 -> 0.7.10

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

diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix
index ffda6081321..75457a1e9b2 100644
--- a/pkgs/development/tools/earthly/default.nix
+++ b/pkgs/development/tools/earthly/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "earthly";
-  version = "0.7.9";
+  version = "0.7.10";
 
   src = fetchFromGitHub {
     owner = "earthly";
     repo = "earthly";
     rev = "v${version}";
-    sha256 = "sha256-KShHkqhPlC5MXHVd81ipacyDxWXyl3xFvWpe+7DHqsM=";
+    sha256 = "sha256-Agg1r/5QYk5U9ZblVO/WvLCBy9od7vQuDYKOJeR93XA=";
   };
 
-  vendorHash = "sha256-0KAnj/PizBC1obz09EAVWUPO0aFw5QUSTENMd7aIo1Y=";
+  vendorHash = "sha256-tEhUywjJtNaWLPSRNeHTcNsPNCZtXzqjg0VG4g4N9E0=";
   subPackages = [ "cmd/earthly" "cmd/debugger" ];
 
   CGO_ENABLED = 0;

From f7ab2c355d942f969c5198d8f081e37810180920 Mon Sep 17 00:00:00 2001
From: Scott Olson <scott@solson.me>
Date: Sun, 9 Jul 2023 02:09:06 +0100
Subject: [PATCH 43/64] capnproto-java: 0.1.5 -> 0.1.15

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

diff --git a/pkgs/development/tools/capnproto-java/default.nix b/pkgs/development/tools/capnproto-java/default.nix
index 95b78b724eb..cbda8c2cc97 100644
--- a/pkgs/development/tools/capnproto-java/default.nix
+++ b/pkgs/development/tools/capnproto-java/default.nix
@@ -2,23 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "capnproto-java";
-  version = "0.1.5";
+  version = "0.1.15";
 
   src = fetchFromGitHub {
     owner = "capnproto";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256:1512x70xa6mlg9dmr84r8xbf0jzysjal51ivhhh2ppl97yiqjgls";
+    hash = "sha256:IcmzI1G0mXOlpzmiyeLD7o1p/eOeVpwkiGsgy5OIjxw=";
   };
 
-  patches = [
-    # Add make install rule
-    (fetchpatch {
-      url = "https://github.com/capnproto/capnproto-java/commit/e96448d3f5737db25e55cd268652712b69db5cc0.diff";
-      sha256 = "0f3vyap1zsxy675900pzg5ngh7bf9icllm1w04q64g8i91sdzljl";
-    })
-  ];
-
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ capnproto ];
@@ -30,6 +22,6 @@ stdenv.mkDerivation rec {
     longDescription = "Only includes compiler plugin, the Java runtime/library that the generated code will link to must be built separately with Maven.";
     homepage = "https://dwrensha.github.io/capnproto-java/index.html";
     license = licenses.mit;
-    maintainers = with maintainers; [ bhipple ];
+    maintainers = with maintainers; [ bhipple solson ];
   };
 }

From 530f45d4133f3854a63541f6f4151cd427a43446 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 01:21:33 +0000
Subject: [PATCH 44/64] docker-buildx: 0.11.0 -> 0.11.1

---
 pkgs/applications/virtualization/docker/buildx.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index e7fe514842c..ff5fb35d42b 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "docker-buildx";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "buildx";
     rev = "v${version}";
-    sha256 = "sha256-iO0ZcQB/sNyrZV8R7EbonMARNAdt5aMXF9h8knrccDg=";
+    sha256 = "sha256-a33jGbafkmv55cKBCr8xlGTsD3bU/1CNyOfaXQIGMg0=";
   };
 
   doCheck = false;
 
-  vendorSha256 = null;
+  vendorHash = null;
 
   ldflags = [
     "-w" "-s"

From 0a158d0a5c84d6c18c8d9971119b3e89b09a2878 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 01:34:23 +0000
Subject: [PATCH 45/64] imgui: 1.89.6 -> 1.89.7

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

diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix
index 36513fb68ac..ba9a0610bde 100644
--- a/pkgs/development/libraries/imgui/default.nix
+++ b/pkgs/development/libraries/imgui/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "imgui";
-  version = "1.89.6";
+  version = "1.89.7";
 
   src = fetchFromGitHub {
     owner = "ocornut";
     repo = "imgui";
     rev = "v${version}";
-    sha256 = "sha256-fxoBvJnGawbPCe+U+5biBbkN33IsWDKMSReJYJrEMMo=";
+    sha256 = "sha256-kio1zy1DVL/Uh4eOqmHNCTE+Tb0GAIvsT4XDPkgHqYs=";
   };
 
   dontBuild = true;

From 0690545f05ffc007f70ec0a77c92b0c8a7534d9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 02:39:47 +0000
Subject: [PATCH 46/64] libdivecomputer: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix
index 4a9a4b0980e..8e37bd773cb 100644
--- a/pkgs/development/libraries/libdivecomputer/default.nix
+++ b/pkgs/development/libraries/libdivecomputer/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdivecomputer";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-gNnxlOokUCA535hZhILgr8aw4zPeeds0wpstaJNNJbk=";
+    sha256 = "sha256-J17M55I2RO1YH6q53LTxpprSUbzrByHE5fhftjFheg4=";
   };
 
   enableParallelBuilding = true;

From feb89eed00eb848da8c9eb56f5dad9fa1e79d536 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 8 Jul 2023 18:57:24 -0600
Subject: [PATCH 47/64] darwin.stdenv: fix portable libsystem hook with
 sandboxing

When sandboxing is enabled, the hook tries to run `install_name_tool`
and fails because the system one is inaccessible. Having it use
`targetPrefix` allows it to find and use the cross-install_name_tool.
---
 pkgs/stdenv/adapters.nix                 | 1 +
 pkgs/stdenv/darwin/portable-libsystem.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 3e66de48b4d..22da13f5d1e 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -105,6 +105,7 @@ rec {
             name = "darwin-portable-libSystem-hook";
             substitutions = {
               libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";
+              targetPrefix = stdenv.cc.bintools.targetPrefix;
             };
           } ./darwin/portable-libsystem.sh)
         ];
diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/pkgs/stdenv/darwin/portable-libsystem.sh
index f50ccc8d32e..1fb80c0e5ce 100644
--- a/pkgs/stdenv/darwin/portable-libsystem.sh
+++ b/pkgs/stdenv/darwin/portable-libsystem.sh
@@ -7,6 +7,6 @@ fixupOutputHooks+=('fixLibsystemRefs $prefix')
 fixLibsystemRefs() {
   if [ -d "$1/bin" ]; then
       find "$1/bin" -exec \
-        install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
+        @targetPrefix@install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
   fi
 }

From 6f6687ee24a26ef33b47aec23d804e998ca00964 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 8 Jul 2023 19:30:33 -0600
Subject: [PATCH 48/64] darwin.stdenv: only run `install_name_tool` on files

---
 pkgs/stdenv/darwin/portable-libsystem.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/pkgs/stdenv/darwin/portable-libsystem.sh
index 1fb80c0e5ce..7608c0a0de2 100644
--- a/pkgs/stdenv/darwin/portable-libsystem.sh
+++ b/pkgs/stdenv/darwin/portable-libsystem.sh
@@ -6,7 +6,7 @@ fixupOutputHooks+=('fixLibsystemRefs $prefix')
 
 fixLibsystemRefs() {
   if [ -d "$1/bin" ]; then
-      find "$1/bin" -exec \
+      find "$1/bin" -type f -exec \
         @targetPrefix@install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
   fi
 }

From 02756b75a44333f8b1af9ee4b9fa838fef46353f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 04:04:43 +0000
Subject: [PATCH 49/64] flink: 1.17.0 -> 1.17.1

---
 pkgs/applications/networking/cluster/flink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index 203af72a7b3..f0547dcf560 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "flink";
-  version = "1.17.0";
+  version = "1.17.1";
 
   src = fetchurl {
     url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz";
-    sha256 = "sha256-x60Lk/xXf+Isg1J6z5qAIZ2/dbDiztPIKWrdPITp3Tg=";
+    sha256 = "sha256-HpVDS3ydi2Z1SINAUed9lni9i8FCr0SI8yBCYP4wxyM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 00e54b06323ff4bfe1161a706ba838ae2937e2e5 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sat, 8 Jul 2023 22:24:26 -0700
Subject: [PATCH 50/64] python310Packages.hap-python: update source hash to fix
 build

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

diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix
index bca7d3c71c2..05699dd07e3 100644
--- a/pkgs/development/python-modules/hap-python/default.nix
+++ b/pkgs/development/python-modules/hap-python/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "ikalchev";
     repo = "HAP-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-fAJB1gk8zTS/mW5KzWr3z26qctZc/EQlk//WM1Xwpl0=";
+    hash = "sha256-/UBJh1m+WscN9I85/kvlNQnowNybEDyGVuQk4HBDWLE=";
   };
 
   propagatedBuildInputs = [

From ca9e7a2416a587d8fce5dd500502079826d81129 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 06:18:12 +0000
Subject: [PATCH 51/64] polymake: 4.9 -> 4.10

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

diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix
index 4dc11db532f..18d6912a2b8 100644
--- a/pkgs/applications/science/math/polymake/default.nix
+++ b/pkgs/applications/science/math/polymake/default.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation rec {
   pname = "polymake";
-  version = "4.9";
+  version = "4.10";
 
   src = fetchurl {
     # "The minimal version is a packager friendly version which omits
     # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality."
     url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2";
-    sha256 = "sha256-BMkLgms6JsWmPhi+MZv/Eqie8BKL+KaPtk3xBZSyWfM=";
+    sha256 = "sha256-YDiyZtbUC76ZVe3oRtzPRBfkEU+qh+d1ZWFhzUyi+Pg=";
   };
 
   nativeBuildInputs = [

From 5c1583bfd754ea6a668d2b76efef855201aa3ea8 Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Sun, 9 Jul 2023 02:31:05 -0400
Subject: [PATCH 52/64] nixos/plymouth: fix minor doc rendering issue

---
 nixos/modules/system/boot/plymouth.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index a63f3493899..b041b8951fa 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -99,10 +99,12 @@ in
         # Dimensions are 48x48 to match GDM logo
         default = "${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png";
         defaultText = literalExpression ''"''${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"'';
-        example = literalExpression ''pkgs.fetchurl {
-          url = "https://nixos.org/logo/nixos-hires.png";
-          sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
-        }'';
+        example = literalExpression ''
+          pkgs.fetchurl {
+            url = "https://nixos.org/logo/nixos-hires.png";
+            sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
+          }
+        '';
         description = lib.mdDoc ''
           Logo which is displayed on the splash screen.
         '';

From 8c70df85b511386ea04f28c3a733d8c36994a02a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 06:37:30 +0000
Subject: [PATCH 53/64] werf: 1.2.241 -> 1.2.242

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

diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix
index 362bcf5feb1..63811d27b7e 100644
--- a/pkgs/applications/networking/cluster/werf/default.nix
+++ b/pkgs/applications/networking/cluster/werf/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "werf";
-  version = "1.2.241";
+  version = "1.2.242";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     rev = "v${version}";
-    hash = "sha256-KEcHKMWe6t2TWbpQecpEDEdldi+9b0E5t+g+Zkhhqtw=";
+    hash = "sha256-cYEhqoCkJtBRQuQDViA+x5Ow5bUB5Y2lZZf18cm5ig8=";
   };
 
-  vendorHash = "sha256-iP1j11bWs5Laa1f3VEt/w+NMSWhHD8Kf4cwAZiy9sRc=";
+  vendorHash = "sha256-tNTjPIVfviUZ4ONDyQI3M+DIzZvvPbBPdVu0Du+PIdg=";
 
   proxyVendor = true;
 

From bd9844b9ad18a514767def3c45297eff9fe7751b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 06:46:51 +0000
Subject: [PATCH 54/64] pritunl-client: 1.3.3484.2 -> 1.3.3584.5

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

diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix
index ff682cfac52..4dfdebf30a6 100644
--- a/pkgs/tools/networking/pritunl-client/default.nix
+++ b/pkgs/tools/networking/pritunl-client/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pritunl-client";
-  version = "1.3.3484.2";
+  version = "1.3.3584.5";
 
   src = fetchFromGitHub {
     owner = "pritunl";
     repo = "pritunl-client-electron";
     rev = version;
-    sha256 = "sha256-thIbw/Iek2vNNmkOBHrzEhTbaOm05CsbjqORQKC2jIs=";
+    sha256 = "sha256-wWpP2u+oQSESjkRvAn5by7efvssYtKBYg2E+FZ/+tg0=";
   };
 
   modRoot = "cli";

From 953b1107ef3bdfe7612e52a145b17ceb7afbc879 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 07:01:53 +0000
Subject: [PATCH 55/64] frp: 0.50.0 -> 0.51.0

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

diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix
index 6c7b14f2792..79e976ee224 100644
--- a/pkgs/tools/networking/frp/default.nix
+++ b/pkgs/tools/networking/frp/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "frp";
-  version = "0.50.0";
+  version = "0.51.0";
 
   src = fetchFromGitHub {
     owner = "fatedier";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-QEVrABDFdHd7DdKLs/mOEmOPvNjHLBFjgdMVi3ooNv0=";
+    sha256 = "sha256-Nng9WZlKyrEtuVQec5pcfUoZQKWN1IwZ8N7JLc+Mark=";
   };
 
-  vendorHash = "sha256-zQMm3qOBDJuL4w/BDGKH3DbfAFn0pwuvjltYnuxxvzk=";
+  vendorHash = "sha256-pnC4bnb/y9x6hDa6yAwNoWDUlIiAyy6LEdoISlX+S1s=";
 
   doCheck = false;
 

From ec8867cd7d9c63344ca260633686b0e6062c3690 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 07:11:42 +0000
Subject: [PATCH 56/64] minesweep-rs: 6.0.11 -> 6.0.13

---
 pkgs/games/minesweep-rs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/games/minesweep-rs/default.nix
index 6e248f7f82f..1adaa51b5c8 100644
--- a/pkgs/games/minesweep-rs/default.nix
+++ b/pkgs/games/minesweep-rs/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "minesweep-rs";
-  version = "6.0.11";
+  version = "6.0.13";
 
   src = fetchFromGitHub {
     owner = "cpcloud";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-jGg6GrPDPOWvIQiZ9UJbGHLaxTxSV7EvqIcEoGrfRZ0=";
+    hash = "sha256-vr6tfwTIDuMyyeWTPeH71ECf4PqI2+5s1Lb45Cavr+4=";
   };
 
-  cargoHash = "sha256-IKf44wCCzXcasuimnAwnEhJGmag67rGxQE7+rBEUVOI=";
+  cargoHash = "sha256-KHmZ37wnz8Z2dz78tiovqhNIiPcb5WBzk9plPNM/gqU=";
 
   meta = with lib; {
     description = "Sweep some mines for fun, and probably not for profit";

From 70ec5657a0a55822cbbb14cd0f8b2c9a37e22afd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 08:05:44 +0000
Subject: [PATCH 57/64] blobby: 1.0 -> 1.1

---
 pkgs/games/blobby/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index 68e18dfe26d..c5c6ed01ecc 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "blobby-volley";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz";
-    sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms";
+    url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.1/blobby2-linux-1.1.tar.gz";
+    sha256 = "sha256-1WJ59Fhb1opXjOci+nAx/F2w5TnBaRhxQuPKgmmLfvQ=";
   };
 
   nativeBuildInputs = [ cmake pkg-config zip ];

From 460b62a16d07e7f284781ddf2c2649ee227f7fe5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 9 Jul 2023 11:07:41 +0300
Subject: [PATCH 58/64] vlc: fix eval on aarch64 after #242080

`null`s are not allowed in `env`.
---
 pkgs/applications/video/vlc/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index c9c09cc07b2..bb0a26e94fb 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -202,10 +202,11 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optional (waylandSupport && withQt5) qtwayland;
 
   env = {
-    LIVE555_PREFIX = if stdenv.hostPlatform.isAarch then null else live555;
     # vlc depends on a c11-gcc wrapper script which we don't have so we need to
     # set the path to the compiler
     BUILDCC = "${stdenv.cc}/bin/gcc";
+  } // lib.optionalAttrs (!stdenv.hostPlatform.isAarch) {
+    LIVE555_PREFIX = live555;
   };
 
   patches = [

From 119ba5ce80e6ae814e3aa88121565df7537cd5a9 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 8 Jul 2023 09:59:57 +0200
Subject: [PATCH 59/64] milkytracker: apply patch for CVE-2022-34927

---
 pkgs/applications/audio/milkytracker/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index ea54a4a55d4..7f5e26e8b29 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper
 , SDL2, alsa-lib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2022-34927.patch";
+      url = "https://github.com/milkytracker/MilkyTracker/commit/3a5474f9102cbdc10fbd9e7b1b2c8d3f3f45d91b.patch";
+      hash = "sha256-YnN1Khcbct7iG7TdwxFU1XVCeKR/Zrhe+oMepvh8cRU=";
+    })
+  ];
+
   postPatch = ''
     # https://github.com/milkytracker/MilkyTracker/issues/262
     substituteInPlace CMakeLists.txt \

From 2fed004f958826071d03e6a7f2a47278aa54457c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 08:18:10 +0000
Subject: [PATCH 60/64] sentry-cli: 2.19.1 -> 2.19.4

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

diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix
index bf75c3e19ec..e99cd52667d 100644
--- a/pkgs/development/tools/sentry-cli/default.nix
+++ b/pkgs/development/tools/sentry-cli/default.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sentry-cli";
-  version = "2.19.1";
+  version = "2.19.4";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-cli";
     rev = version;
-    sha256 = "sha256-Va9hVXsASkDCGEGGy+QdJOswHHfORDu2t2qj7lUapsc=";
+    sha256 = "sha256-C86s/fQlQc49TP9CSzA8lPKBd2YKnuJNL//GPvxcVBU=";
   };
   doCheck = false;
 
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
   nativeBuildInputs = [ pkg-config ];
 
-  cargoHash = "sha256-CPNvLxJABgJ2HCt86v7G6ykGHPtCTpCXc832PtWaxyU=";
+  cargoHash = "sha256-Ks0IM+iqB9b44mmg6QHTZssQd+9Giu/Be+DUKy5HImg=";
 
   meta = with lib; {
     homepage = "https://docs.sentry.io/cli/";

From 7d48263e1232a7ac63e4ae5ab79a18c1bd633334 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 08:18:15 +0000
Subject: [PATCH 61/64] vmagent: 1.91.2 -> 1.91.3

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

diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix
index e3e8fcb5f0f..a5a473db8a3 100644
--- a/pkgs/servers/monitoring/vmagent/default.nix
+++ b/pkgs/servers/monitoring/vmagent/default.nix
@@ -1,13 +1,13 @@
 { lib, fetchFromGitHub, buildGoModule }:
 buildGoModule rec {
   pname = "vmagent";
-  version = "1.91.2";
+  version = "1.91.3";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     rev = "v${version}";
-    sha256 = "sha256-+xc3XhHHHe8JdHhEcAEGf6hkzlhSLYjG4C9znONPYzw=";
+    sha256 = "sha256-xW31Lm+WiJ1quMaIDa7tbZuKhILTMdUviIDTRJT1Cqg=";
   };
 
   ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];

From e15f252fb9dac31a30cfc4ea050a2a951df5d96f Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Fri, 7 Jul 2023 20:15:45 +1200
Subject: [PATCH 62/64] xonotic: fix icon installation

---
 pkgs/games/xonotic/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 785e889421f..60eb1189391 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -97,10 +97,17 @@ let
     enableParallelBuilding = true;
 
     installPhase = (''
-      for size in 16x16 24x24 32x32 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 1024x1024 scalable; do
-        install -Dm644 ../../misc/logos/xonotic_icon.svg \
-          $out/share/icons/hicolor/$size/xonotic.svg
+      install -Dm644 ../../misc/logos/xonotic_icon.svg \
+        $out/share/icons/hicolor/scalable/apps/xonotic.svg
+      pushd ../../misc/logos/icons_png
+      for img in *.png; do
+        size=''${img#xonotic_}
+        size=''${size%.png}
+        dimensions="''${size}x''${size}"
+        install -Dm644 $img \
+          $out/share/icons/hicolor/$dimensions/apps/xonotic.png
       done
+      popd
     '' + lib.optionalString withDedicated ''
       install -Dm755 darkplaces-dedicated "$out/bin/xonotic-dedicated"
     '' + lib.optionalString withGLX ''

From 2e10bdddec186590c96f1a8801294fa073361c0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 08:47:13 +0000
Subject: [PATCH 63/64] nixpacks: 1.9.1 -> 1.9.2

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

diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix
index 098461c5322..3b5b87e8d94 100644
--- a/pkgs/applications/virtualization/nixpacks/default.nix
+++ b/pkgs/applications/virtualization/nixpacks/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nixpacks";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-LTZl9ErmapABeVJyaVjO9Ulq0chDoRzwPBd6GzwYioI=";
+    sha256 = "sha256-tUL8pvUmRMTEeQpHbxaBMDuEdaEYVGmkopAhCL26CCk=";
   };
 
-  cargoHash = "sha256-EIEfoSpNU/+GlxOd+oSw9QbURfp/yn7g13teuyjPJX0=";
+  cargoHash = "sha256-I+ILjtnbLuxWHmw9KFMc00GWOOpY7UC8i+9nbybDPg4=";
 
   # skip test due FHS dependency
   doCheck = false;

From f603066c335db93957d778d7a805286362ddb2cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Jul 2023 09:04:32 +0000
Subject: [PATCH 64/64] ctranslate2: 3.16.0 -> 3.16.1

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

diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix
index c3f17c201c9..5dbd959b5e9 100644
--- a/pkgs/development/libraries/ctranslate2/default.nix
+++ b/pkgs/development/libraries/ctranslate2/default.nix
@@ -17,13 +17,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ctranslate2";
-  version = "3.16.0";
+  version = "3.16.1";
 
   src = fetchFromGitHub {
     owner = "OpenNMT";
     repo = "CTranslate2";
     rev = "v${version}";
-    hash = "sha256-wQhPIjLUpeWNzUH7ZkK+l0nkiv4ncFHUys/vu/e9SOU=";
+    hash = "sha256-6K4TQnm9va+oxwWuKfV+txF7rRBRzE6PoUEDA2v3lEM=";
     fetchSubmodules = true;
   };