From d2cd68772a7b6cbe0b24bd16c5e428bc9317b671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Bla=C5=A1kovi=C4=87?= <lblasc@tvbeat.com>
Date: Sat, 26 Apr 2025 06:56:25 +0000
Subject: [PATCH 01/55] buildRustCrate: add missing env variables for build
 scripts

Adds {CRATENAME}_{CRATEVERSION} variant of DEP_ environment variable
to match the Cargo behavior.

resolves issues like:
https://github.com/nix-community/crate2nix/issues/376
---
 pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index 30f13b988c6a..007b9553509b 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -246,9 +246,10 @@ in
      IFS="$_OLDIFS"
 
      CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/" -e "s/-/_/g")
+     CRATEVERSION=$(echo ${crateVersion} | sed -e "s/[\.\+]/_/g")
      grep -P "^cargo:(?!:?(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \
        | awk -F= "/^cargo::metadata=/ {  gsub(/-/, \"_\", \$2); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$2) \"=\" \"\\\"\"\$3\"\\\"\"; next }
-                  /^cargo:/ { sub(/^cargo::?/, \"\", \$1); gsub(/-/, \"_\", \$1); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$1) \"=\" \"\\\"\"\$2\"\\\"\"; next }" > target/env
+                  /^cargo:/ { sub(/^cargo::?/, \"\", \$1); gsub(/-/, \"_\", \$1); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$1) \"=\" \"\\\"\"\$2\"\\\"\"; print \"export \" toupper(\"DEP_$(echo $CRATENAME)_$(echo $CRATEVERSION)_\" \$1) \"=\" \"\\\"\"\$2\"\\\"\"; next }" > target/env
      set -e
   fi
   runHook postConfigure

From b2d0cbc4a151c73e7e1c1bba1c955f096ef5e42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 16 Jun 2025 00:40:29 +0200
Subject: [PATCH 02/55] hydra: avoid drawing in development dependencies from
 nix 2.29 on runtime

---
 pkgs/by-name/hy/hydra/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 61d8d1606397..fceef1e4812b 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -239,7 +239,7 @@ stdenv.mkDerivation (finalAttrs: {
         read -n 4 chars < $i
         if [[ $chars =~ ELF ]]; then continue; fi
         wrapProgram $i \
-            --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
+            --prefix PERL5LIB ':' "$out/libexec/hydra/lib:${perlPackages.makePerlPath [ perlDeps ]}" \
             --prefix PATH ':' $out/bin:$hydraPath \
             --set-default HYDRA_RELEASE ${finalAttrs.version} \
             --set HYDRA_HOME $out/libexec/hydra \

From dcc19204a1f2b88ddb7f63521181f5b67c96e250 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 18:52:44 +0000
Subject: [PATCH 03/55] sundials: 7.3.0 -> 7.4.0

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

diff --git a/pkgs/by-name/su/sundials/package.nix b/pkgs/by-name/su/sundials/package.nix
index 82fceb3ccad5..b9d4d7d9dc8e 100644
--- a/pkgs/by-name/su/sundials/package.nix
+++ b/pkgs/by-name/su/sundials/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   pname = "sundials";
-  version = "7.3.0";
+  version = "7.4.0";
 
   outputs = [
     "out"
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
-    hash = "sha256-/ZcKkCP46je4HFBlwGe/Fyb2VrOfWQe0gWmm+Y0wa6c=";
+    hash = "sha256-Z53azdd2EBEOYTFk6Cl9bQzTW66OnDr8jo/2+ZocKns=";
   };
 
   nativeBuildInputs = [

From b9e49739d2d17736dc11492ce4b0d3ba7c439d84 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 24 Jun 2025 11:56:54 +0200
Subject: [PATCH 04/55] dependency-track: use protogen_30 to fix build

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

diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix
index 6c342f3ac380..c0e58a8968aa 100644
--- a/pkgs/by-name/de/dependency-track/package.nix
+++ b/pkgs/by-name/de/dependency-track/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   nodejs_20,
   jre_headless,
-  protobuf,
+  protobuf_30,
   cyclonedx-cli,
   makeWrapper,
   maven,
@@ -61,7 +61,7 @@ maven.buildMavenPackage rec {
   postPatch = ''
     substituteInPlace pom.xml \
       --replace-fail '<protocArtifact>''${tool.protoc.version}</protocArtifact>' \
-      "<protocCommand>${protobuf}/bin/protoc</protocCommand>"
+      "<protocCommand>${protobuf_30}/bin/protoc</protocCommand>"
   '';
 
   mvnJdk = jre_headless;

From ef8b8e5a456c9b00e5856ca0dbc9ab9d0a91e81b Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Sun, 12 Jan 2025 21:23:27 +0000
Subject: [PATCH 05/55] xen: 4.19.1 -> 4.20.0

Includes patches for XSA #469. (Training Solo)

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/xe/xen/package.nix | 38 +++++++++++++--------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index e5fffebe293b..b0df72e7f9e6 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -6,45 +6,37 @@
 
 buildXenPackage.override { inherit python3Packages; } {
   pname = "xen";
-  version = "4.19.1";
+  version = "4.20.0";
   patches = [
     (fetchpatch {
-      url = "https://lore.kernel.org/xen-devel/e2caa6648a0b6c429349a9826d8fbc4338222482.1733766758.git.andrii.sultanov@cloud.com/raw";
-      hash = "sha256-JC1ueXuC1Jdi2gtUsjOHmTeEx56zjotMMLde5vBonxc=";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-01.patch";
+      hash = "sha256-go743oBhYDuxsK0Xc6nK/WxutQQwc2ERtLKhCU9Dnng=";
     })
     (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa467.patch";
-      hash = "sha256-O2IwfRo6BnXAO04xjKmOyrV6J6Q1mAVLHWNCxqIEQGU=";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-02.patch";
+      hash = "sha256-FTtEGAPFYxsun38hLhVMKJ1TFJOsTMK3WWPkO0R/OHg=sha256-FTtEGAPFYxsun38hLhVMKJ1TFJOsTMK3WWPkO0R/OHg=";
     })
     (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-01.patch";
-      hash = "sha256-YUcp9QI49RM/7WCxYzpzppv+vKtyl/NvLy6rIX5hVMw=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-02.patch";
-      hash = "sha256-FTtEGAPFYxsun38hLhVMKJ1TFJOsTMK3WWPkO0R/OHg=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-03.patch";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-03.patch";
       hash = "sha256-UkYMSpUgFvr4GJPXLgQsCyppGkNbeiFMyCZORK5tfmA=";
     })
     (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-04.patch";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-04.patch";
       hash = "sha256-lpiDPSHi+v2VfaWE9kp4+hveZKTzojD1F+RHsOtKE3A=";
     })
     (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-05.patch";
-      hash = "sha256-EKo9a5STX0mTRopoThe3+6gCWat+3XbguLr9QgMheZs=";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-05.patch";
+      hash = "sha256-N+WR8S5w9dLISlOhMI71TOH8jvCgVAR8xm310k3ZA/M=";
     })
     (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-06.patch";
-      hash = "sha256-HU+4apyTZNIFZ9cySOEtNh0JBJDG3LjDLwMvQYq0src=";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-06.patch";
+      hash = "sha256-ePuyB3VP9NfQbW36BP3jjMMHKJWFJGeTYUYZqy+IlHQ=";
     })
     (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-07.patch";
-      hash = "sha256-9S85nkQ9Nn0cMzyRe4KGrFUaLggVxXBeKhoFF4R0y78=";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-07.patch";
+      hash = "sha256-+BsCJa01R2lrbu7tEluGrYSAqu2jJcrpFNUoLMY466c=";
     })
   ];
-  rev = "ccf400846780289ae779c62ef0c94757ff43bb60";
-  hash = "sha256-s0eCBCd6ybl+kLtXCC6E1sk++w7txXn/B/Cg5acQFfY=";
+  rev = "3ad5d648cda5add395f49fc3704b2552aae734f7";
+  hash = "sha256-v2DRJv+1bym8zAgU74lo1HQ/9rUcyK3qc4Eec4RpcEY=";
 }

From e3c735ccd8febea57e8260157a58a6d1ef9a34b4 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Wed, 26 Mar 2025 08:11:13 -0300
Subject: [PATCH 06/55] xen: delete outdated README

The README no longer contained any useful information as of Xen 4.20.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/xe/xen/README.md | 133 ----------------------------------
 1 file changed, 133 deletions(-)
 delete mode 100644 pkgs/by-name/xe/xen/README.md

diff --git a/pkgs/by-name/xe/xen/README.md b/pkgs/by-name/xe/xen/README.md
deleted file mode 100644
index df3b71b3c956..000000000000
--- a/pkgs/by-name/xe/xen/README.md
+++ /dev/null
@@ -1,133 +0,0 @@
-<p align="center">
-  <a href="https://xenproject.org/">
-    <picture>
-      <source
-        media="(prefers-color-scheme: light)"
-        srcset="https://downloads.xenproject.org/Branding/Logos/Green+Black/xen_project_logo_dualcolor_2000x832.png">
-      <source
-        media="(prefers-color-scheme: dark)"
-        srcset="https://xenproject.org/wp-content/uploads/sites/79/2018/09/logo_xenproject.png">
-      <img
-        src="https://downloads.xenproject.org/Branding/Logos/Green+Black/xen_project_logo_dualcolor_2000x832.png"
-        width="512px"
-        alt="Xen Project Logo">
-    </picture>
-  </a>
-</p>
-
-# Xen Project Hypervisor <a href="https://xenproject.org/"><img src="https://downloads.xenproject.org/Branding/Mascots/Xen-Fu-Panda-2000px.png" width="48px" align="top" alt="Xen Fu Panda"></a>
-
-This directory begins the [Xen Project Hypervisor](https://xenproject.org/) build process.
-
-Some other notable packages that compose the Xen Project Ecosystem include:
-
-- `ocamlPackages.xenstore`: Mirage's `oxenstore` implementation.
-- `ocamlPackages.vchan`: Mirage's `xen-vchan` implementation.
-- `ocamlPackages.xenstore-tool`: XAPI's `oxenstore` utilities.
-- `xen-guest-agent`: Guest drivers for UNIX domUs.
-- `win-pvdrivers`: Guest drivers for Windows domUs.
-- `xtf`: The Xen Test Framework.
-
-## Updating
-
-### Manually
-
-1. [Update](https://xenbits.xenproject.org/gitweb/) the `package.nix` file for
-   the latest branch of Xen.
-   - Do not forget to set the `branch`, `version`, and `latest` attributes.
-   - The revisions are preferably commit hashes, but tag names are acceptable
-     as well.
-1. Make sure it builds.
-1. Use the NixOS module to test if dom0 boots successfully on the new version.
-1. Make sure the `meta` attributes evaluate to something that makes sense. The
-   following one-line command is useful for testing this:
-
-   ```console
-   echo -e "\033[1m$(nix eval .#xen.meta.description --raw 2> /dev/null)\033[0m\n\n$(nix eval .#xen.meta.longDescription --raw 2> /dev/null)"
-   ```
-
-1. Run `xtf --all --host` as root when booted into the Xen update, and make
-   sure no important tests fail.
-1. Clean up your changes and commit them, making sure to follow the
-   [Nixpkgs Contribution Guidelines](../../../../CONTRIBUTING.md).
-1. Open a PR and await a review from the current maintainers.
-
-## Features
-
-### Generic Builder
-
-`buildXenPackage` is a helpful utility capable of building Xen when passed
-certain attributes. The `package.nix` file on this directory includes all
-important attributes for building a Xen package with Nix. Downstreams can
-pin their Xen revision or include extra patches if the default Xen package
-does not meet their needs.
-
-### EFI
-
-Building `xen.efi` requires an `ld` with PE support.[^2]
-
-We use a `makeFlag` to override the `$LD` environment variable to point to our
-patched `efiBinutils`. For more information, see the comment in `pkgs/build-support/xen/default.nix`.
-
-> [!TIP]
-> If you are certain you will not be running Xen in an x86 EFI environment, disable
-the `withEFI` flag with an [override](https://nixos.org/manual/nixpkgs/stable/#chap-overrides)
-to save you the need to compile `efiBinutils`.
-
-## Security
-
-We aim to support the **latest** version of Xen at any given time.
-See the [Xen Support Matrix](https://xenbits.xen.org/docs/unstable/support-matrix.html)
-for a list of versions. As soon as a version is no longer the newest, it should
-be removed from Nixpkgs (`master`). If you need earlier versions of Xen, consider
-building your own Xen by following the instructions in the **Generic Builder**
-section.
-
-> [!CAUTION]
-> Pull requests that introduce XSA patches
-should have the `1.severity: security` label.
-
-### Maintainers
-
-Xen is a particularly complex piece of software, so we are always looking for new
-maintainers. Help out by [making and triaging issues](https://github.com/NixOS/nixpkgs/issues/new/choose),
-[sending build fixes and improvements through PRs](https://github.com/NixOS/nixpkgs/compare),
-updating the branches, and [patching security flaws](https://xenbits.xenproject.org/xsa/).
-
-We are also looking for testers, particularly those who can test Xen on AArch64
-machines. Open issues for any build failures or runtime errors you find!
-
-## Tests
-
-So far, we only have had one simple automated test that checks for
-the correct `pkg-config` output files.
-
-Due to Xen's nature as a type-1 hypervisor, it is not a trivial matter to design
-new tests, as even basic functionality requires a machine booted in a dom0
-kernel. For this reason, most testing done with this package must be done
-manually in a NixOS machine with `virtualisation.xen.enable` set to `true`.
-
-Another unfortunate thing is that none of the Xen commands have a `--version`
-flag. This means that `testers.testVersion` cannot ascertain the Xen version.
-The only way to verify that you have indeed built the correct version is to
-boot into the freshly built Xen kernel and run `xl info`.
-
-<p align="center">
-  <a href="https://xenproject.org/">
-    <img
-      src="https://downloads.xenproject.org/Branding/Mascots/Xen%20Big%20Panda%204242x3129.png"
-      width="96px"
-      alt="Xen Fu Panda">
-  </a>
-</p>
-
-[^1]: We also produce fake `git`, `wget` and `hostname` binaries that do nothing,
-      to prevent the build from failing because Xen cannot fetch the sources that
-      were already fetched by Nix.
-[^2]: From the [Xen Documentation](https://xenbits.xenproject.org/docs/unstable/misc/efi.html):
-      > For x86, building `xen.efi` requires `gcc` 4.5.x or above (4.6.x or newer
-      recommended, as 4.5.x was probably never really tested for this purpose)
-      and `binutils` 2.22 or newer. Additionally, the `binutils` build must be
-      configured to include support for the x86_64-pep emulation (i.e.
-      `--enable-targets=x86_64-pep` or an option of equivalent effect should be
-      passed to the configure script).

From 4a0180f434d7378fdce98fabc08f9fbf010c521e Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Wed, 26 Mar 2025 11:42:48 -0300
Subject: [PATCH 07/55] nixos/xen: dehardcode the .pad section from the UKI
 builder

Upstream, intentionally or not, no longer appends the EFI image
with a .pad section for us to hook the rest of the UKI to. This
simply dehardcodes .pad from the awk script, instead using the
very last section in the binary. (Currently .reloc)

Co-authored-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 nixos/modules/virtualisation/xen-boot-builder.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/xen-boot-builder.sh b/nixos/modules/virtualisation/xen-boot-builder.sh
index 1b7c1470f6eb..f8363b337662 100755
--- a/nixos/modules/virtualisation/xen-boot-builder.sh
+++ b/nixos/modules/virtualisation/xen-boot-builder.sh
@@ -1,6 +1,8 @@
 # This script is called by ./xen-dom0.nix to create the Xen boot entries.
 # shellcheck shell=bash
 
+export LC_ALL=C
+
 # Handle input argument and exit if the flag is invalid. See virtualisation.xen.efi.bootBuilderVerbosity below.
 [[ $# -ne 1 ]] && echo -e "\e[1;31merror:\e[0m xenBootBuilder must be called with exactly one verbosity argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option." && exit 1
 case "$1" in
@@ -89,7 +91,8 @@ EOF
         # https://xenbits.xenproject.org/docs/unstable/misc/efi.html.
         [ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m making Xen UKI..."
         xenEfi=$(jq -re '."org.xenproject.bootspec.v1".xen' "$bootspecFile")
-        padding=$(objdump --header --section=".pad" "$xenEfi" | awk '/\.pad/ { printf("0x%016x\n", strtonum("0x"$3) + strtonum("0x"$4))};')
+        finalSection=$(objdump --header --wide "$xenEfi" | tail -n +6 | sort --key="4,4" | tail -n 1 | grep -Eo '\.[a-z]*')
+        padding=$(objdump --header --section="$finalSection" "$xenEfi" | awk -v section="$finalSection" '$0 ~ section { printf("0x%016x\n", and(strtonum("0x"$3) + strtonum("0x"$4) + 0xfff, compl(0xfff)))};')
         [ "$1" = "debug" ] && echo "               - padding: $padding"
         objcopy \
             --add-section .config="$tmpCfg" \

From 07f211853d30fad7cb840ce037afabf909a205bf Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 27 Jun 2025 16:09:58 +0000
Subject: [PATCH 08/55] glitchtip: 5.0.4 -> 5.0.5

Changelog: https://gitlab.com/glitchtip/glitchtip-backend/-/blob/v5.0.5/CHANGELOG
Diff: https://gitlab.com/glitchtip/glitchtip-backend/-/compare/v5.0.4...v5.0.5
Diff: https://gitlab.com/glitchtip/glitchtip-frontend/-/compare/v5.0.4...v5.0.5
---
 pkgs/by-name/gl/glitchtip/frontend.nix | 6 +++---
 pkgs/by-name/gl/glitchtip/package.nix  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix
index 6b536f6b6425..5bc65dc56f59 100644
--- a/pkgs/by-name/gl/glitchtip/frontend.nix
+++ b/pkgs/by-name/gl/glitchtip/frontend.nix
@@ -9,18 +9,18 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "glitchtip-frontend";
-  version = "5.0.4";
+  version = "5.0.5";
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2XZCIIWQAM2Nk8/JTs5MzUJJOvJS+wrsa2m/XiC9FHM=";
+    hash = "sha256-PL0/1u+gJk/obRnSeMRx6BeSOxzXeFXZ1WlKnebyCqI=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-iJFEeUaPP6ZnntoZ2X0TyR6f923zPuzzZNW/zkd8M7E=";
+    hash = "sha256-kiL4UtY6qOVS1X6UeZFM53+oPyM1E5NCBstZQwBgZDI=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix
index 8de4566399f5..637ede9fb8c3 100644
--- a/pkgs/by-name/gl/glitchtip/package.nix
+++ b/pkgs/by-name/gl/glitchtip/package.nix
@@ -102,14 +102,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glitchtip";
-  version = "5.0.4";
+  version = "5.0.5";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-backend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ihefyunZc191w9cn7iSqblNA4V4hELi9jwxfFrjPvu0=";
+    hash = "sha256-7ulmrFOy14/Y/8LmKrmBzqrMPuwfdWOGMuhhhYI7+f4=";
   };
 
   propagatedBuildInputs = pythonPackages;

From 4e47396634a9321b2e14af7e12a5bc377848ddb9 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 30 Jun 2025 00:25:14 +0800
Subject: [PATCH 09/55] marktext: fix typo

---
 pkgs/by-name/ma/marktext/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix
index 6f4dcac1317c..fd433457c330 100644
--- a/pkgs/by-name/ma/marktext/package.nix
+++ b/pkgs/by-name/ma/marktext/package.nix
@@ -136,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     mkdir -p $out/opt/marktext $out/bin
 
-    install -Dm644 resources/linux/marktext.desktop $out/share/application/marktext.desktop
+    install -Dm644 resources/linux/marktext.desktop $out/share/applications/marktext.desktop
 
     pushd resources/icons/
 

From b5999bad15d9d22f7e8ccca98a125b50bea1bbf8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 21:45:45 +0000
Subject: [PATCH 10/55] podofo: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/by-name/po/podofo_1_0/package.nix b/pkgs/by-name/po/podofo_1_0/package.nix
index 773b7de814cf..a8d60a04ca4a 100644
--- a/pkgs/by-name/po/podofo_1_0/package.nix
+++ b/pkgs/by-name/po/podofo_1_0/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "podofo";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "podofo";
     repo = "podofo";
     rev = finalAttrs.version;
-    hash = "sha256-DtbTaPNXjVRl1KU0NH/Sd2j9y3OZlUQGOYYJL3bTQQg=";
+    hash = "sha256-AiuWSIVTeq6O13yDC4mRIK5LNOKSfMG8AGE9wdMA9PE=";
   };
 
   outputs = [

From b9d7717e141ef188586b254148e00f6846ea8e1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jun 2025 16:32:09 +0000
Subject: [PATCH 11/55] cosmic-protocols: 0-unstable-2025-06-19 ->
 0-unstable-2025-06-24

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

diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix
index 01db9b8bf909..ffe2b310cfb8 100644
--- a/pkgs/by-name/co/cosmic-protocols/package.nix
+++ b/pkgs/by-name/co/cosmic-protocols/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "cosmic-protocols";
-  version = "0-unstable-2025-06-19";
+  version = "0-unstable-2025-06-24";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-protocols";
-    rev = "408af98de5122577a0df80a64b85c7e1c5c7b6e0";
-    hash = "sha256-yfCtv0HfxlyCABCVTRUiutHxfPEu0Anp+cdkdVwyyRY=";
+    rev = "4f053317cc9a0e776bc24610df91ff84dfd6cc7b";
+    hash = "sha256-p4xRATocwG/QZtjI6fj1CPc+3jqlqr1mwoqojFxfpFE=";
   };
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];

From 12319d98674cf9426d0eababe66e75ce4102ebed Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Mon, 30 Jun 2025 20:40:29 +0200
Subject: [PATCH 12/55] sudo: 1.9.17 -> 1.9.17p1

Fixes CVE-2025-32462 and CVE-2025-32463.

Changes:
https://www.sudo.ws/releases/stable/#1.9.17p1
---
 pkgs/by-name/su/sudo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/su/sudo/package.nix b/pkgs/by-name/su/sudo/package.nix
index 34b1a8e98e16..d7394649a5f0 100644
--- a/pkgs/by-name/su/sudo/package.nix
+++ b/pkgs/by-name/su/sudo/package.nix
@@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "sudo";
   # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping
   # e.g. links to man pages, value constraints etc.
-  version = "1.9.17";
+  version = "1.9.17p1";
 
   __structuredAttrs = true;
 
   src = fetchurl {
     url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz";
-    hash = "sha256-PyEsadU01YIrSS0JmrsCpZP5HKmfWv3ly5vT4dza0Gk=";
+    hash = "sha256-/2B+pxcHIZdzinj3eGks1t+afj5ARWX1HeBjyidFXTI=";
   };
 
   prePatch = ''

From 39b0485b23a6af93784b9ee7b672a7320a23184c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jun 2025 18:42:20 +0000
Subject: [PATCH 13/55] vacuum-go: 0.17.0 -> 0.17.1

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

diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 49920bddcc35..673958c802bc 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -7,14 +7,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "vacuum-go";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IpJI+RD5TNsYaZhf3U/VD2CqW5ebutKvZRUOrwD2rGU=";
+    hash = "sha256-zWnYBDNsOoyc28JB8/dbommIxKUU2XGOHHYsR2q1hj0=";
   };
 
   vendorHash = "sha256-4cYG8ilWSI+bSoEBpohN6Fr3kmsBUNmbz0iyHmiCDgw=";

From c5d6abc24e1e281c11a4be0067568c8135364f06 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <github@i.m.mmlb.dev>
Date: Mon, 30 Jun 2025 13:41:51 -0400
Subject: [PATCH 14/55] wezterm: 0-unstable-2025-05-18 -> 0-unstable-2025-06-24

---
 pkgs/by-name/we/wezterm/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index 22d85651a88e..b18c541b76c7 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -29,14 +29,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wezterm";
-  version = "0-unstable-2025-05-18";
+  version = "0-unstable-2025-06-24";
 
   src = fetchFromGitHub {
     owner = "wez";
     repo = "wezterm";
-    rev = "5663e749948df3ed3c2d8ee0bfea6c85226310d9";
+    rev = "2deb317ec069b8f94ec1282253faaa71a8d997fc";
     fetchSubmodules = true;
-    hash = "sha256-SQ1H16jy6GVjM8tEKZZC7AGIADLR1NyGfOT/6pFcFA0=";
+    hash = "sha256-danJcaG4ZyMbqR+4xaVOVM7a+4Sehq5cum40iRt/HQ8=";
   };
 
   postPatch =
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec {
   # https://github.com/wezterm/wezterm/blob/main/nix/flake.nix#L134
   auditable = false;
 
-  cargoHash = "sha256-9pdkXpkIbe5HeVGvgusRaI4A6ZjDGssO5k0ULVnO6k8=";
+  cargoHash = "sha256-uYx5OykWHN4B73rXWMYg3Sl7B+o7uFJMyAFiLMlLCsA=";
   useFetchCargoVendor = true;
 
   nativeBuildInputs = [

From 78b3dd59f42686aceef4ee40dea92fadab65da48 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 30 Jun 2025 20:18:31 +0000
Subject: [PATCH 15/55] firefox-devedition-unwrapped: 141.0b2 -> 141.0b4

---
 .../browsers/firefox/packages/firefox-devedition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index 294c7063419f..25d5b3548680 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = pname;
-  version = "141.0b2";
+  version = "141.0b4";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "90b20ecbc5a83f4dbf07a136f4d098800fd601aa486a3b48d19b63316f0c3a49704370f42975549b4fb26723796c8287ccb5b251d9e2c9ca6b5b1fa9db021109";
+    sha512 = "c96fb731ff935176f9dfd8b31693dc49c2eac63e6d5b935fe3ebf1f9d39023bfeb9c9cfa07f4f759dfbd45cf911684b90a810879e412028d35c3ab6ec419b2ba";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From 23470836ddd46de9f2a87175ddd4ce8e68277f34 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 30 Jun 2025 20:18:53 +0000
Subject: [PATCH 16/55] firefox-beta-unwrapped: 141.0b2 -> 141.0b4

---
 .../networking/browsers/firefox/packages/firefox-beta.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
index cd821d6f21ef..5646485d61e0 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = pname;
-  version = "141.0b2";
+  version = "141.0b4";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "edbdc261c1c2cb3bcbe85cec81ec064da10955766dabb1580a38b5d07c5cf11904614ca61b5b09a176e9c618387d70eb41fbfd6deb178753b38c296f41a42431";
+    sha512 = "89a5e3fdc7fa3ec7ba91930baea05f231354c2b2f44d6b3cb82e15575a5a05812ef6eda29605ce652a72145733d2bd7cd84e22942e566e0434b0fed116922e0b";
   };
 
   meta = {

From a0d3df39a9d1d1d8dfc460141e999fa8ef0dd218 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jun 2025 20:27:10 +0000
Subject: [PATCH 17/55] sourcepawn-studio: 8.1.6 -> 8.1.7

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

diff --git a/pkgs/by-name/so/sourcepawn-studio/package.nix b/pkgs/by-name/so/sourcepawn-studio/package.nix
index 1a9d6f9d8be0..1b7e0087dfc5 100644
--- a/pkgs/by-name/so/sourcepawn-studio/package.nix
+++ b/pkgs/by-name/so/sourcepawn-studio/package.nix
@@ -8,17 +8,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sourcepawn-studio";
-  version = "8.1.6";
+  version = "8.1.7";
 
   src = fetchFromGitHub {
     owner = "Sarrus1";
     repo = "sourcepawn-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XDvVOY1BueavFe9pHMGLDZRaKbDq78xQAUMPVNKG04M=";
+    hash = "sha256-f7mBsBITBmgoGfiAzdQpZQnSY/9WYJ91uCJxCu755tU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-o4mGOsoayR39gyV5Jit3ZEkdDllqNklfaHs0Oxw+tDc=";
+  cargoHash = "sha256-NQHetE5z8pgTtPjbc9PK3X4FEw7fL7n+ZGyzmQ5JBPM=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 5bacb03aeabe9f57238a2b66b72220e761596691 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jun 2025 21:18:26 +0000
Subject: [PATCH 18/55] komac: 2.12.0 -> 2.12.1

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

diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix
index fa16ed6cc525..b05665cd6395 100644
--- a/pkgs/by-name/ko/komac/package.nix
+++ b/pkgs/by-name/ko/komac/package.nix
@@ -16,17 +16,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "komac";
-  version = "2.12.0";
+  version = "2.12.1";
 
   src = fetchFromGitHub {
     owner = "russellbanks";
     repo = "Komac";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-G1oZQ4TgkmBlAfV1aLkA4qvZcBK4K8tvCxaTwPqi16M=";
+    hash = "sha256-F6Vb6X1JbB7I1oOkrtLBVUdi2nqPIhiQIlqUEfPIgsc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3o53CJpgCBwjS8IkEHaOIBth6HlKJ0IJYh8qyL5wd1A=";
+  cargoHash = "sha256-FMxt98wbes1PWqeOE95epK4uwOEgLU3zvCu1cyDPxGA=";
 
   nativeBuildInputs =
     [

From f4fb03b8e6153d28a9e28f6a7bd283ce78599fcc Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Mon, 30 Jun 2025 23:32:47 +0200
Subject: [PATCH 19/55] chromium,chromedriver: 138.0.7204.49 -> 138.0.7204.92

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop_30.html

This update includes 1 security fix. Google is aware that an exploit for
CVE-2025-6554 exists in the wild.

CVEs:
CVE-2025-6554
---
 .../networking/browsers/chromium/info.json       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index b8c8fa8ba405..482dd0da54e9 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "138.0.7204.49",
+    "version": "138.0.7204.92",
     "chromedriver": {
-      "version": "138.0.7204.50",
-      "hash_darwin": "sha256-JqEH04dZxqyUKou8QkwtJa0+4AXWPm0p3NJlYM2fnqw=",
-      "hash_darwin_aarch64": "sha256-WojmEFRIqFDMfay3UA0pzSwH9FRno+nHxzR47x4o7gA="
+      "version": "138.0.7204.93",
+      "hash_darwin": "sha256-Fo5N9rAgHSSnYxrcWMHRezLh8DKi+etZQNjwUKJn7dI=",
+      "hash_darwin_aarch64": "sha256-A46qZtWNli5IuR043RzrEQlNIyeddkyU+5/UJgg5SgU="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "d2b48fd5f7813ed477a2d68fa232b8178fa4fb1e",
-        "hash": "sha256-n2jSVXpV0mqdTdLpE+N3yJhutJTOE1fez0BleU0+VSU=",
+        "rev": "f079b9bc781e3c2adb1496ea1d72812deb0ddb3d",
+        "hash": "sha256-OiDdGapC/sjDZXItnFcCvOtA7TKzeHPK4EsYFMCMQJs=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -796,8 +796,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "0ea9b0813581826a94b45324e746f9ab57f0f843",
-        "hash": "sha256-jGx1jafKyh9BrrJwWKU78sKlwkX9KYHzhggx6TzRel4="
+        "rev": "e5b4c78b54e8b033b2701db3df0bf67d3030e4c1",
+        "hash": "sha256-5y/yNZopnwtDrG+BBU6fMEi0yJJoYvsygQR+fl6vS/Y="
       }
     }
   },

From 9e9c66ef3665990320a4d76261ba58d393408bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sun, 29 Jun 2025 09:03:26 -0300
Subject: [PATCH 20/55] lxqt.lxqt-build-tools: 2.2.0 -> 2.2.1

Diff: https://github.com/lxqt/lxqt-build-tools/compare/2.2.0...2.2.1
---
 pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index 6fa59d212205..cf3e7f2f0726 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -9,7 +9,7 @@
   perl,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.2.0",
+  version ? "2.2.1",
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
-        "2.2.0" = "sha256-q/VkxfC2vGRpFnAGULkjhmJ8JsdpxChROqemCyf0esE=";
+        "2.2.1" = "sha256-dewsmkma8QHgb3LzRGvfntI48bOaFFsrEDrOznaC8eg=";
       }
       ."${version}";
   };

From 26c306a0c4e26b78db226f178e766beebd20018d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Mon, 30 Jun 2025 18:40:37 -0300
Subject: [PATCH 21/55] lxqt.lxqt-powermanagement: 2.2.0 -> 2.2.1

Diff: https://github.com/lxqt/lxqt-powermanagement/compare/2.2.0...2.2.1
---
 pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index 4cc3c53b57af..40837cc1af30 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-powermanagement";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-NVyt9HcGRCLIVJFlkiiZ3OOTzGEfo3boDQlTmWythGk=";
+    hash = "sha256-Awk/NlYd8HldmEL0G/LUgj101Y1BTQBrDJfG56Y/aX4=";
   };
 
   nativeBuildInputs = [

From 86973f69ae3cfebca048c5bf3baa83b0dde13df0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Jun 2025 07:03:49 +0000
Subject: [PATCH 22/55] docker-compose: 2.37.1 -> 2.38.1

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

diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index 4754450d205d..7c158fe6af9e 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "docker-compose";
-  version = "2.37.1";
+  version = "2.38.1";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "compose";
     rev = "v${version}";
-    hash = "sha256-jz5ve9VzmsRMv05fGrxSUUg0mGRbtQzpWrs4jyAnubI=";
+    hash = "sha256-yxHQvJuwfoG74e3WnlvfIVpY0t8TICo/dtjUEjGRRiI=";
   };
 
   postPatch = ''
@@ -20,7 +20,7 @@ buildGoModule rec {
     rm -rf pkg/e2e/
   '';
 
-  vendorHash = "sha256-i23na2J4XTsHFZZO5ASY7XVsd/rOZPkAMEH0HWzr+0s=";
+  vendorHash = "sha256-fAe0Bp8fkIe+eHRSCIaeKCH4cAN3DNqJnhTVi6eRHgQ=";
 
   ldflags = [
     "-X github.com/docker/compose/v2/internal.Version=${version}"

From 74a86de1216b0b57d413d7df065de69ce165e4d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jun 2025 21:55:21 +0000
Subject: [PATCH 23/55] ecapture: 1.2.0 -> 1.3.1

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

diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix
index 2e588fbe8d06..32dd635acf1b 100644
--- a/pkgs/by-name/ec/ecapture/package.nix
+++ b/pkgs/by-name/ec/ecapture/package.nix
@@ -22,13 +22,13 @@
 
 buildGoModule rec {
   pname = "ecapture";
-  version = "1.2.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "gojue";
     repo = "ecapture";
     tag = "v${version}";
-    hash = "sha256-4cdjdTJjblI6ywpVE1/ZuM4gGkD2uZdfwfFx2gtr5yE=";
+    hash = "sha256-SY7Q8WlxE473An6/MntjPaIT3mFE/u9JJS6nb8BWiuQ=";
     fetchSubmodules = true;
   };
 

From e0b8a3577fc453f19d03a8d129abb134cac6187b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jun 2025 23:55:08 +0000
Subject: [PATCH 24/55] oci-cli: 3.59.0 -> 3.61.0

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

diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix
index aeca69b75ce4..d25e41148db8 100644
--- a/pkgs/by-name/oc/oci-cli/package.nix
+++ b/pkgs/by-name/oc/oci-cli/package.nix
@@ -25,14 +25,14 @@ in
 
 py.pkgs.buildPythonApplication rec {
   pname = "oci-cli";
-  version = "3.59.0";
+  version = "3.61.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "oci-cli";
     tag = "v${version}";
-    hash = "sha256-V3YaGYrBDzKSZ9Cx0FEA9uGnPK+CX08b5tKaJ5pHGJA=";
+    hash = "sha256-/Dl7y4asXDJiqAF5uvffrCnVWlObQt2cemQ23OKL0Xc=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 2d3f4f410db3182854194e37ce199e09edbe88e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 00:31:13 +0000
Subject: [PATCH 25/55] alterware-launcher: 0.11.2 -> 0.11.3

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

diff --git a/pkgs/by-name/al/alterware-launcher/package.nix b/pkgs/by-name/al/alterware-launcher/package.nix
index 7d9ea7565c29..8068abffe357 100644
--- a/pkgs/by-name/al/alterware-launcher/package.nix
+++ b/pkgs/by-name/al/alterware-launcher/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alterware-launcher";
-  version = "0.11.2";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "alterware";
     repo = "alterware-launcher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DFIiVNYom3LvU9IFA9w9FvXwm9gqfACDs8KaFKQR9Qs=";
+    hash = "sha256-qxAHnyjcb1ee6kZ4emBg7CN+z4UJXW5zjoY+TkXRwtc=";
   };
 
-  cargoHash = "sha256-/2i6GyBTKLf2oNFkizaBUHcLcCPgsy3g0p31D6cO+xg=";
+  cargoHash = "sha256-FZcfUBRzgyMwGKi/7d76UNNr6SwRogyJKy7P7HNMNz0=";
 
   buildInputs = [ openssl ];
   nativeBuildInputs = [ pkg-config ];

From 834d5f2646e791b20aaa58ace31fc4ba475c12a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 03:53:45 +0000
Subject: [PATCH 26/55] juicity: 0.4.3 -> 0.5.0

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

diff --git a/pkgs/by-name/ju/juicity/package.nix b/pkgs/by-name/ju/juicity/package.nix
index b56c7c507546..ff201501a7a6 100644
--- a/pkgs/by-name/ju/juicity/package.nix
+++ b/pkgs/by-name/ju/juicity/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "juicity";
-  version = "0.4.3";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "juicity";
     repo = "juicity";
     rev = "v${version}";
-    hash = "sha256-4sej/nb7d58+hSCaD6KIfDsqiGmgECPIbRKR65TbMBM=";
+    hash = "sha256-CFytPXfmGNfKDbyYuMCr+4HiH37f28cTmng+XgnO6T0=";
   };
 
-  vendorHash = "sha256-SM5ZrTtuqenPsGjphkCM9JHzucw0/qBmevD+3/kyF6k=";
+  vendorHash = "sha256-kToWZCk6xAAj+t/elO9U5itoOBQ2J9sLcmzz+nNdBHg=";
 
   proxyVendor = true;
 

From a8332982de322b0529ce00af62f534d3e663d05d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 05:43:43 +0000
Subject: [PATCH 27/55] libxlsxwriter: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/by-name/li/libxlsxwriter/package.nix b/pkgs/by-name/li/libxlsxwriter/package.nix
index ffcf5dc0ba79..5612de5ec025 100644
--- a/pkgs/by-name/li/libxlsxwriter/package.nix
+++ b/pkgs/by-name/li/libxlsxwriter/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libxlsxwriter";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "jmcnamara";
     repo = "libxlsxwriter";
     tag = "v${version}";
-    hash = "sha256-Bi89TtihLtiXUh1PsJW1TiiT7ygQUM8yKeiYMi1PRCM=";
+    hash = "sha256-1FUJLsnx0ZNTT66sK7/gbZVo6Se85nbYvtEyoxeOHTI=";
   };
 
   buildInputs = [

From 57177df8c650a0ccff892b76516371fc14149f94 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 1 Jul 2025 14:03:05 +0800
Subject: [PATCH 28/55] omnom: mv omnom-addons to passthru

---
 pkgs/by-name/om/omnom/package.nix | 80 +++++++++++++++----------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix
index 8074a8ce4f94..ecfcc0e3ebb7 100644
--- a/pkgs/by-name/om/omnom/package.nix
+++ b/pkgs/by-name/om/omnom/package.nix
@@ -34,46 +34,12 @@ buildGoModule (finalAttrs: {
     "-w"
   ];
 
-  postBuild =
-    let
-      omnom-addons = buildNpmPackage {
-        pname = "omnom-addons";
-        inherit (finalAttrs) version src;
+  postBuild = ''
+    mkdir -p $out/share/addons
 
-        npmDepsHash = "sha256-sUn5IvcHWJ/yaqeGz9SGvGx9HHAlrcnS0lJxIxUVS6M=";
-        sourceRoot = "${finalAttrs.src.name}/ext";
-        npmPackFlags = [ "--ignore-scripts" ];
-
-        nativeBuildInputs = [ zip ];
-
-        # Fix path for the `static` directory
-        postConfigure = ''
-          substituteInPlace webpack.config.js \
-          --replace-fail '"..", ".."' '".."'
-        '';
-
-        postBuild = ''
-          mkdir -p $out
-
-          zip -r "$out/omnom_ext_src.zip" README.md src utils package* webpack.config.js
-
-          pushd build
-            zip "$out/omnom_ext_chrome.zip" ./* icons/* -x manifest_ff.json
-            zip "$out/omnom_ext_firefox.zip" ./* icons/* -x manifest_ff.json
-          popd
-        '';
-
-        postCheck = ''
-          npm run build-test
-        '';
-      };
-    in
-    ''
-      mkdir -p $out/share/addons
-
-      # Copy Firefox and Chrome addons
-      cp -r ${omnom-addons}/*.zip $out/share/addons
-    '';
+    # Copy Firefox and Chrome addons
+    cp -r ${finalAttrs.passthru.omnom-addons}/*.zip $out/share/addons
+  '';
 
   postInstall = ''
     mkdir -p $out/share/examples
@@ -82,7 +48,41 @@ buildGoModule (finalAttrs: {
     cp config.yml_sample $out/share/examples/config.yml
   '';
 
-  passthru.tests = nixosTests.omnom;
+  passthru = {
+    omnom-addons = buildNpmPackage (finalAttrs': {
+      pname = "omnom-addons";
+      inherit (finalAttrs) version src;
+
+      npmDepsHash = "sha256-sUn5IvcHWJ/yaqeGz9SGvGx9HHAlrcnS0lJxIxUVS6M=";
+      sourceRoot = "${finalAttrs'.src.name}/ext";
+      npmPackFlags = [ "--ignore-scripts" ];
+
+      nativeBuildInputs = [ zip ];
+
+      # Fix path for the `static` directory
+      postConfigure = ''
+        substituteInPlace webpack.config.js \
+        --replace-fail '"..", ".."' '".."'
+      '';
+
+      postBuild = ''
+        mkdir -p $out
+
+        zip -r "$out/omnom_ext_src.zip" README.md src utils package* webpack.config.js
+
+        pushd build
+          zip "$out/omnom_ext_chrome.zip" ./* icons/* -x manifest_ff.json
+          zip "$out/omnom_ext_firefox.zip" ./* icons/* -x manifest_ff.json
+        popd
+      '';
+
+      postCheck = ''
+        npm run build-test
+      '';
+    });
+
+    tests = nixosTests.omnom;
+  };
 
   meta = {
     description = "Webpage bookmarking and snapshotting service";

From a5ecf849c51e78254a28580e9ee14febadfe3eba Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 1 Jul 2025 14:04:47 +0800
Subject: [PATCH 29/55] omnom: install addons in postInstall

---
 pkgs/by-name/om/omnom/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix
index ecfcc0e3ebb7..21e88dac825d 100644
--- a/pkgs/by-name/om/omnom/package.nix
+++ b/pkgs/by-name/om/omnom/package.nix
@@ -34,14 +34,12 @@ buildGoModule (finalAttrs: {
     "-w"
   ];
 
-  postBuild = ''
+  postInstall = ''
     mkdir -p $out/share/addons
 
     # Copy Firefox and Chrome addons
     cp -r ${finalAttrs.passthru.omnom-addons}/*.zip $out/share/addons
-  '';
 
-  postInstall = ''
     mkdir -p $out/share/examples
 
     cp -r static templates $out/share

From db462ff67ebd4457105357486d3f8a784adf08b0 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 1 Jul 2025 14:16:54 +0800
Subject: [PATCH 30/55] omnom: fix firefox extension

---
 pkgs/by-name/om/omnom/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix
index 21e88dac825d..837c72984180 100644
--- a/pkgs/by-name/om/omnom/package.nix
+++ b/pkgs/by-name/om/omnom/package.nix
@@ -70,6 +70,7 @@ buildGoModule (finalAttrs: {
 
         pushd build
           zip "$out/omnom_ext_chrome.zip" ./* icons/* -x manifest_ff.json
+          cp manifest_ff.json manifest.json
           zip "$out/omnom_ext_firefox.zip" ./* icons/* -x manifest_ff.json
         popd
       '';

From 2b98432eab9f027eb7c373997895503e19575bee Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 1 Jul 2025 09:40:47 +0200
Subject: [PATCH 31/55] claude-code: 1.0.35 -> 1.0.38

---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index b4ae2f17cca8..d3d947537b45 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.33"
+        "@anthropic-ai/claude-code": "^1.0.38"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.33",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.33.tgz",
-      "integrity": "sha512-rKQ1C0+iSV/bS4LVfyCt2FIkIc8MnFi5EbmRAXEunNkXLCQLHfXjsqx7cLOy7c11vZwGkyf/wEp5LwaDQHdjCQ==",
+      "version": "1.0.38",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.38.tgz",
+      "integrity": "sha512-hPZbJCt7O8T872wbCXGiwF210DzMBo/k3EVKB6EZQB10b73ZQIEflAWGTC2ZvBcMp79qAR4F6c82V0+Cc6o0sg==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 99a4ef459256..9e8a2cc162f4 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.35";
+  version = "1.0.38";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-Lt79XxHrgy6rPAHBf1QtwjsKnrZmsKFeVFOvHwN4aOY=";
+    hash = "sha256-flG9VlnQfMfGFBbs6RdQKSbceD/Tke19Euo8znR5OG0=";
   };
 
-  npmDepsHash = "sha256-oHSePK/QiAHP+2Fn+yUf66TcRGCoZg3mrI4x7S/nbCc=";
+  npmDepsHash = "sha256-IOk/dPi43WqFb1mWC/48JMK5a8PeSHE2uKz+4qA3AYA=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From e0e8849436f7fc352a540d4ccffa76fa4daf9b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 1 Jul 2025 10:38:43 +0200
Subject: [PATCH 32/55] emmet-language-server: don't depend on environment's
 node

---
 pkgs/by-name/em/emmet-language-server/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/em/emmet-language-server/package.nix b/pkgs/by-name/em/emmet-language-server/package.nix
index 4ee2a91033e9..61b80c57f34d 100644
--- a/pkgs/by-name/em/emmet-language-server/package.nix
+++ b/pkgs/by-name/em/emmet-language-server/package.nix
@@ -52,8 +52,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     mkdir -p $out/{bin,lib/emmet-language-server}
     mv {node_modules,dist} $out/lib/emmet-language-server
+
+    chmod +x $out/lib/emmet-language-server/dist/index.js
+    patchShebangs $out/lib/emmet-language-server/dist/index.js
     ln -s $out/lib/emmet-language-server/dist/index.js $out/bin/emmet-language-server
-    chmod +x $out/bin/emmet-language-server
 
     runHook postInstall
   '';

From 47935ee04fb547908b6e0daeaeea70a156da2096 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 08:58:42 +0000
Subject: [PATCH 33/55] stress-ng: 0.19.01 -> 0.19.02

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

diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix
index af3b04a9621e..84f4ef4a3d2e 100644
--- a/pkgs/by-name/st/stress-ng/package.nix
+++ b/pkgs/by-name/st/stress-ng/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "stress-ng";
-  version = "0.19.01";
+  version = "0.19.02";
 
   src = fetchFromGitHub {
     owner = "ColinIanKing";
     repo = "stress-ng";
     rev = "V${version}";
-    hash = "sha256-ZfL7u6OCEYnjlXlGaKFT4aemMI1b7keIf+KZdgeasfA=";
+    hash = "sha256-QEj+JC3l6O8UqK08+X2CIs/GNHdV7hn2bem3xx1jgjQ=";
   };
 
   postPatch = ''

From 35beb68f70c25bcfef33540a0104c090ac1bada4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 09:52:57 +0000
Subject: [PATCH 34/55] cargo-modules: 0.24.2 -> 0.24.3

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

diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix
index fb39a2c88512..422e07b58f55 100644
--- a/pkgs/by-name/ca/cargo-modules/package.nix
+++ b/pkgs/by-name/ca/cargo-modules/package.nix
@@ -6,17 +6,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cargo-modules";
-  version = "0.24.2";
+  version = "0.24.3";
 
   src = fetchFromGitHub {
     owner = "regexident";
     repo = "cargo-modules";
     tag = "v${version}";
-    hash = "sha256-Z6CbH0a2LCHtFQeiHXAC8ebysVLueHNlqxDe+Q3Tbyc=";
+    hash = "sha256-ZotG9eYVwNb123dQ6D4bsVCb7vS/jc/I67JPrQnJ59U=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-8MNhuvYfIVAIsnHFyz38CY0YOgqc9AwEh3W5kn9Gs3k=";
+  cargoHash = "sha256-CNOzNaA/bOvuBsON42m0cPEvAcqpCp1oNNOetuDEN04=";
 
   checkFlags = [
     "--skip=cfg_test::with_tests::smoke"

From 6ab50b567da9764f649d04d1ba2771b753d43117 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 11:19:40 +0000
Subject: [PATCH 35/55] lux-cli: 0.7.3 -> 0.7.4

---
 pkgs/by-name/lu/lux-cli/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix
index 8a6453fc5ce7..7103d7c452ea 100644
--- a/pkgs/by-name/lu/lux-cli/package.nix
+++ b/pkgs/by-name/lu/lux-cli/package.nix
@@ -17,18 +17,18 @@
 rustPlatform.buildRustPackage rec {
   pname = "lux-cli";
 
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "nvim-neorocks";
     repo = "lux";
-    tag = "v0.7.3";
-    hash = "sha256-d/WznA6BRduQJOFlE+ll1H7XtGXs9BPrhAKST09Lh0s=";
+    tag = "v0.7.4";
+    hash = "sha256-m8GSs2gBw+WzDOBciOQHi7n4923XCd7z1TbfTnfJzUA=";
   };
 
   buildAndTestSubdir = "lux-cli";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-B1Fu5KWLL/XuUvIROPh0huLw4/OHe/c+LC0/gRFpBnc=";
+  cargoHash = "sha256-7q5NqAmsHcZEwDAeNRZLiQIKzFsx6BsWAgsv2s2dmRI=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 48bc90c3a87e23a5cddcb2d22e1fb8cfe1e43c79 Mon Sep 17 00:00:00 2001
From: Leonardo Taglialegne <cmt.miniBill@gmail.com>
Date: Mon, 30 Jun 2025 15:02:08 +0200
Subject: [PATCH 36/55] doc/installing-pxe: fix formatting

---
 nixos/doc/manual/installation/installing-pxe.section.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/installation/installing-pxe.section.md b/nixos/doc/manual/installation/installing-pxe.section.md
index c1cad99d39f3..fe73c3779183 100644
--- a/nixos/doc/manual/installation/installing-pxe.section.md
+++ b/nixos/doc/manual/installation/installing-pxe.section.md
@@ -12,10 +12,11 @@ you can run:
 nix-build -A netboot.x86_64-linux '<nixpkgs/nixos/release.nix>'
 ```
 
-This will create a `result` directory containing: \* `bzImage` -- the
-Linux kernel \* `initrd` -- the initrd file \* `netboot.ipxe` -- an
-example ipxe script demonstrating the appropriate kernel command line
-arguments for this image
+This will create a `result` directory containing:
+
+* `bzImage` -- the Linux kernel
+* `initrd` -- the initrd file
+* `netboot.ipxe` -- an example ipxe script demonstrating the appropriate kernel command line arguments for this image
 
 If you're using plain PXE, configure your boot loader to use the
 `bzImage` and `initrd` files and have it provide the same kernel command

From cda617fe3f8a8b3c74381f947d50f8b4fccca819 Mon Sep 17 00:00:00 2001
From: "\"Jan Lafferton\"" <"jan.lafferton@vector.com">
Date: Tue, 1 Jul 2025 14:12:10 +0200
Subject: [PATCH 37/55] vimPlugins.live-rename-nvim: init at 2025-06-23

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 1b22e0bae02f..71a57862489c 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -7354,6 +7354,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  live-rename-nvim = buildVimPlugin {
+    pname = "live-rename.nvim";
+    version = "2025-06-23";
+    src = fetchFromGitHub {
+      owner = "saecki";
+      repo = "live-rename.nvim";
+      rev = "78fcdb4072c6b1a8e909872f9a971b2f2b642d1e";
+      sha256 = "0g0yirjvlzjy7v6lpzwphn87h3mgs33l3pa3sw9np36lhk9ww6g4";
+    };
+    meta.homepage = "https://github.com/saecki/live-rename.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   live-share-nvim = buildVimPlugin {
     pname = "live-share.nvim";
     version = "2025-05-03";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index a5457cddb3cc..4ed4a36ed028 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -564,6 +564,7 @@ https://github.com/ldelossa/litee-filetree.nvim/,,
 https://github.com/ldelossa/litee-symboltree.nvim/,,
 https://github.com/ldelossa/litee.nvim/,,
 https://github.com/smjonas/live-command.nvim/,HEAD,
+https://github.com/saecki/live-rename.nvim/,HEAD,
 https://github.com/azratul/live-share.nvim/,HEAD,
 https://github.com/ggml-org/llama.vim/,HEAD,
 https://github.com/huggingface/llm.nvim/,HEAD,

From c67bc3f79221871fdff20d9a76bbd8f28d3fe0a1 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 1 Jul 2025 12:37:48 +0000
Subject: [PATCH 38/55] river: 0.3.10 -> 0.3.11

https://codeberg.org/river/river/releases/tag/v0.3.11
---
 pkgs/by-name/ri/river/build.zig.zon.nix | 6 +++---
 pkgs/by-name/ri/river/package.nix       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ri/river/build.zig.zon.nix b/pkgs/by-name/ri/river/build.zig.zon.nix
index b176fe484367..ce38b2c91f01 100644
--- a/pkgs/by-name/ri/river/build.zig.zon.nix
+++ b/pkgs/by-name/ri/river/build.zig.zon.nix
@@ -22,10 +22,10 @@ linkFarm "zig-packages" [
     };
   }
   {
-    name = "wlroots-0.19.1-jmOlcs7dAwCajnVWlQZIc-ySYjRlbLxy0F5FvTQqYA3P";
+    name = "wlroots-0.19.2-jmOlcsnnAwDFAeOamkUaxyHNhKngH4Ai5rrLSVbqA8LW";
     path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.19.1.tar.gz";
-      hash = "sha256-37s4hXaYeKAyZySWZOMQP3BHz7EzxVNpj0dhJcPJoTM=";
+      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.19.2.tar.gz";
+      hash = "sha256-BMNvnRJdM8qhqtm2Do7l5LdD1INDXD3t0ykPHYwyI6U=";
     };
   }
   {
diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix
index d8647a01107c..8bfaa550c05d 100644
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "river";
-  version = "0.3.10";
+  version = "0.3.11";
 
   outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "river";
     repo = "river";
-    hash = "sha256-mTS62HT/v/5af/PTsNcDIrl7GUczP55+VCumQIii6y4=";
+    hash = "sha256-7LC5nxan9jmjjt29afkps9H/sfhfIqpvBxvCKb0zvNM=";
     tag = "v${finalAttrs.version}";
   };
 

From 3a903161e9b28cd74ee68699d94f8d6f5c095da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 1 Jul 2025 14:38:59 +0200
Subject: [PATCH 39/55] yt-dlp: 2025.6.25 -> 2025.6.30

Changelog: https://github.com/yt-dlp/yt-dlp/blob/HEAD/Changelog.md
---
 pkgs/by-name/yt/yt-dlp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index aa54eead14af..4ed1feb8a6f0 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec {
   # The websites yt-dlp deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2025.6.25";
+  version = "2025.6.30";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "yt_dlp";
-    hash = "sha256-JCtkjhoYqwS91MwXWjF/6Ow619AXXu6fmBkSYks9bIs=";
+    hash = "sha256-bQroVcClW/zCjf+6gE7IUlublV00pBGRoVYaTOwD2L0=";
   };
 
   build-system = with python3Packages; [

From 30ddfbb7c66dcbe56969b2bf516b90acbe957976 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Tue, 1 Jul 2025 14:45:55 +0200
Subject: [PATCH 40/55] workflows/periodic-merge: remove 24.11

24.11 is deprecated now.
---
 .github/workflows/periodic-merge-24h.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index a76b2310492d..63e3dfd13887 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -31,10 +31,6 @@ jobs:
       max-parallel: 1
       matrix:
         pairs:
-          - from: release-24.11
-            into: staging-next-24.11
-          - from: staging-next-24.11
-            into: staging-24.11
           - from: release-25.05
             into: staging-next-25.05
           - from: staging-next-25.05

From 22e563fc3dfaae5dc4e2d66ea7c1e674182a873f Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Tue, 1 Jul 2025 16:48:42 +0400
Subject: [PATCH 41/55] glibc: add comments describing the patches

This simply adds some comments describing previously undocumented
patches.
---
 pkgs/development/libraries/glibc/common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 18e7d84477f7..e4b9d66f7dd0 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -124,10 +124,16 @@ stdenv.mkDerivation (
           isAarch64 = stdenv.buildPlatform.isAarch64 || stdenv.hostPlatform.isAarch64;
           isLinux = stdenv.buildPlatform.isLinux || stdenv.hostPlatform.isLinux;
         in
+        # Remove certain defines when __CUDACC__ is defined (i.e. we're building with a CUDA compiler)
         lib.optional (isAarch64 && isLinux) ./0001-aarch64-math-vector.h-add-NVCC-include-guard.patch
       )
+      # Modify certain defines to be compatible with musl
       ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
+      # Enable cross-compilation of glibc on Darwin (build=Darwin, host=Linux)
       ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch
+      # Reverts this patch: https://sourceware.org/git/?p=glibc.git;a=commit;h=55d63e731253de82e96ed4ddca2e294076cd0bc5
+      # This revert enables [CET] (Control-flow Enforcement Technology) by default
+      # [CET]: https://en.wikipedia.org/wiki/Control-flow_integrity#Intel_Control-flow_Enforcement_Technology
       ++ lib.optional enableCETRuntimeDefault ./2.39-revert-cet-default-disable.patch;
 
     postPatch =

From 23454de4554d675d144a5cbeaf0be391a43e5f7f Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Tue, 1 Jul 2025 15:06:00 +0200
Subject: [PATCH 42/55] .github/PULL_RQUEST_TEMPLATE: remove 24.11 references

24.11 is unmaintained now.
---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1ed8ae285d89..db78d5188521 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -25,9 +25,9 @@ For new packages please briefly describe the package or provide a link to its ho
   - made sure NixOS tests are [linked](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#linking-nixos-module-tests-to-a-package) to the relevant packages
 - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
 - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
-- [Nixpkgs 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/doc/release-notes/rl-2511.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/doc/manual/release-notes/rl-2505.section.md) Nixpkgs Release notes)
+- [Nixpkgs 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/doc/release-notes/rl-2511.section.md) (or backporting [25.05](https://github.com/NixOS/nixpkgs/blob/master/doc/manual/release-notes/rl-2505.section.md) Nixpkgs Release notes)
   - [ ] (Package updates) Added a release notes entry if the change is major or breaking
-- [NixOS 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2511.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) NixOS Release notes)
+- [NixOS 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2511.section.md) (or backporting [25.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) NixOS Release notes)
   - [ ] (Module updates) Added a release notes entry if the change is significant
   - [ ] (Module addition) Added a release notes entry if adding a new NixOS module
 - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md), [pkgs/README.md](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md), [maintainers/README.md](https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md) and other contributing documentation in corresponding paths.

From e83d9fbf169c90bfd9d784f11c8fcc303181e388 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Tue, 1 Jul 2025 15:07:12 +0200
Subject: [PATCH 43/55] .github/labeler: remove "backport release-24.11" auto
 label

24.11 is unmaintained.
---
 .github/labeler-no-sync.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml
index cb7e413fb5c4..850b11837ef0 100644
--- a/.github/labeler-no-sync.yml
+++ b/.github/labeler-no-sync.yml
@@ -22,13 +22,6 @@
               - doc/**/*
               - nixos/doc/**/*
 
-"backport release-24.11":
-  - any:
-      - changed-files:
-          - any-glob-to-any-file:
-              - .github/workflows/*
-              - ci/**/*.*
-
 "backport release-25.05":
   - any:
       - changed-files:

From 7a31ddea37d998b8f0d5813e71abda0a6a6e75c0 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Tue, 1 Jul 2025 15:10:01 +0200
Subject: [PATCH 44/55] .github/ISSUE_TEMPLATE: remove 24.11 references

24.11 is unmaintained now
---
 .github/ISSUE_TEMPLATE/01_bug_report.yml        | 1 -
 .github/ISSUE_TEMPLATE/02_bug_report_darwin.yml | 1 -
 .github/ISSUE_TEMPLATE/03_bug_report_nixos.yml  | 1 -
 .github/ISSUE_TEMPLATE/04_build_failure.yml     | 1 -
 .github/ISSUE_TEMPLATE/05_update_request.yml    | 1 -
 .github/ISSUE_TEMPLATE/06_module_request.yml    | 1 -
 6 files changed, 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
index e0ec7544c83b..8deac1129874 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -37,7 +37,6 @@ body:
         - "Please select a version."
         - "- Unstable (25.11)"
         - "- Stable (25.05)"
-        - "- Previous Stable (24.11)"
       default: 0
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
index 980c7dd2bb2c..48ed14747bdb 100644
--- a/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
+++ b/.github/ISSUE_TEMPLATE/02_bug_report_darwin.yml
@@ -37,7 +37,6 @@ body:
         - "Please select a version."
         - "- Unstable (25.11)"
         - "- Stable (25.05)"
-        - "- Previous Stable (24.11)"
       default: 0
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
index 9a6834cf9810..de8ac36e467f 100644
--- a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
+++ b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml
@@ -37,7 +37,6 @@ body:
         - "Please select a version."
         - "- Unstable (25.11)"
         - "- Stable (25.05)"
-        - "- Previous Stable (24.11)"
       default: 0
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml
index 4060900452a7..df44b8a985c0 100644
--- a/.github/ISSUE_TEMPLATE/04_build_failure.yml
+++ b/.github/ISSUE_TEMPLATE/04_build_failure.yml
@@ -39,7 +39,6 @@ body:
         - "Please select a version."
         - "- Unstable (25.11)"
         - "- Stable (25.05)"
-        - "- Previous Stable (24.11)"
       default: 0
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/05_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml
index a0f076973d7b..695921a70263 100644
--- a/.github/ISSUE_TEMPLATE/05_update_request.yml
+++ b/.github/ISSUE_TEMPLATE/05_update_request.yml
@@ -39,7 +39,6 @@ body:
         - "Please select a version."
         - "- Unstable (25.11)"
         - "- Stable (25.05)"
-        - "- Previous Stable (24.11)"
       default: 0
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/06_module_request.yml b/.github/ISSUE_TEMPLATE/06_module_request.yml
index cdd7908041a5..f1c7e3cc8f7e 100644
--- a/.github/ISSUE_TEMPLATE/06_module_request.yml
+++ b/.github/ISSUE_TEMPLATE/06_module_request.yml
@@ -37,7 +37,6 @@ body:
         - "Please select a version."
         - "- Unstable (25.11)"
         - "- Stable (25.05)"
-        - "- Previous Stable (24.11)"
       default: 0
     validations:
       required: true

From 41054323048560df98d66f2f971ef555942e701e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 13:30:11 +0000
Subject: [PATCH 45/55] wivrn: 25.6 -> 25.6.1

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

diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index ecdf59183636..d7b66282e8e2 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -51,13 +51,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wivrn";
-  version = "25.6";
+  version = "25.6.1";
 
   src = fetchFromGitHub {
     owner = "wivrn";
     repo = "wivrn";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-opl1zPQrdOMgDY0rYZccNNRpgba6FQZMHxvgKNS7svM=";
+    hash = "sha256-DqgayLXI+RPIb8tLzJoHi+Z12px4pdzU50C0UBSa2u4=";
   };
 
   monado = applyPatches {

From ec49bcde0fcdf052bc3906053358079238512181 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 1 Jul 2025 21:08:09 +0800
Subject: [PATCH 46/55] nixos-render-docs: fix path for redirects.js

---
 .../ni/nixos-render-docs/src/nixos_render_docs/manual.py    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py
index 52b51f63f4d8..aab3d91a587b 100644
--- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py
+++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py
@@ -312,10 +312,10 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer):
 
         scripts = self._html_params.scripts
         if self._redirects:
-            redirects_path = f'{self._base_path}/{toc.target.path.split('.html')[0]}-redirects.js'
-            with open(redirects_path, 'w') as file:
+            redirects_name = f'{toc.target.path.split('.html')[0]}-redirects.js'
+            with open(self._base_path / redirects_name, 'w') as file:
                 file.write(self._redirects.get_redirect_script(toc.target.path))
-            scripts.append(redirects_path)
+            scripts.append(f'./{redirects_name}')
 
         return "\n".join([
             '<?xml version="1.0" encoding="utf-8" standalone="no"?>',

From 5ad6d40ca3a216427dfa6b9353952f8659965281 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <github@i.m.mmlb.dev>
Date: Tue, 1 Jul 2025 10:05:50 -0400
Subject: [PATCH 47/55] wezterm: Drop thiagokokada as maintainer

See https://github.com/NixOS/nixpkgs/pull/421309#issuecomment-3024157345
---
 pkgs/by-name/we/wezterm/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index b18c541b76c7..7c878ce24e3f 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -168,7 +168,6 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [
       mimame
       SuperSandro2000
-      thiagokokada
     ];
   };
 }

From 7f4056013cb25dcd1b04d4dbb132396f81c6c516 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 1 Jul 2025 16:07:02 +0200
Subject: [PATCH 48/55] espflash: 3.3.0 -> 4.0.0

The failing doctest was fixed upstream in
https://github.com/esp-rs/espflash/commit/85d8f3190b3d60fc5cabc1fee3ecff6d640a65cb
---
 pkgs/by-name/es/espflash/package.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix
index d39566ee01e8..1b0231aed23f 100644
--- a/pkgs/by-name/es/espflash/package.nix
+++ b/pkgs/by-name/es/espflash/package.nix
@@ -12,13 +12,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "espflash";
-  version = "3.3.0";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "espflash";
     tag = "v${version}";
-    hash = "sha256-8qFq+OyidW8Bwla6alk/9pXLe3zayHkz5LsqI3jwgY0=";
+    hash = "sha256-ZC5TL56lWopfFuKQp0GatyTXDRYHMb0t/6/15hyBxXg=";
   };
 
   nativeBuildInputs = [
@@ -36,10 +36,7 @@ rustPlatform.buildRustPackage rec {
     ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-WEPSXgHR7wA2zWbc8ogVxDRtXcmR20R14Qwo2VqPLrQ=";
-  checkFlags = [
-    "--skip cli::monitor::external_processors"
-  ];
+  cargoHash = "sha256-O/rZU0fflF0Sa44mO2dUFOeW7uQdNzzGaMeyaYHaFiI=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd espflash \

From ff1f4efe0fb7df85ab59044e54da42af8cf02d7d Mon Sep 17 00:00:00 2001
From: Jennifer Graul <jgraul@relaix.net>
Date: Tue, 1 Jul 2025 16:34:18 +0200
Subject: [PATCH 49/55] librenms: 25.5.0 -> 25.6.0

---
 pkgs/by-name/li/librenms/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix
index 814822fc1c84..1e83bb3ca172 100644
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@@ -27,16 +27,16 @@ let
 in
 phpPackage.buildComposerProject2 rec {
   pname = "librenms";
-  version = "25.5.0";
+  version = "25.6.0";
 
   src = fetchFromGitHub {
     owner = "librenms";
     repo = "librenms";
     tag = version;
-    sha256 = "sha256-I1bHEFWGgwHq1U8Ipbm9tu7t6ikfMG+EIPjCsLAP/tk=";
+    sha256 = "sha256-8LL0D1vIThjZ5RBIQ6INAuXz0bbhOBEZMFYhv3OX1c8=";
   };
 
-  vendorHash = "sha256-bt7DXkQ3Jgab4L9fB8qInbHvlRxFfkzP+F8DVQ9qWJ4=";
+  vendorHash = "sha256-9ndmr1cs6+p2EThs8UQkNsSFHd/1wxbPOgw2rX5ZivU=";
 
   php = phpPackage;
 
@@ -77,7 +77,7 @@ phpPackage.buildComposerProject2 rec {
     patch -p1 -d $out -i ${./broken-binary-paths.diff}
 
     substituteInPlace \
-      $out/misc/config_definitions.json \
+      $out/resources/definitions/config_definitions.json \
       --replace-fail '"default": "/bin/ping",' '"default": "/run/wrappers/bin/ping",' \
       --replace-fail '"default": "fping",' '"default": "/run/wrappers/bin/fping",' \
       --replace-fail '"default": "fping6",' '"default": "/run/wrappers/bin/fping6",' \

From 675540f6bab0a7b422e13d21e67d3d285d0a9b05 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Mon, 30 Jun 2025 20:06:44 -0300
Subject: [PATCH 50/55] xen: patch with XSA-470

https://xenbits.xenproject.org/xsa/advisory-470.html

Certain instructions need intercepting and emulating by Xen.  In some
cases Xen emulates the instruction by replaying it, using an executable
stub.  Some instructions may raise an exception, which is supposed to be
handled gracefully.  Certain replayed instructions have additional logic
to set up and recover the changes to the arithmetic flags.

For replayed instructions where the flags recovery logic is used, the
metadata for exception handling was incorrect, preventing Xen from
handling the the exception gracefully, treating it as fatal instead.

An unprivileged guest can cause a hypervisor crash, causing a Denial of
Service (DoS) of the entire host.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/xe/xen/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index b0df72e7f9e6..b4fb111556e3 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -36,6 +36,10 @@ buildXenPackage.override { inherit python3Packages; } {
       url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-07.patch";
       hash = "sha256-+BsCJa01R2lrbu7tEluGrYSAqu2jJcrpFNUoLMY466c=";
     })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa470.patch";
+      hash = "sha256-zhMZ6pCZtt0ocgsMFVqthMaof46lMMTaYmlepMXVJqM=";
+    })
   ];
   rev = "3ad5d648cda5add395f49fc3704b2552aae734f7";
   hash = "sha256-v2DRJv+1bym8zAgU74lo1HQ/9rUcyK3qc4Eec4RpcEY=";

From a1a9a62a6893b365e9426d4e9d007720d70d2111 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 1 Jul 2025 17:42:59 +0300
Subject: [PATCH 51/55] kdePackages: Plasma 6.4.1 -> 6.4.2

---
 pkgs/kde/generated/sources/plasma.json | 414 ++++++++++++-------------
 1 file changed, 207 insertions(+), 207 deletions(-)

diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index c41e5437e303..b955a9b6aa59 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,347 +1,347 @@
 {
   "aurorae": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/aurorae-6.4.1.tar.xz",
-    "hash": "sha256-4hZ73nLjVc0AZXOeqNLNnR3z9D6beAn8VwKzs1K7/WU="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/aurorae-6.4.2.tar.xz",
+    "hash": "sha256-nYjOtnMItAk8aisnEz6Aj5dM+XMUR/rO9y7hO19CTVE="
   },
   "bluedevil": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/bluedevil-6.4.1.tar.xz",
-    "hash": "sha256-mtR03dabzoVJgNMEL96JBb2UBZ/aqoAEJcds12J+Bu8="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/bluedevil-6.4.2.tar.xz",
+    "hash": "sha256-JTvWMwWrK3Y5H+ynIfc1trrmxcE3mRZLjKoJ+/o6DgY="
   },
   "breeze": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/breeze-6.4.1.tar.xz",
-    "hash": "sha256-T+AIX/ohsuOu9J3E5chi8i7xM5WpaBOHqZAwh0PwHFU="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/breeze-6.4.2.tar.xz",
+    "hash": "sha256-RgerRR0NFfDQgVJD0H/V9XCZhffrK+8b9MoWkbRwqrU="
   },
   "breeze-grub": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/breeze-grub-6.4.1.tar.xz",
-    "hash": "sha256-c6yyJ5vbMtXpeqeHha4P6vBuQnQTtNvR3LZbu9zacwM="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/breeze-grub-6.4.2.tar.xz",
+    "hash": "sha256-kqyaSHIcRgVBajz+LxVvE1e47YDliZq0jTe0X17roCU="
   },
   "breeze-gtk": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/breeze-gtk-6.4.1.tar.xz",
-    "hash": "sha256-4Qj+nLx2oPUf2N+cYw05l4o8H7bPrznZqy9VVJRie1g="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/breeze-gtk-6.4.2.tar.xz",
+    "hash": "sha256-SOW1KpUXZGGlO9U7P+lRPEycJxVcrW+IMMeLzEA8to0="
   },
   "breeze-plymouth": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/breeze-plymouth-6.4.1.tar.xz",
-    "hash": "sha256-JSE/12TBsME2nbqFASXjsC2ZkKuQwcZ0PKodCHy3BkU="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/breeze-plymouth-6.4.2.tar.xz",
+    "hash": "sha256-/V6zHc9mCS2kgceXyHKGWQcAA961ldyVxP6jvf9K3T4="
   },
   "discover": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/discover-6.4.1.tar.xz",
-    "hash": "sha256-80zqQ4qKCuC7b9E+QWTUnHoqmFfiBDAMzCdvLV+JgjA="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/discover-6.4.2.tar.xz",
+    "hash": "sha256-8d21G83ZgV3CIsAtKZQkkk2lQbOpGiy/lye9GyDb1RU="
   },
   "drkonqi": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/drkonqi-6.4.1.tar.xz",
-    "hash": "sha256-REnekqvM46h7RyeWQffxcmqo0C5vMVSPDzJ3ks6C/UM="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/drkonqi-6.4.2.tar.xz",
+    "hash": "sha256-xYlgsRuheAqPOTMgJRcmJJSkDHPQQeu/5tdsFBdAbJ0="
   },
   "flatpak-kcm": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/flatpak-kcm-6.4.1.tar.xz",
-    "hash": "sha256-27UINtKXUF5efF/LKeIrb/IbUtBE7gf4QriZlMXapd4="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/flatpak-kcm-6.4.2.tar.xz",
+    "hash": "sha256-FA48nX/qzO76aQHFXchyKBr5t81YzzZlU4kVB9RXnAQ="
   },
   "kactivitymanagerd": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kactivitymanagerd-6.4.1.tar.xz",
-    "hash": "sha256-tt1cG4TT0ucNt58W7O/iOsr1PEX9XCursu6ZS0ZsrJk="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kactivitymanagerd-6.4.2.tar.xz",
+    "hash": "sha256-GraFQCR7IHrhS+Rkd7YEqOj/A9qwB+n84WDSMP6DtsM="
   },
   "kde-cli-tools": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kde-cli-tools-6.4.1.tar.xz",
-    "hash": "sha256-LZCrDANPudKBZ1Dams45twi3EtP3NBZj67v+iNWwLKQ="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kde-cli-tools-6.4.2.tar.xz",
+    "hash": "sha256-9iJhUETVIxqayTNJalCbRaZ54vT3arlUHa8ZoP7c76o="
   },
   "kde-gtk-config": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kde-gtk-config-6.4.1.tar.xz",
-    "hash": "sha256-S79X5NeYqJnD8SM1BClZrvz11q81SwSJXk6N3ujIxD4="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kde-gtk-config-6.4.2.tar.xz",
+    "hash": "sha256-b6XWoEX0eRaRm9wY8eJxR2PwXmIOtaJjqMqU1weVIVQ="
   },
   "kdecoration": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kdecoration-6.4.1.tar.xz",
-    "hash": "sha256-obRAHtr3/iFjw+HKtUjZPDExlXuFNPISSe787uSW4SI="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kdecoration-6.4.2.tar.xz",
+    "hash": "sha256-16vnPcCTBFPxl7egIvwZPNESwlSvKccvMWq/517nXzM="
   },
   "kdeplasma-addons": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kdeplasma-addons-6.4.1.tar.xz",
-    "hash": "sha256-iUv51ID9vwo+AFczkVNaQemlfO5yP7rQ+NosFtKZ0vY="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kdeplasma-addons-6.4.2.tar.xz",
+    "hash": "sha256-3d+FtyjfgE6jngJFLjVc7RlrGjXrjp2dcbdH+JzBZsE="
   },
   "kgamma": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kgamma-6.4.1.tar.xz",
