From d1bda4a0056c1ab2eddaa17a9fbd9e7c071e02db Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Thu, 28 May 2026 18:26:46 -0400
Subject: [PATCH 01/28] krunkit: install missing firmware

Otherwise it fails to boot.
---
 pkgs/by-name/kr/krunkit/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/kr/krunkit/package.nix b/pkgs/by-name/kr/krunkit/package.nix
index 894231cb3ea1..233fc17428bc 100644
--- a/pkgs/by-name/kr/krunkit/package.nix
+++ b/pkgs/by-name/kr/krunkit/package.nix
@@ -43,6 +43,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
+  postInstall = ''
+    install -Dm444 edk2/KRUN_EFI.silent.fd $out/share/krunkit/KRUN_EFI.silent.fd
+  '';
+
   # This is necessary in order for the binary to keep its entitlements
   dontStrip = true;
 

From 4bfafef8b4b0f34d584d1a5e22ed5c062fc172bc Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Thu, 28 May 2026 18:27:34 -0400
Subject: [PATCH 02/28] krunkit: add boot regression test

The test boots a nixos efi machine. It requires a aarch64-linux builder
to produce the nixos image, as well as apple-virt feature enabled.

Assisted-By: Codex, gpt-5.5 high
---
 pkgs/by-name/kr/krunkit/boot-test.nix | 126 ++++++++++++++++++++++++++
 pkgs/by-name/kr/krunkit/package.nix   |   8 +-
 2 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/kr/krunkit/boot-test.nix

