From c4fae33b450397a4574136ec838eed02e6d0b996 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Thu, 10 Apr 2025 17:26:52 -0400
Subject: [PATCH 01/40] hunspell: refactor to by-name and finalAttrs

---
 .../hu}/hunspell/dictionaries-chromium.nix                  | 0
 .../libraries => by-name/hu}/hunspell/dictionaries.nix      | 0
 pkgs/by-name/hu/hunspell/package.nix                        | 4 ++--
 .../hu}/hunspell/update-chromium-dictionaries.py            | 0
 pkgs/top-level/all-packages.nix                             | 6 ++----
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/{development/libraries => by-name/hu}/hunspell/dictionaries-chromium.nix (100%)
 rename pkgs/{development/libraries => by-name/hu}/hunspell/dictionaries.nix (100%)
 rename pkgs/{development/libraries => by-name/hu}/hunspell/update-chromium-dictionaries.py (100%)

diff --git a/pkgs/development/libraries/hunspell/dictionaries-chromium.nix b/pkgs/by-name/hu/hunspell/dictionaries-chromium.nix
similarity index 100%
rename from pkgs/development/libraries/hunspell/dictionaries-chromium.nix
rename to pkgs/by-name/hu/hunspell/dictionaries-chromium.nix
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix
similarity index 100%
rename from pkgs/development/libraries/hunspell/dictionaries.nix
rename to pkgs/by-name/hu/hunspell/dictionaries.nix
diff --git a/pkgs/by-name/hu/hunspell/package.nix b/pkgs/by-name/hu/hunspell/package.nix
index 64e5ad4979fd..ff38cd945a43 100644
--- a/pkgs/by-name/hu/hunspell/package.nix
+++ b/pkgs/by-name/hu/hunspell/package.nix
@@ -95,8 +95,8 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://hunspell.github.io/";
     changelog = "https://github.com/hunspell/hunspell/releases/tag/${finalAttrs.src.rev}";
     license = with lib.licenses; [
-      gpl2
-      lgpl21
+      gpl2Plus
+      lgpl21Plus
       mpl11
     ];
     maintainers = with lib.maintainers; [ getchoo ];
diff --git a/pkgs/development/libraries/hunspell/update-chromium-dictionaries.py b/pkgs/by-name/hu/hunspell/update-chromium-dictionaries.py
similarity index 100%
rename from pkgs/development/libraries/hunspell/update-chromium-dictionaries.py
rename to pkgs/by-name/hu/hunspell/update-chromium-dictionaries.py
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff9041c61f98..c37867f28787 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9801,12 +9801,10 @@ with pkgs;
 
   hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { };
 
-  hunspellDicts = recurseIntoAttrs (
-    callPackages ../development/libraries/hunspell/dictionaries.nix { }
-  );
+  hunspellDicts = recurseIntoAttrs (callPackages ../by-name/hu/hunspell/dictionaries.nix { });
 
   hunspellDictsChromium = recurseIntoAttrs (
-    callPackages ../development/libraries/hunspell/dictionaries-chromium.nix { }
+    callPackages ../by-name/hu/hunspell/dictionaries-chromium.nix { }
   );
 
   hunspellWithDicts = dicts: callPackage ../by-name/hu/hunspell/wrapper.nix { inherit dicts; };

From d8220bdba88e6ea898672739b7739039b3a28d6b Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Thu, 10 Apr 2025 13:29:01 -0400
Subject: [PATCH 02/40] hunspell: refactor, add withDict wrapper passthru
 function

---
 pkgs/by-name/hu/hunspell/package.nix | 11 +++---
 pkgs/by-name/hu/hunspell/wrapper.nix | 56 +++++++++++++++-------------
 pkgs/top-level/all-packages.nix      |  6 ++-
 3 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/hu/hunspell/package.nix b/pkgs/by-name/hu/hunspell/package.nix
index ff38cd945a43..ce0e7db16a7b 100644
--- a/pkgs/by-name/hu/hunspell/package.nix
+++ b/pkgs/by-name/hu/hunspell/package.nix
@@ -58,13 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [ "format" ];
 
   passthru = {
+    withDicts = callPackage ./wrapper.nix { hunspell = finalAttrs.finalPackage; };
     tests = {
       pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
       version = testers.testVersion { package = finalAttrs.finalPackage; };
-      wrapper = callPackage ./wrapper.nix {
-        hunspell = finalAttrs.finalPackage;
-        dicts = [ hunspellDicts.en_US ];
-      };
+      wrapper = finalAttrs.finalPackage.withDicts (d: [ d.en_US ]);
     };
 
     updateScript = nix-update-script { };
@@ -99,7 +97,10 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl21Plus
       mpl11
     ];
-    maintainers = with lib.maintainers; [ getchoo ];
+    maintainers = with lib.maintainers; [
+      getchoo
+      RossSmyth
+    ];
     mainProgram = "hunspell";
     platforms = lib.platforms.all;
     pkgConfigModules = [ "hunspell" ];
diff --git a/pkgs/by-name/hu/hunspell/wrapper.nix b/pkgs/by-name/hu/hunspell/wrapper.nix
index 678a16bee80e..c18fb4a21871 100644
--- a/pkgs/by-name/hu/hunspell/wrapper.nix
+++ b/pkgs/by-name/hu/hunspell/wrapper.nix
@@ -1,33 +1,39 @@
 {
-  stdenv,
   lib,
+  buildEnv,
   hunspell,
+  hunspellDicts,
   makeBinaryWrapper,
-  dicts ? [ ],
 }:
-let
-  searchPath = lib.makeSearchPath "share/hunspell" dicts;
-in
-stdenv.mkDerivation {
-  inherit (lib.appendToName "with-dicts" hunspell) name;
 
-  nativeBuildInputs = [ makeBinaryWrapper ];
+lib.makeOverridable (
+  { ... }@dicts:
+  f:
+  buildEnv {
+    inherit (lib.appendToName "with-dicts" hunspell) name;
 
-  buildCommand = ''
-    makeWrapper ${lib.getExe hunspell} $out/bin/hunspell \
-      --prefix DICPATH : ${lib.escapeShellArg searchPath}
-  '';
+    paths = f dicts;
 
-  meta = {
-    inherit (hunspell.meta)
-      description
-      longDescription
-      homepage
-      changelog
-      license
-      maintainers
-      mainProgram
-      platforms
-      ;
-  };
-}
+    pathsToLink = [ "/share/hunspell" ];
+
+    nativeBuildInputs = [ makeBinaryWrapper ];
+
+    postBuild = ''
+      makeWrapper ${lib.getExe hunspell} $out/bin/hunspell \
+        --prefix DICPATH : $out/share/hunspell
+    '';
+
+    meta = {
+      inherit (hunspell.meta)
+        description
+        longDescription
+        homepage
+        changelog
+        license
+        maintainers
+        mainProgram
+        platforms
+        ;
+    };
+  }
+) hunspellDicts
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c37867f28787..5e068ba03d7d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9807,7 +9807,11 @@ with pkgs;
     callPackages ../by-name/hu/hunspell/dictionaries-chromium.nix { }
   );
 
-  hunspellWithDicts = dicts: callPackage ../by-name/hu/hunspell/wrapper.nix { inherit dicts; };
+  hunspellWithDicts =
+    dicts:
+    lib.warn "hunspellWithDicts is deprecated, please use hunspell.withDicts instead."
+      hunspell.withDicts
+      (_: dicts);
 
   hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_28; };
 