-    "hash": "sha256-zClBxUYyHA9ACHqB4sPY1E6jhFA0wWQXmmOEtU7w+5A="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kgamma-6.4.2.tar.xz",
+    "hash": "sha256-/4JZiLpURND+5uM4xkPX0x230fNb4txizmf27oAcjxs="
   },
   "kglobalacceld": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kglobalacceld-6.4.1.tar.xz",
-    "hash": "sha256-PuOK9MlVHeZAoYZ9J4NS2BcUaSz3AAwg0Z3CYuBL9DM="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kglobalacceld-6.4.2.tar.xz",
+    "hash": "sha256-n3yiUzquPVzROJX0euB7/bpBZa8BzKpGDWRbPE0qUeQ="
   },
   "kinfocenter": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kinfocenter-6.4.1.tar.xz",
-    "hash": "sha256-IOr7rnikN/dnuLbpSTh1sjADP5dgRUcy6BBIPIISeSc="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kinfocenter-6.4.2.tar.xz",
+    "hash": "sha256-HSX/7XkEvbeuTS/1bUFztIoVOEy5cKeKFFEnhm3Rmdo="
   },
   "kmenuedit": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kmenuedit-6.4.1.tar.xz",
-    "hash": "sha256-VdsXXw897aYVS/sMchrfGD9jwTS3eFjJ+74IWK6cd3M="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kmenuedit-6.4.2.tar.xz",
+    "hash": "sha256-oA/YUDAP8IsXvZpS7Bno9pgiNE79oXc06GVaHL6qNSs="
   },
   "kpipewire": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kpipewire-6.4.1.tar.xz",