diff --git a/pkgs/by-name/kr/krunkit/boot-test.nix b/pkgs/by-name/kr/krunkit/boot-test.nix
new file mode 100644
index 000000000000..4278b41539d2
--- /dev/null
+++ b/pkgs/by-name/kr/krunkit/boot-test.nix
@@ -0,0 +1,126 @@
+{
+  krunkit,
+  lib,
+  nixos,
+  pkgs,
+  runCommand,
+}:
+
+let
+  linuxPkgs = import pkgs.path {
+    system = "aarch64-linux";
+  };
+
+  nixosConfig =
+    (nixos {
+      nixpkgs.pkgs = linuxPkgs;
+
+      imports = [ "${pkgs.path}/nixos/modules/profiles/qemu-guest.nix" ];
+
+      boot = {
+        kernelParams = [ "console=hvc0" ];
+        loader = {
+          efi.canTouchEfiVariables = false;
+          systemd-boot.enable = true;
+        };
+      };
+
+      documentation.enable = false;
+      environment.defaultPackages = [ ];
+
+      fileSystems = {
+        "/" = {
+          device = "/dev/disk/by-label/nixos";
+          fsType = "ext4";
+        };
+
+        "/boot" = {
+          device = "/dev/disk/by-label/ESP";
+          fsType = "vfat";
+        };
+      };
+
+      systemd.services.krunkit-boot-ok = {
+        wantedBy = [ "multi-user.target" ];
+        after = [ "multi-user.target" ];
+        serviceConfig.Type = "oneshot";
+        script = ''
+          echo krunkit-boot-ok >/dev/hvc0
+        '';
+      };
+
+      system.stateVersion = lib.trivial.release;
+    }).config;
+
+  image = import "${pkgs.path}/nixos/lib/make-disk-image.nix" {
+    inherit lib;
+    config = nixosConfig;
+    pkgs = linuxPkgs;
+
+    additionalSpace = "64M";
+    baseName = "krunkit-nixos";
+    bootSize = "128M";
+    copyChannel = false;
+    format = "raw";
+    partitionTableType = "efi";
+  };
+in
+runCommand "krunkit-nixos-boot-test"
+  {
+    requiredSystemFeatures = [ "apple-virt" ];
+
+    meta.platforms = [ "aarch64-darwin" ];
+  }
+  ''
+    image=${image}/krunkit-nixos.img
+    disk=$TMPDIR/disk.img
+    console=$TMPDIR/console.log
+    log=$TMPDIR/krunkit.log
+
+    cp "$image" "$disk"
+    chmod u+w "$disk"
+    touch "$console" "$log"
+
+    cleanup() {
+      set +e
+      if [ -n "''${pid:-}" ]; then
+        kill "$pid" >/dev/null 2>&1
+        for _ in $(seq 1 20); do
+          kill -0 "$pid" >/dev/null 2>&1 || break
+          sleep 1
+        done
+        kill -KILL "$pid" >/dev/null 2>&1
+      fi
+    }
+    trap cleanup EXIT
+
+    ${krunkit}/bin/krunkit \
+      --cpus 1 \
+      --memory 1024 \
+      --log-file "$log" \
+      --device "virtio-blk,path=$disk,format=raw" \
+      --device "virtio-serial,logFilePath=$console" &
+    pid=$!
+
+    for _ in $(seq 1 120); do
+      if grep -q krunkit-boot-ok "$console"; then
+        touch "$out"
+        exit 0
+      fi
+
+      if ! kill -0 "$pid" >/dev/null 2>&1; then
+        echo "krunkit exited before the guest reached multi-user.target"
+        wait "$pid"
+        cat "$log"
+        cat "$console"
+        exit 1
+      fi
+
+      sleep 1
+    done
+
+    echo "timed out waiting for krunkit guest boot marker"
+    cat "$log"
+    cat "$console"
+    exit 1
+  ''
diff --git a/pkgs/by-name/kr/krunkit/package.nix b/pkgs/by-name/kr/krunkit/package.nix
index 233fc17428bc..7062159cf41f 100644
--- a/pkgs/by-name/kr/krunkit/package.nix
+++ b/pkgs/by-name/kr/krunkit/package.nix
@@ -1,4 +1,5 @@
 {
+  callPackage,
   cargo,
   darwin,
   pkg-config,
@@ -50,7 +51,12 @@ stdenv.mkDerivation (finalAttrs: {
   # This is necessary in order for the binary to keep its entitlements
   dontStrip = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    tests.boot = callPackage ./boot-test.nix {
+      krunkit = finalAttrs.finalPackage;
+    };
+    updateScript = nix-update-script { };
+  };
 
   meta = {
     description = "Launch configurable virtual machines with libkrun";

From b4e72c546611cc806c7b6e855e555eede13cc36c Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Thu, 28 May 2026 18:28:27 -0400
Subject: [PATCH 03/28] podman-desktop: add krunkit to closure on darwin

When starting podman machine from UI, it fails because podman-desktop
directly calls to krunkit to determine some configuration if the machine
is of krunkit type.
---
 pkgs/by-name/po/podman-desktop/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index f96534cab492..9e65cc26c8dc 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -18,6 +18,7 @@
   jq,
   gnugrep,
   podman,
+  krunkit,
 }:
 
 let
@@ -124,7 +125,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase =
     let
-      commonWrapperArgs = "--prefix PATH : ${lib.makeBinPath [ podman ]}";
+      prefixPackages = lib.makeBinPath (
+        [ podman ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform krunkit) krunkit
+      );
+      commonWrapperArgs = "--prefix PATH : ${prefixPackages}";
     in
     (
       ''

From e53453bc1bb2ba77b8fb70ed6a3a093d0ae6dc0f Mon Sep 17 00:00:00 2001
From: George Huebner <ghuebner@anduril.com>
Date: Tue, 16 Jun 2026 10:35:23 -0700
Subject: [PATCH 04/28] xquartz: properly replace X utility paths

---
 pkgs/by-name/xq/xquartz/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/xq/xquartz/package.nix b/pkgs/by-name/xq/xquartz/package.nix
index a3a33b92d458..008e213e97e4 100644
--- a/pkgs/by-name/xq/xquartz/package.nix
+++ b/pkgs/by-name/xq/xquartz/package.nix
@@ -240,12 +240,12 @@ stdenv.mkDerivation {
     cp ${fontsConf} $fontsConfPath
 
     substituteInPlace $out/bin/startx \
-      --replace "bindir=${xinit}/bin" "bindir=$out/bin" \
-      --replace 'defaultserver=${xorg-server}/bin/X' "defaultserver=$out/bin/Xquartz" \
-      --replace "${xinit}" "$out" \
-      --replace "${xorg-server}" "$out" \
-      --replace "eval xinit" "eval $out/bin/xinit" \
-      --replace "sysclientrc=/etc/X11/xinit/xinitrc" "sysclientrc=$out/etc/X11/xinit/xinitrc"
+      --replace-fail "${xinit}" "$out" \
+      --replace-fail "xserver=\"${xorg-server}/bin/X\"" "xserver=\"$out/bin/Xquartz\"" \
+      --replace-fail 'xinit="xinit"' "xinit=$out/bin/xinit" \
+      --replace-fail '"xauth"' "${lib.getExe xauth}" \
+      --replace-fail "xauth " '"$xauth" ' \
+      --replace-fail "sysclientrc=/etc/X11/xinit/xinitrc" "sysclientrc=$out/etc/X11/xinit/xinitrc"
 
     wrapProgram $out/bin/Xquartz \
       --set XQUARTZ_APP $out/Applications/XQuartz.app
@@ -262,9 +262,9 @@ stdenv.mkDerivation {
     EOF
 
     substituteInPlace $out/etc/X11/xinit/xinitrc \
-      --replace ${xinit} $out \
-      --replace xmodmap ${xmodmap}/bin/xmodmap \
-      --replace xrdb ${xrdb}/bin/xrdb
+      --replace-fail ${xinit} $out \
+      --replace-fail '"xmodmap"' ${xmodmap}/bin/xmodmap \
+      --replace-fail '"xrdb"' ${xrdb}/bin/xrdb
 
     mkdir -p $out/etc/X11/xinit/xinitrc.d
 
@@ -281,7 +281,7 @@ stdenv.mkDerivation {
     chmod +x $out/etc/X11/xinit/xinitrc.d/99-quartz-wm.sh
 
     substituteInPlace $out/etc/X11/xinit/privileged_startx.d/20-font_cache \
-      --replace ${xinit} $out
+      --replace-fail ${xinit} $out
 
     cp ${./font_cache} $out/bin/font_cache
     substituteInPlace $out/bin/font_cache \

From eb4202e42878c3674857e2d85da9f6d5edd7c129 Mon Sep 17 00:00:00 2001
From: George Huebner <ghuebner@anduril.com>
Date: Tue, 16 Jun 2026 10:35:23 -0700
Subject: [PATCH 05/28] xorg-server: enable SECURITY module on darwin

This is required for `ssh -X` to work properly.
---
 pkgs/by-name/xo/xorg-server/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix
index 270f23950dbf..05def6678eba 100644
--- a/pkgs/by-name/xo/xorg-server/package.nix
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -152,8 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dxkb_bin_dir=${xkbcomp}/bin"
     "-Dxkb_dir=${xkeyboard-config}/share/X11/xkb"
     "-Dxkb_output_dir=$out/share/X11/xkb/compiled"
-  ]
-  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+
     "-Dxcsecurity=true"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [

From 44f293318432773f7f200d3e5440d75e2ede37bf Mon Sep 17 00:00:00 2001
From: George Huebner <ghuebner@anduril.com>
Date: Tue, 16 Jun 2026 10:35:24 -0700
Subject: [PATCH 06/28] xorg-server: disable false positive buffer overrun
 check

The bounds checks introduced by `-D_FORTIFY_SOURCE=2` in functions
like `strlcpy` interact poorly with data structures that treat fixed
sized arrays as flexible arrays (e.g. `struct sockaddr`).  This bug
manifested as an endless crashloop in XQuartz.

See also https://github.com/llvm/llvm-project/issues/29694
---
 pkgs/by-name/xo/xorg-server/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix
index 05def6678eba..b9028ccbbe4c 100644
--- a/pkgs/by-name/xo/xorg-server/package.nix
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -176,6 +176,9 @@ stdenv.mkDerivation (finalAttrs: {
       --subst-var-by XQUARTZ_APP "$out/Applications/XQuartz.app"
   '';
 
+  # avoid linux rebuilds
+  ${if stdenv.hostPlatform.isDarwin then "hardeningDisable" else null} = [ "strictflexarrays1" ];
+
   # default X install symlinks this to Xorg, we want XQuartz
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     ln -sf $out/bin/Xquartz $out/bin/X

From b63faf0d4e63115a02f0c093f04d20d49b462d42 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Jun 2026 11:28:21 +0000
Subject: [PATCH 07/28] filebeat8: 8.19.16 -> 8.19.17

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

diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix
index aff497b2bdb5..fb988970f506 100644
--- a/pkgs/by-name/fi/filebeat8/package.nix
+++ b/pkgs/by-name/fi/filebeat8/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "filebeat";
-  version = "8.19.16";
+  version = "8.19.17";
 
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "beats";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OBPaSbPAp7SvhEi2yycgT70yRfCtIEdkL4/GSR2YrO4=";
+    hash = "sha256-Xpth1SoXMXCUh/DFf3wA+Ql6SedtUB7tCYzDElpX5Lc=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
 
-  vendorHash = "sha256-aCoXzWnNsctxJmsfeUyVSLkUY59adtIn2JxxGKPBob8=";
+  vendorHash = "sha256-Wxk+eI0XfBpQqqUNuskyr+/bTRqT38hszdkz/LJweQo=";
 
   subPackages = [ "filebeat" ];
 

From 6212428317c2d03253d2ba0c8e444a50aeba5ada Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 06:39:16 +0000
Subject: [PATCH 08/28] clusternet: 0.18.1 -> 1.0.0

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

diff --git a/pkgs/by-name/cl/clusternet/package.nix b/pkgs/by-name/cl/clusternet/package.nix
index 6175595a2abc..dedf8b5e1660 100644
--- a/pkgs/by-name/cl/clusternet/package.nix
+++ b/pkgs/by-name/cl/clusternet/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "clusternet";
-  version = "0.18.1";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "clusternet";
     repo = "clusternet";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MtiQM2msHv2gLaVpYoSrzJMZWwA0vMBIklwAQi+lG4g=";
+    hash = "sha256-Nrnk3Ru4DTOagc7iTC4ZGyYhqhQwLIgs3fu67l0stEs=";
   };
 
-  vendorHash = "sha256-vG+k9ttXp/QqhbVKgwn2uo5kEk8OD+LBvJi5lBQfUk4=";
+  vendorHash = "sha256-mMXtiCz4Y5pL77c24RnZ2Uoq5Fh2pkrkApAdkd/xyyw=";
 
   ldFlags = [
     "-s"

From b210a9dc3185f5aaec991bcbedda01245ae7874b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 19:58:05 +0000
Subject: [PATCH 09/28] kubectl-cnpg: 1.29.1 -> 1.30.0

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

diff --git a/pkgs/by-name/ku/kubectl-cnpg/package.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix
index 37a81c43b0fa..eb6a000dd6f2 100644
--- a/pkgs/by-name/ku/kubectl-cnpg/package.nix
+++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-cnpg";
-  version = "1.29.1";
+  version = "1.30.0";
 
   src = fetchFromGitHub {
     owner = "cloudnative-pg";
     repo = "cloudnative-pg";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-SlisY7v/CFVXH85IAvlBH1RjyrTS+e8hFHJIwh0FgCc=";
+    hash = "sha256-UHgllbD2eNBVYrF5nPZhethZIyyBkEji1xf0okGshoI=";
   };
 
-  vendorHash = "sha256-He5L4HBTMOlzLgB+tAxNbjvDdvGyz5UolC8mMFibwZ4=";
+  vendorHash = "sha256-Eh057tW8NTCNVtgyeY4A+Cc8wQbRDpUYDFmj4l+pn8o=";
 
   subPackages = [ "cmd/kubectl-cnpg" ];
 

From b265f0d684fa43dc53f0d6bd7781a7a38cb539cd Mon Sep 17 00:00:00 2001
From: Ross Carter <rcarter@anduril.com>
Date: Tue, 30 Jun 2026 13:02:53 -0400
Subject: [PATCH 10/28] ioping: Fix cross compilation

---
 pkgs/by-name/io/ioping/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/io/ioping/package.nix b/pkgs/by-name/io/ioping/package.nix
index 125a3ab42eb2..7f2a08763bab 100644
--- a/pkgs/by-name/io/ioping/package.nix
+++ b/pkgs/by-name/io/ioping/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  pkgsCross,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,13 +16,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-9lJEjns8ttjgI52ZXeWgL77GMd7o7IvefBJ5UH9y9ks=";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "CC:=$(CC)"
+  ];
 
   outputs = [
     "out"
     "man"
   ];
 
+  passthru.tests = {
+    aarch64-cross = pkgsCross.aarch64-multiplatform.ioping;
+  };
+
   meta = {
     description = "Disk I/O latency measuring tool";
     maintainers = with lib.maintainers; [ raskin ];

From fe59ef25daf78d9ed40dbb1dec550e8552a7b9f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 00:05:55 +0000
Subject: [PATCH 11/28] drasl: 3.4.3 -> 3.4.4

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

diff --git a/pkgs/by-name/dr/drasl/package.nix b/pkgs/by-name/dr/drasl/package.nix
index 49bf56f79376..6277aae2d512 100644
--- a/pkgs/by-name/dr/drasl/package.nix
+++ b/pkgs/by-name/dr/drasl/package.nix
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "drasl";
-  version = "3.4.3";
+  version = "3.4.4";
 
   src = fetchFromGitHub {
     owner = "unmojang";
     repo = "drasl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kisClBALEESxuGh2gtwCyB02/SrYvabouaApho7z7GY=";
+    hash = "sha256-GHwgN1yWf/xav2t03/09x/U0c6fRBDmEn0mDIv+V9ic=";
   };
 
   nativeBuildInputs = [

From ff8210b83c8431dcc7a774a62155e516327d324c Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Sat, 2 May 2026 17:29:12 +1000
Subject: [PATCH 12/28] gnat-bootstrap15: init at 15.2.0-1

---
 .../compilers/gnat-bootstrap/default.nix      | 53 ++++++++++++-------
 pkgs/top-level/all-packages.nix               | 13 +++--
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix
index fad7f427fbe6..3a3cecb77620 100644
--- a/pkgs/development/compilers/gnat-bootstrap/default.nix
+++ b/pkgs/development/compilers/gnat-bootstrap/default.nix
@@ -33,23 +33,6 @@ stdenv.mkDerivation (
         url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-${finalAttrs.version}/gnat-${stdenv.hostPlatform.system}-${finalAttrs.version}.tar.gz";
       in
       {
-        "12" = {
-          gccVersion = "12.1.0";
-          alireRevision = "2";
-        }
-        // {
-          x86_64-darwin = {
-            inherit url;
-            hash = "sha256-zrcVFvFZMlGUtkG0p1wST6kGInRI64Icdsvkcf25yVs=";
-            upstreamTriplet = "x86_64-apple-darwin19.6.0";
-          };
-          x86_64-linux = {
-            inherit url;
-            hash = "sha256-EPDPOOjWJnJsUM7GGxj20/PXumjfLoMIEFX1EDtvWVY=";
-            upstreamTriplet = "x86_64-pc-linux-gnu";
-          };
-        }
-        .${stdenv.hostPlatform.system} or throwUnsupportedSystem;
         "13" = {
           gccVersion = "13.2.0";
           alireRevision = "2";
@@ -99,6 +82,36 @@ stdenv.mkDerivation (
           };
         }
         .${stdenv.hostPlatform.system} or throwUnsupportedSystem;
+        "15" = {
+          gccVersion = "15.2.0";
+        }
+        // {
+          x86_64-darwin = {
+            alireRevision = "1";
+            inherit url;
+            hash = "sha256-1YTqWsLBwNH/GBAtF5CL/YZHQvfE/3PE0LlLJ9HmjAg=";
+            upstreamTriplet = "x86_64-apple-darwin22.6.0";
+          };
+          x86_64-linux = {
+            alireRevision = "1";
+            inherit url;
+            hash = "sha256-b4hAg3ifoBRqgPxpfMYuOdunw7wzRTL/G5YGBO+im24=";
+            upstreamTriplet = "x86_64-pc-linux-gnu";
+          };
+          aarch64-linux = {
+            alireRevision = "1";
+            inherit url;
+            hash = "sha256-0V/VHqOSYQI6LmvpUIHy3zB6hI3dG0njOcDsrg8oZq8=";
+            upstreamTriplet = "aarch64-linux-gnu";
+          };
+          aarch64-darwin = {
+            alireRevision = "2-pre0";
+            url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-15.2.0-2-macos-pre0/gnat-${stdenv.hostPlatform.system}-${finalAttrs.version}.tar.gz";
+            hash = "sha256-4bFtsjixfXYc8wYOc+5iAbp1MmiIS1h1NcdKno2IdJg=";
+            upstreamTriplet = "aarch64-apple-darwin24.6.0";
+          };
+        }
+        .${stdenv.hostPlatform.system} or throwUnsupportedSystem;
       };
     inherit (versionMap.${majorVersion}) gccVersion alireRevision upstreamTriplet;
   in
@@ -146,13 +159,15 @@ stdenv.mkDerivation (
     ++
       lib.optionals
         (
-          lib.versionAtLeast majorVersion "14" && stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux
+          (majorVersion == "14" && stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux)
+          || (lib.versionAtLeast majorVersion "15" && stdenv.hostPlatform.isLinux)
         )
         [
           # not sure why the bootstrap binaries link to zstd only on this architecture but they do
           zstd
         ];
 
+    __structuredAttrs = true;
     strictDeps = true;
 
     # https://github.com/alire-project/GNAT-FSF-builds/issues/51
@@ -245,8 +260,6 @@ stdenv.mkDerivation (
       platforms = [
         "x86_64-linux"
         "x86_64-darwin"
-      ]
-      ++ lib.optionals (lib.versionAtLeast majorVersion "13") [
         "aarch64-darwin"
       ]
       ++ lib.optionals (lib.versionAtLeast majorVersion "14") [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8f8f3e967a2..ac829ad6ab91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3535,7 +3535,7 @@ with pkgs;
       # If we are cross-compiling GNAT, we may as well do the same.
       gnat-bootstrap =
         if stdenv.hostPlatform == stdenv.targetPlatform && stdenv.buildPlatform == stdenv.hostPlatform then
-          buildPackages.gnat-bootstrap14
+          buildPackages.gnat-bootstrap15
         else
           buildPackages.gnat15;
       stdenv =
@@ -3544,7 +3544,7 @@ with pkgs;
           && stdenv.buildPlatform == stdenv.hostPlatform
           && stdenv.buildPlatform.isDarwin
         then
-          overrideCC gccStdenv gnat-bootstrap14
+          overrideCC gccStdenv gnat-bootstrap15
         else
           stdenv;
     }
@@ -3562,7 +3562,7 @@ with pkgs;
       # If we are cross-compiling GNAT, we may as well do the same.
       gnat-bootstrap =
         if stdenv.hostPlatform == stdenv.targetPlatform && stdenv.buildPlatform == stdenv.hostPlatform then
-          buildPackages.gnat-bootstrap14
+          buildPackages.gnat-bootstrap15
         else
           buildPackages.gnat16;
       stdenv =
@@ -3571,7 +3571,7 @@ with pkgs;
           && stdenv.buildPlatform == stdenv.hostPlatform
           && stdenv.buildPlatform.isDarwin
         then
-          overrideCC gccStdenv gnat-bootstrap14
+          overrideCC gccStdenv gnat-bootstrap15
         else
           stdenv;
     }
@@ -3588,6 +3588,11 @@ with pkgs;
     isAlireGNAT = true;
   };
 
+  gnat-bootstrap15 = wrapCCWith {
+    cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "15"; };
+    isAlireGNAT = true;
+  };
+
   gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; });
   gnat14Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat14; });
   gnat15Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat15; });

From 034b8a07c38925d16f5a541aacfaaaff19b49a56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 07:32:49 +0000
Subject: [PATCH 13/28] unityhub: 3.18.3 -> 3.19.1

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

diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix
index ce2ce84f0844..71388456cc17 100644
--- a/pkgs/by-name/un/unityhub/package.nix
+++ b/pkgs/by-name/un/unityhub/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "unityhub";
-  version = "3.18.3";
+  version = "3.19.1";
 
   src = fetchurl {
     url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/UnityHubSetup-${version}-amd64.deb";
-    hash = "sha256-6Gjik6zIQMYoAr8jmMp3X6+Xu5fdcbh2Exd8eToSbto=";
+    hash = "sha256-PoWjyHBDsJPrGUBuTB2yXdLPu2gxrGn68flpy7fxC7Q=";
   };
 
   nativeBuildInputs = [

From 57b3c44a08d5b7b10bef7dd97a586eade0faa399 Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Sun, 28 Jun 2026 21:01:29 +1000
Subject: [PATCH 14/28] gnat-bootstrap16: init at 16.1.0-1

---
 .../compilers/gnat-bootstrap/default.nix      | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  9 +++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix
index 3a3cecb77620..9a6e728c9fcc 100644
--- a/pkgs/development/compilers/gnat-bootstrap/default.nix
+++ b/pkgs/development/compilers/gnat-bootstrap/default.nix
@@ -112,6 +112,33 @@ stdenv.mkDerivation (
           };
         }
         .${stdenv.hostPlatform.system} or throwUnsupportedSystem;
+        "16" = {
+          gccVersion = "16.1.0";
+          alireRevision = "1";
+        }
+        // {
+          x86_64-darwin = {
+            inherit url;
+            hash = "sha256-u/cYFKqWLTaFADTscDxnrkYSoemKrfKpNIZ8XPlTbLI=";
+            upstreamTriplet = "x86_64-apple-darwin24.6.0";
+          };
+          x86_64-linux = {
+            inherit url;
+            hash = "sha256-5bKYPJnXDGa80BtAogLE82X0zTuYKdN2cKh503oMeic=";
+            upstreamTriplet = "x86_64-pc-linux-gnu";
+          };
+          aarch64-linux = {
+            inherit url;
+            hash = "sha256-jJnqDJGBOjqbT4hDW0nRpV0oA3RXxJhvI7BuvQkPDQI=";
+            upstreamTriplet = "aarch64-linux-gnu";
+          };
+          aarch64-darwin = {
+            inherit url;
+            hash = "sha256-TJlV/Ngq6SwpIgGkwamTN3aRGP2BnEzJyBGovtWb6Y0=";
+            upstreamTriplet = "aarch64-apple-darwin24.6.0";
+          };
+        }
+        .${stdenv.hostPlatform.system} or throwUnsupportedSystem;
       };
     inherit (versionMap.${majorVersion}) gccVersion alireRevision upstreamTriplet;
   in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac829ad6ab91..2de22e5837ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3562,7 +3562,7 @@ with pkgs;
       # If we are cross-compiling GNAT, we may as well do the same.
       gnat-bootstrap =
         if stdenv.hostPlatform == stdenv.targetPlatform && stdenv.buildPlatform == stdenv.hostPlatform then