From 42a03465e45059069e85e27af1046aa038bca9ee Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Thu, 10 Apr 2025 15:58:02 -0400
Subject: [PATCH 03/40] onboard: Fix hunspell warning

---
 pkgs/by-name/on/onboard/package.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/on/onboard/package.nix b/pkgs/by-name/on/onboard/package.nix
index 7a2e35306d84..5dae5e0dace6 100644
--- a/pkgs/by-name/on/onboard/package.nix
+++ b/pkgs/by-name/on/onboard/package.nix
@@ -15,7 +15,6 @@
   gtk3,
   hunspell,
   hunspellDicts,
-  hunspellWithDicts,
   intltool,
   isocodes,
   libappindicator-gtk3,
@@ -33,14 +32,11 @@
 
 let
 
-  customHunspell = hunspellWithDicts [
-    hunspellDicts.en-us
-  ];
+  customHunspell = hunspell.withDicts (di: [ di.en-us ]);
 
   majorVersion = "1.4";
 
 in
-
 python3.pkgs.buildPythonApplication rec {
   pname = "onboard";
   version = "${majorVersion}.1";
@@ -51,9 +47,7 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   patches = [
-    (replaceVars ./fix-paths.patch {
-      inherit mousetweaks;
-    })
+    (replaceVars ./fix-paths.patch { inherit mousetweaks; })
     # Allow loading hunspell dictionaries installed in NixOS system path
     ./hunspell-use-xdg-datadirs.patch
 
@@ -108,9 +102,7 @@ python3.pkgs.buildPythonApplication rec {
     systemd
   ];
 
-  propagatedUserEnvPkgs = [
-    dconf
-  ];
+  propagatedUserEnvPkgs = [ dconf ];
 
   nativeCheckInputs = [
     # for Onboard.SpellChecker.aspell_cmd doctests

From 219158d36caa1e2fed83d944eead56e9534fd7f2 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 22 Jun 2025 18:58:31 -0400
Subject: [PATCH 04/40] hdf5-blosc: 1.0.0 -> 1.0.1

Changelog: https://github.com/Blosc/hdf5-blosc/releases/tag/v1.0.1

Fixes gcc14 build. I needed to update the patch for it to apply cleanly though.
---
 pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch | 13 ++++++++-----
 pkgs/by-name/hd/hdf5-blosc/package.nix             |  5 +++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch b/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch
index 8f2bd8579ed8..c0b7df147b24 100644
--- a/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch
+++ b/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch
@@ -1,12 +1,15 @@
---- a/CMakeLists.txt      2019-10-11 12:12:27.445417039 -0400
-+++ b/CMakeLists.txt      2019-10-11 12:27:26.630691742 -0400
-@@ -22,14 +22,6 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9ec0f23..35953d3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,15 +24,6 @@ message("BLOSC_INSTALL_DIR='${BLOSC_INSTALL_DIR}'")
  message("BLOSC_CMAKE_ARGS='${BLOSC_CMAKE_ARGS}'")
  message("GIT_EXECUTABLE='${GIT_EXECUTABLE}'")
 
 -ExternalProject_Add(project_blosc
 -  PREFIX ${BLOSC_PREFIX}
 -  GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
+-  GIT_TAG main
 -  INSTALL_DIR ${BLOSC_INSTALL_DIR}
 -  CMAKE_ARGS ${BLOSC_CMAKE_ARGS}
 -)
@@ -15,10 +18,10 @@
  # sources
  set(SOURCES src/blosc_filter.c)
  set(PLUGIN_SOURCES src/blosc_filter.c src/blosc_plugin.c )
-@@ -53,7 +45,6 @@
+@@ -56,7 +47,6 @@ include_directories(${HDF5_INCLUDE_DIRS})
  # add blosc libraries
  add_library(blosc_shared SHARED IMPORTED)
- set_property(TARGET blosc_shared PROPERTY IMPORTED_LOCATION ${BLOSC_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}blosc${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set_property(TARGET blosc_shared PROPERTY IMPORTED_LOCATION ${BLOSC_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}blosc${CMAKE_SHARED_LIBRARY_SUFFIX})
 -add_dependencies(blosc_shared project_blosc)
  include_directories(${BLOSC_INSTALL_DIR}/include)
 
diff --git a/pkgs/by-name/hd/hdf5-blosc/package.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix
index 1a0eaea6c2f6..3df9bcdd11c0 100644
--- a/pkgs/by-name/hd/hdf5-blosc/package.nix
+++ b/pkgs/by-name/hd/hdf5-blosc/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hdf5-blosc";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "hdf5-blosc";
     rev = "v${version}";
-    sha256 = "1nj2bm1v6ymm3fmyvhbn6ih5fgdiapavlfghh1pvbmhw71cysyqs";
+    sha256 = "sha256-pM438hUEdzdZEGYxoKlBAHi1G27auj9uGSeiXwVPAE8=";
   };
 
   patches = [ ./no-external-blosc.patch ];
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DPLUGIN_INSTALL_PATH=${placeholder "plugin"}/hdf5/lib/plugin"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
   ];
 
   postInstall = ''

From 519c9061deb8acf08fc3f46c976e6d136c89cbaa Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 22 Jun 2025 18:59:40 -0400
Subject: [PATCH 05/40] hdf5-blosc: add passthru.updateScript, cleanup, add
 test

---
 pkgs/by-name/hd/hdf5-blosc/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/hd/hdf5-blosc/package.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix
index 3df9bcdd11c0..d0eb807a72a3 100644
--- a/pkgs/by-name/hd/hdf5-blosc/package.nix
+++ b/pkgs/by-name/hd/hdf5-blosc/package.nix
@@ -5,6 +5,7 @@
   cmake,
   hdf5,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -33,12 +34,13 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    substituteInPlace CMakeLists.txt --replace 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")'
+    substituteInPlace CMakeLists.txt --replace-fail 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")'
   '';
 
   cmakeFlags = [
     "-DPLUGIN_INSTALL_PATH=${placeholder "plugin"}/hdf5/lib/plugin"
     "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DBUILD_TESTS=ON"
   ];
 
   postInstall = ''
@@ -46,6 +48,10 @@ stdenv.mkDerivation rec {
     substituteAll ${./blosc_filter.pc.in} $out/lib/pkgconfig/blosc_filter.pc
   '';
 
+  doCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Filter for HDF5 that uses the Blosc compressor";
     homepage = "https://github.com/Blosc/hdf5-blosc";

From 832348682114ac3e3bfaaf4675e92c03410195b3 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 15 Jun 2025 19:43:07 -0700
Subject: [PATCH 06/40] mattermost: disable MySQL tests

---
 pkgs/by-name/ma/mattermost/tests.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix
index e6918b8bff70..39b60f60c8bc 100644
--- a/pkgs/by-name/ma/mattermost/tests.nix
+++ b/pkgs/by-name/ma/mattermost/tests.nix
@@ -145,9 +145,12 @@ mattermost.overrideAttrs (
         "TestRunServerNoSystemd"
 
         # Appear to be broken.
-        "TestSessionStore/MySQL/SessionGetWithDeviceId"
-        "TestSessionStore/MySQL/GetMobileSessionMetadata"
-        "TestSessionStore/MySQL/GetSessionsWithActiveDeviceIds"
+        "TestSessionStore/MySQL"
+        "TestAccessControlPolicyStore/MySQL"
+        "TestAttributesStore/MySQL"
+        "TestBasicAPIPlugins"
+
+        "TestRunExportJobE2EByType"
         "TestUpdateTeam"
         "TestSyncSyncableRoles"
       ]

From 3e57d8f2b8ac326d279bf25e6a7a69dda223608d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 07:33:55 +0000
Subject: [PATCH 07/40] komga: 1.21.3 -> 1.22.0

---
 pkgs/by-name/ko/komga/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix
index a51548102929..933da21637e8 100644
--- a/pkgs/by-name/ko/komga/package.nix
+++ b/pkgs/by-name/ko/komga/package.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "komga";
-  version = "1.21.3";
+  version = "1.22.0";
 
   src = fetchurl {
     url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
-    sha256 = "sha256-NFj/C1oNRh9PzAi5TUv+4vVea1Nsn/frxf4aZjuYfvA=";
+    sha256 = "sha256-buc79CIADeZjQycEymTmskRD2+aY6nQecf0QqVDEgV8=";
   };
 
   nativeBuildInputs = [

From e014cb68ccd512fde1de37a678607d98735cff38 Mon Sep 17 00:00:00 2001
From: purpole <101905225+purpole@users.noreply.github.com>
Date: Tue, 24 Jun 2025 20:14:52 +0200
Subject: [PATCH 08/40] sccmhunter: 1.0.9 -> 1.0.10

---
 pkgs/by-name/sc/sccmhunter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sc/sccmhunter/package.nix b/pkgs/by-name/sc/sccmhunter/package.nix
index b47540c07f19..be7568e72786 100644
--- a/pkgs/by-name/sc/sccmhunter/package.nix
+++ b/pkgs/by-name/sc/sccmhunter/package.nix
@@ -5,14 +5,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "sccmhunter";
-  version = "1.0.9";
+  version = "1.0.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "garrettfoster13";
     repo = "sccmhunter";
     rev = "v${version}";
-    hash = "sha256-Db+kBLy2ejIKKjCskAE4arppk/sq9qQ3w1nCQmeLYhs=";
+    hash = "sha256-h7P+ry4J26Hm1s9U37t1EDWBaYRL32WA3sk8caA1edg=";
   };
 
   build-system = with python3Packages; [

From 03476bb97bbebefa575ce39f0cf192b39cf17ec9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Jun 2025 18:53:03 +0000
Subject: [PATCH 09/40] tanka: 0.32.0 -> 0.33.0

---
 pkgs/by-name/ta/tanka/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix
index 3acd0f5ac34b..5bda8d7657b7 100644
--- a/pkgs/by-name/ta/tanka/package.nix
+++ b/pkgs/by-name/ta/tanka/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "tanka";
-  version = "0.32.0";
+  version = "0.33.0";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "tanka";
     rev = "v${version}";
-    sha256 = "sha256-+875PMDATNarFhnAhpi9QxBNgV9irrjRWd/hHsqlH+c=";
+    sha256 = "sha256-B4ebheUeBf1E/bdwSZoMiMCAmbbuBki6EBn6ZDT4ocM=";
   };
 
-  vendorHash = "sha256-pgtkTpEnRBjao/78Zc8qVJXZGRmKbO5wIy/7G4y0DgU=";
+  vendorHash = "sha256-I8acIMTxn7w+b9Z/4TxycQZp1LK7CphtTPOZFcfoEvU=";
 
   doCheck = false;
   # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK

From f6234d273bc4dd32b6286cad0deeaab73dbebfc0 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 26 Jun 2025 11:44:55 -0700
Subject: [PATCH 10/40] zrythm: move to by-name

---
 .../zrythm/default.nix => by-name/zr/zrythm/package.nix}      | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/audio/zrythm/default.nix => by-name/zr/zrythm/package.nix} (97%)

diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/by-name/zr/zrythm/package.nix
similarity index 97%
rename from pkgs/applications/audio/zrythm/default.nix
rename to pkgs/by-name/zr/zrythm/package.nix
index 91389dd07254..a61eef83bc09 100644
--- a/pkgs/applications/audio/zrythm/default.nix
+++ b/pkgs/by-name/zr/zrythm/package.nix
@@ -7,7 +7,6 @@
   appstream,
   bash-completion,
   boost,
-  breeze-icons,
   carla,
   chromaprint,
   cmake,
@@ -42,6 +41,7 @@
   ninja,
   pcre2,
   pkg-config,
+  plasma5Packages,
   python3,
   rtaudio_6,
   rtmidi,
@@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: {
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${finalAttrs.pname}-${finalAttrs.version}/glib-2.0/schemas/"
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${breeze-icons}/share"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${plasma5Packages.breeze-icons}/share"
     )
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09a5540fec3f..85ab5158b34b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16636,10 +16636,6 @@ with pkgs;
 
   inherit (callPackage ../applications/misc/zettlr { }) zettlr;
 
-  zrythm = callPackage ../applications/audio/zrythm {
-    inherit (plasma5Packages) breeze-icons;
-  };
-
   swift-corelibs-libdispatch = swiftPackages.Dispatch;
 
   aitrack = libsForQt5.callPackage ../applications/misc/aitrack { };

From 975aa3db46aa012491359a4eda63b961fb04f2e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 17:44:48 +0000
Subject: [PATCH 11/40] netbird-dashboard: 2.12.0 -> 2.14.0

---
 pkgs/by-name/ne/netbird-dashboard/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix
index e696c9130df2..1d2c2d4ff029 100644
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "netbird-dashboard";
-  version = "2.12.0";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "dashboard";
     rev = "v${version}";
-    hash = "sha256-AZ8vrDtpVADW8NMq/MBpYd6VSMcuFzk67UXoXdPeiPk=";
+    hash = "sha256-uJfXBRN8rr51nmXhpqW/P/fj+hr2yIxamL36JH7vTQI=";
   };
 
-  npmDepsHash = "sha256-XNAphh1zNi4enf0Mz9TUgWyZHezTuctMPTBswKO4eW8=";
+  npmDepsHash = "sha256-5a2OXxTjamRpm1PBrJWYtrvAT1c9qfAOja7gpkt2stI=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   installPhase = ''

From 9f1b57d841bb3bcf2a49374d848ebb1fdcb42535 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2025 05:53:03 +0000
Subject: [PATCH 12/40] linuxPackages.r8168: 8.053.00 -> 8.055.00

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

diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix
index 77d91d039bc6..e272449933ac 100644
--- a/pkgs/os-specific/linux/r8168/default.nix
+++ b/pkgs/os-specific/linux/r8168/default.nix
@@ -13,18 +13,18 @@ in
 stdenv.mkDerivation rec {
   name = "r8168-${kernel.version}-${version}";
   # on update please verify that the source matches the realtek version
-  version = "8.053.00";
+  version = "8.055.00";
 
   # This is a mirror. The original website[1] doesn't allow non-interactive
   # downloads, instead emailing you a download link.
   # [1] https://www.realtek.com/Download/List?cate_id=584
-  # I've verified manually (`diff -r`) that the source code for version 8.053.00
+  # I've verified manually (`diff -r`) that the source code for version 8.055.00
   # is the same as the one available on the realtek website.
   src = fetchFromGitHub {
     owner = "mtorromeo";
     repo = "r8168";
     rev = version;
-    sha256 = "0bHGs8jyWd+ZiixOoNkBqhS9RjDpRp3vveAgk1YuOWU=";
+    sha256 = "sha256-qL64+jlF1biWaYc5Ga/fjz8ZY3u72bcKVtDpiozHb1g=";
   };
 
   hardeningDisable = [ "pic" ];
@@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ ];
-    broken = lib.versionAtLeast kernel.modDirVersion "6.9";
+    broken = lib.versionAtLeast kernel.modDirVersion "6.13";
   };
 }