-    "hash": "sha256-Npbf0ZtT5e+h57xpDDggkZuLvcDXj5Z3nMOzGekDX+I="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kpipewire-6.4.2.tar.xz",
+    "hash": "sha256-1Z+L6VTSOsS58+0ovMWiLoquvq31HCg0SZt2lMqQzhw="
   },
   "krdp": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/krdp-6.4.1.tar.xz",
-    "hash": "sha256-zoGR8xXF9HBGuZh/Uv/wqI/8P51AmJ7yQj8QuY4sWMI="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/krdp-6.4.2.tar.xz",
+    "hash": "sha256-7PKlFzfhYOmo57hVcqLAAKk8e1k4spyVkRiasGJKC7Y="
   },
   "kscreen": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kscreen-6.4.1.tar.xz",
-    "hash": "sha256-w6KFacTwkt74RWTpFi64p/poGo9GWKFNgkNuohdU3Fs="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kscreen-6.4.2.tar.xz",
+    "hash": "sha256-dxpsShfDTbdii6tY7m0Zd9WO7iik05T7nsIIz3nnaBk="
   },
   "kscreenlocker": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kscreenlocker-6.4.1.tar.xz",
-    "hash": "sha256-yEnck5oFCibycDk/i1nouG1nGYOnUuAUr3yJoclVuSU="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kscreenlocker-6.4.2.tar.xz",
+    "hash": "sha256-7yvIwvHw33XGd3jEIIpe4CwFRjVu+DUt0f/e6GcoPMQ="
   },
   "ksshaskpass": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/ksshaskpass-6.4.1.tar.xz",