-          buildPackages.gnat-bootstrap15
+          buildPackages.gnat-bootstrap16
         else
           buildPackages.gnat16;
       stdenv =
@@ -3571,7 +3571,7 @@ with pkgs;
           && stdenv.buildPlatform == stdenv.hostPlatform
           && stdenv.buildPlatform.isDarwin
         then
-          overrideCC gccStdenv gnat-bootstrap15
+          overrideCC gccStdenv gnat-bootstrap16
         else
           stdenv;
     }
@@ -3593,6 +3593,11 @@ with pkgs;
     isAlireGNAT = true;
   };
 
+  gnat-bootstrap16 = wrapCCWith {
+    cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "16"; };
+    isAlireGNAT = true;
+  };
+
   gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; });
   gnat14Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat14; });
   gnat15Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat15; });

From 54c63611750b9e22db783d6c03ca40526f45004c Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Sat, 2 May 2026 18:02:16 +1000
Subject: [PATCH 15/28] gnat: 13.4.0 -> 15.2.0

---
 pkgs/top-level/all-packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2de22e5837ee..770cca51a28c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3467,7 +3467,7 @@ with pkgs;
     enableLTO = false;
   };
 
-  gnat = gnat13; # When changing this, update also gnatPackages
+  gnat = pkgs."gnat${toString default-gcc-version}"; # When changing this, update also gnatPackages
 
   gnat13 = wrapCC (
     gcc13.cc.override {
@@ -3577,7 +3577,8 @@ with pkgs;
     }
   );
 