From acea6b562fe88bd1bf972e67182a6f2df95331bd Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 28 Jun 2025 07:42:00 +0200
Subject: [PATCH 13/40] renderdoc: 1.38 -> 1.39

---
 pkgs/by-name/re/renderdoc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix
index 7555e26de182..ae571d74e7ec 100644
--- a/pkgs/by-name/re/renderdoc/package.nix
+++ b/pkgs/by-name/re/renderdoc/package.nix
@@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "renderdoc";
-  version = "1.38";
+  version = "1.39";
 
   src = fetchFromGitHub {
     owner = "baldurk";
     repo = "renderdoc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6DvBV2amPfQff3LleXaqfoKzWvoHUJ0dh/bg/WcGIeA=";
+    hash = "sha256-UFaZtSA3oYOYKuV2loh5tX1rLnoKgRypaJe6H+j/uHU=";
   };
 
   outputs = [

From bd8aabbc088428f8bf9b3ead62cb12884d488d51 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 28 Jun 2025 15:13:34 +0800
Subject: [PATCH 14/40] moarvm: 2025.05 -> 2025.06

---
 pkgs/development/interpreters/rakudo/moarvm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index 52a2a4661e7b..8a5e630b2ceb 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "moarvm";
-  version = "2025.05";
+  version = "2025.06";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "moarvm";
     repo = "moarvm";
     rev = version;
-    hash = "sha256-ikzi0DsKb/HDL+rmMcm/LbYXZWhYzysERHvcmSemfJ0=";
+    hash = "sha256-QtJ8cLAbsFJ26wkfQCbIMVU1ArWlAXjsQ/RJbQ0wRNo=";
     fetchSubmodules = true;
   };
 