-    "hash": "sha256-VJXbLUX5sqxQqBOC9+OMmauD1+o0rc9ysFwmDZ2KNDM="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/ksshaskpass-6.4.2.tar.xz",
+    "hash": "sha256-bvOBEjnC7FBYWfbEg5J9bWmln72NbaQbOFqXfCMe//w="
   },
   "ksystemstats": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/ksystemstats-6.4.1.tar.xz",
-    "hash": "sha256-pwp0070kEW9gAQhrlCzJ1p91FPP1t8KgOC1dwoHn8Ko="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/ksystemstats-6.4.2.tar.xz",
+    "hash": "sha256-UWE07MisRse88JnVfYiJ6FbMzxo2EnWg0yxmzS9lwSQ="
   },
   "kwallet-pam": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kwallet-pam-6.4.1.tar.xz",
-    "hash": "sha256-BNTXB1y5PKwQp+BQSDbZYcei7aTwiYe7UA+ScgApi3w="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kwallet-pam-6.4.2.tar.xz",
+    "hash": "sha256-/FV4roYNdM52lc8LVhpyvPRzBjZpTY3r/BDIXpcpauk="
   },
   "kwayland": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kwayland-6.4.1.tar.xz",
-    "hash": "sha256-f48oQSL/2kTF4dZEJ76QWcoj9an78JLiod5tQd5FhiU="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kwayland-6.4.2.tar.xz",
+    "hash": "sha256-go3ZwewydyFYPW8EpEE/CPb/2TUMUd4WmGNZqnDICNc="
   },
   "kwayland-integration": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kwayland-integration-6.4.1.tar.xz",