-  gnat-bootstrap = gnat-bootstrap13;
+  gnat-bootstrap = pkgs."gnat-bootstrap${toString default-gcc-version}";
+
   gnat-bootstrap13 = wrapCCWith {
     cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "13"; };
     isAlireGNAT = true;
@@ -3602,7 +3603,7 @@ with pkgs;
   gnat14Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat14; });
   gnat15Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat15; });
   gnat16Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat16; });
-  gnatPackages = gnat13Packages;
+  gnatPackages = pkgs."gnat${toString default-gcc-version}Packages";
 
   inherit (gnatPackages)
     gprbuild

From eff113acd985cb3e522eb90f9391eb09504ea62c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 18:21:55 +0000
Subject: [PATCH 16/28] nak: 0.19.13 -> 0.20.0

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

diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix
index 82897c04a719..76e04a15401b 100644
--- a/pkgs/by-name/na/nak/package.nix
+++ b/pkgs/by-name/na/nak/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nak";
-  version = "0.19.13";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "fiatjaf";
     repo = "nak";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bM91nnwQxcqzWFFFJXEmCJ1DKBIKb/o/qTwRjxCc15Q=";
+    hash = "sha256-jewvap5dYDpW7kqN2BvJuaqXG8C+gya9y6NxwPQhR4I=";
   };
 