From e54674948773bf69629b87b2518316df57683467 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 28 Jun 2025 15:19:31 +0800
Subject: [PATCH 15/40] nqp: 2025.05 -> 2025.06

---
 pkgs/development/interpreters/rakudo/nqp.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index e7dc771e01e9..d6bf9d254faa 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation rec {
   pname = "nqp";
-  version = "2025.05";
+  version = "2025.06";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "raku";
     repo = "nqp";
     rev = version;
-    hash = "sha256-CNanRrK9ReK1OoM82ytCRh/tZfnvAs4vCyy5BRYIwCU=";
+    hash = "sha256-zI/Br2GwZuhX7X+vnRDPERVmx5hW64+t79P1oFIeVnI=";
     fetchSubmodules = true;
   };
 

From 93f97e163ecd52d71ecd999c79fec7ca47591f44 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 28 Jun 2025 15:21:27 +0800
Subject: [PATCH 16/40] rakudo: 2025.05 -> 2025.06

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

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index cc272049520a..3e42ae21591e 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation rec {
   pname = "rakudo";
-  version = "2025.05";
+  version = "2025.06";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "rakudo";
     repo = "rakudo";
     rev = version;
-    hash = "sha256-F4CWVUlDtPjnZaOPIoTMAw6kxM7FlQqr3Lm+Mg0CV2M=";
+    hash = "sha256-vZ8U18TS+L6P8jTwUxasKH+nrDMElAnGKvgT3nXdpwU=";
     fetchSubmodules = true;
   };
 

From a0328dd6d8852f5f64fe3af9d848944761c1b8d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Jun 2025 12:49:09 +0000
Subject: [PATCH 17/40] kustomize: 5.6.0 -> 5.7.0

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

diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index fec68830047f..aff9b5aa52ca 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -7,7 +7,7 @@
 
 buildGoModule rec {
   pname = "kustomize";
-  version = "5.6.0";
+  version = "5.7.0";
 
   ldflags =
     let
@@ -23,13 +23,13 @@ buildGoModule rec {
     owner = "kubernetes-sigs";
     repo = pname;
     rev = "kustomize/v${version}";
-    hash = "sha256-KsdOosKDT+wWWLzeph5NfCOx96D7GncM0qDSBJxAzJ8=";
+    hash = "sha256-O8avyJ1secafVP+Edr7PCTKjcmUFFbB1Dx74qoLxD0M=";
   };
 
   # avoid finding test and development commands
   modRoot = "kustomize";
   proxyVendor = true;
-  vendorHash = "sha256-ZYDrYhEWUEJFxFWj/LLrW8epLX2hJNqQ1CteShEbQ+M=";
+  vendorHash = "sha256-Qo2KmNbj9OYThOrt/dk6U0CnK8awUOAagYQ2iX5szVQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From c27d29b5110c93649a90e46c5c22696eb49544b4 Mon Sep 17 00:00:00 2001
From: kashu-02 <64694079+kashu-02@users.noreply.github.com>
Date: Sun, 29 Jun 2025 00:40:56 +0900
Subject: [PATCH 18/40] gemini-cli: update to v0.1.7

---
 pkgs/by-name/ge/gemini-cli/package.nix | 38 ++++----------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index ddaa7f42355c..574e5e57afd5 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -10,23 +10,23 @@
   jq,
   nix-prefetch-github,
   prefetch-npm-deps,
+  gitUpdater,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.1.5";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
-    # Currently there's no release tag
-    rev = "121bba346411cce23e350b833dc5857ea2239f2f";
-    hash = "sha256-2w28N6Fhm6k3wdTYtKH4uLPBIOdELd/aRFDs8UMWMmU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DAenod/w9BydYdYsOnuLj7kCQRcTnZ81tf4MhLUug6c=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-yoUAOo8OwUWG0gyI5AdwfRFzSZvSCd3HYzzpJRvdbiM=";
+    hash = "sha256-otogkSsKJ5j1BY00y4SRhL9pm7CK9nmzVisvGCDIMlU=";
   };
 
   preConfigure = ''