-    "hash": "sha256-IQk2AksNGsr5zZOo94SjSBBhno6zVvaPAgVHU1QK5gs="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kwayland-integration-6.4.2.tar.xz",
+    "hash": "sha256-P8Xp+/SqnXM0KeI+VBd6mYOj7SohH6IKGfUA1c/dJjc="
   },
   "kwin": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kwin-6.4.1.tar.xz",
-    "hash": "sha256-1OQwbJbMLouoYw6sMjT7wIVoWwCrxeWvwsLBxsb8pNQ="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kwin-6.4.2.tar.xz",
+    "hash": "sha256-HLAMYDuwENRQ4IvidDlBi+ZZlA6IWpCsTi9bxhrjtxs="
   },
   "kwin-x11": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kwin-x11-6.4.1.tar.xz",
-    "hash": "sha256-eYy9ba9fstfr20lOaxLzmp7A4CWicjNiEhOWYUEgfAs="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kwin-x11-6.4.2.tar.xz",
+    "hash": "sha256-bt+yBKGrmvmRvwV643bBJZUXDVkdCAFnS7pkFI1FLCM="
   },
   "kwrited": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/kwrited-6.4.1.tar.xz",
-    "hash": "sha256-qApe1F7WM/Fc86QrLZVmCNnmpaePJn3zOslqr8wg2NQ="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/kwrited-6.4.2.tar.xz",
+    "hash": "sha256-25fcbeRcNfwUY6kQe/0lYnUk3nwcAEQ0US2naWvPmWE="
   },
   "layer-shell-qt": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/layer-shell-qt-6.4.1.tar.xz",