-  vendorHash = "sha256-hpvBJXtzKWY5Kuy72qMtw8wuS9ejGy1wT+h28gACsXw=";
+  vendorHash = "sha256-gDBDN+loVtsTTj8J1sFlWqMgcdlKepj/16hLkiQEmTs=";
 
   ldflags = [
     "-s"

From 47ae899700580ea975c3aa01a8379a62d3fe301d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 18:32:55 +0000
Subject: [PATCH 17/28] open-webui: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index 225007c43a2c..2a402879ce3f 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -9,13 +9,13 @@
 }:
 let
   pname = "open-webui";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     tag = "v${version}";
-    hash = "sha256-ec/pmmjuFDYsL4MwHbTiw8PxG9iMHM/ntGfJIm3OpH8=";
+    hash = "sha256-tJ9b5up5FoX5TrmpwMWevyA/o3Ai/lKsHu+nahc2Ttc=";
   };
 
   frontend = buildNpmPackage rec {
@@ -30,7 +30,7 @@ let
       url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
     };
 
-    npmDepsHash = "sha256-hHBTbiEaZsyfZWpwiNNbGOJTt6Bor0FKClYrCY5mjzE=";
+    npmDepsHash = "sha256-yw/1n1jBCUtt8wUqJmIkB3W53wsXTKuAFG/EMwcTpx8=";
 
     npmFlags = [ "--force" ];
 

