From 6bfa34810938d6f658017ef27abe25e9f0fe05de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Apr 2026 19:14:52 +0000
Subject: [PATCH 001/128] kubernetes-helmPlugins.helm-secrets: 4.6.10 -> 4.7.6

---
 .../networking/cluster/helm/plugins/helm-secrets.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
index b0c266c65ecd..6395244fe708 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "helm-secrets";
-  version = "4.6.10";
+  version = "4.7.6";
 
   src = fetchFromGitHub {
     owner = "jkroepke";
     repo = "helm-secrets";
     rev = "v${version}";
-    hash = "sha256-hno6+kik+U9XA7Mr9OnuuVidfc/xoqWRjMbBMI6M3QA=";
+    hash = "sha256-gCsXnZCvQqc5PIQGheOdzZ1YSUNDhbMvJIROMGA65Jg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 8e36f892744761a8d6f6eed2d8d400abd1829d82 Mon Sep 17 00:00:00 2001
From: terrorbyte <1601039+terrorbyte@users.noreply.github.com>
Date: Mon, 13 Apr 2026 21:01:53 -0600
Subject: [PATCH 002/128] foks: init at 0.1.7

---
 pkgs/by-name/fo/foks-server/package.nix | 63 +++++++++++++++++++++++++
 pkgs/by-name/fo/foks/package.nix        | 62 ++++++++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 pkgs/by-name/fo/foks-server/package.nix
 create mode 100644 pkgs/by-name/fo/foks/package.nix

diff --git a/pkgs/by-name/fo/foks-server/package.nix b/pkgs/by-name/fo/foks-server/package.nix
new file mode 100644
index 000000000000..5cffeb4a7033
--- /dev/null
+++ b/pkgs/by-name/fo/foks-server/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  foks,
+  pcsclite,
+  pkg-config,
+  stdenv,
+  buildPackages,
+}:
+let
+  templFoks = buildPackages.templ.overrideAttrs (old: {
+    pname = "templ-foks";
+    version = "0.3.833";
+    src = old.src.override {
+      hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8=";
+    };
+    vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM=";
+  });
+in
+buildGoModule (finalAttrs: {
+  pname = "foks-server";
+  version = "0.1.7";
+
+  src = fetchFromGitHub {
+    owner = "foks-proj";
+    repo = "go-foks";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UZ4BZ2/S44hnG+uLHtWR/qqQtr6tbbQbQOgIrN4ciT0=";
+  };
+
+  vendorHash = "sha256-+ysHa5KNhoxtoXPgOWC9ZDJKYqF+84s7oyxRib2S6a8=";
+
+  postPatch = ''
+    cd ./server/web/templates
+    templ generate
+    cd -
+  '';
+  postInstall = ''
+    ln -s $out/bin/{foks-server,git-remote-foks}
+  '';
+
+  subPackages = [ "server/foks-server" ];
+  excludedPackages = [ "server" ];
+
+  buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ];
+  nativeBuildInputs = [
+    pkg-config
+    templFoks
+    foks
+  ];
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Federated key management and distribution system";
+    homepage = "https://foks.pub";
+    downloadPage = "https://github.com/foks-proj/go-foks";
+    changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ poptart ];
+    mainProgram = "foks";
+  };
+})
diff --git a/pkgs/by-name/fo/foks/package.nix b/pkgs/by-name/fo/foks/package.nix
new file mode 100644
index 000000000000..caf6f5d99cf7
--- /dev/null
+++ b/pkgs/by-name/fo/foks/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  pcsclite,
+  pkg-config,
+  stdenv,
+  templ,
+  buildPackages,
+}:
+let
+  templFoks = buildPackages.templ.overrideAttrs (old: {
+    pname = "templ-foks";
+    version = "0.3.833";
+    src = old.src.override {
+      hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8=";
+    };
+    vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM=";
+  });
+in
+buildGoModule (finalAttrs: {
+  pname = "foks";
+  version = "0.1.7";
+
+  src = fetchFromGitHub {
+    owner = "foks-proj";
+    repo = "go-foks";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UZ4BZ2/S44hnG+uLHtWR/qqQtr6tbbQbQOgIrN4ciT0=";
+  };
+
+  vendorHash = "sha256-+ysHa5KNhoxtoXPgOWC9ZDJKYqF+84s7oyxRib2S6a8=";
+
+  postPatch = ''
+    cd ./server/web/templates
+    ${templFoks}/bin/templ generate
+    cd -
+  '';
+  postInstall = ''
+    ln -s $out/bin/{foks,git-remote-foks}
+  '';
+
+  subPackages = [ "client/foks" ];
+  excludedPackages = [ "server" ];
+
+  buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ];
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Federated key management and distribution system";
+    homepage = "https://foks.pub";
+    downloadPage = "https://github.com/foks-proj/go-foks";
+    changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ poptart ];
+    mainProgram = "foks";
+  };
+})

From 92befa42b6f0fe3291b76814a1667df54f2b08f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 May 2026 15:45:13 +0000
Subject: [PATCH 003/128] aiken: 1.1.21 -> 1.1.22

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

diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix
index 968e645ee630..fbcd408e3ae3 100644
--- a/pkgs/by-name/ai/aiken/package.nix
+++ b/pkgs/by-name/ai/aiken/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "aiken";
-  version = "1.1.21";
+  version = "1.1.22";
 
   src = fetchFromGitHub {
     owner = "aiken-lang";
     repo = "aiken";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8Oq6Bem4mREHXsBC0FwBnU2MVmTh8b7KtJ/KrPDMqLU=";
+    hash = "sha256-mq/NwfSjqykYwyKq63jDs7u21uWxzAtwDKbZ9Fn3i90=";
   };
 
-  cargoHash = "sha256-5TplKj7q8G1XX6o4d8Vlgf5eGXB8fpnvkl7TwVcuTw0=";
+  cargoHash = "sha256-WzaprYYTFLaM6TKzUG6JadQNLBHjgoM3FwRUfMTmiHA=";
 
   buildInputs = [ openssl ];
 

From 96e83603fc5221e78e319bba9cce6f001a510844 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sat, 16 May 2026 16:37:23 +0000
Subject: [PATCH 004/128] hstr: 3.1 -> 3.2

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

diff --git a/pkgs/by-name/hs/hstr/package.nix b/pkgs/by-name/hs/hstr/package.nix
index 4975d106f258..354a90f0afdb 100644
--- a/pkgs/by-name/hs/hstr/package.nix
+++ b/pkgs/by-name/hs/hstr/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hstr";
-  version = "3.1";
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner = "dvorka";
     repo = "hstr";
-    rev = finalAttrs.version;
-    hash = "sha256-OuLy1aiEwUJDGy3+UXYF1Vx1nNXic46WIZEM1xrIPfA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-c+YUpry96OGJ7nmBw180W2r0z4EBd2Cl3SyOQrNxP+o=";
   };
 
   nativeBuildInputs = [

From 526d0decdc1af0b2cd1e5a1794a2603548f514cf Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 20 May 2026 10:39:11 +0200
Subject: [PATCH 005/128] oxidized: 0.36.0 -> 0.37.0

---
 pkgs/by-name/ox/oxidized/Gemfile      | 2 +-
 pkgs/by-name/ox/oxidized/Gemfile.lock | 4 ++--
 pkgs/by-name/ox/oxidized/gemset.nix   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ox/oxidized/Gemfile b/pkgs/by-name/ox/oxidized/Gemfile
index c89aabe1432b..af1bf8eafce3 100644
--- a/pkgs/by-name/ox/oxidized/Gemfile
+++ b/pkgs/by-name/ox/oxidized/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'oxidized', '0.36.0'
+gem 'oxidized', '0.37.0'
 gem 'oxidized-web', '0.18.1'
 gem 'oxidized-script', '0.7.0'
 gem 'psych', '~> 5.0'
diff --git a/pkgs/by-name/ox/oxidized/Gemfile.lock b/pkgs/by-name/ox/oxidized/Gemfile.lock
index 341165ab0474..70b3ae65075d 100644
--- a/pkgs/by-name/ox/oxidized/Gemfile.lock
+++ b/pkgs/by-name/ox/oxidized/Gemfile.lock
@@ -30,7 +30,7 @@ GEM
     net-ssh (7.3.2)
     net-telnet (0.2.0)
     nio4r (2.7.5)
-    oxidized (0.36.0)
+    oxidized (0.37.0)
       asetus (~> 0.4)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
@@ -103,7 +103,7 @@ PLATFORMS
 
 DEPENDENCIES
   net-scp (~> 4.1)
-  oxidized (= 0.36.0)
+  oxidized (= 0.37.0)
   oxidized-script (= 0.7.0)
   oxidized-web (= 0.18.1)
   psych (~> 5.0)
diff --git a/pkgs/by-name/ox/oxidized/gemset.nix b/pkgs/by-name/ox/oxidized/gemset.nix
index 7b6c788c2278..b5f2946faa97 100644
--- a/pkgs/by-name/ox/oxidized/gemset.nix
+++ b/pkgs/by-name/ox/oxidized/gemset.nix
@@ -241,10 +241,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0g2a60bwpjidwkksai6l2ndnq3qbvqj33jv53c800m7m4hgr5r0n";
+      sha256 = "0apg5psqdkc0h71qpgiq52qnifr41g57agvgyxiq10335gh6c2v0";
       type = "gem";
     };
-    version = "0.36.0";
+    version = "0.37.0";
   };
   oxidized-script = {
     dependencies = [

From ed081185c68fc43c506ad70f55585419c8edaf0b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 10:19:18 +0000
Subject: [PATCH 006/128] mixing-station: 2.9.1 -> 2.9.3

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

diff --git a/pkgs/by-name/mi/mixing-station/package.nix b/pkgs/by-name/mi/mixing-station/package.nix
index 0ef327338301..e2becb6acfc6 100644
--- a/pkgs/by-name/mi/mixing-station/package.nix
+++ b/pkgs/by-name/mi/mixing-station/package.nix
@@ -22,13 +22,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mixing-station";
-  version = "2.9.1";
+  version = "2.9.3";
 
   src = fetchzip {
     url = "https://mixingstation.app/backend/api/web/download/archive/mixing-station-pc/update/${finalAttrs.version}";
     name = "mixing-station-${finalAttrs.version}.zip";
     extension = "zip";
-    hash = "sha256-tyoagT21lIT0kIL9RZT1qQ7Aa7E3WAfmdsqvqc7iEGU=";
+    hash = "sha256-efY+zvX2cN+yFm1xxpvsZAiMhtNW/S9g2hgLnYUYd4I=";
     stripRoot = false;
   };
 

From fe37bcee2260eada371799ce30f19b534e252d66 Mon Sep 17 00:00:00 2001
From: Varun Biniwale <vbiniwale@qumulo.com>
Date: Fri, 22 May 2026 16:16:58 -0700
Subject: [PATCH 007/128] vmTools: add Ubuntu 26.04 "Resolute" (amd64) disk
 image

Adds `ubuntu2604x86_64` to the VM disk image definitions using a
snapshot from 2026-05-15, along with a corresponding test target
`testUbuntu2604x86_64Image` in test.nix.
---
 pkgs/build-support/vm/default.nix | 36 +++++++++++++++++++++++++++++++
 pkgs/build-support/vm/test.nix    |  1 +
 2 files changed, 37 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 6be7d9ebb3f4..f89a29915778 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1333,6 +1333,42 @@ let
       ];
     };
 
+    ubuntu2604x86_64 = {
+      name = "ubuntu-26.04-resolute-amd64";
+      fullName = "Ubuntu 26.04 Resolute (amd64)";
+      packagesLists = [
+        (fetchurl {
+          url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute/main/binary-amd64/Packages.xz";
+          hash = "sha256-7ZrEHLJj767MWgagdC3FZXDi+1/5TE8uSy+9zd1zzyQ=";
+        })
+        (fetchurl {
+          url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute/universe/binary-amd64/Packages.xz";
+          hash = "sha256-FYe+htZtOFQjJSFeDhCfdb1pXI8k15Os4nYgOKatWB4=";
+        })
+        (fetchurl {
+          url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute-updates/main/binary-amd64/Packages.xz";
+          hash = "sha256-EVMoiLf7KqEfG+QtBKbCbQY+creamYm6EbndC+Ogqj4=";
+        })
+        (fetchurl {
+          url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute-updates/universe/binary-amd64/Packages.xz";
+          hash = "sha256-Xw3Ao/IR6j2tTsAotuestXZBpBvPles4gKGCAILmhMw=";
+        })
+        (fetchurl {
+          url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute-security/main/binary-amd64/Packages.xz";
+          hash = "sha256-Qcrp4D/K+a/bWEQLWzI8bw50Y9IuDmZ/qW+0YOOgsmc=";
+        })
+        (fetchurl {
+          url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute-security/universe/binary-amd64/Packages.xz";
+          hash = "sha256-7COZT1+EDlfzJCiJ+rOPpCUo9WTkMHniUOTOvkrBOGg=";
+        })
+      ];
+      urlPrefix = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z";
+      packages = commonDebPackages ++ [
+        "diffutils"
+        "libc-bin"
+      ];
+    };
+
     debian11i386 = {
       name = "debian-11.11-bullseye-i386";
       fullName = "Debian 11.11 Bullseye (i386)";
diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index ec27d06cd7b9..de9042ba18c6 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -83,4 +83,5 @@ in
   testUbuntu2204i386Image = makeImageTestScript diskImages.ubuntu2204i386;
   testUbuntu2204x86_64Image = makeImageTestScript diskImages.ubuntu2204x86_64;
   testUbuntu2404x86_64Image = makeImageTestScript diskImages.ubuntu2404x86_64;
+  testUbuntu2604x86_64Image = makeImageTestScript diskImages.ubuntu2604x86_64;
 }

From c73f751b5d2a5760002e903f6c03ee5de16f42e3 Mon Sep 17 00:00:00 2001
From: Varun Biniwale <vbiniwale@qumulo.com>
Date: Wed, 27 May 2026 09:32:26 -0700
Subject: [PATCH 008/128] vmTools: update Ubuntu 26.04 commit hashes

Not sure why they changed but they (hopefully) shouldn't change again.
---
 pkgs/build-support/vm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index f89a29915778..b1b9bb59f905 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1347,19 +1347,19 @@ let
         })
         (fetchurl {
           url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute-updates/main/binary-amd64/Packages.xz";
-          hash = "sha256-EVMoiLf7KqEfG+QtBKbCbQY+creamYm6EbndC+Ogqj4=";
+          hash = "sha256-xaUdPgtH3jCgTJXYUbksMHvzt6jj6YfdzSAb+91tQNw=";
         })
         (fetchurl {
           url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute-updates/universe/binary-amd64/Packages.xz";
-          hash = "sha256-Xw3Ao/IR6j2tTsAotuestXZBpBvPles4gKGCAILmhMw=";
+          hash = "sha256-gXEKlgpgyrcnIhYwz1vxypFNX50EMbwhmidbDvUruKc=";
         })
         (fetchurl {
           url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute-security/main/binary-amd64/Packages.xz";
-          hash = "sha256-Qcrp4D/K+a/bWEQLWzI8bw50Y9IuDmZ/qW+0YOOgsmc=";
+          hash = "sha256-tzAvbwp+/6snpL8TtbtTx2kEL2f+XfGAwDCl/r6ka6Y=";
         })
         (fetchurl {
           url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute-security/universe/binary-amd64/Packages.xz";
-          hash = "sha256-7COZT1+EDlfzJCiJ+rOPpCUo9WTkMHniUOTOvkrBOGg=";
+          hash = "sha256-gXEKlgpgyrcnIhYwz1vxypFNX50EMbwhmidbDvUruKc=";
         })
       ];
       urlPrefix = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z";

From cb998250f23b91901189c66d74a8551536e8d0f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 13:29:30 +0000
Subject: [PATCH 009/128] scanservjs: 3.0.4 -> 3.1.0

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

diff --git a/pkgs/by-name/sc/scanservjs/package.nix b/pkgs/by-name/sc/scanservjs/package.nix
index c386bf6b3dca..ba1a8749514f 100644
--- a/pkgs/by-name/sc/scanservjs/package.nix
+++ b/pkgs/by-name/sc/scanservjs/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "scanservjs";
-  version = "3.0.4";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "sbs20";
     repo = "scanservjs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qCJyQO/hSDF4NOupV7sepwvpNyjSElnqT71LJuIKe+A=";
+    hash = "sha256-VfFahIyn2MIW4E0sMCpqdduP7F0U7t4a5c1fwpQl7Dc=";
   };
 
-  npmDepsHash = "sha256-HIWT09G8gqSFt9CIjsjJaDRnj2GO0G6JOGeI0p4/1vw=";
+  npmDepsHash = "sha256-VB4z7PCOUzhSbSbxLj/47oppMdTvd2lT7WZKDqd+jfo=";
 
   postInstall = ''
     mkdir $out/bin

From 47dd26e701ea5ec0a7f65ba785c9fdd3acbde5b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 16:59:23 +0000
Subject: [PATCH 010/128] pyprland: 3.4.0 -> 3.4.2

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

diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix
index 7763cd280118..e7aa394e31c1 100644
--- a/pkgs/by-name/py/pyprland/package.nix
+++ b/pkgs/by-name/py/pyprland/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyprland";
-  version = "3.4.0";
+  version = "3.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hyprland-community";
     repo = "pyprland";
     tag = finalAttrs.version;
-    hash = "sha256-e2BTHGmZrxRXC+Eu2TpNcEJB1txZDOi0gs/CsjZu9eY=";
+    hash = "sha256-Bu2UumLJay3Fvd2aXhqWGbxApCVSdJKo51NLy1AC/+0=";
   };
 
   build-system = [ python3Packages.hatchling ];

From e5ec5c94d82e20e3d798e97b6b844de91d63ecb9 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Tue, 2 Jun 2026 02:00:53 +0300
Subject: [PATCH 011/128] nixos/limine: fix fwupd-efi signing script under
 strict shell checks

The signing service builds `fwupd_efi` as a bash array but referenced
it as a scalar, tripping SC2128 (array expanded without index) and
SC2046 (unquoted command substitution). With enableStrictShellChecks
these are promoted to errors, breaking the unit-script build when
secureBoot, fwupd and strict shell checks are all enabled.

Loop over the array and sign every matched fwupd EFI binary, quoting
the basename and the -o argument. Indexing a single element would
silently skip any additional files the glob matches.

Assisted-by: claude-code with claude-opus-4-8[1m]-high
---
 nixos/modules/system/boot/loader/limine/limine.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix
index fd0ee9b2b36d..c9725a6fee00 100644
--- a/nixos/modules/system/boot/loader/limine/limine.nix
+++ b/nixos/modules/system/boot/loader/limine/limine.nix
@@ -503,7 +503,9 @@ in
 
         script = ''
           fwupd_efi=(${config.services.fwupd.package.fwupd-efi}/libexec/fwupd/efi/fwupd*.efi)
-          ${lib.getExe cfg.secureBoot.sbctl} sign -o /run/fwupd-efi/$(basename "$fwupd_efi").signed "$fwupd_efi"
+          for efi in "''${fwupd_efi[@]}"; do
+            ${lib.getExe cfg.secureBoot.sbctl} sign -o "/run/fwupd-efi/$(basename "$efi").signed" "$efi"
+          done
         '';
       };
 

From 91c1efbc6be4099fdbe91b6277f45343f9986027 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:18:11 +0700
Subject: [PATCH 012/128] python3Packages.assertpy: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/assertpy/default.nix b/pkgs/development/python-modules/assertpy/default.nix
index 186210157cad..cc07ebb17329 100644
--- a/pkgs/development/python-modules/assertpy/default.nix
+++ b/pkgs/development/python-modules/assertpy/default.nix
@@ -3,12 +3,13 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "assertpy";
   version = "1.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "assertpy";
@@ -17,6 +18,8 @@ buildPythonPackage rec {
     sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "assertpy" ];

From 5619d8fa8c4b49a6c9e07b42858621cadd65584e Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:21:07 +0700
Subject: [PATCH 013/128] python3Packages.assertpy: convert to finalAttrs

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

diff --git a/pkgs/development/python-modules/assertpy/default.nix b/pkgs/development/python-modules/assertpy/default.nix
index cc07ebb17329..1a8544f9da8c 100644
--- a/pkgs/development/python-modules/assertpy/default.nix
+++ b/pkgs/development/python-modules/assertpy/default.nix
@@ -6,7 +6,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "assertpy";
   version = "1.1";
   pyproject = true;
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "assertpy";
     repo = "assertpy";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f";
   };
 
@@ -30,4 +30,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From f91ee283e6e1c577058ac95f3b7ba205a9c39225 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:23:14 +0700
Subject: [PATCH 014/128] python3Packages.assertpy: use tag in src

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

diff --git a/pkgs/development/python-modules/assertpy/default.nix b/pkgs/development/python-modules/assertpy/default.nix
index 1a8544f9da8c..c884de4f1d3e 100644
--- a/pkgs/development/python-modules/assertpy/default.nix
+++ b/pkgs/development/python-modules/assertpy/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "assertpy";
     repo = "assertpy";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f";
   };
 

From e25bf712f95be9ae10bfe8d59e82145b9c03374b Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:25:20 +0700
Subject: [PATCH 015/128] python3Packages.assertpy: use SRI hash format

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

diff --git a/pkgs/development/python-modules/assertpy/default.nix b/pkgs/development/python-modules/assertpy/default.nix
index c884de4f1d3e..36c97919aea0 100644
--- a/pkgs/development/python-modules/assertpy/default.nix
+++ b/pkgs/development/python-modules/assertpy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: {
     owner = "assertpy";
     repo = "assertpy";
     tag = finalAttrs.version;
-    sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f";
+    hash = "sha256-TmDnwYvOQIpjwBpMCCn+qg68HnKc0qzVP9fjygqBzkI=";
   };
 
   build-system = [ setuptools ];

From 49666df29621383f45f3138a52ab612e388deb54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Thu, 4 Jun 2026 05:31:45 +0200
Subject: [PATCH 016/128] onnxruntime: use latest abseil-cpp

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

diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index 3a04c92bf309..1d1bb925d72f 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -3,7 +3,7 @@
   config,
   stdenv,
   fetchFromGitHub,
-  abseil-cpp_202508,
+  abseil-cpp,
   buildPackages,
   cmake,
   cpuinfo,
@@ -275,7 +275,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "ABSL_ENABLE_INSTALL" true)
     (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
     (lib.cmakeBool "FETCHCONTENT_QUIET" false)
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202508.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp.src}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DLPACK" "${dlpack-src}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FLATBUFFERS" "${flatbuffers_23.src}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MP11" "${mp11-src}")

From dd509002f831ac2fc63de4e78ac76be572642e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Thu, 4 Jun 2026 05:32:18 +0200
Subject: [PATCH 017/128] onnxruntime: simplify Nix expression

ncclSupport is already guarded with cudaSupport
---
 pkgs/by-name/on/onnxruntime/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index 1d1bb925d72f..527597381ede 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -138,8 +138,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     substituteInPlace cmake/libonnxruntime.pc.cmake.in \
       --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_
     echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake
-  ''
-  + ''
     substituteInPlace onnxruntime/core/platform/posix/env.cc --replace-fail \
       "return PathString{};" \
       "return PathString(\"$out/lib/\");"
@@ -289,7 +287,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.doCheck)
     (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf)
     (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
-    (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport))
+    (lib.cmakeBool "onnxruntime_USE_NCCL" ncclSupport)
     (lib.cmakeBool "onnxruntime_USE_MIGRAPHX" rocmSupport)
     (lib.cmakeBool "onnxruntime_USE_COREML" coremlSupport)
     (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8"))

From 108255da78127a5b8fb46b081cb889201d8b60ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 4 Jun 2026 20:11:26 +0200
Subject: [PATCH 018/128] home-assistant-custom-components.blueprints-updater:
 2.4.0 -> 2.7.2

Diff: https://github.com/luuquangvu/blueprints-updater/compare/2.4.0...2.7.2

Changelog: https://github.com/luuquangvu/blueprints-updater/releases/tag/2.7.2
---
 .../allow-symlinked-blueprints.diff             | 10 ++++------
 .../blueprints-updater/package.nix              | 17 +++++++++--------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/blueprints-updater/allow-symlinked-blueprints.diff b/pkgs/servers/home-assistant/custom-components/blueprints-updater/allow-symlinked-blueprints.diff
index 95705df6e413..39fc706c1957 100644
--- a/pkgs/servers/home-assistant/custom-components/blueprints-updater/allow-symlinked-blueprints.diff
+++ b/pkgs/servers/home-assistant/custom-components/blueprints-updater/allow-symlinked-blueprints.diff
@@ -1,12 +1,11 @@
 diff --git a/custom_components/blueprints_updater/coordinator.py b/custom_components/blueprints_updater/coordinator.py
-index 9cbbe32..92a5ab5 100644
+index 441b870..54551d1 100644
 --- a/custom_components/blueprints_updater/coordinator.py
 +++ b/custom_components/blueprints_updater/coordinator.py
-@@ -3234,21 +3234,6 @@ def scan_blueprints(
-                         continue
+@@ -3731,19 +3731,6 @@ def scan_blueprints(
  
                      full_path = os.path.join(root, file)
--                    real_full_path = os.path.realpath(full_path)
+                     real_full_path = os.path.realpath(full_path)
 -                    try:
 -                        if (
 -                            os.path.commonpath([real_full_path, real_blueprint_path])
@@ -20,7 +19,6 @@ index 9cbbe32..92a5ab5 100644
 -                    except (ValueError, OSError):
 -                        _LOGGER.warning("Skipping blueprint with invalid path: %s", full_path)
 -                        continue
--
+ 
                      if relative_path := get_blueprint_relative_path(hass, full_path):
                          try:
-                             with open(full_path, encoding="utf-8") as f:
diff --git a/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix b/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix
index f003f9aec3ee..e061bb578741 100644
--- a/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/blueprints-updater/package.nix
@@ -13,13 +13,13 @@
 buildHomeAssistantComponent rec {
   owner = "luuquangvu";
   domain = "blueprints_updater";
-  version = "2.4.0";
+  version = "2.7.2";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "blueprints-updater";
     tag = version;
-    hash = "sha256-O5HGjnj9fz+RrCq6sgdYlU1r9qFJhmUdfYWdFrwFngw=";
+    hash = "sha256-qWWb4n20wFiunvjYUFWXnze3kqYF4n2GCNy5Q34+7ao=";
   };
 
   patches = [
@@ -31,10 +31,12 @@ buildHomeAssistantComponent rec {
   postPatch = ''
     # avoid dependency on rather big pytest-timeout
     substituteInPlace pyproject.toml \
-      --replace-fail '"--timeout=60"' ""
+      --replace-fail '"--timeout=60",' ""
   '';
 
   dependencies = [
+    # Uncodumented, but otherwise the home-assistant helpers/httpx_client.py fails like:
+    # ImportError: Using http2=True, but the 'h2' package is not installed. Make sure to install httpx using `pip install httpx[http2]`.
     h2
   ];
 
@@ -46,12 +48,11 @@ buildHomeAssistantComponent rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
+  disabledTestPaths = [
     # pytest-homeassistant-custom-component tries to create temporary directories inside the nix store
-    "test_async_fetch_content_forum_invalid_json_sets_fetch_error"
-    "test_full_update_lifecycle"
-    "test_restore_blueprint_service"
-    "test_update_all_service"
+    "tests/integration/test_init.py::test_full_update_lifecycle"
+    "tests/integration/test_services.py::test_restore_blueprint_service"
+    "tests/integration/test_services.py::test_update_all_service"
   ];
 
   meta = {

From 64ce3caf8a53dcbfd982abbaeea09535e645bedb Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 3 Jun 2026 17:02:30 -0400
Subject: [PATCH 019/128] senpai: 0.4.1 -> 0.5.0

Changelog: https://git.sr.ht/~delthas/senpai/refs/v0.5.0
---
 pkgs/by-name/se/senpai/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/senpai/package.nix b/pkgs/by-name/se/senpai/package.nix
index 7cc748e0bf8a..9b93926a43f1 100644
--- a/pkgs/by-name/se/senpai/package.nix
+++ b/pkgs/by-name/se/senpai/package.nix
@@ -5,25 +5,30 @@
   installShellFiles,
   scdoc,
   nix-update-script,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "senpai";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromSourcehut {
     owner = "~delthas";
     repo = "senpai";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-lwfhRnaHGOIp6NyugPEu6P+3WXkVgQEWaz7DUfHiJrQ=";
+    sha256 = "sha256-VjXgKdy4IpBhAP6uw/NtlexPki7nJzQi/HuY/+5lE/o=";
   };
 
-  vendorHash = "sha256-6glslBPjJr0TmrAkDGbOQ4sDzvODlavVeTugs6RXsCU=";
+  vendorHash = "sha256-4Ax9YVa9z1Unk3Z2iy9ZEqKjNmdgK0aF4GrD9ucXtjk=";
 
   subPackages = [
     "cmd/senpai"
   ];
 
+  ldflags = [
+    "-X git.sr.ht/~delthas/senpai.version=${finalAttrs.version}"
+  ];
+
   nativeBuildInputs = [
     scdoc
     installShellFiles
@@ -39,6 +44,9 @@ buildGoModule (finalAttrs: {
     install -D -m 444 res/icon.svg $out/share/icons/hicolor/scalable/apps/senpai.svg
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From b8e7c176d2e392405a1973388b63673d67e2dbc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 5 Jun 2026 14:10:10 +0200
Subject: [PATCH 020/128] python314Packages.mocket: align dependencies with
 upstream

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

diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index 48cec8423dfa..44a129ee6c9e 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -11,6 +11,7 @@
   decorator,
   h11,
   puremagic,
+  typing-extensions,
   urllib3,
 
   # optional-dependencies
@@ -50,6 +51,7 @@ buildPythonPackage rec {
     decorator
     h11
     puremagic
+    typing-extensions
     urllib3
   ];
 

From 6b6c73f946caace6e7c61e6f17a2028ffdf40b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 27 May 2026 01:25:46 +0200
Subject: [PATCH 021/128] python314Packages.pyacoustid: 1.3.0 -> 1.3.1,
 cleanup, modernise

---
 .../python-modules/pyacoustid/default.nix     | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix
index 80a06edc804e..aa9455e70c2b 100644
--- a/pkgs/development/python-modules/pyacoustid/default.nix
+++ b/pkgs/development/python-modules/pyacoustid/default.nix
@@ -1,42 +1,51 @@
 {
   lib,
-  buildPythonPackage,
-  fetchPypi,
-  requests,
   audioread,
+  buildPythonPackage,
+  fetchFromGitHub,
   pkgs,
+  poetry-core,
+  pytestCheckHook,
+  requests,
+  stdenv,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyacoustid";
-  version = "1.3.0";
-  format = "setuptools";
+  version = "1.3.1";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-X09IcZHBnruQgnCxt7UpfxMtozKxVouWqRRXTAee0Xc=";
+  src = fetchFromGitHub {
+    owner = "beetbox";
+    repo = "pyacoustid";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7bL1g7Zvzc+Re0zSjsEqFsNzgkgwh+onoS4sQk0t55o=";
   };
 
-  propagatedBuildInputs = [
-    requests
-    audioread
-  ];
-
   postPatch = ''
-    sed -i \
-        -e '/^FPCALC_COMMAND *=/s|=.*|= "${pkgs.chromaprint}/bin/fpcalc"|' \
-        acoustid.py
+    substituteInPlace chromaprint.py \
+      --replace "ctypes.CDLL(name" 'ctypes.CDLL("${lib.getLib pkgs.chromaprint}/lib/libchromaprint${stdenv.hostPlatform.extensions.sharedLibrary}"'
   '';
 
-  # package has no tests
-  doCheck = false;
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    audioread
+    requests
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "acoustid" ];
 
   meta = {
-    description = "Bindings for Chromaprint acoustic fingerprinting";
-    homepage = "https://github.com/sampsyo/pyacoustid";
+    description = "Bindings for Chromaprint acoustic fingerprinting and the Acoustid Web service";
+    homepage = "https://github.com/beetbox/pyacoustid";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From 387d7f40cc6fd6d89eba4ae56504984fe9a07c92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 5 Jun 2026 16:52:44 +0000
Subject: [PATCH 022/128] deno: 2.8.0 -> 2.8.2

---
 pkgs/by-name/de/deno/package.nix          | 6 +++---
 pkgs/by-name/de/deno/rusty-v8/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index a87145cb0ca0..094428943ecc 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -32,17 +32,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deno";
-  version = "2.8.0";
+  version = "2.8.2";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true; # required for tests
-    hash = "sha256-gcDQ2nkiLtnOJCneiHAWwvYxHUwQ/2n2lsmWAMgf/yc=";
+    hash = "sha256-WtACDLrC1c7KxkoQgYrNavykkm8+tZmF46UU1YrLwVs=";
   };
 
-  cargoHash = "sha256-1vHgkLWqwTt3tO4qSkfqwCj5KMfKCT3kscChf2FrkH8=";
+  cargoHash = "sha256-Og+owcfHfdFJ08Xtiye2IEvKWd2Q/7f7QzQ/898IOcQ=";
 
   patches = [
     ./patches/0002-tests-replace-hardcoded-paths.patch
diff --git a/pkgs/by-name/de/deno/rusty-v8/default.nix b/pkgs/by-name/de/deno/rusty-v8/default.nix
index ab09655bac5f..b9865c673fa4 100644
--- a/pkgs/by-name/de/deno/rusty-v8/default.nix
+++ b/pkgs/by-name/de/deno/rusty-v8/default.nix
@@ -70,14 +70,14 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rusty-v8";
-  version = "149.0.0";
+  version = "149.2.0";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "rusty_v8";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-OdVz8d8hkBhXZnX9vKV51rlHAYN2PbVycmqrDWNLV5M=";
+    hash = "sha256-OAwfrSU1bu80+qcseUHtScVLZCTe9mY3NEfq0+hmVMg=";
   };
 
   patches = [
@@ -89,7 +89,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch
   ];
 
-  cargoHash = "sha256-uj1B3lkgbZG5emJgfsilJXdHbqg0JNAywaSVLe/LbWk=";
+  cargoHash = "sha256-dkuvWJaDPmsU25f3UGifWl2GvYku6+7Htk9tm5JVpLU=";
 
   nativeBuildInputs = [
     llvmPackages.clang

From 6f64e7b1aa9a5a7fd1f61b7dfeed508c1b71b741 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:14:10 +0700
Subject: [PATCH 023/128] python3Packages.base36: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/base36/default.nix b/pkgs/development/python-modules/base36/default.nix
index e1fd894a2922..ff9d22aa24ea 100644
--- a/pkgs/development/python-modules/base36/default.nix
+++ b/pkgs/development/python-modules/base36/default.nix
@@ -2,13 +2,14 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "base36";
   version = "0.1.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tonyseek";
@@ -17,6 +18,8 @@ buildPythonPackage rec {
     sha256 = "076nmk9s0zkmgs2zqzkaqij5cmzhf4mrhivbb9n6cvz52i1mppr5";
   };
 
+  build-system = [ setuptools ];
+
   postPatch = ''
     substituteInPlace setup.cfg \
       --replace "[pytest]" "[tool:pytest]" \

From 5c3201bd2940482a29e7c90edbb3cdaf1b05dbb5 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:18:43 +0700
Subject: [PATCH 024/128] python3Packages.base36: modernize

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

diff --git a/pkgs/development/python-modules/base36/default.nix b/pkgs/development/python-modules/base36/default.nix
index ff9d22aa24ea..429938a554e7 100644
--- a/pkgs/development/python-modules/base36/default.nix
+++ b/pkgs/development/python-modules/base36/default.nix
@@ -6,24 +6,26 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "base36";
   version = "0.1.1";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "tonyseek";
     repo = "python-base36";
-    rev = "v${version}";
-    sha256 = "076nmk9s0zkmgs2zqzkaqij5cmzhf4mrhivbb9n6cvz52i1mppr5";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Jd9bQxTlb2ZsWmtHmCtx8FdWZMRqfvyFfnV+oNOs1hw=";
   };
 
   build-system = [ setuptools ];
 
   postPatch = ''
     substituteInPlace setup.cfg \
-      --replace "[pytest]" "[tool:pytest]" \
-      --replace "--pep8 --cov" ""
+      --replace-fail "[pytest]" "[tool:pytest]" \
+      --replace-fail "--pep8 --cov" ""
   '';
 
   nativeCheckInputs = [ pytestCheckHook ];
@@ -37,4 +39,4 @@ buildPythonPackage rec {
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 45022f33df1d39ade109cd9998825fcae89cd6fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 5 Jun 2026 18:42:11 +0000
Subject: [PATCH 025/128] warp-terminal: 0.2026.04.15.08.45.stable_04 ->
 0.2026.06.03.09.49.stable_01

---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index c9b66f380fbc..ccc8f6fc3ee8 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-Mff9jfrWQJ2YovS+yW7/NhwGDGASIvUFEAaH04YF6rw=",
-    "version": "0.2026.04.15.08.45.stable_04"
+    "hash": "sha256-vJE22Nn9GXfNZcdvwH74X28nhLrxESoAX8XtxzDSBmI=",
+    "version": "0.2026.06.03.09.49.stable_01"
   },
   "linux_x86_64": {
-    "hash": "sha256-tGhC+pjPQTTd5XTKwQJ/ctnLcQY6lvvI6zRjXByon5g=",
-    "version": "0.2026.04.15.08.45.stable_04"
+    "hash": "sha256-dVBJ9L+e8B4WlVuMPWb0nDRdDkx8+eydbiAiJUm/OQg=",
+    "version": "0.2026.06.03.09.49.stable_01"
   },
   "linux_aarch64": {
-    "hash": "sha256-U7gctUpWhJP2hfF62I7wh/cdE9ixVEVnKd6B1dOoLfc=",
-    "version": "0.2026.04.15.08.45.stable_04"
+    "hash": "sha256-llYMjRqZAlpbhzQTjndW7cgcEnGvdtcaP8bPmrP8HVo=",
+    "version": "0.2026.06.03.09.49.stable_01"
   }
 }

From 179fb98a04529f56fc9d0c3fffdbe47f0de24682 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 02:20:49 +0700
Subject: [PATCH 026/128] python3Packages.betamax-serializers: migrate to
 pyproject

---
 .../python-modules/betamax-serializers/default.nix           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix
index 0f3217269062..2a56ddf99fd5 100644
--- a/pkgs/development/python-modules/betamax-serializers/default.nix
+++ b/pkgs/development/python-modules/betamax-serializers/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   betamax,
   pyyaml,
 }:
@@ -9,13 +10,15 @@
 buildPythonPackage rec {
   pname = "betamax-serializers";
   version = "0.2.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0ja9isbjmzzhxdj69s0kdsvw8nkp073w6an6a4liy5vk3fdl2p1l";
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [
     betamax
     pyyaml

From f2ea04cffb4ef561edc847576421597396cc3798 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 02:22:38 +0700
Subject: [PATCH 027/128] python3Packages.betamax-serializers: modernize

---
 .../python-modules/betamax-serializers/default.nix   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix
index 2a56ddf99fd5..1935df0d69c8 100644
--- a/pkgs/development/python-modules/betamax-serializers/default.nix
+++ b/pkgs/development/python-modules/betamax-serializers/default.nix
@@ -7,14 +7,16 @@
   pyyaml,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "betamax-serializers";
   version = "0.2.1";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "0ja9isbjmzzhxdj69s0kdsvw8nkp073w6an6a4liy5vk3fdl2p1l";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-NFxBmxtzFx8pUcYqw8cBd1rEt24T6GRk6/D/KpeOSUk=";
   };
 
   build-system = [ setuptools ];
@@ -24,9 +26,11 @@ buildPythonPackage rec {
     pyyaml
   ];
 
+  pythonImportsCheck = [ "betamax_serializers" ];
+
   meta = {
     homepage = "https://gitlab.com/betamax/serializers";
     description = "Set of third-party serializers for Betamax";
     license = lib.licenses.asl20;
   };
-}
+})

From 9d3d755e8ed372991c373ac185487df09b7d6469 Mon Sep 17 00:00:00 2001
From: Elliot Berman <eberman@anduril.com>
Date: Fri, 5 Jun 2026 13:32:52 -0700
Subject: [PATCH 028/128] cudaPackages.tensorrt: Add TensorRT 10.16.1 manifest

---
 .../manifests/tensorrt/redistrib_10.16.1.json | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.16.1.json

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.16.1.json b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.16.1.json
new file mode 100644
index 000000000000..4421c6f9d2bf
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.16.1.json
@@ -0,0 +1,37 @@
+
+{
+    "release_date": "2026-04-07",
+    "release_label": "10.16.1",
+    "release_product": "tensorrt",
+    "tensorrt": {
+        "name": "NVIDIA TensorRT",
+        "license": "TensorRT",
+        "version": "10.16.1.11",
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+          "cuda13": {
+            "md5": "141f8346668152f5ae31b13d1280066d",
+            "relative_path": "tensorrt/10.16.1/tars/TensorRT-10.16.1.11.Linux.aarch64-gnu.cuda-13.2.tar.gz",
+            "sha256": "63ecfb16d2df932cc5c3f2a362ae6281919f565c5ca3a5e1299c95780e165c91",
+            "size": "5617960358"
+          }
+        },
+        "linux-x86_64": {
+          "cuda12": {
+            "md5": "df43a636866bc933c4794383ae9fd7bd",
+            "relative_path": "tensorrt/10.16.1/tars/TensorRT-10.16.1.11.Linux.x86_64-gnu.cuda-12.9.tar.gz",
+            "sha256": "48e64fc9231fe3aeaa18be13385b486ea7c7131dd64f09b54e5fcb051386f014",
+            "size": "8546982998"
+          },
+          "cuda13": {
+            "md5": "523a08f532cb88cad8384793df555221",
+            "relative_path": "tensorrt/10.16.1/tars/TensorRT-10.16.1.11.Linux.x86_64-gnu.cuda-13.2.tar.gz",
+            "sha256": "08334948c57c3bcf2de171ef4bd53d15f48a61a942b048abea12e32f892284e8",
+            "size": "7568035730"
+          }
+        }
+    }
+}

From 5bb67e892a77f1a4789e9d9a163a28289ba20eb6 Mon Sep 17 00:00:00 2001
From: Elliot Berman <eberman@anduril.com>
Date: Fri, 5 Jun 2026 13:33:21 -0700
Subject: [PATCH 029/128] cudaPackages.tensorrt-samples: Add support for
 10.16.1

---
 .../cuda-modules/packages/tensorrt-samples/package.nix        | 4 ++++
 .../cuda-modules/packages/tensorrt-samples/passthru.nix       | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/package.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/package.nix
index 174831cb5ff9..f292e0ffc3de 100644
--- a/pkgs/development/cuda-modules/packages/tensorrt-samples/package.nix
+++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/package.nix
@@ -117,6 +117,10 @@ backendStdenv.mkDerivation (finalAttrs: {
         tag = "v10.14";
         hash = "sha256-pWvXpXiUriLDYHqro3HWAmO/9wbGznyUrc9qxq/t0/U=";
       };
+      "10.16.1" = {
+        tag = "v10.16";
+        hash = "sha256-Wm5oOXxAIpIlwiJKhH0WjgUAuTB9H2xFEVpM/sO36qk=";
+      };
     }
   );
 
diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix
index a91317465ced..8b2eea89ebd1 100644
--- a/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix
+++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix
@@ -27,6 +27,7 @@ in
       else
         lib.getAttr finalAttrs.version {
           "10.14.1" = sample-data_10_14_1;
+          "10.16.1" = sample-data_10_14_1; # Release 10.16 is missing sample data
         }
     );
 

From 6fe092add31ac9a4a208325a2b927c4bd6859cfe Mon Sep 17 00:00:00 2001
From: amusingimpala75 <69653100+amusingimpala75@users.noreply.github.com>
Date: Fri, 5 Jun 2026 13:58:18 -0700
Subject: [PATCH 030/128] angle: fix pkg-config path string interpolation

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

diff --git a/pkgs/by-name/an/angle/package.nix b/pkgs/by-name/an/angle/package.nix
index a7920e4b0e94..ea19de2455bc 100644
--- a/pkgs/by-name/an/angle/package.nix
+++ b/pkgs/by-name/an/angle/package.nix
@@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     mkdir -p $out/lib/pkgconfig
 
-    cat > $out/lib/pkgconfig/angle.pc <<EOF
+    cat > $out/lib/pkgconfig/angle.pc <<'EOF'
     prefix=${placeholder "out"}
     exec_prefix=''${prefix}
     libdir=''${prefix}/lib

From ac3ddf45f6cd470a5b95fcdf0be95a0b81931d97 Mon Sep 17 00:00:00 2001
From: amusingimpala75 <69653100+amusingimpala75@users.noreply.github.com>
Date: Fri, 5 Jun 2026 13:59:31 -0700
Subject: [PATCH 031/128] angle: fix dylib path names on darwin

---
 pkgs/by-name/an/angle/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/an/angle/package.nix b/pkgs/by-name/an/angle/package.nix
index ea19de2455bc..92913aa506a0 100644
--- a/pkgs/by-name/an/angle/package.nix
+++ b/pkgs/by-name/an/angle/package.nix
@@ -17,6 +17,7 @@
   pciutils,
   libGL,
   apple-sdk_15,
+  fixDarwinDylibNames,
   xcbuild,
 }:
 let
@@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     llvmPackages.bintools
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
     xcbuild
   ];
 
@@ -100,6 +102,8 @@ stdenv.mkDerivation (finalAttrs: {
     "treat_warnings_as_errors=false"
   ];
 
+  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";
+
   patches = [
     # https://issues.chromium.org/issues/432275627
     # https://chromium-review.googlesource.com/c/chromium/src/+/6761936/2/build/config/compiler/BUILD.gn
@@ -175,6 +179,13 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool \
+        -change ./libGLESv2.dylib \
+        $out/lib/libGLESv2.dylib \
+        $out/lib/libGLESv1_CM.dylib
+  '';
+
   meta = {
     description = "Conformant OpenGL ES implementation for Windows, Mac, Linux, iOS and Android";
     longDescription = ''

From 627d6e94ebb2301a00d6df8e722057c0a332ef23 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 08:48:45 +0700
Subject: [PATCH 032/128] python3Packages.bond-async: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/bond-async/default.nix b/pkgs/development/python-modules/bond-async/default.nix
index 2cffcd53fffa..1a1c96906c37 100644
--- a/pkgs/development/python-modules/bond-async/default.nix
+++ b/pkgs/development/python-modules/bond-async/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   aiohttp,
   aioresponses,
   orjson,
@@ -13,7 +14,7 @@ buildPythonPackage rec {
   pname = "bond-async";
   version = "0.2.1";
 
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bondhome";
@@ -22,7 +23,9 @@ buildPythonPackage rec {
     hash = "sha256-YRJHUOYFLf4dtQGIFKHLdUQxWTnZzG1MPirMsGvDor8=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
     orjson
   ];

From 51a011b824a9865ffe9990a015eb0e4033a1e78d Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 08:52:04 +0700
Subject: [PATCH 033/128] python3Packages.bond-async: modernize

---
 pkgs/development/python-modules/bond-async/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/bond-async/default.nix b/pkgs/development/python-modules/bond-async/default.nix
index 1a1c96906c37..800f8ac7b725 100644
--- a/pkgs/development/python-modules/bond-async/default.nix
+++ b/pkgs/development/python-modules/bond-async/default.nix
@@ -10,16 +10,18 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bond-async";
   version = "0.2.1";
 
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "bondhome";
     repo = "bond-async";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-YRJHUOYFLf4dtQGIFKHLdUQxWTnZzG1MPirMsGvDor8=";
   };
 
@@ -41,8 +43,8 @@ buildPythonPackage rec {
   meta = {
     description = "Asynchronous Python wrapper library over Bond Local API";
     homepage = "https://github.com/bondhome/bond-async";
-    changelog = "https://github.com/bondhome/bond-async/releases/tag/v${version}";
+    changelog = "https://github.com/bondhome/bond-async/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})

From a985feb1605048c7390bf7cb179f78e01fdae772 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Jun 2026 07:33:46 +0000
Subject: [PATCH 034/128] vscode: 1.122.1 -> 1.123.0

---
 pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index d3685fdf55f0..f4cd51574768 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -35,17 +35,17 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-t26YN3E5XaSJ7gki8nm06hVh4ZvXDEU77M749ZrqfAo=";
-      x86_64-darwin = "sha256-jOnwhiDJmU+EqU30wg1+frqDDxJgfngETx414i2YTIg=";
-      aarch64-linux = "sha256-8sYanI12qDMPgVG7S0QKLEkU0i/SICkJ5wz/OwhP+i4=";
-      aarch64-darwin = "sha256-oXeZZWAvpUn5KItEOR8yX9iQ0Fp6EzXGux0jvYbZqtU=";
-      armv7l-linux = "sha256-16cUu1C389edf0aHxXxTLJwjxmpHxM8mv1YFnPDLgP4=";
+      x86_64-linux = "sha256-L975R3F779LgaFTL4B6ZtImPd1LyXhImnDgCPmO5PI8=";
+      x86_64-darwin = "sha256-Sygw/VkIiyV+iABylgFpTiHs0f5dS6NYPWSm5BNh9tQ=";
+      aarch64-linux = "sha256-jcFC668WKAjlYju33RI6poAKnhm3fL1hO16alUwjwv4=";
+      aarch64-darwin = "sha256-AY6WeDzGEH5zXRosN1H/osxC3e5j0Hs9s2Ys2xe1UxI=";
+      armv7l-linux = "sha256-LqofnnZid/I0lVTyhC7yHD+Fxz4dSBxKJ8n+lp2uucQ=";
     }
     .${system} or throwSystem;
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.122.1";
+  version = "1.123.0";
 
   # The update server (update.code.visualstudio.com) expects the version path
   # segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
@@ -53,7 +53,7 @@ let
   downloadVersion = lib.versions.pad 3 version;
 
   # This is used for VS Code - Remote SSH test
-  rev = "8761a5560cfd65fdd19ce7e2bd18dab5c0a4d84e";
+  rev = "6a44c352bd24569c417e530095901b649960f9f8";
 in
 buildVscode {
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -86,7 +86,7 @@ buildVscode {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-7n8KvIYEDYO8qqJjfbuUsgUwCxq9FJ6i/EuDBd1HQDk=";
+      hash = "sha256-i034bIsaPlxlVFNY5cKf/ftWPy17SFokbFUMa+zeLng=";
     };
     stdenv = stdenvNoCC;
   };

From a7d3347c5b9e57783c8ec08a9d6a13f21a98d5e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Jun 2026 07:51:49 +0000
Subject: [PATCH 035/128] kubernetes-helmPlugins.helm-diff: 3.15.7 -> 3.15.8

---
 .../networking/cluster/helm/plugins/helm-diff.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
index 176772bf67c4..b12a71003953 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "helm-diff";
-  version = "3.15.7";
+  version = "3.15.8";
 
   src = fetchFromGitHub {
     owner = "databus23";
     repo = "helm-diff";
     rev = "v${version}";
-    hash = "sha256-RCtWxK1Ex1U+emtulXeAT9Jz9bGIiq/yEsZ+JxqmK3g=";
+    hash = "sha256-rH5EgSrL6yBmLd8m5QhEe3VTv8NVmyO5AC++7QQw/wI=";
   };
 
-  vendorHash = "sha256-suNOXXmwDo3rxICijnEvwYNqN50lukm1kI0tJgqs3ko=";
+  vendorHash = "sha256-wBGHhjVNqA7SAueg9xowqxcCda8HzggepmOprsKPnjo=";
 
   ldflags = [
     "-s"

From 9d010c79c3c2ae076eb5cd32e51cd797c201c79c Mon Sep 17 00:00:00 2001
From: Yuxuan Shui <yshuiv7@gmail.com>
Date: Sat, 6 Jun 2026 15:03:30 +0100
Subject: [PATCH 036/128] scx.rustscheds: aarch64-linux is good

---
 pkgs/os-specific/linux/scx/scx_rustscheds.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
index 42d8e672d7e0..809277cd53d1 100644
--- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
@@ -114,7 +114,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/sched-ext/scx/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
-    badPlatforms = [ "aarch64-linux" ];
     maintainers = with lib.maintainers; [
       johnrtitor
       Gliczy

From f6cb12e27ac3c96c93e3717b79f085c7b52ba2d6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 7 Jun 2026 01:00:44 +0200
Subject: [PATCH 037/128] python3Packages.triton-bin: enable __structuredAttrs

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

diff --git a/pkgs/development/python-modules/triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix
index b78e4fd38707..3e0af134cc1e 100644
--- a/pkgs/development/python-modules/triton/bin.nix
+++ b/pkgs/development/python-modules/triton/bin.nix
@@ -13,6 +13,7 @@ buildPythonPackage (finalAttrs: {
   pname = "triton";
   version = "3.6.0";
   format = "wheel";
+  __structuredAttrs = true;
 
   src =
     let

From f638d22564c554b02fab46480f509d396b1d12bb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 29 May 2026 09:31:25 +0000
Subject: [PATCH 038/128] python3Packages.apex: fix CUDA capabilities selection
 in setup.py

---
 .../python-modules/apex/default.nix           |   5 +
 .../fix-cuda-capabilities-selection.patch     | 164 ++++++++++++++++++
 2 files changed, 169 insertions(+)
 create mode 100644 pkgs/development/python-modules/apex/fix-cuda-capabilities-selection.patch

diff --git a/pkgs/development/python-modules/apex/default.nix b/pkgs/development/python-modules/apex/default.nix
index 6524afed8197..57c4c1fe2316 100644
--- a/pkgs/development/python-modules/apex/default.nix
+++ b/pkgs/development/python-modules/apex/default.nix
@@ -49,6 +49,11 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
     # Fix incompatibility with more recent versions of cudnn to de-vendor it:
     #   error: ‘throw_if’ is not a member of ‘cudnn_frontend’
     ./fix-cudnn-frontend-compat.patch
+
+    # By default apex's setup.py will taget all capabilities instead of using TORCH_CUDA_ARCH_LIST
+    # This result in the build failing on recent versions of CUDA.
+    # Instead, use TORCH_CUDA_ARCH_LIST as the source of truth for selecting capabilities
+    ./fix-cuda-capabilities-selection.patch
   ];
 
   # Don't use git submodules for cuda dependencies
diff --git a/pkgs/development/python-modules/apex/fix-cuda-capabilities-selection.patch b/pkgs/development/python-modules/apex/fix-cuda-capabilities-selection.patch
new file mode 100644
index 000000000000..84fa82194bcc
--- /dev/null
+++ b/pkgs/development/python-modules/apex/fix-cuda-capabilities-selection.patch
@@ -0,0 +1,164 @@
+diff --git a/setup.py b/setup.py
+index fa61b72..c31d1e0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -405,24 +405,8 @@ if has_flag("--cuda_ext", "APEX_CUDA_EXT"):
+     )
+ 
+     if bare_metal_version >= Version("11.0"):
+-
+-        cc_flag = []
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_70,code=sm_70")
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_80,code=sm_80")
+-        if bare_metal_version >= Version("11.1"):
+-            cc_flag.append("-gencode")
+-            cc_flag.append("arch=compute_86,code=sm_86")
+-        if bare_metal_version >= Version("11.8"):
+-            cc_flag.append("-gencode")
+-            cc_flag.append("arch=compute_90,code=sm_90")
+-        if bare_metal_version >= Version("12.8"):
+-            cc_flag.append("-gencode")
+-            cc_flag.append("arch=compute_100,code=sm_100")
+-            cc_flag.append("-gencode")
+-            cc_flag.append("arch=compute_120,code=sm_120")
+-
++        # Architectures are selected via TORCH_CUDA_ARCH_LIST (torch appends the
++        # matching -gencode flags) instead of a hard-coded list.
+         ext_modules.append(
+             CUDAExtension(
+                 name="fused_weight_gradient_mlp_cuda",
+@@ -441,7 +425,7 @@ if has_flag("--cuda_ext", "APEX_CUDA_EXT"):
+                         "--expt-relaxed-constexpr",
+                         "--expt-extended-lambda",
+                         "--use_fast_math",
+-                    ] + version_dependent_macros + cc_flag,
++                    ] + version_dependent_macros,
+                 },
+             )
+         )
+@@ -530,14 +514,7 @@ if has_flag("--group_norm", "APEX_GROUP_NORM"):
+         sys.argv.remove("--group_norm")
+     raise_if_cuda_home_none("--group_norm")
+ 
+-    # CUDA group norm supports from SM70
+-    arch_flags = []
+-    # FIXME: this needs to be done more cleanly
+-    for arch in [70, 75, 80, 86, 90, 100, 120]:
+-        arch_flag = f"-gencode=arch=compute_{arch},code=sm_{arch}"
+-        arch_flags.append(arch_flag)
+-    arch_flags.append(arch_flag)
+-
++    # Architectures are selected via TORCH_CUDA_ARCH_LIST instead of a hard-coded list.
+     ext_modules.append(
+         CUDAExtension(
+             name="group_norm_cuda",
+@@ -549,7 +526,7 @@ if has_flag("--group_norm", "APEX_GROUP_NORM"):
+                 "cxx": ["-O3", "-std=c++17"] + version_dependent_macros,
+                 "nvcc": [
+                     "-O3", "-std=c++17", "--use_fast_math", "--ftz=false",
+-                ] + arch_flags + version_dependent_macros,
++                ] + version_dependent_macros,
+             },
+         )
+     )
+@@ -651,22 +628,7 @@ if has_flag("--fast_layer_norm", "APEX_FAST_LAYER_NORM"):
+         sys.argv.remove("--fast_layer_norm")
+     raise_if_cuda_home_none("--fast_layer_norm")
+ 
+-    cc_flag = []
+-    cc_flag.append("-gencode")
+-    cc_flag.append("arch=compute_70,code=sm_70")
+-
+-    if bare_metal_version >= Version("11.0"):
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_80,code=sm_80")
+-    if bare_metal_version >= Version("11.8"):
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_90,code=sm_90")
+-    if bare_metal_version >= Version("12.8"):
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_100,code=sm_100")
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_120,code=sm_120")
+-
++    # Architectures are selected via TORCH_CUDA_ARCH_LIST instead of a hard-coded list.
+     ext_modules.append(
+         CUDAExtension(
+             name="fast_layer_norm",
+@@ -689,7 +651,7 @@ if has_flag("--fast_layer_norm", "APEX_FAST_LAYER_NORM"):
+                     "--expt-relaxed-constexpr",
+                     "--expt-extended-lambda",
+                     "--use_fast_math",
+-                ] + version_dependent_macros + generator_flag + cc_flag,
++                ] + version_dependent_macros + generator_flag,
+             },
+             include_dirs=[os.path.join(this_dir, "apex/contrib/csrc/layer_norm")],
+         )
+@@ -703,17 +665,18 @@ if has_flag("--fmha", "APEX_FMHA"):
+     if bare_metal_version < Version("11.0"):
+         raise RuntimeError("--fmha only supported on sm_80 and sm_90 GPUs")
+ 
++    # The fmha kernels use sm_80 MMA instructions, so select architectures from
++    # TORCH_CUDA_ARCH_LIST but drop anything below 8.0 (torch would otherwise also
++    # try to build the unsupported sm_75 target).
+     cc_flag = []
+-    cc_flag.append("-gencode")
+-    cc_flag.append("arch=compute_80,code=sm_80")
+-    if bare_metal_version >= Version("11.8"):
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_90,code=sm_90")
+-    if bare_metal_version >= Version("12.8"):
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_100,code=sm_100")
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_120,code=sm_120")
++    for arch in os.environ["TORCH_CUDA_ARCH_LIST"].replace(" ", ";").split(";"):
++        capability = arch.removesuffix("+PTX")
++        if not capability or Version(capability) < Version("8.0"):
++            continue
++        num = capability.replace(".", "")
++        cc_flag += ["-gencode", f"arch=compute_{num},code=sm_{num}"]
++        if arch.endswith("+PTX"):
++            cc_flag += ["-gencode", f"arch=compute_{num},code=compute_{num}"]
+ 
+     ext_modules.append(
+         CUDAExtension(
+@@ -755,25 +718,7 @@ if has_flag("--fast_multihead_attn", "APEX_FAST_MULTIHEAD_ATTN"):
+         sys.argv.remove("--fast_multihead_attn")
+     raise_if_cuda_home_none("--fast_multihead_attn")
+ 
+-    cc_flag = []
+-    cc_flag.append("-gencode")
+-    cc_flag.append("arch=compute_70,code=sm_70")
+-
+-    if bare_metal_version >= Version("11.0"):
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_80,code=sm_80")
+-    if bare_metal_version >= Version("11.1"):
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_86,code=sm_86")
+-    if bare_metal_version >= Version("11.8"):
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_90,code=sm_90")
+-    if bare_metal_version >= Version("12.8"):
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_100,code=sm_100")
+-        cc_flag.append("-gencode")
+-        cc_flag.append("arch=compute_120,code=sm_120")
+-
++    # Architectures are selected via TORCH_CUDA_ARCH_LIST instead of a hard-coded list.
+     subprocess.run(["git", "submodule", "update", "--init", "apex/contrib/csrc/multihead_attn/cutlass"])
+     ext_modules.append(
+         CUDAExtension(
+@@ -800,8 +745,7 @@ if has_flag("--fast_multihead_attn", "APEX_FAST_MULTIHEAD_ATTN"):
+                     "--use_fast_math",
+                 ]
+                 + version_dependent_macros
+-                + generator_flag
+-                + cc_flag,
++                + generator_flag,
+             },
+             include_dirs=[
+                 os.path.join(this_dir, "apex/contrib/csrc/multihead_attn/cutlass/include/"),

From 477cd352f0e48956cf8435b8151f6804781f2791 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 6 Jun 2026 22:00:50 +0000
Subject: [PATCH 039/128] python3Packages.apex: add missing ninja build
 dependency

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

diff --git a/pkgs/development/python-modules/apex/default.nix b/pkgs/development/python-modules/apex/default.nix
index 57c4c1fe2316..cabaffcd23a3 100644
--- a/pkgs/development/python-modules/apex/default.nix
+++ b/pkgs/development/python-modules/apex/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
 
   # build-system
+  ninja,
   setuptools,
   torch,
 
@@ -92,6 +93,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
   '';
 
   build-system = [
+    ninja
     setuptools
     torch
   ];

From 68b325de92b55b9c7c9ae392d25bccc442b0df98 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 6 Jun 2026 22:02:00 +0000
Subject: [PATCH 040/128] python3Packages.apex: rename local lerp to avoid
 ambiguity with std::lerp

---
 .../python-modules/apex/default.nix           | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/apex/default.nix b/pkgs/development/python-modules/apex/default.nix
index cabaffcd23a3..75dc021a58f1 100644
--- a/pkgs/development/python-modules/apex/default.nix
+++ b/pkgs/development/python-modules/apex/default.nix
@@ -57,16 +57,25 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
     ./fix-cuda-capabilities-selection.patch
   ];
 
-  # Don't use git submodules for cuda dependencies
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail \
-        'subprocess.run(["git", "submodule", "update", "--init", "apex/contrib/csrc/multihead_attn/cutlass"])' \
-        "" \
-      --replace-fail \
-        'subprocess.run(["git", "submodule", "update", "--init", "apex/contrib/csrc/cudnn-frontend/"])' \
-        ""
-  '';
+  postPatch =
+    # Don't use git submodules for cuda dependencies
+    ''
+      substituteInPlace setup.py \
+        --replace-fail \
+          'subprocess.run(["git", "submodule", "update", "--init", "apex/contrib/csrc/multihead_attn/cutlass"])' \
+          "" \
+        --replace-fail \
+          'subprocess.run(["git", "submodule", "update", "--init", "apex/contrib/csrc/cudnn-frontend/"])' \
+          ""
+    ''
+    # Disambiguate apex's local `lerp` from `std::lerp`, which is now reachable through ATen/torch
+    # headers with CUDA 13's C++20 standard and gcc 15's <cmath>.
+    + ''
+      substituteInPlace apex/contrib/csrc/optimizers/multi_tensor_distopt_adam_kernel.cu \
+        --replace-fail \
+          "lerp(" \
+          "apex_lerp("
+    '';
 
   env = {
     APEX_CPP_EXT = 1;

From f012a712b4576d41bccf8b4a791f581f7fd4c347 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 7 Jun 2026 01:01:10 +0200
Subject: [PATCH 041/128] python3Packages.triton-bin: revisit cuda & rocm
 patching

---
 .../development/python-modules/triton/bin.nix | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix
index 3e0af134cc1e..f6589b72645a 100644
--- a/pkgs/development/python-modules/triton/bin.nix
+++ b/pkgs/development/python-modules/triton/bin.nix
@@ -1,12 +1,17 @@
 {
   lib,
   stdenv,
+  config,
   cudaPackages,
   buildPythonPackage,
   fetchurl,
   python,
   autoPatchelfHook,
   zlib,
+  rocmPackages,
+
+  rocmSupport ? config.rocmSupport,
+  addDriverRunpath,
 }:
 
 buildPythonPackage (finalAttrs: {
@@ -38,10 +43,25 @@ buildPythonPackage (finalAttrs: {
 
   dontStrip = true;
 
-  # If this breaks, consider replacing with "${cuda_nvcc}/bin/ptxas"
   postFixup = ''
     mkdir -p $out/${python.sitePackages}/triton/third_party/cuda/bin/
     ln -s ${cudaPackages.cuda_nvcc}/bin/ptxas $out/${python.sitePackages}/triton/third_party/cuda/bin/
+  ''
+  # Ugly patch to circumvent the heuristic-based search logic of libcuda.so
+  + ''
+    substituteInPlace "${placeholder "out"}/${python.sitePackages}/triton/backends/nvidia/driver.py" \
+      --replace-fail \
+        "if env_libcuda_path := knobs.nvidia.libcuda_path:" \
+        "return '${addDriverRunpath.driverLink}/lib/libcuda.so'" \
+      --replace-fail \
+        "return [env_libcuda_path]" \
+        ""
+  ''
+  + lib.optionalString rocmSupport ''
+    substituteInPlace "${placeholder "out"}/${python.sitePackages}/triton/backends/amd/driver.py" \
+      --replace-fail \
+        "lib_name = "libamdhip64.so" \
+        "return '${rocmPackages.clr}/lib/libamdhip64.so'"
   '';
 
   meta = {

From 7e63a2e0093abd596c1033585533a1cba6c49b56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Jun 2026 23:31:43 +0000
Subject: [PATCH 042/128] docker: 29.5.2 -> 29.5.3

---
 pkgs/applications/virtualization/docker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 01d55aa59add..9969a1705be5 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -420,18 +420,18 @@ in
 
   docker_29 =
     let
-      version = "29.5.2";
+      version = "29.5.3";
     in
     callPackage dockerGen {
       inherit version;
       cliRev = "v${version}";
-      cliHash = "sha256-kHgDZVr6mAyCtZ6bSG9FWV0GhWDfXLXzHYFrmjFzO9w=";
+      cliHash = "sha256-ZYfBWNVp7w8ZKdRA6bmDVQV4UEp+t8lWehInvtfysxM=";
       mobyRev = "docker-v${version}";
-      mobyHash = "sha256-lux7tTyF6vm5wuIXs+z3Ygd2v4JjgHbRvOXNA4kjNtg=";
+      mobyHash = "sha256-D+XjHsKUFgMBCQsFI825JIGHEQmDt3NQCwpTdu6XSc8=";
       runcRev = "v1.3.5";
       runcHash = "sha256-Swphxbu/OLkUrfRjLMZIVGwYb7AN0xHdyxm0ysAVam0=";
-      containerdRev = "v2.2.3";
-      containerdHash = "sha256-jaOLZf246kmvBHHrwgvqrhxuh+n1HE6NDqckZK4tvnM=";
+      containerdRev = "v2.2.4";
+      containerdHash = "sha256-F0lw7zh4V9JlFQGkE4RNT1VLX8WWLgZAAvbP12jnRMw=";
       tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
       tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
     };

From ad1a2c16dd5a608e2e4a7a471f5a1b1fe27eae71 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 6 Jun 2026 20:53:18 -0700
Subject: [PATCH 043/128] python3Packages.lg-rs232-tv: init at 1.2.0

---
 .../python-modules/lg-rs232-tv/default.nix    | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/lg-rs232-tv/default.nix

diff --git a/pkgs/development/python-modules/lg-rs232-tv/default.nix b/pkgs/development/python-modules/lg-rs232-tv/default.nix
new file mode 100644
index 000000000000..0b259670027d
--- /dev/null
+++ b/pkgs/development/python-modules/lg-rs232-tv/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  uv-build,
+  serialx,
+  aiowebostv,
+  pytest-asyncio,
+  pytest-timeout,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "lg-rs232-tv";
+  version = "1.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = "lg-rs232-tv";
+    tag = finalAttrs.version;
+    hash = "sha256-gMjRyZ/gUMAsS0v465ISD38YAlrOB8N/5VAFZkXtyAE=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.8.4,<0.9.0" "uv_build"
+  '';
+
+  build-system = [ uv-build ];
+
+  dependencies = [ serialx ];
+
+  optional-dependencies = {
+    esphome = serialx.optional-dependencies.esphome;
+    remote = [ aiowebostv ];
+  };
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-timeout
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "lg_rs232_tv" ];
+
+  meta = {
+    description = "Async library to control LG TVs over RS232";
+    homepage = "https://github.com/home-assistant-libs/lg-rs232-tv";
+    changelog = "https://github.com/home-assistant-libs/lg-rs232-tv/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89ca0b58fe5f..ef334c91f49d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8789,6 +8789,8 @@ self: super: with self; {
 
   lexilang = callPackage ../development/python-modules/lexilang { };
 
+  lg-rs232-tv = callPackage ../development/python-modules/lg-rs232-tv { };
+
   lgpio = toPythonModule (
     pkgs.lgpio.override {
       inherit buildPythonPackage;

From bb23471cb34bd44ff984758a491da223141f6ae4 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 6 Jun 2026 20:54:29 -0700
Subject: [PATCH 044/128] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 71b1cac92d68..fbf9e08c93b4 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3610,8 +3610,9 @@
     "lg_tv_rs232" =
       ps: with ps; [
         aiousbwatcher
+        lg-rs232-tv
         serialx
-      ]; # missing inputs: lg-rs232-tv
+      ];
     "libre_hardware_monitor" =
       ps: with ps; [
         librehardwaremonitor-api
@@ -8228,6 +8229,7 @@
     "lg_netcast"
     "lg_soundbar"
     "lg_thinq"
+    "lg_tv_rs232"
     "libre_hardware_monitor"
     "lichess"
     "lidarr"

From a54a2b42942141787cd908f6a0f265499d98e47c Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 6 Jun 2026 21:58:31 -0700
Subject: [PATCH 045/128] python3Packages.mitsubishi-comfort: init at 0.3.0

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

diff --git a/pkgs/development/python-modules/mitsubishi-comfort/default.nix b/pkgs/development/python-modules/mitsubishi-comfort/default.nix
new file mode 100644
index 000000000000..9aaeab111986
--- /dev/null
+++ b/pkgs/development/python-modules/mitsubishi-comfort/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  aiohttp,
+  aioresponses,
+  pytest-asyncio,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "mitsubishi-comfort";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "nikolairahimi";
+    repo = "mitsubishi-comfort";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-O/HAPb7MYU0/LEVS4ynddQuN6HKZUOUKWFn/CMz2q5E=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "mitsubishi_comfort" ];
+
+  meta = {
+    description = "Async Python library for Mitsubishi minisplit control via Kumo Cloud and local API";
+    homepage = "https://github.com/nikolairahimi/mitsubishi-comfort";
+    changelog = "https://github.com/nikolairahimi/mitsubishi-comfort/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89ca0b58fe5f..f263541c1ba4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10109,6 +10109,8 @@ self: super: with self; {
 
   mitogen = callPackage ../development/python-modules/mitogen { };
 
+  mitsubishi-comfort = callPackage ../development/python-modules/mitsubishi-comfort { };
+
   mixbox = callPackage ../development/python-modules/mixbox { };
 
   mixins = callPackage ../development/python-modules/mixins { };

From 60990066f9e4d327c948c48d65f9cb79d00e7800 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 6 Jun 2026 21:59:43 -0700
Subject: [PATCH 046/128] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 71b1cac92d68..dee21354b5cf 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -4063,7 +4063,8 @@
       ];
     "mitsubishi_comfort" =
       ps: with ps; [
-      ]; # missing inputs: mitsubishi-comfort
+        mitsubishi-comfort
+      ];
     "mjpeg" =
       ps: with ps; [
       ];
@@ -8301,6 +8302,7 @@
     "min_max"
     "minecraft_server"
     "minio"
+    "mitsubishi_comfort"
     "mjpeg"
     "moat"
     "mobile_app"

From c66ff8b8751a3384155781b1d9d72b7a3cd84ef3 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 6 Jun 2026 22:05:56 -0700
Subject: [PATCH 047/128] python3Packages.ouman-eh-800-api: init at 0.5.0

---
 .../ouman-eh-800-api/default.nix              | 53 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/python-modules/ouman-eh-800-api/default.nix

diff --git a/pkgs/development/python-modules/ouman-eh-800-api/default.nix b/pkgs/development/python-modules/ouman-eh-800-api/default.nix
new file mode 100644
index 000000000000..e84d768dce1a
--- /dev/null
+++ b/pkgs/development/python-modules/ouman-eh-800-api/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  aiohttp,
+  aioresponses,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+  pythonOlder,
+  uv-build,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "ouman-eh-800-api";
+  version = "0.5.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.13";
+
+  src = fetchFromGitHub {
+    owner = "Markus98";
+    repo = "ouman-eh-800-api";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1CEn44Uw+OH4DXcATt6qvsi3Ce4ghorWyS7lBhO2lH4=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.21,<0.10.0" "uv_build"
+  '';
+
+  build-system = [ uv-build ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "ouman_eh_800_api" ];
+
+  meta = {
+    description = "Async client for communicating with the Ouman EH-800 heating controller";
+    homepage = "https://github.com/Markus98/ouman-eh-800-api";
+    changelog = "https://github.com/Markus98/ouman-eh-800-api/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89ca0b58fe5f..0a3c2090001a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12171,6 +12171,8 @@ self: super: with self; {
 
   otxv2 = callPackage ../development/python-modules/otxv2 { };
 
+  ouman-eh-800-api = callPackage ../development/python-modules/ouman-eh-800-api { };
+
   ourgroceries = callPackage ../development/python-modules/ourgroceries { };
 
   outcome = callPackage ../development/python-modules/outcome { };

From 5e437dae0c5b42272c50d19aed4e3ddf9b50e5c5 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 6 Jun 2026 22:07:30 -0700
Subject: [PATCH 048/128] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 71b1cac92d68..b5d1623bd25b 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -4888,7 +4888,8 @@
       ];
     "ouman_eh_800" =
       ps: with ps; [
-      ]; # missing inputs: ouman-eh-800-api
+        ouman-eh-800-api
+      ];
     "ourgroceries" =
       ps: with ps; [
         ourgroceries
@@ -8422,6 +8423,7 @@
     "osoenergy"
     "otbr"
     "otp"
+    "ouman_eh_800"
     "ourgroceries"
     "overkiz"
     "overseerr"

From 69d532a619e62f1e4ba45ad53d784329f5c3079d Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 6 Jun 2026 22:44:59 -0700
Subject: [PATCH 049/128] python3Packages.esios-api: init at 4.4.0

---
 .../python-modules/esios-api/default.nix      | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/esios-api/default.nix

diff --git a/pkgs/development/python-modules/esios-api/default.nix b/pkgs/development/python-modules/esios-api/default.nix
new file mode 100644
index 000000000000..0679e5ecce2c
--- /dev/null
+++ b/pkgs/development/python-modules/esios-api/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytest-timeout,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "esios-api";
+  version = "4.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "chiro79";
+    repo = "esios-api";
+    tag = finalAttrs.version;
+    hash = "sha256-ZmU1D+W3ah4LUwgHwaS6NJpfKPLSRgIC8psUXTy/muM=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "poetry_core>=2.4.0" "poetry_core"
+  '';
+
+  build-system = [ poetry-core ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytest-timeout
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "esios_api" ];
+
+  meta = {
+    description = "Retrieval of Spanish Electricity hourly prices (PVPC)";
+    homepage = "https://github.com/chiro79/esios-api";
+    changelog = "https://github.com/chiro79/esios-api/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89ca0b58fe5f..8a15b0db85c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5166,6 +5166,8 @@ self: super: with self; {
 
   eseries = callPackage ../development/python-modules/eseries { };
 
+  esios-api = callPackage ../development/python-modules/esios-api { };
+
   esp-idf-size = callPackage ../development/python-modules/esp-idf-size { };
 
   espeak-phonemizer = callPackage ../development/python-modules/espeak-phonemizer { };

From 95915161f840022cb24244767abb66655705dea4 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 6 Jun 2026 22:46:03 -0700
Subject: [PATCH 050/128] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 71b1cac92d68..13116ff7b55b 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -5312,7 +5312,8 @@
       ];
     "pvpc_hourly_pricing" =
       ps: with ps; [
-      ]; # missing inputs: esios_api
+        esios-api
+      ];
     "pyload" =
       ps: with ps; [
         pyloadapi
@@ -8479,6 +8480,7 @@
     "pushbullet"
     "pushover"
     "pvoutput"
+    "pvpc_hourly_pricing"
     "pyload"
     "python_script"
     "qbittorrent"

From 02df528ea386f5a2f0cdd5519ab336b7102a1423 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 6 Jun 2026 22:59:10 -0700
Subject: [PATCH 051/128] python3Packages.ha-xthings-cloud: init at 1.0.5

---
 .../ha-xthings-cloud/default.nix              | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/ha-xthings-cloud/default.nix

diff --git a/pkgs/development/python-modules/ha-xthings-cloud/default.nix b/pkgs/development/python-modules/ha-xthings-cloud/default.nix
new file mode 100644
index 000000000000..c7a5453ebc79
--- /dev/null
+++ b/pkgs/development/python-modules/ha-xthings-cloud/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  aiohttp,
+  pyjwt,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "ha-xthings-cloud";
+  version = "1.0.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "XthingsJacobs";
+    repo = "ha-xthings-cloud";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Qz/JOvOcT7GicqduNOi4r9F2xqtQLX9d8D1zQb5oAUo=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    pyjwt
+  ];
+
+  pythonImportsCheck = [ "ha_xthings_cloud" ];
+
+  meta = {
+    description = "Async Python client for Xthings Cloud API";
+    homepage = "https://github.com/XthingsJacobs/ha-xthings-cloud";
+    changelog = "https://github.com/XthingsJacobs/ha-xthings-cloud/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89ca0b58fe5f..ad2c69f3b99d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6974,6 +6974,8 @@ self: super: with self; {
 
   ha-silabs-firmware-client = callPackage ../development/python-modules/ha-silabs-firmware-client { };
 
+  ha-xthings-cloud = callPackage ../development/python-modules/ha-xthings-cloud { };
+
   habanero = callPackage ../development/python-modules/habanero { };
 
   habiticalib = callPackage ../development/python-modules/habiticalib { };

From acdaf635129cca6694bf8995b7d5f2628626e649 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 6 Jun 2026 23:00:27 -0700
Subject: [PATCH 052/128] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 71b1cac92d68..ee4f143d1dff 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -7526,7 +7526,8 @@
       ];
     "xthings_cloud" =
       ps: with ps; [
-      ]; # missing inputs: ha-xthings-cloud
+        ha-xthings-cloud
+      ];
     "yale" =
       ps: with ps; [
         aiohasupervisor
@@ -8816,6 +8817,7 @@
     "xiaomi_aqara"
     "xiaomi_ble"
     "xiaomi_miio"
+    "xthings_cloud"
     "yale"
     "yale_smart_alarm"
     "yalexs_ble"

From fe33f68d9a1a8dece57d4f334a57380371e8cc7a Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 6 Jun 2026 23:36:34 -0700
Subject: [PATCH 053/128] python3Packages.pajgps-api: init at 0.3.1

---
 .../python-modules/pajgps-api/default.nix     | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/pajgps-api/default.nix

diff --git a/pkgs/development/python-modules/pajgps-api/default.nix b/pkgs/development/python-modules/pajgps-api/default.nix
new file mode 100644
index 000000000000..88acca389028
--- /dev/null
+++ b/pkgs/development/python-modules/pajgps-api/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  aiohttp,
+  pytestCheckHook,
+  python-dotenv,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pajgps-api";
+  version = "0.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "skipperro";
+    repo = "pajgps-api";
+    tag = finalAttrs.version;
+    hash = "sha256-OJbWF5KcqyRud0Sfx7rME+mXIjiZQD9UxD3vpeV6RWY=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    python-dotenv
+  ];
+
+  pythonImportsCheck = [ "pajgps_api" ];
+
+  meta = {
+    description = "Python library to interact with the PAJ GPS API";
+    homepage = "https://github.com/skipperro/pajgps-api";
+    changelog = "https://github.com/skipperro/pajgps-api/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89ca0b58fe5f..cb42fcc1ec27 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12235,6 +12235,8 @@ self: super: with self; {
 
   paintcompiler = callPackage ../development/python-modules/paintcompiler { };
 
+  pajgps-api = callPackage ../development/python-modules/pajgps-api { };
+
   palace = callPackage ../development/python-modules/palace { };
 
   palettable = callPackage ../development/python-modules/palettable { };

From 363dd05f195933df407d0f2ccc9c7b2f788a96d2 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 6 Jun 2026 23:36:34 -0700
Subject: [PATCH 054/128] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 71b1cac92d68..b00cdee0ce54 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -4972,7 +4972,8 @@
       ];
     "paj_gps" =
       ps: with ps; [
-      ]; # missing inputs: pajgps-api
+        pajgps-api
+      ];
     "palazzetti" =
       ps: with ps; [
         pypalazzetti
@@ -8429,6 +8430,7 @@
     "ovo_energy"
     "owntracks"
     "p1_monitor"
+    "paj_gps"
     "palazzetti"
     "panasonic_viera"
     "panel_custom"

From 3f8ec4e08bbd69285a36d5777b86e072737a596e Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Sun, 7 Jun 2026 13:20:15 +0200
Subject: [PATCH 055/128] python3Packages.geopy: use finalAttrs

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

diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix
index 90413b9fa6c8..632b8f6109be 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -9,7 +9,7 @@
   pytz,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "geopy";
   version = "2.4.1";
   format = "setuptools";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "geopy";
     repo = "geopy";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-mlOXDEtYry1IUAZWrP2FuY/CGliUnCPYLULnLNN0n4Y=";
   };
 
@@ -45,8 +45,8 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/geopy/geopy";
     description = "Python Geocoding Toolbox";
-    changelog = "https://github.com/geopy/geopy/releases/tag/${version}";
+    changelog = "https://github.com/geopy/geopy/releases/tag/${finalAttrs.version}";
     license = with lib.licenses; [ mit ];
     maintainers = [ ];
   };
-}
+})

From 4cea6c4fcd88888e51ede60087139da9e5891c77 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Sun, 7 Jun 2026 13:22:19 +0200
Subject: [PATCH 056/128] python3Packages.geopy: enable structuredAttrs

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

diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix
index 632b8f6109be..44475e0ddbfc 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -14,6 +14,8 @@ buildPythonPackage (finalAttrs: {
   version = "2.4.1";
   format = "setuptools";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "geopy";
     repo = "geopy";

From 2b9c91709ba11cfc4aef78c3bfb24fbc847ccc91 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Sun, 7 Jun 2026 13:26:49 +0200
Subject: [PATCH 057/128] python3Packages.geopy: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix
index 44475e0ddbfc..74537988a2d7 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   docutils,
   fetchFromGitHub,
+  setuptools,
   geographiclib,
   pytest7CheckHook,
   pythonAtLeast,
@@ -12,7 +13,7 @@
 buildPythonPackage (finalAttrs: {
   pname = "geopy";
   version = "2.4.1";
-  format = "setuptools";
+  pyproject = true;
 
   __structuredAttrs = true;
 
@@ -23,7 +24,9 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-mlOXDEtYry1IUAZWrP2FuY/CGliUnCPYLULnLNN0n4Y=";
   };
 
-  propagatedBuildInputs = [ geographiclib ];
+  build-system = [ setuptools ];
+
+  dependencies = [ geographiclib ];
 
   nativeCheckInputs = [
     docutils

From 5cac589e7aeffebd9140df48924d3ef601a03559 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 13:42:37 +0000
Subject: [PATCH 058/128] python3Packages.qbittorrent-api: 2026.5.1 -> 2026.6.0

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

diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix
index 84f35bc44e8f..cb84a39e9463 100644
--- a/pkgs/development/python-modules/qbittorrent-api/default.nix
+++ b/pkgs/development/python-modules/qbittorrent-api/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "qbittorrent-api";
-  version = "2026.5.1";
+  version = "2026.6.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "qbittorrent_api";
     inherit version;
-    hash = "sha256-pCwSD+q5vqh/WSxg4i20LBRQv8JHUEtBzoNzC9x6C1s=";
+    hash = "sha256-8uJb8HCWC5BgNZF6EHWQQrDCiKxq3xkbr09ISIkLghM=";
   };
 
   build-system = [

From 4755b6e00bbb8c2a4d0362d5704030c7b9e82aa0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 19:06:45 +0000
Subject: [PATCH 059/128] sioyek: 2.0.0-unstable-2026-04-08 ->
 2.0.0-unstable-2026-06-06

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

diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix
index c04779c5a500..c08a0f31c9d7 100644
--- a/pkgs/by-name/si/sioyek/package.nix
+++ b/pkgs/by-name/si/sioyek/package.nix
@@ -15,13 +15,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "sioyek";
-  version = "2.0.0-unstable-2026-04-08";
+  version = "2.0.0-unstable-2026-06-06";
 
   src = fetchFromGitHub {
     owner = "ahrm";
     repo = "sioyek";
-    rev = "a0650b5a71c15692c4797fec2908cc55c5aafd12";
-    hash = "sha256-9g1JhZEqBz6x2gv690efXaV7TNggyRvOq1xn8phubEY=";
+    rev = "96a5b0aebbacffdd9c8ddefd6efd3413828d0f37";
+    hash = "sha256-kCblPkBZETNmkX1RCQRR/zLBbAMhlB2svNCSltSeNlg=";
   };
 
   buildInputs = [

From 6e5de9b8d9b5c675b6f549fbf7be669023f11c88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 22:24:51 +0000
Subject: [PATCH 060/128] kiro: 0.12.263 -> 0.12.301

---
 pkgs/by-name/ki/kiro/package.nix  |  2 +-
 pkgs/by-name/ki/kiro/sources.json | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix
index 135fc9f2678a..d7c10b95a3f6 100644
--- a/pkgs/by-name/ki/kiro/package.nix
+++ b/pkgs/by-name/ki/kiro/package.nix
@@ -14,7 +14,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = extraCommandLineArgs;
 
-  version = "0.12.263";
+  version = "0.12.301";
   pname = "kiro";
 
   # You can find the current VSCode version in the About dialog:
diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json
index da7230e17913..7b95fb488123 100644
--- a/pkgs/by-name/ki/kiro/sources.json
+++ b/pkgs/by-name/ki/kiro/sources.json
@@ -1,14 +1,14 @@
 {
   "x86_64-linux": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.263/tar/kiro-ide-0.12.263-stable-linux-x64.tar.gz",
-    "hash": "sha256-PDm8lib9dA5kPxyaVzbrmmJwBb6Brdb2zIMH1u4MJeM="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.301/tar/kiro-ide-0.12.301-stable-linux-x64.tar.gz",
+    "hash": "sha256-TSsezw9e4qwehiw1ZRkGIcNgsm9bfORqNZN+wBeoxZM="
   },
   "x86_64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.12.263/kiro-ide-0.12.263-stable-darwin-x64.dmg",
-    "hash": "sha256-8a390Ka49Pd2Z6A00V0crGnA8CizrMQmvi2kdGG+Koc="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.12.301/kiro-ide-0.12.301-stable-darwin-x64.dmg",
+    "hash": "sha256-t/UxzyVzx0+zlC6T2Rs3cmWObRYNdmhKoIobYGa+Yq4="
   },
   "aarch64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.263/kiro-ide-0.12.263-stable-darwin-arm64.dmg",
-    "hash": "sha256-b1gxq72GL1br0XGhDe9vNJBSVNKm/AeNbJ8Jmwa7FUE="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.301/kiro-ide-0.12.301-stable-darwin-arm64.dmg",
+    "hash": "sha256-Ofi+JB7aLSVYFnP3bUnkGGg900/pUu8bpEbnYfW1sDI="
   }
 }

From 43af989f50e5b854bc157c0fb3e179b51fc8675e Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Sun, 7 Jun 2026 21:07:15 -0300
Subject: [PATCH 061/128] piped: use pnpm 10

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/pi/piped/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix
index 39bc48ba14d8..e336b6ba7ef4 100644
--- a/pkgs/by-name/pi/piped/package.nix
+++ b/pkgs/by-name/pi/piped/package.nix
@@ -1,14 +1,14 @@
 {
   lib,
   buildNpmPackage,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   fetchFromGitHub,
   unstableGitUpdater,
 }:
 let
-  pnpm = pnpm_9;
+  pnpm = pnpm_10;
 in
 buildNpmPackage rec {
   pname = "piped";
@@ -21,7 +21,7 @@ buildNpmPackage rec {
     hash = "sha256-o3TwE0s5rim+0VKR+oW9Rv3/eQRf2dgRQK4xjZ9pqCE=";
   };
 
-  nativeBuildInputs = [ pnpm_9 ];
+  nativeBuildInputs = [ pnpm ];
   npmConfigHook = pnpmConfigHook;
 
   installPhase = ''
@@ -36,10 +36,10 @@ buildNpmPackage rec {
       pname
       version
       src
+      pnpm
       ;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-IB/suR1I1hNip1qpIcUCP0YyUEDV2EwE5F2WXW8OhmU=";
+    fetcherVersion = 4;
+    hash = "sha256-o5NKMMIVPkKiPx++ALcZ+3oN80DMQHPwQqGT4f4q5P8=";
   };
 
   passthru.updateScript = unstableGitUpdater { };

From fac5eb98a503b52cada38afd74825fcf671e1e61 Mon Sep 17 00:00:00 2001
From: loner <2788892716@qq.com>
Date: Wed, 27 May 2026 11:11:39 +0800
Subject: [PATCH 062/128] kazumi: 2.1.1 -> 2.1.3

---
 pkgs/by-name/ka/kazumi/git-hashes.json   |  21 +-
 pkgs/by-name/ka/kazumi/package.nix       |  15 +-
 pkgs/by-name/ka/kazumi/pubspec.lock.json | 265 ++++++++++++-----------
 3 files changed, 165 insertions(+), 136 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/git-hashes.json b/pkgs/by-name/ka/kazumi/git-hashes.json
index e37ca412e382..740dbb06f326 100644
--- a/pkgs/by-name/ka/kazumi/git-hashes.json
+++ b/pkgs/by-name/ka/kazumi/git-hashes.json
@@ -1,14 +1,15 @@
 {
   "audio_service_mpris": "sha256-IVv1ioBpiK0VbnOFqnc9NbNn3Z+l9VN2clpCQjckBRo=",
+  "audio_service_win": "sha256-OZq2waTr0WLJ6uki/VLdUBdDdui25PvXnMNFohs7gjs=",
   "desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=",
-  "media_kit": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_android_video": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_ios_video": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_linux": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_macos_video": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_ohos": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_video": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_windows_video": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_video": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "webview_windows": "sha256-5iNB/h6TzMOTxp98flg7jt2XZn0bFU6wSvYjjUXt3bk="
+  "media_kit": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_android_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_ios_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_linux": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_macos_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_ohos": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_windows_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "webview_windows": "sha256-afBTwbam9YA0xvIYMtiJe+CKi8GWit1HqDR3J72r2o0="
 }
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 845318238eb8..e760af510ddc 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  flutter338,
+  flutter,
   fetchFromGitHub,
   autoPatchelfHook,
   alsa-lib,
@@ -18,16 +18,16 @@
 }:
 
 let
-  version = "2.1.1";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-zXqSc89swNQ/zYLyqBOShJScqWFlsKC6+qHwHl5Pd1Y=";
+    hash = "sha256-GpHLqqvjfgLRICIHO7YPLdzrQWHexJlg0ilqCJkkOfw=";
   };
 in
-flutter338.buildFlutterApplication {
+flutter.buildFlutterApplication {
   pname = "kazumi";
   inherit version src;
 
@@ -98,6 +98,13 @@ flutter338.buildFlutterApplication {
     webkitgtk_4_1
   ];
 
+  # patch onReorderItem to onReorder for nixpkgs Flutter compatibility
+  postPatch = ''
+    substituteInPlace \
+      lib/pages/plugin_editor/plugin_view_page.dart \
+      --replace-fail "onReorderItem:" "onReorder:"
+  '';
+
   postInstall = ''
     ln -snf ${mpv-unwrapped}/lib/libmpv.so.2 $out/app/$pname/lib/libmpv.so.2
     install -Dm 0644 assets/linux/io.github.Predidit.Kazumi.desktop -t $out/share/applications/
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index bce40aab071d..8a467b2833d7 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -4,21 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "5b7468c326d2f8a4f630056404ca0d291ade42918f4a3c6233618e724f39da8e",
+        "sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "92.0.0"
+      "version": "96.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "70e4b1ef8003c64793a9e268a551a82869a8a96f39deb73dea28084b0e8bf75e",
+        "sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.0.0"
+      "version": "10.2.0"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -64,11 +64,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.13.0"
+      "version": "2.13.1"
     },
     "audio_service": {
       "dependency": "direct main",
@@ -114,12 +114,13 @@
     "audio_service_win": {
       "dependency": "direct main",
       "description": {
-        "name": "audio_service_win",
-        "sha256": "8e8cd6a576901e4386dc22a8ca6d959317bf41c74b2bc4c6c5466826d0e529e8",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "8ad650c6eb487208b9861d44755c8e58db061c88",
+        "resolved-ref": "8ad650c6eb487208b9861d44755c8e58db061c88",
+        "url": "https://github.com/Predidit/audio_service_win.git"
       },
-      "source": "hosted",
-      "version": "0.0.2"
+      "source": "git",
+      "version": "0.0.3"
     },
     "audio_session": {
       "dependency": "direct main",
@@ -165,11 +166,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "aadd943f4f8cc946882c954c187e6115a84c98c81ad1d9c6cbf0895a8c85da9c",
+        "sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.5"
+      "version": "4.0.6"
     },
     "build_config": {
       "dependency": "transitive",
@@ -195,11 +196,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "521daf8d189deb79ba474e43a696b41c49fb3987818dbacf3308f1e03673a75e",
+        "sha256": "1523ce62448ebac2c15a8ba5fbad8acac169788658a7dd2a1c2d9c2a9318b9a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.13.1"
+      "version": "2.15.0"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -215,11 +216,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
+        "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.12.4"
+      "version": "8.12.6"
     },
     "cached_network_image": {
       "dependency": "direct main",
@@ -321,16 +322,6 @@
       "source": "hosted",
       "version": "1.0.0"
     },
-    "code_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "code_builder",
-        "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.11.1"
-    },
     "collection": {
       "dependency": "transitive",
       "description": {
@@ -355,11 +346,11 @@
       "dependency": "transitive",
       "description": {
         "name": "connectivity_plus_platform_interface",
-        "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204",
+        "sha256": "3c09627c536d22fd24691a905cdd8b14520de69da52c7a97499c8be5284a32ed",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.1.0"
     },
     "console": {
       "dependency": "transitive",
@@ -402,7 +393,7 @@
       "version": "0.3.5+2"
     },
     "crypto": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "crypto",
         "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
@@ -425,21 +416,21 @@
       "dependency": "direct main",
       "description": {
         "name": "cupertino_icons",
-        "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6",
+        "sha256": "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.8"
+      "version": "1.0.9"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b",
+        "sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.3"
+      "version": "3.1.7"
     },
     "dbus": {
       "dependency": "transitive",
@@ -619,7 +610,7 @@
       "version": "0.0.0"
     },
     "flutter_cache_manager": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "flutter_cache_manager",
         "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386",
@@ -642,11 +633,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_foreground_task",
-        "sha256": "1903697944a31f596622e51a6af55e3a9dfb27762f9763ab2841184098c6b0ba",
+        "sha256": "fc5c01a5e1b8f7bb51d0c737714f0c50440dbdf1aeddc5f8cbba313aa6fd4856",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.2.1"
+      "version": "9.2.2"
     },
     "flutter_inappwebview_android": {
       "dependency": "direct main",
@@ -758,11 +749,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
+        "sha256": "38d1c268de9097ff59cf0e844ac38759fc78f76836d37edad06fa21e182055a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.33"
+      "version": "2.0.34"
     },
     "flutter_rating_bar": {
       "dependency": "direct main",
@@ -778,11 +769,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9",
+        "sha256": "35882981abcbfb8c15b286f0cd690ff25bac12d95eff3e25ee207f37d4c42e7f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.4"
+      "version": "2.3.0"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -794,11 +785,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_volume_controller",
-        "sha256": "22edb0993ad03ecbc8d1164daeb5b39d798d409625db692675a86889403b1532",
+        "sha256": "27b95004d8abd7c6b24a63e555d721ef5f958fbe54551246567b72321494c6c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.4"
+      "version": "2.0.0"
     },
     "flutter_web_plugins": {
       "dependency": "transitive",
@@ -860,21 +851,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "hive_ce_generator",
-        "sha256": "fd629eefef44f3efb92dec5c422ab4c395153def0e651ed0f9bb3c8a4d4f783b",
+        "sha256": "c9a7cda57823ffec35846c051637ddcd105eafa253e7395d9c8c0ed5e87fbb72",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.11.0"
+      "version": "1.11.1"
     },
     "hooks": {
       "dependency": "transitive",
       "description": {
         "name": "hooks",
-        "sha256": "e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388",
+        "sha256": "025f060e86d2d4c3c47b56e33caf7f93bf9283340f26d23424ebcfccf34f621e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "1.0.3"
     },
     "html": {
       "dependency": "direct main",
@@ -917,7 +908,7 @@
       "version": "4.1.2"
     },
     "image": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "image",
         "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce",
@@ -930,21 +921,21 @@
       "dependency": "direct main",
       "description": {
         "name": "image_picker",
-        "sha256": "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320",
+        "sha256": "91c025426c2881c551100bce834e201c835a170151545f58d17da5180ca7d9ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "image_picker_android": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "66810af8e99b2657ee98e5c6f02064f69bb63f7a70e343937f70946c5f8c6622",
+        "sha256": "d5b3e1774af29c9ab00103afb0d4614070f924d2e0057ac867ec98800114793f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.13+16"
+      "version": "0.8.13+17"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
@@ -1036,6 +1027,26 @@
       "source": "hosted",
       "version": "0.6.1"
     },
+    "jni": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni",
+        "sha256": "c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "jni_flutter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni_flutter",
+        "sha256": "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
     "js": {
       "dependency": "transitive",
       "description": {
@@ -1050,11 +1061,11 @@
       "dependency": "transitive",
       "description": {
         "name": "json_annotation",
-        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
+        "sha256": "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.11.0"
+      "version": "4.12.0"
     },
     "leak_tracker": {
       "dependency": "transitive",
@@ -1140,8 +1151,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1151,8 +1162,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/android/media_kit_libs_android_video",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1162,8 +1173,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/ios/media_kit_libs_ios_video",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1173,8 +1184,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/linux/media_kit_libs_linux",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1184,8 +1195,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/macos/media_kit_libs_macos_video",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1195,8 +1206,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/ohos/media_kit_libs_ohos",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1206,8 +1217,8 @@
       "dependency": "direct main",
       "description": {
         "path": "libs/universal/media_kit_libs_video",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1217,8 +1228,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/windows/media_kit_libs_windows_video",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1228,8 +1239,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit_video",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1249,11 +1260,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
+        "sha256": "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.17.0"
+      "version": "1.18.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -1279,11 +1290,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "mobx_codegen",
-        "sha256": "406051a76157fb0a562700110bd2bedd85c959b1cd2d3df740c706bc07539c33",
+        "sha256": "6529bcae074838004b58ad01fbe4966be182a176aacfb723686985986ebac19f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.6"
+      "version": "2.7.7"
     },
     "modular_core": {
       "dependency": "transitive",
@@ -1439,11 +1450,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
+        "sha256": "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.22"
+      "version": "2.3.1"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1585,6 +1596,16 @@
       "source": "hosted",
       "version": "3.2.2"
     },
+    "record_use": {
+      "dependency": "transitive",
+      "description": {
+        "name": "record_use",
+        "sha256": "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
+    },
     "result_dart": {
       "dependency": "transitive",
       "description": {
@@ -1619,51 +1640,51 @@
       "dependency": "direct main",
       "description": {
         "name": "saver_gallery",
-        "sha256": "1d942bd7f4fedc162d9a751e156ebac592e4b81fc2e757af82de9077f3437003",
+        "sha256": "3f983d4be63aff52523c3e097a9b00ce9ab8444f9a982c878cde9d0359f4681d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.0"
+      "version": "4.1.1"
     },
     "screen_brightness_android": {
       "dependency": "direct main",
       "description": {
         "name": "screen_brightness_android",
-        "sha256": "d34f5321abd03bc3474f4c381f53d189117eba0b039eac1916aa92cca5fd0a96",
+        "sha256": "2df5e0488a22a73271a43d92dbcd80643df6910cf69690faacaf9929ae9ade3b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "screen_brightness_ios": {
       "dependency": "direct main",
       "description": {
         "name": "screen_brightness_ios",
-        "sha256": "2493953340ecfe8f4f13f61db50ce72533a55b0bbd58ba1402893feecf3727f5",
+        "sha256": "0792d8f98852558f831b4b75241c46047b884598b3f4d982b37dc2dd43e2b2e1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "screen_brightness_ohos": {
       "dependency": "direct main",
       "description": {
         "name": "screen_brightness_ohos",
-        "sha256": "a93a263dcd39b5c56e589eb495bcd001ce65cdd96ff12ab1350683559d5c5bb7",
+        "sha256": "33f495741d5aa53104d3f5875dcb4b6a119f29ef595be17129ee03a5b78e76a9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "screen_brightness_platform_interface": {
       "dependency": "direct main",
       "description": {
         "name": "screen_brightness_platform_interface",
-        "sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c",
+        "sha256": "59d50850d6735d677780fc7359c8e997d0ff6df91c8465161c9e617a7b0a11d8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
     },
     "screen_retriever": {
       "dependency": "transitive",
@@ -1729,21 +1750,21 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences",
-        "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
+        "sha256": "c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.5"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41",
+        "sha256": "e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.21"
+      "version": "2.4.23"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1769,11 +1790,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_platform_interface",
-        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+        "sha256": "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "shared_preferences_web": {
       "dependency": "transitive",
@@ -1845,21 +1866,21 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "732792cfd197d2161a65bb029606a46e0a18ff30ef9e141a7a82172b05ea8ecd",
+        "sha256": "ec37cc0e6694374cbef59ed79685572c870a54ede6fa30a3e420feb3adffea02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.2"
+      "version": "4.2.3"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "1d3b229b2934034fb2e691fbb3d53e0f75a4af7b1407f88425ed8f209bcb1b8f",
+        "sha256": "4227d54ceefd0bb8ca4c8fcb96e1719dc53f1ee1b6e2ca9d7a6069da160e4eae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.11"
+      "version": "1.3.12"
     },
     "source_span": {
       "dependency": "transitive",
@@ -1875,11 +1896,11 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite",
-        "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
+        "sha256": "564cfed0746fe53140c23b70b308e045c3b31f17778f2f326ccb7d804ea0250a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.2+1"
     },
     "sqflite_android": {
       "dependency": "transitive",
@@ -1895,11 +1916,11 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6",
+        "sha256": "1581ffbf7a0e333b380d6a30737d78516b826cb35beb7fb0bf8a3ea0c678b465",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.6"
+      "version": "2.5.8"
     },
     "sqflite_darwin": {
       "dependency": "transitive",
@@ -1965,11 +1986,11 @@
       "dependency": "direct main",
       "description": {
         "name": "synchronized",
-        "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0",
+        "sha256": "63896c27e81b28f8cb4e69ead0d3e8f03f1d1e5fc531a3e579cabed6a2c7c9e5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.0"
+      "version": "3.4.0+1"
     },
     "term_glyph": {
       "dependency": "transitive",
@@ -1985,11 +2006,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
+        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
     },
     "tray_manager": {
       "dependency": "direct main",
@@ -2065,11 +2086,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
+        "sha256": "3bb000251e55d4a209aa0e2e563309dc9bb2befea2295fd0cec1f51760aac572",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.28"
+      "version": "6.3.29"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
@@ -2115,11 +2136,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
+        "sha256": "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -2145,11 +2166,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "7076216a10d5c390315fbe536a30f1254c341e7543e6c4c8a815e591307772b1",
+        "sha256": "2306c03da2ba81724afeb589c351ebbc0aa7d86005925be8f8735856dbe5e42d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.20"
+      "version": "1.2.2"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -2165,11 +2186,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "5a88dd14c0954a5398af544651c7fb51b457a2a556949bfb25369b210ef73a74",
+        "sha256": "b9b3f391857781aa96acacef96066f2f49b4cd03cf9fce3ca4d8da2ef5ea129e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.2.3"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -2195,11 +2216,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.2"
+      "version": "15.2.0"
     },
     "wakelock_plus": {
       "dependency": "transitive",
@@ -2225,11 +2246,11 @@
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "24b84143787220a403491c2e5de0877fbbb87baf3f0b18a2a988973863db4b03",
+        "sha256": "b13f99e992e7ae6a152e16c5559d3c07ff445b13330192662494e614ca3e7d7b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.1"
     },
     "watcher": {
       "dependency": "transitive",
@@ -2285,8 +2306,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "d9bbeabe51562e727850fe3f60407cf0f6239a8e",
-        "resolved-ref": "d9bbeabe51562e727850fe3f60407cf0f6239a8e",
+        "ref": "8e3578e6032c93f1723f58db930d480b7828d796",
+        "resolved-ref": "8e3578e6032c93f1723f58db930d480b7828d796",
         "url": "https://github.com/Predidit/flutter-webview-windows.git"
       },
       "source": "git",
@@ -2374,7 +2395,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.10.3 <4.0.0",
-    "flutter": ">=3.41.9"
+    "dart": ">=3.11.0 <4.0.0",
+    "flutter": ">=3.44.0"
   }
 }

From b317380e6169e9ae332cbacb3d835bf182b3ba7a Mon Sep 17 00:00:00 2001
From: n3tcat <webmaster@scd31.com>
Date: Sun, 7 Jun 2026 22:34:15 -0400
Subject: [PATCH 063/128] kitty: 0.47.1 -> 0.47.2

---
 pkgs/by-name/ki/kitty/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index 32d439b36e2a..cd4083b3194d 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -50,21 +50,21 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.47.1";
+  version = "0.47.2";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     tag = "v${version}";
-    hash = "sha256-/FOeJiC9SNE/k7SzXl5nmwdfKiFlKa0C0IuIph4cRxQ=";
+    hash = "sha256-hRQ/1EMBt04Er1OfLg1W9fIma3NZBHZklW1N4DmFBpM=";
   };
 
   goModules =
     (buildGo126Module {
       pname = "kitty-go-modules";
       inherit src version;
-      vendorHash = "sha256-SuLcY8M+F9HijinaNr6jmsGlJ00o5LJN+Y04cfjyQ/c=";
+      vendorHash = "sha256-zZZDrWzl2q/o4f52diE0YDV/MdYfsdKWWjQ0ej2bBTM=";
     }).goModules;
 
   buildInputs = [
@@ -152,6 +152,7 @@ buildPythonApplication rec {
   env = {
     CGO_ENABLED = 0;
     GOFLAGS = "-trimpath";
+    GOTOOLCHAIN = "local";
   };
 
   configurePhase = ''

From b95c755fdc7caec68537bbfecc74c43469afdd3d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 03:48:54 +0000
Subject: [PATCH 064/128] androidenv.test-suite: 2937e647936072ec ->
 b302c79dc7524f10

---
 pkgs/development/mobile/androidenv/repo.json | 1288 ++++++++++--------
 1 file changed, 702 insertions(+), 586 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index 6f6c452b84d6..f0e8bf2b73e0 100644
--- a/pkgs/development/mobile/androidenv/repo.json
+++ b/pkgs/development/mobile/androidenv/repo.json
@@ -12,7 +12,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-10",
@@ -90,7 +90,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-11",
@@ -154,7 +154,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-12",
@@ -230,7 +230,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-12",
@@ -276,7 +276,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-13",
@@ -352,7 +352,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-13",
@@ -398,7 +398,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-14",
@@ -476,7 +476,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-15",
@@ -568,7 +568,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-16",
@@ -660,7 +660,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-17",
@@ -752,7 +752,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-18",
@@ -844,7 +844,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-19",
@@ -936,7 +936,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-21",
@@ -1028,7 +1028,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-22",
@@ -1212,7 +1212,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-24",
@@ -1304,7 +1304,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-25",
@@ -1396,7 +1396,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-3",
@@ -1460,7 +1460,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-4",
@@ -1524,7 +1524,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-5",
@@ -1588,7 +1588,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-6",
@@ -1652,7 +1652,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-7",
@@ -1716,7 +1716,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-8",
@@ -1780,7 +1780,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-9",
@@ -1845,7 +1845,7 @@
         }
       ],
       "displayName": "Android Support Repository",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-android-m2repository",
       "path": "extras/android/m2repository",
@@ -1876,7 +1876,7 @@
         }
       ],
       "displayName": "Android Emulator hypervisor driver (installer)",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-Android_Emulator_Hypervisor_Driver",
       "path": "extras/google/Android_Emulator_Hypervisor_Driver",
@@ -1907,7 +1907,7 @@
         }
       ],
       "displayName": "Google AdMob Ads SDK",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-admob_ads_sdk",
       "path": "extras/google/admob_ads_sdk",
@@ -1936,7 +1936,7 @@
         }
       ],
       "displayName": "Google Analytics App Tracking SDK",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-analytics_sdk_v2",
       "path": "extras/google/analytics_sdk_v2",
@@ -1986,7 +1986,7 @@
         }
       ],
       "displayName": "Android Auto Desktop Head Unit Emulator",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-auto",
       "path": "extras/google/auto",
@@ -2012,7 +2012,7 @@
         }
       ],
       "displayName": "Google Cloud Messaging for Android Library",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-gcm",
       "path": "extras/google/gcm",
@@ -2048,7 +2048,7 @@
         }
       },
       "displayName": "Google Play services",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services",
       "path": "extras/google/google_play_services",
@@ -2077,7 +2077,7 @@
         }
       ],
       "displayName": "Google Play services for Froyo",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services_froyo",
       "path": "extras/google/google_play_services_froyo",
@@ -2106,7 +2106,7 @@
         }
       ],
       "displayName": "Google Play Instant Development SDK (Deprecated)",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-instantapps",
       "path": "extras/google/instantapps",
@@ -2144,7 +2144,7 @@
         }
       },
       "displayName": "Google Repository",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-m2repository",
       "path": "extras/google/m2repository",
@@ -2173,7 +2173,7 @@
         }
       ],
       "displayName": "Google Play APK Expansion library",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-market_apk_expansion",
       "path": "extras/google/market_apk_expansion",
@@ -2202,7 +2202,7 @@
         }
       ],
       "displayName": "Google Play Licensing Library",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-market_licensing",
       "path": "extras/google/market_licensing",
@@ -2231,7 +2231,7 @@
         }
       ],
       "displayName": "Android Auto API Simulators",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-simulators",
       "path": "extras/google/simulators",
@@ -2260,7 +2260,7 @@
         }
       ],
       "displayName": "Google USB Driver",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-usb_driver",
       "path": "extras/google/usb_driver",
@@ -2289,7 +2289,7 @@
         }
       ],
       "displayName": "Google Web Driver",
-      "last-available-day": 20603,
+      "last-available-day": 20612,
       "license": "android-sdk-license",
       "name": "extras-google-webdriver",
       "path": "extras/google/webdriver",
@@ -2329,7 +2329,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-10-default-armeabi-v7a",
           "path": "system-images/android-10/default/armeabi-v7a",
@@ -2373,7 +2373,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-10-default-x86",
           "path": "system-images/android-10/default/x86",
@@ -2419,7 +2419,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-armeabi-v7a",
           "path": "system-images/android-10/google_apis/armeabi-v7a",
@@ -2471,7 +2471,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-x86",
           "path": "system-images/android-10/google_apis/x86",
@@ -2520,7 +2520,7 @@
             }
           ],
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-14-default-armeabi-v7a",
           "path": "system-images/android-14/default/armeabi-v7a",
@@ -2568,7 +2568,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-15-default-armeabi-v7a",
           "path": "system-images/android-15/default/armeabi-v7a",
@@ -2612,7 +2612,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-15-default-x86",
           "path": "system-images/android-15/default/x86",
@@ -2658,7 +2658,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-armeabi-v7a",
           "path": "system-images/android-15/google_apis/armeabi-v7a",
@@ -2710,7 +2710,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-x86",
           "path": "system-images/android-15/google_apis/x86",
@@ -2766,7 +2766,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-16-default-armeabi-v7a",
           "path": "system-images/android-16/default/armeabi-v7a",
@@ -2803,7 +2803,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "mips-android-sysimage-license",
           "name": "system-image-16-default-mips",
           "path": "system-images/android-16/default/mips",
@@ -2847,7 +2847,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-16-default-x86",
           "path": "system-images/android-16/default/x86",
@@ -2893,7 +2893,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-armeabi-v7a",
           "path": "system-images/android-16/google_apis/armeabi-v7a",
@@ -2945,7 +2945,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-x86",
           "path": "system-images/android-16/google_apis/x86",
@@ -3001,7 +3001,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-17-default-armeabi-v7a",
           "path": "system-images/android-17/default/armeabi-v7a",
@@ -3038,7 +3038,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "mips-android-sysimage-license",
           "name": "system-image-17-default-mips",
           "path": "system-images/android-17/default/mips",
@@ -3082,7 +3082,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-17-default-x86",
           "path": "system-images/android-17/default/x86",
@@ -3136,7 +3136,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-armeabi-v7a",
           "path": "system-images/android-17/google_apis/armeabi-v7a",
@@ -3188,7 +3188,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-x86",
           "path": "system-images/android-17/google_apis/x86",
@@ -3244,7 +3244,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-18-default-armeabi-v7a",
           "path": "system-images/android-18/default/armeabi-v7a",
@@ -3288,7 +3288,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-18-default-x86",
           "path": "system-images/android-18/default/x86",
@@ -3334,7 +3334,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-armeabi-v7a",
           "path": "system-images/android-18/google_apis/armeabi-v7a",
@@ -3386,7 +3386,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-x86",
           "path": "system-images/android-18/google_apis/x86",
@@ -3442,7 +3442,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-19-default-armeabi-v7a",
           "path": "system-images/android-19/default/armeabi-v7a",
@@ -3486,7 +3486,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-19-default-x86",
           "path": "system-images/android-19/default/x86",
@@ -3532,7 +3532,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-armeabi-v7a",
           "path": "system-images/android-19/google_apis/armeabi-v7a",
@@ -3584,7 +3584,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-x86",
           "path": "system-images/android-19/google_apis/x86",
@@ -3633,7 +3633,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-armeabi-v7a",
           "path": "system-images/android-21/android-tv/armeabi-v7a",
@@ -3670,7 +3670,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-x86",
           "path": "system-images/android-21/android-tv/x86",
@@ -3709,7 +3709,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-21-default-arm64-v8a",
           "path": "system-images/android-21/default/arm64-v8a",
@@ -3753,7 +3753,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-21-default-armeabi-v7a",
           "path": "system-images/android-21/default/armeabi-v7a",
@@ -3797,7 +3797,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86",
           "path": "system-images/android-21/default/x86",
@@ -3841,7 +3841,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86_64",
           "path": "system-images/android-21/default/x86_64",
@@ -3880,7 +3880,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-arm64-v8a",
           "path": "system-images/android-21/google_apis/arm64-v8a",
@@ -3932,7 +3932,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-armeabi-v7a",
           "path": "system-images/android-21/google_apis/armeabi-v7a",
@@ -3984,7 +3984,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86",
           "path": "system-images/android-21/google_apis/x86",
@@ -4036,7 +4036,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86_64",
           "path": "system-images/android-21/google_apis/x86_64",
@@ -4085,7 +4085,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-22-android-tv-x86",
           "path": "system-images/android-22/android-tv/x86",
@@ -4124,7 +4124,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-22-default-arm64-v8a",
           "path": "system-images/android-22/default/arm64-v8a",
@@ -4168,7 +4168,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-22-default-armeabi-v7a",
           "path": "system-images/android-22/default/armeabi-v7a",
@@ -4212,7 +4212,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86",
           "path": "system-images/android-22/default/x86",
@@ -4256,7 +4256,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86_64",
           "path": "system-images/android-22/default/x86_64",
@@ -4295,7 +4295,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-arm64-v8a",
           "path": "system-images/android-22/google_apis/arm64-v8a",
@@ -4347,7 +4347,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-armeabi-v7a",
           "path": "system-images/android-22/google_apis/armeabi-v7a",
@@ -4399,7 +4399,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86",
           "path": "system-images/android-22/google_apis/x86",
@@ -4451,7 +4451,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86_64",
           "path": "system-images/android-22/google_apis/x86_64",
@@ -4500,7 +4500,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-armeabi-v7a",
           "path": "system-images/android-23/android-tv/armeabi-v7a",
@@ -4544,7 +4544,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-x86",
           "path": "system-images/android-23/android-tv/x86",
@@ -4583,7 +4583,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-23-default-arm64-v8a",
           "path": "system-images/android-23/default/arm64-v8a",
@@ -4627,7 +4627,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-23-default-armeabi-v7a",
           "path": "system-images/android-23/default/armeabi-v7a",
@@ -4671,7 +4671,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86",
           "path": "system-images/android-23/default/x86",
@@ -4715,7 +4715,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86_64",
           "path": "system-images/android-23/default/x86_64",
@@ -4754,7 +4754,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-arm64-v8a",
           "path": "system-images/android-23/google_apis/arm64-v8a",
@@ -4806,7 +4806,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-armeabi-v7a",
           "path": "system-images/android-23/google_apis/armeabi-v7a",
@@ -4858,7 +4858,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86",
           "path": "system-images/android-23/google_apis/x86",
@@ -4910,7 +4910,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86_64",
           "path": "system-images/android-23/google_apis/x86_64",
@@ -4966,7 +4966,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-24-android-tv-x86",
           "path": "system-images/android-24/android-tv/x86",
@@ -5005,7 +5005,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-24-default-arm64-v8a",
           "path": "system-images/android-24/default/arm64-v8a",
@@ -5049,7 +5049,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-24-default-armeabi-v7a",
           "path": "system-images/android-24/default/armeabi-v7a",
@@ -5093,7 +5093,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86",
           "path": "system-images/android-24/default/x86",
@@ -5137,7 +5137,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86_64",
           "path": "system-images/android-24/default/x86_64",
@@ -5183,7 +5183,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-arm64-v8a",
           "path": "system-images/android-24/google_apis/arm64-v8a",
@@ -5235,7 +5235,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86",
           "path": "system-images/android-24/google_apis/x86",
@@ -5287,7 +5287,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86_64",
           "path": "system-images/android-24/google_apis/x86_64",
@@ -5341,7 +5341,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis_playstore-x86",
           "path": "system-images/android-24/google_apis_playstore/x86",
@@ -5397,7 +5397,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-25-android-tv-x86",
           "path": "system-images/android-25/android-tv/x86",
@@ -5443,7 +5443,7 @@
             }
           },
           "displayName": "Android Wear ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-armeabi-v7a",
           "path": "system-images/android-25/android-wear/armeabi-v7a",
@@ -5487,7 +5487,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-x86",
           "path": "system-images/android-25/android-wear/x86",
@@ -5526,7 +5526,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-25-default-arm64-v8a",
           "path": "system-images/android-25/default/arm64-v8a",
@@ -5570,7 +5570,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86",
           "path": "system-images/android-25/default/x86",
@@ -5614,7 +5614,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86_64",
           "path": "system-images/android-25/default/x86_64",
@@ -5653,7 +5653,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-arm64-v8a",
           "path": "system-images/android-25/google_apis/arm64-v8a",
@@ -5705,7 +5705,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-armeabi-v7a",
           "path": "system-images/android-25/google_apis/armeabi-v7a",
@@ -5757,7 +5757,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86",
           "path": "system-images/android-25/google_apis/x86",
@@ -5809,7 +5809,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86_64",
           "path": "system-images/android-25/google_apis/x86_64",
@@ -5863,7 +5863,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis_playstore-x86",
           "path": "system-images/android-25/google_apis_playstore/x86",
@@ -5934,7 +5934,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-android-tv-x86",
           "path": "system-images/android-26/android-tv/x86",
@@ -5980,7 +5980,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-26-android-wear-x86",
           "path": "system-images/android-26/android-wear/x86",
@@ -6031,7 +6031,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-26-default-arm64-v8a",
           "path": "system-images/android-26/default/arm64-v8a",
@@ -6075,7 +6075,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86",
           "path": "system-images/android-26/default/x86",
@@ -6119,7 +6119,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86_64",
           "path": "system-images/android-26/default/x86_64",
@@ -6170,7 +6170,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-arm64-v8a",
           "path": "system-images/android-26/google_apis/arm64-v8a",
@@ -6237,7 +6237,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86",
           "path": "system-images/android-26/google_apis/x86",
@@ -6304,7 +6304,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86_64",
           "path": "system-images/android-26/google_apis/x86_64",
@@ -6373,7 +6373,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-google_apis_playstore-x86",
           "path": "system-images/android-26/google_apis_playstore/x86",
@@ -6429,7 +6429,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-27-android-tv-x86",
           "path": "system-images/android-27/android-tv/x86",
@@ -6480,7 +6480,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-27-default-arm64-v8a",
           "path": "system-images/android-27/default/arm64-v8a",
@@ -6524,7 +6524,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86",
           "path": "system-images/android-27/default/x86",
@@ -6568,7 +6568,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86_64",
           "path": "system-images/android-27/default/x86_64",
@@ -6619,7 +6619,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-arm64-v8a",
           "path": "system-images/android-27/google_apis/arm64-v8a",
@@ -6686,7 +6686,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-x86",
           "path": "system-images/android-27/google_apis/x86",
@@ -6755,7 +6755,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis_playstore-x86",
           "path": "system-images/android-27/google_apis_playstore/x86",
@@ -6816,7 +6816,7 @@
             }
           },
           "displayName": "Automotive Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-28-android-automotive-playstore-x86",
           "path": "system-images/android-28/android-automotive-playstore/x86",
@@ -6861,7 +6861,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-android-tv-x86",
           "path": "system-images/android-28/android-tv/x86",
@@ -6907,7 +6907,7 @@
             }
           },
           "displayName": "Wear OS Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-28-android-wear-x86",
           "path": "system-images/android-28/android-wear/x86",
@@ -6958,7 +6958,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-28-default-arm64-v8a",
           "path": "system-images/android-28/default/arm64-v8a",
@@ -6995,7 +6995,7 @@
             }
           ],
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86",
           "path": "system-images/android-28/default/x86",
@@ -7032,7 +7032,7 @@
             }
           ],
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86_64",
           "path": "system-images/android-28/default/x86_64",
@@ -7083,7 +7083,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-arm64-v8a",
           "path": "system-images/android-28/google_apis/arm64-v8a",
@@ -7150,7 +7150,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis-x86",
           "path": "system-images/android-28/google_apis/x86",
@@ -7217,7 +7217,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-x86_64",
           "path": "system-images/android-28/google_apis/x86_64",
@@ -7276,7 +7276,7 @@
             }
           },
           "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-28/google_apis_playstore/arm64-v8a",
@@ -7343,7 +7343,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86",
           "path": "system-images/android-28/google_apis_playstore/x86",
@@ -7410,7 +7410,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86_64",
           "path": "system-images/android-28/google_apis_playstore/x86_64",
@@ -7471,7 +7471,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-29-android-automotive-playstore-x86",
           "path": "system-images/android-29/android-automotive-playstore/x86",
@@ -7531,7 +7531,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-29-android-tv-x86",
           "path": "system-images/android-29/android-tv/x86",
@@ -7570,7 +7570,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-29-default-arm64-v8a",
           "path": "system-images/android-29/default/arm64-v8a",
@@ -7633,7 +7633,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86",
           "path": "system-images/android-29/default/x86",
@@ -7696,7 +7696,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86_64",
           "path": "system-images/android-29/default/x86_64",
@@ -7747,7 +7747,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis-arm64-v8a",
           "path": "system-images/android-29/google_apis/arm64-v8a",
@@ -7804,7 +7804,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86",
           "path": "system-images/android-29/google_apis/x86",
@@ -7861,7 +7861,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86_64",
           "path": "system-images/android-29/google_apis/x86_64",
@@ -7920,7 +7920,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-29/google_apis_playstore/arm64-v8a",
@@ -8001,7 +8001,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86",
           "path": "system-images/android-29/google_apis_playstore/x86",
@@ -8082,7 +8082,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86_64",
           "path": "system-images/android-29/google_apis_playstore/x86_64",
@@ -8143,7 +8143,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-30-android-automotive-playstore-x86_64",
           "path": "system-images/android-30/android-automotive-playstore/x86_64",
@@ -8203,7 +8203,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-30-android-tv-x86",
           "path": "system-images/android-30/android-tv/x86",
@@ -8249,7 +8249,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-arm64-v8a",
           "path": "system-images/android-30/android-wear-cn/arm64-v8a",
@@ -8293,7 +8293,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-x86",
           "path": "system-images/android-30/android-wear-cn/x86",
@@ -8332,7 +8332,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-30-default-arm64-v8a",
           "path": "system-images/android-30/default/arm64-v8a",
@@ -8381,7 +8381,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-30-default-x86_64",
           "path": "system-images/android-30/default/x86_64",
@@ -8432,7 +8432,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis-arm64-v8a",
           "path": "system-images/android-30/google_apis/arm64-v8a",
@@ -8499,7 +8499,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86",
           "path": "system-images/android-30/google_apis/x86",
@@ -8566,7 +8566,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86_64",
           "path": "system-images/android-30/google_apis/x86_64",
@@ -8632,7 +8632,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-30/google_apis_playstore/arm64-v8a",
@@ -8713,7 +8713,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis_playstore-x86",
           "path": "system-images/android-30/google_apis_playstore/x86",
@@ -8794,7 +8794,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-x86_64",
           "path": "system-images/android-30/google_apis_playstore/x86_64",
@@ -8865,7 +8865,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-arm64-v8a",
           "path": "system-images/android-31/android-tv/arm64-v8a",
@@ -8924,7 +8924,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-x86",
           "path": "system-images/android-31/android-tv/x86",
@@ -8975,7 +8975,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-31-default-arm64-v8a",
           "path": "system-images/android-31/default/arm64-v8a",
@@ -9024,7 +9024,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-31-default-x86_64",
           "path": "system-images/android-31/default/x86_64",
@@ -9085,7 +9085,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis-arm64-v8a",
           "path": "system-images/android-31/google_apis/arm64-v8a",
@@ -9152,7 +9152,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-31-google_apis-x86_64",
           "path": "system-images/android-31/google_apis/x86_64",
@@ -9228,7 +9228,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-31/google_apis_playstore/arm64-v8a",
@@ -9295,7 +9295,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-x86_64",
           "path": "system-images/android-31/google_apis_playstore/x86_64",
@@ -9356,7 +9356,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play arm64-v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-arm64-v8a",
           "path": "system-images/android-32/android-automotive-playstore/arm64-v8a",
@@ -9409,7 +9409,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play x86_64 System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-x86_64",
           "path": "system-images/android-32/android-automotive-playstore/x86_64",
@@ -9464,7 +9464,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-32-default-arm64-v8a",
           "path": "system-images/android-32/default/arm64-v8a",
@@ -9513,7 +9513,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-32-default-x86_64",
           "path": "system-images/android-32/default/x86_64",
@@ -9574,7 +9574,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis-arm64-v8a",
           "path": "system-images/android-32/google_apis/arm64-v8a",
@@ -9641,7 +9641,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis-x86_64",
           "path": "system-images/android-32/google_apis/x86_64",
@@ -9717,7 +9717,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-32/google_apis_playstore/arm64-v8a",
@@ -9798,7 +9798,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis_playstore-x86_64",
           "path": "system-images/android-32/google_apis_playstore/x86_64",
@@ -9859,7 +9859,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-arm64-v8a",
           "path": "system-images/android-33/android-automotive/arm64-v8a",
@@ -9912,7 +9912,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-x86_64",
           "path": "system-images/android-33/android-automotive/x86_64",
@@ -9977,7 +9977,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-arm64-v8a",
           "path": "system-images/android-33/android-tv/arm64-v8a",
@@ -10036,7 +10036,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-x86",
           "path": "system-images/android-33/android-tv/x86",
@@ -10082,7 +10082,7 @@
             }
           },
           "displayName": "Wear OS 4 ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-arm64-v8a",
           "path": "system-images/android-33/android-wear/arm64-v8a",
@@ -10126,7 +10126,7 @@
             }
           },
           "displayName": "Wear OS 4 Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-x86_64",
           "path": "system-images/android-33/android-wear/x86_64",
@@ -10177,7 +10177,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-33-default-arm64-v8a",
           "path": "system-images/android-33/default/arm64-v8a",
@@ -10226,7 +10226,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-33-default-x86_64",
           "path": "system-images/android-33/default/x86_64",
@@ -10287,7 +10287,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis-arm64-v8a",
           "path": "system-images/android-33/google_apis/arm64-v8a",
@@ -10354,7 +10354,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis-x86_64",
           "path": "system-images/android-33/google_apis/x86_64",
@@ -10423,7 +10423,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33/google_apis_playstore/arm64-v8a",
@@ -10490,7 +10490,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis_playstore-x86_64",
           "path": "system-images/android-33/google_apis_playstore/x86_64",
@@ -10565,7 +10565,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a",
@@ -10614,7 +10614,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-33x-google_apis_playstore-x86_64",
           "path": "system-images/android-33-ext4/google_apis_playstore/x86_64",
@@ -10677,7 +10677,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-arm64-v8a",
           "path": "system-images/android-34/android-tv/arm64-v8a",
@@ -10737,7 +10737,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-x86",
           "path": "system-images/android-34/android-tv/x86",
@@ -10777,7 +10777,7 @@
             }
           ],
           "displayName": "Wear OS 5 ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-arm64-v8a",
           "path": "system-images/android-34/android-wear/arm64-v8a",
@@ -10814,7 +10814,7 @@
             }
           ],
           "displayName": "Wear OS 5 Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-x86_64",
           "path": "system-images/android-34/android-wear/x86_64",
@@ -10865,7 +10865,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-34-default-arm64-v8a",
           "path": "system-images/android-34/default/arm64-v8a",
@@ -10914,7 +10914,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-34-default-x86_64",
           "path": "system-images/android-34/default/x86_64",
@@ -10975,7 +10975,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis-arm64-v8a",
           "path": "system-images/android-34/google_apis/arm64-v8a",
@@ -11043,7 +11043,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis-x86_64",
           "path": "system-images/android-34/google_apis/x86_64",
@@ -11113,7 +11113,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34/google_apis_playstore/arm64-v8a",
@@ -11182,7 +11182,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis_playstore-x86_64",
           "path": "system-images/android-34/google_apis_playstore/x86_64",
@@ -11245,7 +11245,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-arm64-v8a",
           "path": "system-images/android-34-ext9/android-automotive/arm64-v8a",
@@ -11298,7 +11298,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-x86_64",
           "path": "system-images/android-34-ext9/android-automotive/x86_64",
@@ -11367,7 +11367,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a",
@@ -11416,7 +11416,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-34x-google_apis_playstore-x86_64",
           "path": "system-images/android-34-ext12/google_apis_playstore/x86_64",
@@ -11457,7 +11457,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-arm64-v8a",
           "path": "system-images/android-35/android-wear/arm64-v8a",
@@ -11489,7 +11489,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-x86_64",
           "path": "system-images/android-35/android-wear/x86_64",
@@ -11535,7 +11535,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-35-default-arm64-v8a",
           "path": "system-images/android-35/default/arm64-v8a",
@@ -11580,7 +11580,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-35-default-x86_64",
           "path": "system-images/android-35/default/x86_64",
@@ -11627,7 +11627,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis-arm64-v8a",
           "path": "system-images/android-35/google_apis/arm64-v8a",
@@ -11685,7 +11685,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis-x86_64",
           "path": "system-images/android-35/google_apis/x86_64",
@@ -11745,7 +11745,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore/arm64-v8a",
@@ -11803,7 +11803,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis_playstore-x86_64",
           "path": "system-images/android-35/google_apis_playstore/x86_64",
@@ -11863,7 +11863,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-page_size_16kb-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a",
@@ -11925,7 +11925,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-35-page_size_16kb-x86_64",
           "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
@@ -11991,7 +11991,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-automotive-arm64-v8a",
           "path": "system-images/android-35-ext15/android-automotive/arm64-v8a",
@@ -12044,7 +12044,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-automotive-x86_64",
           "path": "system-images/android-35-ext15/android-automotive/x86_64",
@@ -12087,7 +12087,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-arm64-v8a",
           "path": "system-images/android-35-ext15/android-wear/arm64-v8a",
@@ -12120,7 +12120,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-x86_64",
           "path": "system-images/android-35-ext15/android-wear/x86_64",
@@ -12167,7 +12167,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis/arm64-v8a",
@@ -12216,7 +12216,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis-x86_64",
           "path": "system-images/android-35-ext15/google_apis/x86_64",
@@ -12267,7 +12267,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis_playstore/arm64-v8a",
@@ -12316,7 +12316,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis_playstore-x86_64",
           "path": "system-images/android-35-ext15/google_apis_playstore/x86_64",
@@ -12369,7 +12369,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-arm64-v8a",
           "path": "system-images/android-36/android-tv/arm64-v8a",
@@ -12414,7 +12414,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-x86",
           "path": "system-images/android-36/android-tv/x86",
@@ -12459,7 +12459,7 @@
             }
           },
           "displayName": "Android TV Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-x86_64",
           "path": "system-images/android-36/android-tv/x86_64",
@@ -12494,7 +12494,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 ARM 64 v8a System Image (signed)",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-arm64-v8a",
           "path": "system-images/android-36/android-wear-signed/arm64-v8a",
@@ -12527,7 +12527,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-x86_64",
           "path": "system-images/android-36/android-wear-signed/x86_64",
@@ -12574,7 +12574,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36-default-arm64-v8a",
           "path": "system-images/android-36/default/arm64-v8a",
@@ -12619,7 +12619,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36-default-x86_64",
           "path": "system-images/android-36/default/x86_64",
@@ -12666,7 +12666,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis-arm64-v8a",
           "path": "system-images/android-36/google_apis/arm64-v8a",
@@ -12715,7 +12715,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis-x86_64",
           "path": "system-images/android-36/google_apis/x86_64",
@@ -12766,7 +12766,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore/arm64-v8a",
@@ -12815,7 +12815,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis_playstore-x86_64",
           "path": "system-images/android-36/google_apis_playstore/x86_64",
@@ -12866,7 +12866,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore_ps16k/arm64-v8a",
@@ -12919,7 +12919,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36-page_size_16kb-x86_64",
           "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64",
@@ -12964,7 +12964,7 @@
             }
           ],
           "displayName": "Wear OS 6.1 ARM 64 v8a System Image (signed)",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36.1-android-wear-arm64-v8a",
           "path": "system-images/android-36.1/android-wear-signed/arm64-v8a",
@@ -12997,7 +12997,7 @@
             }
           ],
           "displayName": "Wear OS 6.1 Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36.1-android-wear-x86_64",
           "path": "system-images/android-36.1/android-wear-signed/x86_64",
@@ -13044,7 +13044,7 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_ps16k/arm64-v8a",
@@ -13102,7 +13102,7 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis-x86_64",
           "path": "system-images/android-36.1/google_apis_ps16k/x86_64",
@@ -13162,7 +13162,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/arm64-v8a",
@@ -13220,7 +13220,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis_playstore-x86_64",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/x86_64",
@@ -13390,7 +13390,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis/arm64-v8a",
@@ -13439,7 +13439,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis-x86_64",
           "path": "system-images/android-36-ext19/google_apis/x86_64",
@@ -13490,7 +13490,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis_playstore/arm64-v8a",
@@ -13539,7 +13539,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis_playstore-x86_64",
           "path": "system-images/android-36-ext19/google_apis_playstore/x86_64",
@@ -13580,7 +13580,7 @@
             }
           ],
           "displayName": "Wear OS 7.0 - Preview ARM 64 v8a System Image (signed)",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-37.0-android-wear-arm64-v8a",
           "path": "system-images/android-37.0/android-wear-signed/arm64-v8a",
@@ -13613,7 +13613,7 @@
             }
           ],
           "displayName": "Wear OS 7.0 - Preview Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-37.0-android-wear-x86_64",
           "path": "system-images/android-37.0/android-wear-signed/x86_64",
@@ -13642,9 +13642,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "ab0e60335152d75d3fabaaa23438190d0a66be51",
-              "size": 2201073607,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-37.0_r04.zip"
+              "sha1": "93d7deda1913754c8a1e5e67707f32ea3b66a1b3",
+              "size": 2100142209,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-37.0_r05.zip"
             }
           ],
           "dependencies": {
@@ -13660,15 +13660,16 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-37.0-google_apis-arm64-v8a",
           "path": "system-images/android-37.0/google_apis_ps16k/arm64-v8a",
           "revision": "37.0-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "4"
+            "major:0": "5"
           },
           "type-details": {
+            "abi:6": "arm64-v8a",
             "abi:7": "arm64-v8a",
             "api-level:0": "37.0",
             "base-extension:2": "true",
@@ -13688,6 +13689,10 @@
               "display:1": "AI Glasses Compatible",
               "id:0": "ai_glasses_compatible"
             },
+            "vendor:5": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            },
             "vendor:6": {
               "display:1": "Google Inc.",
               "id:0": "google"
@@ -13699,9 +13704,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "d8754fe51083e036070dc7b58c1f297e244deff1",
-              "size": 2181070454,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-37.0_r04.zip"
+              "sha1": "c4332566131ac50b3d49d1ffad37492ef40eaefe",
+              "size": 2078450851,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-37.0_r05.zip"
             }
           ],
           "dependencies": {
@@ -13717,15 +13722,16 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-37.0-google_apis-x86_64",
           "path": "system-images/android-37.0/google_apis_ps16k/x86_64",
           "revision": "37.0-google_apis-x86_64",
           "revision-details": {
-            "major:0": "4"
+            "major:0": "5"
           },
           "type-details": {
+            "abi:6": "x86_64",
             "abi:7": "x86_64",
             "api-level:0": "37.0",
             "base-extension:2": "true",
@@ -13745,6 +13751,10 @@
               "display:1": "AI Glasses Compatible",
               "id:0": "ai_glasses_compatible"
             },
+            "vendor:5": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            },
             "vendor:6": {
               "display:1": "Google Inc.",
               "id:0": "google"
@@ -13758,9 +13768,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "d7756dd1e4e2d93b774be1624cf73037d0259d7d",
-              "size": 2319010289,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-37.0_r04.zip"
+              "sha1": "b3cd0b0e6a53efbc5036c0ef89f23177821d0939",
+              "size": 2216674212,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-37.0_r05.zip"
             }
           ],
           "dependencies": {
@@ -13776,15 +13786,16 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-37.0-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-37.0/google_apis_playstore_ps16k/arm64-v8a",
           "revision": "37.0-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "4"
+            "major:0": "5"
           },
           "type-details": {
+            "abi:6": "arm64-v8a",
             "abi:7": "arm64-v8a",
             "api-level:0": "37.0",
             "base-extension:2": "true",
@@ -13804,6 +13815,10 @@
               "display:1": "AI Glasses Compatible",
               "id:0": "ai_glasses_compatible"
             },
+            "vendor:5": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            },
             "vendor:6": {
               "display:1": "Google Inc.",
               "id:0": "google"
@@ -13815,9 +13830,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "e187789f6e20c728636bc99fa0b384c6965bf17a",
-              "size": 2322377552,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-37.0_r04.zip"
+              "sha1": "a76705ed2a631a0cad132abdb9aa2eb24c163905",
+              "size": 2217616705,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-37.0_r05.zip"
             }
           ],
           "dependencies": {
@@ -13833,15 +13848,16 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-37.0-google_apis_playstore-x86_64",
           "path": "system-images/android-37.0/google_apis_playstore_ps16k/x86_64",
           "revision": "37.0-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "4"
+            "major:0": "5"
           },
           "type-details": {
+            "abi:6": "x86_64",
             "abi:7": "x86_64",
             "api-level:0": "37.0",
             "base-extension:2": "true",
@@ -13861,6 +13877,10 @@
               "display:1": "AI Glasses Compatible",
               "id:0": "ai_glasses_compatible"
             },
+            "vendor:5": {
+              "display:1": "Google Inc.",
+              "id:0": "google"
+            },
             "vendor:6": {
               "display:1": "Google Inc.",
               "id:0": "google"
@@ -13894,7 +13914,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis/arm64-v8a",
@@ -13944,7 +13964,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis/x86_64",
@@ -13996,7 +14016,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore/arm64-v8a",
@@ -14046,7 +14066,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis_playstore-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore/x86_64",
@@ -14098,7 +14118,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/arm64-v8a",
@@ -14152,7 +14172,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-page_size_16kb-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/x86_64",
@@ -14210,7 +14230,7 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_ps16k/arm64-v8a",
@@ -14273,7 +14293,7 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-CANARY-google_apis-x86_64",
           "path": "system-images/android-CANARY/google_apis_ps16k/x86_64",
@@ -14338,7 +14358,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/arm64-v8a",
@@ -14401,7 +14421,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-CANARY-google_apis_playstore-x86_64",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/x86_64",
@@ -14466,7 +14486,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36.0-CANARY/google_apis_playstore_ps16k/arm64-v8a",
@@ -14520,7 +14540,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-preview-license",
           "name": "system-image-CANARY-page_size_16kb-x86_64",
           "path": "system-images/android-36.0-CANARY/google_apis_playstore_ps16k/x86_64",
@@ -14578,7 +14598,7 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CinnamonBun-google_apis-arm64-v8a",
           "path": "system-images/android-CinnamonBun/google_apis_ps16k/arm64-v8a",
@@ -14641,7 +14661,7 @@
             }
           },
           "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-CinnamonBun-google_apis-x86_64",
           "path": "system-images/android-CinnamonBun/google_apis_ps16k/x86_64",
@@ -14706,7 +14726,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CinnamonBun-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-CinnamonBun/google_apis_playstore_ps16k/arm64-v8a",
@@ -14769,7 +14789,7 @@
             }
           },
           "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20603,
+          "last-available-day": 20612,
           "license": "android-sdk-license",
           "name": "system-image-CinnamonBun-google_apis_playstore-x86_64",
           "path": "system-images/android-CinnamonBun/google_apis_playstore_ps16k/x86_64",
@@ -15387,7 +15407,7 @@
     "build-tools": "37.0.0",
     "cmake": "4.1.2",
     "cmdline-tools": "20.0",
-    "emulator": "36.6.10",
+    "emulator": "36.6.11",
     "ndk": "29.0.14206865",
     "ndk-bundle": "22.1.7171670",
     "platform-tools": "37.0.0",
@@ -15395,7 +15415,7 @@
     "skiaparser": "8",
     "sources": "37.0",
     "tools": "26.1.1",
-    "fingerprint": "2937e647936072ec"
+    "fingerprint": "b302c79dc7524f10"
   },
   "licenses": {
     "android-googletv-license": [
@@ -15463,7 +15483,7 @@
           }
         ],
         "displayName": "Lightbuild",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build",
         "path": "build/lightbuild/0.0.10-alpha01",
@@ -15518,7 +15538,7 @@
           }
         ],
         "displayName": "Android Project Templates",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build",
         "path": "build/templates",
@@ -15568,7 +15588,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 17",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15617,7 +15637,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15666,7 +15686,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15715,7 +15735,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15764,7 +15784,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15813,7 +15833,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15862,7 +15882,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15911,7 +15931,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15960,7 +15980,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/19.1.0",
@@ -16008,7 +16028,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 20",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/20.0.0",
@@ -16056,7 +16076,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16105,7 +16125,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16154,7 +16174,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16203,7 +16223,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16252,7 +16272,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16301,7 +16321,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/21.1.2",
@@ -16349,7 +16369,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16398,7 +16418,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/22.0.1",
@@ -16446,7 +16466,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16495,7 +16515,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.1",
@@ -16543,7 +16563,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.2",
@@ -16591,7 +16611,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.3",
@@ -16639,7 +16659,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.0",
@@ -16687,7 +16707,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.1",
@@ -16735,7 +16755,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.2",
@@ -16783,7 +16803,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.3",
@@ -16831,7 +16851,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.0",
@@ -16879,7 +16899,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.1",
@@ -16927,7 +16947,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.2",
@@ -16975,7 +16995,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.3",
@@ -17023,7 +17043,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.0",
@@ -17071,7 +17091,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.1",
@@ -17119,7 +17139,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.2",
@@ -17167,7 +17187,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.3",
@@ -17215,7 +17235,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.0",
@@ -17263,7 +17283,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.1",
@@ -17311,7 +17331,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.2",
@@ -17359,7 +17379,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.3",
@@ -17407,7 +17427,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.0",
@@ -17455,7 +17475,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17505,7 +17525,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17555,7 +17575,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.1",
@@ -17603,7 +17623,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.2",
@@ -17651,7 +17671,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.3",
@@ -17699,7 +17719,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.0",
@@ -17747,7 +17767,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17797,7 +17817,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17847,7 +17867,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17897,7 +17917,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.1",
@@ -17945,7 +17965,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.2",
@@ -17993,7 +18013,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.3",
@@ -18041,7 +18061,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.0",
@@ -18089,7 +18109,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.1",
@@ -18137,7 +18157,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.2",
@@ -18185,7 +18205,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.3",
@@ -18226,7 +18246,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 31",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/31.0.0",
@@ -18267,7 +18287,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/32.0.0",
@@ -18308,7 +18328,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32.1-rc1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/32.1.0-rc1",
@@ -18350,7 +18370,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.0",
@@ -18391,7 +18411,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.1",
@@ -18432,7 +18452,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.2",
@@ -18473,7 +18493,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.3",
@@ -18514,7 +18534,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0",
@@ -18555,7 +18575,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc1",
@@ -18597,7 +18617,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc2",
@@ -18639,7 +18659,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc3",
@@ -18681,7 +18701,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0",
@@ -18722,7 +18742,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc1",
@@ -18764,7 +18784,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc2",
@@ -18806,7 +18826,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc3",
@@ -18848,7 +18868,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc4",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc4",
@@ -18890,7 +18910,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35.0.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.1",
@@ -18931,7 +18951,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0",
@@ -18972,7 +18992,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc1",
@@ -19014,7 +19034,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc3",
@@ -19056,7 +19076,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc4",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc4",
@@ -19098,7 +19118,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc5",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc5",
@@ -19140,7 +19160,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0",
@@ -19181,7 +19201,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1-rc1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0-rc1",
@@ -19223,7 +19243,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0",
@@ -19264,7 +19284,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37-rc1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0-rc1",
@@ -19306,7 +19326,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37-rc2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0-rc2",
@@ -19357,7 +19377,7 @@
           }
         ],
         "displayName": "CMake 3.10.2.4988404",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.10.2.4988404",
@@ -19398,7 +19418,7 @@
           }
         ],
         "displayName": "CMake 3.18.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.18.1",
@@ -19439,7 +19459,7 @@
           }
         ],
         "displayName": "CMake 3.22.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.22.1",
@@ -19480,7 +19500,7 @@
           }
         ],
         "displayName": "CMake 3.30.3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.3",
@@ -19521,7 +19541,7 @@
           }
         ],
         "displayName": "CMake 3.30.4",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.4",
@@ -19562,7 +19582,7 @@
           }
         ],
         "displayName": "CMake 3.30.5",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.5",
@@ -19603,7 +19623,7 @@
           }
         ],
         "displayName": "CMake 3.31.0",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.0",
@@ -19644,7 +19664,7 @@
           }
         ],
         "displayName": "CMake 3.31.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.1",
@@ -19685,7 +19705,7 @@
           }
         ],
         "displayName": "CMake 3.31.4",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.4",
@@ -19726,7 +19746,7 @@
           }
         ],
         "displayName": "CMake 3.31.5",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.5",
@@ -19767,7 +19787,7 @@
           }
         ],
         "displayName": "CMake 3.31.6",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.6",
@@ -19815,7 +19835,7 @@
           }
         ],
         "displayName": "CMake 3.6.4111459",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.6.4111459",
@@ -19856,7 +19876,7 @@
           }
         ],
         "displayName": "CMake 4.0.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.2",
@@ -19897,7 +19917,7 @@
           }
         ],
         "displayName": "CMake 4.0.3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.3",
@@ -19938,7 +19958,7 @@
           }
         ],
         "displayName": "CMake 4.1.0",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.0",
@@ -19979,7 +19999,7 @@
           }
         ],
         "displayName": "CMake 4.1.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.1",
@@ -20020,7 +20040,7 @@
           }
         ],
         "displayName": "CMake 4.1.2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.2",
@@ -20063,7 +20083,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/1.0",
@@ -20103,7 +20123,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/10.0",
@@ -20143,7 +20163,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/11.0",
@@ -20183,7 +20203,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/12.0",
@@ -20223,7 +20243,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0",
@@ -20263,7 +20283,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0-rc01",
@@ -20304,7 +20324,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/14.0-alpha01",
@@ -20345,7 +20365,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0",
@@ -20385,7 +20405,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0-alpha01",
@@ -20426,7 +20446,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/17.0",
@@ -20466,7 +20486,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0",
@@ -20506,7 +20526,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0-alpha01",
@@ -20547,7 +20567,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "obsolete": "true",
@@ -20588,7 +20608,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/2.1",
@@ -20628,7 +20648,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/20.0",
@@ -20668,7 +20688,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/3.0",
@@ -20708,7 +20728,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/4.0",
@@ -20748,7 +20768,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/5.0",
@@ -20788,7 +20808,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/6.0",
@@ -20828,7 +20848,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/7.0",
@@ -20868,7 +20888,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/8.0",
@@ -20908,7 +20928,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/9.0",
@@ -22239,6 +22259,54 @@
           }
         }
       },
+      "36.6.11": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "f8d8b83cf21a04966326eb1378bacda255f63b93",
+            "size": 331232577,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-15507667.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "0a0c9409692d73d31c860e50f6ae59a74211afe7",
+            "size": 448835510,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-15507667.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "45328141bb585e096a5bebf870ff351e140bcda3",
+            "size": 383903546,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-15507667.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "d5f07a99221c6e528a4942887dc36ada7d1602f8",
+            "size": 418510366,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-15507667.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20612,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.6.11",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "11",
+          "minor:1": "6"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "36.6.2": {
         "archives": [
           {
@@ -22478,6 +22546,54 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "37.1.2": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "e1a50b5fa26c771fbb18c747944907aa67b1ca96",
+            "size": 347618707,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-15513348.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "2ffa9109d7ab2014a22704ae82444e55401ea829",
+            "size": 462567414,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-15513348.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "cd3a21cb3018f7c70c0f3587a827ed36e9b055f3",
+            "size": 396951355,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-15513348.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "560880168862a4278494cb5d183374ddae50e135",
+            "size": 429551646,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-15513348.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20612,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "37.1.2",
+        "revision-details": {
+          "major:0": "37",
+          "micro:2": "2",
+          "minor:1": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "extras": {
@@ -22603,7 +22719,7 @@
           }
         },
         "displayName": "NDK (Side by side) 16.1.4479499",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/16.1.4479499",
@@ -22665,7 +22781,7 @@
           }
         },
         "displayName": "NDK (Side by side) 17.2.4988734",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/17.2.4988734",
@@ -22727,7 +22843,7 @@
           }
         },
         "displayName": "NDK (Side by side) 18.1.5063045",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/18.1.5063045",
@@ -22789,7 +22905,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.0.5232133",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "obsolete": "true",
@@ -22852,7 +22968,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.2.5345600",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/19.2.5345600",
@@ -22914,7 +23030,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5392854",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -22978,7 +23094,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5471264",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -23042,7 +23158,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5594570",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.0.5594570",
@@ -23104,7 +23220,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.1.5948944",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.1.5948944",
@@ -23152,7 +23268,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6011959",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.0.6011959",
@@ -23201,7 +23317,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6113669",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.0.6113669",
@@ -23249,7 +23365,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6210238",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6210238",
@@ -23305,7 +23421,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6273396",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6273396",
@@ -23361,7 +23477,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6352462",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.1.6352462",
@@ -23416,7 +23532,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6363665",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6363665",
@@ -23472,7 +23588,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.2.6472646",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.2.6472646",
@@ -23527,7 +23643,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.3.6528147",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.3.6528147",
@@ -23582,7 +23698,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.4.7075529",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.4.7075529",
@@ -23637,7 +23753,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.6917172",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/22.0.6917172",
@@ -23693,7 +23809,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.7026061",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.0.7026061",
@@ -23748,7 +23864,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.1.7171670",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.1.7171670",
@@ -23803,7 +23919,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7123448",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7123448",
@@ -23859,7 +23975,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7196353",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7196353",
@@ -23915,7 +24031,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7272597",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7272597",
@@ -23971,7 +24087,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7344513",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7344513",
@@ -24020,7 +24136,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7421159",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7421159",
@@ -24069,7 +24185,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7530507",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7530507",
@@ -24118,7 +24234,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7599858",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.0.7599858",
@@ -24166,7 +24282,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.1.7779620",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.1.7779620",
@@ -24214,7 +24330,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.2.8568313",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.2.8568313",
@@ -24262,7 +24378,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7856742",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7856742",
@@ -24311,7 +24427,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7956693",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7956693",
@@ -24360,7 +24476,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8079956",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.8079956",
@@ -24409,7 +24525,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8215888",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/24.0.8215888",
@@ -24457,7 +24573,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8151533",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8151533",
@@ -24506,7 +24622,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8221429",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8221429",
@@ -24555,7 +24671,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8355429",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8355429",
@@ -24604,7 +24720,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8528842",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8528842",
@@ -24653,7 +24769,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8775105",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.0.8775105",
@@ -24701,7 +24817,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.1.8937393",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.1.8937393",
@@ -24749,7 +24865,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.2.9519653",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.2.9519653",
@@ -24797,7 +24913,7 @@
           }
         },
         "displayName": "NDK (Side by side) 26.0.10404224",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10404224",
@@ -24839,7 +24955,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10636728",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10636728",
@@ -24881,7 +24997,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10792818",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.0.10792818",
@@ -24922,7 +25038,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.1.10909125",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.1.10909125",
@@ -24963,7 +25079,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.2.11394342",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.2.11394342",
@@ -25004,7 +25120,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.3.11579264",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.3.11579264",
@@ -25045,7 +25161,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11718014",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11718014",
@@ -25087,7 +25203,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11902837",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11902837",
@@ -25129,7 +25245,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.12077973",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.0.12077973",
@@ -25170,7 +25286,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.1.12297006",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.1.12297006",
@@ -25211,7 +25327,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.2.12479018",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.2.12479018",
@@ -25252,7 +25368,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.3.13750724",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.3.13750724",
@@ -25293,7 +25409,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12433566",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12433566",
@@ -25335,7 +25451,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12674087",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12674087",
@@ -25377,7 +25493,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12916984",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12916984",
@@ -25419,7 +25535,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.13004108",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.0.13004108",
@@ -25460,7 +25576,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.1.13356709",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.1.13356709",
@@ -25501,7 +25617,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.2.13676358",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.2.13676358",
@@ -25542,7 +25658,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13113456",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13113456",
@@ -25584,7 +25700,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13599879",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13599879",
@@ -25626,7 +25742,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13846066",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13846066",
@@ -25668,7 +25784,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14033849",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.14033849",
@@ -25710,7 +25826,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14206865",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/29.0.14206865",
@@ -25751,7 +25867,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 30.0.14904198",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/30.0.14904198",
@@ -25816,7 +25932,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25878,7 +25994,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25940,7 +26056,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26002,7 +26118,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -26065,7 +26181,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26127,7 +26243,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -26191,7 +26307,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -26255,7 +26371,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26317,7 +26433,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26365,7 +26481,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26414,7 +26530,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26462,7 +26578,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26518,7 +26634,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26574,7 +26690,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26629,7 +26745,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26685,7 +26801,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26740,7 +26856,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26795,7 +26911,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26850,7 +26966,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26906,7 +27022,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26961,7 +27077,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27016,7 +27132,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27072,7 +27188,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27128,7 +27244,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27184,7 +27300,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27393,7 +27509,7 @@
           }
         ],
         "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platform-tools",
         "path": "platform-tools",
@@ -27422,7 +27538,7 @@
           }
         ],
         "displayName": "Android SDK Platform 10",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-10",
@@ -27460,7 +27576,7 @@
           }
         ],
         "displayName": "Android SDK Platform 11",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-11",
@@ -27498,7 +27614,7 @@
           }
         ],
         "displayName": "Android SDK Platform 12",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-12",
@@ -27536,7 +27652,7 @@
           }
         ],
         "displayName": "Android SDK Platform 13",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-13",
@@ -27574,7 +27690,7 @@
           }
         ],
         "displayName": "Android SDK Platform 14",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-14",
@@ -27612,7 +27728,7 @@
           }
         ],
         "displayName": "Android SDK Platform 15",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-15",
@@ -27650,7 +27766,7 @@
           }
         ],
         "displayName": "Android SDK Platform 16",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-16",
@@ -27688,7 +27804,7 @@
           }
         ],
         "displayName": "Android SDK Platform 17",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-17",
@@ -27726,7 +27842,7 @@
           }
         ],
         "displayName": "Android SDK Platform 18",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-18",
@@ -27764,7 +27880,7 @@
           }
         ],
         "displayName": "Android SDK Platform 19",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-19",
@@ -27816,7 +27932,7 @@
           }
         ],
         "displayName": "Android SDK Platform 2",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -27855,7 +27971,7 @@
           }
         ],
         "displayName": "Android SDK Platform 20",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-20",
@@ -27893,7 +28009,7 @@
           }
         ],
         "displayName": "Android SDK Platform 21",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-21",
@@ -27931,7 +28047,7 @@
           }
         ],
         "displayName": "Android SDK Platform 22",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-22",
@@ -27969,7 +28085,7 @@
           }
         ],
         "displayName": "Android SDK Platform 23",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-23",
@@ -28007,7 +28123,7 @@
           }
         ],
         "displayName": "Android SDK Platform 24",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-24",
@@ -28045,7 +28161,7 @@
           }
         ],
         "displayName": "Android SDK Platform 25",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-25",
@@ -28083,7 +28199,7 @@
           }
         ],
         "displayName": "Android SDK Platform 26",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-26",
@@ -28121,7 +28237,7 @@
           }
         ],
         "displayName": "Android SDK Platform 27",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-27",
@@ -28159,7 +28275,7 @@
           }
         ],
         "displayName": "Android SDK Platform 28",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-28",
@@ -28197,7 +28313,7 @@
           }
         ],
         "displayName": "Android SDK Platform 29",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-29",
@@ -28249,7 +28365,7 @@
           }
         ],
         "displayName": "Android SDK Platform 3",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28288,7 +28404,7 @@
           }
         ],
         "displayName": "Android SDK Platform 30",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-30",
@@ -28326,7 +28442,7 @@
           }
         ],
         "displayName": "Android SDK Platform 31",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-31",
@@ -28364,7 +28480,7 @@
           }
         ],
         "displayName": "Android SDK Platform 32",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-32",
@@ -28402,7 +28518,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33",
@@ -28441,7 +28557,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33-ext5",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33-ext5",
@@ -28475,7 +28591,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28520,7 +28636,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34-ext12",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-34-ext12",
@@ -28553,7 +28669,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35",
@@ -28591,7 +28707,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35-ext15",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35-ext15",
@@ -28624,7 +28740,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36",
@@ -28657,7 +28773,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36.1",
@@ -28690,7 +28806,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36-ext19",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36-ext19",
@@ -28717,19 +28833,19 @@
           {
             "arch": "all",
             "os": "all",
-            "sha1": "1a9a8c2e2a5ab8cd95f2eded7d9da037e62fbc6f",
-            "size": 67204348,
-            "url": "https://dl.google.com/android/repository/platform-37.0_r01.zip"
+            "sha1": "ed8ebf7f8822a4de5686d427f237d2fa30ff7410",
+            "size": 67281901,
+            "url": "https://dl.google.com/android/repository/platform-37.0_r02.zip"
           }
         ],
         "displayName": "Android SDK Platform 37.0",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-37.0",
         "revision": "37.0",
         "revision-details": {
-          "major:0": "1"
+          "major:0": "2"
         },
         "type-details": {
           "api-level:0": "37.0",
@@ -28771,7 +28887,7 @@
           }
         ],
         "displayName": "Android SDK Platform 4",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28824,7 +28940,7 @@
           }
         ],
         "displayName": "Android SDK Platform 5",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28877,7 +28993,7 @@
           }
         ],
         "displayName": "Android SDK Platform 6",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28916,7 +29032,7 @@
           }
         ],
         "displayName": "Android SDK Platform 7",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-7",
@@ -28954,7 +29070,7 @@
           }
         ],
         "displayName": "Android SDK Platform 8",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-8",
@@ -28992,7 +29108,7 @@
           }
         ],
         "displayName": "Android SDK Platform 9",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-9",
@@ -29030,7 +29146,7 @@
           }
         ],
         "displayName": "Android SDK Platform Baklava-ext19",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-Baklava-ext19",
@@ -29064,7 +29180,7 @@
           }
         ],
         "displayName": "Android SDK Platform CANARY",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-CANARY",
@@ -29098,7 +29214,7 @@
           }
         ],
         "displayName": "Android SDK Platform CinnamonBun-ext23",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-CinnamonBun-ext23",
@@ -29163,7 +29279,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCake",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29281,7 +29397,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API S",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
@@ -29402,7 +29518,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 29-30",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/1",
@@ -29494,7 +29610,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 31-36",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/3",
@@ -29521,7 +29637,7 @@
           }
         ],
         "displayName": "Sources for Android 14",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "obsolete": "true",
@@ -29550,7 +29666,7 @@
           }
         ],
         "displayName": "Sources for Android 15",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-15",
@@ -29578,7 +29694,7 @@
           }
         ],
         "displayName": "Sources for Android 16",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-16",
@@ -29606,7 +29722,7 @@
           }
         ],
         "displayName": "Sources for Android 17",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-17",
@@ -29634,7 +29750,7 @@
           }
         ],
         "displayName": "Sources for Android 18",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-18",
@@ -29662,7 +29778,7 @@
           }
         ],
         "displayName": "Sources for Android 19",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-19",
@@ -29690,7 +29806,7 @@
           }
         ],
         "displayName": "Sources for Android 20",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-20",
@@ -29718,7 +29834,7 @@
           }
         ],
         "displayName": "Sources for Android 21",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-21",
@@ -29746,7 +29862,7 @@
           }
         ],
         "displayName": "Sources for Android 22",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-22",
@@ -29774,7 +29890,7 @@
           }
         ],
         "displayName": "Sources for Android 23",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-23",
@@ -29802,7 +29918,7 @@
           }
         ],
         "displayName": "Sources for Android 24",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-24",
@@ -29830,7 +29946,7 @@
           }
         ],
         "displayName": "Sources for Android 25",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-25",
@@ -29858,7 +29974,7 @@
           }
         ],
         "displayName": "Sources for Android 26",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-26",
@@ -29886,7 +30002,7 @@
           }
         ],
         "displayName": "Sources for Android 27",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-27",
@@ -29914,7 +30030,7 @@
           }
         ],
         "displayName": "Sources for Android 28",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-28",
@@ -29942,7 +30058,7 @@
           }
         ],
         "displayName": "Sources for Android 29",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-29",
@@ -29970,7 +30086,7 @@
           }
         ],
         "displayName": "Sources for Android 30",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-30",
@@ -29998,7 +30114,7 @@
           }
         ],
         "displayName": "Sources for Android 31",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-31",
@@ -30026,7 +30142,7 @@
           }
         ],
         "displayName": "Sources for Android 32",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-32",
@@ -30054,7 +30170,7 @@
           }
         ],
         "displayName": "Sources for Android 33",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-33",
@@ -30083,7 +30199,7 @@
           }
         ],
         "displayName": "Sources for Android 34",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-34",
@@ -30112,7 +30228,7 @@
           }
         ],
         "displayName": "Sources for Android 35",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-35",
@@ -30141,7 +30257,7 @@
           }
         ],
         "displayName": "Sources for Android 36",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36",
@@ -30169,7 +30285,7 @@
           }
         ],
         "displayName": "Sources for Android 36.1",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36.1",
@@ -30191,19 +30307,19 @@
           {
             "arch": "all",
             "os": "all",
-            "sha1": "5dc25b723b23edfcb9604bc2917acdea265fd6fb",
-            "size": 52760617,
-            "url": "https://dl.google.com/android/repository/source-37.0_r01.zip"
+            "sha1": "759b8d2ef7e3ee01bb1ddc7d524cb26ec90dc928",
+            "size": 52891611,
+            "url": "https://dl.google.com/android/repository/source-37.0_r02.zip"
           }
         ],
         "displayName": "Sources for Android 37.0",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-37.0",
         "revision": "37.0",
         "revision-details": {
-          "major:0": "1"
+          "major:0": "2"
         },
         "type-details": {
           "api-level:0": "37.0",
@@ -30265,7 +30381,7 @@
           }
         },
         "displayName": "Android SDK Tools",
-        "last-available-day": 20603,
+        "last-available-day": 20612,
         "license": "android-sdk-license",
         "name": "tools",
         "obsolete": "true",

From 0bf569ec99e649a1bd4c9857dca2e09e0e68f618 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 06:22:03 +0000
Subject: [PATCH 065/128] frida-tools: 14.6.1 -> 14.9.0

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

diff --git a/pkgs/by-name/fr/frida-tools/package.nix b/pkgs/by-name/fr/frida-tools/package.nix
index d3a7c64dfc58..d147b8f75ce7 100644
--- a/pkgs/by-name/fr/frida-tools/package.nix
+++ b/pkgs/by-name/fr/frida-tools/package.nix
@@ -6,13 +6,13 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "frida-tools";
-  version = "14.6.1";
+  version = "14.9.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) version;
     pname = "frida_tools";
-    hash = "sha256-EwpoRBHT6NyR1sHV4oEXqu5R/Wcud4n3DWxEkeZXdzM=";
+    hash = "sha256-9S/PtdcyFV/9c3pNrmhpqBg8hXtGkqtUyoX1SzXHxtE=";
   };
 
   build-system = with python3Packages; [

From c50e750c2d7bd1d9c7c29b4a215f71ecca1b4f37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 06:41:27 +0000
Subject: [PATCH 066/128] music-assistant-desktop: 0.3.7 -> 0.3.9

---
 pkgs/by-name/mu/music-assistant-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mu/music-assistant-desktop/package.nix b/pkgs/by-name/mu/music-assistant-desktop/package.nix
index 77be62afb2a9..77733a10003b 100644
--- a/pkgs/by-name/mu/music-assistant-desktop/package.nix
+++ b/pkgs/by-name/mu/music-assistant-desktop/package.nix
@@ -30,13 +30,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "music-assistant-desktop";
-  version = "0.3.7";
+  version = "0.3.9";
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "desktop-app";
     tag = finalAttrs.version;
-    hash = "sha256-QhKc5GBUnI1ae6+XK14YRWEpWuVtL6s90sSuWKLwNpk=";
+    hash = "sha256-fogNPPdbU8ikTxxaGDYsqR6GCcAsc2fS4qapVDkesAQ=";
   };
 
   # hide update feature
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoRoot = "src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
-  cargoHash = "sha256-rd0kvUTAi4fOh3hxCY1cmkkLWsxNPxVmPVzB9uEv/8c=";
+  cargoHash = "sha256-xi6Clo8iHg3YFVcWNMFrN2422MZm2BhB9m/etFlyb/4=";
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";

From 9984cc19a123cc5c750c133227466b313a4bc776 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 8 Jun 2026 09:03:26 +0200
Subject: [PATCH 067/128] meshtastic-web: pnpm_9 -> pnpm_10

---
 pkgs/by-name/me/meshtastic-web/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/me/meshtastic-web/package.nix b/pkgs/by-name/me/meshtastic-web/package.nix
index 7d956162ec67..e9a2cfed3289 100644
--- a/pkgs/by-name/me/meshtastic-web/package.nix
+++ b/pkgs/by-name/me/meshtastic-web/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   nodejs,
@@ -29,19 +29,19 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmWorkspaces = [ "*" ];
   pnpmRoot = "packages/web";
   pnpmDeps = fetchPnpmDeps {
-    pnpm = pnpm_9;
+    pnpm = pnpm_10;
+    fetcherVersion = 4;
     inherit (finalAttrs)
       pname
       version
       src
       pnpmWorkspaces
       ;
-    fetcherVersion = 3;
-    hash = "sha256-yUdPrZAnCsxIiF++SxTm1VuVAEKIzTsp2qd/WcCPOcQ=";
+    hash = "sha256-0o/g5FVzSGX9xtQ8DZGjakwOnPXvlA95tdD/VNymB1M=";
   };
 
   nativeBuildInputs = [
-    pnpm_9
+    pnpm_10
     pnpmConfigHook
     nodejs
   ];

From b270a194d844f69c8512ea65b7d17cf02fb99eb1 Mon Sep 17 00:00:00 2001
From: Daste <stefankar1000@gmail.com>
Date: Mon, 8 Jun 2026 11:51:45 +0200
Subject: [PATCH 068/128] jellyfin-tui: 1.4.2 -> 1.5.0

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

diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix
index 22d7df003201..3a9baa010409 100644
--- a/pkgs/by-name/je/jellyfin-tui/package.nix
+++ b/pkgs/by-name/je/jellyfin-tui/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jellyfin-tui";
-  version = "1.4.2";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "dhonus";
     repo = "jellyfin-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GumYBQkdTNR+sfEY0l5xHjtFM9Z9sn/2H+yVzC0MEe4=";
+    hash = "sha256-BeZyJQ04S2Vnqx3sTFe6a0s56KckIzOIfOVz+bkhBoY=";
   };
 
-  cargoHash = "sha256-1FUmCACPm9TaURMLXrNODnVtx8FQ6FeAkwF2ucgezhk=";
+  cargoHash = "sha256-MP6wso9YlxJdN8WPuU149C5Hn3KeL+CekpPyN21ioA0=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From 30372d4ada5257ec8111684a6a4e7c3b665f2fbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 11:24:31 +0000
Subject: [PATCH 069/128] az-pim-cli: 1.14.0 -> 1.15.0

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

diff --git a/pkgs/by-name/az/az-pim-cli/package.nix b/pkgs/by-name/az/az-pim-cli/package.nix
index 50255d4328c3..a0fb01757576 100644
--- a/pkgs/by-name/az/az-pim-cli/package.nix
+++ b/pkgs/by-name/az/az-pim-cli/package.nix
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "az-pim-cli";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "netr0m";
     repo = "az-pim-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2WhinTxFCNLgw2TejoulhGXJwnUHP/CyC/Gwedv/8Xw=";
+    hash = "sha256-Pqc8pWicVORcoTXg7oT8SX1BwDRSjLHuqyyBZ6q7eio=";
   };
 
   patches = [

From 7139ca02789f6e914be7ccd5dfb2b2f626abfba6 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 8 Jun 2026 19:40:17 +0700
Subject: [PATCH 070/128] python3Packages.chai: drop

---
 .../python-modules/chai/default.nix           | 29 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 pkgs/development/python-modules/chai/default.nix

diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix
deleted file mode 100644
index 907de8a8cdc9..000000000000
--- a/pkgs/development/python-modules/chai/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "chai";
-  version = "1.1.2";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ff8d2b6855f660cd23cd5ec79bd10264d39f24f6235773331b48e7fcd637d6cc";
-  };
-
-  postPatch = ''
-    # python 3.12 compatibility
-    substituteInPlace tests/*.py \
-      --replace "assertEquals" "assertEqual" \
-      --replace "assertNotEquals" "assertNotEqual" \
-      --replace "assert_equals" "assert_equal"
-  '';
-
-  meta = {
-    description = "Mocking, stubbing and spying framework for python";
-    license = lib.licenses.bsd3;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 6163988c63f0..1a4d9b53fafa 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -130,6 +130,7 @@ mapAliases {
   can = throw "'can' has been renamed to/replaced by 'python-can'"; # Converted to throw 2025-10-29
   casbin = pycasbin; # added 2025-06-12
   cchardet = throw "'cchardet' has been renamed to/replaced by 'faust-cchardet'"; # Converted to throw 2025-10-29
+  chai = throw "'chai' has been removed as it is no longer maintained upstream and the repository was archived"; # Added 2026-06-08
   characteristic = throw "'characteristic' has been removed because it is no longer maintained upstream"; # Added 2026-01-14
   chart-studio = throw "'chart-studio' has been removed as it is no longer maintained upstream"; # Added 2026-03-12
   chromeprint = throw "'chromaprint' was removed as it depended on m2r which was removed."; # Added 2026-05-27
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89ca0b58fe5f..eb8471ccecc4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2691,8 +2691,6 @@ self: super: with self; {
     callPackage ../development/python-modules/chacha20poly1305-reuseable
       { };
 
-  chai = callPackage ../development/python-modules/chai { };
-
   chainmap = callPackage ../development/python-modules/chainmap { };
 
   chainstream = callPackage ../development/python-modules/chainstream { };

From 54d9241d9a142e11dca58ecb44d1bdbaf2929e9e Mon Sep 17 00:00:00 2001
From: HigherOrderLogic <73709188+HigherOrderLogic@users.noreply.github.com>
Date: Mon, 8 Jun 2026 15:51:24 +0000
Subject: [PATCH 071/128] taze: bump to pnpm 11

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

diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix
index 3c0d016a86c7..53666126a855 100644
--- a/pkgs/by-name/ta/taze/package.nix
+++ b/pkgs/by-name/ta/taze/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   nodejs,
-  pnpm_9,
+  pnpm_11,
   fetchPnpmDeps,
   pnpmConfigHook,
   npmHooks,
@@ -23,15 +23,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-c2jBLdxQuIw028xo9cGhLykxARlOjK/R4e63U2UsXCQ=";
+    pnpm = pnpm_11;
+    fetcherVersion = 4;
+    hash = "sha256-6J7yNwtekfMfsqeXWpNeqw4cak7z03494nYlBHRMZH0=";
   };
 
   nativeBuildInputs = [
     nodejs
     pnpmConfigHook
-    pnpm_9
+    pnpm_11
     npmHooks.npmInstallHook
   ];
 

From 938ee4c22d5569f8f710a07b090a4eeafc99e68a Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Mon, 8 Jun 2026 19:11:16 +0200
Subject: [PATCH 072/128] offlineimap: 8.0.2 -> 8.0.3

Changelog: https://github.com/OfflineIMAP/offlineimap3/blob/v8.0.3/Changelog.md#offlineimap-v803-2026-06-08
---
 pkgs/by-name/of/offlineimap/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/of/offlineimap/package.nix b/pkgs/by-name/of/offlineimap/package.nix
index 313391fd1a14..8b4cb8634bf3 100644
--- a/pkgs/by-name/of/offlineimap/package.nix
+++ b/pkgs/by-name/of/offlineimap/package.nix
@@ -14,14 +14,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "offlineimap";
-  version = "8.0.2";
+  version = "8.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OfflineIMAP";
     repo = "offlineimap3";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mysvqltO4x2dD8V+FAGOnDw5lQ8bgDwXFK9n15fbUdI=";
+    hash = "sha256-JWWv3zpiKzQmG8FRFb9h+TnCyR+f7LY3SBgYlcZA+1A=";
   };
 
   postPatch = ''

From c527ba0b94c3a9b7276e7f2abaff459d40c6078c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 8 Jun 2026 13:24:55 -0500
Subject: [PATCH 073/128] borgmatic: switch to finalAttrs, fix eval error with
 optional-dependencies, use strictDeps and structuredAttrs

Assisted-by: Cursor Composer 2.5
---
 pkgs/by-name/bo/borgmatic/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix
index 31ad075a0345..682d8808520e 100644
--- a/pkgs/by-name/bo/borgmatic/package.nix
+++ b/pkgs/by-name/bo/borgmatic/package.nix
@@ -13,13 +13,16 @@
   testers,
   nixosTests,
 }:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "borgmatic";
   version = "2.1.5";
   pyproject = true;
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-T0+E6opyfr7zxfP44OlNuhqsdQyi7OdIXiE5r310LaU=";
   };
 
@@ -33,7 +36,7 @@ python3Packages.buildPythonApplication rec {
       pytest-cov-stub
       pytest-timeout
     ]
-    ++ optional-dependencies.apprise;
+    ++ finalAttrs.passthru.optional-dependencies.apprise;
 
   # - test_borgmatic_version_matches_news_version
   #   NEWS file not available on the pypi source
@@ -48,7 +51,7 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
     borgbackup
     colorama
     jsonschema
@@ -98,4 +101,4 @@ python3Packages.buildPythonApplication rec {
       x123
     ];
   };
-}
+})

From 620e770acf0f35915d3ee219fb6f31ff13d254a5 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 8 Jun 2026 13:34:03 -0500
Subject: [PATCH 074/128] sketchybar-app-font: migrate to pnpm_11

pnpm 9 reached EOL on 2026-04-30. Migrate to pnpm_11 and bump
fetchPnpmDeps to fetcherVersion 4.

Related #529285
---
 pkgs/by-name/sk/sketchybar-app-font/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix
index b51e5117680f..c76bbb6647c3 100644
--- a/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix
@@ -1,7 +1,7 @@
 {
   fetchFromGitHub,
   lib,
-  pnpm_9,
+  pnpm_11,
   fetchPnpmDeps,
   pnpmConfigHook,
   stdenvNoCC,
@@ -21,15 +21,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-/nYH3ZgfNv9krvH/ZjCJ2F3aanLZzlkNwOizgTRtqXE=";
+    pnpm = pnpm_11;
+    fetcherVersion = 4;
+    hash = "sha256-zFheFcVSCZWDrThn5PnxhJscRhLG/psSI8Q8g48nXNU=";
   };
 
   nativeBuildInputs = [
     nodejs
     pnpmConfigHook
-    pnpm_9
+    pnpm_11
   ];
 
   buildPhase = ''

From 260d1c6c8158dbaaca14218bfe4e6315a55bb84c Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Sat, 6 Jun 2026 02:56:09 +0300
Subject: [PATCH 075/128] nixos/llama-cpp: switch to RFC42-style settings

---
 .../manual/release-notes/rl-2611.section.md   |   2 +
 nixos/modules/services/misc/llama-cpp.nix     | 249 ++++++++----------
 2 files changed, 119 insertions(+), 132 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md
index b286c10f7cb9..f55be895ad02 100644
--- a/nixos/doc/manual/release-notes/rl-2611.section.md
+++ b/nixos/doc/manual/release-notes/rl-2611.section.md
@@ -22,6 +22,8 @@
 
 - Support for the legacy U‐Boot image format has been removed from the initrd generators, as it is deprecated upstream and no longer used by any platform in Nixpkgs.
 
+- `services.llama-cpp` is now configured using structured `services.llama-cpp.settings` attribute.
+
 - Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use.
 
 - `services.timesyncd.extraConfig` has been removed in favor of the structured [](#opt-services.timesyncd.settings.Time) option. Use `services.timesyncd.settings.Time` to set any `timesyncd.conf(5)` option directly. For example, replace `services.timesyncd.extraConfig = "PollIntervalMaxSec=180";` with `services.timesyncd.settings.Time.PollIntervalMaxSec = 180;`.
diff --git a/nixos/modules/services/misc/llama-cpp.nix b/nixos/modules/services/misc/llama-cpp.nix
index fdf306ab5256..c2d267a1bc98 100644
--- a/nixos/modules/services/misc/llama-cpp.nix
+++ b/nixos/modules/services/misc/llama-cpp.nix
@@ -2,188 +2,173 @@
   config,
   lib,
   pkgs,
-  utils,
   ...
 }:
-
 let
   cfg = config.services.llama-cpp;
-
-  modelsPresetFile =
-    if cfg.modelsPreset != null then
-      pkgs.writeText "llama-models.ini" (lib.generators.toINI { } cfg.modelsPreset)
-    else
-      null;
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "services" "llama-cpp" "host" ]
+      [ "services" "llama-cpp" "settings" "host" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "services" "llama-cpp" "port" ]
+      [ "services" "llama-cpp" "settings" "port" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "services" "llama-cpp" "model" ]
+      [ "services" "llama-cpp" "settings" "model" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "services" "llama-cpp" "modelsDir" ]
+      [ "services" "llama-cpp" "settings" "models-dir" ]
+    )
+    (lib.mkRemovedOptionModule [ "services" "llama-cpp" "modelsPreset" ] ''
+      Using a Nix attribute set for configuring model presets is no longer
+      supported. However, it's possible to use
+      `services.llama-cpp.settings.models-preset` to provide a path to an INI
+      file with desired options.
+    '')
+    (lib.mkRemovedOptionModule [
+      "services"
+      "llama-cpp"
+      "extraFlags"
+    ] "Use `services.llama-cpp.settings` instead")
+  ];
 
   options = {
-
     services.llama-cpp = {
-      enable = lib.mkEnableOption "LLaMA C++ server";
+      enable = lib.mkEnableOption "llama.cpp HTTP server";
 
       package = lib.mkPackageOption pkgs "llama-cpp" { };
 
-      model = lib.mkOption {
-        type = lib.types.nullOr lib.types.path;
-        example = "/models/mistral-instruct-7b/ggml-model-q4_0.gguf";
-        description = "Model path.";
-        default = null;
-      };
-
-      modelsDir = lib.mkOption {
-        type = lib.types.nullOr lib.types.path;
-        example = "/models/";
-        description = "Models directory.";
-        default = null;
-      };
-
-      modelsPreset = lib.mkOption {
-        type = lib.types.nullOr (lib.types.attrsOf lib.types.attrs);
-        default = null;
-        description = ''
-          Models preset configuration as a Nix attribute set.
-          This is converted to an INI file and passed to llama-server via --model-preset.
-          See llama-server documentation for available options.
-        '';
-        example = lib.literalExpression ''
-          {
-            "Qwen3-Coder-Next" = {
-              hf-repo = "unsloth/Qwen3-Coder-Next-GGUF";
-              hf-file = "Qwen3-Coder-Next-UD-Q4_K_XL.gguf";
-              alias = "unsloth/Qwen3-Coder-Next";
-              fit = "on";
-              seed = "3407";
-              temp = "1.0";
-              top-p = "0.95";
-              min-p = "0.01";
-              top-k = "40";
-              jinja = "on";
+      settings = lib.mkOption {
+        type = lib.types.submodule {
+          freeformType = lib.types.attrs;
+          options = {
+            host = lib.mkOption {
+              type = lib.types.str;
+              default = "127.0.0.1";
+              example = "0.0.0.0";
+              description = ''
+                IP address on which the server should listen on.
+              '';
             };
-          }
+
+            port = lib.mkOption {
+              type = lib.types.port;
+              default = 8080;
+              example = 1337;
+              description = ''
+                Port on which the server should listen on.
+              '';
+            };
+          };
+        };
+        default = { };
+        example = {
+          host = "0.0.0.0";
+          port = 1337;
+          model = "/mnt/llms/Foo3.6-27B-UD-Q4_K_XL.gguf";
+          ctx-size = 252144;
+          temp = 0.6;
+          top-k = 20;
+          top-p = 0.95;
+          batch-size = 512;
+          ubatch-size = 256;
+          spec-type = "draft-mtp";
+          spec-draft-n-max = 2;
+          flash-attn = "on";
+        };
+        description = ''
+          Command-line arguments for `llama-server`.
+
+          See <https://github.com/ggml-org/llama.cpp/blob/master/tools/server/README.md>
+          for the full list of options.
         '';
       };
 
-      extraFlags = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        description = "Extra flags passed to llama-cpp-server.";
-        example = [
-          "-c"
-          "4096"
-          "-ngl"
-          "32"
-          "--numa"
-          "numactl"
-        ];
-        default = [ ];
-      };
-
-      host = lib.mkOption {
-        type = lib.types.str;
-        default = "127.0.0.1";
-        example = "0.0.0.0";
-        description = "IP address the LLaMA C++ server listens on.";
-      };
-
-      port = lib.mkOption {
-        type = lib.types.port;
-        default = 8080;
-        description = "Listen port for LLaMA C++ server.";
-      };
-
       openFirewall = lib.mkOption {
         type = lib.types.bool;
         default = false;
-        description = "Open ports in the firewall for LLaMA C++ server.";
+        description = ''
+          Open ports in the firewall for the server.
+        '';
       };
     };
-
   };
 
   config = lib.mkIf cfg.enable {
     systemd.services.llama-cpp = {
-      description = "LLaMA C++ server";
+      description = "llama.cpp HTTP server";
+      wants = [ "network.target" ];
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
-        Type = "idle";
-        KillSignal = "SIGINT";
+        ExecStart = toString [
+          (lib.getExe' cfg.package "llama-server")
+          (lib.cli.toCommandLine (optionName: {
+            option = if builtins.stringLength optionName > 1 then "--${optionName}" else "-${optionName}";
+            sep = " ";
+            explicitBool = false;
+            formatArg = lib.generators.mkValueStringDefault { };
+          }) cfg.settings)
+        ];
+        ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -HUP $MAINPID";
+        Restart = "on-failure";
+        RestartSec = 300;
+
+        DynamicUser = true;
         StateDirectory = "llama-cpp";
         CacheDirectory = "llama-cpp";
         WorkingDirectory = "/var/lib/llama-cpp";
         Environment = [ "LLAMA_CACHE=/var/cache/llama-cpp" ];
-        ExecStart =
-          let
-            args = [
-              "--host"
-              cfg.host
-              "--port"
-              (toString cfg.port)
-            ]
-            ++ lib.optionals (cfg.model != null) [
-              "-m"
-              cfg.model
-            ]
-            ++ lib.optionals (cfg.modelsDir != null) [
-              "--models-dir"
-              cfg.modelsDir
-            ]
-            ++ lib.optionals (cfg.modelsPreset != null) [
-              "--models-preset"
-              modelsPresetFile
-            ]
-            ++ cfg.extraFlags;
-          in
-          "${cfg.package}/bin/llama-server ${utils.escapeSystemdExecArgs args}";
-        Restart = "on-failure";
-        RestartSec = 300;
 
-        # for GPU acceleration
-        PrivateDevices = false;
-
-        # hardening
-        DynamicUser = true;
-        CapabilityBoundingSet = "";
+        AmbientCapabilities = [ "" ];
+        CapabilityBoundingSet = [ "" ];
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = false; # Required for GPU support.
+        PrivateMounts = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        RemoveIPC = true;
         RestrictAddressFamilies = [
           "AF_INET"
           "AF_INET6"
           "AF_UNIX"
         ];
-        NoNewPrivileges = true;
-        PrivateMounts = true;
-        PrivateTmp = true;
-        PrivateUsers = true;
-        ProtectClock = true;
-        ProtectControlGroups = true;
-        ProtectHome = true;
-        ProtectKernelLogs = true;
-        ProtectKernelModules = true;
-        ProtectKernelTunables = true;
-        ProtectSystem = "strict";
-        MemoryDenyWriteExecute = true;
-        LockPersonality = true;
-        RemoveIPC = true;
         RestrictNamespaces = true;
         RestrictRealtime = true;
         RestrictSUIDSGID = true;
         SystemCallArchitectures = "native";
+        SystemCallErrorNumber = "EPERM";
         SystemCallFilter = [
           "@system-service"
           "~@privileged"
         ];
-        SystemCallErrorNumber = "EPERM";
-        ProtectProc = "invisible";
-        ProtectHostname = true;
-        ProcSubset = "pid";
       };
     };
 
-    networking.firewall = lib.mkIf cfg.openFirewall {
-      allowedTCPPorts = [ cfg.port ];
-    };
-
+    networking.firewall.allowedTCPPorts = lib.optional cfg.openFirewall cfg.port;
   };
 
-  meta.maintainers = with lib.maintainers; [ newam ];
+  meta.maintainers = with lib.maintainers; [
+    azahi
+    newam
+  ];
 }

From 03441e004fb4ff6452487db44d67492343d773bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Jun 2026 21:52:47 +0000
Subject: [PATCH 076/128] rura: 1.3.0 -> 1.5.0

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

diff --git a/pkgs/by-name/ru/rura/package.nix b/pkgs/by-name/ru/rura/package.nix
index 793aef7442a1..0b23a2941339 100644
--- a/pkgs/by-name/ru/rura/package.nix
+++ b/pkgs/by-name/ru/rura/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rura";
-  version = "1.3.0";
+  version = "1.5.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "tlipinski";
     repo = "rura";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cwL3Dw1qPYcKFzy0CV/XI7jZWHZZoZumdbB2kK+9jdc=";
+    hash = "sha256-AL8qrO6QlHD+cLMEjgfH/4cLqxsRapp9nxJ/eMe0uic=";
   };
 
-  cargoHash = "sha256-T/7v1WxTfsilw5i592EoRWxpkaL4bnluXmCModO1WQg=";
+  cargoHash = "sha256-t/ylPVTi0AAumiixU5oaFgldtKkwYvuETjaxCwzveDk=";
 
   passthru = {
     updateScript = nix-update-script { };

From 94b4fde482a48b8eeae984f8cfc0e9550f4c45da Mon Sep 17 00:00:00 2001
From: S0AndS0 <strangerthanbland@gmail.com>
Date: Sun, 7 Jun 2026 18:14:59 -0700
Subject: [PATCH 077/128] prettier: use pnpm_10

This _should_ address issue #529285 notice that pnpm_9 is EoL

Co-authored-by: Victor Engmark <victor@engmark.name>
---
 pkgs/by-name/pr/prettier/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix
index 0f071d92102a..1baf32402fea 100644
--- a/pkgs/by-name/pr/prettier/package.nix
+++ b/pkgs/by-name/pr/prettier/package.nix
@@ -6,7 +6,7 @@
   makeBinaryWrapper,
   nodejs,
   pnpmConfigHook,
-  pnpm_9,
+  pnpm_10,
   stdenv,
   versionCheckHook,
   yarn-berry,
@@ -87,7 +87,7 @@ let
     nativeBuildInputs = [
       nodejs
       pnpmConfigHook
-      pnpm_9
+      pnpm_10
     ];
 
     patches = [
@@ -102,9 +102,9 @@ let
         patches
         ;
 
-      pnpm = pnpm_9;
+      pnpm = pnpm_10;
       fetcherVersion = 3;
-      hash = "sha256-WPsVL05rVku2YSbfjHX4/BoFM+qvIm4sZip7pISg0vA=";
+      hash = "sha256-S9d89o5GNUGLoc9SBe58qKmbPEdGj3PEnQN+eADG4SU=";
     };
 
     buildPhase = ''

From c0d0bbd7b1197a9b82e1d62cf38933de2ad5fa39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 02:57:40 +0000
Subject: [PATCH 078/128] tile38: 1.37.0 -> 1.38.0

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

diff --git a/pkgs/by-name/ti/tile38/package.nix b/pkgs/by-name/ti/tile38/package.nix
index 68f04fbcb934..7d165e68a0bd 100644
--- a/pkgs/by-name/ti/tile38/package.nix
+++ b/pkgs/by-name/ti/tile38/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tile38";
-  version = "1.37.0";
+  version = "1.38.0";
 
   src = fetchFromGitHub {
     owner = "tidwall";
     repo = "tile38";
     tag = finalAttrs.version;
-    hash = "sha256-5dnLeXqEo89m2LFAbDw/NelSJpxGFYWQlIcw8PY2/RA=";
+    hash = "sha256-jmUvsSOA16tGp1nAam8ae3cqHU6K2Lfiukfj16N3Hy0=";
   };
 
-  vendorHash = "sha256-mi4Cz3nb/5qbC9sp2o5FptBDh2AdxTOk3hWBpVr9K3s=";
+  vendorHash = "sha256-zSH5/AQFS73YJpy7kVxHXTF4kPuaxVl4aNdKUq1aqDM=";
 
   subPackages = [
     "cmd/tile38-cli"

From ef1a9dc2fb31979bff35631bca988d02c50af206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 8 Jun 2026 20:02:54 -0700
Subject: [PATCH 079/128] python3Packages.wassima: 2.1.0 -> 2.1.1

Diff: https://github.com/jawah/wassima/compare/2.1.0...2.1.1

Changelog: https://github.com/jawah/wassima/blob/2.1.1/CHANGELOG.md
---
 pkgs/development/python-modules/wassima/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wassima/default.nix b/pkgs/development/python-modules/wassima/default.nix
index 5a9a6b40240c..ecd83712c450 100644
--- a/pkgs/development/python-modules/wassima/default.nix
+++ b/pkgs/development/python-modules/wassima/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "wassima";
-  version = "2.1.0";
+  version = "2.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "wassima";
     tag = version;
-    hash = "sha256-0YHj5cmGZlZqUow+xkpQKHe+KB4X/OklEs4u8z/uV18=";
+    hash = "sha256-uH8UBsdqnPbGyQX/Tn5Ct3vcbfLEyUC8pDSCM4PwWZg=";
   };
 
   build-system = [ hatchling ];

From 874f15227e41fd82a50819b05f53934c92470d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 8 Jun 2026 20:05:11 -0700
Subject: [PATCH 080/128] python3Packages.wassima: use finalAttrs

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

diff --git a/pkgs/development/python-modules/wassima/default.nix b/pkgs/development/python-modules/wassima/default.nix
index ecd83712c450..b39234226445 100644
--- a/pkgs/development/python-modules/wassima/default.nix
+++ b/pkgs/development/python-modules/wassima/default.nix
@@ -6,7 +6,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "wassima";
   version = "2.1.1";
   pyproject = true;
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "wassima";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-uH8UBsdqnPbGyQX/Tn5Ct3vcbfLEyUC8pDSCM4PwWZg=";
   };
 
@@ -30,10 +30,10 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    changelog = "https://github.com/jawah/wassima/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/jawah/wassima/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "Access your OS root certificates with utmost ease";
     homepage = "https://github.com/jawah/wassima";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})

From 2904bb9b6b69792689a9f3ac5206d34d14d87bd8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 03:20:52 +0000
Subject: [PATCH 081/128] python3Packages.ultraheat-api: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/development/python-modules/ultraheat-api/default.nix b/pkgs/development/python-modules/ultraheat-api/default.nix
index 638c63d9c90c..02cc75c7e7fa 100644
--- a/pkgs/development/python-modules/ultraheat-api/default.nix
+++ b/pkgs/development/python-modules/ultraheat-api/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ultraheat-api";
-  version = "0.6.0";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vpathuis";
     repo = "ultraheat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Mw2BEm98FqD/bggABJu8jftwyMEik0+xtKHONoFVxhw=";
+    hash = "sha256-I8tdq50zCbC3+D19R5TLkb8F1TbEh0GZG3tepe1mPPc=";
   };
 
   build-system = [ setuptools ];

From 3d6f894227c0b30368cb7731fcb47b78b5acafce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 03:24:25 +0000
Subject: [PATCH 082/128] android-studio: 2025.3.4.7 -> 2026.1.1.8

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 8c1f000c845d..8391b4428825 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -16,9 +16,9 @@ let
       inherit tiling_wm;
     };
   stableVersion = {
-    version = "2025.3.4.7"; # "Android Studio Panda 4 | 2025.3.4 Patch 1"
-    sha256Hash = "sha256-qujzMvEkr9I8pJXcdwkVpFbadIDI+FngFTWtQvy0ygY=";
-    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.7/android-studio-panda4-patch1-linux.tar.gz";
+    version = "2026.1.1.8"; # "Android Studio Quail 1 | 2026.1.1"
+    sha256Hash = "sha256-DB+kujz6vQfkipDgCl+i6iqCzVhwgz2tpbApDIF9g9M=";
+    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.8/android-studio-quail1-linux.tar.gz";
   };
   betaVersion = {
     version = "2026.1.1.7"; # "Android Studio Quail 1 | 2026.1.1 RC 2"

From 17118eb1d51324110802ff6dd489e32290f80979 Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@euxane.eu>
Date: Tue, 9 Jun 2026 07:06:59 +0200
Subject: [PATCH 083/128] rmfakecloud: remove euxane from maintainers

---
 nixos/modules/services/misc/rmfakecloud.nix | 2 +-
 pkgs/by-name/rm/rmfakecloud/package.nix     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/rmfakecloud.nix b/nixos/modules/services/misc/rmfakecloud.nix
index 674309ddbf45..f04fcc35de6b 100644
--- a/nixos/modules/services/misc/rmfakecloud.nix
+++ b/nixos/modules/services/misc/rmfakecloud.nix
@@ -146,5 +146,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ euxane ];
+  meta.maintainers = with lib.maintainers; [ ];
 }
diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix
index 821484bbd4fc..ed0a7f21170c 100644
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@@ -70,7 +70,6 @@ buildGoModule rec {
     homepage = "https://ddvk.github.io/rmfakecloud/";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
-      euxane
       martinetd
     ];
     mainProgram = "rmfakecloud";

From e36a94df80164e37e0d247ca5407159bf9c950b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 05:21:12 +0000
Subject: [PATCH 084/128] slade-unstable: 3.2.12-unstable-2026-05-08 ->
 3.2.12-unstable-2026-06-08

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

diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix
index 53d4c7cde8a2..5231ed650feb 100644
--- a/pkgs/by-name/sl/slade-unstable/package.nix
+++ b/pkgs/by-name/sl/slade-unstable/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation {
   pname = "slade";
-  version = "3.2.12-unstable-2026-05-08";
+  version = "3.2.12-unstable-2026-06-08";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
-    rev = "6711fee0014ba0d3fc78c3d0dbfc2ff8785198a3";
-    hash = "sha256-eBQlU4JoZbevL4NrT3eeqwirtqz9gZBllJKJ/i821MI=";
+    rev = "46fc51ac57f4fe54caf036b3d1e9b028a120be27";
+    hash = "sha256-mSddQstwZYkTzeA9fHswfuIUaoQlqXT+zTXWp20jgDc=";
   };
 
   nativeBuildInputs = [

From d1faf06ac27095da913eb7271cf84ab23dfa23a7 Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@euxane.eu>
Date: Tue, 9 Jun 2026 09:01:16 +0200
Subject: [PATCH 085/128] nixos/rmfakecloud: add martinetd as maintainer

From: https://github.com/NixOS/nixpkgs/pull/529771#discussion_r3378389488
---
 nixos/modules/services/misc/rmfakecloud.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/rmfakecloud.nix b/nixos/modules/services/misc/rmfakecloud.nix
index f04fcc35de6b..6cfe5693cc82 100644
--- a/nixos/modules/services/misc/rmfakecloud.nix
+++ b/nixos/modules/services/misc/rmfakecloud.nix
@@ -146,5 +146,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = with lib.maintainers; [ martinetd ];
 }

From 91c6e051363e96351fde09cb8f35590628244087 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 07:39:02 +0000
Subject: [PATCH 086/128] igir: 5.0.2 -> 5.1.0

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

diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix
index 16fcb1d7a14e..e50d1c4c2630 100644
--- a/pkgs/by-name/ig/igir/package.nix
+++ b/pkgs/by-name/ig/igir/package.nix
@@ -18,16 +18,16 @@
 
 buildNpmPackage rec {
   pname = "igir";
-  version = "5.0.2";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "emmercm";
     repo = "igir";
     rev = "v${version}";
-    hash = "sha256-vMas5QGpk3bwn4VkdRtYga8cgf6G+dVr3jJCGeyb5mQ=";
+    hash = "sha256-OgWf4xhgYsk9vQSbwrLdjbDElXrhI7r+4CaxZ7yRs7E=";
   };
 
-  npmDepsHash = "sha256-QhvGc8HLY61LptHdPZbOTjr5jDvUZ4dML+MV7KrqU/0=";
+  npmDepsHash = "sha256-r/1ImMfTFuRHvcH3713sDFNq7LJvgjt8a1rE8JtuaUk=";
 
   # I have no clue why I have to do this
   postPatch = ''

From ed6daf6a1ebfbaa8fd1d47615aad206ad86a79b4 Mon Sep 17 00:00:00 2001
From: Carman Fu <huivioemp1bs@posteo.com>
Date: Tue, 9 Jun 2026 11:28:56 +0800
Subject: [PATCH 087/128] vimPlugins.guh-nvim: init at 2026-06-09

https://github.com/justinmk/guh.nvim
---
 .../applications/editors/vim/plugins/generated.nix | 14 ++++++++++++++
 .../editors/vim/plugins/vim-plugin-names           |  1 +
 2 files changed, 15 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e300c0a3bf1b..03e3ee8bca39 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -7085,6 +7085,20 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  guh-nvim = buildVimPlugin {
+    pname = "guh.nvim";
+    version = "2026-06-09";
+    src = fetchFromGitHub {
+      owner = "justinmk";
+      repo = "guh.nvim";
+      rev = "e8d8df780eb13da78a992fdc387bbc5f1401dd6f";
+      hash = "sha256-vkBP9TvNbUsChtntdgFkHaT01R84HfUAjGXk+SbZUng=";
+    };
+    meta.homepage = "https://github.com/justinmk/guh.nvim/";
+    meta.license = getLicenseFromSpdxId "MIT";
+    meta.hydraPlatforms = [ ];
+  };
+
   guihua-lua = buildVimPlugin {
     pname = "guihua.lua";
     version = "0.1-unstable-2026-05-26";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 540a4fb4e206..f0edc1979e29 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -504,6 +504,7 @@ https://github.com/ellisonleao/gruvbox.nvim/,,
 https://github.com/nvimdev/guard-collection/,,
 https://github.com/nvimdev/guard.nvim/,,
 https://github.com/nmac427/guess-indent.nvim/,,
+https://github.com/justinmk/guh.nvim/,main,
 https://github.com/ray-x/guihua.lua/,,
 https://github.com/sjl/gundo.vim/,,
 https://github.com/junegunn/gv.vim/,,

From 2d4b379f8c7d1e6b440057244b7625c4a1d2b7e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 07:51:50 +0000
Subject: [PATCH 088/128] dbeaver-bin: 26.0.5 -> 26.1.0

---
 pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index ed324e5b3dbe..c68ca12af343 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -19,7 +19,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbeaver-bin";
-  version = "26.0.5";
+  version = "26.1.0";
 
   src =
     let
@@ -32,10 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-urgvGZNM7V5zmts+3Zv7nDtyBuyyAHjc9HDUP2CXx50=";
-        aarch64-linux = "sha256-Ye6NH8tBmSbDS3sJjTzvc9C+qyU3DA0HL0csFUzD1pc=";
-        x86_64-darwin = "sha256-iMyHZUNHzSpc2DrKSsduMx13hUY1SdHQTANR3Yj256A=";
-        aarch64-darwin = "sha256-F60zrgx2cS6HCmSznUapSgmuIxLI1Ma8WHrmawDzEUk=";
+        x86_64-linux = "sha256-zAkHddh5xm9SHMV6OcJpl2A3+lS4GMJDbZ/+zg/5PzE=";
+        aarch64-linux = "sha256-0Tv45N+nZ2lRgn/Lo5HpPjuGigI0X2CJIIV96UO0bs8=";
+        x86_64-darwin = "sha256-INfXvR9FJZcruC8KeRtc0SIHUUHc0p3jjDNk4eBk7Lo=";
+        aarch64-darwin = "sha256-s+NQ5hp3NiQpJ/b3mp7Fdjh5rEmf1UnSz/Ai5Z43qEg=";
       };
     in
     fetchurl {

From 2dd0dce26793aa430a183abcc9200f5b49dc7e6c Mon Sep 17 00:00:00 2001
From: Fay Ash <yaoshiu@qq.com>
Date: Sun, 7 Jun 2026 22:19:54 +0800
Subject: [PATCH 089/128] astro-language-server: 2.16.7 -> 2.16.10

---
 .../as/astro-language-server/package.nix      | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix
index 270c56e614e6..9f494ff0f702 100644
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@@ -2,32 +2,45 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  pnpm_10,
+  pnpm_11,
+  nodejs-slim_22,
   fetchPnpmDeps,
   pnpmConfigHook,
   nodejs,
   nix-update-script,
+  fetchpatch2,
 }:
+let
+  # pnpm 11's bundled Node.js 24 has a libuv/kqueue bug on macOS, workaround copied from openclaw package
+  pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_22; };
+
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "astro-language-server";
-  version = "2.16.7";
+  version = "2.16.10";
 
   src = fetchFromGitHub {
     owner = "withastro";
     repo = "astro";
     tag = "@astrojs/language-server@${finalAttrs.version}";
-    hash = "sha256-0UkbHGOvMJxY4RXVLx9T8oh2cnuwziEuwUfFrls4Wc0=";
+    hash = "sha256-ZzLLGfbY6Rtjzqw+MMCHthvalo3B8lf/qxFJNJ/2LdQ=";
   };
 
+  patches = [
+    # remove on next release
+    (fetchpatch2 {
+      name = "fix-supply-chain-verification-fail.patch";
+      url = "https://github.com/withastro/astro/commit/272ca6173b40cfa37299c27b513f495f386d4009.patch?full_index=1";
+      includes = [ "pnpm-workspace.yaml" ];
+      hash = "sha256-jPYFiyBlIoqpbIcT/hPa+VlF1IX+QCP8CVFQGarzlEs=";
+    })
+  ];
+
   # https://pnpm.io/filtering#--filter-package_name-1
   pnpmWorkspaces = [
     "@astrojs/language-server..."
     "@astrojs/ts-plugin"
   ];
-  prePnpmInstall = ''
-    pnpm config set dedupe-peer-dependents false
-    pnpm approve-builds @emmetio/css-parser
-  '';
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs)
@@ -35,17 +48,18 @@ stdenv.mkDerivation (finalAttrs: {
       version
       src
       pnpmWorkspaces
-      prePnpmInstall
+      patches
       ;
-    pnpm = pnpm_10;
-    fetcherVersion = 3;
-    hash = "sha256-1kdXt0Wc/ON//hwBYozRSMAyKQqEfSMfOI7XJyd9MBc=";
+    inherit pnpm;
+    # pnpm 11 stores state in a SQLite binary, fetcherVersion = 4 dumps it to a deterministic SQL text file
+    fetcherVersion = 4;
+    hash = "sha256-dqqvN8FMLjEbTtgQRkkURD7clMJ/OL9Mbk6icc4KU60=";
   };
 
   nativeBuildInputs = [
     nodejs
     pnpmConfigHook
-    pnpm_10
+    pnpm
   ];
 
   buildInputs = [ nodejs ];
@@ -70,6 +84,9 @@ stdenv.mkDerivation (finalAttrs: {
     pushd $out/lib/node_modules/astro-language-server/node_modules
     rm -rf {./,.pnpm/node_modules/}astro-{scripts,benchmark} .pnpm/node_modules/@astrojs/ts-plugin
     popd
+    # pnpm creates symlinks for optional platform-specific packages (e.g. @biomejs/cli-darwin-arm64)
+    # that are not installed by the --prod --filter install, leaving dangling symlinks
+    find $out -xtype l -delete
     ln -s $out/lib/node_modules/astro-language-server/packages/language-tools/language-server/bin/nodeServer.js $out/bin/astro-ls
 
     runHook postInstall

From 23490a11705fb74a4b0f49a6dba091bc87efaa8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 09:13:55 +0000
Subject: [PATCH 090/128] pfetch: 1.10.0 -> 1.11.0

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

diff --git a/pkgs/by-name/pf/pfetch/package.nix b/pkgs/by-name/pf/pfetch/package.nix
index 08c0d263e878..9be219f4eb87 100644
--- a/pkgs/by-name/pf/pfetch/package.nix
+++ b/pkgs/by-name/pf/pfetch/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "pfetch";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "Un1q32";
     repo = "pfetch";
     tag = version;
-    hash = "sha256-0EI5D33lVm/lJ0m47wDBE5fGmx/7tDRAC/AE58nJ2ao=";
+    hash = "sha256-QxHbk27A45awUqLGS/HZmOLOi0sQ1DVfwCFhyOlSCKk=";
   };
 
   dontBuild = true;

From 032c72ae07dddfee120df0b1efb9040cb35932e5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 9 Jun 2026 09:16:49 +0000
Subject: [PATCH 091/128] python3Packages.tensorflow-metadata: 1.17.3 -> 1.21.0

Diff: https://github.com/tensorflow/metadata/compare/v1.17.3...v1.21.0

Changelog: https://github.com/tensorflow/metadata/releases/tag/v1.21.0
---
 .../python-modules/tensorflow-metadata/build.patch   | 12 ++++++------
 .../python-modules/tensorflow-metadata/default.nix   | 10 ++++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow-metadata/build.patch b/pkgs/development/python-modules/tensorflow-metadata/build.patch
index 14469d1f60fa..9cdf63d1434d 100644
--- a/pkgs/development/python-modules/tensorflow-metadata/build.patch
+++ b/pkgs/development/python-modules/tensorflow-metadata/build.patch
@@ -1,13 +1,13 @@
 diff --git a/setup.py b/setup.py
-index 30ac370..a05812d 100644
+index 9c2a17f..c7e120d 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -141,8 +141,4 @@ setup(
-     keywords='tensorflow metadata tfx',
-     download_url='https://github.com/tensorflow/metadata/tags',
+@@ -154,8 +154,4 @@ setup(
+     keywords="tensorflow metadata tfx",
+     download_url="https://github.com/tensorflow/metadata/tags",
      requires=[],
 -    cmdclass={
--        'build': _BuildCommand,
--        'bazel_build': _BazelBuildCommand,
+-        "build": _BuildCommand,
+-        "bazel_build": _BazelBuildCommand,
 -    },
  )
diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix
index c9cd7fae87f3..a73c766364cc 100644
--- a/pkgs/development/python-modules/tensorflow-metadata/default.nix
+++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix
@@ -14,18 +14,24 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tensorflow-metadata";
-  version = "1.17.3";
+  version = "1.21.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "tensorflow";
     repo = "metadata";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4xj2JfQryGy7a9ho9/JJtyg+0H5VLQzq9JevOmOWJZk=";
+    hash = "sha256-k+SJmR5n4S31wpSuMhJwrjJfX/Bow0QwLpw+TwRPS7U=";
   };
 
   patches = [ ./build.patch ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools<70" "setuptools"
+  '';
+
   # Default build pulls in Bazel + extra deps, given the actual build
   # is literally three lines (see below) - replace it with custom build.
   preBuild = ''

From 84e07753d3d564ea064b6544aa7a310cdf508921 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 10:11:03 +0000
Subject: [PATCH 092/128] python3Packages.django-money: 3.6.0 -> 3.6.1

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

diff --git a/pkgs/development/python-modules/django-money/default.nix b/pkgs/development/python-modules/django-money/default.nix
index f34d7fc17c14..f94179d9d322 100644
--- a/pkgs/development/python-modules/django-money/default.nix
+++ b/pkgs/development/python-modules/django-money/default.nix
@@ -12,14 +12,14 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "django-money";
-  version = "3.6.0";
+  version = "3.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-money";
     repo = "django-money";
     tag = finalAttrs.version;
-    hash = "sha256-VxAKTtrbDMRhiLxqjVYt7pLGl0sy9F1iwswP/hxQ01k=";
+    hash = "sha256-UHqtKav/tot+fSA5ey2R4WdheUWuDBXdOXDgFDXgjLM=";
   };
 
   build-system = [ setuptools ];

From ea541685e86fd4ac462f4c114d323f1370354c0d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 9 Jun 2026 13:26:15 +0300
Subject: [PATCH 093/128] musescore: make it find ffmpeg automatically (video
 export)

Fixes #529852.
---
 pkgs/by-name/mu/musescore/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix
index 0deadb2f1cfe..8bf887c07d20 100644
--- a/pkgs/by-name/mu/musescore/package.nix
+++ b/pkgs/by-name/mu/musescore/package.nix
@@ -13,6 +13,7 @@
   # buildInputs
   alsa-lib,
   alsa-plugins,
+  ffmpeg,
   flac,
   freetype,
   kdePackages,
@@ -181,6 +182,15 @@ stdenv.mkDerivation (finalAttrs: {
     kdePackages'.qtwayland
   ];
 
+  # Put the default, `$prefix/lib` directory to look for ffmpeg shared objects,
+  # Nixpkgs' provided ffmpeg, for both MacOS & Linux. Note that upstream uses
+  # the /usr/lib/x86_64-linux-gnu location for any Linux (e.g aarch64 too).
+  preConfigure = ''
+    substituteInPlace src/framework/media/internal/ffmpegutils.cpp \
+      --replace-fail "/usr/lib/x86_64-linux-gnu" "${lib.getLib ffmpeg}/lib" \
+      --replace-fail "/opt/homebrew/lib" "${lib.getLib ffmpeg}/lib" \
+  '';
+
   strictDeps = true;
   __structuredAttrs = true;
 

From 2b00300f14a7138f06f4dd3d8995f23c518f1879 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 9 Jun 2026 12:43:16 +0200
Subject: [PATCH 094/128] firefox-unwrapped: 151.0.3 -> 151.0.4

https://www.firefox.com/en-US/firefox/151.0.4/releasenotes/
---
 .../networking/browsers/firefox/packages/firefox.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index 1a91ea09423c..c24ed2dd9b13 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,10 +9,10 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "151.0.3";
+  version = "151.0.4";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "511723e5cf042abb66cbeda89b78d42de8d1b53544565670173f3e69c2a7ceefc76468c90576221418bfc9b122151ec117978caa4823cfb9b80797f3064bd895";
+    sha512 = "7df6099411843764321e1480b058530193bf134f590b97aadf053603c356c34599f42d6b83d739c2d6440a78cd81dd0b19fd2ddc2a59746d6bbe7e39f00b7e04";
   };
 
   meta = {

From 67c59757800be99e4170266ba24bfff56c8290f3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 9 Jun 2026 12:43:53 +0200
Subject: [PATCH 095/128] firefox-bin-unwrapped: 151.0.3 -> 151.0.4

https://www.firefox.com/en-US/firefox/151.0.4/releasenotes/
---
 .../browsers/firefox-bin/release_sources.nix  | 1238 ++++++++---------
 1 file changed, 619 insertions(+), 619 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 111d7c2afb44..08a1a43785b9 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,1859 +1,1859 @@
 {
-  version = "151.0.3";
+  version = "151.0.4";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ach/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ach/firefox-151.0.4.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "0c2e1315913c0c60f73def8241f0a19007df29bb3b19cb2e8a95477474011de9";
+      sha256 = "239e586b8d30af758163a6893d9734111b92573130795992be5996ad7eef9238";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/af/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/af/firefox-151.0.4.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "46687872bfe94c9a52546ed5112c05e47df1564705788d20aa3d1b7258bf4355";
+      sha256 = "f7cc68084015fb622ae64749977a453e4449955fee9a144d6b65b7322f053b7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/an/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/an/firefox-151.0.4.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "843a23453655440a96296e728056a1073ecdba0121cb387cdb017f0bf4b8bc42";
+      sha256 = "4452f4579146ae8bd1b6996f29035a792d0bb93d2791d6c82452c5b115610708";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ar/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ar/firefox-151.0.4.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "e84ef31783000a88c866f7aee525801c69cddceb6704412b2c82f81fb58c162e";
+      sha256 = "feb34c02f109e8baaf496cbac0427328921899a9b9676333fbe3148cff8479f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ast/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ast/firefox-151.0.4.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "ca08440fba6b43168b75b5b38bec1ea4fd1f54c84f3ed5d1647f21c56056f582";
+      sha256 = "7c4f40a56f71cd1b4af4e98db2d2466bebdda8b8952005d8acdda7985508ea45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/az/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/az/firefox-151.0.4.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "c8515914d199fb880a104dc07205c67eda748be097de039466af907f27053628";
+      sha256 = "0c7fcd9410d9c7db885c3f50cb861004397886c96e1f0af999bdb02f6307dca2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/be/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/be/firefox-151.0.4.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "b9fced2ebea231ffbffb043133975eb59a9e214c41d03d56d79b1128c03bbbf8";
+      sha256 = "ab0d253699c0fcbb9734e3ad060cbbc7a19edaaf8abb291f9ad35c9c96896d62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/bg/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/bg/firefox-151.0.4.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "03eb96e42d9cade75b29867ab94ce0796a8afc85acde2695e7bcf21715a12963";
+      sha256 = "77a4d058ab8cb9d1f63622723b37a4a6b81cba50a71cc7e94cda26a9de2ce0f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/bn/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/bn/firefox-151.0.4.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "7f0496965d807a3566e98cece70ec826ee374bba18886084ad5b552bf74a2075";
+      sha256 = "4770c8158da2c7c2808ff13e431cb0164172a1ad6ce1bfcc900ac2960621a68e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/br/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/br/firefox-151.0.4.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "23a7df25534b59c433a77e6af8ea0205ca01c6fc034f68cf74897c7c3439cb1c";
+      sha256 = "4994cbd8ccd2d68d4cb6d10db26df6d37a0ee4b138e4b6aa654515fd19619a9a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/bs/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/bs/firefox-151.0.4.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "f4aae3658d9ecf375e8819f8be55477ec4921372a2f0d6182186898d11ba5f0a";
+      sha256 = "c977928fcf18369e9cc1e34843cd62393daf818f95944d32d20c0cc954cd4d1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ca-valencia/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ca-valencia/firefox-151.0.4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "e8c09631e04c0afdf7965683385632a33367e8c92d0fe8f6d7b04bfdf1a6c8e6";
+      sha256 = "38c934332d748ee9233dcb036ce1835cd969b386a34610b4ba27eec021d00284";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ca/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ca/firefox-151.0.4.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "b80ffaf77480485b26ab3c6c9d5db8327c04d594d77ae1626977dfeb50fca105";
+      sha256 = "b1b90cc7b6c7ba214c886e10e486726a4d4521747af640eb72d9e6ac1b223478";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/cak/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/cak/firefox-151.0.4.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "f8d825cdbb0604e69f9edf61586073d56ea25520e470bd9b3ffe4ea2ac9d8c54";
+      sha256 = "1ee199865a35fd34b3f572a2b1334f331ae6f80b369fb3c087c54029b6745db0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/cs/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/cs/firefox-151.0.4.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "edb3d957d3a0bf45a07f278e9ec89a1b62665055eea058833c7866185a05b12d";
+      sha256 = "397d8e62e80061cf7d857cb1057bcfc05babf530d99755fe730de6930d3aaae0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/cy/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/cy/firefox-151.0.4.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "7a2738c410f7613e6e3e6bc14956f445bd56f178fc95e6aadb7bee0934f9e6aa";
+      sha256 = "8216dcaec6e3f0f9defeea937ab0f7d8aed3c20bc013d608e1ffb8652aa8d5e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/da/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/da/firefox-151.0.4.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "f1904f221fe05a1a928a04f76686fbd2dde304674267dd5f60dc4fa7f8a28ced";
+      sha256 = "b99997b5a3b1e8929ff5ac5170b1636a2aa1877bd82d4533f61d89ae70dc1dc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/de/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/de/firefox-151.0.4.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "ffe1da807206d117920944517273a2b2ce8f6cc57eacba4b7524306c66dbf244";
+      sha256 = "12cb34cadcc246fe831f08e3d1b8a8dd64be4007d7d936adcdd604c4500dabcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/dsb/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/dsb/firefox-151.0.4.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "6a955baec6a78ee358733916dc4ffc57a91db535cd9e874c41fc553c31fc540d";
+      sha256 = "da06a8d0f551b6e84bd273c2c55aa2c231f18870ef5fb2c15713879f757f45bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/el/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/el/firefox-151.0.4.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "7c33aafab2f7c07ab27029a858aefe9a8b26bb303a1a6823734f0404399dd5d2";
+      sha256 = "721e70e7c708a5c71afb5645f3f4b45882de39377a965aefb11dd1a825665c27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/en-CA/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/en-CA/firefox-151.0.4.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "938e320cea42a760e8e5a4a57e0dbf2fe472f75f9edff4e88e753c0814e8821f";
+      sha256 = "abc5ad597445d84f54e0b64b490c511c68ff8bb26ebe373ab75a49abe6366465";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/en-GB/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/en-GB/firefox-151.0.4.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "1b793ab310dbd59a220e918953fbc39389fba965daaa2115ec4cd5fd1fdf532a";
+      sha256 = "6d5839c2efe1d2e3546ac17e771f8ff007dd6aedc55dacf9df863f8fa9e363e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/en-US/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/en-US/firefox-151.0.4.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "b2405272cc3a8dde0fadeb5cea2b1fb03fc0a181b3015bd60985a63b04e70ed7";
+      sha256 = "5fa872cb4845a52829fa58568c2901edcbda4b79ce466b4b9b09afe41cffcd9b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/eo/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/eo/firefox-151.0.4.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "27d4cbd9936f0ee25a0f7511e474e3b4faac0d1a94e78e5f3cc51d8291cd6ce1";
+      sha256 = "13e7b1992205a8bbcea8a3c4c8dab09226459e962f5e40f34038e59cf7322c84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/es-AR/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/es-AR/firefox-151.0.4.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "ab7498e91c365361816d8c9a4014ea656fed58b5fef8d5ea70ac3685933a36b5";
+      sha256 = "b2d0bf9dac50fb8874107fe56055ea742e9508ac6f87dfefdd455116b3b117fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/es-CL/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/es-CL/firefox-151.0.4.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "2bd4ba5bf33231069492231b9ac8438d2d7a9faefe2906353b873e82d02e2999";
+      sha256 = "97c265491171b493fa3ba7989f35fac556b474935e695b6011d02fab3b44176c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/es-ES/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/es-ES/firefox-151.0.4.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "e2e542f543ca564c08be8773919056c36dc2bec54d51012cd5d360e741ec8a56";
+      sha256 = "81f0b699d18f88cfb7746d6ff256b80f18cc1de0e2fb1200986ac2bb9853d1b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/es-MX/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/es-MX/firefox-151.0.4.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "b4092fd51d5a17ce8a0a59ca07085a5a3625cffcdc3e0e8ce9173f65ac5f9ce2";
+      sha256 = "8344bd79f6d98e0d058e0aa941cd8ac2b5cff2924f1f19a6f69d71b58cb075d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/et/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/et/firefox-151.0.4.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "eb7356dcfcd88f2d0298e5b56da7d8ab63fea3a22401a50caa719b492c62b161";
+      sha256 = "7b95f81d52ee59f9f593079b1bf9cf3cb178ac8105d0ee26b7da1c642fd2c89e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/eu/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/eu/firefox-151.0.4.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "d2416a489ac82764c1099fe0ea6f0c05e9f2545ed198163a60f7a4729a52d7aa";
+      sha256 = "2e602d0c0e93e941fdecf3a4077ae1242d78692a7b4698ee0acd5fd6ccc832fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/fa/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/fa/firefox-151.0.4.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "e5947d3daa3707eba2ee28aec8ea14074672090b013fb78772a28e10b2c12e23";
+      sha256 = "938b24ee51e07e64a4a6043b355dc5e583aa29c97c3342e61c63cb203bce8361";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ff/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ff/firefox-151.0.4.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "333d9cf636c6a71d1762216bd8b5b97c5495d93e62b637f188c5e1d0496116d0";
+      sha256 = "0ef584148b7678895d1dbb196e34d8c0f698157c90b59602a7d58e2c1cbda326";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/fi/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/fi/firefox-151.0.4.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "4657f23a7a67fcdca607638668836290b0416f0fba5886afb23bed7ee436a317";
+      sha256 = "2d874871d85119426b0f2abd44288d410695bf1923b6f7dc8754d3a29b46db47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/fr/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/fr/firefox-151.0.4.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "9eb5ab8120c534698e665b83dcb4e5438d4c250e17954c1d8598e17cdd047aaa";
+      sha256 = "8bf00a047fb12cdd58065cc6ba51521c058cfaa9fbfc750c83838d0b03d1b0f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/fur/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/fur/firefox-151.0.4.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "790785664356ed578d2bebe2700d154f851c61550eb78d895add4da65cb42d3c";
+      sha256 = "90d4e8e2f5033c83653efc5f48fc39a391c7b3760d318ee4378eadf373671e67";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/fy-NL/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/fy-NL/firefox-151.0.4.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "a2793fbe457504574c1cb959c56a91a86168abac5542915a5d62fa59e2ebab39";
+      sha256 = "3deb92769480435283a394601f1b8d24998f37bc52fae06b204ba468084503dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ga-IE/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ga-IE/firefox-151.0.4.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "ef065585a51737a83fbc3ebd6666a987a3b75964915cb9410c475ab9609a168a";
+      sha256 = "d417883b6d77a9908bc807d2249e6492c1c6a6c63c70a95bd58a4754127aeb86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/gd/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/gd/firefox-151.0.4.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "29a35ea980736334d1bcc8055204c5d5f330a23b3e3db61c2c1e07f8b676f170";
+      sha256 = "c8c1222f6b301631afb6d6ced425d81535ed11bedc83463216d2b36019b51830";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/gl/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/gl/firefox-151.0.4.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "4757da35c551488500635398dc09731fbd0de8427797f74ccd8e9cf2831de004";
+      sha256 = "21e9ac44b0abb9885ffb97c56c885153bc826c376373c5ca3886fbb97842f6ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/gn/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/gn/firefox-151.0.4.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "5f67c5a7c42180698ee9e5cf88f2ac48c3589d33c69ac71537bd91bec33fa1a9";
+      sha256 = "115525969ac0425d983a95bbcb1184bc0655b899efd6e75a0ce16c8a3b4fdb1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/gu-IN/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/gu-IN/firefox-151.0.4.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "158afbd677c18596b309572df6af414388a86c63947979e3d326af1696ea1b82";
+      sha256 = "2990959f8cfa15b3340b2c38722a6d8dab25bff4ea4b60e2218fcea91a2c1e92";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/he/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/he/firefox-151.0.4.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "34dbab6f108048af4f55d5e3582fa9b49320f871bbea8713d828c3ae20044c7a";
+      sha256 = "a122be5612000f5fc821d800dd2b5d4dc76ac9d1399f409de0812612c1653999";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/hi-IN/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/hi-IN/firefox-151.0.4.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "109441bbc7d0c3cf5db62f0c6f0ad8ff782d5c953e08e388b9365b22be12b298";
+      sha256 = "2b59ee424191c3dc14a6ba4dca8d2e2f4ada98324f81ba03aa471ed59e491c00";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/hr/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/hr/firefox-151.0.4.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "5a6f2f9b2a702f9cd8f1a16bd18864f9322166ed23f3165683760f7431a950e9";
+      sha256 = "8ad4320ee62c1017fe9038dd4702826e62ef4a60bc06e5d8aa0084e63074f2ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/hsb/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/hsb/firefox-151.0.4.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "36318ecd4cf2b4f4f06db5d23a01b53d3cdde846711c77c2b4e80340ad6c2862";
+      sha256 = "0a6c4ea8e2efab955933a4aa697502244a838daa73d1ea12becab37aec37cf4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/hu/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/hu/firefox-151.0.4.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "4b2dc2acb15c73b9dd5457edacf58c2cf10591bd8e2fd46b4894cef3bc05d338";
+      sha256 = "4a6b64fd8c730991e307b794a8efd40e05cabb338ef48aac79347114fbaeac62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/hy-AM/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/hy-AM/firefox-151.0.4.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "1d02133ad96bc0e5efbf3e0c25a99f14323ee41bca89ff6b83b8f6f35c5ff1fb";
+      sha256 = "b392f16280bf9977cd1de1f5b451cce4887a991920b67fb1ff05e014dcdc1e12";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ia/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ia/firefox-151.0.4.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "c736f3982de86cdb854fc5f62c3a725da9782ff0584311cb36446c3d461e09ff";
+      sha256 = "afb8de469c0be4f7544a6477c66e610ae8c11150c494581777b92528878a8e1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/id/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/id/firefox-151.0.4.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "d9f6ad01125eb14735f8bc5ed15398a021941ca91a5ee29fe5cc41365ce68b96";
+      sha256 = "6e42cec538a69f74f0c558d23b63d7500c05789efc78774329f74e0d53363974";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/is/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/is/firefox-151.0.4.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "0e22fe2510af1137863e85da7ec948b61555b9be49e9497eb543b7978c8a7d2f";
+      sha256 = "fb3cc4371c5a57d99d8636c5c6fc3810f21a1ec88f6f3c11a30b2c097cd7af4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/it/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/it/firefox-151.0.4.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "5b4f14a12542e2c31d1c6952429d77d34bca5e8de18c102fa3c599baa63b8fc7";
+      sha256 = "64b0e2f041ddb7e3cd63c5e2128634d67661348f988990813de3b1c03c791bba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ja/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ja/firefox-151.0.4.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "f24314ada8dc42cc725506ca24b38fff52c5ab461051fecc3368a77fa346987c";
+      sha256 = "a69b5156f3a825920952df1cf1d689b2465ea755d38a39fa14f73763a9d060e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ka/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ka/firefox-151.0.4.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "3121477f55b1d93e4bd451f54354eaff9e0c5081083cddae5fd40c0466b51138";
+      sha256 = "b23ad11801254bd60a02b7eff122b7372dd25cd5b26b0544b8402e68c6082e5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/kab/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/kab/firefox-151.0.4.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "3a6ec5144bd65a670e22d74e04ef9ca8ee4d5cacad39664b9f29391bc6d8d37c";
+      sha256 = "f833c910ab36dd8e48e9865dfba85028a4f075938bb0b72697a78d54c8ba384e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/kk/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/kk/firefox-151.0.4.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "3514c9ff771996349c5d47ec512a06211390be0f5ae1a44e9c02d34546f1d919";
+      sha256 = "0977ea48d98834f23df941cd4a949b5cf6c3df2dd1a93b1c3b27a63c8135b584";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/km/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/km/firefox-151.0.4.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "ceea632a61f20bac5d0389aa29390ad563affbd2428b9510ec21546631ed0f20";
+      sha256 = "61145917a4f3f3ef6aaca76c448b45755ab0f99b653b1a04aec3f816629c7c82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/kn/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/kn/firefox-151.0.4.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "758335343dcde2809b2154c01e45fb81a329845ba366f41f16aff82c119ad7e1";
+      sha256 = "12e15bb2fb1284d60bc9677a8bff5114860757cb6436813af758ffb56d464c13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ko/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ko/firefox-151.0.4.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "035b4a77a07a72e157d1bf69be09692ef76bbbf33425aadebd3b1ee7793b1f46";
+      sha256 = "5e531c64c897fc78c894a5c072c3b1f1746a5dee4dca58fc733591fed481d5cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/lij/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/lij/firefox-151.0.4.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "3ebdb48a8f4c5c64ad0e62be31ddb1e5e5c879b7bc62c215b1f1d71ed5d237fa";
+      sha256 = "46381c13c6ffb5e274c700f8596e6c96f32ff2b6e7b028dba7254d437d249705";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/lt/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/lt/firefox-151.0.4.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "f8a9b07e10559e65022117f8eb4c61ab1980194b4204e27bf7235249658a7df7";
+      sha256 = "367161d330271d03ab006fa4a388c3506313010688291d2ab380ddce2e3e7cc3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/lv/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/lv/firefox-151.0.4.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "9ddd54ecccfe7cc8ad126e47068db2a555795f637aad7c92ffb65db0adb7bfe2";
+      sha256 = "bb6e468fa954e55f0ff7be00becefefb153c74d6fa9772d75e221efc39443637";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/mk/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/mk/firefox-151.0.4.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "6a63266fa93a43382716458eeb0c4f6684678040b5b434fc3af552a316edbb9b";
+      sha256 = "7546a51c35a0cca092a2173bb11a130c3538de3f39c2805cd8c78df93b1822b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/mr/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/mr/firefox-151.0.4.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "d0f100c265a28b9ad03c5fc912c16e025b5a32bfdc4d25e26d9d72b67fe153ea";
+      sha256 = "0430c34b5ab543c758202b9e20825dbb801e32ac79b6ceee507237f2ba942a71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ms/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ms/firefox-151.0.4.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "dde1073a74f2b67feab1ce42b0d76923cf0adf5b26e1aa8627cb700ffa949e27";
+      sha256 = "4fa461bd9f1b1afb1deab7f1acb758ce9af57fe5e5cc217eb14656a5cd3dccbe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/my/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/my/firefox-151.0.4.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "37bacda16e37580d9769ddbcab39719714d19aef8e78b2a33478e523e8bff0c2";
+      sha256 = "880d7c9428876a0d160c1912032ed8de5948055e75ecd8dc686dc8edcbe2f633";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/nb-NO/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/nb-NO/firefox-151.0.4.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "c7188be1213bbc85805f371e86fa92131ebd8a6b323c92d97ad028ca67b5b168";
+      sha256 = "2b7f7c6525855bb81c6f6c35a8a98d83888b3e4392ce6c814298234c4ddccaa9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ne-NP/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ne-NP/firefox-151.0.4.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "69bdc7a4d90fd6d10770a05db00eb5e1ff847a046c3046c03dfca03010873e11";
+      sha256 = "88f21e16d1b6e075f87a3d6ce79d9187be02590f38ffd219a2080bbf78f4e12f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/nl/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/nl/firefox-151.0.4.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "8de71875501680cb186a44241c9a0c32a49325e571e70da6a926ac5f0eccaaa0";
+      sha256 = "55fab1471b8bf19ddbab5c5c01d3e190d61658d598aa6142f80f2d0dd4a5e9b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/nn-NO/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/nn-NO/firefox-151.0.4.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "d53ab35a27ae410f14a6859c397b6d12fb0cf430e971ac32eb87b1854e8f4553";
+      sha256 = "110e35c48fb3e24e2dc028906133726441ec56fb79b0d702b3c632b8ece33e7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/oc/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/oc/firefox-151.0.4.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "f591b4e124d22c110fe3cd0b415511b70cd0bd7f346d55fee5a700852c7010f6";
+      sha256 = "073f3c525754a003551c86663beebb2fc9a139c1d3b67ca3a1ff5f4056e02880";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/pa-IN/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/pa-IN/firefox-151.0.4.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "0882145c67e2be53943f1f826c870efec91c58b51b2677eb75f65279f6e36e24";
+      sha256 = "9059a6e36bffe39d447f275385c25a38b9dd117671a917086dce559093d3af9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/pl/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/pl/firefox-151.0.4.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "5d552f469df13c282197bfa9133eee896982b7a63d39d16b538f1ae5df7ba7f8";
+      sha256 = "b8d82d1546c2de3e750c620361bdcd014a6efcfc6827ab2376b37ab610dc899b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/pt-BR/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/pt-BR/firefox-151.0.4.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "7b2dd06f14a79331d9afdc90f3e565e120b2b85ca58d1b704898b3700d8775f5";
+      sha256 = "cb84e8d322d29c1ff21c085a433fc2f59883e7af135a27271f6b0d317ae14a3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/pt-PT/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/pt-PT/firefox-151.0.4.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "ef9d8c998b35fcae3a2f1f4282cdadb9196e431665ccc9e09d01aee398f7d85e";
+      sha256 = "3c2fee42dc1706437775f48b486920cafc8b99f394c7d995e8f83f4653ef2f29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/rm/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/rm/firefox-151.0.4.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "2d6cbcc185abe34dde45eac8d798f0a8defeeecd11790778bfee0e82f99baf03";
+      sha256 = "664eff14b84169f13c64548d1d0789d03e4da5c7fefaca587fbcaee6cb321417";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ro/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ro/firefox-151.0.4.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "66648dc8a762e1840ae36e39f73d10ca89cd9596d11eb1efca542170c4d5b3b6";
+      sha256 = "8b17c14de1a069026495c00d86044d5b1fce816740d2117359c4db1ca8b253be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ru/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ru/firefox-151.0.4.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "f93b3f3aa5ccd63af4ae4b495d9c92b0b5a80f1f2f8ecd387c2ffae6db3d49a3";
+      sha256 = "87e93998790b98eecc2781f1d0b73c85fbc9ef21addceea66a561d6aeb11c07c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/sat/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sat/firefox-151.0.4.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "aa9bd1d8bc465a56087a6d65ea13fd136e4d640d794d18fec0329ea1ba8ad6fc";
+      sha256 = "5da3172c2663dc85288b45e4d3e76af1122be8b7744922e95f062b9621e54045";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/sc/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sc/firefox-151.0.4.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "f83c19ad84df50208af2f2f90c99d96bb2dd9a8d91a6a27324c17ca9f86cc405";
+      sha256 = "7e46dd591dcfbaf30da7f5513a7e6ad66671ddfc18eac4d82ae6a10b68effeb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/sco/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sco/firefox-151.0.4.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "4812b3eafeb1b89b32923758c82b8309dfc880533e01a6d2c64016692edfefed";
+      sha256 = "3238b6c0f8103bf25298a5df64e6969fe203e72b60407147efd2115f33bdc552";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/si/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/si/firefox-151.0.4.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "ed234c43c68cecf838d2ff308c54ff99e69616650441d985b56d53bc839707bd";
+      sha256 = "4b3c3cc0634cc640db0a174ad07ae5c35c74da107a23919bf8c0aa176b4eff87";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/sk/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sk/firefox-151.0.4.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "6e366409bc4dc558c1e1ec3c76aa87d1244f7d988663439141862617de96cda6";
+      sha256 = "d61d02c09ef8d554b0412d59902a1da092ba35fedf0bf97f05fa7b9000b9422c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/skr/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/skr/firefox-151.0.4.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "ff62d952141e2388e7b55fb2130adf082e3ad88f43ea8ceea9dd15dd20fd9167";
+      sha256 = "4de00a9ac21dbac4008b2be38890e2f56a0f5f7b97ebabaf5b8e755278ecd432";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/sl/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sl/firefox-151.0.4.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "d8ca49274e30cdf82c1a9aab2feebdf370cbc5d51810e91822cf1b0cd1fc203c";
+      sha256 = "a695b7dbe92b22c3eff265ad3f95bbc8b2baf3597e3fa70287a65ea32b909bd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/son/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/son/firefox-151.0.4.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "7dfa7eef693d50c99feffe88a5c5303fc1f156407d3416e1f0cb35a3c556d88e";
+      sha256 = "45c93b4d2f1096b34a1df3a09fa6d1ea09827a32348c4ef9882016f8b602a69f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/sq/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sq/firefox-151.0.4.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "cf55f84530b4ea2fe189be354cba0ee3ea2e93afafa6d762ac476e741bdde02a";
+      sha256 = "85a50059a4ed730c2353e674f995668828a5f660aca46dd6d4f8cc166da79652";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/sr/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sr/firefox-151.0.4.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "e7cc01adc007009aad91b8e81cbcf3ce57fc8b4ebb0b058d262cc26c54de6748";
+      sha256 = "7e0cc7694b3f5686c8b11a5bc9419b4668ca95251d22656b37062cac675434bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/sv-SE/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sv-SE/firefox-151.0.4.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "7058bafd1f9b676efd88ec00c6f34c46242c868967d5dab74f130509686fbaec";
+      sha256 = "d5ecbc202eaec32036a8bb6d6d7df39bf53ccbc4506c27c282d88cf3c27094e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/szl/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/szl/firefox-151.0.4.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "615122ecddabd3f3ac4cc517c5477b1d1bc4d5f61e6c77ed775b4b775121dc33";
+      sha256 = "554256a3e6d316dafbba75f4019d80a154f6f06ebf4e47c2403d87daaedefd3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ta/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ta/firefox-151.0.4.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "16f64a67539e81f196d0e28ba3a97777cdef18bca1b635c33cb42d9151fb2d49";
+      sha256 = "2932599e7f7ea4c4fb5081b6ecc13e48b00045ef1b35efb3c87c2e515d62bf73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/te/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/te/firefox-151.0.4.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "74e9cf8b2c5bca1a56daa6afe26f5981378e48653095823af70bca0594404009";
+      sha256 = "eee28745d2cf06d93ad2471241ded63c695cb926be07490f5d324ee0bb3476db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/tg/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/tg/firefox-151.0.4.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "a667b2d8ce93b9665479d125bcdf98973ae19dff96a24ebc5e062a0665a59ae5";
+      sha256 = "5db058056434892cfecd6d2fe7e416623c612e4e7f67c0e8241f7adb00899a21";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/th/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/th/firefox-151.0.4.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "58afff776e148e6a9e94b34df7fd8ef6d52c73ab0bcb17b574530db831fbe009";
+      sha256 = "0a570b70825cdadef9812ec3a7733b0a2f4241c789cd81dbe8d5da939caf8f09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/tl/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/tl/firefox-151.0.4.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "b0d84f27cea7d2603a6cf31e3156ed5fc4bf75a45c1d5e975dbfef5a1f6b26b6";
+      sha256 = "f76dc8d34852a5c2ed9e52dccbcc6cf68e2b661d05800ce726f7b3dffb5e06db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/tr/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/tr/firefox-151.0.4.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "d858d039abaaf872a76c5e3e3245f2782a208a9e9123bc41dfac10e16d3e2408";
+      sha256 = "553226c673a4f015ce05c1412a06a8a3493fd42ac67539624a60c93e3d88c811";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/trs/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/trs/firefox-151.0.4.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "a151cd48397600784a68e933e38089c0ca05c561901d155b5829fff56093870e";
+      sha256 = "5eb9902019c6688732d4eeaf6077efd6fd97ed70169fe6e9323c822aa6125894";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/uk/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/uk/firefox-151.0.4.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "0aa41f50e08c4525acff09fcd4c083aec0b80030a6bc63cfcd3b2012e584e8e2";
+      sha256 = "4ae67bb1127387879acfefd49f973a4c52d70c26412fe2195be070db0f220cee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/ur/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ur/firefox-151.0.4.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "0c71f9d27eda61266b6cdb5dff7a1850b7ac3a4278573e4a13ba436deba7d070";
+      sha256 = "a368812f3872b26004558e71f5344cf8730f5676cd6791dab86d1a8d2f5058fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/uz/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/uz/firefox-151.0.4.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "c70507c1761687653b00940acfb9533a969547b508a9a6efcdf42c0afa48d291";
+      sha256 = "8b034ef77df66121dd424c561f107fdec1b26bcfe873cb042718fa152d23ca44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/vi/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/vi/firefox-151.0.4.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "983484dff631fc4e2e39e13c6ec4f7ecaeaedf972b31c91db16b234e1767f2b1";
+      sha256 = "0efdbfc744486392ba48171c8cc119402d98ba0071488c2496f0feef2a072ef5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/xh/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/xh/firefox-151.0.4.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "1baa772ce94e74b99768e99708bb7f87d9c0bae3cbdad5ae59f4f127df889980";
+      sha256 = "07e9ee8230d48bf8511b817c4fb7ca99f06ca23ad03a454b10c793355b846a78";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/zh-CN/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/zh-CN/firefox-151.0.4.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "ecbdc1f40aa27e5692b929c774f3b5f1f85451f7cee51e22a633cd69798a2b89";
+      sha256 = "097d12b4892658712913f4c59578b3ed78692061816190d47cd521f2452e232b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-x86_64/zh-TW/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/zh-TW/firefox-151.0.4.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "569b49af0e704c7f32bfe0ed2b19d5609d807b8b62bf561ce06b1ac936feef30";
+      sha256 = "89621bb75479b7f30fbcca8358f4a477358de3a622ed83c0c91661fef0169dcb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ach/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ach/firefox-151.0.4.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "2650c1890fb01adf1b1fa39a37cd2e52eea17ff678928839db26c9175b5e87ae";
+      sha256 = "2a148ba5395d248a979fb86ac45ea7940aae254a0dab7d83c3842b880218b6c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/af/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/af/firefox-151.0.4.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "e9440a8520e3a407a76ba5d698562e846d401265eece41f1c64b4d12ef99d370";
+      sha256 = "a10a63f3c1c9918013c05322c9b66a9377bec1001a5da85883be116bb8a541ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/an/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/an/firefox-151.0.4.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "2b26c40bb52fe0b4f94301861af3e2e0021ff80ea6b56f84b03b54cf2dee7066";
+      sha256 = "a3a68e693fd54675e81d07a017e21e4a69808262b7d94753f31e9355501776c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ar/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ar/firefox-151.0.4.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "d37d5c78c0a4cc78b8646ed3214092ae0e4a24e9004feac22953a9eeeb08f9dc";
+      sha256 = "ff7dbe73d85709663ebcb0437d68391a4309e154527b2f384087ba0cfed51eea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ast/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ast/firefox-151.0.4.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "ccdeb74e3543bd8d5e792f3c152cd50acdbfebcd11527b1e79d2ffc5266637c1";
+      sha256 = "fcd69eaa2e2dea0e685a9e23ad24b9aec4c11790ac7f23f75bfb7ad38e7b4876";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/az/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/az/firefox-151.0.4.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "56dbd1a8299e32942e4855c6762b19eff5a18a7d6c7fed6297c4e4316db4c491";
+      sha256 = "20152c7d830b9577c472263e5abc141c21e30cb231900faf7e39104b1eb7b3e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/be/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/be/firefox-151.0.4.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "3cdbdccb7a6dcc5e2cb353278bbdfd29d31f99fe5d62ef1016cc5bb17e7e6f8b";
+      sha256 = "e34760e4b5ae98515f237e524008a1db30d5c05feea3d59be68964090dbb89c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/bg/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/bg/firefox-151.0.4.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "827712d41ad955966f5d1cb4ac42ba0555819e38691dd494f7c566c5cafec299";
+      sha256 = "992cf32b95a623969d136cef89a1dba44a20eb00b74918c098b61a108d59c738";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/bn/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/bn/firefox-151.0.4.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "f248bc0c13c03ff75f257434cdef20c40637e0268232d03bd165c3c85fad1cae";
+      sha256 = "af5bc711a904f24226dfd6883bfdc63a69c030a33681aee838f19e95ff4268ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/br/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/br/firefox-151.0.4.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "a3a3fa31a6e9a02be4a80e8ea167aa3a86bc7f58e3657ef2075aa536c296cf0d";
+      sha256 = "616bf28b84f98c2253a8c7072f1aeb29b0927f703d751368c879fc3b911865ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/bs/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/bs/firefox-151.0.4.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "6d5bfd75839a68e1e370523e8f7e1b0222e245a6180f8c01917874d7c8dfbf58";
+      sha256 = "fb32d2badde34732bb232652a96330205d57188afc91775c4861a4f9d879833a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ca-valencia/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ca-valencia/firefox-151.0.4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "5c1437493a2c86deabeb3a4728e3755dd5dc657e5ec55d9022d0a76d38cb0afb";
+      sha256 = "1a74d1d62b84977e2cc08fe85ba88b2a074db48a87d36ca87ca50f43224b9013";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ca/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ca/firefox-151.0.4.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "8cc0faab8685a8343eb30683aa37a4fde5b543e50f0101f611897de393e7383b";
+      sha256 = "bb5e52dcdc6137a99e3f3ae9ce51ceafaebbd2065c3ed61d0cbf943dba87101f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/cak/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/cak/firefox-151.0.4.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "debb755d807893c20370098f48205f726c4367bbf1dc3d8ed2f9e89d5e491a8e";
+      sha256 = "324c518b8c7a7bfc5cbf41346bab81f8b69a18356a78cf79d6a09ec4878bb21f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/cs/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/cs/firefox-151.0.4.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "7d7a1639b4c64e10e5332e12187afec234f9306c4f8124fff0e8cc7cb7e58d1f";
+      sha256 = "3dfae5a5174a10224f9275591c3e4287f433996d7428fad4484af76ddda39894";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/cy/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/cy/firefox-151.0.4.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "7c829f12861ff1f7ca1adac1c40b260169d8befc1a3c2e79040f974c241db973";
+      sha256 = "57c594eff446adf6d8c6443e6a5f375a5eae2edd4328012b5dc5f37e29ee6469";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/da/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/da/firefox-151.0.4.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "b738c438f017e3ded7fc24903723297b641107fff4744230e8c447f9103790fc";
+      sha256 = "fecadf40892bfd6d51142e5aa0250846a78647002c10b608f25febd8aa6c3719";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/de/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/de/firefox-151.0.4.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "de87c594a318c8f1e5d7a30297fbcb1755e73979a192112454bf781d5a0c50d8";
+      sha256 = "9b01eff2c90e0f7c34f57e53a182e1609356f68411a650eeafb342d2e211e285";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/dsb/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/dsb/firefox-151.0.4.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "40d34ddd99895a79882707af2ac002f984d8d0413b6606e1df908ee5ed9faa50";
+      sha256 = "1eb1bc9c3533e5b62cca23de936c45aa77ba1dce840eb9627a3b28590b281ec0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/el/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/el/firefox-151.0.4.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "9c82b60fd7212f5af92dea144246a57f9f0e4a156d1bcb2ef632676424e76684";
+      sha256 = "7f4a71487fb4dc7bff2f37013d04db3acf1e9a02525c7305f1ade36153d52c61";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/en-CA/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/en-CA/firefox-151.0.4.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "5fd49843932fb6d9ec233b3d975319b75b4294a0d18bab07e28e5fa875b891e3";
+      sha256 = "10bb7e02801535e97d9267c472d40b3328cfe11f600cd5f95e317278e120b8c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/en-GB/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/en-GB/firefox-151.0.4.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "aa20494abb5a0452f90fcebf23df4fa11a9882f0288913a9c18af1a41e23ed8f";
+      sha256 = "c11b0198a5441dbf83bfc90033be092783854a7a5bb6f9fd04611aff29aaa3f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/en-US/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/en-US/firefox-151.0.4.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "1efbb93469668fda8f091dbb35c3cebf3fe08754aef3a8755c8e61d805a4e89b";
+      sha256 = "31eac8648add83583ce13b1635eca1a24f25ce5dd921f606687909a5cec252f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/eo/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/eo/firefox-151.0.4.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "2f2b6ec6d8bd17f83a63c0043d5b405eff5d5e119a4ec80a17357ff08fe204e5";
+      sha256 = "e7400613f2a8993c97fe2dc340037604f203d4ac37655a9700b694c6f2479cc0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/es-AR/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/es-AR/firefox-151.0.4.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "6a9b0ec549d0cf15fdbc117c1364d8d607bce0bd06c5f7964e0f7e8a256e3675";
+      sha256 = "96796ecdc735a391521cbf3b9e303cec64171b9a2e51580da828ed02b589ab4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/es-CL/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/es-CL/firefox-151.0.4.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "a39731a0ad9fb4c0d13848e96a059e40ae0dd1297e0bfb425eda26b288e2d276";
+      sha256 = "e232f089967203a114d27f58a22b327ecbfdc6f6c26ef85bfacdb4cd62b61e5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/es-ES/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/es-ES/firefox-151.0.4.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "78874b3930efcf22e62dd5ace4e1862727ba42bfc3f0a0136b8d95d8ffebde14";
+      sha256 = "e4a78ce58e6ea5dd2f5f2688830fd057d88ba28a4cf47ff47c65ab569fb588ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/es-MX/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/es-MX/firefox-151.0.4.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "f198669ca924bc350a2c50c8cafd8c0d073084e58d1ba87d99ceadb25ed88579";
+      sha256 = "8e9361112eecf1f3f3964ce07c7fc6b2cf7b0350dc86347a8844228eaa71405e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/et/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/et/firefox-151.0.4.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "318f89e5b4500562979f50b0a625f0d8060a3ac0cfc9f7c55427163006133803";
+      sha256 = "40dfddc2dd4a20d41195d0d9db0193e900eedd14d466161e9df46d7f6c2fc22e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/eu/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/eu/firefox-151.0.4.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "3c1bc2dd1e457013a26cc818e5ade096ea4944882ca471d90cb23c2ffd6eddb4";
+      sha256 = "4fcd800585dd9281ba4c922d9f9402511d85d2751eb72c1677176d9f9f06246c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/fa/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/fa/firefox-151.0.4.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "5d84ea136bded65df4813ffee7bbfcae8ca08ae1f2cab08be0ce974ecf382bd2";
+      sha256 = "c856afc2f8f92d1f4d189d3be5e93bf987984f43362c7e6f30eabb7734cbd514";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ff/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ff/firefox-151.0.4.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "ce7098d98d4308fea68ee01b4a3fd30bc30aec5aab7eb10ad1f7f73369a5d7ca";
+      sha256 = "d30ce672b4a8032b56bd91b4d7cc5fd6507c7e3e9926a68a0656edc8768b54ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/fi/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/fi/firefox-151.0.4.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "9be532e7c1e7f3e5fa4b0a1f3cb6cb96a8be16202b4965809e6abd8598cf5f56";
+      sha256 = "e6b8be08ce3692d2d4e9b96de7a88794ca3cfd9f4368b95c4772a7b7df687853";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/fr/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/fr/firefox-151.0.4.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "98f51a76df21e1b81b6ca80391d143df1ff742893ff50f5df779dc30036e7cd1";
+      sha256 = "a5d275c078f6835d8f8edc34f968fbd14e5b8dca4f83ad92f275b4740bb51026";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/fur/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/fur/firefox-151.0.4.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "518a9b03ab5662fc371b55893c7065989a25b84331428b9b7cf8b7c3bc941f60";
+      sha256 = "f02b78936f50c20ec1c2d87737a532477cd2242a760093c0114bac91e088196b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/fy-NL/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/fy-NL/firefox-151.0.4.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "c5e7e3206f83fecdd7153f9b530a9d1efa5ac21e370557e166dc85803f14a750";
+      sha256 = "6d24f9de7c251e0fd6b5a31bf3c5558f1cfd078fe4fe439bc3632f6fbc8db960";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ga-IE/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ga-IE/firefox-151.0.4.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "fc7273451bf017abfd7258982ccd4e8a0b4a4a16d2257291f6a134adb15fad73";
+      sha256 = "64e2b7ba35f9e5cb45b7ad1fc7dacc902b980ba8f21c7ea9eb508a6d6cffef0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/gd/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/gd/firefox-151.0.4.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "dc4b28d48f4bd956e6b872b11990f0a79a6a7a9f8f1d768f6d017b8084213b43";
+      sha256 = "ec520d9aeedb700664c3dbf6b3549b422c097b0c4aebbb5ea9eb3693fb62dd41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/gl/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/gl/firefox-151.0.4.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "772a5e623a0abbcd0f0324956e2253e217ad28b335fcd335ad900c8bdb59f7cd";
+      sha256 = "1a6075d581857d1273f3c4cb643609c17d45d02385ab69941fa06d421f0fd757";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/gn/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/gn/firefox-151.0.4.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "bdba6bfb4e0644c1c65e4628131a537d36ea2452eba3cbf703c3974ced836a44";
+      sha256 = "d0dd378393b4909a10380d9999e763a0043da09c686e3e4337e2d9eb3675757d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/gu-IN/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/gu-IN/firefox-151.0.4.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "159e95fa62ff52a88a14f4efb3564ed175911284da65e8e3d1a62a7b2c2c9c25";
+      sha256 = "c713a928e655c1ebfc34fc9a9818d08049f9bf79f8709d7265e38efe436a1571";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/he/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/he/firefox-151.0.4.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "7d093334da7c828eff9a582663f9669ccd7c4bbc15fab2523d5deeae53c4743d";
+      sha256 = "3dd19410481bed37cca8a66ba8710236ff1310a2e92a9b130f2f3d1ed6185d51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/hi-IN/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/hi-IN/firefox-151.0.4.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "f47727c680349609970a65c22dc0e980dd93eb5c536d976075a9cef059758894";
+      sha256 = "48a05d3a894a664df179d9b30ac8f27a484cd0ffa306d1a4141a876d4fea9215";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/hr/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/hr/firefox-151.0.4.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "224ee8677d1183994e9a15fb9e78d21e9938b65a629a5a673a258f367c2409af";
+      sha256 = "c23027e824c602d8e8b8c768187ba2eda33fb2b29202fb5ddabdb11c72d0f94c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/hsb/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/hsb/firefox-151.0.4.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "ca0547ebd62115a2f1f84d62c0c5603550b0f21c1d8311525a581dd0a1945b7c";
+      sha256 = "bb9614ce4f61932e43e9c881644d63feb5b3667be2a1a04800624d3d777fee9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/hu/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/hu/firefox-151.0.4.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "f38178e0826b6b87c8eb656a3d5ea3bb992d339cdd5eaf2c649c719100302be9";
+      sha256 = "784300fde25f2e41c0845352a22cddb54a421ab75bf0770e0b01714482726b05";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/hy-AM/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/hy-AM/firefox-151.0.4.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "7160b228fd326d867e034c18dde03a7c22283e4ed53803c271926844cccea3c1";
+      sha256 = "ec1c56d7c5daae64ef901b6c60881b62e64f595c0f29cb6ec35df3b2f6711ad4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ia/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ia/firefox-151.0.4.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "ce03bdba24fb0d6d3fe4142aac1dbeb5f4d0979aa03ade47761f0d9ffefad397";
+      sha256 = "414dc6d722559ac106c87c36829a2a13b97615341df068d4644bc28357ffd021";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/id/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/id/firefox-151.0.4.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "38f57ba97feb7e44c73a14f4777db47cc57faafa04d2105aad6d20e209c53c44";
+      sha256 = "eaeff32ef724ba192fab1deeead47b9439529c27350bb154d6f99989c9e5a6cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/is/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/is/firefox-151.0.4.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "71a96a923d17380868129f75ddef57bb4ed95b54dc067811c53610e707eb70b8";
+      sha256 = "577af541c0d8c2b132436487b37deda00be525b187b1f90c53a38b7854286d88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/it/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/it/firefox-151.0.4.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "0f87ac473541ee02e635d1870ff95756a155c8fbb99bf5caf1aa648a9cb3c443";
+      sha256 = "a3c62cbc99944bedc53e925ec19f4e49675f98f623ee14d50510965d47945bd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ja/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ja/firefox-151.0.4.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "a99a111bb46d8212e0e25abda2b7443ce9855bcf85aeb08a26220a0e0fd65eca";
+      sha256 = "8d2af729d55febd5992d32f6048327c9a29ad6b3013860173262fa8d7ac5a57d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ka/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ka/firefox-151.0.4.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "13807ccb1a0706978c73d41f205fc2fc0294ef063f91d2036792d9df942ce246";
+      sha256 = "4558e58356f3b2f8a45e5dc2405ec2972b36b1fb89f620beb60862fa1fe1b60e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/kab/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/kab/firefox-151.0.4.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "53aff6d5a22588a3fb8140c13cf37554e8b1bdf3496e7962761c6f675fdf0886";
+      sha256 = "fe6de24faabd6026fbbbc0ce9d01b72a05ee921632b1de54e5ca00c4413e0181";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/kk/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/kk/firefox-151.0.4.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "f203c31c7e9cf95d0f6f9861e3a2868c6931a4136e607440b74d7c99c3b23bf2";
+      sha256 = "cd8a8d5ddedc126e438a35ac1e3b7dc6ae33869741d4f37a2b315184ca533836";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/km/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/km/firefox-151.0.4.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "46d26ad831f6e4856bf9dc45267890c443b7a70d4bc7ae1830241f3dfbf93f3f";
+      sha256 = "8d0adb3e7db27c014f5bb0707abb146a301f77bb007d6cdec98bb313184a2f1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/kn/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/kn/firefox-151.0.4.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "4bacfcfd9a8cb696f12700ff1cdc88720fb56520275e017764505e6c289fd2c7";
+      sha256 = "7dfe723e490361092314fcad1c28b79f7449720b7999a338d4c392f8bb45ebba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ko/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ko/firefox-151.0.4.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "49d54efbdca1afb3dcc68358db2a919cb551754c749ce2e95e2c80d47ef81501";
+      sha256 = "55c68c17ec82f4451571fdd3dbbe781954429a54c41b12d65c922661703ad5ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/lij/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/lij/firefox-151.0.4.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "0775939045906beffa8e31b33d20392db7157b88d6dfa0a8363606ca8a8fd11e";
+      sha256 = "6d5f90e399770e6f90a02c2a6f9201c81bd75aa4ddf5f0c9830e7f2bb976b3e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/lt/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/lt/firefox-151.0.4.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "394c47d8629955593dc45fc3ed6290bf27d925a355e15f58228937e3410248d5";
+      sha256 = "0c271897c167f9aa78d441587bcdc491858bae35d0193a555c81e8e654f72da5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/lv/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/lv/firefox-151.0.4.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "63a9ececd7d413a43528239225cb7ecd70af09c87062286273e48d0628e73fb4";
+      sha256 = "9f8ca04ab9bb7897e2b5f2fea8d14051005e8b84e238479310486126e2c8aa7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/mk/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/mk/firefox-151.0.4.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "6f32fcd56d55b302d3bfdd1ff71681f10a2bd3f2bbc47a6a47db02abb4d36d62";
+      sha256 = "a6059f371ebc9fb7b894a16419f1fb8dc8eb52b7e215faebbefe18e140b0781e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/mr/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/mr/firefox-151.0.4.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "283a2033b2c7646ee917125576a35639a16f752c40660ef6eacd0e79da8c2e15";
+      sha256 = "05e1cc59ef7b4db5a6f9c5950145672b98d1e8dd0e514d911a931f40af52ada6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ms/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ms/firefox-151.0.4.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "74a6c3c0499c53ac35d5376bd3d528a71a2ca78d5fba2ed229cb84f2721e9e30";
+      sha256 = "33f166acab96b7aed064e73ab290457af3daaa57bb530b1607bfd149796e6118";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/my/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/my/firefox-151.0.4.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "af6fb220c65ac3c458b6e15d4d27e6ee6ff89dcbaee9894e803bbba5cd7b1344";
+      sha256 = "da4d2a6160cc516388c7e5ba6c61ce35fa2760f85e1b482bf0168986a54b1221";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/nb-NO/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/nb-NO/firefox-151.0.4.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "320cc2c164d61b625b176451f44619a57b55bf63f8fc9927f76daaf8600545e9";
+      sha256 = "c508e7af4e8d6b76798e7b8a0ee904304d01a2ad062adf107f69c0b691fa35dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ne-NP/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ne-NP/firefox-151.0.4.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "c39b93e5001ca390432e6243b1544f74793449683a237974f7c1b70feadbb503";
+      sha256 = "aeb81280e7f0dffd203e31e999292ec043d9bad49fc7aa05c4960568466f67e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/nl/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/nl/firefox-151.0.4.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "e1528df7cac8b4e5664a7c3e2447316fab3fab1ddfe64d1faffd9a9a18457ed0";
+      sha256 = "c702b2122a045990dcc8b93f02fbcfd20c0228cad6122ba87110ae8d8e1a4013";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/nn-NO/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/nn-NO/firefox-151.0.4.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "aa977181e8b1157477c6a2b0e8c6f66257a8be5188e1a75fc31d861497716169";
+      sha256 = "f4715bc8bd6fa2448628b79accceb2ee222e32505d116c5014e95a9da462b5c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/oc/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/oc/firefox-151.0.4.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "58a385af0b95981bf9bd1fa9e5b9cd7452acf510956c14647a4631193e13ac35";
+      sha256 = "e2443416b04c023f049e2848909135eefac3561589ac68e977bf85163ab27f0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/pa-IN/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/pa-IN/firefox-151.0.4.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "512f9d85a457a09068b5edfae64f8a55c00dcf7076913c5bcb95c5026cbb4b8b";
+      sha256 = "08734b2e09ad01749121961a16826342d7c9f0fa86bdaa9ce5ab1d37dc5e7f68";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/pl/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/pl/firefox-151.0.4.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "f46a64ef9f0164f9c40ffcf1fdab75f20759e93d9c8b392d448d6617b0717d9b";
+      sha256 = "43225e4645a56524c358740ba76e3a985d316fe9fac684d190f74edb2da82661";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/pt-BR/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/pt-BR/firefox-151.0.4.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "09c27c2df8808836a8f53e8e870253d043cb5b669ca52e9d254e6ae35fd48f4b";
+      sha256 = "cc8f1c2e049e944da5978b6bb00df7dcfe200bad9e642234c0b10e77ec74a900";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/pt-PT/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/pt-PT/firefox-151.0.4.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "06091a73f950af858c3cd2f530a6175fa291d20c8bd0dd53863b0e1e62321cf4";
+      sha256 = "849f574ba5a78768ff57e45e2f33e824f9d5d8e10676e38d52cddfe2451e145d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/rm/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/rm/firefox-151.0.4.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "be78c2e9f7fc74eb19cb594f3ad3689e26d38ad0c278626e359a3e246c8713e8";
+      sha256 = "06b1d82020959127d6ad13e0ca34c5709b1fc02fc8ea4d033e2852fa6cbfbc80";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ro/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ro/firefox-151.0.4.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "ef30f8b422abeb66999adfc83daa8175e8322626bbc33273c9f53b525624c42a";
+      sha256 = "5304dd3f87009cdc6baa8edb212f0e97bc062e9606e522cce265fc1b81e8f651";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ru/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ru/firefox-151.0.4.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "6173b26704cd8292180a7653b5074804bf09b92f76a6acf4404b3146e255b2b2";
+      sha256 = "d3dfc4a2d53f229a4462dc850f1f16bd4ae03edacdbb9a3fbb0116649ae98a05";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/sat/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sat/firefox-151.0.4.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "91e054364494006b53c3ed39064fc44dc43fd1b430052cf6e4a331d88eeeb3cf";
+      sha256 = "92349a705603d4ea74fdfd03e98dc04c2918f2163cdd2b0bf33b1e75e890dddb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/sc/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sc/firefox-151.0.4.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "5f32267d2b2978765800657615324b08e5c824de804fd6a691b50e154c8af774";
+      sha256 = "e5858c4ad0d1e0694b63a96de3db5dedfc8de6a01b55526b98575786d259f7c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/sco/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sco/firefox-151.0.4.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "de486d285cf23ab663b653f018df8b4e7dc3c8cb46e6c6dd0260c963ab8c3f7a";
+      sha256 = "fbf420f26e3bd5412f010b5029617b96f4fd0f75b10a85f3c65a8f12148c0054";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/si/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/si/firefox-151.0.4.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "6fd12b14a339b85d7ca1a076e48ea6a6b1789813ad0a9ec50b5deaa69aea7674";
+      sha256 = "e15bbcd9af0e722112e90654b29ce81f86e75c78f93769e4078a71f3560e1690";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/sk/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sk/firefox-151.0.4.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "91ffaf24508649a4ab84efa9dc556309571c2cd7e9222252850f7d34c88bd9b6";
+      sha256 = "15fe710c5877fa30c215d93c819ab85ede215765416c6f68c649a8c43303a36e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/skr/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/skr/firefox-151.0.4.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "8446789bcc97c0f4ed5ecdb1cb6348449985255b9b3418f509cfcccdc9f1cdff";
+      sha256 = "a45e02c07dec0d9dc5ef5c961f5dc83647fb6e95763e7a091c848fe0df356121";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/sl/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sl/firefox-151.0.4.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "da1cb0c1b23e5199fd71cb099ccee1d7e094db452f53053ec96ba30bc1e479f8";
+      sha256 = "f661da01a752d5462549d945407c56366962c6943f923ed10c26d7d3f7626ba7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/son/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/son/firefox-151.0.4.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "c06c3a7c2925bcb9d7b511df71ec498c9300e1192676409616c97a4b8baa7b20";
+      sha256 = "3487d39b10f379c7879c9a122cca170e3c96ce3b01778349fbc04cf97a9bfe45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/sq/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sq/firefox-151.0.4.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "7c4127cf8764851a792bb89a299c9961776f219db49da14c9842f7f6c3c1bedc";
+      sha256 = "669d4b95bd8dbd1a68d6bd436a08c4d5a745f77958cd58b2f3ea1ccad52f0985";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/sr/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sr/firefox-151.0.4.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "ad0c98d93e1d130da213815c47db6b563208d643e26c3f13b7e9986b6868c007";
+      sha256 = "5cc14011df05aee9f03e84dbe2bc16d0f78047f68634ad32725c1f521dfbe098";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/sv-SE/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sv-SE/firefox-151.0.4.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "437d7efb73dd0d2e8998f46854d8658a7391bc616c3a47ada78e8a312dcce118";
+      sha256 = "b0d8d05ae36ce9bc0e65aa3c83804d20416cbfc3636f62e1704eb6ddb6965a16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/szl/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/szl/firefox-151.0.4.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "161fda33c2c47eff36e1af199a8bb7f80ad524a3e0588dd8b21f36cf7a12e77c";
+      sha256 = "b94d603bf1737b759a8126ec6b2e55e99aac34f4ab3bdd81253329800ce6c1f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ta/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ta/firefox-151.0.4.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "4be72ef1ca9da3368cfb5a70b9fe321f9fc779ed6c649793625823b44676a2d2";
+      sha256 = "6423a83944dba8e78d6ce2d80414ac48b22486ac4f84bf0cd23ffdc0849c56fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/te/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/te/firefox-151.0.4.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "080e691045f2c297c9083db2a60a8358ff4da111641f46241d43d70acb9824aa";
+      sha256 = "b3ff7a776dd223b141182ee4635ef28b1e32fb86c5271323eeafaff8a45ea989";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/tg/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/tg/firefox-151.0.4.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "e7a987c56ea409b75f7ff04e9ad96fc3e812c0b5a4765590b22698837c914a09";
+      sha256 = "66cc2d41ee37917c5187dbf77706f80da466ad8cccdb88631ad36ed6b0effd8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/th/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/th/firefox-151.0.4.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "6b2a221d53b9f8bba9d91f81729d4ae733906474664ad93a81adef95549361cd";
+      sha256 = "5da41a2c479c420401f287ebcac977af376511d06ec5f64676c6d5a07dc6d321";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/tl/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/tl/firefox-151.0.4.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "9844af62e10ce51f0209278d9d8fcd2db9030c0576a6b73a84c17c308d4b4756";
+      sha256 = "fd89b192207bb24ff2185121a1765fe05f98bb12e38ed3699c5a846765162bcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/tr/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/tr/firefox-151.0.4.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "d692695538f9fa38204f0e3c65926e8dc88fef56365e4f9dcfe077d51816cf71";
+      sha256 = "bf923969fcaade255f6158d3ab97889c6ce224cdcb59206c852f5d5323affa9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/trs/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/trs/firefox-151.0.4.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "f908a3805924ef5198d3cb6dba15f0000792995cac5d933a8384a0ad8292d9b1";
+      sha256 = "fdf040055cc0af6146b14ee6ed529ba3370fff2eeeb1d635fa20a9ac5ea57d7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/uk/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/uk/firefox-151.0.4.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "b5f6f031230c35fd39804c7ea10d5abbf6e7c04a66aff5afd5179486a8565a21";
+      sha256 = "1eecddfb59ed090f73f78deb03166aa119dff4bbe9aab6c438c6a5f04d315ef1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/ur/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ur/firefox-151.0.4.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "12da686a5faec256767bd5c94f8eb8468dadbf295302495daa13e04e076e2022";
+      sha256 = "752a957ba36c07c9e4c38261fdb10e01b4b971aea83fe51dc46560b6468d983f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/uz/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/uz/firefox-151.0.4.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "9635bab17a662c1f54a407fbce84746bec39af0a8b41954f1c99129c6a1c6b1f";
+      sha256 = "838934d0833b8b5e64f6cb97cb652dae90bb10ed17aa7fe45d65d1878f6c1a86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/vi/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/vi/firefox-151.0.4.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "03d079524bc413647545e225062d8cec9ca337706379d3166fea6d9bb4257044";
+      sha256 = "0d62bfdfc15d80f9790b0ec499947073fc3a0b1648c912463a6cfc30fb0cb8eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/xh/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/xh/firefox-151.0.4.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "2971d3d3863414bf46ee2a341d95d9aba9565a9476b131352d37769b5e9f11b9";
+      sha256 = "e1f78b8ec12283b54567005da707aec84eaff12b6f223095c1d896b747d5fbb2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/zh-CN/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/zh-CN/firefox-151.0.4.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "32deb7435b8bd5a62f93aeb398f0e23bb5de092d992a3a597c0da008bb9efadd";
+      sha256 = "87a9a8bdac0107a7f8a32ea51f7f636d251d10e3be11bb8f5326358e8b600b89";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/linux-aarch64/zh-TW/firefox-151.0.3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/zh-TW/firefox-151.0.4.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "b046d60f23eb57e8b6e9b8def60330683dce689d21866d02dfe30d33209bf787";
+      sha256 = "f85df75f51b6ab9ed8271a1af51865c9f07e3556fd00ca53b1b0b73aadc5d586";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ach/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ach/Firefox%20151.0.4.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "ca2b6d578fe0234a5ece836c6441f3707a1b0ccd59faa6a85875fcdaaf1aac18";
+      sha256 = "d109d6468240e837bb7a15129def3c4563d3f8f26275b74a0c1f4b260e005b64";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/af/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/af/Firefox%20151.0.4.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "1420d319ac7f98ef23c09e151771bcdd0ccd48f5da479a6d614cff332a2b6192";
+      sha256 = "a418e97bd52aed2991ac6be0e8b07629d8ffeb203a56f45e5848c251c3d0d286";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/an/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/an/Firefox%20151.0.4.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "8f3cade81009a011e96391caad6b0e1dbf58b48125607084031ed0738812797c";
+      sha256 = "cd11259a2104c0046d7a5d251f379b00498e2bf81715e2dd0e0d9dab893d5bc4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ar/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ar/Firefox%20151.0.4.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "6437ae3fc8098402032d2811f5e21f9c985a513178f1f576e275815f09bd7920";
+      sha256 = "2c2137daddc5b4b4db50e80b1cd9008ce9491d26451a010c8111ca858146dcc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ast/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ast/Firefox%20151.0.4.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "b3bed47ebaf6397cdee0d626ec442ccdc58a91348296c2666667a80994694a46";
+      sha256 = "64be4f35eccb686dda5cc8e5f24e7e93143e9b12792411e9f359cac9374de54d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/az/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/az/Firefox%20151.0.4.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "541b84b7d01741144031c83460a0bea90296c07c4a6c49c1dc4fc085cc053199";
+      sha256 = "ecbf2be24f776897b02a50aca30f75381ad5f6a9260402c61f8c19ff4265ee36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/be/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/be/Firefox%20151.0.4.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "be39b9a62ab650123eacdaea600aa33b54d5ea0e86b63bb24f7acfc82176ddaf";
+      sha256 = "a0af5e21d9dcb892ef045916c9da9f137ec1e2c92bdd8c1c34266bc6f121aff5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/bg/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/bg/Firefox%20151.0.4.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "28e194428894507e0b1d3b3e43cabbdf74b09414a5482ffafc4724f362afbf6c";
+      sha256 = "4f38503171219bab259a206e90d0ec7c9e6f034c89b25506e37e3f3c37d7d7dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/bn/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/bn/Firefox%20151.0.4.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "9901d7a12107342aa925816374d1f6f8fbfacd4aa31eeda5b4a212d9f297439c";
+      sha256 = "feea23926e4ab04b5773d64435a71bec09e5074da7b36bc13e321cfe930b9744";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/br/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/br/Firefox%20151.0.4.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "07489965c9f585d2de404fb8194afaad0e9ae1b70b9ed6d5b05a35649081c32e";
+      sha256 = "252bd21e6fbfb5f736eb74c79ea3896c1bf3c306301475c83dcca1240957467f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/bs/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/bs/Firefox%20151.0.4.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "dc14dc72a620526a1533e87f0be426ac34548106e146814c18728cb1786885b1";
+      sha256 = "34f561c4743bdfaf1a7495804f939553645606427c9e304d1a09af7740192eae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ca-valencia/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ca-valencia/Firefox%20151.0.4.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "6cb407c7b1255de60e42b336d0e63c7d3e037b3dd5595c9c9c1945f6a7858235";
+      sha256 = "b4579744b35df912677a755dad2272e12de3cc5a29e828cafb577608a700d739";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ca/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ca/Firefox%20151.0.4.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "d4ca3ac96ab9cb355ca814487ba86bab9d9d98724f968bf0fb5f4c19727f2a59";
+      sha256 = "051dce45f09bb8cc62846fc30b8e7c4d3e2598b5abc5647dc1ab085a8e88965a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/cak/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/cak/Firefox%20151.0.4.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "141a3fdd4e8d1be97a9d266f5accfb0e3a3bb944721d617f5766429631c92a23";
+      sha256 = "dce3c9a4a0199aa2306c4a3937630cf83916fa5facd72b8b7f4f60f97e5f5206";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/cs/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/cs/Firefox%20151.0.4.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "9972c3179b05647e891adcf4e1a11078d35b37314f082fcb4af15cc939531f35";
+      sha256 = "8a61ef07a97745bd68e241f4af9d7c448c7f3bee7762ceb330c9e9d880c4784e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/cy/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/cy/Firefox%20151.0.4.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "bbe92c4aaf16bb948537a6b75acb4f074e4bfd316b1a16894d9439fa916e54ea";
+      sha256 = "652cd696099b3713736c130e5bb54dfd99fb2bb50a4928397f49bd42cd8b8f54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/da/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/da/Firefox%20151.0.4.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "d13085770e6b4d5396f03b701a665eb1d13bf94f2edd2641c7b627dc99807cf8";
+      sha256 = "bd1d3ea2d75329e99db7ce9c83268216034bdabf92c10b2dbc1f080dbf1ccebd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/de/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/de/Firefox%20151.0.4.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "f324ea1e26ef3150b6f9993eff19ab15aa258e86a38c05cb179346be6f70c734";
+      sha256 = "7f6232d39fc3b42499c8e2a8c485a15cce1967582d2d30ef6558efef4b996f94";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/dsb/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/dsb/Firefox%20151.0.4.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "e99c57f94c0fd2184791dc6de91ef3d74e41f77bb59703038ee52bcbc406cbe6";
+      sha256 = "db131cdce9e759f482498bee9836f8f6dc9b270559b9f2fd967695c4e91316ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/el/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/el/Firefox%20151.0.4.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "6bac9857cf7863216007c1c72068f35ef1f9fc677deacae2cec878d42e8b9d13";
+      sha256 = "3524cf8d5d34816c2ca0f77a688a83e1451c9840bf226229ffc76ec0c0b1e3c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/en-CA/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/en-CA/Firefox%20151.0.4.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "46497909f9faa6893ed3a046556df2611505ec5bb05dce3f6d7e86468622caf5";
+      sha256 = "577372a9575bc7fc291c2c1539c83218d0ff783222e125a4ad0daacfad71d41c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/en-GB/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/en-GB/Firefox%20151.0.4.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "b959349a750a829b179825e66a900b45aa715e02cc443d67da5c52802680e699";
+      sha256 = "2f3570e61bf02642a306f83f338f598ed5fddc672cf5b9f65d9c74bdf6dd6d2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/en-US/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/en-US/Firefox%20151.0.4.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "60d5cb29412b161c76ecc58f3f8a960cd0048081cf84c6fe91579f1957564277";
+      sha256 = "bc2e72f6abf31aa854b30a3e2841d3f2b8b8e153eaa0a5c3ab285728b7f9b160";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/eo/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/eo/Firefox%20151.0.4.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "f06f51234c79f88638b79b8df94daa9d43c335313dfaa2786ef661d2e7e96a70";
+      sha256 = "a6ed72875ea0280a45016ce9233ab2ea28bb32833cdead4981e85a92e3c1fc4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/es-AR/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/es-AR/Firefox%20151.0.4.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "391a25dbd751689f12d7c36bae7fae2ed7bbbdb5c0b7d4641c6afe3d44830364";
+      sha256 = "7f5228050a974ddc86c3b288941c221d4593a926533d318029896f64cfdb0adc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/es-CL/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/es-CL/Firefox%20151.0.4.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "c7cdf9e6fe63569d3f62bbec7fdc551cedd965d938570dd4bc5b109faa261a61";
+      sha256 = "662b648abd16d473c1bbfeeda51422b58588a78ab84452f5626f7eed0efac2f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/es-ES/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/es-ES/Firefox%20151.0.4.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "0f2a3f203bb9733094fd910d5f0c72ed9258fb0e1dd549f48c36ca3c2f85ca0f";
+      sha256 = "bbe59b59a737f709bbc3dbc8e07a6e7b556bbf5039f3268532a99e261cd8a033";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/es-MX/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/es-MX/Firefox%20151.0.4.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "6ca2ba5aea2bc22d7c728d1c1c605236d7195f80d4f7e8660f6d6afc8c6125fc";
+      sha256 = "da418707aff6ed6e2d8c1b0264d3a5124bfc0b2abac887fcf18e983fee31b2cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/et/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/et/Firefox%20151.0.4.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "7fbd8d96c9ab100046cd4cd5c5e2c0faea58e6786799b4ded8312efc4272daa1";
+      sha256 = "6e3969680c68e857d8bab99ede4878e2a9896588e0b856a0fc07a5bdd8628b57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/eu/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/eu/Firefox%20151.0.4.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "4722d421250360ba0b51633f634ca1e19835d4567a0195cd60c31314c5c62631";
+      sha256 = "8e5d162e687cfed827bea13e64ef63bc4d0ed801dd240f01ed5a0e1fcb4110da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/fa/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/fa/Firefox%20151.0.4.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "c14abe3415caacfdeea003c9099b27852f7f226fc49cc18d9c4d842c55842b0b";
+      sha256 = "b33d33f0fb0bae5eb04725ee63dffdcc007a9d4f2426b96096a2354a06501b3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ff/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ff/Firefox%20151.0.4.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "094721372a46c9d781e0383fe3bf139e8f1652a01d9d24c83dda62579c34ff14";
+      sha256 = "7b6b586d82c03ab031b3b90c0a2cb594aa8b876178a6c7d1a76e70eb13e7ef48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/fi/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/fi/Firefox%20151.0.4.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "93a2c4c891c523c645fddc2269441d12bf45ff8c0158fc7946d66d1b64391e52";
+      sha256 = "f73d6d3a0a2cf245105fe2b15be4e9fb075058ce58a3c9bebd64ec8b832b1c0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/fr/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/fr/Firefox%20151.0.4.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "e39c89fb503fd1418d59537fce517b87fd2716379d2901934838b2c77bf1d407";
+      sha256 = "e219c74cad44193370aab7cf58c6131d0646b352f7e79b55d12437ad482214b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/fur/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/fur/Firefox%20151.0.4.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "86e10ae5122de531a2ee880216e38b2ce60469e7adedfea48e82400b93f27d14";
+      sha256 = "f6d1bd6e98239962364fa178366c7bdd3997e60bcc4416493f22ab11204ce77d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/fy-NL/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/fy-NL/Firefox%20151.0.4.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "9b634211d11f3e568ca735d4aa5f512e4996755937e80e2863c66ff83f14f85e";
+      sha256 = "ee96dfc51c8fbd63c5fa6f9f529a6069485eb6daa24275352cd138cd8b6ead6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ga-IE/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ga-IE/Firefox%20151.0.4.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "52338ab882e2a320df2ec025ab4ba705be82f1788175e262fd880950bded8c26";
+      sha256 = "9fc53b347aa4662e9d18c19ce6c3392561cb237fc5878d6e1c0b7ce9401e5c2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/gd/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/gd/Firefox%20151.0.4.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "a825dc2072283047cedac4d4e8d9e6be461ef04a6b515868d90d450c207d4c1d";
+      sha256 = "5672037b3e176a056671c218036c0429892a3c58d899221172733ad7dde4748c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/gl/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/gl/Firefox%20151.0.4.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "2c22c14bf6a673b81f77eccffa32476c5d87d7bb48d554395d7c553d4b7ffd72";
+      sha256 = "d8133870cdb2ded7191bfa4fa3fab2dbb05f0431835133f76769745239ffafff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/gn/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/gn/Firefox%20151.0.4.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "8fabe816e82981e6e3285a6b0d58283954b3bd5295e98e639de08ba84e16ee53";
+      sha256 = "17fc1998cad24861025a9c03e53077c2ccd82d6c4f7bd798013c6a0fcc2c0045";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/gu-IN/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/gu-IN/Firefox%20151.0.4.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "1ee2f95a9d0a4f3b60b51223c56e7f68e57e8349e6a230f77c557a3655b486be";
+      sha256 = "88932d471b7cc1c83489bf3d47bd010028842d39085096fdf000c45e2d27766f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/he/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/he/Firefox%20151.0.4.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "70021ba703fa6ebc6e39b92ff03484fe6d94701d4ad12f854be6204a88201ac1";
+      sha256 = "009fb0d815e1c5f30ae17879bfcafb6bcdc522929208f9ce4404b389e1973377";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/hi-IN/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/hi-IN/Firefox%20151.0.4.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "0abeffa25d51722f5400f0a24c1a053fa8fec4fa9e9d407f62a77fa3b65c82c4";
+      sha256 = "c6e09aa3f0c2ada9bdd086b35c264fd0276c1267d64d5c189333c249c16e1850";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/hr/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/hr/Firefox%20151.0.4.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "adffbc2e4e586e5be53aa963a27134233bbf504e8677e27f6f223ba3de6e76f6";
+      sha256 = "70e0aa55d64ce6cb7f616708f6fcdd76aef8fbafa7c70db265e16c88d008c077";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/hsb/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/hsb/Firefox%20151.0.4.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "692852a332d126ed115b546bc174c0108bf6aac0b292b9519607c2b9581104ac";
+      sha256 = "a336d45d2467c513f7358073bb38a5762670afbcb7c277c75b63fe7e29eb9e32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/hu/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/hu/Firefox%20151.0.4.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "52809dd8cc5b10a2f39aa9cdbf0f0c790d826b638638842030e3b2cac75b26da";
+      sha256 = "0ce51e08a8da787e071a66271a167d99c757af0899ae1f7f5c9f5cc7ecb51714";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/hy-AM/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/hy-AM/Firefox%20151.0.4.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "bfae4fd494238108a3f8d8d7c200e4e4801b6fef76148f62214f976f99b446fe";
+      sha256 = "b7cc80fed0a7754e410b68143375acfa04e054f2931beb36cf27bdd021d356ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ia/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ia/Firefox%20151.0.4.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "1683b2f7d90b6a0c9512879f034373ae0a5609cf8d0ab4d11045a37e23091c5b";
+      sha256 = "c5462045f4978c23d16f0cd9bfef75ed37a9bdbdce880691028b059d171b3ff8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/id/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/id/Firefox%20151.0.4.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "e512ab61d2c9fe77f2b6f2497296ab4a7ef8843e8cfc19f043d0cd80ab469637";
+      sha256 = "9987f59f7fbdb6da0c66bd60b2a2259c9b8514c59dbf5901bebbef147205a8a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/is/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/is/Firefox%20151.0.4.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "c34a32be38bf01281a02cfb6c6b1c4f43da259737b63f5513f4ed63aa51b89ef";
+      sha256 = "b258a97995fbb72f977a4633299d5e2849056d1495d444ac304a330275c16091";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/it/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/it/Firefox%20151.0.4.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "2e47297d6339248340c7aeee26ec806f335a2b5bafdfa5f76712bd791bb730fd";
+      sha256 = "7ba2e0c6061e1ac3ea06bc568155f1a206003402b645e513182321a09114c6a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ja-JP-mac/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ja-JP-mac/Firefox%20151.0.4.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "a190c44eafaf7d8be0e5de1deb373da4cbdc9b0ef57d231d7e4bdee980d5ec83";
+      sha256 = "45ce4c7c928d24feb77f1d57333342247a523eec584fc6cf10f79b3dcfd3996c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ka/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ka/Firefox%20151.0.4.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "9e6ee08d015c8b00abe1122b0cb986f1009ccc342c1f2aa23ef0e4e917269bd7";
+      sha256 = "6ae7cc3b545561a389dbd718a41c9fce96e29caa37112eaeb72e25cd0f28fa50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/kab/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/kab/Firefox%20151.0.4.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "d70148b90c2bb37ab249262622d25633f609f677b97846a5f74b71c4ae13f01a";
+      sha256 = "2879b7279509a3cb207d764e6a9fb851d5182d11f2434d603e8b4f9fa6507d40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/kk/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/kk/Firefox%20151.0.4.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "513f53d388f8dcf5e871969f3453ce41e178d34fc015f6c12fbbfdaf8b3bf9c3";
+      sha256 = "8f1cbd44c51d55e7aeaa7f02f69e56ccd473d6afab4f6f9cbb399d928e63deea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/km/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/km/Firefox%20151.0.4.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "13fb4bd89ecb9754925a211c467e8083e64a6a76812c84b37633e341d565727e";
+      sha256 = "3b3b5a2bef80085504b4817116f82e0cb117c2fc2d449d40e66d40988e5f9075";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/kn/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/kn/Firefox%20151.0.4.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "40b5def6463e65461b6c13d8af0817faf5a3a9d873e2ed968fb0fed56a2eaf38";
+      sha256 = "a5c42eb35ea9909a69799b7160c2256b2bd54596f2feab3a971fe3b86235d31c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ko/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ko/Firefox%20151.0.4.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "dcfdacdba37e784857fe94548112aeda8644ad7154bf5acb0b190879abc27bb1";
+      sha256 = "8480a0e8f4e74667f5f30495feb907919f55e14d2cebbd7a7b549fb4fba1f57b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/lij/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/lij/Firefox%20151.0.4.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "45e16409af07b9323559cff3d34dab17e2055c98679e0412589f0651eaac9aae";
+      sha256 = "7d5fb1de26bd29c7d42b9ec57f530140a264d2bd7944b9e7a702dd0af27cf680";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/lt/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/lt/Firefox%20151.0.4.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "d5b2829d0bcebfa341cf94458bbe503282578a26ab8e14e3040eb3eb75be31da";
+      sha256 = "95b106de218172a8e23faaa281217465160de4c94212f001dbec79f8b1e72ad0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/lv/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/lv/Firefox%20151.0.4.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "22a75e17ec3e4bb73be721a349b2f701784859c97b94b902cde410419e8c4dc7";
+      sha256 = "4ff3c84cd71df51d93158d7da62b4a97b69bb0c043653539157b986024803743";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/mk/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/mk/Firefox%20151.0.4.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "54d0102de3217799c12248828fb083ba22628955f6d819a910c9976344054803";
+      sha256 = "e6d9d7e152a17cf4c24cc1761b2e14ebf2b6085fd2b709de992ba00683adb03e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/mr/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/mr/Firefox%20151.0.4.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "4d7bf9b7ec4cf4b0f7c52b8b35b08d2a469488fdd87be9af1df45a7d8acaf7fc";
+      sha256 = "a24d6e5a0d6251eecadf5af806e6a823664909c389707178b8f26229f1d895ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ms/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ms/Firefox%20151.0.4.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "ae5b02e40b449c8bf45adbbae6a1a7eec9030961f604e46f6fa80a4620eaf368";
+      sha256 = "432a3c8e806fc3129538f665caec1fca5c4a36bfa6f43a87bd6497dab5a598b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/my/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/my/Firefox%20151.0.4.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "59ad3ff18b91183c15c65125c1e02893b58d8c2b5593af7f89ec3bc98b0c375e";
+      sha256 = "49f4fd9595f06a45484ea15c0d1a42c35e56eb21e9ea88d26faba1fe380d7129";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/nb-NO/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/nb-NO/Firefox%20151.0.4.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "cbfdadea288163a0bb7e8b1aacdd664d1a4016aa401ee3ff946c4d116a36741a";
+      sha256 = "e91073c6f259c96eafcc19f5d059e2ba94c642066962484a9767bdcdfa8bf970";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ne-NP/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ne-NP/Firefox%20151.0.4.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "588296c7c455da5272c842041d4720a4c5d7bd59f665aaee252c853d9f72710e";
+      sha256 = "f4ba5e70cb7dccd729d62a66b5341418a625f3622a155f022f67ecfba175571f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/nl/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/nl/Firefox%20151.0.4.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "96784ecd92e58635b6642fa94e42f24d27bc7ca250ebb9ef8c2bb9c708bd3ede";
+      sha256 = "ccb3fa66fa102b1ba78312bf128b7afbc9e0989684dfc7b6d4392b3bbf284934";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/nn-NO/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/nn-NO/Firefox%20151.0.4.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "e31541a24f9ecad2e71b30abd3de2002b5ef5f6d56e32c88e6cf9fda7a72c324";
+      sha256 = "ac824d101b89a75afa9d195a740b32ae9d54c120fedb395a97df8614c6d4da48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/oc/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/oc/Firefox%20151.0.4.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "2578d5b3519cea10697bb92f8a4de93b2aeda23aae0890b07870d004aedb7fff";
+      sha256 = "a376f7b39f49ca455bff09bead533418db9aae706a81d1e567b35f00817f27fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/pa-IN/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/pa-IN/Firefox%20151.0.4.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "33567016410e52c1c0d589987de8d46faf6326d2b3bebd1859e03a743990005f";
+      sha256 = "02f369380f0734b4a6e4b762bd3a39a4e51e849693abc468f6618202ba2427dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/pl/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/pl/Firefox%20151.0.4.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "a6ebf398359218bef48a2fb50928a16b415de0086398e93b8e9f334fe3c94001";
+      sha256 = "86f3a774809efb8722478e8257fbf7196dcedb42645c5dd37127c7c0119e93c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/pt-BR/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/pt-BR/Firefox%20151.0.4.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "e811db45f4c80cdd1bbf7ec4f8439b86eadf0e2e946360255f708c1005a2e16d";
+      sha256 = "9532f7c63cc71891bea015f4f71df858fd016c3ed9920ca0e415966d7c3807e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/pt-PT/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/pt-PT/Firefox%20151.0.4.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "248260b45c9584b55b961f5e1539cf0ffc7481c899ce0277bbe84a00da6a1c48";
+      sha256 = "42d135d2fe9e69bbcf72472287d8cde5fc1ebb3e32487dc720962a3164bd87bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/rm/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/rm/Firefox%20151.0.4.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "7f416b33967c74d33703659652cdea5a9ac65d451fdb2b99eaa6ff608e5273ab";
+      sha256 = "33e250c0c56167ef4d0536b88d575ca58be26aacfb75e823b0de68d2b208cccd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ro/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ro/Firefox%20151.0.4.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "0534355b134923852419c73b638db18699db58c57568f6964eee165bac5caafb";
+      sha256 = "027e7bdffa4db1948fe66d9e4c46e523a2931ab7db7babc7e3db41c1eecb5888";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ru/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ru/Firefox%20151.0.4.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "d6717399e8353d01e4577de2ddfbd58f380bb2250e7f9137ffd99afebc49b2d5";
+      sha256 = "92dc8213d80d417d394bdefd7e4aed99b3c979d53dec3cb2dd135eeb37078b0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/sat/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sat/Firefox%20151.0.4.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "1a6a985e46d2718c7f2dbeff069d4da25528af1ce80f38527946d1cee713756d";
+      sha256 = "7711e02cb8d398c2787bd621362ec6bdd7fc89a7bc23e94fd02e8158dd9569ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/sc/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sc/Firefox%20151.0.4.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "a4934cd125b29050c4144539ddbeabb1377c87c901b73e42df2b88da33377620";
+      sha256 = "cf61b01d10317b5ddf6ed5b2169818381efff98bbd3e863eb3a7b9aef7a68e26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/sco/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sco/Firefox%20151.0.4.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "89c6e1a77ead56d5f421ecf39ccca8348451f3362f6aa5641888cc3a74c54ce0";
+      sha256 = "8a5ab2301f95861c69f6e7e956b5cab5913a467413c319057ca4d7d771bf928a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/si/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/si/Firefox%20151.0.4.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "9c2e02d605f974b34e5236acc0b4314a17d034522f427f478070094ee08bceb7";
+      sha256 = "e4f692fc6102fb1e7a8f8e4f28ca4633ec8b0de4d7180b4667e4268d9ca1231b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/sk/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sk/Firefox%20151.0.4.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "fe217a0a0052e417d49123e8ce7aea90fbe53a12fb32c886b8e41f2b33745fc1";
+      sha256 = "92bcaf75ef583f464dbd060fef08369baaa53ce395846961942309f7be8ee9fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/skr/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/skr/Firefox%20151.0.4.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "92d37b666612f29acd7ca55d6a46f231c7736424cc0428b9649e204c00d776f8";
+      sha256 = "23ffa1aba5fc2513b75e561615c07f4ab73cf464cec313b189adde13a3f6d6c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/sl/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sl/Firefox%20151.0.4.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "35bbb1774c3de9001207e98ff36d6d4a82bc0a7db12d157c11af0b42574e7510";
+      sha256 = "96c619665ca7f90bf605d4b33c16a5eb3209a5bc982de65e6362e74abb322a5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/son/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/son/Firefox%20151.0.4.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "461fdfa0e2615bd6832ae5172275b78c33dffdea2197791f9ea267fc9f075872";
+      sha256 = "75a48f037c8161549c7025c035c067f234012ab14d50bebc2858d099c3cea999";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/sq/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sq/Firefox%20151.0.4.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "1fca9118642b9f1366bc1e3b7d7cb40ad6649ac16de73f8f565095bf6bb19557";
+      sha256 = "3bb6af9c8217b22f7c469498186831da05eefb4f97f3d790329e6fb6002a382b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/sr/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sr/Firefox%20151.0.4.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "452e7670eefd77ac089e4f58e15fc76570a2fa10964cdc6e39fb10299f4dd0e4";
+      sha256 = "38e4cb5a7df9e80a0536d810b260883b5caa7ff61766874bc675fac4607372ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/sv-SE/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sv-SE/Firefox%20151.0.4.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "24645218dcdae69093325120c41d402e4f61a05f1b2f42403565d25f4776d155";
+      sha256 = "8d4cb2cc9f76671903d0feb6169f620a364c72f54f654fca071a2f66af9b135d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/szl/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/szl/Firefox%20151.0.4.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "e6f47f57d84e90d7f5826aee96844c5e2175d3cacd0bb5d47dd615fc9802c799";
+      sha256 = "b85165efb112bdc0a5725c4f1a6a6120d07e07a70504799b9a4813121eb1f75f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ta/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ta/Firefox%20151.0.4.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "f695557558baadfe84ee754baaabd3d14c3970c24a1957cb8ae08aa0ae85a663";
+      sha256 = "b3b75b28988a7847cac82abb6c1cdad02b02653d9d8ec5b28d32ca5986a0d205";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/te/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/te/Firefox%20151.0.4.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "b60a9b095c901d5ea72985e816b2714fe42e5dfa4624f936e0b53695544ccead";
+      sha256 = "aaca8301f2857abfa176d428a5b1cf49dbd289502b3fa878bbf87cb20cacbf26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/tg/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/tg/Firefox%20151.0.4.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "d7e0d4fc6f5b3475f0d8c3461f7f95509e08f4526f0b13cd0b6b37152df160dd";
+      sha256 = "36d2c47239879a3d1cf0b0c39dc3f2b6e03b589ecdaf5d9ce1969fbf3f33d7a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/th/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/th/Firefox%20151.0.4.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "2510473d4069ed297a78baf0e8dc6bdc6a8100cb2f0189400edc4ef0ecc809f5";
+      sha256 = "141a725ff1b58f2ce2e98e4d3b75917d85d0883e1f1ac8e0ac5ffa60fb2767b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/tl/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/tl/Firefox%20151.0.4.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "e61ca5ded07f0fd48f29b9c4494d30da33d97dec162a36525a53449f14aa9178";
+      sha256 = "424ed93cac2306a480ebd50ae35401e2665f0f41aab75e6dea9c43882a81666e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/tr/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/tr/Firefox%20151.0.4.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "d4ff6df2daabc7ad205c78372d9fc6960f0ea8446774becde17a3638a45c8028";
+      sha256 = "c6a42ff159c20ae851803c68930374482cc464d0e2dc8e542cf06e9826157312";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/trs/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/trs/Firefox%20151.0.4.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "e0ec52263af35318779b31d3ceedb4d860387bd6c821dc49f9d446b7176b6be5";
+      sha256 = "7a884903c4b9935aa4a1f86ab3af01dfd039613100b044261b207d1bae1dbdfd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/uk/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/uk/Firefox%20151.0.4.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "0b5216c62923d08eaf85a7b8b92df2aa48dafb19d9df8dd75153e9ce6d3b315f";
+      sha256 = "c8fa5f9b3bcbc69ef01f3d42c5e1cbe7964407e070a9f866840e81e3d9f40d4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/ur/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ur/Firefox%20151.0.4.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "c6db53733b254836b3bb1db7394db4240e585a92f99778b112de82392ec331d0";
+      sha256 = "12a1bc68cfe6727cc140541aff3186c9c39722afff9e83abfe9a7ae1ae61396e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/uz/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/uz/Firefox%20151.0.4.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "2e3015c4b1df7d5af877925f0f54c1ad2bbbf1c2615d90a3fafd027c97055399";
+      sha256 = "62f0cbcaa8ac13ffb3203015806622eaad786486ab3b2bb864e4b77b71ed7809";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/vi/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/vi/Firefox%20151.0.4.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "2d3575a63c564f293e511b062949ba33ff858d3469abd1fb7da6c7e3c0444ca1";
+      sha256 = "748d90db2e87eb31992acc9e1a2e274a4c8ee2b164c4d494e9c7ce948a931462";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/xh/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/xh/Firefox%20151.0.4.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "c58dbb37218d1f44f982cc536578d9ab9933a66cb2305cff3e11ccad3d6de5fd";
+      sha256 = "6c9f4c0deee6b49b14a3e82376f3bd027d5522c2c8923d595e3797a01c611711";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/zh-CN/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/zh-CN/Firefox%20151.0.4.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "e472c397692f380d578679c2bd83ec3b75f5b679f73d761fe2303f5a07b22437";
+      sha256 = "e27fe006d808af3519ea45aad63087aa0786d825f21cb16280c33b054c0c86bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.3/mac/zh-TW/Firefox%20151.0.3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/zh-TW/Firefox%20151.0.4.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "a12a82abb6502f9e11b006dd313259d3d1e6a4b84d9ef566da14f530b8ebc91b";
+      sha256 = "78748a47a616b6389e4dd315d785d83aedbb83d8d20a776f72a8e0f8253c1ad6";
     }
   ];
 }

From d0aef1b2309a60eafc72b38da727fabe330c4c4a Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Tue, 9 Jun 2026 12:44:03 +0200
Subject: [PATCH 096/128] frida-tools: add eyjhb as maintainer

---
 pkgs/by-name/fr/frida-tools/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fr/frida-tools/package.nix b/pkgs/by-name/fr/frida-tools/package.nix
index d3a7c64dfc58..d5f814ef072e 100644
--- a/pkgs/by-name/fr/frida-tools/package.nix
+++ b/pkgs/by-name/fr/frida-tools/package.nix
@@ -35,7 +35,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers (client tools)";
     homepage = "https://www.frida.re/";
-    maintainers = with lib.maintainers; [ s1341 ];
+    maintainers = with lib.maintainers; [
+      s1341
+      eyjhb
+    ];
     license = with lib.licenses; [
       lgpl2Plus
       wxWindowsException31

From 3e35220fc8b63979384b833b85f157c32e7f9787 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 9 Jun 2026 13:00:15 +0200
Subject: [PATCH 097/128] ghostty: set meta.donationPage

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

diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index 087e4fa8b2c6..b2a77b03e28b 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -174,6 +174,7 @@ stdenv.mkDerivation (finalAttrs: {
       features, or native UIs. Ghostty provides all three.
     '';
     homepage = "https://ghostty.org/";
+    donationPage = "https://ghostty.org/docs/sponsor";
     downloadPage = "https://ghostty.org/download";
     changelog = "https://ghostty.org/docs/install/release-notes/${
       builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version

From aae769fe309cdcea5792003c609926a038610359 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 9 Jun 2026 13:05:42 +0200
Subject: [PATCH 098/128] river: set meta.donationPage

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

diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix
index 7e317651dba9..4ce607e75246 100644
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -89,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Non-monolithic Wayland compositor";
     homepage = "https://codeberg.org/river/river";
+    donationPage = "https://codeberg.org/river/river#donate";
     longDescription = ''
       River is a non-monolithic Wayland compositor.
       Unlike other Wayland compositors, river does not combine the compositor and window manager into one program.

From 443107aefbd242c47a58c5941c9cff4e9a407e98 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 9 Jun 2026 13:26:56 +0200
Subject: [PATCH 099/128] chromium,chromedriver: 149.0.7827.53 ->
 149.0.7827.102

https://chromereleases.googleblog.com/2026/06/stable-channel-update-for-desktop_0153744567.html

This update includes 74 security fixes. Google is aware that an exploit
for CVE-2026-11645 exists in the wild.

CVEs:
CVE-2026-11628 CVE-2026-11629 CVE-2026-11630 CVE-2026-11631
CVE-2026-11632 CVE-2026-11633 CVE-2026-11634 CVE-2026-11635
CVE-2026-11636 CVE-2026-11637 CVE-2026-11638 CVE-2026-11639
CVE-2026-11640 CVE-2026-11641 CVE-2026-11642 CVE-2026-11643
CVE-2026-11644 CVE-2026-11645 CVE-2026-11646 CVE-2026-11647
CVE-2026-11648 CVE-2026-11649 CVE-2026-11650 CVE-2026-11651
CVE-2026-11652 CVE-2026-11653 CVE-2026-11654 CVE-2026-11655
CVE-2026-11656 CVE-2026-11657 CVE-2026-11658 CVE-2026-11659
CVE-2026-11660 CVE-2026-11661 CVE-2026-11662 CVE-2026-11663
CVE-2026-11664 CVE-2026-11665 CVE-2026-11666 CVE-2026-11667
CVE-2026-11668 CVE-2026-11669 CVE-2026-11670 CVE-2026-11671
CVE-2026-11672 CVE-2026-11673 CVE-2026-11674 CVE-2026-11675
CVE-2026-11676 CVE-2026-11677 CVE-2026-11678 CVE-2026-11679
CVE-2026-11680 CVE-2026-11681 CVE-2026-11682 CVE-2026-11683
CVE-2026-11684 CVE-2026-11685 CVE-2026-11686 CVE-2026-11687
CVE-2026-11688 CVE-2026-11689 CVE-2026-11690 CVE-2026-11691
CVE-2026-11692 CVE-2026-11693 CVE-2026-11694 CVE-2026-11695
CVE-2026-11696 CVE-2026-11697 CVE-2026-11698 CVE-2026-11699
CVE-2026-11700 CVE-2026-11701
---
 .../networking/browsers/chromium/info.json    | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index b8ab6d84b6fd..4d6e2a837b42 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "149.0.7827.53",
+    "version": "149.0.7827.102",
     "chromedriver": {
-      "version": "149.0.7827.53",
-      "hash_darwin": "sha256-JzeQy8O9gcoV195sQrfUV1TclUyAI4lzOcE5+BmgKrM=",
-      "hash_darwin_aarch64": "sha256-nEkMVGUVYP0q9UECGT0ibc2vzjVRIO69dFrYOB05lqg="
+      "version": "149.0.7827.103",
+      "hash_darwin": "sha256-3ws6RyF5SwjRcdo4IY+MzqcaZ6214dCVV3YB4YL+h6k=",
+      "hash_darwin_aarch64": "sha256-S8/dGAlipcYXzZIEJEGAnvsu3ilqjnBb8IdXUxGrp2o="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "9d2c8156a72129edca4785abb98866fad60ea338",
-        "hash": "sha256-RPFeHTWAeJUzbWU7QyRPmT3sqf3bAEuJ7/IJ3TP40pA=",
+        "rev": "112f665d98a2fe84b156c74fbea2aed742f16c15",
+        "hash": "sha256-75PYsss5Qob493WCc28XHncjFIlvUr2HQx79w5UmK/k=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -92,8 +92,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "ded782bca9d5f165d1c4a70124cdc5384043a8b3",
-        "hash": "sha256-7+Hhx/V554hO3zzGuIZswkaRVDElz7ost7vbnf2wyZc="
+        "rev": "4b8c7f0f321952bba4f81056b4aa57d0d6428642",
+        "hash": "sha256-ADG0WfkeFRq4NF0m+s3a/N5+u3q4ApExuWUnV3m5uAI="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -132,8 +132,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "1815a06195d9c74ac737a96f87c05111926e04f8",
-        "hash": "sha256-71KbW0w60VB67+HM48WpOo18hrVId4/4QBDl+xl5pgo="
+        "rev": "c1179de12ec3ed8feb91e922f12a90ae33f4a8cf",
+        "hash": "sha256-VFEBqbSsn/3jqRGJgTM/r5DEtfhvTOIfS9fGIKzYo9I="
       },
       "src/third_party/dawn/third_party/glfw3/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -552,8 +552,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "a7849e8a5e9c996bef2332efae897e7301055a20",
-        "hash": "sha256-ftOTwWULKNplqjQQ9oM9t+PU3S6/ySDOBoE5E/HWuHg="
+        "rev": "644251f252a84bf8ce91ff0aca86a9b16b069ab8",
+        "hash": "sha256-DsoOY8bg0sPOF8tF67Gk7fRqdQzG1hc9fVMlZVjKWU4="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -607,8 +607,8 @@
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "846203c4b3b25f834a0bebc101fa8e1b8f9d0ca9",
-        "hash": "sha256-YOgOau9vNrOOqyUf6WylI/oQ2drCxoW7jnrHt7fAfQM="
+        "rev": "97c58a94bb6495c4e202467fb1c55eaa22b5670f",
+        "hash": "sha256-qtClkWAluLDRZn7yrHLU7qp9szP+/WsiG5JZZzRKd38="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -652,8 +652,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "53348aa333da02b77c4b5797e2de722f5abde7d0",
-        "hash": "sha256-Qh0ytA45zP67VQE417iUtjPcJmJmDzcu4BAatyh6p0w="
+        "rev": "92a56ebeef43061f4878aa869aa1f2160265c24c",
+        "hash": "sha256-QEY9Wy2guRuS4CXeXHUhUNigCJWWndnNCbWQmaSYJ/A="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -787,8 +787,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "5a7e0ff57a52e12f834d64c57d040d1105ea17f2",
-        "hash": "sha256-V1accCSU6LV5Ixhd+HBOvqZ7GxT57ALsvaF8ABLIXxM="
+        "rev": "e8b4d4c5952a8fb7b35c2a6cba4e8c3de2ea2e1e",
+        "hash": "sha256-94U9URlFGLYe94KCFU0giY9bBbrHNDCBr9GEwbRbOK4="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -817,8 +817,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "5a39b146dd810a52812202fae891281d5dc4db7d",
-        "hash": "sha256-UbX88nE4VyWUm4PvFTOy3mC04MzSdgC006ZpQrEY8cQ="
+        "rev": "16ef80c1f5d3cfade812bd1743952a4cfd480a31",
+        "hash": "sha256-GI0NWA0XYGocxZp3+lPen6BkwaG7X3EDaEWM9rejgkI="
       }
     }
   },

From f8c609f2886911874a030330786313ed71dce36d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 11:34:34 +0000
Subject: [PATCH 100/128] shellhub-agent: 0.24.2 -> 0.25.0

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

diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
index 388f0cc40b66..0e1b9dcfcf73 100644
--- a/pkgs/by-name/sh/shellhub-agent/package.nix
+++ b/pkgs/by-name/sh/shellhub-agent/package.nix
@@ -12,18 +12,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "shellhub-agent";
-  version = "0.24.2";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-5lQSiN6XnZmtpIVU/FbsCzoAKGbDEe1stCiEOcUfI08=";
+    hash = "sha256-9hA3Sxz0SwkpyYJsIrnT/7B2S1px6f+GgT6yvM3VZ8Q=";
   };
 
   modRoot = "./agent";
 
-  vendorHash = "sha256-hGUTF2USDxzb1VYVGX+BcOxFC2hSbpBJsWebjPD80Yc=";
+  vendorHash = "sha256-Cm/xApEJR94qtXFD5ASU8oPG/VwWbeq91B7Znn/dQdY=";
 
   ldflags = [
     "-s"

From ce183ddcc5a701ec5bf9684b1b425e5e2083eed5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 12:33:54 +0000
Subject: [PATCH 101/128] python3Packages.meshtastic: 2.7.8 -> 2.7.9

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

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 34bbea6e9e64..512bd74686af 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "meshtastic";
-  version = "2.7.8";
+  version = "2.7.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "meshtastic";
     repo = "python";
     tag = finalAttrs.version;
-    hash = "sha256-LAcBD7BUNzexq3kTY/fw2yPMq66T5+cPj9p3GeGH/Vw=";
+    hash = "sha256-u3lU48VyFsfwHVXz/mSmJUW7c+mQ5BR2SclwCKym27k=";
   };
 
   pythonRelaxDeps = [

From 87450e1f172d539844f01a2f0b16296d7e7fab0e Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Tue, 9 Jun 2026 07:54:20 -0400
Subject: [PATCH 102/128] anytype: automatically update bun node_modules

---
 pkgs/by-name/an/anytype/package.nix | 1 -
 pkgs/by-name/an/anytype/update.sh   | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index c51ad8832da4..5a5739564494 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -87,7 +87,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     dontFixup = true;
 
-    #TODO: update it in update script
     outputHash = "sha256-6IHFidjVDDzUOCRXVwjvzcLGKV6dWWS7k2jwrOuJ748=";
     outputHashMode = "recursive";
   };
diff --git a/pkgs/by-name/an/anytype/update.sh b/pkgs/by-name/an/anytype/update.sh
index de3617cb7223..c46478d044a4 100755
--- a/pkgs/by-name/an/anytype/update.sh
+++ b/pkgs/by-name/an/anytype/update.sh
@@ -57,5 +57,6 @@ tantivy_go_version=${tantivy_go_version//v}
 
 nix-update tantivy-go --version "$tantivy_go_version" --generate-lockfile
 nix-update anytype-heart --version "$middleware_version"
-update-source-version anytype --ignore-same-version --source-key=locales --rev="$locales_rev"
+update-source-version anytype --source-key=locales --rev="$locales_rev" --ignore-same-version
 nix-update anytype --version "$anytype_version"
+update-source-version anytype --source-key=node_modules --ignore-same-version --ignore-same-hash

From e4875cd8407d8a79226f8ad0e0b2bcbee999bf51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 12:48:37 +0000
Subject: [PATCH 103/128] watchlog: 1.259.0 -> 1.261.0

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

diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix
index 7f385a5b9c74..297e92dfbe3c 100644
--- a/pkgs/by-name/wa/watchlog/package.nix
+++ b/pkgs/by-name/wa/watchlog/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "watchlog";
-  version = "1.259.0";
+  version = "1.261.0";
 
   src = fetchFromGitLab {
     owner = "kevincox";
     repo = "watchlog";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-MjuQ1k38ZS1d6kJitEH9DTCUWzvUNhm3mto/QAWxE5k=";
+    hash = "sha256-Nv7J7/hg4t2f8ZBK7RCur6mbd+2Vn52QIz53ZFck96I=";
   };
 
-  cargoHash = "sha256-Mukw9DLIaPI0/CQws7AQwHmGmX/T4KuoX/2KTAUZXx4=";
+  cargoHash = "sha256-672wSQ/bnwpT5USFtg4P7kZyn8ONOrHbZ4eRkNc6KBA=";
 
   meta = {
     description = "Easier monitoring of live logs";

From d272ee5c8d00ea0f308feadff3f6ad7c6e7732c3 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Tue, 9 Jun 2026 13:52:37 +0100
Subject: [PATCH 104/128] flood: pnpm_9 -> pnpm_10

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

diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix
index 5ece7f302559..519b00b12135 100644
--- a/pkgs/by-name/fl/flood/package.nix
+++ b/pkgs/by-name/fl/flood/package.nix
@@ -3,7 +3,7 @@
   buildNpmPackage,
   fetchFromGitHub,
   nixosTests,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   nix-update-script,
@@ -19,7 +19,7 @@ buildNpmPackage (finalAttrs: {
     hash = "sha256-gSjkpAGkvgRRh8WDpL/F7fS8KDxHRJUuWVqHGcFEGAc=";
   };
 
-  nativeBuildInputs = [ pnpm_9 ];
+  nativeBuildInputs = [ pnpm_10 ];
   npmConfigHook = pnpmConfigHook;
   npmDeps = finalAttrs.pnpmDeps;
   dontNpmPrune = true;
@@ -29,9 +29,9 @@ buildNpmPackage (finalAttrs: {
       version
       src
       ;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-Los6faQJ4it0fVqtRvPvYmyANK4qBcwHxmZBacR7Q6E=";
+    pnpm = pnpm_10;
+    fetcherVersion = 4;
+    hash = "sha256-yNRC5sCBn002gxUfHMUvh3DZeVYOokfz4MTvqXR2MzI=";
   };
 
   passthru = {

From cc3020092912d763c2dd248845eb294a5fc75be4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 13:06:52 +0000
Subject: [PATCH 105/128] python3Packages.django-vcache: 2.1.1 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/django-vcache/default.nix b/pkgs/development/python-modules/django-vcache/default.nix
index 403aec4563d8..7f1d9ff265e4 100644
--- a/pkgs/development/python-modules/django-vcache/default.nix
+++ b/pkgs/development/python-modules/django-vcache/default.nix
@@ -12,19 +12,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "django-vcache";
-  version = "2.1.1";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "django-vcache";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EUTZ7dUpjwZ7cU4Hgud40PKfryX5gNyAgaRBGEdy9WE=";
+    hash = "sha256-7KeSnOJQOb766kYFh6+qeL3csPNuhk63C6NBsoS1dvc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
-    hash = "sha256-fj0Ukfo9+Aq8D+spqB5OzL8QkPqpHqr2AaCgYqDCjzw=";
+    hash = "sha256-rQ5nCzWw6AUU9KimNJX3pdnRE4kg86kDTZq0TCBEp8s=";
   };
 
   build-system = [ hatchling ];

From e91e36f9f2e60ea2f059a37a771b8319b2ace958 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Mon, 8 Jun 2026 13:55:58 +0200
Subject: [PATCH 106/128] rquickshare: pin pnpm to v10

---
 ...k-file-tauri-minor-version-mismatch.patch} |   0
 pkgs/by-name/rq/rquickshare/package.nix       |  19 +--
 ...ve-duplicate-versions-of-sys-metrics.patch | 114 ------------------
 3 files changed, 11 insertions(+), 122 deletions(-)
 rename pkgs/by-name/rq/rquickshare/{fix-pnpm-lock-file-tauri-minor-verison-mismatch.patch => fix-pnpm-lock-file-tauri-minor-version-mismatch.patch} (100%)
 delete mode 100644 pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch

diff --git a/pkgs/by-name/rq/rquickshare/fix-pnpm-lock-file-tauri-minor-verison-mismatch.patch b/pkgs/by-name/rq/rquickshare/fix-pnpm-lock-file-tauri-minor-version-mismatch.patch
similarity index 100%
rename from pkgs/by-name/rq/rquickshare/fix-pnpm-lock-file-tauri-minor-verison-mismatch.patch
rename to pkgs/by-name/rq/rquickshare/fix-pnpm-lock-file-tauri-minor-version-mismatch.patch
diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix
index 7817d71c6003..ecd596f9bb66 100644
--- a/pkgs/by-name/rq/rquickshare/package.nix
+++ b/pkgs/by-name/rq/rquickshare/package.nix
@@ -9,7 +9,7 @@
   nodejs,
   openssl,
   pkg-config,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   protobuf,
@@ -18,6 +18,10 @@
   webkitgtk_4_1,
   wrapGAppsHook4,
 }:
+let
+  # upstream still uses pnpm 8 though
+  pnpm = pnpm_10;
+in
 rustPlatform.buildRustPackage rec {
   pname = "rquickshare";
   version = "0.11.5";
@@ -31,7 +35,7 @@ rustPlatform.buildRustPackage rec {
 
   patches = [
     ./fix-pnpm-outdated-lockfile.patch
-    ./fix-pnpm-lock-file-tauri-minor-verison-mismatch.patch
+    ./fix-pnpm-lock-file-tauri-minor-version-mismatch.patch
   ];
 
   # from https://github.com/NixOS/nixpkgs/blob/04e40bca2a68d7ca85f1c47f00598abb062a8b12/pkgs/by-name/ca/cargo-tauri/test-app.nix#L23-L26
@@ -47,20 +51,19 @@ rustPlatform.buildRustPackage rec {
       version
       src
       patches
+      pnpm
       ;
-    pnpm = pnpm_9;
     postPatch = "cd ${pnpmRoot}";
-    fetcherVersion = 3;
-    hash = "sha256-ESm7YVVbsfjpgYeNf3aVhJawpWhbeNdo0u7cBzLmEMw=";
+    fetcherVersion = 4;
+    hash = "sha256-uugI9ztwHPYn7WdXfo3XlBxjhVczGnpWvTb3IEMJUqg=";
   };
 
   cargoRoot = "app/main/src-tauri";
   buildAndTestSubdir = cargoRoot;
   cargoPatches = [
-    ./remove-duplicate-versions-of-sys-metrics.patch
     ./remove-code-signing-darwin.patch
   ];
-  cargoHash = "sha256-XfN+/oC3lttDquLfoyJWBaFfdjW/wyODCIiZZksypLM=";
+  cargoHash = "sha256-9LFMWr/TQZ0nolQykrsGR2aqrSWIXoPZRLYO4mjTmpg=";
 
   nativeBuildInputs = [
     cargo-tauri.hook
@@ -68,7 +71,7 @@ rustPlatform.buildRustPackage rec {
     # Setup pnpm
     nodejs
     pnpmConfigHook
-    pnpm_9
+    pnpm
 
     protobuf
   ]
diff --git a/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch b/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch
deleted file mode 100644
index 2de75e9ca237..000000000000
--- a/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff --git a/app/legacy/src-tauri/Cargo.lock b/app/legacy/src-tauri/Cargo.lock
-index 14872dc..341fcc8 100644
---- a/app/legacy/src-tauri/Cargo.lock
-+++ b/app/legacy/src-tauri/Cargo.lock
-@@ -4296,7 +4296,7 @@ dependencies = [
-  "rand 0.9.0",
-  "serde",
-  "sha2",
-- "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)",
-+ "sys_metrics",
-  "tokio",
-  "tokio-util",
-  "tracing-subscriber",
-@@ -4316,7 +4316,7 @@ dependencies = [
-  "rqs_lib",
-  "serde",
-  "serde_json",
-- "sys_metrics 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "sys_metrics",
-  "tauri",
-  "tauri-build",
-  "tauri-plugin-autostart",
-@@ -4920,21 +4920,6 @@ dependencies = [
-  "libc",
- ]
- 
--[[package]]
--name = "sys_metrics"
--version = "0.2.7"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484"
--dependencies = [
-- "core-foundation-sys",
-- "glob",
-- "io-kit-sys",
-- "lazy_static",
-- "libc",
-- "mach",
-- "serde",
--]
--
- [[package]]
- name = "sys_metrics"
- version = "0.2.7"
-diff --git a/app/legacy/src-tauri/Cargo.toml b/app/legacy/src-tauri/Cargo.toml
-index fb735b2..cfd1349 100644
---- a/app/legacy/src-tauri/Cargo.toml
-+++ b/app/legacy/src-tauri/Cargo.toml
-@@ -20,7 +20,7 @@ notify-rust = "4.10"
- rqs_lib = { path = "../../../core_lib", features = ["experimental"] }
- serde = { version = "1.0", features = ["derive"] }
- serde_json = "1.0"
--sys_metrics = "0.2"
-+sys_metrics = { git = "https://github.com/Martichou/sys_metrics" }
- tauri = { version = "1.8", features = ["api-all", "reqwest-native-tls-vendored", "devtools", "system-tray"] }
- tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
- tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-diff --git a/app/main/src-tauri/Cargo.lock b/app/main/src-tauri/Cargo.lock
-index 5580ef5..4327d4c 100644
---- a/app/main/src-tauri/Cargo.lock
-+++ b/app/main/src-tauri/Cargo.lock
-@@ -4247,7 +4247,7 @@ dependencies = [
-  "rand 0.9.0",
-  "serde",
-  "sha2",
-- "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)",
-+ "sys_metrics",
-  "tokio",
-  "tokio-util",
-  "tracing-subscriber",
-@@ -4267,7 +4267,7 @@ dependencies = [
-  "rqs_lib",
-  "serde",
-  "serde_json",
-- "sys_metrics 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "sys_metrics",
-  "tauri",
-  "tauri-build",
-  "tauri-plugin-autostart",
-@@ -4932,21 +4932,6 @@ dependencies = [
-  "syn 2.0.95",
- ]
- 
--[[package]]
--name = "sys_metrics"
--version = "0.2.7"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484"
--dependencies = [
-- "core-foundation-sys",
-- "glob",
-- "io-kit-sys",
-- "lazy_static",
-- "libc",
-- "mach",
-- "serde",
--]
--
- [[package]]
- name = "sys_metrics"
- version = "0.2.7"
-diff --git a/app/main/src-tauri/Cargo.toml b/app/main/src-tauri/Cargo.toml
-index 8864112..7707922 100644
---- a/app/main/src-tauri/Cargo.toml
-+++ b/app/main/src-tauri/Cargo.toml
-@@ -20,7 +20,7 @@ notify-rust = "4.10"
- rqs_lib = { path = "../../../core_lib", features = ["experimental"] }
- serde = { version = "1.0", features = ["derive"] }
- serde_json = "1.0"
--sys_metrics = "0.2"
-+sys_metrics = { git = "https://github.com/Martichou/sys_metrics" }
- tauri = { version = "2.2", features = [ "devtools", "tray-icon", "native-tls-vendored", "image-png"] }
- tauri-plugin-autostart = "2.2"
- tauri-plugin-process = "2.2"

From cd63cf95627c9c0e602d8dd31a48439952c76aa5 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Thu, 21 May 2026 10:03:00 +0200
Subject: [PATCH 107/128] mpy-utils: drop fusepy, modernize derivation and
 unbreak on darwin

---
 pkgs/by-name/mp/mpy-utils/package.nix | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/mp/mpy-utils/package.nix b/pkgs/by-name/mp/mpy-utils/package.nix
index 4264b0a3a466..73a174e36bf6 100644
--- a/pkgs/by-name/mp/mpy-utils/package.nix
+++ b/pkgs/by-name/mp/mpy-utils/package.nix
@@ -1,30 +1,47 @@
 {
-  stdenv,
   lib,
   python3Packages,
   fetchPypi,
+  fetchpatch2,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mpy-utils";
   version = "0.1.13";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     hash = "sha256-die8hseaidhs9X7mfFvV8C8zn0uyw08gcHNqmjl+2Z4=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
-    fusepy
+  patches = [
+    # https://github.com/nickzoic/mpy-utils/pull/20
+    (fetchpatch2 {
+      name = "use-mfusepy.patch";
+      url = "https://github.com/nickzoic/mpy-utils/commit/1513b4dc1096bd8861792cd13abafd2342fb5510.patch?full_index=1";
+      hash = "sha256-ZgSEP+4yJf/0itApSmVh/hSqW10Ty+/kOjxg+XJsnn4=";
+    })
+  ];
+
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
+    mfusepy
     pyserial
   ];
 
+  # Skip mpy_utils.replfuseops: importing it loads libfuse via ctypes, which
+  # requires macFUSE on Darwin and is not available in the build sandbox.
+  pythonImportsCheck = [
+    "mpy_utils"
+    "mpy_utils.replcontrol"
+  ];
+
   meta = {
     description = "MicroPython development utility programs";
     homepage = "https://github.com/nickzoic/mpy-utils";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aciceri ];
-    broken = stdenv.hostPlatform.isDarwin;
   };
 })

From d885f2e092bbd0cf5f40c458973bcd6892a09afd Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 8 Jun 2026 21:23:31 -0500
Subject: [PATCH 108/128] vimPlugins.sqlite-lua: skip bookmarks example check

Removed in recent PR but example is non deterministic and not safe on
darwin.
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 42278849f698..eacd2a8686e2 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -4154,6 +4154,8 @@ assertNoAdditions {
       };
 
       nvimSkipModules = [
+        # Example seeds and edits a database during require.
+        "sqlite.examples.bookmarks"
         # Require "sql.utils" ?
         "sqlite.tbl.cache"
       ];

From f5fc776cc48c3920500f47758a1cb5cd3140c62d Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Wed, 12 Nov 2025 13:38:06 -0500
Subject: [PATCH 109/128] kubernetes-helm: 3.20.2 -> 4.2.0

---
 .../networking/cluster/helm/default.nix       | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 976dbf760db4..baaa3a1d7e45 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -5,26 +5,30 @@
   fetchFromGitHub,
   installShellFiles,
   testers,
+  writableTmpDirAsHomeHook,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "kubernetes-helm";
-  version = "3.20.2";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-YF5djCmCoPdLlEa/cksQgGtscEmIsQTiRqYZNyFjsEY=";
+    hash = "sha256-Wyihzf7KpnVuIdp5lmjhB7uLAGgtmI0TXYl29uaVC5Y=";
   };
-  vendorHash = "sha256-kqx23LekpuZJFisVZUoXBY9vHh9zviKyaW5NSa4ecxM=";
+
+  vendorHash = "sha256-QTDC0v0BPE3FoK9AAq1n2jWxOE9gB9OsoY2wnpcCDUQ=";
 
   subPackages = [ "cmd/helm" ];
   ldflags = [
     "-w"
     "-s"
-    "-X helm.sh/helm/v3/internal/version.version=v${finalAttrs.version}"
-    "-X helm.sh/helm/v3/internal/version.gitCommit=${finalAttrs.src.rev}"
+    "-X helm.sh/helm/v4/internal/version.version=v${finalAttrs.version}"
+    "-X helm.sh/helm/v4/internal/version.metadata="
+    "-X helm.sh/helm/v4/internal/version.gitCommit=${finalAttrs.src.rev}"
+    "-X helm.sh/helm/v4/internal/version.gitTreeState=clean"
   ];
 
   preBuild = ''
@@ -33,10 +37,14 @@ buildGoModule (finalAttrs: {
     K8S_MODULES_MAJOR_VER="$(($(cut -d. -f1 <<<"$K8S_MODULES_VER") + 1))"
     K8S_MODULES_MINOR_VER="$(cut -d. -f2 <<<"$K8S_MODULES_VER")"
     old_ldflags="''${ldflags}"
-    ldflags="''${ldflags} -X helm.sh/helm/v3/pkg/lint/rules.k8sVersionMajor=''${K8S_MODULES_MAJOR_VER}"
-    ldflags="''${ldflags} -X helm.sh/helm/v3/pkg/lint/rules.k8sVersionMinor=''${K8S_MODULES_MINOR_VER}"
-    ldflags="''${ldflags} -X helm.sh/helm/v3/pkg/chartutil.k8sVersionMajor=''${K8S_MODULES_MAJOR_VER}"
-    ldflags="''${ldflags} -X helm.sh/helm/v3/pkg/chartutil.k8sVersionMinor=''${K8S_MODULES_MINOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/pkg/chart/v2/lint/rules.k8sVersionMajor=''${K8S_MODULES_MAJOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/pkg/chart/v2/lint/rules.k8sVersionMinor=''${K8S_MODULES_MINOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/pkg/internal/v3/lint/rules.k8sVersionMajor=''${K8S_MODULES_MAJOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/pkg/internal/v3/lint/rules.k8sVersionMinor=''${K8S_MODULES_MINOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/pkg/chart/common/util.k8sVersionMajor=''${K8S_MODULES_MAJOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/pkg/chart/common/util.k8sVersionMinor=''${K8S_MODULES_MINOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/internal/version.kubeClientVersionMajor=''${K8S_MODULES_MAJOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/internal/version.kubeClientVersionMinor=''${K8S_MODULES_MINOR_VER}"
   '';
 
   overrideModAttrs = _: {
@@ -50,15 +58,17 @@ buildGoModule (finalAttrs: {
     # restore ldflags for tests
     ldflags="''${old_ldflags}"
 
+    patchShebangs pkg/cmd/testdata/helmhome/helm/plugins/exitwith/exitwith.sh
+
     # skipping version tests because they require dot git directory
-    substituteInPlace cmd/helm/version_test.go \
+    substituteInPlace pkg/cmd/version_test.go \
       --replace-fail "TestVersion" "SkipVersion"
     # skipping plugin tests
-    substituteInPlace cmd/helm/plugin_test.go \
+    substituteInPlace pkg/cmd/plugin_test.go \
       --replace-fail "TestPluginDynamicCompletion" "SkipPluginDynamicCompletion" \
-      --replace-fail "TestLoadPlugins" "SkipLoadPlugins"
+      --replace-fail "TestLoadCLIPlugins" "SkipLoadCLIPlugins"
     substituteInPlace cmd/helm/helm_test.go \
-      --replace-fail "TestPluginExitCode" "SkipPluginExitCode"
+      --replace-fail "TestCliPluginExitCode" "TestCliPluginExitCode"
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     # skipping as test fails in sandbox
@@ -76,6 +86,7 @@ buildGoModule (finalAttrs: {
   '';
 
   nativeBuildInputs = [ installShellFiles ];
+  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     $out/bin/helm completion bash > helm.bash
     $out/bin/helm completion zsh > helm.zsh

From 7a813a41db73f481a2f63851effa5204c579028f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 9 Jun 2026 14:26:50 +0000
Subject: [PATCH 110/128] radicle-desktop: 0.11.0 -> 0.12.0

Changelog: https://radicle.network/nodes/seed.radicle.dev/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md
---
 pkgs/by-name/ra/radicle-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-desktop/package.nix b/pkgs/by-name/ra/radicle-desktop/package.nix
index ead2073a3905..7f70f73de9da 100644
--- a/pkgs/by-name/ra/radicle-desktop/package.nix
+++ b/pkgs/by-name/ra/radicle-desktop/package.nix
@@ -26,13 +26,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-desktop";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromRadicle {
     seed = "seed.radicle.dev";
     repo = "z4D5UCArafTzTQpDZNQRuqswh3ury";
     tag = "releases/${finalAttrs.version}";
-    hash = "sha256-LKV69Yr06KI46GNl+Xk3sb9sn9Yr6A3i0+WuPsbvW7g=";
+    hash = "sha256-lbLBtLOBLf+w2Oq56JwXtouDykNrRZyrMxYX9131lf8=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git_head

From c5059c32b6c014e9d03c12121768942f2641af28 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 9 Jun 2026 16:04:50 +0200
Subject: [PATCH 111/128] taler-wallet-core: update pnpm & fetcher versions

---
 pkgs/by-name/ta/taler-wallet-core/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index 3f872686467e..7b38c18ffb3e 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -8,7 +8,7 @@
   srcOnly,
   removeReferencesTo,
   nodejs-slim_24,
-  pnpm_9,
+  pnpm_11,
   fetchPnpmDeps,
   pnpmConfigHook,
   python3,
@@ -20,7 +20,7 @@ let
   nodeSources = (srcOnly nodejs-slim_24).overrideAttrs {
     outputChecks = { };
   };
-  pnpm' = pnpm_9.override { nodejs-slim = nodejs-slim_24; };
+  pnpm' = pnpm_11.override { nodejs-slim = nodejs-slim_24; };
   esbuild' = esbuild.override {
     buildGoModule =
       args:
@@ -57,8 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm';
-    fetcherVersion = 3;
-    hash = "sha256-W5C2JVFbEccf4b+ppeEJ68au/2Tqfsry7ri6Qi1M50k=";
+    fetcherVersion = 4;
+    hash = "sha256-ZoxAZ5f3Szz2goGOE5yn/aCZ5fuhDt1owZ/o1kvX7d0=";
   };
 
   nativeBuildInputs = [

From 819f1a801cd56f8a8b711195a581c250dfa12616 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 9 Jun 2026 16:30:08 +0200
Subject: [PATCH 112/128] tor{-browser}: set meta.donationPage

---
 pkgs/by-name/to/tor-browser/package.nix | 1 +
 pkgs/by-name/to/tor/package.nix         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 8b6c03407e22..bb87d7b261bc 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -340,6 +340,7 @@ stdenv.mkDerivation rec {
     description = "Privacy-focused browser routing traffic through the Tor network";
     mainProgram = "tor-browser";
     homepage = "https://www.torproject.org/";
+    donationPage = "https://donate.torproject.org/";
     changelog = "https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/maint-${lib.versions.majorMinor version}/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt";
     platforms = lib.attrNames sources;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/to/tor/package.nix b/pkgs/by-name/to/tor/package.nix
index 49dbe04f2c5d..80a3eb3c64ad 100644
--- a/pkgs/by-name/to/tor/package.nix
+++ b/pkgs/by-name/to/tor/package.nix
@@ -134,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://www.torproject.org/";
+    donationPage = "https://donate.torproject.org/";
     description = "Anonymizing overlay network";
     longDescription = ''
       Tor helps improve your privacy by bouncing your communications around a

From df90e277311d05257e04bc79d03f0112221a0b30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 14:35:29 +0000
Subject: [PATCH 113/128] hyprshell: 4.10.6 -> 4.10.7

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

diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix
index 3845463b8b1e..ac69fca14473 100644
--- a/pkgs/by-name/hy/hyprshell/package.nix
+++ b/pkgs/by-name/hy/hyprshell/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyprshell";
-  version = "4.10.6";
+  version = "4.10.7";
 
   src = fetchFromGitHub {
     owner = "H3rmt";
     repo = "hyprshell";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ud3tZngQzl6eupFCSvpcEdNuOA/g7bmkWWO+3h7V1mg=";
+    hash = "sha256-1Hr9X7MdYkcibCxRl4zlQOxGu/HDyjBeDTUMJi4B23E=";
   };
 
-  cargoHash = "sha256-gPZZWz6ihBgpcnLvzwE4b4AvNph5Euaomm220n/0GA8=";
+  cargoHash = "sha256-p2oo2rUOILRv5Ifapacz+CvJQhCjxnKTe3X2kTvLr9g=";
 
   nativeBuildInputs = [
     wrapGAppsHook4

From c76ef019d93caaa320ba6d9b25fe1b2a8ce3faca Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Mon, 8 Jun 2026 12:24:36 +0200
Subject: [PATCH 114/128] anyrun: 25.12.0 -> 26.6.1

Changelogs:
- https://github.com/anyrun-org/anyrun/releases/tag/v26.6.0
- https://github.com/anyrun-org/anyrun/releases/tag/v26.6.1

Diff: https://github.com/anyrun-org/anyrun/compare/v25.12.0...v26.6.1
---
 pkgs/by-name/an/anyrun/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix
index 65cf9d4ee3dc..7d42d27c849a 100644
--- a/pkgs/by-name/an/anyrun/package.nix
+++ b/pkgs/by-name/an/anyrun/package.nix
@@ -17,16 +17,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "anyrun";
-  version = "25.12.0";
+  version = "26.6.1";
 
   src = fetchFromGitHub {
     owner = "anyrun-org";
     repo = "anyrun";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KEEJLERvo04AsPo/SWHFJUmHaGGOVjUoGwA9e8GVIQQ=";
+    hash = "sha256-+Fx+JfSboBk8KKVgmaMKDKvMe9c3WC+7RKYjnpvMVpg=";
   };
 
-  cargoHash = "sha256-IDrDgmksDdKw5JYY/kw+CCEIDJ6S2KARxUDSul713pw=";
+  cargoHash = "sha256-NHWKgLvILeXVLyKxfm/uWxb2mwb1wM6Utw9vPlUPYaI=";
 
   strictDeps = true;
   enableParallelBuilding = true;

From aa1a4a413eecb93daee0e192e73568499af9d0aa Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 27 May 2026 16:39:31 -0500
Subject: [PATCH 115/128] cdemu: inline common-drv-attrs and refactor

---
 .../applications/emulators/cdemu/analyzer.nix | 45 +++++++++++-----
 pkgs/applications/emulators/cdemu/client.nix  | 44 +++++++++++-----
 .../emulators/cdemu/common-drv-attrs.nix      | 33 ------------
 pkgs/applications/emulators/cdemu/daemon.nix  | 52 ++++++++++---------
 pkgs/applications/emulators/cdemu/gui.nix     | 50 ++++++++++++------
 .../emulators/cdemu/libmirage.nix             | 38 ++++++--------
 6 files changed, 140 insertions(+), 122 deletions(-)
 delete mode 100644 pkgs/applications/emulators/cdemu/common-drv-attrs.nix

diff --git a/pkgs/applications/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix
index e9065676e147..90fdb30a1821 100644
--- a/pkgs/applications/emulators/cdemu/analyzer.nix
+++ b/pkgs/applications/emulators/cdemu/analyzer.nix
@@ -1,7 +1,6 @@
 {
   cmake,
   pkg-config,
-  callPackage,
   gobject-introspection,
   wrapGAppsHook3,
   python3Packages,
@@ -11,20 +10,17 @@
   gdk-pixbuf,
   intltool,
   libmirage,
+  fetchurl,
+  lib,
 }:
-python3Packages.buildPythonApplication {
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "image-analyzer";
+  version = "3.2.6";
 
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.6";
-      pname = "image-analyzer";
-      hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/image-analyzer-${finalAttrs.version}.tar.xz";
+    hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc=";
+  };
 
   buildInputs = [
     libxml2
@@ -33,10 +29,12 @@ python3Packages.buildPythonApplication {
     adwaita-icon-theme
     gdk-pixbuf
   ];
+
   propagatedBuildInputs = with python3Packages; [
     pygobject3
     matplotlib
   ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -47,8 +45,27 @@ python3Packages.buildPythonApplication {
 
   pyproject = false;
   dontWrapGApps = true;
+
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-}
+  meta = {
+    description = "Suite of tools for emulating optical drives and discs";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
+    homepage = "https://cdemu.sourceforge.io/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bendlas ];
+  };
+})
diff --git a/pkgs/applications/emulators/cdemu/client.nix b/pkgs/applications/emulators/cdemu/client.nix
index afb68755775c..c45fda289abc 100644
--- a/pkgs/applications/emulators/cdemu/client.nix
+++ b/pkgs/applications/emulators/cdemu/client.nix
@@ -1,25 +1,21 @@
 {
-  callPackage,
   python3Packages,
   cmake,
   pkg-config,
   intltool,
   wrapGAppsNoGuiHook,
   gobject-introspection,
+  fetchurl,
+  lib,
 }:
-python3Packages.buildPythonApplication {
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "cdemu-client";
+  version = "3.2.5";
 
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.5";
-      pname = "cdemu-client";
-      hash = "sha256-py2F61v8vO0BCM18GCflAiD48deZjbMM6wqoCDZsOd8=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/cdemu-client-${finalAttrs.version}.tar.xz";
+    hash = "sha256-py2F61v8vO0BCM18GCflAiD48deZjbMM6wqoCDZsOd8=";
+  };
 
   nativeBuildInputs = [
     cmake
@@ -28,6 +24,7 @@ python3Packages.buildPythonApplication {
     wrapGAppsNoGuiHook
     gobject-introspection
   ];
+
   propagatedBuildInputs = with python3Packages; [
     dbus-python
     pygobject3
@@ -35,8 +32,27 @@ python3Packages.buildPythonApplication {
 
   pyproject = false;
   dontWrapGApps = true;
+
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-}
+  meta = {
+    description = "Suite of tools for emulating optical drives and discs";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
+    homepage = "https://cdemu.sourceforge.io/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bendlas ];
+  };
+})
diff --git a/pkgs/applications/emulators/cdemu/common-drv-attrs.nix b/pkgs/applications/emulators/cdemu/common-drv-attrs.nix
deleted file mode 100644
index edc3361a5fad..000000000000
--- a/pkgs/applications/emulators/cdemu/common-drv-attrs.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  fetchurl,
-  pname,
-  version,
-  hash,
-}:
-
-{
-  inherit pname version;
-  src = fetchurl {
-    url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz";
-    inherit hash;
-  };
-  meta = {
-    description = "Suite of tools for emulating optical drives and discs";
-    longDescription = ''
-      CDEmu consists of:
-
-      - a kernel module implementing a virtual drive-controller
-      - libmirage which is a software library for interpreting optical disc images
-      - a daemon which emulates the functionality of an optical drive+disc
-      - textmode and GTK clients for controlling the emulator
-      - an image analyzer to view the structure of image files
-
-      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
-    '';
-    homepage = "https://cdemu.sourceforge.io/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ bendlas ];
-  };
-}
diff --git a/pkgs/applications/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix
index 874b0522aa07..42cac77cba31 100644
--- a/pkgs/applications/emulators/cdemu/daemon.nix
+++ b/pkgs/applications/emulators/cdemu/daemon.nix
@@ -1,6 +1,5 @@
 {
   stdenv,
-  callPackage,
   cmake,
   pkg-config,
   glib,
@@ -8,34 +7,31 @@
   intltool,
   libmirage,
   coreutils,
+  fetchurl,
+  lib,
 }:
 
-let
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.7";
-      pname = "cdemu-daemon";
-      hash = "sha256-EKh2G6RA9Yq46BpTAqN2s6TpLJb8gwDuEpGiwdGcelc=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
-in
-stdenv.mkDerivation {
-  inherit pname version src;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "cdemu-daemon";
+  version = "3.2.7";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/cdemu-daemon-${finalAttrs.version}.tar.xz";
+    hash = "sha256-EKh2G6RA9Yq46BpTAqN2s6TpLJb8gwDuEpGiwdGcelc=";
+  };
 
   nativeBuildInputs = [
     cmake
     pkg-config
     intltool
   ];
+
   buildInputs = [
     glib
     libao
     libmirage
   ];
+
   postInstall = ''
     mkdir -p $out/share/dbus-1/services
     cp -R ../service-example $out/share/cdemu
@@ -46,14 +42,22 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    inherit (meta)
-      description
-      license
-      longDescription
-      maintainers
-      platforms
-      ;
+    description = "Suite of tools for emulating optical drives and discs";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
     homepage = "https://cdemu.sourceforge.io/about/daemon/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bendlas ];
     mainProgram = "cdemu-daemon";
   };
-}
+})
diff --git a/pkgs/applications/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix
index 90523e12ead6..11fd3c2c7c88 100644
--- a/pkgs/applications/emulators/cdemu/gui.nix
+++ b/pkgs/applications/emulators/cdemu/gui.nix
@@ -1,5 +1,4 @@
 {
-  callPackage,
   cmake,
   pkg-config,
   wrapGAppsHook3,
@@ -10,20 +9,18 @@
   adwaita-icon-theme,
   gdk-pixbuf,
   libappindicator-gtk3,
+  fetchurl,
+  lib,
 }:
-python3Packages.buildPythonApplication {
 
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.6";
-      pname = "gcdemu";
-      hash = "sha256-w4vzKoSotL5Cjfr4Cu4YhNSWXJqS+n/vySrwvbhR1zA=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "gcdemu";
+  version = "3.2.6";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/gcdemu-${finalAttrs.version}.tar.xz";
+    hash = "sha256-w4vzKoSotL5Cjfr4Cu4YhNSWXJqS+n/vySrwvbhR1zA=";
+  };
 
   nativeBuildInputs = [
     cmake
@@ -32,18 +29,41 @@ python3Packages.buildPythonApplication {
     intltool
     gobject-introspection
   ];
+
   buildInputs = [
     libnotify
     adwaita-icon-theme
     gdk-pixbuf
     libappindicator-gtk3
   ];
-  propagatedBuildInputs = with python3Packages; [ pygobject3 ];
+
+  propagatedBuildInputs = with python3Packages; [
+    pygobject3
+  ];
 
   pyproject = false;
   dontWrapGApps = true;
+
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-}
+  meta = {
+    description = "Suite of tools for emulating optical drives and discs";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
+    homepage = "https://cdemu.sourceforge.io/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bendlas ];
+  };
+})
diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix
index e2017be9616c..16e1cc2e3a01 100644
--- a/pkgs/applications/emulators/cdemu/libmirage.nix
+++ b/pkgs/applications/emulators/cdemu/libmirage.nix
@@ -1,6 +1,5 @@
 {
   stdenv,
-  callPackage,
   cmake,
   pkg-config,
   gobject-introspection,
@@ -16,23 +15,18 @@
   util-linux,
   libselinux,
   libsepol,
+  fetchurl,
+  lib,
 }:
 
-let
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.10";
-      pname = "libmirage";
-      hash = "sha256-+T5Gu3VcprCkSJcq/kTySRnNI7nc+GbRtctLkzPhgK4=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
-in
-stdenv.mkDerivation {
-  inherit pname version src;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libmirage";
+  version = "3.2.10";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/libmirage-${finalAttrs.version}.tar.xz";
+    hash = "sha256-+T5Gu3VcprCkSJcq/kTySRnNI7nc+GbRtctLkzPhgK4=";
+  };
 
   env = {
     PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
@@ -47,6 +41,7 @@ stdenv.mkDerivation {
     xz
     libsamplerate
   ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -54,6 +49,7 @@ stdenv.mkDerivation {
     gobject-introspection
     vala
   ];
+
   propagatedBuildInputs = [
     pcre
     util-linux
@@ -62,12 +58,10 @@ stdenv.mkDerivation {
   ];
 
   meta = {
-    inherit (meta)
-      maintainers
-      license
-      platforms
-      ;
+    maintainers = with lib.maintainers; [ bendlas ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
     description = "CD-ROM image access library";
     homepage = "https://cdemu.sourceforge.io/about/libmirage/";
   };
-}
+})

From 9d366f5d08344c21fa2e847f031fe9b79f88c165 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 27 May 2026 16:51:39 -0500
Subject: [PATCH 116/128] cdemu-*: migrate to by-name

---
 .../client.nix => by-name/cd/cdemu-client/package.nix} |  0
 .../daemon.nix => by-name/cd/cdemu-daemon/package.nix} |  0
 .../cdemu/gui.nix => by-name/gc/gcdemu/package.nix}    |  0
 .../im/image-analyzer/package.nix}                     |  0
 .../libmirage.nix => by-name/li/libmirage/package.nix} |  0
 pkgs/top-level/all-packages.nix                        | 10 ----------
 6 files changed, 10 deletions(-)
 rename pkgs/{applications/emulators/cdemu/client.nix => by-name/cd/cdemu-client/package.nix} (100%)
 rename pkgs/{applications/emulators/cdemu/daemon.nix => by-name/cd/cdemu-daemon/package.nix} (100%)
 rename pkgs/{applications/emulators/cdemu/gui.nix => by-name/gc/gcdemu/package.nix} (100%)
 rename pkgs/{applications/emulators/cdemu/analyzer.nix => by-name/im/image-analyzer/package.nix} (100%)
 rename pkgs/{applications/emulators/cdemu/libmirage.nix => by-name/li/libmirage/package.nix} (100%)

diff --git a/pkgs/applications/emulators/cdemu/client.nix b/pkgs/by-name/cd/cdemu-client/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/client.nix
rename to pkgs/by-name/cd/cdemu-client/package.nix
diff --git a/pkgs/applications/emulators/cdemu/daemon.nix b/pkgs/by-name/cd/cdemu-daemon/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/daemon.nix
rename to pkgs/by-name/cd/cdemu-daemon/package.nix
diff --git a/pkgs/applications/emulators/cdemu/gui.nix b/pkgs/by-name/gc/gcdemu/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/gui.nix
rename to pkgs/by-name/gc/gcdemu/package.nix
diff --git a/pkgs/applications/emulators/cdemu/analyzer.nix b/pkgs/by-name/im/image-analyzer/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/analyzer.nix
rename to pkgs/by-name/im/image-analyzer/package.nix
diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/by-name/li/libmirage/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/libmirage.nix
rename to pkgs/by-name/li/libmirage/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30674f248999..50c6c1d6a792 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1253,21 +1253,11 @@ with pkgs;
     else
       throw "Don't know 32-bit platform for cross from: ${stdenv.hostPlatform.stdenv}";
 
-  cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { };
-
-  cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { };
-
   fceux-qt5 = fceux.override { ___qtVersion = "5"; };
   fceux-qt6 = fceux.override { ___qtVersion = "6"; };
 
-  gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
-
-  image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { };
-
   kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { };
 
-  libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };
-
   mame-tools = lib.addMetaAttrs {
     description = mame.meta.description + " (tools only)";
   } (lib.getOutput "tools" mame);

From a9aa8b41038423efa2805a0d5507cf5d915e7b34 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 27 May 2026 17:11:54 -0500
Subject: [PATCH 117/128] cdemu-*: add updateScript

---
 pkgs/by-name/cd/cdemu-client/package.nix   | 15 +++++++++++++++
 pkgs/by-name/cd/cdemu-daemon/package.nix   | 15 +++++++++++++++
 pkgs/by-name/gc/gcdemu/package.nix         | 15 +++++++++++++++
 pkgs/by-name/im/image-analyzer/package.nix | 15 +++++++++++++++
 pkgs/by-name/li/libmirage/package.nix      | 15 +++++++++++++++
 5 files changed, 75 insertions(+)

diff --git a/pkgs/by-name/cd/cdemu-client/package.nix b/pkgs/by-name/cd/cdemu-client/package.nix
index c45fda289abc..54abd96a1d23 100644
--- a/pkgs/by-name/cd/cdemu-client/package.nix
+++ b/pkgs/by-name/cd/cdemu-client/package.nix
@@ -7,6 +7,7 @@
   gobject-introspection,
   fetchurl,
   lib,
+  writeScript,
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "cdemu-client";
@@ -37,6 +38,20 @@ python3Packages.buildPythonApplication (finalAttrs: {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  passthru = {
+    updateScript = writeScript "update-cdemu-client" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for cdemu-client
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/cdemu-client" | pcre2grep -o1 'cdemu-client-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version cdemu-client "$newVersion"
+    '';
+  };
+
   meta = {
     description = "Suite of tools for emulating optical drives and discs";
     longDescription = ''
diff --git a/pkgs/by-name/cd/cdemu-daemon/package.nix b/pkgs/by-name/cd/cdemu-daemon/package.nix
index 42cac77cba31..4f5f43c006dd 100644
--- a/pkgs/by-name/cd/cdemu-daemon/package.nix
+++ b/pkgs/by-name/cd/cdemu-daemon/package.nix
@@ -9,6 +9,7 @@
   coreutils,
   fetchurl,
   lib,
+  writeScript,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -41,6 +42,20 @@ stdenv.mkDerivation (finalAttrs: {
       --replace /bin/true ${coreutils}/bin/true
   '';
 
+  passthru = {
+    updateScript = writeScript "update-cdemu-daemon" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for cdemu-daemon
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/cdemu-daemon" | pcre2grep -o1 'cdemu-daemon-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version cdemu-daemon "$newVersion"
+    '';
+  };
+
   meta = {
     description = "Suite of tools for emulating optical drives and discs";
     longDescription = ''
diff --git a/pkgs/by-name/gc/gcdemu/package.nix b/pkgs/by-name/gc/gcdemu/package.nix
index 11fd3c2c7c88..82586645a2fa 100644
--- a/pkgs/by-name/gc/gcdemu/package.nix
+++ b/pkgs/by-name/gc/gcdemu/package.nix
@@ -11,6 +11,7 @@
   libappindicator-gtk3,
   fetchurl,
   lib,
+  writeScript,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
@@ -48,6 +49,20 @@ python3Packages.buildPythonApplication (finalAttrs: {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  passthru = {
+    updateScript = writeScript "update-gcdemu" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for gcdemu
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/gcdemu" | pcre2grep -o1 'gcdemu-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version gcdemu "$newVersion"
+    '';
+  };
+
   meta = {
     description = "Suite of tools for emulating optical drives and discs";
     longDescription = ''
diff --git a/pkgs/by-name/im/image-analyzer/package.nix b/pkgs/by-name/im/image-analyzer/package.nix
index 90fdb30a1821..16e8c6616460 100644
--- a/pkgs/by-name/im/image-analyzer/package.nix
+++ b/pkgs/by-name/im/image-analyzer/package.nix
@@ -12,6 +12,7 @@
   libmirage,
   fetchurl,
   lib,
+  writeScript,
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "image-analyzer";
@@ -50,6 +51,20 @@ python3Packages.buildPythonApplication (finalAttrs: {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  passthru = {
+    updateScript = writeScript "update-image-analyzer" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for image-analyzer
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/image-analyzer" | pcre2grep -o1 'image-analyzer-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version image-analyzer "$newVersion"
+    '';
+  };
+
   meta = {
     description = "Suite of tools for emulating optical drives and discs";
     longDescription = ''
diff --git a/pkgs/by-name/li/libmirage/package.nix b/pkgs/by-name/li/libmirage/package.nix
index 16e1cc2e3a01..7b2427774cb8 100644
--- a/pkgs/by-name/li/libmirage/package.nix
+++ b/pkgs/by-name/li/libmirage/package.nix
@@ -17,6 +17,7 @@
   libsepol,
   fetchurl,
   lib,
+  writeScript,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -57,6 +58,20 @@ stdenv.mkDerivation (finalAttrs: {
     libsepol
   ];
 
+  passthru = {
+    updateScript = writeScript "update-libmirage" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for libmirage
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/libmirage" | pcre2grep -o1 'libmirage-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version libmirage "$newVersion"
+    '';
+  };
+
   meta = {
     maintainers = with lib.maintainers; [ bendlas ];
     license = lib.licenses.gpl2Plus;

From a156cab325bea0dfd51321aab1de2126b9d75efc Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 27 May 2026 22:15:24 +0000
Subject: [PATCH 118/128] cdemu-*: update to latest versions

cdemu-daemon: 3.2.7 -> 3.3.0

cdemu-client: 3.2.5 -> 3.3.0

gcdemu: 3.2.6 -> 3.3.0

image-analyzer: 3.2.6 -> 3.3.0

libmirage: 3.2.10 -> 3.3.1
---
 pkgs/by-name/cd/cdemu-client/package.nix   | 4 ++--
 pkgs/by-name/cd/cdemu-daemon/package.nix   | 4 ++--
 pkgs/by-name/gc/gcdemu/package.nix         | 4 ++--
 pkgs/by-name/im/image-analyzer/package.nix | 4 ++--
 pkgs/by-name/li/libmirage/package.nix      | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/cd/cdemu-client/package.nix b/pkgs/by-name/cd/cdemu-client/package.nix
index 54abd96a1d23..9e409d46fb4c 100644
--- a/pkgs/by-name/cd/cdemu-client/package.nix
+++ b/pkgs/by-name/cd/cdemu-client/package.nix
@@ -11,11 +11,11 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "cdemu-client";
-  version = "3.2.5";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/cdemu-client-${finalAttrs.version}.tar.xz";
-    hash = "sha256-py2F61v8vO0BCM18GCflAiD48deZjbMM6wqoCDZsOd8=";
+    hash = "sha256-WiKm00ZKUDeHX6RII4+JKruAzUyWzZWyI0iZeDqksnA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cd/cdemu-daemon/package.nix b/pkgs/by-name/cd/cdemu-daemon/package.nix
index 4f5f43c006dd..f25748b01c85 100644
--- a/pkgs/by-name/cd/cdemu-daemon/package.nix
+++ b/pkgs/by-name/cd/cdemu-daemon/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cdemu-daemon";
-  version = "3.2.7";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/cdemu-daemon-${finalAttrs.version}.tar.xz";
-    hash = "sha256-EKh2G6RA9Yq46BpTAqN2s6TpLJb8gwDuEpGiwdGcelc=";
+    hash = "sha256-AYHjiOAQdu685gc6p0j2QNtCmTYTWix1kzWQZYvGPWU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gc/gcdemu/package.nix b/pkgs/by-name/gc/gcdemu/package.nix
index 82586645a2fa..3cd67894358e 100644
--- a/pkgs/by-name/gc/gcdemu/package.nix
+++ b/pkgs/by-name/gc/gcdemu/package.nix
@@ -16,11 +16,11 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gcdemu";
-  version = "3.2.6";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/gcdemu-${finalAttrs.version}.tar.xz";
-    hash = "sha256-w4vzKoSotL5Cjfr4Cu4YhNSWXJqS+n/vySrwvbhR1zA=";
+    hash = "sha256-C9d4Rv47kQhs2kbTCwAUcdm+dcljA8IVkwhLJHJpUS0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/im/image-analyzer/package.nix b/pkgs/by-name/im/image-analyzer/package.nix
index 16e8c6616460..364286765d26 100644
--- a/pkgs/by-name/im/image-analyzer/package.nix
+++ b/pkgs/by-name/im/image-analyzer/package.nix
@@ -16,11 +16,11 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "image-analyzer";
-  version = "3.2.6";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/image-analyzer-${finalAttrs.version}.tar.xz";
-    hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc=";
+    hash = "sha256-N2aufwYEBVx7z2Vo7Qi4DP2MsDXXr5LrQdeNYOtNGnU=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/li/libmirage/package.nix b/pkgs/by-name/li/libmirage/package.nix
index 7b2427774cb8..f45a1342ab26 100644
--- a/pkgs/by-name/li/libmirage/package.nix
+++ b/pkgs/by-name/li/libmirage/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmirage";
-  version = "3.2.10";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/libmirage-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+T5Gu3VcprCkSJcq/kTySRnNI7nc+GbRtctLkzPhgK4=";
+    hash = "sha256-mstOGdmKJXRUrQA5F1DZGqVuY+f25Q5ZpdOXPx4MZRI=";
   };
 
   env = {

From eede6b7946e6502343150664307a72b8520f27aa Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 27 May 2026 17:28:38 -0500
Subject: [PATCH 119/128] linuxPackages.vhba: add updateScript

---
 pkgs/applications/emulators/cdemu/vhba.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix
index 844c56088162..7559dd14465f 100644
--- a/pkgs/applications/emulators/cdemu/vhba.nix
+++ b/pkgs/applications/emulators/cdemu/vhba.nix
@@ -4,6 +4,7 @@
   fetchurl,
   kernel,
   kernelModuleMakeFlags,
+  writeScript,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,6 +22,20 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
+  passthru = {
+    updateScript = writeScript "update-vhba-module" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for vhba-module
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/vhba-module" | pcre2grep -o1 'vhba-module-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version linuxPackages.vhba "$newVersion"
+    '';
+  };
+
   meta = {
     description = "Provides a Virtual (SCSI) HBA";
     homepage = "https://cdemu.sourceforge.io/about/vhba/";

From b3bd938d3d5b014efc99844826cb779babdf8d9d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 27 May 2026 17:31:00 -0500
Subject: [PATCH 120/128] linuxPackages.vhba: migrate kernel module to by-name

---
 .../emulators/cdemu => by-name/cd/cdemu-daemon}/vhba.nix        | 0
 pkgs/top-level/linux-kernels.nix                                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{applications/emulators/cdemu => by-name/cd/cdemu-daemon}/vhba.nix (100%)

diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/by-name/cd/cdemu-daemon/vhba.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/vhba.nix
rename to pkgs/by-name/cd/cdemu-daemon/vhba.nix
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 1c674c91fda0..8e5a62bfae8a 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -555,7 +555,7 @@ in
         veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { };
         vendor-reset = callPackage ../os-specific/linux/vendor-reset { };
 
-        vhba = callPackage ../applications/emulators/cdemu/vhba.nix { };
+        vhba = callPackage ../by-name/cd/cdemu-daemon/vhba.nix { };
 
         virtio_vmmci = callPackage ../os-specific/linux/virtio_vmmci { };
 

From 49091d78a4df7a536c4aa0f385f7481833999db6 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 9 Jun 2026 17:45:04 +0300
Subject: [PATCH 121/128] pizauth: fix systemd units substitutions

Should have been part of 4b0398fd2c8205ce10c81aef2f1b63cadd75241a.
---
 pkgs/by-name/pi/pizauth/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 953a3fe1932c..0af0150531aa 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -19,6 +19,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-9cDVbDCb8vY6KxreyiMX3gp13bXZpxTQOwYbk6TEVpc=";
 
+  preConfigure = ''
+    substituteInPlace lib/systemd/user/pizauth.service \
+      --replace-fail /usr/bin/ ''${!outputBin}/bin/
+  '';
+
   postInstall = ''
     make PREFIX=$out install ${lib.optionalString stdenv.hostPlatform.isLinux "install-systemd"}
   '';

From 974e2cf0a58a7e4b828b88692b925d621cd715c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 00:18:19 +0000
Subject: [PATCH 122/128] pizauth: 1.0.11 -> 1.1.0

---
 pkgs/by-name/pi/pizauth/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 0af0150531aa..1d0a5f9bb3cf 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -8,16 +8,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pizauth";
-  version = "1.0.11";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "ltratt";
     repo = "pizauth";
     tag = "pizauth-${finalAttrs.version}";
-    hash = "sha256-e9YBeYMC9tfxZoXZi/QBW3FO5V6BAe7RSvVWs7rv0PI=";
+    hash = "sha256-VL58v/mBwFwDmF4Xg43bzitcBCsPsEwEaLKqV5X9rpg=";
   };
 
-  cargoHash = "sha256-9cDVbDCb8vY6KxreyiMX3gp13bXZpxTQOwYbk6TEVpc=";
+  cargoHash = "sha256-pxzPcieUXE3VOyGNDaeDHUQPayRDZXpW57VWMejlZ4k=";
+
+  buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [
+    "systemd"
+  ];
 
   preConfigure = ''
     substituteInPlace lib/systemd/user/pizauth.service \

From e42a1fcc6ce14e76e13d4aef3d082e5f67003bd5 Mon Sep 17 00:00:00 2001
From: fliiiix <hi@l33t.name>
Date: Tue, 9 Jun 2026 15:44:54 +0200
Subject: [PATCH 123/128] ayatana-indicator-display: Fix for cppcheck 2.21.0

---
 .../ay/ayatana-indicator-display/package.nix  |  8 +++
 ...cpp-Mark-create_phone_menu-as-static.patch | 26 ++++++++++
 ...und-undefined-function-like-macro-fo.patch | 49 +++++++++++++++++++
 ...-cppcheck-warning-has-no-initializer.patch | 30 ++++++++++++
 4 files changed, 113 insertions(+)
 create mode 100644 pkgs/by-name/ay/ayatana-indicator-display/patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch
 create mode 100644 pkgs/by-name/ay/ayatana-indicator-display/patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch
 create mode 100644 pkgs/by-name/ay/ayatana-indicator-display/patches/0003-Fix-cppcheck-warning-has-no-initializer.patch

diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
index c13451700809..cb5970285cd3 100644
--- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
@@ -39,6 +39,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-rsZjEfAiz1HC5XMjPume1Y6miNAv1kmPFP4J/+NKlsA=";
   };
 
+  patches = [
+    # This should be dropped once the issue is fixed upstream.
+    # https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/108
+    ./patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch
+    ./patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch
+    ./patches/0003-Fix-cppcheck-warning-has-no-initializer.patch
+  ];
+
   postPatch = ''
     # Replace systemd prefix in pkg-config query, use GNUInstallDirs location for /etc
     substituteInPlace data/CMakeLists.txt \
diff --git a/pkgs/by-name/ay/ayatana-indicator-display/patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch b/pkgs/by-name/ay/ayatana-indicator-display/patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch
new file mode 100644
index 000000000000..3c460a90236a
--- /dev/null
+++ b/pkgs/by-name/ay/ayatana-indicator-display/patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch
@@ -0,0 +1,26 @@
+From 5a1ce0ea5fd630efc7d85d681dacb562c356c3a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jbicha@ubuntu.com>
+Date: Sun, 29 Mar 2026 21:49:07 -0700
+Subject: [PATCH 1/3] service.cpp: Mark create_phone_menu as static
+
+to satisfy cppcheck
+---
+ src/service.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/service.cpp b/src/service.cpp
+index d6b4ed7..ced370c 100644
+--- a/src/service.cpp
++++ b/src/service.cpp
+@@ -1058,7 +1058,7 @@ private:
+     static_cast<Impl*>(gself)->update_phone_header();
+   }
+ 
+-  GMenuModel* create_phone_menu()
++  static GMenuModel* create_phone_menu()
+   {
+     GMenu* menu;
+     GMenu* section;
+-- 
+2.43.0
+
diff --git a/pkgs/by-name/ay/ayatana-indicator-display/patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch b/pkgs/by-name/ay/ayatana-indicator-display/patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch
new file mode 100644
index 000000000000..8626f610b2d5
--- /dev/null
+++ b/pkgs/by-name/ay/ayatana-indicator-display/patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch
@@ -0,0 +1,49 @@
+From 3f30df763c2b0ac84b1c754faaedc69107539508 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jbicha@ubuntu.com>
+Date: Sun, 29 Mar 2026 17:02:56 -0700
+Subject: [PATCH 2/3] cppcheck: Workaround undefined function-like macro for
+ GLIB_CHECK_VERSION
+
+Copy a snippet from gtk.cfg.
+
+I didn't include gtk.cfg directly because its config triggers
+additional failures, so only copy the one line that we need
+
+https://github.com/danmar/cppcheck/commit/8c762adcdd9e
+
+https://bugs.debian.org/1125642
+
+Closes: #106
+---
+ tests/CMakeLists.txt | 2 +-
+ tests/ayatana.cfg    | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+ create mode 100644 tests/ayatana.cfg
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index bdc074f..97d6be0 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -28,7 +28,7 @@ endif()
+ 
+ add_compile_options(${CXX_WARNING_ARGS})
+ 
+-add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride)
++add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt --library=${CMAKE_SOURCE_DIR}/tests/ayatana.cfg -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride)
+ 
+ add_subdirectory (unit)
+ 
+diff --git a/tests/ayatana.cfg b/tests/ayatana.cfg
+new file mode 100644
+index 0000000..035020a
+--- /dev/null
++++ b/tests/ayatana.cfg
+@@ -0,0 +1,5 @@
++<?xml version="1.0"?>
++<def format="2">
++  <!-- cppcheck override copied from gtk.cfg -->
++  <define name="GLIB_CHECK_VERSION(major, minor, micro)" value="1"/>
++</def>
+-- 
+2.43.0
+
diff --git a/pkgs/by-name/ay/ayatana-indicator-display/patches/0003-Fix-cppcheck-warning-has-no-initializer.patch b/pkgs/by-name/ay/ayatana-indicator-display/patches/0003-Fix-cppcheck-warning-has-no-initializer.patch
new file mode 100644
index 000000000000..918bc200a5ed
--- /dev/null
+++ b/pkgs/by-name/ay/ayatana-indicator-display/patches/0003-Fix-cppcheck-warning-has-no-initializer.patch
@@ -0,0 +1,30 @@
+From 172bf8a7d8e232d31a85ef61d21ee54b6c2eab7c Mon Sep 17 00:00:00 2001
+From: fliiiix <hi@l33t.name>
+Date: Tue, 9 Jun 2026 15:33:29 +0200
+Subject: [PATCH 3/3] Fix cppcheck warning has no initializer
+
+cppcheck 2.21.0
+---
+ src/service.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/service.cpp b/src/service.cpp
+index ced370c..251df5b 100644
+--- a/src/service.cpp
++++ b/src/service.cpp
+@@ -50,9 +50,9 @@ extern "C"
+ 
+     typedef struct
+     {
+-       guint nTempLow;
+-       guint nTempHigh;
+-       const gchar *sName;
++       guint nTempLow{};
++       guint nTempHigh{};
++       const gchar *sName = nullptr;
+     } TempProfile;
+ 
+     TempProfile m_lTempProfiles[] =
+-- 
+2.43.0
+

From 8c9434beea65d216ac05852f17c62626ad1c0e27 Mon Sep 17 00:00:00 2001
From: fliiiix <hi@l33t.name>
Date: Tue, 9 Jun 2026 15:44:29 +0200
Subject: [PATCH 124/128] cppcheck: 2.18.3 -> 2.21.0

Also update to correct owner

Add myself as maintainer
---
 pkgs/by-name/cp/cppcheck/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix
index 6789d6f9e139..2af1ab22eff4 100644
--- a/pkgs/by-name/cp/cppcheck/package.nix
+++ b/pkgs/by-name/cp/cppcheck/package.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cppcheck";
-  version = "2.18.3";
+  version = "2.21.0";
 
   outputs = [
     "out"
@@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   src = fetchFromGitHub {
-    owner = "danmar";
+    owner = "cppcheck-opensource";
     repo = "cppcheck";
     tag = finalAttrs.version;
-    hash = "sha256-c32dNM1tNN+Nqv5GmKHnAhWx8r9RTcv3FQ/+ROGurkw=";
+    hash = "sha256-y7P25ThLC54IwuMIc4UGt9bz1HoafB0/b2rus28GcGo=";
   };
 
   nativeBuildInputs = [
@@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "http://cppcheck.sourceforge.net";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ l33tname ];
     platforms = lib.platforms.unix;
   };
 })

From a552f494b9da0111983de9aa2185678e2bf223b3 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 9 Jun 2026 09:14:22 -0500
Subject: [PATCH 125/128] fcitx5-lua: switch to finalAttrs, hardcode pname,
 move lua5_3 out of top-level

Assisted-by: Cursor Composer 2.5

fcitx5-lua: migrate to by-name

Assisted-by: Cursor Composer 2.5
---
 .../fc/fcitx5-lua/package.nix}                  | 17 ++++++++++++-----
 pkgs/top-level/all-packages.nix                 |  2 --
 2 files changed, 12 insertions(+), 7 deletions(-)
 rename pkgs/{tools/inputmethods/fcitx5/fcitx5-lua.nix => by-name/fc/fcitx5-lua/package.nix} (81%)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/by-name/fc/fcitx5-lua/package.nix
similarity index 81%
rename from pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
rename to pkgs/by-name/fc/fcitx5-lua/package.nix
index 884d77a7005d..9b3ffe06eff8 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
+++ b/pkgs/by-name/fc/fcitx5-lua/package.nix
@@ -6,17 +6,24 @@
   pkg-config,
   kdePackages,
   fcitx5,
-  lua,
+  lua5_3,
   gettext,
 }:
-stdenv.mkDerivation rec {
+
+let
+  lua = lua5_3;
+in
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "fcitx5-lua";
   version = "5.0.16";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "fcitx";
-    repo = pname;
-    rev = version;
+    repo = "fcitx5-lua";
+    tag = finalAttrs.version;
     hash = "sha256-df0BjORGT+zx/8kg/nGPDa9MBAXpPtdfx8S5O+E31wE=";
   };
 
@@ -43,4 +50,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ poscat ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30674f248999..de79450156a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2159,8 +2159,6 @@ with pkgs;
 
   Fabric = with python3Packages; toPythonApplication fabric;
 
-  fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; };
-
   flatpak-builder = callPackage ../development/tools/flatpak-builder {
     binutils = binutils-unwrapped;
   };

From a8f8c0ed8623532e839a260b6959033b629223cd Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 9 Jun 2026 22:03:42 +0530
Subject: [PATCH 126/128] warp-terminal: fix darwin build

Co-authored-by: FlameFlag <git@ps1.sh>
---
 pkgs/by-name/wa/warp-terminal/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix
index 528ba9110ff8..969eb5b858be 100644
--- a/pkgs/by-name/wa/warp-terminal/package.nix
+++ b/pkgs/by-name/wa/warp-terminal/package.nix
@@ -4,7 +4,7 @@
   stdenv,
   fetchurl,
   autoPatchelfHook,
-  undmg,
+  _7zz,
   zstd,
   alsa-lib,
   curl,
@@ -107,7 +107,8 @@ let
 
     sourceRoot = ".";
 
-    nativeBuildInputs = [ undmg ];
+    # Warp.dmg is APFS formatted, which is unsupported by undmg
+    nativeBuildInputs = [ _7zz ];
 
     installPhase = ''
       runHook preInstall

From 596c89a917db556bc50b06fc088a36d3dd197343 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 9 Jun 2026 01:42:19 +0200
Subject: [PATCH 127/128] moonfire-nvr: 0.7.20 -> 0.7.31

https://github.com/scottlamb/moonfire-nvr/releases/tag/v0.7.21
https://github.com/scottlamb/moonfire-nvr/releases/tag/v0.7.22
https://github.com/scottlamb/moonfire-nvr/releases/tag/v0.7.23
https://github.com/scottlamb/moonfire-nvr/releases/tag/v0.7.24
https://github.com/scottlamb/moonfire-nvr/releases/tag/v0.7.25
https://github.com/scottlamb/moonfire-nvr/releases/tag/v0.7.26
https://github.com/scottlamb/moonfire-nvr/releases/tag/v0.7.27
https://github.com/scottlamb/moonfire-nvr/releases/tag/v0.7.28
https://github.com/scottlamb/moonfire-nvr/releases/tag/v0.7.29
https://github.com/scottlamb/moonfire-nvr/releases/tag/v0.7.30
https://github.com/scottlamb/moonfire-nvr/releases/tag/v0.7.31
---
 pkgs/by-name/mo/moonfire-nvr/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix
index 42a9e5e1db0e..2cbfc8bcb29e 100644
--- a/pkgs/by-name/mo/moonfire-nvr/package.nix
+++ b/pkgs/by-name/mo/moonfire-nvr/package.nix
@@ -9,19 +9,19 @@
   testers,
   moonfire-nvr,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
 }:
 
 let
   pname = "moonfire-nvr";
-  version = "0.7.20";
+  version = "0.7.31";
   src = fetchFromGitHub {
     owner = "scottlamb";
     repo = "moonfire-nvr";
     tag = "v${version}";
-    hash = "sha256-0EaGqZUmYGxLHcJAhlbG2wZMDiVv8U1bcTQqMx0aTo0=";
+    hash = "sha256-QgsaiWcXeU4y7z9mcqUAl4mQ/M4p38yRjOB/4MKlpVA=";
   };
   ui = stdenv.mkDerivation (finalAttrs: {
     inherit version src;
@@ -30,14 +30,14 @@ let
     nativeBuildInputs = [
       nodejs
       pnpmConfigHook
-      pnpm_9
+      pnpm_10
     ];
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) pname version src;
-      pnpm = pnpm_9;
+      pnpm = pnpm_10;
       sourceRoot = "${finalAttrs.src.name}/ui";
-      fetcherVersion = 3;
-      hash = "sha256-1bkuou8jfWqdev4ZlpqvC4BRrFj//LK6ImVvSeMUEuM=";
+      fetcherVersion = 4;
+      hash = "sha256-U/SHOVlx0kj1hfl09KcPg3CQZX9HZE5SghVEThWL1RA=";
     };
     installPhase = ''
       runHook preInstall
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage {
 
   sourceRoot = "${src.name}/server";
 
-  cargoHash = "sha256-+L4XofUFvhJDPGv4fAGYXFNpuNd01k/P63LH2tXXHE0=";
+  cargoHash = "sha256-TDFe5pD+8eSwvw0h9GLM+JfODlSBU1CO8fw4FVjy8xk=";
 
   env.VERSION = "v${version}";
 

From 1591fcddab710d94ba41d81f7eb2b968df342b6d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 9 Jun 2026 02:13:06 +0200
Subject: [PATCH 128/128] moonfire-nvr: add update script

---
 pkgs/by-name/mo/moonfire-nvr/package.nix | 68 ++++++++++--------------
 pkgs/by-name/mo/moonfire-nvr/ui.nix      | 41 ++++++++++++++
 2 files changed, 68 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/mo/moonfire-nvr/ui.nix

diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix
index 2cbfc8bcb29e..7c8bbc2cbf8d 100644
--- a/pkgs/by-name/mo/moonfire-nvr/package.nix
+++ b/pkgs/by-name/mo/moonfire-nvr/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  callPackage,
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
@@ -8,54 +8,26 @@
   sqlite,
   testers,
   moonfire-nvr,
-  nodejs,
-  pnpm_10,
-  fetchPnpmDeps,
-  pnpmConfigHook,
+  nix-update,
+  writeShellApplication,
 }:
 
-let
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "moonfire-nvr";
   version = "0.7.31";
+
   src = fetchFromGitHub {
     owner = "scottlamb";
     repo = "moonfire-nvr";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-QgsaiWcXeU4y7z9mcqUAl4mQ/M4p38yRjOB/4MKlpVA=";
   };
-  ui = stdenv.mkDerivation (finalAttrs: {
-    inherit version src;
-    pname = "${pname}-ui";
-    sourceRoot = "${src.name}/ui";
-    nativeBuildInputs = [
-      nodejs
-      pnpmConfigHook
-      pnpm_10
-    ];
-    pnpmDeps = fetchPnpmDeps {
-      inherit (finalAttrs) pname version src;
-      pnpm = pnpm_10;
-      sourceRoot = "${finalAttrs.src.name}/ui";
-      fetcherVersion = 4;
-      hash = "sha256-U/SHOVlx0kj1hfl09KcPg3CQZX9HZE5SghVEThWL1RA=";
-    };
-    installPhase = ''
-      runHook preInstall
 
-      cp -r public $out
-
-      runHook postInstall
-    '';
-  });
-in
-rustPlatform.buildRustPackage {
-  inherit pname version src;
-
-  sourceRoot = "${src.name}/server";
+  sourceRoot = "${finalAttrs.src.name}/server";
 
   cargoHash = "sha256-TDFe5pD+8eSwvw0h9GLM+JfODlSBU1CO8fw4FVjy8xk=";
 
-  env.VERSION = "v${version}";
+  env.VERSION = "v${finalAttrs.version}";
 
   nativeBuildInputs = [
     pkg-config
@@ -68,26 +40,40 @@ rustPlatform.buildRustPackage {
 
   postInstall = ''
     mkdir -p $out/lib
-    ln -s ${ui} $out/lib/ui
+    ln -s ${moonfire-nvr.ui} $out/lib/ui
   '';
 
   doCheck = false;
 
   passthru = {
-    inherit ui;
+    ui = callPackage ./ui.nix { };
     tests.version = testers.testVersion {
       package = moonfire-nvr;
       command = "moonfire-nvr --version";
-      version = "Version: v${version}";
+      version = "Version: v${finalAttrs.version}";
     };
+    updateScript = lib.getExe (writeShellApplication {
+      name = "update-moonfire-nvr";
+
+      runtimeInputs = [
+        nix-update
+      ];
+
+      text = ''
+        set -euo pipefail
+
+        nix-update moonfire-nvr
+        nix-update moonfire-nvr.ui --version=skip
+      '';
+    });
   };
 
   meta = {
     description = "Moonfire NVR, a security camera network video recorder";
     homepage = "https://github.com/scottlamb/moonfire-nvr";
-    changelog = "https://github.com/scottlamb/moonfire-nvr/releases/tag/v${version}";
+    changelog = "https://github.com/scottlamb/moonfire-nvr/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Only;
     maintainers = [ ];
     mainProgram = "moonfire-nvr";
   };
-}
+})
diff --git a/pkgs/by-name/mo/moonfire-nvr/ui.nix b/pkgs/by-name/mo/moonfire-nvr/ui.nix
new file mode 100644
index 000000000000..b66bbf87a45a
--- /dev/null
+++ b/pkgs/by-name/mo/moonfire-nvr/ui.nix
@@ -0,0 +1,41 @@
+{
+  stdenv,
+  moonfire-nvr,
+  nodejs,
+  pnpmConfigHook,
+  pnpm_10,
+  fetchPnpmDeps,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "moonfire-nvr-ui";
+  inherit (moonfire-nvr) version src;
+
+  sourceRoot = "${finalAttrs.src.name}/ui";
+
+  nativeBuildInputs = [
+    nodejs
+    pnpmConfigHook
+    pnpm_10
+  ];
+
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    pnpm = pnpm_10;
+    sourceRoot = "${finalAttrs.src.name}/ui";
+    fetcherVersion = 4;
+    hash = "sha256-U/SHOVlx0kj1hfl09KcPg3CQZX9HZE5SghVEThWL1RA=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r public $out
+
+    runHook postInstall
+  '';
+
+  meta = moonfire-nvr.meta // {
+    description = "Moonfire UI";
+  };
+})