-    "hash": "sha256-54HK3sALTDibkUPLOkDfd4iqTU0hHIhH9rm2UXbm6c4="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/layer-shell-qt-6.4.2.tar.xz",
+    "hash": "sha256-e+rQL1BufB763GFYjMUujtL6Rnyhg0hcO3KAwIpaYxI="
   },
   "libkscreen": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/libkscreen-6.4.1.tar.xz",
-    "hash": "sha256-dBU8GUDd7sCZuhIMenm7yzn/42NE581cQ2CHdq9bLRQ="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/libkscreen-6.4.2.tar.xz",
+    "hash": "sha256-c9+69sQ3pcHQH3aLTxQAcNBH+P7DBkQqzZOrVIN+wao="
   },
   "libksysguard": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/libksysguard-6.4.1.tar.xz",
-    "hash": "sha256-fDOUnb3MzuzjX779JEpESbI7UHHgytCC+RruZPeygeE="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/libksysguard-6.4.2.tar.xz",
+    "hash": "sha256-5XHYTNsLpcPePCabNKJ2aylMUjNwuiy3jW9OUqO7R9k="
   },
   "libplasma": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/libplasma-6.4.1.tar.xz",
-    "hash": "sha256-O6Tx+KmWix0zlWT5GzOBjoDmEt5+U0WREXJGlj0scXs="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/libplasma-6.4.2.tar.xz",
+    "hash": "sha256-qbtVMubvswgzx2teLg+xzhquVAvraBO2kWPSC5bVYKw="
   },
   "milou": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/milou-6.4.1.tar.xz",