From cb5edbd30e39e98485104b2556ad8df225b84086 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 19:31:42 +0000
Subject: [PATCH 18/28] openimageio: 3.1.14.1 -> 3.1.15.0

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

diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix
index a5dd93938fa3..7c1ec8c50399 100644
--- a/pkgs/by-name/op/openimageio/package.nix
+++ b/pkgs/by-name/op/openimageio/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openimageio";
-  version = "3.1.14.1";
+  version = "3.1.15.0";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenImageIO";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gAW9pUK0oPGoeNRBCS7i444PQ3b6f9Pa0UJwhSJV9ss=";
+    hash = "sha256-ebB9f0QkW83ZT6ydbpV2srvSaFayw1OM3HjI8rqPL4k=";
   };
 
   outputs = [

From fce514111b1606e510bda6a02561b498dfdb1ffd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jul 2026 23:31:42 +0200
Subject: [PATCH 19/28] betterleaks: 1.5.0 -> 1.6.1

Diff: https://github.com/betterleaks/betterleaks/compare/v1.5.0...v1.6.1

Changelog: https://github.com/betterleaks/betterleaks/releases/tag/v1.6.1
---
 pkgs/by-name/be/betterleaks/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/be/betterleaks/package.nix b/pkgs/by-name/be/betterleaks/package.nix
index c112872d0d2b..f6c4d9b3b4d2 100644
--- a/pkgs/by-name/be/betterleaks/package.nix
+++ b/pkgs/by-name/be/betterleaks/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "betterleaks";
-  version = "1.5.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "betterleaks";
     repo = "betterleaks";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7Oa6mtFhkHqgd4/FH85W7Bc/KSMwPCeHRhIFk2KVkik=";
+    hash = "sha256-2VjvTS2qOUH8W+hFm4xA3xCGZZs+oP1KQOSq6FBLjaw=";
   };
 