@@ -57,33 +57,7 @@ buildNpmPackage (finalAttrs: {
     chmod +x "$out/bin/gemini"
   '';
 
-  passthru.updateScript = lib.getExe (writeShellApplication {
-    name = "gemini-cli-update-script";
-    runtimeInputs = [
-      cacert
-      curl
-      gnused
-      jq
-      nix-prefetch-github
-      prefetch-npm-deps
-    ];
-    text = ''
-      latest_version=$(curl -s "https://raw.githubusercontent.com/google-gemini/gemini-cli/main/package-lock.json" | jq -r '.version')
-      latest_rev=$(curl -s "https://api.github.com/repos/google-gemini/gemini-cli/commits/main" | jq -r '.sha')
-
-      src_hash=$(nix-prefetch-github google-gemini gemini-cli --rev "$latest_rev" | jq -r '.hash')
-
-      temp_dir=$(mktemp -d)
-      curl -s "https://raw.githubusercontent.com/google-gemini/gemini-cli/$latest_rev/package-lock.json" > "$temp_dir/package-lock.json"
-      npm_deps_hash=$(prefetch-npm-deps "$temp_dir/package-lock.json")
-      rm -rf "$temp_dir"
-
-      sed -i "s|version = \".*\";|version = \"$latest_version\";|" "pkgs/by-name/ge/gemini-cli/package.nix"
-      sed -i "s|rev = \".*\";|rev = \"$latest_rev\";|" "pkgs/by-name/ge/gemini-cli/package.nix"
-      sed -i "/src = fetchFromGitHub/,/};/s|hash = \".*\";|hash = \"$src_hash\";|" "pkgs/by-name/ge/gemini-cli/package.nix"
-      sed -i "/npmDeps = fetchNpmDeps/,/};/s|hash = \".*\";|hash = \"$npm_deps_hash\";|" "pkgs/by-name/ge/gemini-cli/package.nix"
-    '';
-  });
+  passthru.updateScript = gitUpdater {};
 
   meta = {
     description = "AI agent that brings the power of Gemini directly into your terminal";

From 6096b841a7c2a224f2d57206be33a46a70932d46 Mon Sep 17 00:00:00 2001
From: kashu-02 <64694079+kashu-02@users.noreply.github.com>
Date: Sun, 29 Jun 2025 01:08:18 +0900
Subject: [PATCH 19/40] gemini-cli: fmt

---
 pkgs/by-name/ge/gemini-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index 574e5e57afd5..7f5ac8afb17b 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -57,7 +57,7 @@ buildNpmPackage (finalAttrs: {
     chmod +x "$out/bin/gemini"
   '';
 
-  passthru.updateScript = gitUpdater {};
+  passthru.updateScript = gitUpdater { };
 
   meta = {
     description = "AI agent that brings the power of Gemini directly into your terminal";

From 48f5657fb955b4c0414351bfd1c83fe293a81269 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Sat, 28 Jun 2025 18:22:12 +0200
Subject: [PATCH 20/40] nixos/chrony: fix defaultText rendering of
 enableMemoryLocking option

---
 nixos/modules/services/networking/ntp/chrony.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index dcfd211470d6..b0af0a6e6ee7 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -92,7 +92,7 @@ in
         default =
           config.environment.memoryAllocator.provider != "graphene-hardened"
           && config.environment.memoryAllocator.provider != "graphene-hardened-light";
-        defaultText = ''config.environment.memoryAllocator.provider != "graphene-hardened" && config.environment.memoryAllocator.provider != "graphene-hardened-light"'';
+        defaultText = lib.literalExpression ''config.environment.memoryAllocator.provider != "graphene-hardened" && config.environment.memoryAllocator.provider != "graphene-hardened-light"'';
         description = ''
           Whether to add the `-m` flag to lock memory.
         '';

From 774f09236c1682a650a9f92999565c6394dad56b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 28 Jun 2025 19:05:57 +0200
Subject: [PATCH 21/40] freeipa: 4.12.3 -> 4.12.4

Fixes CVE-2025-4404.

Changes:
https://www.freeipa.org/release-notes/4-12-4.html
---
 pkgs/os-specific/linux/freeipa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix
index e967f01fd6be..b50e3f79e488 100644
--- a/pkgs/os-specific/linux/freeipa/default.nix
+++ b/pkgs/os-specific/linux/freeipa/default.nix
@@ -67,11 +67,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "freeipa";
-  version = "4.12.3";
+  version = "4.12.4";
 
   src = fetchurl {
     url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz";
-    sha256 = "sha256-bVttsyn99DX01CmthIxzxuJPGgqZB2+pgamviO4LBJI=";
+    hash = "sha256-Nn3dHoaAt6+MZ0gMFCJniXginq4guNM8HjChren9adY=";
   };
 
   patches = [

From f0df0c4775a6782113889f12e0c2a9f2955578ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89douard=20Lopez?=
 <edouard-lopez@users.noreply.github.com>
Date: Tue, 27 May 2025 21:54:21 +0200
Subject: [PATCH 22/40] fishPlugins.pure: update project homepage

docs(pkgs): update `pure` project homepage
see decision to migrate to organization: https://github.com/pure-fish/pure/issues/249#issuecomment-751510259
---
 pkgs/shells/fish/plugins/pure.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix
index c5a288b8f027..9027ad49587d 100644
--- a/pkgs/shells/fish/plugins/pure.nix
+++ b/pkgs/shells/fish/plugins/pure.nix
@@ -28,7 +28,7 @@ buildFishPlugin rec {
 
   meta = {
     description = "Pretty, minimal and fast Fish prompt, ported from zsh";
-    homepage = "https://github.com/rafaelrinaldi/pure";
+    homepage = "https://github.com/pure-fish/pure";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ euxane ];
   };

From 1d9f5399b3a672e6bc2a887319ce54cbbe536e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 28 Jun 2025 20:27:38 +0200
Subject: [PATCH 23/40] python3Packages.hcloud: 2.5.2 -> 2.5.3

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

diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index 77ceb0a49683..4e106a48419c 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -13,20 +13,19 @@
 
 buildPythonPackage rec {
   pname = "hcloud";
-  version = "2.5.2";
+  version = "2.5.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-v1vnII5q1bOf/neiNOJPa+t03ma/cjLbxbabo2jQptQ=";
+    hash = "sha256-+9unvxFjf/ryqN6g4IKWX1viwgSfkgrX1prjXvBnbWs=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
-    future
     requests
     python-dateutil
   ];

From f2bb10c1fd0efce16fe5842c795f0a34b92216fa Mon Sep 17 00:00:00 2001
From: Daniel Baker <daniel.n.baker@gmail.com>
Date: Sat, 28 Jun 2025 12:03:09 -0700
Subject: [PATCH 24/40] maintainers: add idabzo

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 17c86233489e..bf367b1d0b4c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10540,6 +10540,11 @@
     github = "id3v1669";
     githubId = 57532211;
   };
+  idabzo = {
+    github = "idabzo";
+    githubId = 12761234;
+    name = "Ida Bzowska";
+  };
   idlip = {
     name = "Dilip";
     email = "igoldlip@gmail.com";

From 2c58a919aba7feaf281b7112b2da48a4502c8229 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Jun 2025 22:04:47 +0000
Subject: [PATCH 25/40] cpptrace: 1.0.1 -> 1.0.2

---
 pkgs/by-name/cp/cpptrace/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cp/cpptrace/package.nix b/pkgs/by-name/cp/cpptrace/package.nix
index 7e174005a80d..fd2516c65bb9 100644
--- a/pkgs/by-name/cp/cpptrace/package.nix
+++ b/pkgs/by-name/cp/cpptrace/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpptrace";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "jeremy-rifkin";
     repo = "cpptrace";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HUUyH9N+e98Gp6TPeT6TCGpdzd09knHVDaQ3KeDp8LY=";
+    hash = "sha256-Rqj0yFOOOZyK4BJWVFGyYznMSSwNgb+o1HTykyyOWcA=";
   };
 
   patches = [

From d6bd678fa8bca4c2c4d54dc4d93ff4fd2fa627c1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 29 Jun 2025 00:22:55 +0200
Subject: [PATCH 26/40] check-sieve: 0.10-unstable-2025-05-06 -> 0.11

https://github.com/dburkart/check-sieve/blob/check-sieve-0.11/ChangeLog
---
 pkgs/by-name/ch/check-sieve/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ch/check-sieve/package.nix b/pkgs/by-name/ch/check-sieve/package.nix
index ac76b9a90868..0a29ac7162d7 100644
--- a/pkgs/by-name/ch/check-sieve/package.nix
+++ b/pkgs/by-name/ch/check-sieve/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "check-sieve";
-  version = "0.10-unstable-2025-05-06";
+  version = "0.11";
 
   src = fetchFromGitHub {
     owner = "dburkart";
     repo = "check-sieve";
-    rev = "794c2b116078af59fa8b7bf7a00450f8de0f06de";
-    hash = "sha256-jml+G253cqYco9vKXwI8LW7w/mN74lMthCzlRXl+SWc=";
+    tag = "check-sieve-${version}";
+    hash = "sha256-vmfHXjcZ5J/+kO3/a0p8krLOuC67+q8SxcPJgW+UaTw=";
   };
 
   nativeBuildInputs = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     description = "Syntax checker for mail sieves";
     mainProgram = "check-sieve";
     homepage = "https://github.com/dburkart/check-sieve";
-    changelog = "https://github.com/dburkart/check-sieve/blob/master/ChangeLog";
+    changelog = "https://github.com/dburkart/check-sieve/blob/${src.tag}/ChangeLog";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ eilvelia ];

From d60ac7eb5ea5f3ab0ac6dab7db7f0d256e87d29e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 00:39:05 +0000
Subject: [PATCH 27/40] steamguard-cli: 0.17.0 -> 0.17.1

---
 pkgs/by-name/st/steamguard-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix
index e7faa8dc414f..849b69c5028c 100644
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "steamguard-cli";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "dyc3";
     repo = "steamguard-cli";
     rev = "v${version}";
-    hash = "sha256-o4hJ8+FsFLKJwifLP3pGbn35SOsTTnQosO4IejitUeI=";
+    hash = "sha256-IoWLPpFPQC1QU1EgJSiiAQqMcDQnHa5WRLiya3WN+6w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OBftq8bPqmc77oeOStAeXZN5DHfASdOJCrmgDTgHFWc=";
+  cargoHash = "sha256-7csGZp5dAz0j7pTxeex/yrgzNFU7Qz3zNcZ/K4dV7GE=";
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

From 53833447bdd165f85ae9aac2156ef76e73587ab8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 02:52:45 +0000
Subject: [PATCH 28/40] rsop: 0.7.0 -> 0.7.1

---
 pkgs/by-name/rs/rsop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix
index 1ace6ca857e6..f1722067888a 100644
--- a/pkgs/by-name/rs/rsop/package.nix
+++ b/pkgs/by-name/rs/rsop/package.nix
@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rsop";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "heiko";
     repo = "rsop";
     rev = "rsop/v${version}";
-    hash = "sha256-jbAv4uTG+ffp6mc9EsezPORh9KqDfUBNXxQuaOIbNfQ=";
+    hash = "sha256-8Zp+sdEV+HJfreBuIaB952Go0LBxMzYFl557TWSxxMk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-G1N76ZG43eiTjxhOfRCSwjz7XOAolj88tex8qoZuC2Y=";
+  cargoHash = "sha256-3/pdOkgd4X9HpJN3LHMCmWchb/qwaNM7pE/dKHxSi5U=";
 
   nativeBuildInputs = [ pkg-config ];
 

From d0c18c0adc86d4e38cd957708d55353e287bf133 Mon Sep 17 00:00:00 2001
From: purpole <101905225+purpole@users.noreply.github.com>
Date: Sun, 29 Jun 2025 08:42:07 +0200
Subject: [PATCH 29/40] sccmhunter: use python3.12

---
 pkgs/by-name/sc/sccmhunter/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sc/sccmhunter/package.nix b/pkgs/by-name/sc/sccmhunter/package.nix
index be7568e72786..2d4a4f773e44 100644
--- a/pkgs/by-name/sc/sccmhunter/package.nix
+++ b/pkgs/by-name/sc/sccmhunter/package.nix
@@ -1,9 +1,11 @@
 {
   lib,
   fetchFromGitHub,
-  python3Packages,
+  # Pinned to Python 3.12 because future-1.0.0 is not supported for Python 3.13:
+  # error: future-1.0.0 not supported for interpreter python3.13
+  python312Packages,
 }:
-python3Packages.buildPythonApplication rec {
+python312Packages.buildPythonApplication rec {
   pname = "sccmhunter";
   version = "1.0.10";
   pyproject = true;
@@ -15,11 +17,11 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-h7P+ry4J26Hm1s9U37t1EDWBaYRL32WA3sk8caA1edg=";
   };
 
-  build-system = with python3Packages; [
+  build-system = with python312Packages; [
     setuptools
   ];
 
-  dependencies = with python3Packages; [
+  dependencies = with python312Packages; [
     cmd2
     cryptography
     impacket

From 1aff5d6e7ee4d833cea31763f0297fca2b53e1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fausto=20N=C3=BA=C3=B1ez=20Alberro?=
 <fausto.nunez@mailbox.org>
Date: Sat, 28 Jun 2025 11:25:26 +0200
Subject: [PATCH 30/40] gemini-cli: fix file collisions

Multiple Node.js packages in nixpkgs create file collisions when installed together in home-manager or system profiles. Specifically:

- `gemini-cli` vs `eslint`: collision on `lib/node_modules/eslint/conf/default-cli-options.js`
- `gemini-cli` vs `angular-language-server`: collision on `lib/node_modules/semver/README.md` (with permission differences: 0555 vs 0444)

This occurs because these packages install their bundled dependencies directly to `$out/lib/node_modules/`, causing path conflicts when multiple packages provide the same transitive dependencies.

The issue stems from packages copying their entire `node_modules` directory to a shared location (`$out/lib/node_modules/`) rather than isolating their dependencies in package-specific directories.

Before:
```nix
cp -r node_modules "$out/lib/"
```

After:
```nix
cp -r node_modules "$out/share/gemini-cli/"
```

This is probably counterproductive in some ways (would ideally share deps?) but at least this fix allows these packages to coexist.
---
 pkgs/by-name/ge/gemini-cli/package.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index ddaa7f42355c..5a61442fc3dc 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -36,20 +36,16 @@ buildNpmPackage (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
+    mkdir -p $out/{bin,share/gemini-cli}
 
-    mkdir -p "$out/lib"
+    cp -r node_modules $out/share/gemini-cli/
 
-    cp -r node_modules "$out/lib/"
-
-    rm -f "$out/lib/node_modules/@google/gemini-cli"
-    rm -f "$out/lib/node_modules/@google/gemini-cli-core"
-
-    cp -r packages/cli "$out/lib/node_modules/@google/gemini-cli"
-    cp -r packages/core "$out/lib/node_modules/@google/gemini-cli-core"
-
-    mkdir -p "$out/bin"
-    ln -s ../lib/node_modules/@google/gemini-cli/dist/index.js "$out/bin/gemini"
+    rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli
+    rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-core
+    cp -r packages/cli $out/share/gemini-cli/node_modules/@google/gemini-cli
+    cp -r packages/core $out/share/gemini-cli/node_modules/@google/gemini-cli-core
 
+    ln -s $out/share/gemini-cli/node_modules/@google/gemini-cli/dist/index.js $out/bin/gemini
     runHook postInstall
   '';
 

From 8f6be61b615ed918d999af13fe21fadbf8d09db3 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Sun, 29 Jun 2025 17:37:11 +0900
Subject: [PATCH 31/40] eza: 0.21.5 -> 0.21.6

https://github.com/eza-community/eza/releases/tag/v0.21.6

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/ez/eza/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
index 1d9e4d1049b3..f614766d74c0 100644
--- a/pkgs/by-name/ez/eza/package.nix
+++ b/pkgs/by-name/ez/eza/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "eza";
-  version = "0.21.5";
+  version = "0.21.6";
 
   src = fetchFromGitHub {
     owner = "eza-community";
     repo = "eza";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Mnd4Hzuzq8aawwDn7qtjbAyM/JLlhtoATF/OUzqQkHc=";
+    hash = "sha256-9Q66xaQzRwpc/fRvAQsbzBDpXhm0goCNiW/sUjGmUEM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3BNyoKWPmq2CHiBeliUGWpChtSmfJUEmf4JZoYVVpb8=";
+  cargoHash = "sha256-Asb6V0R49ZprabXQOi95zBpqc855CLwXUstKVq7+rXs=";
 
   nativeBuildInputs = [
     cmake

From 2c2bded35f94e4793313d1591dd800d7f8a54101 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 09:46:15 +0000
Subject: [PATCH 32/40] clever-tools: 3.13.0 -> 3.13.1

---
 pkgs/by-name/cl/clever-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
index 1e57a56089fb..22bbb16711b4 100644
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@@ -11,7 +11,7 @@
 buildNpmPackage rec {
   pname = "clever-tools";
 
-  version = "3.13.0";
+  version = "3.13.1";
 
   nodejs = nodejs_20;
 
@@ -19,10 +19,10 @@ buildNpmPackage rec {
     owner = "CleverCloud";
     repo = "clever-tools";
     rev = version;
-    hash = "sha256-E6MD/fQO7cpczaaTbkZOf/lMOywUUXBP9uUVfTH+Iv8=";
+    hash = "sha256-6QzwZmDCts/ci0J2ok1Met9bNiqDHmdYj/PbvWyd4Wk=";
   };
 
-  npmDepsHash = "sha256-Q66Gq8LvZEoRVpwzwbK4D9KLVNk6Rc5SztFGwQUuePI=";
+  npmDepsHash = "sha256-H53g1hbVpArFNy47M5QS2/diWbEyyoLOf86OxVffvwQ=";
 
   nativeBuildInputs = [
     installShellFiles

From 388426df26b8e2c21c9bddf302c19cdbd2e4f17d Mon Sep 17 00:00:00 2001
From: loner <2788892716@qq.com>
Date: Sat, 28 Jun 2025 14:26:33 +0800
Subject: [PATCH 33/40] typeinc: 1.0.1 -> 1.0.3

---
 pkgs/by-name/ty/typeinc/package.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ty/typeinc/package.nix b/pkgs/by-name/ty/typeinc/package.nix
index a38ab3d9adf6..58635da69898 100644
--- a/pkgs/by-name/ty/typeinc/package.nix
+++ b/pkgs/by-name/ty/typeinc/package.nix
@@ -8,27 +8,21 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "typeinc";
-  version = "1.0.1";
+  version = "1.0.3";
+
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AnirudhG07";
     repo = "Typeinc";
     tag = "v${version}";
-    hash = "sha256-p549vz4PoZgFybu/X/6BZfEnQAeQEA1jZAgqB5nD5UM=";
+    hash = "sha256-/R3mNxZE4Pt4UlCljsQphHBCoA2JIZrTorqU4Adcdp0=";
   };
 
-  pyproject = true;
   build-system = [ python3Packages.hatchling ];
 
   nativeBuildInputs = [ installShellFiles ];
 
-  dependencies = with python3Packages; [
-    setuptools
-    pyttsx3
-    pyperclip
-    keyboard
-  ];
-
   postInstall = ''
     installManPage docs/man/typeinc.1
   '';

From 0d6370788afe04913e91234f130868cd7c0cfc92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 12:48:48 +0000
Subject: [PATCH 34/40] qmmp: 2.2.6 -> 2.2.7

---
 pkgs/by-name/qm/qmmp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qm/qmmp/package.nix b/pkgs/by-name/qm/qmmp/package.nix
index e9c91a1a10d6..adc1427480ce 100644
--- a/pkgs/by-name/qm/qmmp/package.nix
+++ b/pkgs/by-name/qm/qmmp/package.nix
@@ -54,11 +54,11 @@
 
 stdenv.mkDerivation rec {
   pname = "qmmp";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchurl {
     url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2";
-    hash = "sha256-Jw7Kb9co2aC8fxnpTg4OH2o8RNreZI3/pYoNu3OWy0s=";
+    hash = "sha256-3c/wthj0eQgC9tUtmnlrXzLLfQ8jyZGBuAT2FPq1+7I=";
   };
 
   nativeBuildInputs = [

From 6ac1f3f61bb645c21f940839c54c18c602a2c0a8 Mon Sep 17 00:00:00 2001
From: arminius-smh <armin@sprejz.de>
Date: Wed, 25 Jun 2025 16:10:41 +0200
Subject: [PATCH 35/40] python3Packages.fugashi: 1.3.0 -> 1.5.1

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

diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix
index 63c19f1215a3..25fedaf96d94 100644
--- a/pkgs/development/python-modules/fugashi/default.nix
+++ b/pkgs/development/python-modules/fugashi/default.nix
@@ -4,7 +4,7 @@
   pythonOlder,
   pytestCheckHook,
   buildPythonPackage,
-  cython_0,
+  cython,
   mecab,
   setuptools-scm,
   ipadic,
@@ -14,19 +14,19 @@
 
 buildPythonPackage rec {
   pname = "fugashi";
-  version = "1.3.0";
-  format = "setuptools";
-  disabled = pythonOlder "3.7";
+  version = "1.5.1";
+  format = "pyproject";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "polm";
     repo = "fugashi";
     tag = "v${version}";
-    hash = "sha256-4i7Q+TtXTQNSJ1EIcS8KHrVPdCJAgZh86Y6lB8772XU=";
+    hash = "sha256-rkQskRz7lgVBrqBeyj9kWO2/7POrZ0TaM+Z7mhpZLvM=";
   };
 
   nativeBuildInputs = [
-    cython_0
+    cython
     mecab
     setuptools-scm
   ];

From 22c3b2e39ff1e2b112319418450c1874103e20ae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 29 Jun 2025 16:22:07 +0200
Subject: [PATCH 36/40] release-python: drop lib-tests

It is unclear why these were added in the first place and now with Nix
2.3 getting its vulnerable mark it has become a nuisance.
---
 pkgs/top-level/release-python.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 06f235b3606c..5bce39ba5e0e 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -49,7 +49,7 @@ let
   );
 
   jobs = {
-    lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
+    # for pkgs.formats tests, which rely on remarshal
     pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; };
 
     tested = pkgs.releaseTools.aggregate {

From 10e0be92db6947eba3ca5dfd9c21bad22520d24f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 16:27:18 +0000
Subject: [PATCH 37/40] rebuilderd: 0.23.1 -> 0.24.0

---
 pkgs/by-name/re/rebuilderd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix
index 303677626ab2..9016df3118ef 100644
--- a/pkgs/by-name/re/rebuilderd/package.nix
+++ b/pkgs/by-name/re/rebuilderd/package.nix
@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rebuilderd";
-  version = "0.23.1";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "rebuilderd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ARm81++VByh/erog1aDQTOaxd60M9OuTbJGdgHx24pw=";
+    hash = "sha256-6LBTUb6kCR/oSyIhiVADSz+oE2xLSY5GKxUQ4HcDFJk=";
   };
 
   postPatch = ''
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-O+1ARimSN26geZanLV5E94vnZk0HsE4pyjNS3dADg8Y=";
+  cargoHash = "sha256-s6gXinH706tAxDyHrhPV4u+Z1tbLvBOhI1JhdiwrHG8=";
 
   nativeBuildInputs = [
     pkg-config

From 182efe799a4097e7dc797568c964f856f6a94752 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 16:35:55 +0000
Subject: [PATCH 38/40] windsurf: 1.10.3 -> 1.10.5

---
 pkgs/by-name/wi/windsurf/info.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json
index 0676e9288632..3349b87ed8a4 100644
--- a/pkgs/by-name/wi/windsurf/info.json
+++ b/pkgs/by-name/wi/windsurf/info.json
@@ -1,20 +1,20 @@
 {
   "aarch64-darwin": {
-    "version": "1.10.3",
+    "version": "1.10.5",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/c1afeb8ae2b17dbdda415f9aa5dec23422c1fe47/Windsurf-darwin-arm64-1.10.3.zip",
-    "sha256": "1d48996a9a695ddce474e4a268e687752c5f856446298c58fdbca3b21f19ec88"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/ff497a1ec3dde399fde9c001a3e69a58f2739dac/Windsurf-darwin-arm64-1.10.5.zip",
+    "sha256": "e402aeb4c1fdc758cc31063fd5cfab1795f45bb2928df1b4c494a778be9d3db3"
   },
   "x86_64-darwin": {
-    "version": "1.10.3",
+    "version": "1.10.5",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/c1afeb8ae2b17dbdda415f9aa5dec23422c1fe47/Windsurf-darwin-x64-1.10.3.zip",
-    "sha256": "ab46ad5bed1c8e577fee8cfe249981af88c504a357f82a769cd698b3bc9c2b4d"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/ff497a1ec3dde399fde9c001a3e69a58f2739dac/Windsurf-darwin-x64-1.10.5.zip",
+    "sha256": "4fb21084c4e077d3c667b061688afe66ea083ec62f6d5620255277cd241926a0"
   },
   "x86_64-linux": {
-    "version": "1.10.3",
+    "version": "1.10.5",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/c1afeb8ae2b17dbdda415f9aa5dec23422c1fe47/Windsurf-linux-x64-1.10.3.tar.gz",
-    "sha256": "638f31624714189f6c3272635d1089debbe1fb9a96eb290a8b5b4471eb288dfb"
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/ff497a1ec3dde399fde9c001a3e69a58f2739dac/Windsurf-linux-x64-1.10.5.tar.gz",
+    "sha256": "4639e428f23cd9e3cfefcd9730518e136cd6d1bb9faac23d7f4c0d4c53ff88ff"
   }
 }

From de113bb486de05a6790b351b01b326f449d75a76 Mon Sep 17 00:00:00 2001
From: Felix Kimmel <felix.kimmel@web.de>
Date: Sun, 29 Jun 2025 18:44:45 +0200
Subject: [PATCH 39/40] vscode-extensions.mkhl.shfmt: init at 1.3.1

---
 .../editors/vscode/extensions/default.nix     |  2 ++
 .../vscode/extensions/mkhl.shfmt/default.nix  | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/mkhl.shfmt/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 963b48977134..384139672b87 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3241,6 +3241,8 @@ let
         };
       };
 
+      mkhl.shfmt = callPackage ./mkhl.shfmt { };
+
       mongodb.mongodb-vscode = callPackage ./mongodb.mongodb-vscode { };
 
       moshfeu.compare-folders = buildVscodeMarketplaceExtension {
diff --git a/pkgs/applications/editors/vscode/extensions/mkhl.shfmt/default.nix b/pkgs/applications/editors/vscode/extensions/mkhl.shfmt/default.nix
new file mode 100644
index 000000000000..84c2bd9a93a0
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/mkhl.shfmt/default.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  vscode-utils,
+  jq,
+  shfmt,
+  moreutils,
+}:
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "shfmt";
+    publisher = "mkhl";
+    version = "1.3.1";
+    hash = "sha256-V7pXPwabmUJLC/T0X4dsc52IZa7SaN70zd4mCjqk4X4=";
+  };
+
+  postInstall = ''
+    cd "$out/$installPrefix"
+    ${lib.getExe jq} '.contributes.configuration.properties."shfmt.executablePath".default = "${lib.getExe shfmt}"' package.json | ${lib.getExe' moreutils "sponge"} package.json
+  '';
+
+  meta = {
+    description = "Extension uses shfmt to provide a formatter for shell script documents";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=mkhl.shfmt";
+    homepage = "https://codeberg.org/mkhl/vscode-shfmt";
+    license = lib.licenses.bsd0;
+    maintainers = [ lib.maintainers.therobot2105 ];
+  };
+}

From c61e6e95e5bbfb7fe1ba97f941933b771eea76bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 17:19:56 +0000
Subject: [PATCH 40/40] signal-desktop: 7.58.0 -> 7.59.0

---
 pkgs/by-name/si/signal-desktop/libsignal-node.nix |  8 ++++----
 pkgs/by-name/si/signal-desktop/package.nix        | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 3d2aee9a4498..3c61ab703de1 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.72.1";
+  version = "0.74.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A8EAHHcBFSD4ZlvFig64g4+eoZQCuqE/qv509hA3I4s=";
+    hash = "sha256-ZMi+/d051CS7TcWVZnVItNpok0ac+vAvvZL/buNrtL0=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-+vJrywIi/RcGGGns42XlN6S63RBil3fB4XByTLsaFVc=";
+  cargoHash = "sha256-pRMFWJSRjhZYfX7dmOQXK3BjhJKzPR1Pg+TZzTfPnd4=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-ZD0ZN2b7KReGbnvarqvGpOlQ5TsJfnaHmmOWQ42Y48E=";
+    hash = "sha256-9x1oCzZLBeX0AN+R4qcyBNwsJ/AY6mebCEEfQ5JKpl8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 65bfd38acbf4..9045fb74a423 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -52,13 +52,13 @@ let
     '';
   });
 
-  version = "7.58.0";
+  version = "7.59.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-0WO4cjbZLVaf/ju7PdfZJKOa7qGXsjWZHGY8lxOvr3w=";
+    hash = "sha256-Brvr4SQ2TzAqrvXm9C7a1ejaP4kviJoQhgRBP3R3dIg=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -120,15 +120,15 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     hash =
       if withAppleEmojis then
-        "sha256-h2yaGRqAtVh/8Jv+YZAcXw3/b8+fi+cKFSqcRhMH2sM="
+        "sha256-mVC7dOsBcBrOEuz7t4xMv1QX2ZgfA5EjnRYunZEx73E="
       else
-        "sha256-1dkJBIQVJxpsd8IQIlRncDYHp+2j0fowlbEEWpQSPtI=";
+        "sha256-9hvqLZGSrzJD5vMTdHoIpDeRM6fu2JSRNdHgyeSWmDY=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1750276003;
+    SOURCE_DATE_EPOCH = 1750885921;
   };
 
   preBuild = ''