-    "hash": "sha256-IZQ2nUxFpTe3kyK/3T7MUlL7Vd/Y968hA8j3t9ouUIA="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/milou-6.4.2.tar.xz",
+    "hash": "sha256-smV6I1WaG/+FqzC2svXS4anBSZ7Qrwla2oOthby1paY="
   },
   "ocean-sound-theme": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/ocean-sound-theme-6.4.1.tar.xz",
-    "hash": "sha256-o/ddckD0SKRnOT6xTxQxrAsFNf5JKYyf+hdLAFAJl/M="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/ocean-sound-theme-6.4.2.tar.xz",
+    "hash": "sha256-0bRaGlY/iK6lHMH2PjpREghMvNHwOEOU64qNkcXIpGY="
   },
   "oxygen": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/oxygen-6.4.1.tar.xz",
-    "hash": "sha256-b5siN5HxUR5v7sS2i6YDThJF4D6iHRMf4YxKhJdVRqU="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/oxygen-6.4.2.tar.xz",
+    "hash": "sha256-i70B4P5cAKMcyT+3u588rfgOn+iwzkQtupJOEQL2f/o="
   },
   "oxygen-sounds": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/oxygen-sounds-6.4.1.tar.xz",
-    "hash": "sha256-pv3YCBYyLq0GRdiJUQpUAh/UvYGEiBTfh1SM8m4HaD8="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/oxygen-sounds-6.4.2.tar.xz",
+    "hash": "sha256-EFCF+0JnJxQoDq9gzLL5/eVOj+81aGdKvnCwiXKPT30="
   },
   "plasma-activities": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-activities-6.4.1.tar.xz",
-    "hash": "sha256-DsBpK13LBfyC0ef3KFq4LaImndt9Axi49KYQONpE2WM="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-activities-6.4.2.tar.xz",
+    "hash": "sha256-u8oDrGpqcZWLRCbVdexoI5klzT7Ry6W9Fxt+e4YFqNs="
   },
   "plasma-activities-stats": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-activities-stats-6.4.1.tar.xz",
-    "hash": "sha256-rfX0v6dY/0EwmXjvULv1/wpZbq+RNzhtS4cOe8wjMLc="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-activities-stats-6.4.2.tar.xz",
+    "hash": "sha256-xon1HSnwtlqRPm10ZIQ0fVFt+aFy8sUee8hcrecqjno="
   },
   "plasma-browser-integration": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-browser-integration-6.4.1.tar.xz",
-    "hash": "sha256-eqDYwMci6fdjuu9cFTp/iC9JDbz5lWPQRye3WcXC1jQ="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-browser-integration-6.4.2.tar.xz",
+    "hash": "sha256-y4W5WagRCb8qqC91gpsOGDPJtMBriBnDBPfKXjIPFUs="
   },
   "plasma-desktop": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-desktop-6.4.1.tar.xz",
-    "hash": "sha256-tc979WDIpK/1oSGc+kF6h2uYIHGju4AdKv9T2/GKBYQ="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-desktop-6.4.2.tar.xz",
+    "hash": "sha256-MpaRuS82jCIRRgRlDjnbkcY4cMgMDAjoU8agQNvTCoQ="
   },
   "plasma-dialer": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-dialer-6.4.1.tar.xz",
-    "hash": "sha256-8bIXU1QRiWxHwQ4cc99Zsp9mQwU8cdfuHWXqLiUr0Q4="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-dialer-6.4.2.tar.xz",
+    "hash": "sha256-l9UkW9yylvJCXNJ3NK/EYWpi6VYKwqEnv+WVxbfFJXs="
   },
   "plasma-disks": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-disks-6.4.1.tar.xz",
-    "hash": "sha256-yY+aDVMimCqQhJfXzAKGeCVIYle44lRi0ZfzNgEcUxQ="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-disks-6.4.2.tar.xz",
+    "hash": "sha256-cZvMFQpGJSsO8WT5CVELOMYusNsRrxYVbB0CbzNGWtk="
   },
   "plasma-firewall": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-firewall-6.4.1.tar.xz",
-    "hash": "sha256-ctXVNJPuOQGEf+Y8+XamjX9gGwh40spnBOhkoFwPv5w="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-firewall-6.4.2.tar.xz",
+    "hash": "sha256-cRXcGHF16e2KIvbbh2ZiE9jlyV2mbErjdxorvxy4VJs="
   },
   "plasma-integration": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-integration-6.4.1.tar.xz",
-    "hash": "sha256-EoE9sNZoVVBXAammIi5qUTpVV4kDJfEMofy/eH2R7eM="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-integration-6.4.2.tar.xz",
+    "hash": "sha256-8LVs4ErhEXzA8ipypgAWT9IUiiW3553AxMUH+ImQpcw="
   },
   "plasma-mobile": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-mobile-6.4.1.tar.xz",
-    "hash": "sha256-+1ivtVRjh7bYN7rGEyNXTgywKBvKob3gH0KKzsWZ8xY="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-mobile-6.4.2.tar.xz",
+    "hash": "sha256-p5O7SWV+40IhLQuCCOz+6uyArVzZZA2fBBQi6fkcn2A="
   },
   "plasma-nano": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-nano-6.4.1.tar.xz",
-    "hash": "sha256-dg9AAdpOMJqWH27gpbl+df+cyzLwQgcLNAz/cHhbMRM="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-nano-6.4.2.tar.xz",
+    "hash": "sha256-HqL2PEcuL+2bwgun0Om7MIDBToMCn/htFwaIopjwqCM="
   },
   "plasma-nm": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-nm-6.4.1.tar.xz",
-    "hash": "sha256-UdwzjlHWBuEx9OM9T7e7KOrYpJzWikYiUtySClkRHFA="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-nm-6.4.2.tar.xz",
+    "hash": "sha256-eG+s60HArZEuBcVHgO2TMcQBlwf7EdzZBPGBOi/Wh2k="
   },
   "plasma-pa": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-pa-6.4.1.tar.xz",
-    "hash": "sha256-C3lyY/Ug3n1zgbcFsW1e/Ul2ZMTzdhoty6k8axxKttE="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-pa-6.4.2.tar.xz",
+    "hash": "sha256-V9cdQErXnobcEB4o5+g7j0xtvYJb4dsi8pr4Gi2izUU="
   },
   "plasma-sdk": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-sdk-6.4.1.tar.xz",
-    "hash": "sha256-c6hlAmveq0XI9ItQrGVvDmJrsEE+dkfAFtkGi8sPVEY="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-sdk-6.4.2.tar.xz",
+    "hash": "sha256-5/DiYmnWxPI5LYWhtoWY7dH9TAcRZbeiWklv2+WgOeE="
   },
   "plasma-systemmonitor": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-systemmonitor-6.4.1.tar.xz",