-  vendorHash = "sha256-KAZfl2t8LUsgQBKsrgXsh/1ziX0FZvDhnSUAv7D/hSA=";
+  vendorHash = "sha256-UBzobzZeIYzP+mU3+9GRF4lAs+cpqkIt+3mBpTN1BN8=";
 
   ldflags = [
     "-s"

From 6e3e19c92f3c24ee83083586ea1542a456a8110c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 21:46:09 +0000
Subject: [PATCH 20/28] ft2-clone: 2.19 -> 2.20

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

diff --git a/pkgs/by-name/ft/ft2-clone/package.nix b/pkgs/by-name/ft/ft2-clone/package.nix
index a8f89d0440e7..3c55fd88d488 100644
--- a/pkgs/by-name/ft/ft2-clone/package.nix
+++ b/pkgs/by-name/ft/ft2-clone/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ft2-clone";
-  version = "2.19";
+  version = "2.20";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-vIo+7yb8QjzHAj68N2rHHc1o2knaBn6hCatDeKr+5gs=";
+    hash = "sha256-e0oIn/g5bWYMFhvd54reacGI8/s7pMfujnEPzYnUbF4=";
   };
 
   nativeBuildInputs = [ cmake ];

From f1fd88161c06331c9e58eadf2089705b878ccb53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 22:38:06 +0000
Subject: [PATCH 21/28] yggdrasil-ng: 0.1.6 -> 0.2.0

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

diff --git a/pkgs/by-name/yg/yggdrasil-ng/package.nix b/pkgs/by-name/yg/yggdrasil-ng/package.nix
index e4a109846271..04f621cbdbf5 100644
--- a/pkgs/by-name/yg/yggdrasil-ng/package.nix
+++ b/pkgs/by-name/yg/yggdrasil-ng/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage (oldAttrs: {
   pname = "yggdrasil-ng";
-  version = "0.1.6";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "Revertron";
     repo = "Yggdrasil-ng";
     tag = "v${oldAttrs.version}";
-    hash = "sha256-nJLK5O2kjFRGZ3JwqwLHtYqvJfrOxtZOjdM6q2NNrbk=";
+    hash = "sha256-Ic3r8xNeBMg+vN9C2JPRrpVRNHqT5XuDT+EoD493qdM=";
   };
 
-  cargoHash = "sha256-mJr8IMTbB+mSrsxzq6ehnfBueulNqZtxU/1aHAyv954=";
+  cargoHash = "sha256-eA5tXPqZJnRIYQGxmjOA8esDV8u74afWMfZ9bn9PsWE=";
 
   __structuredAttrs = true;
 

From 72498fc3754ac5447d5151b73a9f441b05ba97ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 22:49:14 +0000
Subject: [PATCH 22/28] rufin: 0.7.8 -> 0.7.13

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

diff --git a/pkgs/by-name/ru/rufin/package.nix b/pkgs/by-name/ru/rufin/package.nix
index 17fdd59bffc6..32e470326425 100644
--- a/pkgs/by-name/ru/rufin/package.nix
+++ b/pkgs/by-name/ru/rufin/package.nix
@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rufin";
-  version = "0.7.8";
+  version = "0.7.13";
 
   __structuredAttrs = true;
 
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "screwys";
     repo = "Rufin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TgPjv3s0ERLSnncbtzyr+K1cVscr0PbPxFuDuiPwuV4=";
+    hash = "sha256-gY/Y+9D/9VlVrmYH+Cf7uP787yxhTyb0RyFRhiTjynM=";
   };
 
-  cargoHash = "sha256-hddBiTzJBSk37/Lq7GQ+kTOx6ikLh641B0ISWN2Z2qI=";
+  cargoHash = "sha256-DQRURA9IvUZC9gTvKIsAmO8uq8DwGGYTySDI7cGSxMU=";
 
   strictDeps = true;
 

From ccdaa14e41d119c84ce023683e8270d5bbd9d10e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 23:33:53 +0000
Subject: [PATCH 23/28] plakar: 1.1.3 -> 1.1.4

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

diff --git a/pkgs/by-name/pl/plakar/package.nix b/pkgs/by-name/pl/plakar/package.nix
index 1754b9420be0..4f90548365ac 100644
--- a/pkgs/by-name/pl/plakar/package.nix
+++ b/pkgs/by-name/pl/plakar/package.nix
@@ -8,7 +8,7 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "plakar";
-  version = "1.1.3";
+  version = "1.1.4";
 
   # to avoid having all the Test(Get|Set|Validate)Service.* tests fail on darwin
   __darwinAllowLocalNetworking = true;