-    "hash": "sha256-sYENMpuBrDWvynX1/yiHtyTi/HsfnFEBmLh8KcuL3l8="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-systemmonitor-6.4.2.tar.xz",
+    "hash": "sha256-pIZhYNvcVvp7hfSOYyZDuC1tNmdMdU+Zafzq3W8+pTg="
   },
   "plasma-thunderbolt": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-thunderbolt-6.4.1.tar.xz",
-    "hash": "sha256-FSxKrKBrV5HBGyBdehA+gGHcX/qt/3T0/Q8Zhc/Jzj0="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-thunderbolt-6.4.2.tar.xz",
+    "hash": "sha256-cNjE7N+ibccva7ZEctbcVRPKlPCCPYJpT/7sntWrOhY="
   },
   "plasma-vault": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-vault-6.4.1.tar.xz",
-    "hash": "sha256-ayOumkp28MaGltQ0awdjtD5STWBceFcNsy/RC4Znp2w="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-vault-6.4.2.tar.xz",
+    "hash": "sha256-vSk0YVkv57EkPPpFyH9bGRlrMN1/ADvlTzi2pIG/UZY="
   },
   "plasma-welcome": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-welcome-6.4.1.tar.xz",
-    "hash": "sha256-BpW/epqDX01kBq2bdjycyWwH14GVlMT1CIfrcnfnToA="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-welcome-6.4.2.tar.xz",
+    "hash": "sha256-bVfIrkRYph+2BXSwF1sup2bQ8oIhQiGU7xA8D7fsfIQ="
   },
   "plasma-workspace": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-workspace-6.4.1.tar.xz",
-    "hash": "sha256-IGe1OeV0Rbs1/DtYmk9feu4xVJkG4iDojYeQ168yruQ="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-workspace-6.4.2.tar.xz",
+    "hash": "sha256-7WV7457JvB1OW6TF5xe0q2g90nvs7Prvbn4gn3cbSFA="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma-workspace-wallpapers-6.4.1.tar.xz",
-    "hash": "sha256-ckXn4lj1YoL+IUJZ+ughSV78ArO5GqnWo58r7Z9eYdc="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma-workspace-wallpapers-6.4.2.tar.xz",
+    "hash": "sha256-06iVlvN2HWJ2wMvCaPerjrcjhhgvjTVovpvDy3bBm38="
   },
   "plasma5support": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plasma5support-6.4.1.tar.xz",
-    "hash": "sha256-EXo7m806Y96DcZ2U85o0zM9kOnFDXISlxQWwRERrjas="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plasma5support-6.4.2.tar.xz",
+    "hash": "sha256-JKB87/CDpqei2bQVKBJUkFBiPENO9zGRCZYwhaEUrvI="
   },
   "plymouth-kcm": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/plymouth-kcm-6.4.1.tar.xz",
-    "hash": "sha256-KL2d+x5qiAoCsJ3ylJLBbF+7KAU6oqe3wTao4+cGxF0="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/plymouth-kcm-6.4.2.tar.xz",
+    "hash": "sha256-3GQyiAKa9btFixXYPW0M/VwAzqajRUj+g6UsM9wrOpI="
   },
   "polkit-kde-agent-1": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/polkit-kde-agent-1-6.4.1.tar.xz",
-    "hash": "sha256-uxzAN3JTaDNEOdE9x94SxfUXs5g4XxyfUpVxpTkqkwI="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/polkit-kde-agent-1-6.4.2.tar.xz",
+    "hash": "sha256-Kq+ua00EgBjDmPSaFf+YchmDGu4i/sVNCPIHhjQXD5o="
   },
   "powerdevil": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/powerdevil-6.4.1.tar.xz",
-    "hash": "sha256-k+Q4HyU/npYHh/61/LhuoafA4peOOzAJrhkqhq5zRi8="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/powerdevil-6.4.2.tar.xz",
+    "hash": "sha256-y/ifJe/Iy4fEfFLrV1eBsjajU3lvcxcqQ7iNRBZixsU="
   },
   "print-manager": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/print-manager-6.4.1.tar.xz",
-    "hash": "sha256-kJbF8osp9hmb8Kzph2Nh8zZ7efII4FxKWTOdF9S8GfI="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/print-manager-6.4.2.tar.xz",
+    "hash": "sha256-brk+AAZa3hcTf/a0ruxIhltRSbz8Jff5xZPfTRoWaL0="
   },
   "qqc2-breeze-style": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/qqc2-breeze-style-6.4.1.tar.xz",
-    "hash": "sha256-YI/1NtUTVx861Kyv1JYOwLWiq/z/MZMhS6wnonR5a+c="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/qqc2-breeze-style-6.4.2.tar.xz",
+    "hash": "sha256-NuBbGyJ7W2WbiwuIbcNN/sIbCZJb707D5x7ygyXG7Ik="
   },
   "sddm-kcm": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/sddm-kcm-6.4.1.tar.xz",
-    "hash": "sha256-otENV7QyyCJ83OGTrbuVAAaaKrHY1kYsahgZknXLnsY="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/sddm-kcm-6.4.2.tar.xz",
+    "hash": "sha256-988F3cfix2M72eKaX92vpuCGB9ayA0dpqPSXTIuoR88="
   },
   "spacebar": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/spacebar-6.4.1.tar.xz",
-    "hash": "sha256-X/eec6cvsOSdE+PTQwPTRcqzP6T/IkdQWErePFJE/4k="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/spacebar-6.4.2.tar.xz",
+    "hash": "sha256-l9lAg3wc5aPXRM/q2jOTXblqjHrP+ALt0y+7r9Eei2E="
   },
   "spectacle": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/spectacle-6.4.1.tar.xz",
-    "hash": "sha256-VHuMxlFzCRYQSosTE1BIFOyn/mpavOJUwQs3/6GxPjQ="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/spectacle-6.4.2.tar.xz",
+    "hash": "sha256-GLHQt+JmgGZuuGorCQjDbZ4XpJizUpRNibkBGDkg4Ms="
   },
   "systemsettings": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/systemsettings-6.4.1.tar.xz",
-    "hash": "sha256-on8xKikqxMXD76GvcecMqDTX7I6PN6cQz4WuLXu+/5U="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/systemsettings-6.4.2.tar.xz",
+    "hash": "sha256-vFZoCu1tpn3qAmoLxgV0w/Olz6s5kxMZI7aY0oEC1gs="
   },
   "wacomtablet": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/wacomtablet-6.4.1.tar.xz",
-    "hash": "sha256-9n38GT270K5Rxt8IWb6HpNXtae4oO64HzpG0JF++4NE="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/wacomtablet-6.4.2.tar.xz",
+    "hash": "sha256-R+aPq/fLHjyXAqxhsaYJvPn4PEgJxD0Et23ln2ih9Nc="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.4.1",
-    "url": "mirror://kde/stable/plasma/6.4.1/xdg-desktop-portal-kde-6.4.1.tar.xz",
-    "hash": "sha256-HwHWKfaBjkiqas+D9YwH8N3z4b8qHstEgDr2XN4RlYM="
+    "version": "6.4.2",
+    "url": "mirror://kde/stable/plasma/6.4.2/xdg-desktop-portal-kde-6.4.2.tar.xz",
+    "hash": "sha256-K2dIB9KnhJN6C87wJxOVrYWjVHUlO6nxirotdtgzClM="
   }
 }
\ No newline at end of file

From c854b4f07857838337a6878ffac67f4cd14532ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 14:56:31 +0000
Subject: [PATCH 52/55] uniex: 0.1.7 -> 0.1.8

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

diff --git a/pkgs/by-name/un/uniex/package.nix b/pkgs/by-name/un/uniex/package.nix
index b1bd45ed1d96..65fe6db53c52 100644
--- a/pkgs/by-name/un/uniex/package.nix
+++ b/pkgs/by-name/un/uniex/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "uniex";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "paepckehh";
     repo = "uniex";
     tag = "v${version}";
-    hash = "sha256-PoGDvnF+P8iUYdW98BT3Gcayf0JSgK257W377yFz5j4=";
+    hash = "sha256-+wcAm3UFRs70HJ64emuWNnyroUhFHUPsaMQPCaMAexg=";
   };
 
-  vendorHash = "sha256-QLjeMSdvFSxnmnsKwTg4SDkc7xqx4csxTWJKOsRzcBI=";
+  vendorHash = "sha256-s/oWtYziUtSKDQmvDxWznqynlKmWxwt5jAAT5xl+gqo=";
 
   ldflags = [
     "-s"

From c95f6f477621322a3ec9454bedeeb4d4c269ad6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 15:44:19 +0000
Subject: [PATCH 53/55] python3Packages.voip-utils: 0.3.2 -> 0.3.3

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

diff --git a/pkgs/development/python-modules/voip-utils/default.nix b/pkgs/development/python-modules/voip-utils/default.nix
index da70c7d1d0ce..3fe80625c9d9 100644
--- a/pkgs/development/python-modules/voip-utils/default.nix
+++ b/pkgs/development/python-modules/voip-utils/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "voip-utils";
-  version = "0.3.2";
+  version = "0.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "voip-utils";
     tag = "v${version}";
-    hash = "sha256-CI6YCT88ay4tDWHwaTL0Wr4b07mCn7440HdWE9+nxAw=";
+    hash = "sha256-LGmvf6HejxH17VaKL2extonoAmk0zqU7UpHmuPc8/u0=";
   };
 
   postPatch = ''
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
-    changelog = "https://github.com/home-assistant-libs/voip-utils/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/home-assistant-libs/voip-utils/blob/${src.tag}/CHANGELOG.md";
     description = "Voice over IP Utilities";
     homepage = "https://github.com/home-assistant-libs/voip-utils";
     license = lib.licenses.asl20;

From 6d211b6f7719fab38e9e282ee90b867b441f7061 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Tue, 1 Jul 2025 18:02:40 +0200
Subject: [PATCH 54/55] ungoogled-chromium: 138.0.7204.49-1 -> 138.0.7204.96-1

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop_30.html

This update includes 1 security fix. Google is aware that an exploit for
CVE-2025-6554 exists in the wild.

CVEs:
CVE-2025-6554
---
 .../networking/browsers/chromium/info.json         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 482dd0da54e9..7f6ee37d61a7 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -802,7 +802,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "138.0.7204.49",
+    "version": "138.0.7204.96",
     "deps": {
       "depot_tools": {
         "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
@@ -813,16 +813,16 @@
         "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM="
       },
       "ungoogled-patches": {
-        "rev": "138.0.7204.49-1",
-        "hash": "sha256-lfaYQjeyM0fAcqayyiL3wcnp1vifYa5RRBOI3mRGUxQ="
+        "rev": "138.0.7204.96-1",
+        "hash": "sha256-tOQSvdwK3lMN/7l23rbw7txJ/ovRguSXe9oMeol63Cs="
       },
       "npmHash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "d2b48fd5f7813ed477a2d68fa232b8178fa4fb1e",
-        "hash": "sha256-n2jSVXpV0mqdTdLpE+N3yJhutJTOE1fez0BleU0+VSU=",
+        "rev": "f01343ee86bdb55cc999f82381f038cdbf20db62",
+        "hash": "sha256-9Ryxv2DvnIKVk4ZvjXegubFDUNzJ3YXGPuYHlntC3RU=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -1597,8 +1597,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "0ea9b0813581826a94b45324e746f9ab57f0f843",
-        "hash": "sha256-jGx1jafKyh9BrrJwWKU78sKlwkX9KYHzhggx6TzRel4="
+        "rev": "e5b4c78b54e8b033b2701db3df0bf67d3030e4c1",
+        "hash": "sha256-5y/yNZopnwtDrG+BBU6fMEi0yJJoYvsygQR+fl6vS/Y="
       }
     }
   }

From 45f6ae858eb3b2effc1e9399f2ea0d5a44c35352 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 1 Jul 2025 10:44:04 +0100
Subject: [PATCH 55/55] google-chrome: 138.0.7204.49 -> 138.0.7204.92

---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 7e476bdd87a4..6b997ece78f5 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.49";
+    version = "138.0.7204.92";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-FHYjo8rPmruJWEpHnkJHs5Ht0NP2GwGSKNYbDCtQmSY=";
+      hash = "sha256-9HaUIvJEw6PqinEnpam/Dh5+6XPJ2ou+j8Jfhc7nd/E=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -276,11 +276,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "138.0.7204.50";
+    version = "138.0.7204.93";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/a4ahzfkgyxfqoxgobvw6tfhnre_138.0.7204.50/GoogleChrome-138.0.7204.50.dmg";
-      hash = "sha256-/VsCUAowk59whR7GYBqzNjp3+aMih68L/6zbfytesOk=";
+      url = "http://dl.google.com/release2/chrome/k3cs4pgesvh4zq3jml7x52esia_138.0.7204.93/GoogleChrome-138.0.7204.93.dmg";
+      hash = "sha256-IEcwjrtNMMSjwNCrINjXRbnSI0Uf2JKtA+KwvQc5Fhc=";
     };
 
     dontPatch = true;