@@ -17,10 +17,10 @@ buildGo125Module (finalAttrs: {
     owner = "PlakarKorp";
     repo = "plakar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AQyE8VtTdkuevBVMLDfhN1h6/DirdhLgPu+76QfRUas=";
+    hash = "sha256-Urj1BG3XGhSroaa9pl9NGiKj38J1P+H9sA7noGwIhdc=";
   };
 
-  vendorHash = "sha256-nueFE6Ka1dq4Rt+Qs9YJU9N+yYfEyA8jkVGC4vKLjSI=";
+  vendorHash = "sha256-aqHjSTVVxBbaHAZZNQaFbftN0Hbl/+7wgk5uFM664po=";
 
   buildInputs = [
     fuse

From 1f361d71e42402a5fb63708fc8925ca8899c3c2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 00:26:26 +0000
Subject: [PATCH 24/28] terraform-providers.oracle_oci: 8.19.0 -> 8.20.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a0ef1151b227..a5b7e0386ac7 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1058,11 +1058,11 @@
     "vendorHash": null
   },
   "oracle_oci": {
-    "hash": "sha256-ByAuY0y7tpzeaHmf1VTpvVUzRFxhuS49g57XqJ4Mnuk=",
+    "hash": "sha256-2mdir7UZJpDxRy5GcB27ovJrE8UQmzjS5ciYY9pKZW8=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v8.19.0",
+    "rev": "v8.20.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 0fe895f236550552ab171c8979bea408ae21aeb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 02:21:38 +0000
Subject: [PATCH 25/28] zashboard: 3.10.1 -> 3.12.0

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

diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index 138104b05ff4..b4802c8b556b 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -12,13 +12,13 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "zashboard";
-  version = "3.10.1";
+  version = "3.12.0";
 
   src = fetchFromGitHub {
     owner = "Zephyruso";
     repo = "zashboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-unk/QO2V5BzuY8TL8Z1K/EPPMB6JwW15OQICix8Mukk=";
+    hash = "sha256-bNkp3FQYM8gdkszPgbN3Ovypg0Uj7Ny0WNkfC82xark=";
   };
 
   npmDeps = null;
@@ -26,7 +26,7 @@ buildNpmPackage (finalAttrs: {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-7bjsqBQssirsrIbegm5G/J/v3+yzfomq/gxCbxKEb6g=";
+    hash = "sha256-ag72Aw8Kor9vpVthq/shWqyNUFL8hHrwdeKHNHgm8NU=";
   };
 
   nativeBuildInputs = [ pnpm ];

From af6b3e1bf766af8b000276af2a3313384e83c257 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 02:28:01 +0000
Subject: [PATCH 26/28] python3Packages.victron-mqtt: 2026.6.7 -> 2026.6.8

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

diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix
index f2b9e81a9557..501f55142150 100644
--- a/pkgs/development/python-modules/victron-mqtt/default.nix
+++ b/pkgs/development/python-modules/victron-mqtt/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "victron-mqtt";
-  version = "2026.6.7";
+  version = "2026.6.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tomer-w";
     repo = "victron_mqtt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-06+vn0HKvml3VRvPnQHz832OQnbvjd8tJEcnE6TIer8=";
+    hash = "sha256-zwdSpfI1UtH9ZDYXk/0jozt9qTs5ZaMrg5c60HBnOWo=";
   };
 
   build-system = [

From ee78f0d85318dca4fca1636a207fba37230a5cda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 05:01:04 +0000
Subject: [PATCH 27/28] intelli-shell: 3.4.4 -> 3.4.5

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

diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix
index a0373a074179..c968ffc4f5e3 100644
--- a/pkgs/by-name/in/intelli-shell/package.nix
+++ b/pkgs/by-name/in/intelli-shell/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "intelli-shell";
-  version = "3.4.4";
+  version = "3.4.5";
 
   src = fetchFromGitHub {
     owner = "lasantosr";
     repo = "intelli-shell";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/DkR2s6xHXhQxwJEEs4vXK7Zc4lwLQvBnqUqW75h0Do=";
+    hash = "sha256-jC5hvyefEEU8odiPaUWtWm8o2oHyS7ZOw4nJdvylb0U=";
   };
 
-  cargoHash = "sha256-9/ZxPYgkETIKRizrlz+Pb9oWUYEeoSSmGk8EjzQO7PY=";
+  cargoHash = "sha256-g/sJJiwUl+N4ryFXhrbSIaOl0zzXKbehGyxTNamtua8=";
 
   nativeBuildInputs = [
     pkg-config

From 696253741cd7c5af151bc11b0edb6333c5698664 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 05:41:14 +0000
Subject: [PATCH 28/28] xenia-canary: 0-unstable-2026-06-22 ->
 0-unstable-2026-06-29

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

diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix
index 2e16974d18dc..35018c8c6721 100644
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -33,14 +33,14 @@ let
 in
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2026-06-22";
+  version = "0-unstable-2026-06-29";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "9c8e34b29e276320a319a0a46f7713de60efa50c";
-    hash = "sha256-56WAS3woSzqNQf1GJNLLvHYdLhb5JWykJ1h+6yZmKOY=";
+    rev = "9588ce244dc2684d1573736a717a5d234bf7c2bb";
+    hash = "sha256-nQuBh4XOSSeIX51KLXLyv+gTk51I4/VNgSBrV835mBI=";
   };
 
   dontConfigure = true;