From 232e7b6df081108480e0a2c0a4df8db8f1e5f944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 23 Feb 2025 17:57:03 +0100
Subject: [PATCH 001/225] nixos/vaultwarden: relax hardening when using
 sendmail

---
 .../services/security/vaultwarden/default.nix  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix
index 285dbc5d7046..613b81b297d2 100644
--- a/nixos/modules/services/security/vaultwarden/default.nix
+++ b/nixos/modules/services/security/vaultwarden/default.nix
@@ -65,6 +65,7 @@ let
 
   vaultwarden = cfg.package.override { inherit (cfg) dbBackend; };
 
+  useSendmail = configEnv.USE_SENDMAIL or null == "true";
 in
 {
   imports = [
@@ -236,10 +237,10 @@ in
         DevicePolicy = "closed";
         LockPersonality = true;
         MemoryDenyWriteExecute = true;
-        NoNewPrivileges = true;
-        PrivateDevices = true;
+        NoNewPrivileges = !useSendmail;
+        PrivateDevices = !useSendmail;
         PrivateTmp = true;
-        PrivateUsers = true;
+        PrivateUsers = !useSendmail;
         ProcSubset = "pid";
         ProtectClock = true;
         ProtectControlGroups = true;
@@ -262,10 +263,13 @@ in
         inherit StateDirectory;
         StateDirectoryMode = "0700";
         SystemCallArchitectures = "native";
-        SystemCallFilter = [
-          "@system-service"
-          "~@privileged"
-        ];
+        SystemCallFilter =
+          [
+            "@system-service"
+          ]
+          ++ lib.optionals (!useSendmail) [
+            "~@privileged"
+          ];
         Restart = "always";
         UMask = "0077";
       };

From 9fea0529e5d3d19a37463ea66e53845d020b9c5c Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Fri, 21 Mar 2025 16:08:09 -0300
Subject: [PATCH 002/225] ISSUE_TEMPLATES: remove the package request template

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 .github/ISSUE_TEMPLATE/05_package_request.yml | 108 ------------------
 ...date_request.yml => 05_update_request.yml} |   0
 ...dule_request.yml => 06_module_request.yml} |   0
 ...rt_request.yml => 07_backport_request.yml} |   0
 ...quest.yml => 08_documentation_request.yml} |   0
 ...kage.yml => 09_unreproducible_package.yml} |   0
 6 files changed, 108 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/05_package_request.yml
 rename .github/ISSUE_TEMPLATE/{06_update_request.yml => 05_update_request.yml} (100%)
 rename .github/ISSUE_TEMPLATE/{07_module_request.yml => 06_module_request.yml} (100%)
 rename .github/ISSUE_TEMPLATE/{08_backport_request.yml => 07_backport_request.yml} (100%)
 rename .github/ISSUE_TEMPLATE/{09_documentation_request.yml => 08_documentation_request.yml} (100%)
 rename .github/ISSUE_TEMPLATE/{10_unreproducible_package.yml => 09_unreproducible_package.yml} (100%)

diff --git a/.github/ISSUE_TEMPLATE/05_package_request.yml b/.github/ISSUE_TEMPLATE/05_package_request.yml
deleted file mode 100644
index b73360a91cb4..000000000000
--- a/.github/ISSUE_TEMPLATE/05_package_request.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-name: "Request: new package"
-description: "Create a package request for software that is not yet included in Nixpkgs."
-title: "Package request: PACKAGENAME"
-labels: ["0.kind: enhancement", "0.kind: packaging request", "9.needs: package (new)"]
-body:
-  - type: "markdown"
-    attributes:
-      value: |
-        <p align="center">
-          <a href="https://nixos.org">
-            <picture>
-              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png">
-              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
-              <img src="https://raw.githubusercontent.com/NixOS/nixos-homepage/main/public/logo/nixos-hires.png" width="400px" alt="NixOS logo">
-            </picture>
-          </a>
-        </p>
-
-        Welcome to Nixpkgs. Please replace the **`Package request: PACKAGENAME`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)).
-
-        > [!TIP]
-        > For instance, if you were filing a request against the missing `hello` package, your title would be as follows:
-        > `Package request: hello`
-
-        ---
-  - type: "textarea"
-    id: "description"
-    attributes:
-      label: "Describe the package"
-      description: "Please include a clear and concise description of what the package is."
-    validations:
-      required: true
-  - type: "input"
-    id: "homepage"
-    attributes:
-      label: "Upstream homepage"
-      description: "Please copy and paste a link to the package's homepage."
-    validations:
-      required: true
-  - type: "input"
-    id: "source"
-    attributes:
-      label: "Source URL"
-      description: "Please copy and paste a link to the package's source code or binary download page."
-    validations:
-      required: true
-  - type: "input"
-    id: "license"
-    attributes:
-      label: "License"
-      description: "Please indicate the package's license. If the package has no license, or the source code is not public, please indicate the package is `unfree`."
-    validations:
-      required: true
-  - type: "dropdown"
-    id: "platforms"
-    attributes:
-      label: "Platforms"
-      description: "Please indicate the platforms this package compiles for. `darwin` refers to macOS. `Exotic` refers to uncommon platforms like RISC-V or 32-bit ARM; please mention in the 'Additional Context' section below if this package is supposed to compile for such exotic platforms."
-      multiple: true
-      options:
-        - "x86_64-linux"
-        - "aarch64-linux"
-        - "x86_64-darwin"
-        - "aarch64-darwin"
-        - "Exotic"
-  - type: "textarea"
-    id: "additional-context"
-    attributes:
-      label: "Additional context"
-      description: "Add any other context about the proposed module here."
-    validations:
-      required: false
-  - type: "checkboxes"
-    id: "sanity-check"
-    attributes:
-      label: "I assert that this issue is relevant for Nixpkgs"
-      options:
-        - label: "I assert that this package does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+package+%28new%29%22) or in [Nixpkgs Unstable](https://search.nixos.org/packages?channel=unstable)."
-          required: true
-        - label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%220.kind%3A+packaging+request%22)."
-          required: true
-        - label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
-          required: true
-  - type: "markdown"
-    attributes:
-      value: |
-        # Thank you for helping improve Nixpkgs!
-
-        ---
-  - type: "textarea"
-    id: "prioritisation"
-    attributes:
-      label: "For this package's maintainers:"
-      description: |
-        **Please do not modify this text area!**
-
-        This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction and also reminds them to tag this issue in their pull requests.
-        This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important.
-      value: |
-
-        Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
-
-        ---
-
-        Add a :+1: [reaction] to [issues you find important].
-
-        [reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
-        [issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc
diff --git a/.github/ISSUE_TEMPLATE/06_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/06_update_request.yml
rename to .github/ISSUE_TEMPLATE/05_update_request.yml
diff --git a/.github/ISSUE_TEMPLATE/07_module_request.yml b/.github/ISSUE_TEMPLATE/06_module_request.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/07_module_request.yml
rename to .github/ISSUE_TEMPLATE/06_module_request.yml
diff --git a/.github/ISSUE_TEMPLATE/08_backport_request.yml b/.github/ISSUE_TEMPLATE/07_backport_request.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/08_backport_request.yml
rename to .github/ISSUE_TEMPLATE/07_backport_request.yml
diff --git a/.github/ISSUE_TEMPLATE/09_documentation_request.yml b/.github/ISSUE_TEMPLATE/08_documentation_request.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/09_documentation_request.yml
rename to .github/ISSUE_TEMPLATE/08_documentation_request.yml
diff --git a/.github/ISSUE_TEMPLATE/10_unreproducible_package.yml b/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/10_unreproducible_package.yml
rename to .github/ISSUE_TEMPLATE/09_unreproducible_package.yml

From 46f89abe85595337c558284c0f23f69b20cb6487 Mon Sep 17 00:00:00 2001
From: Daru <mica.tui@proton.me>
Date: Sat, 22 Mar 2025 16:49:55 +0200
Subject: [PATCH 003/225] ashell: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/by-name/as/ashell/package.nix b/pkgs/by-name/as/ashell/package.nix
index f89bd96f66c4..a270b3fb92a2 100644
--- a/pkgs/by-name/as/ashell/package.nix
+++ b/pkgs/by-name/as/ashell/package.nix
@@ -9,20 +9,22 @@
   pipewire,
   libpulseaudio,
   wayland,
+  udev,
+  vulkan-loader,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "ashell";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "MalpenZibo";
     repo = "ashell";
     tag = version;
-    hash = "sha256-a0yvmAq/4TDe+W1FLeLPSLppX81G6fdAOhzDmDJg3II=";
+    hash = "sha256-J97MRYYkNx8Ze4vcxZTDVOSQLCANyIBcDtqZEsEZ80w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Vh/+4iApi+03ZmMIDSXc9Mn408v3wC+WlNJsXNcva+Q=";
+  cargoHash = "sha256-XDcCCKq/NOzaKTDwVu0GCeGV70IlJ2TvD0w8ib+lEhg=";
 
   nativeBuildInputs = [
     pkg-config
@@ -33,12 +35,14 @@ rustPlatform.buildRustPackage rec {
   runtimeDependencies = [
     wayland
     libGL
+    vulkan-loader
   ];
 
   buildInputs = [
     libpulseaudio
     libxkbcommon
     pipewire
+    udev
   ] ++ runtimeDependencies;
 
   meta = {

From 32d4da5cbf64d65979dca96553197290dc2cb1a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 17:26:21 +0000
Subject: [PATCH 004/225] autobrr: 1.59.0 -> 1.60.0

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

diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix
index 13d5453eda32..89d456a0cc9e 100644
--- a/pkgs/by-name/au/autobrr/package.nix
+++ b/pkgs/by-name/au/autobrr/package.nix
@@ -13,12 +13,12 @@
 
 let
   pname = "autobrr";
-  version = "1.59.0";
+  version = "1.60.0";
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "autobrr";
     tag = "v${version}";
-    hash = "sha256-etVhOgE8H8bWuraBepwDSZZzo9Xl819w2sT+UwpUVjM=";
+    hash = "sha256-HaNaVxOtlzquKvWmUzUELtv0ZQZ+C/G5ni9/QbOlAh4=";
   };
 
   autobrr-web = stdenvNoCC.mkDerivation {

From eaec6a5eaffafa7929531f81a5c9df4995c439a5 Mon Sep 17 00:00:00 2001
From: thiloho <123883702+thiloho@users.noreply.github.com>
Date: Mon, 24 Mar 2025 11:41:04 +0100
Subject: [PATCH 005/225] archtika: fix update script by passing src to
 passthru

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

diff --git a/pkgs/by-name/ar/archtika/package.nix b/pkgs/by-name/ar/archtika/package.nix
index c59c95e9516e..979126012985 100644
--- a/pkgs/by-name/ar/archtika/package.nix
+++ b/pkgs/by-name/ar/archtika/package.nix
@@ -9,13 +9,13 @@
 }:
 
 let
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "archtika";
     repo = "archtika";
     tag = "v${version}";
-    hash = "sha256-ba9da7LqCE/e2lhRVHD7GOhwOj1fNTBbN/pARPMzIg4=";
+    hash = "sha256-GffYAtLs12v2Lt1WoKJOG5dZsmzDcySZKFBQwCT9nnY=";
   };
 
   web = buildNpmPackage {
@@ -50,7 +50,10 @@ symlinkJoin {
     api
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    inherit src;
+    updateScript = nix-update-script { };
+  };
 
   meta = {
     description = "Modern, performant and lightweight CMS";

From 6cc803093ca90f4f8885fb513eae10f4e44f5470 Mon Sep 17 00:00:00 2001
From: thiloho <123883702+thiloho@users.noreply.github.com>
Date: Mon, 24 Mar 2025 11:45:34 +0100
Subject: [PATCH 006/225] nixos/archtika: fix mkEnableOption naming

---
 nixos/modules/services/web-apps/archtika.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/archtika.nix b/nixos/modules/services/web-apps/archtika.nix
index cfd80dfb064f..0367d52451cb 100644
--- a/nixos/modules/services/web-apps/archtika.nix
+++ b/nixos/modules/services/web-apps/archtika.nix
@@ -17,7 +17,7 @@ let
 in
 {
   options.services.archtika = {
-    enable = mkEnableOption "Whether to enable the archtika service";
+    enable = mkEnableOption "the archtika CMS";
 
     package = mkPackageOption pkgs "archtika" { };
 

From 2c916c0352c301253c75233232673290f5db76ce Mon Sep 17 00:00:00 2001
From: thiloho <123883702+thiloho@users.noreply.github.com>
Date: Mon, 24 Mar 2025 12:12:44 +0100
Subject: [PATCH 007/225] archtika: also pass web to passthru to update
 npmDepsHash

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

diff --git a/pkgs/by-name/ar/archtika/package.nix b/pkgs/by-name/ar/archtika/package.nix
index 979126012985..51d948b6c7d3 100644
--- a/pkgs/by-name/ar/archtika/package.nix
+++ b/pkgs/by-name/ar/archtika/package.nix
@@ -21,7 +21,7 @@ let
   web = buildNpmPackage {
     name = "web-app";
     src = "${src}/web-app";
-    npmDepsHash = "sha256-RTyo7K/Hr1hBGtcBKynrziUInl91JqZl84NkJg16ufA=";
+    npmDepsHash = "sha256-2udi8vLLvdoZxIyRKLOCfEpEMsooxsIrM1wiua1QPAI=";
     npmFlags = [ "--legacy-peer-deps" ];
     installPhase = ''
       mkdir -p $out/web-app
@@ -51,7 +51,7 @@ symlinkJoin {
   ];
 
   passthru = {
-    inherit src;
+    inherit src web;
     updateScript = nix-update-script { };
   };
 

From 3c6a660329bc3a6b667963bec0a0e6ce064d6745 Mon Sep 17 00:00:00 2001
From: Silvio Ankermann <silvio@booq.org>
Date: Thu, 20 Mar 2025 01:21:11 +0100
Subject: [PATCH 008/225] openstack-rs: init at 0.10.0

---
 pkgs/by-name/op/openstack-rs/package.nix | 48 ++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 pkgs/by-name/op/openstack-rs/package.nix

diff --git a/pkgs/by-name/op/openstack-rs/package.nix b/pkgs/by-name/op/openstack-rs/package.nix
new file mode 100644
index 000000000000..54ba07dbecb0
--- /dev/null
+++ b/pkgs/by-name/op/openstack-rs/package.nix
@@ -0,0 +1,48 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  installShellFiles,
+  versionCheckHook,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "openstack-rs";
+  version = "0.10.0";
+  src = fetchFromGitHub {
+    owner = "gtema";
+    repo = "openstack";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-NDiqIhpKP7iGEAgAnaBekqjjWM7KqZPpdtPu/mEp1NU=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-S4FivjHkWC5tA1l4cheJsTECRfv8zyQbR88BqCeKFuc=";
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd osc \
+      --bash <($out/bin/osc completion bash) \
+      --fish <($out/bin/osc completion fish) \
+      --zsh <($out/bin/osc completion zsh)
+  '';
+
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "OpenStack CLI and TUI implemented in Rust";
+    homepage = "https://github.com/gtema/openstack";
+    changelog = "https://github.com/gtema/openstack/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ lykos153 ];
+    mainProgram = "osc";
+  };
+})

From 9497f7371ee2afe743c032742bfb6620f0fc414b Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Wed, 26 Mar 2025 09:05:22 +0100
Subject: [PATCH 009/225] qgis-ltr: 3.40.4 -> 3.40.5

---
 pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index ef8e21463fa1..74de2b190b42 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -82,14 +82,14 @@ let
   ];
 in
 mkDerivation rec {
-  version = "3.40.4";
+  version = "3.40.5";
   pname = "qgis-ltr-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-R2/ycRPQVKqleSt+9D/YCpBlqKgJdhLc0BvYT7qFJo8=";
+    hash = "sha256-YVHNB4vdLw8RZir4UydTijztzx58aXBLJk+lA0K9y+4=";
   };
 
   passthru = {

From 851518527041028a696f065481e40f292f1b3821 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 22:43:56 +0000
Subject: [PATCH 010/225] yafc-ce: 2.10.0 -> 2.11.0

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

diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
index 164cd559b1e4..0d8ebe02570f 100644
--- a/pkgs/by-name/ya/yafc-ce/package.nix
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -12,13 +12,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   pname = "yafc-ce";
-  version = "2.10.0";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     owner = "shpaass";
     repo = "yafc-ce";
     rev = finalAttrs.version;
-    hash = "sha256-AFFu4yqnBq0OD3XY1V97zxAIfZuXswT9KOJzU8GqQuU";
+    hash = "sha256-jWJOJ00VXBaHogm3xUsV9Shvv9islRA+Z4fkln5VuWM=";
   };
 
   projectFile = [ "Yafc/Yafc.csproj" ];

From 7605633c219a4b3900b49cb1aaf3dafd562d80dc Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Fri, 28 Mar 2025 14:35:35 +0100
Subject: [PATCH 011/225] python313Packages.msmart-ng: 2025.3.1 -> 2025.3.3

https://github.com/mill1000/midea-msmart/releases/tag/2025.3.2

https://github.com/mill1000/midea-msmart/releases/tag/2025.3.3

This also reverts the pep639 license format change in pyproject.toml
because setuptools has yet to implement pep639.
---
 .../python-modules/msmart-ng/default.nix         | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/msmart-ng/default.nix b/pkgs/development/python-modules/msmart-ng/default.nix
index 0f01c755834f..8d1983474e18 100644
--- a/pkgs/development/python-modules/msmart-ng/default.nix
+++ b/pkgs/development/python-modules/msmart-ng/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
 
   # build-system
   setuptools,
@@ -17,16 +18,27 @@
 
 buildPythonPackage rec {
   pname = "msmart-ng";
-  version = "2025.3.1";
+  version = "2025.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mill1000";
     repo = "midea-msmart";
     tag = version;
-    hash = "sha256-hTYqRJn/ixseHHezfTOG0UzdQmnpn4hACijYOMtwtT8=";
+    hash = "sha256-M8Gl6QXj0tRN7VFDhop47vINk8MeWSyCJ9bboo3j8Go=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      # Revert <https://github.com/mill1000/midea-msmart/pull/209> until setuptools
+      # implements support for <https://peps.python.org/pep-0639/>.
+      name = "revert-pyproject-license-declaration-pep639-syntax.patch";
+      url = "https://github.com/mill1000/midea-msmart/commit/e5d6a982135e497c251095e421d3de4686f36056.patch?full_index=1";
+      hash = "sha256-+mxmFGZd04MZY2C5eo4k1lFoXsM8XyeJNazShnjAseE=";
+      revert = true;
+    })
+  ];
+
   build-system = [
     setuptools
     setuptools-scm

From c3b36902e41b61f7514182138cd121fda749d33b Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Fri, 28 Mar 2025 14:38:20 +0100
Subject: [PATCH 012/225] home-assistant-custom-components.midea_ac: 2025.3.0
 -> 2025.3.1

https://github.com/mill1000/midea-ac-py/releases/tag/2025.3.1
---
 .../home-assistant/custom-components/midea_ac/package.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
index 8588b6045e72..9befc39ade5e 100644
--- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "mill1000";
   domain = "midea_ac";
-  version = "2025.3.0";
+  version = "2025.3.1";
 
   src = fetchFromGitHub {
     owner = "mill1000";
     repo = "midea-ac-py";
     tag = version;
-    hash = "sha256-UJS9z+t+Tb/w7yRHKXJ6HoQ4uS1guM8PYl0OcLz4EJM=";
+    hash = "sha256-oO+t0my72PwWWUAzr8blA3Q8uJyICZNcfoOHsLFL3MQ=";
   };
 
   dependencies = [ msmart-ng ];

From 3029bd758b4ff3a240bead21c3491a51759a6ccd Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Wed, 19 Mar 2025 17:59:53 -0700
Subject: [PATCH 013/225] lixPackageSets.lix_2_92: init

This adapts #375030 now that #391402 is merged, as are the `editline`
(#391425, #391426) and `capnproto` (#391424) packaging updates.

This introduces https://lix.systems/blog/2025-01-18-lix-2.92-release/ in
nixpkgs.

This new release introduces a bunch of changes at the packaging level,
reliant on new features of Meson, new features of some of our
dependencies which are done in previous commits (editline & capnproto).

The approach taken here is that it's OK to add more dependencies than
required for older versions but not OK to break them.

Moreover, Lix is now load-bearing dependent on the Clang stdenv, it
cannot be compiled with GCC anymore.

An escape hatch is included but if this escape hatch is used, the user
is on its own and should probably work with GCC upstream to fix
miscompilations.
---
 .../package-management/lix/common-lix.nix     | 88 +++++++++++++++++--
 .../lix/common-nix-eval-jobs.nix              |  5 +-
 pkgs/tools/package-management/lix/default.nix | 56 +++++++++++-
 3 files changed, 136 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index 2e23c9c9e049..b9077e7672d4 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -3,11 +3,22 @@
   suffix ? "",
   version,
   src,
-  docCargoDeps,
+  # For Lix versions >= 2.92, Rust sources are in the Lix repository root.
+  cargoDeps ? null,
+  # For previous versions, Rust sources are only in a subdirectory for
+  # `lix-doc`.
+  docCargoDeps ? null,
   patches ? [ ],
   maintainers ? lib.teams.lix.members,
 }@args:
 
+assert lib.assertMsg (
+  lib.versionOlder version "2.92" -> docCargoDeps != null
+) "`lix-doc` `cargoDeps` must be set for Lix < 2.92";
+assert lib.assertMsg (
+  lib.versionAtLeast version "2.92" -> cargoDeps != null
+) "`cargoDeps` must be set for Lix ≥ 2.92";
+
 {
   stdenv,
   meson,
@@ -18,6 +29,8 @@
   busybox-sandbox-shell,
   bzip2,
   callPackage,
+  capnproto,
+  cargo,
   curl,
   cmake,
   doxygen,
@@ -30,6 +43,7 @@
   libarchive,
   libcpuid,
   libsodium,
+  llvmPackages,
   lowdown,
   lowdown-unsandboxed,
   lsof,
@@ -39,6 +53,7 @@
   nlohmann_json,
   ninja,
   openssl,
+  rustc,
   toml11,
   pegtl,
   python3,
@@ -47,8 +62,11 @@
   Security,
   sqlite,
   util-linuxMinimal,
+  removeReferencesTo,
   xz,
   nixosTests,
+  rustPlatform,
+  # Only used for versions before 2.92.
   lix-doc ? callPackage ./doc {
     inherit src;
     version = "${version}${suffix}";
@@ -57,6 +75,7 @@
 
   enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform,
   enableStatic ? stdenv.hostPlatform.isStatic,
+  enableStrictLLVMChecks ? true,
   withAWS ? !enableStatic && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin),
   aws-sdk-cpp,
   # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
@@ -67,11 +86,16 @@
   stateDir,
   storeDir,
 }:
-
 let
+  isLLVMOnly = lib.versionAtLeast version "2.92";
+  hasExternalLixDoc = lib.versionOlder version "2.92";
   isLegacyParser = lib.versionOlder version "2.91";
 in
-stdenv.mkDerivation {
+# gcc miscompiles coroutines at least until 13.2, possibly longer
+# do not remove this check unless you are sure you (or your users) will not report bugs to Lix upstream about GCC miscompilations.
+assert lib.assertMsg (enableStrictLLVMChecks && isLLVMOnly -> stdenv.cc.isClang)
+  "Lix upstream strongly discourage the usage of GCC to compile Lix as there's known miscompilations in important places. If you are a compiler developer, please get in touch with us.";
+stdenv.mkDerivation (finalAttrs: {
   pname = "lix";
 
   version = "${version}${suffix}";
@@ -91,9 +115,24 @@ stdenv.mkDerivation {
     ];
 
   strictDeps = true;
+  disallowedReferences = lib.optionals isLLVMOnly [
+    # We don't want the Clang.
+    stdenv.cc.cc
+    # We don't want the underlying GCC neither!
+    stdenv.cc.cc.stdenv.cc.cc
+  ];
+
+  # We only include CMake so that Meson can locate toml11, which only ships CMake dependency metadata.
+  dontUseCmakeConfigure = true;
 
   nativeBuildInputs =
     [
+      # python3.withPackages does not splice properly, see https://github.com/NixOS/nixpkgs/issues/305858
+      (python3.pythonOnBuildForHost.withPackages (p: [
+        p.pytest
+        p.pytest-xdist
+        p.python-frontmatter
+      ]))
       pkg-config
       flex
       jq
@@ -101,6 +140,8 @@ stdenv.mkDerivation {
       ninja
       cmake
       python3
+      # Required for libstd++ assertions that leaks inside of the final binary.
+      removeReferencesTo
 
       # Tests
       git
@@ -108,6 +149,11 @@ stdenv.mkDerivation {
       jq
       lsof
     ]
+    ++ lib.optionals isLLVMOnly [
+      rustc
+      cargo
+      rustPlatform.cargoSetupHook
+    ]
     ++ lib.optionals isLegacyParser [ bison ]
     ++ lib.optionals enableDocumentation [
       (lib.getBin lowdown-unsandboxed)
@@ -123,6 +169,7 @@ stdenv.mkDerivation {
       brotli
       bzip2
       curl
+      capnproto
       editline
       libsodium
       openssl
@@ -133,14 +180,31 @@ stdenv.mkDerivation {
       lowdown
       rapidcheck
       toml11
-      lix-doc
     ]
+    ++ lib.optionals hasExternalLixDoc [ lix-doc ]
     ++ lib.optionals (!isLegacyParser) [ pegtl ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]
+    # NOTE(Raito): I'd have expected that the LLVM packaging would inject the
+    # libunwind library path directly in the wrappers, but it does inject
+    # -lunwind without injecting the library path...
+    ++ lib.optionals stdenv.hostPlatform.isStatic [ llvmPackages.libunwind ]
     ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ libcpuid ]
     ++ lib.optionals withLibseccomp [ libseccomp ]
     ++ lib.optionals withAWS [ aws-sdk-cpp ];
 
+  inherit cargoDeps;
+
+  env = {
+    # Meson allows referencing a /usr/share/cargo/registry shaped thing for subproject sources.
+    # Turns out the Nix-generated Cargo dependencies are named the same as they
+    # would be in a Cargo registry cache.
+    MESON_PACKAGE_CACHE_DIR =
+      if finalAttrs.cargoDeps != null then
+        finalAttrs.cargoDeps
+      else
+        "lix: no `MESON_PACKAGE_CACHE_DIR`, set `cargoDeps`";
+  };
+
   propagatedBuildInputs = [
     boehmgc
     nlohmann_json
@@ -179,8 +243,9 @@ stdenv.mkDerivation {
   mesonFlags =
     [
       # Enable LTO, since it improves eval performance a fair amount
-      # LTO is disabled on static due to strange linking errors
-      (lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic && stdenv.cc.isGNU))
+      # LTO is disabled on:
+      # - static builds (strange linkage errors)
+      (lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic && (isLLVMOnly || stdenv.cc.isGNU)))
       (lib.mesonEnable "gc" true)
       (lib.mesonBool "enable-tests" true)
       (lib.mesonBool "enable-docs" enableDocumentation)
@@ -208,6 +273,11 @@ stdenv.mkDerivation {
       mkdir -p $devdoc/nix-support
       echo "devdoc internal-api $devdoc/share/doc/nix/internal-api" >> $devdoc/nix-support/hydra-build-products
     ''
+    + lib.optionalString (!hasExternalLixDoc) ''
+      # We do not need static archives.
+      # FIXME(Raito): why are they getting installed _at all_ ?
+      rm $out/lib/liblix_doc.a
+    ''
     + lib.optionalString stdenv.hostPlatform.isStatic ''
       mkdir -p $out/nix-support
       echo "file binary-dist $out/bin/nix" >> $out/nix-support/hydra-build-products
@@ -219,6 +289,10 @@ stdenv.mkDerivation {
           "$out/lib/libboost_context.dylib" \
           "$out/lib/$lib"
       done
+    ''
+    + ''
+      # Drop all references to libstd++ include files due to `__FILE__` leaking in libstd++ assertions.
+      find "$out" -type f -exec remove-references-to -t ${stdenv.cc.cc.stdenv.cc.cc} '{}' +
     '';
 
   # This needs to run after _multioutDocs moves the docs to $doc
@@ -299,4 +373,4 @@ stdenv.mkDerivation {
     outputsToInstall = [ "out" ] ++ lib.optional enableDocumentation "man";
     mainProgram = "nix";
   };
-}
+})
diff --git a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
index f80353d1754f..d3be7a626d97 100644
--- a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
+++ b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix
@@ -17,7 +17,7 @@
   pkg-config,
   ninja,
   cmake,
-  clang-tools,
+  buildPackages,
 }:
 
 stdenv.mkDerivation {
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     ninja
     # nlohmann_json can be only discovered via cmake files
     cmake
-  ] ++ (lib.optional stdenv.cc.isClang [ clang-tools ]);
+  ] ++ (lib.optional stdenv.cc.isClang [ buildPackages.clang-tools ]);
 
   # point 'nix edit' and ofborg at the file that defines the attribute,
   # not this common file.
@@ -52,5 +52,6 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl3;
     inherit maintainers;
     platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isStatic;
   };
 }
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 5c351b2542a2..30025e74b3bb 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -8,6 +8,10 @@
   rustPlatform,
   Security,
   newScope,
+  editline,
+  ncurses,
+  stdenv,
+  clangStdenv,
 
   storeDir ? "/nix/store",
   stateDir ? "/nix/var",
@@ -19,6 +23,10 @@ let
       lix-args,
       nix-eval-jobs-args,
     }:
+    let
+      # GCC 13.2 is known to miscompile Lix coroutines (introduced in 2.92).
+      lixStdenv = if lib.versionAtLeast lix-args.version "2.92" then clangStdenv else stdenv;
+    in
     lib.makeScope newScope (
       self:
       lib.recurseIntoAttrs {
@@ -58,6 +66,11 @@ let
               requiredSystemFeatures = [ ];
             };
 
+        editline = editline.override {
+          inherit ncurses;
+          enableTermcap = true;
+        };
+
         # NOTE: The `common-*.nix` helpers contain a top-level function which
         # takes the Lix source to build and version information. We use the
         # outer `callPackage` for that.
@@ -65,12 +78,15 @@ let
         # That *returns* another function which takes the actual build
         # dependencies, and that uses the new scope's `self.callPackage` so
         # that `nix-eval-jobs` can be built against the correct `lix` version.
-        lix = self.callPackage (callPackage ./common-lix.nix lix-args) { };
+        lix = self.callPackage (callPackage ./common-lix.nix lix-args) {
+          stdenv = lixStdenv;
+        };
 
-        nix-eval-jobs = self.callPackage (callPackage ./common-nix-eval-jobs.nix nix-eval-jobs-args) { };
+        nix-eval-jobs = self.callPackage (callPackage ./common-nix-eval-jobs.nix nix-eval-jobs-args) {
+          stdenv = lixStdenv;
+        };
       }
     );
-
 in
 lib.makeExtensible (self: {
   inherit makeLixScope;
@@ -137,7 +153,39 @@ lib.makeExtensible (self: {
     };
   };
 
-  latest = self.lix_2_91;
+  lix_2_92 = self.makeLixScope {
+    lix-args = rec {
+      version = "2.92.0";
+
+      src = fetchFromGitHub {
+        owner = "lix-project";
+        repo = "lix";
+        rev = version;
+        hash = "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=";
+      };
+
+      cargoDeps = rustPlatform.fetchCargoVendor {
+        name = "lix-${version}";
+        inherit src;
+        allowGitDependencies = false;
+        hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8=";
+      };
+    };
+
+    nix-eval-jobs-args = rec {
+      version = "2.92.0";
+      src = fetchgit {
+        url = "https://git.lix.systems/lix-project/nix-eval-jobs.git";
+        rev = version;
+        hash = "sha256-tPr61X9v/OMVt7VXOs1RRStciwN8gDGxEKx+h0/Fg48=";
+      };
+    };
+  };
+
+  latest = self.lix_2_92;
+
+  # Note: This is not yet 2.92 because of a non-deterministic `curl` error.
+  # See: https://git.lix.systems/lix-project/lix/issues/662
   stable = self.lix_2_91;
 
   # Previously, `nix-eval-jobs` was not packaged here, so we export an

From 0d079338b2f5e681304215e901eebf9e9cb1dd58 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Sun, 16 Feb 2025 17:52:58 +0100
Subject: [PATCH 014/225] nixos/tests/installer: introduce `lix-simple` variant

An installer tests exacerbates the distribution packaging but in the
case of NixOS: the Nix package manager implementation.

As part of our classical release management process, the Lix team tests
whether a NixOS system installs just fine with Lix or not.

To avoid bloating the CI needlessly and keeping it simple, we only
introduce it on the simple variant and give a general way to pipe a Nix
implementation inside of an installer test.

Change-Id: I781da14475867dc2d946b740bad10af5de79ec5a
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 nixos/tests/installer.nix                        | 5 +++++
 pkgs/tools/package-management/lix/common-lix.nix | 1 +
 2 files changed, 6 insertions(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 6be3346d9850..db9fccaa2bb4 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -638,6 +638,7 @@ let
       clevisTest ? false,
       clevisFallbackTest ? false,
       disableFileSystems ? false,
+      selectNixPackage ? pkgs: pkgs.nixStable,
     }:
     let
       isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
@@ -701,6 +702,7 @@ let
             virtualisation.rootDevice = "/dev/vdb";
 
             hardware.enableAllFirmware = mkForce false;
+            nix.package = selectNixPackage pkgs;
 
             # The test cannot access the network, so any packages we
             # need must be included in the VM.
@@ -1101,6 +1103,9 @@ in
   # The (almost) simplest partitioning scheme: a swap partition and
   # one big filesystem partition.
   simple = makeInstallerTest "simple" simple-test-config;
+  lix-simple = makeInstallerTest "simple" simple-test-config // {
+    selectNixPackage = pkgs: pkgs.lix;
+  };
 
   switchToFlake = makeInstallerTest "switch-to-flake" simple-test-config-flake;
 
diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index b9077e7672d4..6f819fb734ef 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -351,6 +351,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit aws-sdk-cpp boehmgc;
     tests = {
       misc = nixosTests.nix-misc.lix;
+      installer = nixosTests.installer.lix-simple;
     };
   };
 

From e34de710576078bf6fef73c82f365a62bce7a679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20=C5=BDlender?= <pub.git@zlender.si>
Date: Sat, 29 Mar 2025 09:48:07 +0100
Subject: [PATCH 015/225] rdkafka: fix cross-compilation

---
 pkgs/by-name/rd/rdkafka/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/rd/rdkafka/package.nix b/pkgs/by-name/rd/rdkafka/package.nix
index c07800cebd6d..104c967406ab 100644
--- a/pkgs/by-name/rd/rdkafka/package.nix
+++ b/pkgs/by-name/rd/rdkafka/package.nix
@@ -8,6 +8,7 @@
   curl,
   cmake,
   ninja,
+  deterministic-host-uname,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -29,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ninja
+    # cross: build system uses uname to determine host system
+    deterministic-host-uname
   ];
 
   buildInputs = [

From 5929ce550c80c947820835faa4d31137b70ca39d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Mar 2025 11:18:06 +0000
Subject: [PATCH 016/225] mapproxy: 3.1.3 -> 4.0.1

* drop python 3.8 support
* drop Riak warnings (support dropped by upstream)
* avoid usage of top level `with`
---
 pkgs/by-name/ma/mapproxy/package.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix
index 75a6ecac099c..8c81b04f3b8b 100644
--- a/pkgs/by-name/ma/mapproxy/package.nix
+++ b/pkgs/by-name/ma/mapproxy/package.nix
@@ -1,26 +1,27 @@
 {
   lib,
-  python3,
   fetchFromGitHub,
+
+  python3Packages,
 }:
 
-with python3.pkgs;
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "mapproxy";
-  version = "3.1.3";
+  version = "4.0.1";
+  disabled = python3Packages.pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "mapproxy";
     repo = "mapproxy";
     tag = version;
-    hash = "sha256-Dltr4JlgE1aJfSybTbAxlUyjqkfaobupNNSj90j9taE=";
+    hash = "sha256-bqM25exBPUB7hFtseWMw4Q1W6IeHLx+JrplOkZVEIl0=";
   };
 
   prePatch = ''
     substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
   '';
 
-  dependencies = [
+  dependencies = with python3Packages; [
     boto3 # needed for caches service
     future
     jsonschema
@@ -33,13 +34,10 @@ buildPythonApplication rec {
     setuptools
     werkzeug
   ];
+
   # Tests are disabled:
   # 1) Dependency list is huge.
   #    https://github.com/mapproxy/mapproxy/blob/master/requirements-tests.txt
-  #
-  # 2) There are security issues with package Riak
-  #    https://github.com/NixOS/nixpkgs/issues/33876
-  #    https://github.com/NixOS/nixpkgs/pull/56480
   doCheck = false;
 
   meta = {

From d7d3b94a85bf58cc7722424289f31223b94fe5b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Mar 2025 17:48:44 +0000
Subject: [PATCH 017/225] microsoft-edge: 134.0.3124.68 -> 134.0.3124.95

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

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index d8194599d9d5..3026e499b6d7 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -174,11 +174,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "134.0.3124.68";
+  version = "134.0.3124.95";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-zjN8ssVeR3yyw+e6tVzcrrYkLToo8Rmm4GjcG9iQMpk=";
+    hash = "sha256-vgTJl9BmMdm4Aw1FCpIfqzfmgsLuY61G/RSkA66kPhI=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From afaa567e52106ee2d9d3a79075fc10ff79aee612 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 30 Mar 2025 17:53:01 +0200
Subject: [PATCH 018/225] docker_27: sync runc and containerd versions with
 upstream

https://github.com/moby/moby/tree/v27.5.1/hack/dockerfile/install/
---
 pkgs/applications/virtualization/docker/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 7da73350e68d..12bed92f528a 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -299,10 +299,10 @@ rec {
     cliHash = "sha256-7laxRfssh2aGfJeZI0PsJ/MCiy2npigSmCa1SUlWY4s=";
     mobyRev = "v${version}";
     mobyHash = "sha256-q+VCJZ93jvPJQE0xn89prH/6spsarVY3VUEmgwyMxU4=";
-    runcRev = "v1.2.3";
-    runcHash = "sha256-SdeCmPttMXQdIn3kGWsIM3dfhQCx1C5bMyAM889VVUc=";
-    containerdRev = "v1.7.24";
-    containerdHash = "sha256-03vJs61AnTuFAdImZjBfn1izFcoalVJdVs9DZeDcABI=";
+    runcRev = "v1.2.4";
+    runcHash = "sha256-LdYCMxdqDP7rKo6Ek/B1DE6QvUFrltbSJVggkVkXQZo=";
+    containerdRev = "v1.7.25";
+    containerdHash = "sha256-T0F5bwxSCqa4Czs/W01NaAlJJFvgrzkBC1y/r+muivA=";
     tiniRev = "v0.19.0";
     tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
   };

From 9f74f685f797705c78429a15e092e287f0173712 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 30 Mar 2025 17:54:34 +0200
Subject: [PATCH 019/225] docker_25: 25.0.6 -> 25.0.8

https://github.com/docker/cli/compare/v25.0.6...v25.0.8
https://github.com/moby/moby/compare/v25.0.6...v25.0.8

Milestones / Changelogs:
25.0.7
https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A25.0.7
https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A25.0.7
25.0.8
https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A25.0.8
https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A25.0.8
---
 .../virtualization/docker/default.nix          | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 7da73350e68d..3bb242a97e72 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -266,15 +266,17 @@ rec {
   # Get revisions from
   # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
   docker_25 = callPackage dockerGen rec {
-    version = "25.0.6";
-    cliRev = "v${version}";
-    cliHash = "sha256-7ZKjlONL5RXEJZrvssrL1PQMNANP0qTw4myGKdtd19U=";
+    version = "25.0.8";
+    # Upstream forgot to tag release
+    # https://github.com/docker/cli/issues/5789
+    cliRev = "43987fca488a535d810c429f75743d8c7b63bf4f";
+    cliHash = "sha256-OwufdfuUPbPtgqfPeiKrQVkOOacU2g4ommHb770gV40=";
     mobyRev = "v${version}";
-    mobyHash = "sha256-+zkhUMeVD3HNq8WrWQmLskq+HykvD5kzSACmf67YbJE=";
-    runcRev = "v1.1.12";
-    runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0=";
-    containerdRev = "v1.7.20";
-    containerdHash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY=";
+    mobyHash = "sha256-n7GdjQEceqyC7E2sPXQWyxpRThtH35eM/J20yLa5NSs=";
+    runcRev = "v1.2.4";
+    runcHash = "sha256-LdYCMxdqDP7rKo6Ek/B1DE6QvUFrltbSJVggkVkXQZo=";
+    containerdRev = "v1.7.25";
+    containerdHash = "sha256-T0F5bwxSCqa4Czs/W01NaAlJJFvgrzkBC1y/r+muivA=";
     tiniRev = "v0.19.0";
     tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
   };

From d5b45a40334e00d5dee76ff04ff68091ab93b24c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 01:47:47 +0000
Subject: [PATCH 020/225] kanata-with-cmd: 1.8.0 -> 1.8.1

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

diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix
index e7521b252862..1b949d4efc1d 100644
--- a/pkgs/by-name/ka/kanata/package.nix
+++ b/pkgs/by-name/ka/kanata/package.nix
@@ -12,17 +12,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "kanata";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "jtroo";
     repo = "kanata";
     rev = "v${version}";
-    sha256 = "sha256-RTFP063NGNfjlOlZ4wghpcUQEmmj73Xlu3KPIxeUI/I=";
+    sha256 = "sha256-w/PeSqj51gJOWmAV5UPMprntdzinX/IL49D2ZUMfeSM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/r4u7pM7asCvG3LkbuP1Y63WVls1uZtV/L3cSOzUXr4=";
+  cargoHash = "sha256-T9fZxv3aujYparzVphfYBJ+5ti/T1VkeCeCqWPyllY8=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     apple-sdk_13

From 5b59c0e893303e92ffd0cccd504bd5bef699d0cf Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 1 Apr 2025 03:30:27 +0800
Subject: [PATCH 021/225] lnav: 0.12.3 -> 0.12.4

---
 pkgs/by-name/ln/lnav/package.nix | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix
index 9af958ac6723..3cf636be8240 100644
--- a/pkgs/by-name/ln/lnav/package.nix
+++ b/pkgs/by-name/ln/lnav/package.nix
@@ -19,24 +19,28 @@
   cargo,
   rustPlatform,
   rustc,
+  libunistring,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lnav";
-  version = "0.12.3";
+  version = "0.12.4";
 
   src = fetchFromGitHub {
     owner = "tstack";
     repo = "lnav";
-    rev = "v${version}";
-    sha256 = "sha256-m0r7LAo9pYFpS+oimVCNCipojxPzMMsLLjhjkitEwow=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-XS3/km2sJwRnWloLKu9X9z07+qBFRfUsaRpZVYjoclI=";
   };
 
   enableParallelBuilding = true;
+
   separateDebugInfo = true;
 
   strictDeps = true;
+
   depsBuildBuild = [ buildPackages.stdenv.cc ];
+
   nativeBuildInputs = [
     autoconf
     automake
@@ -47,6 +51,7 @@ stdenv.mkDerivation rec {
     rustPlatform.cargoSetupHook
     rustc
   ];
+
   buildInputs =
     [
       bzip2
@@ -56,14 +61,15 @@ stdenv.mkDerivation rec {
       sqlite
       curl
       libarchive
+      libunistring
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
       gpm
     ];
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    src = "${src}/src/third-party/prqlc-c";
-    hash = "sha256-jfmr6EuNW2mEHTEVHn6YnBDMzKxKI097vEFHXC4NT2Y=";
+    src = "${finalAttrs.src}/src/third-party/prqlc-c";
+    hash = "sha256-svi+C3ELw6Ly0mtji8xOv+DDqR0z5shFNazHa3kDQVg=";
   };
 
   cargoRoot = "src/third-party/prqlc-c";
@@ -74,7 +80,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/tstack/lnav";
     description = "Logfile Navigator";
     longDescription = ''
@@ -87,14 +93,13 @@ stdenv.mkDerivation rec {
       will allow the user to quickly and efficiently zero in on problems.
     '';
     downloadPage = "https://github.com/tstack/lnav/releases";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [
       dochang
       symphorien
       pcasaretto
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "lnav";
   };
-
-}
+})

From 922a4ab7808146b40563a9b433723f949a9b8635 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 31 Mar 2025 15:51:43 -0500
Subject: [PATCH 022/225] zdoom: Migrate to by-name

Remove zdoom and related packages from all-packages.nix
---
 .../zdoom => by-name/do/doom-bcc}/bcc-warning-fix.patch     | 0
 .../zdoom/bcc-git.nix => by-name/do/doom-bcc/package.nix}   | 0
 .../zdoom/zdbsp.nix => by-name/zd/zdbsp/package.nix}        | 0
 .../zdoom/default.nix => by-name/zd/zdoom/package.nix}      | 0
 pkgs/top-level/all-packages.nix                             | 6 ------
 5 files changed, 6 deletions(-)
 rename pkgs/{games/doom-ports/zdoom => by-name/do/doom-bcc}/bcc-warning-fix.patch (100%)
 rename pkgs/{games/doom-ports/zdoom/bcc-git.nix => by-name/do/doom-bcc/package.nix} (100%)
 rename pkgs/{games/doom-ports/zdoom/zdbsp.nix => by-name/zd/zdbsp/package.nix} (100%)
 rename pkgs/{games/doom-ports/zdoom/default.nix => by-name/zd/zdoom/package.nix} (100%)

diff --git a/pkgs/games/doom-ports/zdoom/bcc-warning-fix.patch b/pkgs/by-name/do/doom-bcc/bcc-warning-fix.patch
similarity index 100%
rename from pkgs/games/doom-ports/zdoom/bcc-warning-fix.patch
rename to pkgs/by-name/do/doom-bcc/bcc-warning-fix.patch
diff --git a/pkgs/games/doom-ports/zdoom/bcc-git.nix b/pkgs/by-name/do/doom-bcc/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/zdoom/bcc-git.nix
rename to pkgs/by-name/do/doom-bcc/package.nix
diff --git a/pkgs/games/doom-ports/zdoom/zdbsp.nix b/pkgs/by-name/zd/zdbsp/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/zdoom/zdbsp.nix
rename to pkgs/by-name/zd/zdbsp/package.nix
diff --git a/pkgs/games/doom-ports/zdoom/default.nix b/pkgs/by-name/zd/zdoom/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/zdoom/default.nix
rename to pkgs/by-name/zd/zdoom/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30280ebb977d..5d8d79fd0ecc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15612,12 +15612,6 @@ with pkgs;
 
   fmodex = callPackage ../games/doom-ports/zandronum/fmod.nix { };
 
-  doom-bcc = callPackage ../games/doom-ports/zdoom/bcc-git.nix { };
-
-  zdbsp = callPackage ../games/doom-ports/zdoom/zdbsp.nix { };
-
-  zdoom = callPackage ../games/doom-ports/zdoom { };
-
   pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { };
 
   qgo = libsForQt5.callPackage ../games/qgo { };

From 6a64f899e1a685bbb5e70135bb57452a72eb4f56 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 1 Apr 2025 08:15:34 +0200
Subject: [PATCH 023/225] 
 python3Packages.microsoft-security-utilities-secret-masker: 1.0.0b3 ->
 1.0.0b4

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../microsoft-security-utilities-secret-masker/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix b/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix
index ef2012371dd3..47b82bbac73c 100644
--- a/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix
+++ b/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "microsoft-security-utilities-secret-masker";
-  version = "1.0.0b3";
+  version = "1.0.0b4";
   pyproject = true;
 
   src = fetchPypi {
     pname = "microsoft_security_utilities_secret_masker";
     inherit version;
-    hash = "sha256-0EVIIwxno70stGCyjnH+bKwWj0jwbXapadnKR732c0M=";
+    hash = "sha256-owvTYawYyLUvaEQHa8JkZTNZSeqcegBNlfUZbsb97z4=";
   };
 
   build-system = [

From 0fdc2760084db2b6159696f39d13beffd591feed Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 1 Apr 2025 08:16:25 +0200
Subject: [PATCH 024/225] python3Packages.azure-mgmt-containerservice: 34.1.0
 -> 34.2.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../python-modules/azure-mgmt-containerservice/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index b246540e020d..b43388a22be4 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerservice";
-  version = "34.1.0";
+  version = "34.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_mgmt_containerservice";
     inherit version;
-    hash = "sha256-Y3ps+PBmNsAWrRUddvnHunW9BdQzSz3Xg364tRfzDb4=";
+    hash = "sha256-FB4F8UbyjNRiioMCfVFb0lPzsvhSO+Q7mEFwcRjvWoQ=";
   };
 
   build-system = [ setuptools ];

From fff8479088ded41cbc59a0051efe4484a2d4ef66 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 1 Apr 2025 08:16:59 +0200
Subject: [PATCH 025/225] python3Packages.azure-mgmt-keyvault: 10.3.1 -> 11.0.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../python-modules/azure-mgmt-keyvault/default.nix         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
index 4213abd86353..eeaeb6fb85b3 100644
--- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
@@ -11,14 +11,15 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-keyvault";
-  version = "10.3.1";
+  version = "11.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-NLkpVq773VccrloD9weOA32Ah7LADPpnSINdxzq7WjA=";
+    pname = "azure_mgmt_keyvault";
+    inherit version;
+    hash = "sha256-/PsTZoUpJvKjEeG8bmp4brioof1G5gJdTBFO3iy0ZC4=";
   };
 
   build-system = [ setuptools ];

From 2e0c384c45603051e69f0eba71e5590d6c620f4a Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 1 Apr 2025 08:17:25 +0200
Subject: [PATCH 026/225] python3Packages.azure-multiapi-storage: 1.3.0 ->
 1.4.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../python-modules/azure-multiapi-storage/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
index 600b5e515259..17d1a30156c2 100644
--- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix
+++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "azure-multiapi-storage";
-  version = "1.3.0";
+  version = "1.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tlKogIs39tIoMVl3p/YConfPdPrpX9oc9WqQ+FuhgQk=";
+    hash = "sha256-RfFd+1xL2ouWJ3NLXMcsRfQ215bi4ha+iCOcYXjND3E=";
   };
 
   build-system = [ setuptools ];

From 5ea3b8d92e2ab477b455175419d3162fe8592b31 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 1 Apr 2025 08:17:40 +0200
Subject: [PATCH 027/225] azure-cli: 2.70.0 -> 2.71.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/az/azure-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix
index 36adc81b5c16..65f4d5153f02 100644
--- a/pkgs/by-name/az/azure-cli/package.nix
+++ b/pkgs/by-name/az/azure-cli/package.nix
@@ -26,14 +26,14 @@
 }:
 
 let
-  version = "2.70.0";
+  version = "2.71.0";
 
   src = fetchFromGitHub {
     name = "azure-cli-${version}-src";
     owner = "Azure";
     repo = "azure-cli";
     rev = "azure-cli-${version}";
-    hash = "sha256-vvX/LkG8qA53AxVlvq7FSTqbVblvE5xbDq4V0SINCAk=";
+    hash = "sha256-vtuDgj3UJCmKxYg0OgG59ezQh7HlscNywz61BHDzJF8=";
   };
 
   # put packages that needs to be overridden in the py package scope

From e8dd02fe7906f53d57bf238dc178cdb80c8654ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Apr 2025 12:39:53 +0000
Subject: [PATCH 028/225] rssguard: 4.8.1 -> 4.8.2

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

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index 4a4ecd52c73e..70c1f17bcfd1 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rssguard";
-  version = "4.8.1";
+  version = "4.8.2";
 
   src = fetchFromGitHub {
     owner = "martinrotter";
     repo = pname;
     tag = version;
-    sha256 = "sha256-qWxcjGl4EaLXZ0q6RVy+IKyBcqlx/yYojlGivSXy5Io=";
+    sha256 = "sha256-C5iA5qK8+FhCUeFtyskY/vd4evaYS3TY1SHAc83/36w=";
   };
 
   buildInputs = [

From 762d3dfa72b17524f43b070bcf2c743a668fab8e Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 18:17:43 +0800
Subject: [PATCH 029/225] petsc: reorder inputs

---
 pkgs/by-name/pe/petsc/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index d31359143af8..b1cbd689f197 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -2,16 +2,14 @@
   lib,
   stdenv,
   fetchzip,
-  gfortran,
   replaceVars,
-  python3,
-  python3Packages,
-  blas,
-  lapack,
-  zlib, # propagated by p4est but required by petsc
+  bash,
+  pkg-config,
+  gfortran,
   mpi, # generic mpi dependency
   mpiCheckPhaseHook,
-  bash,
+  python3,
+  python3Packages,
 
   # Build options
   petsc-optimized ? true,
@@ -33,14 +31,16 @@
   withP4est ? withFullDeps,
 
   # External libraries
+  blas,
+  lapack,
   hdf5-fortran-mpi,
   metis,
   parmetis,
   scotch,
   scalapack,
   mumps_par,
-  pkg-config,
   p4est,
+  zlib, # propagated by p4est but required by petsc
 }:
 assert withFullDeps -> withCommonDeps;
 

From 795f035bb7fb988018e9c77e87f8bc74ab7f39b6 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 18:53:50 +0800
Subject: [PATCH 030/225] petsc: use finalAttrs

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

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index b1cbd689f197..7d7fe18a86db 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -54,12 +54,12 @@ assert withPtscotch -> mpiSupport;
 assert withScalapack -> mpiSupport;
 assert withMumps -> withScalapack;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "petsc";
   version = "3.22.4";
 
   src = fetchzip {
-    url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${version}.tar.gz";
+    url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
     hash = "sha256-8WV1ylXytkhiNa7YpWSOIpSvzLCCjdVVe5SiGfhicas=";
   };
 
@@ -213,4 +213,4 @@ stdenv.mkDerivation rec {
       qbisi
     ];
   };
-}
+})

From 1f4f2e029214c3b4badd1166537767de25dadaf3 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 19:26:16 +0800
Subject: [PATCH 031/225] petsc: add fullDeps test

---
 pkgs/by-name/pe/petsc/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 7d7fe18a86db..8d682f86bbba 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -41,6 +41,9 @@
   mumps_par,
   p4est,
   zlib, # propagated by p4est but required by petsc
+
+  # Used in passthru.tests
+  petsc,
 }:
 assert withFullDeps -> withCommonDeps;
 
@@ -199,6 +202,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     inherit mpiSupport pythonSupport;
+    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      fullDeps = petsc.override {
+        withFullDeps = true;
+        withParmetis = false;
+      };
+    };
   };
 
   setupHook = ./setup-hook.sh;

From e477c1f0b900848fb8aebb051982abd1a28c20c5 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 19:29:43 +0800
Subject: [PATCH 032/225] petsc: remove configure flag
 --with-hdf5-fortran-bindings=1

This option is only used when PETsc download and build hdf5 with fortran
support for other project depend on petsc. PETsc does not need it.
---
 pkgs/by-name/pe/petsc/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 8d682f86bbba..af8be7de0743 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -150,7 +150,6 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optionals withHdf5 [
       "--with-hdf5=1"
-      "--with-hdf5-fortran-bindings=1"
       "--with-hdf5-include=${lib.getDev hdf5-fortran-mpi}/include"
       "--with-hdf5-lib=[-L${lib.getLib hdf5-fortran-mpi}/lib,-lhdf5]"
     ]

From f00965dcff5fd8557fc764cd8651b69574277659 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 19:40:43 +0800
Subject: [PATCH 033/225] petsc: remove unnecssary configure flags

---
 pkgs/by-name/pe/petsc/package.nix | 35 +++++++------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index af8be7de0743..c58e18f00f92 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -122,37 +122,16 @@ stdenv.mkDerivation (finalAttrs: {
       "--with-cxx=mpicxx"
       "--with-fc=mpif90"
     ]
-    ++ lib.optionals withMetis [
-      "--with-metis=1"
-      "--with-metis-dir=${metis}"
-    ]
-    ++ lib.optionals withParmetis [
-      "--with-parmetis=1"
-      "--with-parmetis-dir=${parmetis}"
-    ]
-    ++ lib.optionals withPtscotch [
-      "--with-ptscotch=1"
-      "--with-ptscotch-include=${lib.getDev scotch}/include"
-      "--with-ptscotch-lib=[-L${lib.getLib scotch}/lib,-lptscotch,-lptesmumps,-lptscotchparmetisv3,-lptscotcherr,-lesmumps,-lscotch,-lscotcherr]"
-    ]
-    ++ lib.optionals withScalapack [
-      "--with-scalapack=1"
-      "--with-scalapack-dir=${scalapack}"
-    ]
-    ++ lib.optionals withMumps [
-      "--with-mumps=1"
-      "--with-mumps-dir=${mumps_par}"
-    ]
+    ++ lib.optional withMetis "--with-metis=1"
+    ++ lib.optional withParmetis "--with-parmetis=1"
+    ++ lib.optional withPtscotch "--with-ptscotch=1"
+    ++ lib.optional withScalapack "--with-scalapack=1"
+    ++ lib.optional withMumps "--with-mumps=1"
     ++ lib.optionals withP4est [
       "--with-p4est=1"
-      "--with-zlib-include=${lib.getDev zlib}/include"
-      "--with-zlib-lib=[-L${lib.getLib zlib}/lib,-lz]"
-    ]
-    ++ lib.optionals withHdf5 [
-      "--with-hdf5=1"
-      "--with-hdf5-include=${lib.getDev hdf5-fortran-mpi}/include"
-      "--with-hdf5-lib=[-L${lib.getLib hdf5-fortran-mpi}/lib,-lhdf5]"
+      "--with-zlib=1"
     ]
+    ++ lib.optional withHdf5 "--with-hdf5=1"
     ++ lib.optionals petsc-optimized [
       "--with-debugging=0"
       "COPTFLAGS=-O3"

From 45b86ca411ab8768af40fb23b45d46e5d4d0a024 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 19:49:13 +0800
Subject: [PATCH 034/225] petsc: add withZlib option

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

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index c58e18f00f92..6498635fd568 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -24,6 +24,7 @@
   # External libraries options
   withHdf5 ? withCommonDeps,
   withMetis ? withCommonDeps,
+  withZlib ? withP4est,
   withScalapack ? withFullDeps,
   withParmetis ? withFullDeps, # parmetis is unfree
   withPtscotch ? withFullDeps,
@@ -48,7 +49,7 @@
 assert withFullDeps -> withCommonDeps;
 
 # This version of PETSc does not support a non-MPI p4est build
-assert withP4est -> (p4est.mpiSupport && mpiSupport);
+assert withP4est -> (p4est.mpiSupport && mpiSupport && withZlib);
 
 # Package parmetis depend on metis and mpi support
 assert withParmetis -> (withMetis && mpiSupport);
@@ -86,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
       lapack
     ]
     ++ lib.optional withHdf5 hdf5-fortran-mpi
+    ++ lib.optional withZlib zlib
     ++ lib.optional withP4est p4est
     ++ lib.optional withMetis metis
     ++ lib.optional withParmetis parmetis
@@ -127,10 +129,8 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional withPtscotch "--with-ptscotch=1"
     ++ lib.optional withScalapack "--with-scalapack=1"
     ++ lib.optional withMumps "--with-mumps=1"
-    ++ lib.optionals withP4est [
-      "--with-p4est=1"
-      "--with-zlib=1"
-    ]
+    ++ lib.optional withP4est "--with-p4est=1"
+    ++ lib.optional withZlib "--with-zlib=1"
     ++ lib.optional withHdf5 "--with-hdf5=1"
     ++ lib.optionals petsc-optimized [
       "--with-debugging=0"

From 0a50de12c97d36f3aac685e0af4578a16c3e0e2e Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 19:52:01 +0800
Subject: [PATCH 035/225] petsc: reorder configure flags

---
 pkgs/by-name/pe/petsc/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 6498635fd568..4877768a1c07 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -118,12 +118,19 @@ stdenv.mkDerivation (finalAttrs: {
       "--with-precision=${petsc-precision}"
       "--with-mpi=${if mpiSupport then "1" else "0"}"
     ]
-    ++ lib.optional pythonSupport "--with-petsc4py=1"
     ++ lib.optionals mpiSupport [
       "--CC=mpicc"
       "--with-cxx=mpicxx"
       "--with-fc=mpif90"
     ]
+    ++ lib.optionals petsc-optimized [
+      "--with-debugging=0"
+      "COPTFLAGS=-O3"
+      "FOPTFLAGS=-O3"
+      "CXXOPTFLAGS=-O3"
+      "CXXFLAGS=-O3"
+    ]
+    ++ lib.optional pythonSupport "--with-petsc4py=1"
     ++ lib.optional withMetis "--with-metis=1"
     ++ lib.optional withParmetis "--with-parmetis=1"
     ++ lib.optional withPtscotch "--with-ptscotch=1"
@@ -131,14 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional withMumps "--with-mumps=1"
     ++ lib.optional withP4est "--with-p4est=1"
     ++ lib.optional withZlib "--with-zlib=1"
-    ++ lib.optional withHdf5 "--with-hdf5=1"
-    ++ lib.optionals petsc-optimized [
-      "--with-debugging=0"
-      "COPTFLAGS=-O3"
-      "FOPTFLAGS=-O3"
-      "CXXOPTFLAGS=-O3"
-      "CXXFLAGS=-O3"
-    ];
+    ++ lib.optional withHdf5 "--with-hdf5=1";
 
   hardeningDisable = lib.optionals (!petsc-optimized) [
     "fortify"

From 62208f0a1b16be2ee2fb388fb3e347a1fb8bd1aa Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 20:04:19 +0800
Subject: [PATCH 036/225] petsc: add fortranSupport option

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

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 4877768a1c07..0a2653f2dc5c 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -16,6 +16,7 @@
   petsc-scalar-type ? "real",
   petsc-precision ? "double",
   mpiSupport ? true,
+  fortranSupport ? true,
   pythonSupport ? false, # petsc python binding
   withExamples ? false,
   withFullDeps ? false, # full External libraries support
@@ -130,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
       "CXXOPTFLAGS=-O3"
       "CXXFLAGS=-O3"
     ]
+    ++ lib.optional (!fortranSupport) "--with-fortran-bindings=0"
     ++ lib.optional pythonSupport "--with-petsc4py=1"
     ++ lib.optional withMetis "--with-metis=1"
     ++ lib.optional withParmetis "--with-parmetis=1"
@@ -179,7 +181,11 @@ stdenv.mkDerivation (finalAttrs: {
   pythonImportsCheck = [ "petsc4py" ];
 
   passthru = {
-    inherit mpiSupport pythonSupport;
+    inherit
+      mpiSupport
+      pythonSupport
+      fortranSupport
+      ;
     tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
       fullDeps = petsc.override {
         withFullDeps = true;

From a11a1f196bbb9787065464785c9750a84c9c9720 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 20:19:26 +0800
Subject: [PATCH 037/225] petsc: override external math libraries in scope
 petscPackages

---
 pkgs/by-name/pe/petsc/package.nix | 58 ++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 0a2653f2dc5c..85e0853d9bf0 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  newScope,
   stdenv,
   fetchzip,
   replaceVars,
@@ -35,12 +36,12 @@
   # External libraries
   blas,
   lapack,
-  hdf5-fortran-mpi,
+  hdf5,
   metis,
   parmetis,
   scotch,
   scalapack,
-  mumps_par,
+  mumps,
   p4est,
   zlib, # propagated by p4est but required by petsc
 
@@ -50,7 +51,7 @@
 assert withFullDeps -> withCommonDeps;
 
 # This version of PETSc does not support a non-MPI p4est build
-assert withP4est -> (p4est.mpiSupport && mpiSupport && withZlib);
+assert withP4est -> (mpiSupport && withZlib);
 
 # Package parmetis depend on metis and mpi support
 assert withParmetis -> (withMetis && mpiSupport);
@@ -59,6 +60,34 @@ assert withPtscotch -> mpiSupport;
 assert withScalapack -> mpiSupport;
 assert withMumps -> withScalapack;
 
+let
+  petscPackages = lib.makeScope newScope (self: {
+    inherit
+      # global override options
+      mpiSupport
+      fortranSupport
+      pythonSupport
+      precision
+      ;
+    enableMpi = self.mpiSupport;
+
+    petscPackages = self;
+    # external libraries
+    mpi = self.callPackage mpi.override { };
+    blas = self.callPackage blas.override { };
+    lapack = self.callPackage lapack.override { };
+    hdf5 = self.callPackage hdf5.override {
+      fortran = gfortran;
+      cppSupport = !mpiSupport;
+    };
+    metis = self.callPackage metis.override { };
+    parmetis = self.callPackage parmetis.override { };
+    scotch = self.callPackage scotch.override { };
+    scalapack = self.callPackage scalapack.override { };
+    mumps = self.callPackage mumps.override { };
+    p4est = self.callPackage p4est.override { };
+  });
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "petsc";
   version = "3.22.4";
@@ -84,17 +113,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     [
-      blas
-      lapack
+      petscPackages.blas
+      petscPackages.lapack
     ]
-    ++ lib.optional withHdf5 hdf5-fortran-mpi
     ++ lib.optional withZlib zlib
-    ++ lib.optional withP4est p4est
-    ++ lib.optional withMetis metis
-    ++ lib.optional withParmetis parmetis
-    ++ lib.optional withPtscotch scotch
-    ++ lib.optional withScalapack scalapack
-    ++ lib.optional withMumps mumps_par;
+    ++ lib.optional withHdf5 petscPackages.hdf5
+    ++ lib.optional withP4est petscPackages.p4est
+    ++ lib.optional withMetis petscPackages.metis
+    ++ lib.optional withParmetis petscPackages.parmetis
+    ++ lib.optional withPtscotch petscPackages.scotch
+    ++ lib.optional withScalapack petscPackages.scalapack
+    ++ lib.optional withMumps petscPackages.mumps;
 
   propagatedBuildInputs = lib.optional pythonSupport python3Packages.numpy;
 
@@ -186,6 +215,11 @@ stdenv.mkDerivation (finalAttrs: {
       pythonSupport
       fortranSupport
       ;
+    petscPackages = petscPackages.overrideScope (
+      final: prev: {
+        petsc = finalAttrs.finalPackage;
+      }
+    );
     tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
       fullDeps = petsc.override {
         withFullDeps = true;

From 9b40829f4da205eafd7947e5dbe9450ca1861f59 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 20:20:19 +0800
Subject: [PATCH 038/225] petsc: add serial tests

---
 pkgs/by-name/pe/petsc/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 85e0853d9bf0..712e56abba41 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -220,12 +220,18 @@ stdenv.mkDerivation (finalAttrs: {
         petsc = finalAttrs.finalPackage;
       }
     );
-    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
-      fullDeps = petsc.override {
-        withFullDeps = true;
-        withParmetis = false;
+    tests =
+      {
+        serial = petsc.override {
+          mpiSupport = false;
+        };
+      }
+      // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+        fullDeps = petsc.override {
+          withFullDeps = true;
+          withParmetis = false;
+        };
       };
-    };
   };
 
   setupHook = ./setup-hook.sh;

From f75b5cfe460b3a14d14b5e8677daa25f3e2da4c7 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 21:02:44 +0800
Subject: [PATCH 039/225] petsc: add mumps,scalapack,ptscotch to commonDeps in
 petsc

---
 pkgs/by-name/pe/petsc/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 712e56abba41..f6e392282e02 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -27,10 +27,10 @@
   withHdf5 ? withCommonDeps,
   withMetis ? withCommonDeps,
   withZlib ? withP4est,
-  withScalapack ? withFullDeps,
+  withScalapack ? withCommonDeps && mpiSupport,
   withParmetis ? withFullDeps, # parmetis is unfree
-  withPtscotch ? withFullDeps,
-  withMumps ? withFullDeps,
+  withPtscotch ? withCommonDeps && mpiSupport,
+  withMumps ? withCommonDeps,
   withP4est ? withFullDeps,
 
   # External libraries
@@ -58,7 +58,7 @@ assert withParmetis -> (withMetis && mpiSupport);
 
 assert withPtscotch -> mpiSupport;
 assert withScalapack -> mpiSupport;
-assert withMumps -> withScalapack;
+assert (withMumps && mpiSupport) -> withScalapack;
 
 let
   petscPackages = lib.makeScope newScope (self: {
@@ -167,6 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional withPtscotch "--with-ptscotch=1"
     ++ lib.optional withScalapack "--with-scalapack=1"
     ++ lib.optional withMumps "--with-mumps=1"
+    ++ lib.optional (withMumps && !mpiSupport) "--with-mumps-serial=1"
     ++ lib.optional withP4est "--with-p4est=1"
     ++ lib.optional withZlib "--with-zlib=1"
     ++ lib.optional withHdf5 "--with-hdf5=1";

From 9b37979905769d2d6e28c58c0c9430a4f5f3e91a Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 21:35:21 +0800
Subject: [PATCH 040/225] petsc: add hypre,fftw,superlu,suitesparse to
 commonDeps

---
 pkgs/by-name/pe/petsc/package.nix | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index f6e392282e02..40049cbeacbe 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -32,6 +32,10 @@
   withPtscotch ? withCommonDeps && mpiSupport,
   withMumps ? withCommonDeps,
   withP4est ? withFullDeps,
+  withHypre ? withCommonDeps && mpiSupport,
+  withFftw ? withCommonDeps,
+  withSuperLu ? withCommonDeps,
+  withSuitesparse ? withCommonDeps,
 
   # External libraries
   blas,
@@ -44,6 +48,10 @@
   mumps,
   p4est,
   zlib, # propagated by p4est but required by petsc
+  hypre,
+  fftw,
+  superlu,
+  suitesparse,
 
   # Used in passthru.tests
   petsc,
@@ -59,6 +67,7 @@ assert withParmetis -> (withMetis && mpiSupport);
 assert withPtscotch -> mpiSupport;
 assert withScalapack -> mpiSupport;
 assert (withMumps && mpiSupport) -> withScalapack;
+assert withHypre -> mpiSupport;
 
 let
   petscPackages = lib.makeScope newScope (self: {
@@ -86,6 +95,10 @@ let
     scalapack = self.callPackage scalapack.override { };
     mumps = self.callPackage mumps.override { };
     p4est = self.callPackage p4est.override { };
+    hypre = self.callPackage hypre.override { };
+    fftw = self.callPackage fftw.override { };
+    superlu = self.callPackage superlu.override { };
+    suitesparse = self.callPackage suitesparse.override { };
   });
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -123,7 +136,11 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional withParmetis petscPackages.parmetis
     ++ lib.optional withPtscotch petscPackages.scotch
     ++ lib.optional withScalapack petscPackages.scalapack
-    ++ lib.optional withMumps petscPackages.mumps;
+    ++ lib.optional withMumps petscPackages.mumps
+    ++ lib.optional withHypre petscPackages.hypre
+    ++ lib.optional withSuperLu petscPackages.superlu
+    ++ lib.optional withFftw petscPackages.fftw
+    ++ lib.optional withSuitesparse petscPackages.suitesparse;
 
   propagatedBuildInputs = lib.optional pythonSupport python3Packages.numpy;
 
@@ -170,7 +187,11 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional (withMumps && !mpiSupport) "--with-mumps-serial=1"
     ++ lib.optional withP4est "--with-p4est=1"
     ++ lib.optional withZlib "--with-zlib=1"
-    ++ lib.optional withHdf5 "--with-hdf5=1";
+    ++ lib.optional withHdf5 "--with-hdf5=1"
+    ++ lib.optional withHypre "--with-hypre=1"
+    ++ lib.optional withSuperLu "--with-superlu=1"
+    ++ lib.optional withFftw "--with-fftw=1"
+    ++ lib.optional withSuitesparse "--with-suitesparse=1";
 
   hardeningDisable = lib.optionals (!petsc-optimized) [
     "fortify"

From bf1af1c732bb8d4381f15b2e352067f549c4f3b3 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 23 Mar 2025 21:41:27 +0800
Subject: [PATCH 041/225] petsc: change some inputs style from kebab-case to
 camelCase

---
 pkgs/by-name/pe/petsc/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 40049cbeacbe..225beef79e6f 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -13,9 +13,9 @@
   python3Packages,
 
   # Build options
-  petsc-optimized ? true,
-  petsc-scalar-type ? "real",
-  petsc-precision ? "double",
+  debug ? false,
+  scalarType ? "real",
+  precision ? "double",
   mpiSupport ? true,
   fortranSupport ? true,
   pythonSupport ? false, # petsc python binding
@@ -161,8 +161,8 @@ stdenv.mkDerivation (finalAttrs: {
     [
       "--with-blas=1"
       "--with-lapack=1"
-      "--with-scalar-type=${petsc-scalar-type}"
-      "--with-precision=${petsc-precision}"
+      "--with-scalar-type=${scalarType}"
+      "--with-precision=${precision}"
       "--with-mpi=${if mpiSupport then "1" else "0"}"
     ]
     ++ lib.optionals mpiSupport [
@@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
       "--with-cxx=mpicxx"
       "--with-fc=mpif90"
     ]
-    ++ lib.optionals petsc-optimized [
+    ++ lib.optionals (!debug) [
       "--with-debugging=0"
       "COPTFLAGS=-O3"
       "FOPTFLAGS=-O3"
@@ -193,7 +193,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional withFftw "--with-fftw=1"
     ++ lib.optional withSuitesparse "--with-suitesparse=1";
 
-  hardeningDisable = lib.optionals (!petsc-optimized) [
+  hardeningDisable = lib.optionals debug [
     "fortify"
     "fortify3"
   ];

From 9f0a2d26fce4e188dfc4272f2db3044e81d1c74c Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Mon, 24 Mar 2025 21:07:02 +0800
Subject: [PATCH 042/225] petsc: remove with lib in meta attrs

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

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 225beef79e6f..617121aaf0d1 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -258,12 +258,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   setupHook = ./setup-hook.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Portable Extensible Toolkit for Scientific computation";
     homepage = "https://petsc.org/release/";
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
     platforms = lib.platforms.unix;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       cburstedde
       qbisi
     ];

From 605ec77678e47441a008a743e16e57d82d5b6bb8 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Wed, 2 Apr 2025 02:48:12 +0800
Subject: [PATCH 043/225] petsc: 3.22.4 -> 3.23.0

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

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 617121aaf0d1..517987db5b90 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -103,11 +103,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "petsc";
-  version = "3.22.4";
+  version = "3.23.0";
 
   src = fetchzip {
     url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
-    hash = "sha256-8WV1ylXytkhiNa7YpWSOIpSvzLCCjdVVe5SiGfhicas=";
+    hash = "sha256-OcI4iyDOR0YTVV+JoOhbfutoW00EmfapNaMnD/JJFsI=";
   };
 
   strictDeps = true;

From 2a71140aba7402f794c61c2def4504e0f50ed807 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Wed, 2 Apr 2025 03:03:22 +0800
Subject: [PATCH 044/225] petsc: fix ptscotch dependencies

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

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 517987db5b90..d394c69ce2c4 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -7,6 +7,7 @@
   bash,
   pkg-config,
   gfortran,
+  bison,
   mpi, # generic mpi dependency
   mpiCheckPhaseHook,
   python3,
@@ -26,7 +27,7 @@
   # External libraries options
   withHdf5 ? withCommonDeps,
   withMetis ? withCommonDeps,
-  withZlib ? withP4est,
+  withZlib ? (withP4est || withPtscotch),
   withScalapack ? withCommonDeps && mpiSupport,
   withParmetis ? withFullDeps, # parmetis is unfree
   withPtscotch ? withCommonDeps && mpiSupport,
@@ -64,7 +65,7 @@ assert withP4est -> (mpiSupport && withZlib);
 # Package parmetis depend on metis and mpi support
 assert withParmetis -> (withMetis && mpiSupport);
 
-assert withPtscotch -> mpiSupport;
+assert withPtscotch -> (mpiSupport && withZlib);
 assert withScalapack -> mpiSupport;
 assert (withMumps && mpiSupport) -> withScalapack;
 assert withHypre -> mpiSupport;
@@ -117,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
       python3
       gfortran
       pkg-config
+      bison
     ]
     ++ lib.optional mpiSupport mpi
     ++ lib.optionals pythonSupport [

From 26d320d7a9695e1af414d1df62569935c03df7ff Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Wed, 2 Apr 2025 02:49:14 +0800
Subject: [PATCH 045/225] slepc: 3.22.2 -> 3.23.0

---
 pkgs/by-name/sl/slepc/package.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/sl/slepc/package.nix b/pkgs/by-name/sl/slepc/package.nix
index 371cd1d15805..42add99600f3 100644
--- a/pkgs/by-name/sl/slepc/package.nix
+++ b/pkgs/by-name/sl/slepc/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  sowing,
   python3,
   python3Packages,
   arpack-mpi,
@@ -17,13 +16,13 @@ assert petsc.mpiSupport;
 assert pythonSupport -> petsc.pythonSupport;
 stdenv.mkDerivation (finalAttrs: {
   pname = "slepc";
-  version = "3.22.2";
+  version = "3.23.0";
 
   src = fetchFromGitLab {
     owner = "slepc";
     repo = "slepc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-a5DmsA7NAlhrEaS43TYPk7vtDfhXLEP+5sftu2A9Yt4=";
+    hash = "sha256-Z9CVZQ/Ezb1S2EkTb9amAPxaN4tiUnKrbvQIc3BnVuU=";
   };
 
   postPatch = ''
@@ -33,11 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
       "slepc.prefixdir,'${python3.sitePackages}'"
 
     patchShebangs lib/slepc/bin
-
-    # Use system bfort
-    substituteInPlace config/packages/sowing.py \
-      --replace-fail "bfort = os.path.join(archdir,'bin','bfort')" \
-      "bfort = '${sowing}/bin/bfort'"
   '';
 
   # Usually this project is being built as part of a `petsc` build or as part of

From e2fa2553f16654a38c92b7312e32ac6bb7a3f5b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Apr 2025 01:07:06 +0000
Subject: [PATCH 046/225] mill: 0.12.9 -> 0.12.10

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

diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix
index 10dfb82e2190..105a0b306a7d 100644
--- a/pkgs/by-name/mi/mill/package.nix
+++ b/pkgs/by-name/mi/mill/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mill";
-  version = "0.12.9";
+  version = "0.12.10";
 
   src = fetchurl {
     url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/${finalAttrs.version}/mill-dist-${finalAttrs.version}-assembly.jar";
-    hash = "sha256-Ntqzivy8dfsRlBclPNsWOZ4h1Xk7D3UJV7GLVGIEcAU=";
+    hash = "sha256-TESwISFz4Xf/F4kgnaTQbi/uVrc75bearih8mydPqHM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c59bac08bd6fe608eac0083a68ec96819a32662d Mon Sep 17 00:00:00 2001
From: Timothy Gallion <timbama@gmail.com>
Date: Sun, 30 Mar 2025 01:52:11 -0400
Subject: [PATCH 047/225] python3: Fixing excessive memory usage for overriden
 python

An attempt to address #338231. The current release of nixpkgs takes over
20GB of memory to evaluate python when the interpreter is overriden.
This adds memoization to the spliced python packages to avoid
evaluating all the commbinations of overrides.
---
 .../interpreters/python/cpython/default.nix   | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 977dd577fc90..56c4fe09fdce 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -55,6 +55,7 @@
   pkgsBuildTarget,
   pkgsHostHost,
   pkgsTargetTarget,
+  __splices ? { },
 
   # build customization
   sourceVersion,
@@ -145,10 +146,28 @@ let
       # When we override the interpreter we also need to override the spliced versions of the interpreter
       # bluez is excluded manually to break an infinite recursion.
       inputs' = lib.filterAttrs (n: v: n != "bluez" && n != "passthruFun" && !lib.isDerivation v) inputs;
+      # Memoization of the splices to avoid re-evaluating this function for all combinations of splices e.g.
+      # python3.pythonOnBuildForHost.pythonOnBuildForTarget == python3.pythonOnBuildForTarget by consuming
+      # __splices as an arg and using the cache if populated.
+      splices = {
+        pythonOnBuildForBuild = override pkgsBuildBuild.${pythonAttr};
+        pythonOnBuildForHost = override pkgsBuildHost.${pythonAttr};
+        pythonOnBuildForTarget = override pkgsBuildTarget.${pythonAttr};
+        pythonOnHostForHost = override pkgsHostHost.${pythonAttr};
+        pythonOnTargetForTarget = lib.optionalAttrs (lib.hasAttr pythonAttr pkgsTargetTarget) (
+          override pkgsTargetTarget.${pythonAttr}
+        );
+      } // __splices;
       override =
         attr:
         let
-          python = attr.override (inputs' // { self = python; });
+          python = attr.override (
+            inputs'
+            // {
+              self = python;
+              __splices = splices;
+            }
+          );
         in
         python;
     in
@@ -160,13 +179,13 @@ let
       pythonVersion = with sourceVersion; "${major}.${minor}";
       sitePackages = "lib/${libPrefix}/site-packages";
       inherit hasDistutilsCxxPatch pythonAttr;
-      pythonOnBuildForBuild = override pkgsBuildBuild.${pythonAttr};
-      pythonOnBuildForHost = override pkgsBuildHost.${pythonAttr};
-      pythonOnBuildForTarget = override pkgsBuildTarget.${pythonAttr};
-      pythonOnHostForHost = override pkgsHostHost.${pythonAttr};
-      pythonOnTargetForTarget = lib.optionalAttrs (lib.hasAttr pythonAttr pkgsTargetTarget) (
-        override pkgsTargetTarget.${pythonAttr}
-      );
+      inherit (splices)
+        pythonOnBuildForBuild
+        pythonOnBuildForHost
+        pythonOnBuildForTarget
+        pythonOnHostForHost
+        pythonOnTargetForTarget
+        ;
     };
 
   version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";

From 0ce0b01c126b892d2f334e3c926f46b62cf52c25 Mon Sep 17 00:00:00 2001
From: Timothy Gallion <timbama@gmail.com>
Date: Sun, 30 Mar 2025 16:10:39 -0400
Subject: [PATCH 048/225] python3: Remove unneeded override in `passthruFun`

`pythonOnBuildForHost` is already overriden when it is passed to
`passthruFun` remove redundant override. Performace is slightly better
~200MB less memory.
---
 pkgs/development/interpreters/python/passthrufun.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix
index d4e20aa24fc9..be5d8a11add5 100644
--- a/pkgs/development/interpreters/python/passthrufun.nix
+++ b/pkgs/development/interpreters/python/passthrufun.nix
@@ -106,10 +106,6 @@ let
           python = self;
         }
     );
-  pythonOnBuildForHost_overridden = pythonOnBuildForHost.override {
-    inherit packageOverrides;
-    self = pythonOnBuildForHost_overridden;
-  };
 in
 rec {
   isPy27 = pythonVersion == "2.7";
@@ -144,7 +140,7 @@ rec {
   pythonAtLeast = lib.versionAtLeast pythonVersion;
   pythonOlder = lib.versionOlder pythonVersion;
   inherit hasDistutilsCxxPatch;
-  pythonOnBuildForHost = pythonOnBuildForHost_overridden;
+  inherit pythonOnBuildForHost;
 
   tests = callPackage ./tests.nix {
     python = self;

From fd12c6f71fc9b4a0850be1c731985baa2306d7c6 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 30 Mar 2025 17:40:56 +0200
Subject: [PATCH 049/225] docker_28: init at 28.0.4

https://github.com/docker/cli/compare/v27.5.1...v28.0.4
https://github.com/moby/moby/compare/v27.5.1...v28.0.4

Milestones / Changelogs:
28.0.0
https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A28.0.0
https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A28.0.0
28.0.1
https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A28.0.1
https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A28.0.1
28.0.2
https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A28.0.2
https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A28.0.2
28.0.3
https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A28.0.3
https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A28.0.3
28.0.4
https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A28.0.4
https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A28.0.4
---
 .../applications/virtualization/docker/default.nix | 14 ++++++++++++++
 pkgs/top-level/all-packages.nix                    |  1 +
 2 files changed, 15 insertions(+)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 2f9e3d58aae5..926d6afcaa54 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -401,4 +401,18 @@ rec {
     tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
   };
 
+  docker_28 = callPackage dockerGen rec {
+    version = "28.0.4";
+    cliRev = "v${version}";
+    cliHash = "sha256-DLUcmxbCxJs3EA96SGaesA+GzvHq6DC2vrGe5PvA0dE=";
+    mobyRev = "v${version}";
+    mobyHash = "sha256-yvz8MUOU61OuphPaIDu6+1wsbCXkIxJYQKK0fhcVwp0=";
+    runcRev = "v1.2.6";
+    runcHash = "sha256-XMN+YKdQOQeOLLwvdrC6Si2iAIyyHD5RgZbrOHrQE/g=";
+    containerdRev = "v1.7.27";
+    containerdHash = "sha256-H94EHnfW2Z59KcHcbfJn+BipyZiNUvHe50G5EXbrIps=";
+    tiniRev = "v0.19.0";
+    tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6f0798ba1e4..0d50bba6b56a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14128,6 +14128,7 @@ with pkgs;
     docker_25
     docker_26
     docker_27
+    docker_28
     ;
 
   docker = docker_27;

From 7f455c456fb85749c16c26b6761692b6aa58e0d0 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 2 Apr 2025 14:43:06 +0200
Subject: [PATCH 050/225] maintainers: drop `dmrauh`

---
 maintainers/maintainer-list.nix                           | 6 ------
 pkgs/by-name/gr/gretl/package.nix                         | 2 +-
 pkgs/development/python-modules/mnist/default.nix         | 2 +-
 pkgs/development/python-modules/simpy/default.nix         | 1 -
 pkgs/development/python-modules/webdavclient3/default.nix | 2 +-
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1c905067113e..e3dd4c63f28f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6261,12 +6261,6 @@
     githubId = 875324;
     name = "David Johnson";
   };
-  dmrauh = {
-    email = "dmrauh@posteo.de";
-    github = "dmrauh";
-    githubId = 37698547;
-    name = "Dominik Michael Rauh";
-  };
   dmvianna = {
     email = "dmlvianna@gmail.com";
     github = "dmvianna";
diff --git a/pkgs/by-name/gr/gretl/package.nix b/pkgs/by-name/gr/gretl/package.nix
index 0e09aa73f5aa..2f811e9e4e5d 100644
--- a/pkgs/by-name/gr/gretl/package.nix
+++ b/pkgs/by-name/gr/gretl/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
       gretl is a cross-platform software package for econometric analysis,
       written in the C programming language.
     '';
-    maintainers = with lib.maintainers; [ dmrauh ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/development/python-modules/mnist/default.nix b/pkgs/development/python-modules/mnist/default.nix
index 7e9d02346c01..9474f170a3de 100644
--- a/pkgs/development/python-modules/mnist/default.nix
+++ b/pkgs/development/python-modules/mnist/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Python utilities to download and parse the MNIST dataset";
     homepage = "https://github.com/datapythonista/mnist";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ dmrauh ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix
index 90bcd244265c..949d6b43cbfe 100644
--- a/pkgs/development/python-modules/simpy/default.nix
+++ b/pkgs/development/python-modules/simpy/default.nix
@@ -57,7 +57,6 @@ buildPythonPackage rec {
     description = "Process-based discrete-event simulation framework based on standard Python";
     license = [ lib.licenses.mit ];
     maintainers = with lib.maintainers; [
-      dmrauh
       shlevy
     ];
   };
diff --git a/pkgs/development/python-modules/webdavclient3/default.nix b/pkgs/development/python-modules/webdavclient3/default.nix
index 861c83691bce..2358b08a9f5e 100644
--- a/pkgs/development/python-modules/webdavclient3/default.nix
+++ b/pkgs/development/python-modules/webdavclient3/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     description = "Easy to use WebDAV Client for Python 3.x";
     homepage = "https://github.com/ezhov-evgeny/webdav-client-python-3";
     license = licenses.mit;
-    maintainers = with maintainers; [ dmrauh ];
+    maintainers = with maintainers; [ ];
     mainProgram = "wdc";
   };
 }

From 185743b4b9b7b382b815075869986ca6d811444d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Apr 2025 15:29:18 +0000
Subject: [PATCH 051/225] python312Packages.meep: 1.29.0 -> 1.30.0

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

diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix
index acb4a056ef87..3db5517dafeb 100644
--- a/pkgs/development/python-modules/meep/default.nix
+++ b/pkgs/development/python-modules/meep/default.nix
@@ -35,13 +35,13 @@ assert !lapack.isILP64;
 
 buildPythonPackage rec {
   pname = "meep";
-  version = "1.29.0";
+  version = "1.30.0";
 
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-TB85obdk8pSWRaz3+3I6P6+dQtCHosWHRnKGck/wG9Q=";
+    hash = "sha256-9cQHvwUAeop5dRMVvedph+KQvTcmnkHdfqPQlSY280c=";
   };
 
   format = "other";

From 9d035c1db1f66b5ec1ee0a361f4dfc10ee1df206 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 12 Mar 2025 19:25:39 +0100
Subject: [PATCH 052/225] metabase: migrate to by-name

---
 .../metabase/default.nix => by-name/me/metabase/package.nix}  | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{servers/metabase/default.nix => by-name/me/metabase/package.nix} (100%)

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/by-name/me/metabase/package.nix
similarity index 100%
rename from pkgs/servers/metabase/default.nix
rename to pkgs/by-name/me/metabase/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01cee5c744ab..9af2936b224b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2618,10 +2618,6 @@ with pkgs;
           throw "mesonEmulatorHook may only be added to nativeBuildInputs when the target binaries can't be executed; however you are attempting to use it in a situation where ${stdenv.hostPlatform.config} can execute ${stdenv.targetPlatform.config}. Consider only adding mesonEmulatorHook according to a conditional based canExecute in your package expression."
       );
 
-  metabase = callPackage ../servers/metabase {
-    jdk11 = jdk11_headless;
-  };
-
   mkspiffs = callPackage ../tools/filesystems/mkspiffs { };
 
   mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { });

From 19356993bd0755a9b95a40468605270f632fbf73 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 12 Mar 2025 19:29:07 +0100
Subject: [PATCH 053/225] metabase: modernize

---
 pkgs/by-name/me/metabase/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix
index d6cac37c3e2d..0ccd46c00454 100644
--- a/pkgs/by-name/me/metabase/package.nix
+++ b/pkgs/by-name/me/metabase/package.nix
@@ -3,16 +3,19 @@
   stdenv,
   fetchurl,
   makeWrapper,
-  jdk11,
+  jdk11_headless,
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+let
+  jdk11 = jdk11_headless;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "metabase";
   version = "0.52.8";
 
   src = fetchurl {
-    url = "https://downloads.metabase.com/v${version}/metabase.jar";
+    url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar";
     hash = "sha256-Z14BuKaSAMzlgdtqppc/3ItCxVZwE4E1EQUVMVR6JwQ=";
   };
 
@@ -22,12 +25,12 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    makeWrapper ${jdk11}/bin/java $out/bin/metabase --add-flags "-jar $src"
+    makeWrapper ${lib.getExe jdk11} $out/bin/metabase --add-flags "-jar $src"
     runHook postInstall
   '';
 
   meta = with lib; {
-    description = "Easy, open source way for everyone in your company to ask questions and learn from data";
+    description = "Business Intelligence and Embedded Analytics tool";
     homepage = "https://metabase.com";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.agpl3Only;
@@ -42,4 +45,4 @@ stdenv.mkDerivation rec {
   passthru.tests = {
     inherit (nixosTests) metabase;
   };
-}
+})

From f7907c177e54006c2e80aefe7c704d233eb1bd1b Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 12 Mar 2025 19:41:26 +0100
Subject: [PATCH 054/225] metabase: switch to jre from jdk11_headless

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

diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix
index 0ccd46c00454..6510f0dda84d 100644
--- a/pkgs/by-name/me/metabase/package.nix
+++ b/pkgs/by-name/me/metabase/package.nix
@@ -3,12 +3,12 @@
   stdenv,
   fetchurl,
   makeWrapper,
-  jdk11_headless,
+  jre_headless,
   nixosTests,
 }:
 
 let
-  jdk11 = jdk11_headless;
+  jre = jre_headless;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "metabase";
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    makeWrapper ${lib.getExe jdk11} $out/bin/metabase --add-flags "-jar $src"
+    makeWrapper ${lib.getExe jre} $out/bin/metabase --add-flags "-jar $src"
     runHook postInstall
   '';
 

From 96c25d43d417f2afd6845e6acf91850466b6c374 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Apr 2025 19:03:32 +0000
Subject: [PATCH 055/225] plemoljp: 2.0.3 -> 2.0.4

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

diff --git a/pkgs/by-name/pl/plemoljp/package.nix b/pkgs/by-name/pl/plemoljp/package.nix
index ec13bfaaf936..59d92b848bab 100644
--- a/pkgs/by-name/pl/plemoljp/package.nix
+++ b/pkgs/by-name/pl/plemoljp/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "plemoljp";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchzip {
     url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_v${version}.zip";
-    hash = "sha256-cT2BpD2PoAd38uYCQlq5fv9NYgwInblrYdK/XDEmOWI=";
+    hash = "sha256-pajE86IK05mm3Z507bvoMGy8JJwuGWZnUiSrXndiBTk=";
   };
 
   installPhase = ''

From d5477d94fc99bfed79faba3088df24f00874bc92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Apr 2025 19:03:43 +0000
Subject: [PATCH 056/225] plemoljp-hs: 2.0.3 -> 2.0.4

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

diff --git a/pkgs/by-name/pl/plemoljp-hs/package.nix b/pkgs/by-name/pl/plemoljp-hs/package.nix
index bc736de3bf7c..20ec33ee1253 100644
--- a/pkgs/by-name/pl/plemoljp-hs/package.nix
+++ b/pkgs/by-name/pl/plemoljp-hs/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "plemoljp-hs";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchzip {
     url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_HS_v${version}.zip";
-    hash = "sha256-rKWZMIK6TP6IV6KjFGuZE2S6IiMtjtHZeWM44tULduk=";
+    hash = "sha256-+pRbMgRaIbsXo8e7rQre377F8LhbK9rBjG/vYrdeFQM=";
   };
 
   installPhase = ''

From 837ff226bbd44c29303611703a4085d48f0957c9 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 2 Apr 2025 07:55:32 -0700
Subject: [PATCH 057/225] flake: fix `nix flake check --all-systems --no-build`
 again

This regressed in be4d27febe7776aac010f1ce11e1ff1f60f09bdd, because
sphinx-issues depends on pandoc at build-time (which depends on GHC).

Previously fixed in https://github.com/NixOS/nixpkgs/pull/349076.
---
 flake.nix | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index a82bb383c062..3bd0a48a5cce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,15 +98,26 @@
 
       checks = forAllSystems (
         system:
-        {
-          tarball = jobs.${system}.tarball;
-        }
+        { }
+        //
+          lib.optionalAttrs
+            (
+              # Exclude x86_64-freebsd because "Failed to evaluate rustc-wrapper-1.85.0: «broken»: is marked as broken"
+              system != "x86_64-freebsd"
+            )
+            {
+              tarball = jobs.${system}.tarball;
+            }
         //
           lib.optionalAttrs
             (
               self.legacyPackages.${system}.stdenv.hostPlatform.isLinux
               # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64
               && !self.legacyPackages.${system}.targetPlatform.isPower64
+              # Exclude armv6l-linux because "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')"
+              && system != "armv6l-linux"
+              # Exclude riscv64-linux because "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')"
+              && system != "riscv64-linux"
             )
             {
               # Test that ensures that the nixosSystem function can accept a lib argument
@@ -156,8 +167,8 @@
               system != "armv6l-linux"
               # Exclude riscv64-linux because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform"
               && system != "riscv64-linux"
-              # Exclude FreeBSD because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform"
-              && !self.legacyPackages.${system}.stdenv.hostPlatform.isFreeBSD
+              # Exclude x86_64-freebsd because "Package ‘ghc-9.6.6’ in .../pkgs/development/compilers/ghc/common-hadrian.nix:579 is not available on the requested hostPlatform"
+              && system != "x86_64-freebsd"
             )
             {
               /**
@@ -167,7 +178,15 @@
             }
       );
 
-      formatter = forAllSystems (system: (import ./ci { inherit system; }).fmt.pkg);
+      formatter = lib.filterAttrs (
+        system: _:
+        # Exclude armv6l-linux because "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')"
+        system != "armv6l-linux"
+        # Exclude riscv64-linux because "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')"
+        && system != "riscv64-linux"
+        # Exclude x86_64-freebsd because "Package ‘go-1.22.12-freebsd-amd64-bootstrap’ in /nix/store/0yw40qnrar3lvc5hax5n49abl57apjbn-source/pkgs/development/compilers/go/binary.nix:50 is not available on the requested hostPlatform"
+        && system != "x86_64-freebsd"
+      ) (forAllSystems (system: (import ./ci { inherit system; }).fmt.pkg));
 
       /**
         A nested structure of [packages](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) and other values.

From 06b7e29907477081045d9e563c2c3fe61f61e063 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 2 Apr 2025 07:55:32 -0700
Subject: [PATCH 058/225] ci/eval: check that flake outputs on all systems
 still evaluate

---
 .github/workflows/eval.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 82781f96c736..01149578af78 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -75,6 +75,9 @@ jobs:
         with:
           extra_nix_config: sandbox = true
 
+      - name: Ensure flake outputs on all systems still evaluate
+        run: nix --experimental-features 'nix-command flakes' flake check --all-systems --no-build ./nixpkgs
+
       - name: Query nixpkgs with aliases enabled to check for basic syntax errors
         run: |
           time nix-env -I ./nixpkgs -f ./nixpkgs -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null

From 1f6a34139487ead93ac72f56cc0f304d4cef74f0 Mon Sep 17 00:00:00 2001
From: Tanya <tanyaarora1866@gmail.com>
Date: Thu, 3 Apr 2025 09:02:12 +0530
Subject: [PATCH 059/225] session-desktop: 1.13.2 -> 1.15.2

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

diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix
index b9f31b07837c..61e408915c62 100644
--- a/pkgs/by-name/se/session-desktop/package.nix
+++ b/pkgs/by-name/se/session-desktop/package.nix
@@ -9,12 +9,12 @@
 }:
 
 let
-  version = "1.13.2";
+  version = "1.15.2";
   pname = "session-desktop";
 
   src = fetchurl {
-    url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
-    hash = "sha256-71v6CvlKa4m1LPG07eGhPqkpK60X4VrafCQyfjQR3rs=";
+    url = "https://github.com/session-foundation/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
+    hash = "sha256-xQ/Fjg04XgXUioCCU0+sOLaTWZV1z05EmzZCqEU++Ok=";
   };
   appimage = appimageTools.wrapType2 { inherit version pname src; };
   appimage-contents = appimageTools.extractType2 { inherit version pname src; };

From 8dc9adb7e6b3046d992cbf1ecea88de7d5028114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 13 Feb 2025 01:38:05 +0100
Subject: [PATCH 060/225] pocket-id: init at 0.42.1

Co-authored-by: ymstnt <21342713+YMSTNT@users.noreply.github.com>

s: 0.42.1 -> 0.44.0

s: 0.44.0 -> 0.45.0
---
 pkgs/by-name/po/pocket-id/package.nix | 115 ++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 pkgs/by-name/po/pocket-id/package.nix

diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
new file mode 100644
index 000000000000..f29410a8e3c5
--- /dev/null
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -0,0 +1,115 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  buildNpmPackage,
+  fetchurl,
+  makeWrapper,
+  nodejs,
+  stdenvNoCC,
+  nix-update-script,
+}:
+
+let
+  version = "0.45.0";
+  src = fetchFromGitHub {
+    owner = "pocket-id";
+    repo = "pocket-id";
+    tag = "v${version}";
+    hash = "sha256-x5Y3ArkIPxiE6avk9DNyFdfkc/pY6h3JH3PZCS8U/GM=";
+  };
+
+  backend = buildGoModule {
+    pname = "pocket-id-backend";
+    inherit version src;
+
+    sourceRoot = "${src.name}/backend";
+
+    vendorHash = "sha256-mqpBP+A2X5ome1Ppg/Kki0C+A77jFtWzUjI/RN+ZCzg=";
+
+    preFixup = ''
+      mv $out/bin/cmd $out/bin/pocket-id-backend
+    '';
+  };
+
+  frontend = buildNpmPackage (finalAttrs: {
+    pname = "pocket-id-frontend";
+    inherit version src;
+
+    sourceRoot = "${src.name}/frontend";
+
+    npmDepsHash = "sha256-cpmZzlz+wusfRLN4iIGdk+I4SWrX/gk2fbhg+Gg3paw=";
+    npmFlags = [ "--legacy-peer-deps" ];
+
+    nativeBuildInputs = [
+      makeWrapper
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      # even though vite build creates most of the minified js files,
+      # it still needs a few packages from node_modules, try to strip that
+      npm prune --omit=dev --omit=optional $npmFlags
+      # larger seemingly unused packages
+      rm -r node_modules/{lucide-svelte,bits-ui,jiti,@swc,.bin}
+      # unused file types
+      for pattern in '*.map' '*.map.js' '*.ts'; do
+        find . -type f -name "$pattern" -exec rm {} +
+      done
+
+      mkdir -p $out/{bin,lib/pocket-id-frontend}
+      cp -r build $out/lib/pocket-id-frontend/dist
+      cp -r node_modules $out/lib/pocket-id-frontend/node_modules
+      makeWrapper ${lib.getExe nodejs} $out/bin/pocket-id-frontend \
+        --add-flags $out/lib/pocket-id-frontend/dist/index.js
+
+      runHook postInstall
+    '';
+  });
+
+in
+stdenvNoCC.mkDerivation rec {
+  pname = "pocket-id";
+  inherit
+    version
+    src
+    backend
+    frontend
+    ;
+
+  dontUnpack = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    ln -s ${backend}/bin/pocket-id-backend $out/bin/pocket-id-backend
+    ln -s ${frontend}/bin/pocket-id-frontend $out/bin/pocket-id-frontend
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "backend"
+        "--subpackage"
+        "frontend"
+      ];
+    };
+  };
+
+  meta = {
+    description = "OIDC provider with passkeys support";
+    homepage = "https://pocket-id.org";
+    changelog = "https://github.com/pocket-id/pocket-id/releases/tag/v${version}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [
+      gepbird
+      ymstnt
+    ];
+    platforms = lib.platforms.unix;
+  };
+}

From 01be6580d38ccc3755bbe8408bf7b38bf075d746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 3 Apr 2025 06:49:33 +0200
Subject: [PATCH 061/225] nixos/pocket-id: init

Co-authored-by: ymstnt <21342713+YMSTNT@users.noreply.github.com>
---
 .../manual/release-notes/rl-2505.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/security/pocket-id.nix | 278 ++++++++++++++++++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/pocket-id.nix                     |  47 +++
 pkgs/by-name/po/pocket-id/package.nix         |   4 +
 6 files changed, 333 insertions(+)
 create mode 100644 nixos/modules/services/security/pocket-id.nix
 create mode 100644 nixos/tests/pocket-id.nix

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index f531ff61af86..9d05c32c697d 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -166,6 +166,8 @@
 
 - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable).
 
+- [pocket-id](https://pocket-id.org/), an OIDC provider with passkeys support. Available as [services.pocket-id](#opt-services.pocket-id.enable).
+
 - [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable).
 
 - [OpenGamepadUI](https://github.com/ShadowBlip/OpenGamepadUI/), an open source gamepad-native game launcher and overlay for Linux. Available as [programs.opengamepadui](#opt-programs.opengamepadui.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0a23a0d0d653..5aa0af4c442c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1419,6 +1419,7 @@
   ./services/security/paretosecurity.nix
   ./services/security/pass-secret-service.nix
   ./services/security/physlock.nix
+  ./services/security/pocket-id.nix
   ./services/security/shibboleth-sp.nix
   ./services/security/sks.nix
   ./services/security/sshguard.nix
diff --git a/nixos/modules/services/security/pocket-id.nix b/nixos/modules/services/security/pocket-id.nix
new file mode 100644
index 000000000000..87c13b638dcb
--- /dev/null
+++ b/nixos/modules/services/security/pocket-id.nix
@@ -0,0 +1,278 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+
+let
+  inherit (lib)
+    mkEnableOption
+    mkIf
+    mkOption
+    optionalAttrs
+    optional
+    mkPackageOption
+    ;
+  inherit (lib.types)
+    bool
+    path
+    str
+    submodule
+    ;
+
+  cfg = config.services.pocket-id;
+
+  format = pkgs.formats.keyValue { };
+  settingsFile = format.generate "pocket-id-env-vars" cfg.settings;
+in
+{
+  meta.maintainers = with lib.maintainers; [
+    gepbird
+    ymstnt
+  ];
+
+  options.services.pocket-id = {
+    enable = mkEnableOption "Pocket ID server";
+
+    package = mkPackageOption pkgs "pocket-id" { };
+
+    environmentFile = mkOption {
+      type = path;
+      description = ''
+        Path to an environment file loaded for the Pocket ID service.
+
+        This can be used to securely store tokens and secrets outside of the world-readable Nix store.
+
+        Example contents of the file:
+        MAXMIND_LICENSE_KEY=your-license-key
+      '';
+      default = "/dev/null";
+      example = "/var/lib/secrets/pocket-id";
+    };
+
+    settings = mkOption {
+      type = submodule {
+        freeformType = format.type;
+
+        options = {
+          PUBLIC_APP_URL = mkOption {
+            type = str;
+            description = ''
+              The URL where you will access the app.
+            '';
+            default = "http://localhost";
+          };
+
+          TRUST_PROXY = mkOption {
+            type = bool;
+            description = ''
+              Whether the app is behind a reverse proxy.
+            '';
+            default = false;
+          };
+        };
+      };
+
+      default = { };
+
+      description = ''
+        Environment variables that will be passed to Pocket ID, see
+        [configuration options](https://pocket-id.org/docs/configuration/environment-variables)
+        for supported values.
+      '';
+    };
+
+    dataDir = mkOption {
+      type = path;
+      default = "/var/lib/pocket-id";
+      description = ''
+        The directory where Pocket ID will store its data, such as the database.
+      '';
+    };
+
+    user = mkOption {
+      type = str;
+      default = "pocket-id";
+      description = "User account under which Pocket ID runs.";
+    };
+
+    group = mkOption {
+      type = str;
+      default = "pocket-id";
+      description = "Group account under which Pocket ID runs.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    warnings = (
+      optional (cfg.settings ? MAXMIND_LICENSE_KEY)
+        "config.services.pocket-id.settings.MAXMIND_LICENSE_KEY will be stored as plaintext in the Nix store. Use config.services.pocket-id.environmentFile instead."
+    );
+
+    systemd.tmpfiles.rules = [
+      "d ${cfg.dataDir} 0755 ${cfg.user} ${cfg.group}"
+    ];
+
+    systemd.services = {
+      pocket-id-backend = {
+        description = "Pocket ID backend";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        restartTriggers = [
+          cfg.package
+          cfg.environmentFile
+          settingsFile
+        ];
+
+        serviceConfig = {
+          Type = "simple";
+          User = cfg.user;
+          Group = cfg.group;
+          WorkingDirectory = cfg.dataDir;
+          ExecStart = "${cfg.package}/bin/pocket-id-backend";
+          Restart = "always";
+          EnvironmentFile = [
+            cfg.environmentFile
+            settingsFile
+          ];
+
+          # Hardening
+          AmbientCapabilities = "";
+          CapabilityBoundingSet = "";
+          DeviceAllow = "";
+          DevicePolicy = "closed";
+          #IPAddressDeny = "any"; # communicates with the frontend
+          LockPersonality = true;
+          MemoryDenyWriteExecute = true;
+          NoNewPrivileges = true;
+          PrivateDevices = true;
+          PrivateNetwork = false; # communicates with the frontend
+          PrivateTmp = true;
+          PrivateUsers = true;
+          ProcSubset = "pid";
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectProc = "invisible";
+          ProtectSystem = "full"; # needs to write in cfg.dataDir
+          RemoveIPC = true;
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+          ];
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          SystemCallArchitectures = "native";
+          SystemCallFilter = lib.concatStringsSep " " [
+            "~"
+            "@clock"
+            "@cpu-emulation"
+            "@debug"
+            "@module"
+            "@mount"
+            "@obsolete"
+            "@privileged"
+            "@raw-io"
+            "@reboot"
+            #"@resources" # vm test segfaults
+            "@swap"
+          ];
+          UMask = "0077";
+        };
+      };
+
+      pocket-id-frontend = {
+        description = "Pocket ID frontend";
+        after = [
+          "network.target"
+          "pocket-id-backend.service"
+        ];
+        wantedBy = [ "multi-user.target" ];
+        restartTriggers = [
+          cfg.package
+          cfg.environmentFile
+          settingsFile
+        ];
+
+        serviceConfig = {
+          Type = "simple";
+          User = cfg.user;
+          Group = cfg.group;
+          ExecStart = "${cfg.package}/bin/pocket-id-frontend";
+          Restart = "always";
+          EnvironmentFile = [
+            cfg.environmentFile
+            settingsFile
+          ];
+
+          # Hardening
+          AmbientCapabilities = "";
+          CapabilityBoundingSet = "";
+          DeviceAllow = "";
+          DevicePolicy = "closed";
+          #IPAddressDeny = "any"; # communicates with the backend and client
+          LockPersonality = true;
+          MemoryDenyWriteExecute = false; # V8_Fatal segfault
+          NoNewPrivileges = true;
+          PrivateDevices = true;
+          PrivateNetwork = false; # communicates with the backend and client
+          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"
+          ];
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          SystemCallArchitectures = "native";
+          SystemCallFilter = lib.concatStringsSep " " [
+            "~"
+            "@clock"
+            "@cpu-emulation"
+            "@debug"
+            "@module"
+            "@mount"
+            "@obsolete"
+            "@privileged"
+            "@raw-io"
+            "@reboot"
+            "@resources"
+            "@swap"
+          ];
+          UMask = "0077";
+        };
+      };
+    };
+
+    users.users = optionalAttrs (cfg.user == "pocket-id") {
+      pocket-id = {
+        isSystemUser = true;
+        group = cfg.group;
+        description = "Pocket ID backend user";
+        home = cfg.dataDir;
+      };
+    };
+
+    users.groups = optionalAttrs (cfg.group == "pocket-id") {
+      pocket-id = { };
+    };
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index cc8eecddf778..186e078c8451 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1039,6 +1039,7 @@ in
   pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix { };
   plikd = handleTest ./plikd.nix { };
   plotinus = handleTest ./plotinus.nix { };
+  pocket-id = handleTest ./pocket-id.nix { };
   podgrab = handleTest ./podgrab.nix { };
   podman = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./podman/default.nix { };
   podman-tls-ghostunnel = handleTestOn [
diff --git a/nixos/tests/pocket-id.nix b/nixos/tests/pocket-id.nix
new file mode 100644
index 000000000000..753fa251473f
--- /dev/null
+++ b/nixos/tests/pocket-id.nix
@@ -0,0 +1,47 @@
+import ./make-test-python.nix (
+  { lib, ... }:
+
+  {
+    name = "pocket-id";
+    meta.maintainers = with lib.maintainers; [
+      gepbird
+      ymstnt
+    ];
+
+    nodes = {
+      machine =
+        { ... }:
+        {
+          services.pocket-id = {
+            enable = true;
+            settings = {
+              PORT = 10001;
+              INTERNAL_BACKEND_URL = "http://localhost:10002";
+              BACKEND_PORT = 10002;
+            };
+          };
+        };
+    };
+
+    testScript =
+      { nodes, ... }:
+      let
+        inherit (nodes.machine.services.pocket-id) settings;
+        inherit (builtins) toString;
+      in
+      ''
+        machine.wait_for_unit("pocket-id-backend.service")
+        machine.wait_for_open_port(${toString settings.BACKEND_PORT})
+        machine.wait_for_unit("pocket-id-frontend.service")
+        machine.wait_for_open_port(${toString settings.PORT})
+
+        backend_status = machine.succeed("curl -L -o /tmp/backend-output -w '%{http_code}' http://localhost:${toString settings.BACKEND_PORT}/api/users/me")
+        assert backend_status == "401"
+        machine.succeed("grep 'You are not signed in' /tmp/backend-output")
+
+        frontend_status = machine.succeed("curl -L -o /tmp/frontend-output -w '%{http_code}' http://localhost:${toString settings.PORT}")
+        assert frontend_status == "200"
+        machine.succeed("grep 'Sign in to Pocket ID' /tmp/frontend-output")
+      '';
+  }
+)
diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index f29410a8e3c5..0fd97ab64c86 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -7,6 +7,7 @@
   makeWrapper,
   nodejs,
   stdenvNoCC,
+  nixosTests,
   nix-update-script,
 }:
 
@@ -91,6 +92,9 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   passthru = {
+    tests = {
+      inherit (nixosTests) pocket-id;
+    };
     updateScript = nix-update-script {
       extraArgs = [
         "--subpackage"

From 8a512d5e646722fd19b6bdc6a37ca810ee2faa91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 08:25:43 +0000
Subject: [PATCH 062/225] erlang_language_platform: 2025-02-13 -> 2025-04-02

---
 pkgs/by-name/er/erlang-language-platform/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix
index 1450966030a1..da80e66bec07 100644
--- a/pkgs/by-name/er/erlang-language-platform/package.nix
+++ b/pkgs/by-name/er/erlang-language-platform/package.nix
@@ -14,14 +14,14 @@ let
 
   hashes = {
     linux-aarch64-unknown-linux-gnu = "sha256-i6XsOK8csrJ/9TDzltA7mGjdutLZONFiYGV5tqSCy8o=";
-    linux-x86_64-unknown-linux-gnu = "sha256-gBIzG0LaP9qxivkr47JpBu1z9km7o/1Wppk/6k2WslE=";
+    linux-x86_64-unknown-linux-gnu = "sha256-XK3DPWIdPDoIL10EATa8p1bnlpZaOzOdU0LnuKbj++E=";
     macos-aarch64-apple-darwin = "sha256-8e5duQYDVFyZejMjuZPuWhg1on3CBku9eBuilG5p1BY=";
     macos-x86_64-apple-darwin = "sha256-dnouUBUUAkMr1h+IJWYamxmk8IC7JdeIUS9/YI0GzOU=";
   };
 in
 stdenv.mkDerivation rec {
   pname = "erlang-language-platform";
-  version = "2025-02-13";
+  version = "2025-04-02";
 
   src = fetchurl {
     url = "https://github.com/WhatsApp/erlang-language-platform/releases/download/${version}/elp-${release}-otp-26.2.tar.gz";

From 28fcb980fdd69611cc3e82ecf0d9566a1343951b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 08:29:37 +0000
Subject: [PATCH 063/225] rabbitmq-server: 4.0.7 -> 4.0.8

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

diff --git a/pkgs/by-name/ra/rabbitmq-server/package.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix
index 236533dcc3a2..c1bcbd99b138 100644
--- a/pkgs/by-name/ra/rabbitmq-server/package.nix
+++ b/pkgs/by-name/ra/rabbitmq-server/package.nix
@@ -42,12 +42,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "rabbitmq-server";
-  version = "4.0.7";
+  version = "4.0.8";
 
   # when updating, consider bumping elixir version in all-packages.nix
   src = fetchurl {
     url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-ScqNRa1itxawGyRruNihA60xbltw7Lek36SP9Nd+LfI=";
+    hash = "sha256-FWB5riSCb8WsGLfNJO6SZRtQxvHpwea+YosvvU8iqng=";
   };
 
   nativeBuildInputs = [

From 0a6d0ed714c8095382cff33d1fd46b9c0c60200f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 09:51:57 +0000
Subject: [PATCH 064/225] python312Packages.dissect-cobaltstrike: 1.2.0 ->
 1.2.1

---
 .../python-modules/dissect-cobaltstrike/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
index 343b9ea25a91..8cd3e3f982f6 100644
--- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
+++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-cobaltstrike";
-  version = "1.2.0";
+  version = "1.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.cobaltstrike";
     tag = "v${version}";
-    hash = "sha256-GMpMTsI4mepaOGhw7/cSymkcxzn4mlNS1ZKYGYut+LM=";
+    hash = "sha256-0Wi0H9jL7suF/d92Sg2LuE6M2EzbIWsEC7Jjd1eJGTw=";
   };
 
   build-system = [
@@ -75,7 +75,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Dissect module implementing a parser for Cobalt Strike related data";
     homepage = "https://github.com/fox-it/dissect.cobaltstrike";
-    changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${version}";
+    changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${src.tag}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ fab ];
   };

From 25743c5e4156f5abf007a8e9d77ce8af86194b4f Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 3 Apr 2025 19:08:09 +0800
Subject: [PATCH 065/225] elpa-packages: updated 2025-04-03 (from overlay)

---
 .../emacs/elisp-packages/elpa-generated.nix   | 326 ++++++++++++++----
 1 file changed, 263 insertions(+), 63 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index 943a50f8ed25..7b3feb57ad0f 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -1462,10 +1462,10 @@
     elpaBuild {
       pname = "compat";
       ename = "compat";
-      version = "30.0.2.0";
+      version = "30.1.0.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/compat-30.0.2.0.tar";
-        sha256 = "0pizq8vwfqls04in95rpnfwv4xc1r2qjpf41g6bjy826i53cfdx0";
+        url = "https://elpa.gnu.org/packages/compat-30.1.0.0.tar";
+        sha256 = "1wmq4sj3kkb4shvsi8djrk9znjxj20lm4v389jyn18q55gqigq6b";
       };
       packageRequires = [ seq ];
       meta = {
@@ -1526,10 +1526,10 @@
     elpaBuild {
       pname = "consult";
       ename = "consult";
-      version = "2.1";
+      version = "2.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/consult-2.1.tar";
-        sha256 = "0w88gpgkqjmllypckrkc54gm42yjsfjp4mj9q9pii8qir49sh8ls";
+        url = "https://elpa.gnu.org/packages/consult-2.2.tar";
+        sha256 = "082n0a27jpdz4z8g46m0c35s6xhca5s042wbzvrvh9hhd3mz64b7";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1639,10 +1639,10 @@
     elpaBuild {
       pname = "corfu";
       ename = "corfu";
-      version = "1.7";
+      version = "2.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/corfu-1.7.tar";
-        sha256 = "1jd6vrbsr5h1j8lsvdkhb1z3nrh1m11fi1hcvhh6nbhqnidwsrii";
+        url = "https://elpa.gnu.org/packages/corfu-2.0.tar";
+        sha256 = "0qih9km4l7i6isaskap9knqhqnjc85qlr2wrrik5cc8yl6yrc36g";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1684,10 +1684,10 @@
     elpaBuild {
       pname = "counsel";
       ename = "counsel";
-      version = "0.15.0";
+      version = "0.15.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/counsel-0.15.0.tar";
-        sha256 = "1mw13iw7ygnigjarcfg7lazrdwk7l17clxs2igf75kdkk4l4jgb4";
+        url = "https://elpa.gnu.org/packages/counsel-0.15.1.tar";
+        sha256 = "1sgaph2wb4mkxlfq6448i1kymaxhs7h37nrn7vzbp9fhik634rhc";
       };
       packageRequires = [
         ivy
@@ -2045,6 +2045,50 @@
       };
     }
   ) { };
+  denote-journal = callPackage (
+    {
+      denote,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-journal";
+      ename = "denote-journal";
+      version = "0.0.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/denote-journal-0.0.0.1.tar";
+        sha256 = "07xb58jqkh0nwzc8l8k1cvqdlkm7iyb3ajjndkz6kvg7vhxiaaqi";
+      };
+      packageRequires = [ denote ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/denote-journal.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  denote-markdown = callPackage (
+    {
+      denote,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-markdown";
+      ename = "denote-markdown";
+      version = "0.0.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/denote-markdown-0.0.0.1.tar";
+        sha256 = "1sn3h6jjclqwda5hch8c23s485w9sra2m3lqz9qcsjdcmb85cxk1";
+      };
+      packageRequires = [ denote ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/denote-markdown.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   denote-menu = callPackage (
     {
       denote,
@@ -2055,10 +2099,10 @@
     elpaBuild {
       pname = "denote-menu";
       ename = "denote-menu";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/denote-menu-1.3.0.tar";
-        sha256 = "0flkb3f1zpp3sbjx6h7qb6fnjgg44s53zkv3q3fj6cl7c0f11n02";
+        url = "https://elpa.gnu.org/packages/denote-menu-1.4.0.tar";
+        sha256 = "1lw8fyf749wmkrcn8ixvrias1a84wcgy9snlmlk0w2h02dqapazi";
       };
       packageRequires = [ denote ];
       meta = {
@@ -2067,6 +2111,28 @@
       };
     }
   ) { };
+  denote-org = callPackage (
+    {
+      denote,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-org";
+      ename = "denote-org";
+      version = "0.0.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/denote-org-0.0.0.1.tar";
+        sha256 = "0mipl5b728qwxwskc28jrvxjf1n5x25gggsrfx8qmdz5z4p0dglr";
+      };
+      packageRequires = [ denote ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/denote-org.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   denote-search = callPackage (
     {
       denote,
@@ -2089,6 +2155,50 @@
       };
     }
   ) { };
+  denote-sequence = callPackage (
+    {
+      denote,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-sequence";
+      ename = "denote-sequence";
+      version = "0.0.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/denote-sequence-0.0.0.1.tar";
+        sha256 = "0z947wk5n2ign2d36b1ahdldr99ir7cmvdhmq4i5dv2kwj36ga1n";
+      };
+      packageRequires = [ denote ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/denote-sequence.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  denote-silo = callPackage (
+    {
+      denote,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-silo";
+      ename = "denote-silo";
+      version = "0.0.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/denote-silo-0.0.0.1.tar";
+        sha256 = "011l6nd7wqjy2zwg0pifi1zqr1diay4i170binl78wv4bxd5z0ln";
+      };
+      packageRequires = [ denote ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/denote-silo.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   detached = callPackage (
     {
       elpaBuild,
@@ -2741,6 +2851,27 @@
       };
     }
   ) { };
+  el-job = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "el-job";
+      ename = "el-job";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/el-job-2.4.3.tar";
+        sha256 = "1iqbs2f71a0mmrmfr2l6dwr6l5h1399z14jv8zfl5zh8h75sm9pm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/el-job.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   el-search = callPackage (
     {
       cl-print ? null,
@@ -2873,10 +3004,10 @@
     elpaBuild {
       pname = "ellama";
       ename = "ellama";
-      version = "1.5.4";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/ellama-1.5.4.tar";
-        sha256 = "0kf25znwzc9mdy2adhramzcr30y9f8qa1q9s0swbsa4ilja7ks7w";
+        url = "https://elpa.gnu.org/packages/ellama-1.8.1.tar";
+        sha256 = "19n8zcgls4jiz7hacj564gb9y0sxdli2yl4j4d35c44pq52g2y6v";
       };
       packageRequires = [
         compat
@@ -3009,10 +3140,10 @@
     elpaBuild {
       pname = "emms";
       ename = "emms";
-      version = "21";
+      version = "22";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/emms-21.tar";
-        sha256 = "188rij39qqaya7hk0p05ygcw5vlha7qd6pm4ws6nfw7g0nv1rbcc";
+        url = "https://elpa.gnu.org/packages/emms-22.tar";
+        sha256 = "0jn8si9m8pxd7ni543p8z697297i9dva319dw141zwpbxqhmyvpi";
       };
       packageRequires = [
         cl-lib
@@ -3433,6 +3564,27 @@
       };
     }
   ) { };
+  flymake-clippy = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flymake-clippy";
+      ename = "flymake-clippy";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/flymake-clippy-1.1.0.tar";
+        sha256 = "1sij8qn7q9jvjnnnqqm152hnvkw079m66pwjyhvsqdqivqjvlnrd";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flymake-clippy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   flymake-codespell = callPackage (
     {
       compat,
@@ -3725,10 +3877,10 @@
     elpaBuild {
       pname = "gnome-dark-style";
       ename = "gnome-dark-style";
-      version = "0.2.2";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/gnome-dark-style-0.2.2.tar";
-        sha256 = "1vf0ka0xg8mvaq3s3b8rgsdv77q7qd73k9mqfvyk7ywhxj7zdb9i";
+        url = "https://elpa.gnu.org/packages/gnome-dark-style-0.2.3.tar";
+        sha256 = "04cp31252svf5pkkkmx9b6nlcv3v4xffn739bna77jjyrw98mhv5";
       };
       packageRequires = [ ];
       meta = {
@@ -4164,6 +4316,28 @@
       };
     }
   ) { };
+  hugoista = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "hugoista";
+      ename = "hugoista";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/hugoista-0.2.1.tar";
+        sha256 = "02rv1r2xr6dhkfqwgbrrsdajxv6inbny5biimkb0qcf3i8b43dih";
+      };
+      packageRequires = [ seq ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hugoista.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   hydra = callPackage (
     {
       cl-lib ? null,
@@ -4369,10 +4543,10 @@
     elpaBuild {
       pname = "ivy";
       ename = "ivy";
-      version = "0.15.0";
+      version = "0.15.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/ivy-0.15.0.tar";
-        sha256 = "13kikgvrhi2b6dg0py4n51kc881dv7bll71iaxq1bjlzdwvsn20h";
+        url = "https://elpa.gnu.org/packages/ivy-0.15.1.tar";
+        sha256 = "12ni3n8h7316hv4nrx4kbjah58n8zdxkf1v8fi0w39da1aqn3r0p";
       };
       packageRequires = [ ];
       meta = {
@@ -4392,10 +4566,10 @@
     elpaBuild {
       pname = "ivy-avy";
       ename = "ivy-avy";
-      version = "0.15.0";
+      version = "0.15.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/ivy-avy-0.15.0.tar";
-        sha256 = "0xqykxvsm7q81744qj4w7ma83v6s9a4wx4flywqch4dn7liaiqwj";
+        url = "https://elpa.gnu.org/packages/ivy-avy-0.15.1.tar";
+        sha256 = "0csysx22sf3bbfh000c2m48rzfn274km0zxbfbcx2871haskwva1";
       };
       packageRequires = [
         avy
@@ -4440,10 +4614,10 @@
     elpaBuild {
       pname = "ivy-hydra";
       ename = "ivy-hydra";
-      version = "0.15.0";
+      version = "0.15.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/ivy-hydra-0.15.0.tar";
-        sha256 = "1crznifig71l6h4zjsr39d2w02blw7vla1vafv0yhhj6ryd4030g";
+        url = "https://elpa.gnu.org/packages/ivy-hydra-0.15.1.tar";
+        sha256 = "16z3ic50zbx9iaw0w6fv04cxpl6qz81424jdian1br1942pz3kdy";
       };
       packageRequires = [
         hydra
@@ -5027,10 +5201,10 @@
     elpaBuild {
       pname = "llm";
       ename = "llm";
-      version = "0.24.1";
+      version = "0.24.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/llm-0.24.1.tar";
-        sha256 = "1vy62pg8hdakw0zbyl1fb8bvbhl2w36z683gbhjb71ikl3bqnav8";
+        url = "https://elpa.gnu.org/packages/llm-0.24.2.tar";
+        sha256 = "16d3758k1xc1w8am9yjzmgri2ijw4gpyaxqvsc1db08ravzqnc21";
       };
       packageRequires = [
         plz
@@ -5264,10 +5438,10 @@
     elpaBuild {
       pname = "marginalia";
       ename = "marginalia";
-      version = "1.8";
+      version = "2.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/marginalia-1.8.tar";
-        sha256 = "0q8mflfsl4vj2r2m47jgm5hrg3a4k5pildb53vlgm5k9wb4sd7md";
+        url = "https://elpa.gnu.org/packages/marginalia-2.0.tar";
+        sha256 = "1qklwzz0swd96vdqymbm91y6h53id6ch1lr1dpdwmz6qknwamrlc";
       };
       packageRequires = [ compat ];
       meta = {
@@ -5530,6 +5704,32 @@
       };
     }
   ) { };
+  minuet = callPackage (
+    {
+      dash,
+      elpaBuild,
+      fetchurl,
+      lib,
+      plz,
+    }:
+    elpaBuild {
+      pname = "minuet";
+      ename = "minuet";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/minuet-0.4.4.tar";
+        sha256 = "0ci47awqky1c28zk3azd4id9wcpd3n9nj5jw5s8ji613kqc1nqs2";
+      };
+      packageRequires = [
+        dash
+        plz
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/minuet.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   mmm-mode = callPackage (
     {
       cl-lib ? null,
@@ -5582,10 +5782,10 @@
     elpaBuild {
       pname = "mpdired";
       ename = "mpdired";
-      version = "2";
+      version = "3";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/mpdired-2.tar";
-        sha256 = "0synpanyqka8nyz9mma69na307vm5pjvn21znbdvz56gka2mbg23";
+        url = "https://elpa.gnu.org/packages/mpdired-3.tar";
+        sha256 = "19qkg7cjh037l4cw3q0b52hpp3fwmly6alc7z683baiz5fklcjc8";
       };
       packageRequires = [ ];
       meta = {
@@ -6118,10 +6318,10 @@
     elpaBuild {
       pname = "orderless";
       ename = "orderless";
-      version = "1.3";
+      version = "1.4";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/orderless-1.3.tar";
-        sha256 = "1gh2xw34adk5q6v9sz42j5mwyjjp1yix70jvjylnapwsjjsjm5qk";
+        url = "https://elpa.gnu.org/packages/orderless-1.4.tar";
+        sha256 = "151df7azrhyxaa768bp6mxmc44mmc4h1x180s2a9ns4b3lsfczrv";
       };
       packageRequires = [ compat ];
       meta = {
@@ -6139,10 +6339,10 @@
     elpaBuild {
       pname = "org";
       ename = "org";
-      version = "9.7.25";
+      version = "9.7.27";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/org-9.7.25.tar";
-        sha256 = "0isa5mqsmnyw874kh980kal4r45h6qdzizg186lvczmhdqir85bm";
+        url = "https://elpa.gnu.org/packages/org-9.7.27.tar";
+        sha256 = "0y2x94qxi6wa7mrcdppyynylv9j5sszik25bmjwsfriiwqwk5gp6";
       };
       packageRequires = [ ];
       meta = {
@@ -8503,10 +8703,10 @@
     elpaBuild {
       pname = "swiper";
       ename = "swiper";
-      version = "0.15.0";
+      version = "0.15.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/swiper-0.15.0.tar";
-        sha256 = "16vznhb8zqzqvg3i2pkwfani2h19dm08aj7qv334mlyj97rv1ppn";
+        url = "https://elpa.gnu.org/packages/swiper-0.15.1.tar";
+        sha256 = "0m70jgcdsbrj6i5b1srrdgzkwavzi098532fv6vi2051nl42snvz";
       };
       packageRequires = [ ivy ];
       meta = {
@@ -8701,10 +8901,10 @@
     elpaBuild {
       pname = "tempel";
       ename = "tempel";
-      version = "1.3";
+      version = "1.4";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/tempel-1.3.tar";
-        sha256 = "0fivsldisk17a1vbzx91kmvsd85vl0dnih77pqnzriyqs8dl1wdm";
+        url = "https://elpa.gnu.org/packages/tempel-1.4.tar";
+        sha256 = "0gh573np15wdy7vd0zj92ivslaga7kalmnkdjlfiw5pamyy5xsl4";
       };
       packageRequires = [ compat ];
       meta = {
@@ -8765,10 +8965,10 @@
     elpaBuild {
       pname = "tex-parens";
       ename = "tex-parens";
-      version = "0.6";
+      version = "0.7";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/tex-parens-0.6.tar";
-        sha256 = "0pgzs0fw2ijns2xqbyq7whlhjjrhp0axja0381q9v75c7fxrp6ba";
+        url = "https://elpa.gnu.org/packages/tex-parens-0.7.tar";
+        sha256 = "1h3l4kn154mmzxgz6s7y2qrkpqk4ava3j1iwx07gsgnr5pcpgvfr";
       };
       packageRequires = [ ];
       meta = {
@@ -9026,10 +9226,10 @@
     elpaBuild {
       pname = "transient";
       ename = "transient";
-      version = "0.8.5";
+      version = "0.8.7";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/transient-0.8.5.tar";
-        sha256 = "0ydxddlf9aniindgi135rj3c1d1ar5qi5kwh1qkdff9124d6f0kh";
+        url = "https://elpa.gnu.org/packages/transient-0.8.7.tar";
+        sha256 = "0j4n8zqnc2l2p6hy3k9b7zahzqxwk8d239whnn0yjp91z11i945c";
       };
       packageRequires = [
         compat
@@ -9692,10 +9892,10 @@
     elpaBuild {
       pname = "vundo";
       ename = "vundo";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/vundo-2.3.0.tar";
-        sha256 = "165y277fi0vp9301hy3pqgfnf160k29n8vri0zyq8a3vz3f8lqrl";
+        url = "https://elpa.gnu.org/packages/vundo-2.4.0.tar";
+        sha256 = "1aj2l6iivgv6mh3rvrj8w8jhznx7cywn5f2b2ivl4hmrxlfbgsjr";
       };
       packageRequires = [ ];
       meta = {

From 46199ef3a3e3e683da2ecc93533e25c9681fbfa5 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 3 Apr 2025 19:08:11 +0800
Subject: [PATCH 066/225] elpa-devel-packages: updated 2025-04-03 (from
 overlay)

---
 .../elisp-packages/elpa-devel-generated.nix   | 608 ++++++++++++------
 1 file changed, 414 insertions(+), 194 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
index aa4db82bb4a2..39968fe8704f 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
@@ -9,10 +9,10 @@
     elpaBuild {
       pname = "a68-mode";
       ename = "a68-mode";
-      version = "1.0.0.20250226.200747";
+      version = "1.0.0.20250322.101009";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/a68-mode-1.0.0.20250226.200747.tar";
-        sha256 = "1h07lgxrrr3838hnl2zzdfm4gj7d6gbdsmnzdbmnzz8h65pk1x93";
+        url = "https://elpa.gnu.org/devel/a68-mode-1.0.0.20250322.101009.tar";
+        sha256 = "0wisz07vd5ciqd81hncxs7pcipmg0ip3lbisnrjx9k21gy4zaj62";
       };
       packageRequires = [ ];
       meta = {
@@ -440,10 +440,10 @@
     elpaBuild {
       pname = "async";
       ename = "async";
-      version = "1.9.9.0.20241126.81020";
+      version = "1.9.9.0.20250325.50900";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/async-1.9.9.0.20241126.81020.tar";
-        sha256 = "0h101k5s68kgki9s50pg2hgwqrbnf21mcvcwxgy9jbrbs64snh4a";
+        url = "https://elpa.gnu.org/devel/async-1.9.9.0.20250325.50900.tar";
+        sha256 = "094wj61sh7v8qamysmrpdclm93p8w33nq9vs9j2c1jpjskd5m3jh";
       };
       packageRequires = [ ];
       meta = {
@@ -461,10 +461,10 @@
     elpaBuild {
       pname = "auctex";
       ename = "auctex";
-      version = "14.0.9.0.20250312.215110";
+      version = "14.0.9.0.20250401.125949";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/auctex-14.0.9.0.20250312.215110.tar";
-        sha256 = "1xphcw0p1q9snk420l9x9xy02lgjxdm4m7d3vynwkb3lcwz9hi3s";
+        url = "https://elpa.gnu.org/devel/auctex-14.0.9.0.20250401.125949.tar";
+        sha256 = "1nbf08jz1i5n9iwijswhv8x0kknv9wlkpfnj58rxgjqgb6pnxw9z";
       };
       packageRequires = [ ];
       meta = {
@@ -761,10 +761,10 @@
     elpaBuild {
       pname = "bicep-ts-mode";
       ename = "bicep-ts-mode";
-      version = "0.1.4.0.20250312.213251";
+      version = "0.1.4.0.20250320.94622";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.4.0.20250312.213251.tar";
-        sha256 = "10vzdld0776gsmjg0wfk731vvwlaw7zf0zhccw0crf7hr5rhhfhg";
+        url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.4.0.20250320.94622.tar";
+        sha256 = "1psvm6g2mklyqfa349ikx78l3hfkw3xr9314schc7j73m9mlbj44";
       };
       packageRequires = [ ];
       meta = {
@@ -875,10 +875,10 @@
     elpaBuild {
       pname = "boxy";
       ename = "boxy";
-      version = "2.0.0.0.20250104.25705";
+      version = "2.0.0.0.20250325.150735";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/boxy-2.0.0.0.20250104.25705.tar";
-        sha256 = "1zy4vwlzm5gqhw2slg6j760b3hd1x989wx5p9xi9gqi2gaa43a1m";
+        url = "https://elpa.gnu.org/devel/boxy-2.0.0.0.20250325.150735.tar";
+        sha256 = "1qk6z7z9ya9d173c3ic5wmxvjq4gdk3z6817inpq43l2npq15hi6";
       };
       packageRequires = [ ];
       meta = {
@@ -1105,10 +1105,10 @@
     elpaBuild {
       pname = "cape";
       ename = "cape";
-      version = "2.0.0.20250311.165029";
+      version = "2.0.0.20250315.85532";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/cape-2.0.0.20250311.165029.tar";
-        sha256 = "1birjf3znacrv82vx8y346xhmzy4ssrd9hmdwp0jjin440lfd7wc";
+        url = "https://elpa.gnu.org/devel/cape-2.0.0.20250315.85532.tar";
+        sha256 = "0jvn4schd8d2dks0wmprl9q4ads7yal60a9yblhpbgpsvn7jn5cf";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1318,10 +1318,10 @@
     elpaBuild {
       pname = "colorful-mode";
       ename = "colorful-mode";
-      version = "1.2.3.0.20250310.213131";
+      version = "1.2.3.0.20250330.183449";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/colorful-mode-1.2.3.0.20250310.213131.tar";
-        sha256 = "1k457wzqbyps7wrhk7klpa06jnw9mbf00g2cp52l76911hcmfwbj";
+        url = "https://elpa.gnu.org/devel/colorful-mode-1.2.3.0.20250330.183449.tar";
+        sha256 = "1xj4020g8k2h18syd6vns09glhhziq0x5q86siq47zqyw8v9046k";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1482,10 +1482,10 @@
     elpaBuild {
       pname = "compat";
       ename = "compat";
-      version = "30.0.2.0.0.20250308.104508";
+      version = "30.1.0.0.0.20250402.70347";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/compat-30.0.2.0.0.20250308.104508.tar";
-        sha256 = "1rri9hknrzkm51vq9m6ji6w6zrdglvr3k3345lwd5vl79lfqhv5c";
+        url = "https://elpa.gnu.org/devel/compat-30.1.0.0.0.20250402.70347.tar";
+        sha256 = "19xc2x70x539dp5c69dn796yq6ya2xjbfsjzs45sh3ikr76ki7w6";
       };
       packageRequires = [ seq ];
       meta = {
@@ -1546,10 +1546,10 @@
     elpaBuild {
       pname = "consult";
       ename = "consult";
-      version = "2.1.0.20250311.165829";
+      version = "2.2.0.20250402.65908";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-2.1.0.20250311.165829.tar";
-        sha256 = "1j5xz5985dgwkcvw44arxndjyylbzmcz51j8rq48hdb5206jpgfj";
+        url = "https://elpa.gnu.org/devel/consult-2.2.0.20250402.65908.tar";
+        sha256 = "001v9pf0aknbni1jmrm7wk8fkc8f01qz0mvi665sxngfzncviz03";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1569,10 +1569,10 @@
     elpaBuild {
       pname = "consult-denote";
       ename = "consult-denote";
-      version = "0.2.4.0.20250121.61759";
+      version = "0.2.4.0.20250325.81913";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-denote-0.2.4.0.20250121.61759.tar";
-        sha256 = "0xcwg4zcpzvyjcmways1v41v78myaxv7kasgh3xhwfy17wyh87y9";
+        url = "https://elpa.gnu.org/devel/consult-denote-0.2.4.0.20250325.81913.tar";
+        sha256 = "1cw4yxh76xg68my7d6nsi9hdy7iflw11rnyk7hq7yrgfhr4ynfsw";
       };
       packageRequires = [
         consult
@@ -1659,10 +1659,10 @@
     elpaBuild {
       pname = "corfu";
       ename = "corfu";
-      version = "1.7.0.20250219.165655";
+      version = "2.0.0.20250328.143011";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/corfu-1.7.0.20250219.165655.tar";
-        sha256 = "0xk3sqba3aii619rv7rjm5pvzaj3mvirk4hv7yijr1cd3qp7jghf";
+        url = "https://elpa.gnu.org/devel/corfu-2.0.0.20250328.143011.tar";
+        sha256 = "0s43c3sr5d33q980nn0rci4g7x737nrm4p7bclgi35dwn0svgpcw";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1704,10 +1704,10 @@
     elpaBuild {
       pname = "counsel";
       ename = "counsel";
-      version = "0.15.0.0.20250304.94445";
+      version = "0.15.1.0.20250329.151454";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/counsel-0.15.0.0.20250304.94445.tar";
-        sha256 = "051nbhrhq92h64cwmjavcljyxy99qn1j4awjlsrf75023r5j3ii3";
+        url = "https://elpa.gnu.org/devel/counsel-0.15.1.0.20250329.151454.tar";
+        sha256 = "0fnxgf08dkq16d65xcaa822vasdqzixmd7ihw48hncx80jzqk1s6";
       };
       packageRequires = [
         ivy
@@ -1940,10 +1940,10 @@
     elpaBuild {
       pname = "dape";
       ename = "dape";
-      version = "0.23.0.0.20250310.201518";
+      version = "0.23.0.0.20250330.183823";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/dape-0.23.0.0.20250310.201518.tar";
-        sha256 = "1g8nq6bhzh7kg8gw8f45lj5a6x25965qfyrzyzaapif0ndxfvpxc";
+        url = "https://elpa.gnu.org/devel/dape-0.23.0.0.20250330.183823.tar";
+        sha256 = "0p4511jm8hi9bb832g8f1w1v4dy5maabfi9mgkr3plzpyk5xrvia";
       };
       packageRequires = [ jsonrpc ];
       meta = {
@@ -2074,10 +2074,10 @@
     elpaBuild {
       pname = "denote";
       ename = "denote";
-      version = "3.1.0.0.20250311.152457";
+      version = "3.1.0.0.20250331.81427";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20250311.152457.tar";
-        sha256 = "1xvkfzqqnm27dml3l8ldnprwwkh5gkm39rmasvzin89z74aywq2j";
+        url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20250331.81427.tar";
+        sha256 = "0hh116prs73s7ykv9vsqmi7s4snavg7yadhp0rgc4djk0anw58s5";
       };
       packageRequires = [ ];
       meta = {
@@ -2086,6 +2086,50 @@
       };
     }
   ) { };
+  denote-journal = callPackage (
+    {
+      denote,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-journal";
+      ename = "denote-journal";
+      version = "0.0.0.1.0.20250402.42932";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/denote-journal-0.0.0.1.0.20250402.42932.tar";
+        sha256 = "1bdh2pj9vp8nfvmps5m4rxvnddmrl9f7m7r9pqspi62rr35a1zx7";
+      };
+      packageRequires = [ denote ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/denote-journal.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  denote-markdown = callPackage (
+    {
+      denote,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-markdown";
+      ename = "denote-markdown";
+      version = "0.0.0.1.0.20250322.71429";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/denote-markdown-0.0.0.1.0.20250322.71429.tar";
+        sha256 = "1b87h16s0ic1b8r4hj1vddqd62amsh1bs1ps2kxbydxjq3hs5ijn";
+      };
+      packageRequires = [ denote ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/denote-markdown.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   denote-menu = callPackage (
     {
       denote,
@@ -2096,10 +2140,10 @@
     elpaBuild {
       pname = "denote-menu";
       ename = "denote-menu";
-      version = "1.3.0.0.20240813.204446";
+      version = "1.4.0.0.20250317.132443";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-menu-1.3.0.0.20240813.204446.tar";
-        sha256 = "0ifs4f1x9cgz324cj57f86qifwx0pnzvq12ma0b55s3din0xsvcc";
+        url = "https://elpa.gnu.org/devel/denote-menu-1.4.0.0.20250317.132443.tar";
+        sha256 = "0xrqfc3ik8n6d76s1rmqnh8v7h8plhm8lm3i714kscmpkzkd9wsp";
       };
       packageRequires = [ denote ];
       meta = {
@@ -2108,6 +2152,28 @@
       };
     }
   ) { };
+  denote-org = callPackage (
+    {
+      denote,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-org";
+      ename = "denote-org";
+      version = "0.0.0.1.0.20250322.71330";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/denote-org-0.0.0.1.0.20250322.71330.tar";
+        sha256 = "05ywsfg7mxq6kh8p742mz8j7d9jhzjbp1kl59a6zrp08yn0gl6f7";
+      };
+      packageRequires = [ denote ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/denote-org.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   denote-search = callPackage (
     {
       denote,
@@ -2118,10 +2184,10 @@
     elpaBuild {
       pname = "denote-search";
       ename = "denote-search";
-      version = "1.0.3.0.20250302.121931";
+      version = "1.0.3.0.20250330.114925";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-search-1.0.3.0.20250302.121931.tar";
-        sha256 = "1di64988dwldzfhbnc12y5czmrfc531lrq5glbny659fz73qimxx";
+        url = "https://elpa.gnu.org/devel/denote-search-1.0.3.0.20250330.114925.tar";
+        sha256 = "1dfvvjh2rhj2wk614rcvnps67v6z71ipnvqzygbvysq8f0cdkcza";
       };
       packageRequires = [ denote ];
       meta = {
@@ -2130,6 +2196,50 @@
       };
     }
   ) { };
+  denote-sequence = callPackage (
+    {
+      denote,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-sequence";
+      ename = "denote-sequence";
+      version = "0.0.0.1.0.20250401.84519";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/denote-sequence-0.0.0.1.0.20250401.84519.tar";
+        sha256 = "1cvwp507mljp4d7c9z8nbf2yhz531wdp8rshbmc01pd3qkxw6hhz";
+      };
+      packageRequires = [ denote ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/denote-sequence.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  denote-silo = callPackage (
+    {
+      denote,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-silo";
+      ename = "denote-silo";
+      version = "0.0.0.1.0.20250322.71039";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/denote-silo-0.0.0.1.0.20250322.71039.tar";
+        sha256 = "05cgwfa0yvpillj4zqsqmhi92kg84xs3fmqd94vbdxg7byf6dfka";
+      };
+      packageRequires = [ denote ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/denote-silo.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   detached = callPackage (
     {
       elpaBuild,
@@ -2208,10 +2318,10 @@
     elpaBuild {
       pname = "dicom";
       ename = "dicom";
-      version = "0.5.0.20250114.192652";
+      version = "0.5.0.20250322.120827";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/dicom-0.5.0.20250114.192652.tar";
-        sha256 = "10rf7adxxpghd1xpww0jaqxpzzq02whp9many1336gfpvcclmxkb";
+        url = "https://elpa.gnu.org/devel/dicom-0.5.0.20250322.120827.tar";
+        sha256 = "09qrvvadvdrab7p70w8b0mj40vvx3prkbqrfprnk95r5absvdzyb";
       };
       packageRequires = [ compat ];
       meta = {
@@ -2258,10 +2368,10 @@
     elpaBuild {
       pname = "diff-hl";
       ename = "diff-hl";
-      version = "1.10.0.0.20250223.232014";
+      version = "1.10.0.0.20250327.31410";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20250223.232014.tar";
-        sha256 = "1bcjrkqilzpc116af3gxz8gwb2p7vz57i2bcv7xz8mbsz8yqma8r";
+        url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20250327.31410.tar";
+        sha256 = "0j594as6idkzyiqns2n41qh909zb490cfkdh025i2jymcv5k24lr";
       };
       packageRequires = [ cl-lib ];
       meta = {
@@ -2385,10 +2495,10 @@
     elpaBuild {
       pname = "dired-preview";
       ename = "dired-preview";
-      version = "0.4.0.0.20250305.70339";
+      version = "0.4.0.0.20250318.50115";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/dired-preview-0.4.0.0.20250305.70339.tar";
-        sha256 = "1xq6qwp90qqacnnr4h0fc66inhn2pf37s8zhi26df8amxpxb7cim";
+        url = "https://elpa.gnu.org/devel/dired-preview-0.4.0.0.20250318.50115.tar";
+        sha256 = "0xkh3izw0m2bghahw684yhp4pplqgsja0h7k67prfp1rhg0nkp5n";
       };
       packageRequires = [ ];
       meta = {
@@ -2763,10 +2873,10 @@
     elpaBuild {
       pname = "eglot";
       ename = "eglot";
-      version = "1.18.0.20250308.53648";
+      version = "1.18.0.20250329.174949";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/eglot-1.18.0.20250308.53648.tar";
-        sha256 = "0km41xslg9d1gv6dl7kldzg4aw8fg797nnbr45m91ywgj2cxiicl";
+        url = "https://elpa.gnu.org/devel/eglot-1.18.0.20250329.174949.tar";
+        sha256 = "1kb90wkqxb9cnqfm4v6139n6wzalzk0war7skd1pm9yxgwfk23lj";
       };
       packageRequires = [
         eldoc
@@ -2783,6 +2893,27 @@
       };
     }
   ) { };
+  el-job = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "el-job";
+      ename = "el-job";
+      version = "2.4.3.0.20250327.30600";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/el-job-2.4.3.0.20250327.30600.tar";
+        sha256 = "12mpsky46qrm9aj67sp1df05rl7p0hn9ikd718hk6gbipyd2jcra";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/el-job.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   el-search = callPackage (
     {
       cl-print ? null,
@@ -2818,10 +2949,10 @@
     elpaBuild {
       pname = "eldoc";
       ename = "eldoc";
-      version = "1.15.0.0.20250304.14245";
+      version = "1.15.0.0.20250329.105231";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20250304.14245.tar";
-        sha256 = "1spns425l79zjc2p0xvs8i3g6ap30l8fi1shb8gdbfn5blkb1phz";
+        url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20250329.105231.tar";
+        sha256 = "0jzsa6m4k2wg7frlbc6mn0g3lwlhbgrhg10ik2yp3fcdav5nfkq1";
       };
       packageRequires = [ ];
       meta = {
@@ -2915,10 +3046,10 @@
     elpaBuild {
       pname = "ellama";
       ename = "ellama";
-      version = "1.5.4.0.20250312.193157";
+      version = "1.8.1.0.20250402.164949";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ellama-1.5.4.0.20250312.193157.tar";
-        sha256 = "0sqfkv552ibcyfi8q69xxlfghi46908xk7fb6qhz5c7i0d933r96";
+        url = "https://elpa.gnu.org/devel/ellama-1.8.1.0.20250402.164949.tar";
+        sha256 = "04ydy4lapx67r6lcg9dardvzznda2wisffzz3g9fxiyxrri5810w";
       };
       packageRequires = [
         compat
@@ -3051,10 +3182,10 @@
     elpaBuild {
       pname = "emms";
       ename = "emms";
-      version = "21.0.20250204.152247";
+      version = "22.0.20250326.124336";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/emms-21.0.20250204.152247.tar";
-        sha256 = "00m56k9j69xh03agj5xsw61brz69r54n2qqkyg0gs1ahaqcf52cc";
+        url = "https://elpa.gnu.org/devel/emms-22.0.20250326.124336.tar";
+        sha256 = "0d0n1lmhvqdbkdw4in1625a1wzh0phzj19nhlq3zdmqkzk6fqv4g";
       };
       packageRequires = [
         cl-lib
@@ -3284,10 +3415,10 @@
     elpaBuild {
       pname = "external-completion";
       ename = "external-completion";
-      version = "0.1.0.20250101.73917";
+      version = "0.1.0.20250329.135944";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20250101.73917.tar";
-        sha256 = "1z3an1r72sxw4l5xlrshxcdmyv3slzqfk42wwg7zi25lq2wf60pg";
+        url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20250329.135944.tar";
+        sha256 = "00hgqksypn9mr6acbyf2xxzg84z6cfrmldzv3ssg9j5zxg0pf4n4";
       };
       packageRequires = [ ];
       meta = {
@@ -3307,10 +3438,10 @@
     elpaBuild {
       pname = "exwm";
       ename = "exwm";
-      version = "0.33.0.20250125.112727";
+      version = "0.33.0.20250319.185706";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/exwm-0.33.0.20250125.112727.tar";
-        sha256 = "12lcqab9ichia738md0rw6xpcl4syy4l5nasryyf46dcjlph5scm";
+        url = "https://elpa.gnu.org/devel/exwm-0.33.0.20250319.185706.tar";
+        sha256 = "0svn8wix5rk6wj3xbj20csidm61xb35bnmskc043ybyzriyzwrx4";
       };
       packageRequires = [
         compat
@@ -3462,10 +3593,10 @@
     elpaBuild {
       pname = "flymake";
       ename = "flymake";
-      version = "1.3.7.0.20250225.2515";
+      version = "1.3.7.0.20250327.181545";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20250225.2515.tar";
-        sha256 = "0n7ffwfgz6s3rkl1fw0zzaqknzm93xr7vpc92h3grfjgrkl7526a";
+        url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20250327.181545.tar";
+        sha256 = "14q04ih94qb8ff2mnl9lbmgza3rdny1cy81nl0p3akk47sn2vwk1";
       };
       packageRequires = [
         eldoc
@@ -3477,6 +3608,27 @@
       };
     }
   ) { };
+  flymake-clippy = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flymake-clippy";
+      ename = "flymake-clippy";
+      version = "1.1.0.0.20250323.141048";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/flymake-clippy-1.1.0.0.20250323.141048.tar";
+        sha256 = "04w4z16iny2z22wffzgrkijsxyjcd24p2ip5yx35wvk7np6r3hxk";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/flymake-clippy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   flymake-codespell = callPackage (
     {
       compat,
@@ -3769,10 +3921,10 @@
     elpaBuild {
       pname = "gnome-dark-style";
       ename = "gnome-dark-style";
-      version = "0.2.2.0.20250309.73232";
+      version = "0.2.3.0.20250325.182321";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/gnome-dark-style-0.2.2.0.20250309.73232.tar";
-        sha256 = "09bplrzfik4hqg041a0992nd64wnr208sr37dd013n992gwj7gqn";
+        url = "https://elpa.gnu.org/devel/gnome-dark-style-0.2.3.0.20250325.182321.tar";
+        sha256 = "1kk6pgl79zgd2jvnh011177080w7vz2561mqi88s1rpv43lf4qxa";
       };
       packageRequires = [ ];
       meta = {
@@ -4208,6 +4360,28 @@
       };
     }
   ) { };
+  hugoista = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "hugoista";
+      ename = "hugoista";
+      version = "0.2.1.0.20250324.144142";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/hugoista-0.2.1.0.20250324.144142.tar";
+        sha256 = "0kmm5zdy8jw1hzr11f9aahqsbnclr1qlphh6picpyh7x0sc2nl2z";
+      };
+      packageRequires = [ seq ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/hugoista.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   hydra = callPackage (
     {
       elpaBuild,
@@ -4218,10 +4392,10 @@
     elpaBuild {
       pname = "hydra";
       ename = "hydra";
-      version = "0.15.0.0.20221030.224757";
+      version = "0.15.0.0.20250316.223951";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/hydra-0.15.0.0.20221030.224757.tar";
-        sha256 = "1d8xdxv9j3vb0jkq6bx3f6kbjc990lbmdr78yqchai861hhllmdn";
+        url = "https://elpa.gnu.org/devel/hydra-0.15.0.0.20250316.223951.tar";
+        sha256 = "1zm3d5pcyblsq0r7aapwcankk80xls3821bvjf12cnzmapy9772a";
       };
       packageRequires = [ lv ];
       meta = {
@@ -4239,10 +4413,10 @@
     elpaBuild {
       pname = "hyperbole";
       ename = "hyperbole";
-      version = "9.0.2pre0.20250305.163914";
+      version = "9.0.2pre0.20250331.73512";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20250305.163914.tar";
-        sha256 = "1w7kql8q62h5fm496bdp6gq7j6f6lbp3bz1h1g3vb7qplbx4mkys";
+        url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20250331.73512.tar";
+        sha256 = "1y9xqfznlh827x3arram5yq6wj2r32pjcrd8pdlnzk4yq8zjmx37";
       };
       packageRequires = [ ];
       meta = {
@@ -4409,10 +4583,10 @@
     elpaBuild {
       pname = "ivy";
       ename = "ivy";
-      version = "0.15.0.0.20250225.83943";
+      version = "0.15.1.0.20250329.144259";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ivy-0.15.0.0.20250225.83943.tar";
-        sha256 = "1h26hx2cvw73nlaryrqhdmxsyagqzcy9iiiglxihq4sp302kcqar";
+        url = "https://elpa.gnu.org/devel/ivy-0.15.1.0.20250329.144259.tar";
+        sha256 = "0zq2g603sqnvjmyib4q69nia4dvci6p2bmpvnsghwb6kbfm99wlv";
       };
       packageRequires = [ ];
       meta = {
@@ -4432,10 +4606,10 @@
     elpaBuild {
       pname = "ivy-avy";
       ename = "ivy-avy";
-      version = "0.15.0.0.20250225.84011";
+      version = "0.15.1.0.20250329.150930";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ivy-avy-0.15.0.0.20250225.84011.tar";
-        sha256 = "0c4azhg0p6b3gbcnmi6v7g4x0x2zkfs1qv0c9nbqpr5cjh0x0bgk";
+        url = "https://elpa.gnu.org/devel/ivy-avy-0.15.1.0.20250329.150930.tar";
+        sha256 = "0zqjfv86p52nr5vfmnliw5awsrzxalhlqwkninnp9sxgdib59z0k";
       };
       packageRequires = [
         avy
@@ -4480,10 +4654,10 @@
     elpaBuild {
       pname = "ivy-hydra";
       ename = "ivy-hydra";
-      version = "0.15.0.0.20250225.84034";
+      version = "0.15.1.0.20250329.151244";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ivy-hydra-0.15.0.0.20250225.84034.tar";
-        sha256 = "0ammfla2zvzzy4cy80ki8404qij3766gnwmqjjd4ld102jn606m8";
+        url = "https://elpa.gnu.org/devel/ivy-hydra-0.15.1.0.20250329.151244.tar";
+        sha256 = "19a9bs0hynz203zw6f1y3khgyd3nv7mf3pp2da5gd6h0012j3k5s";
       };
       packageRequires = [
         hydra
@@ -4616,10 +4790,10 @@
     elpaBuild {
       pname = "jinx";
       ename = "jinx";
-      version = "2.0.0.20250311.165730";
+      version = "2.0.0.20250402.103750";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/jinx-2.0.0.20250311.165730.tar";
-        sha256 = "0fv0lkqlpsl8fxhsxw772bl83ram252wn6zjvj0ngy99zrh6cvjp";
+        url = "https://elpa.gnu.org/devel/jinx-2.0.0.20250402.103750.tar";
+        sha256 = "18jpcfm1q4ksnynzavv35im0a6c81h8s8aj9ly7xxcq78yydy55h";
       };
       packageRequires = [ compat ];
       meta = {
@@ -5067,10 +5241,10 @@
     elpaBuild {
       pname = "llm";
       ename = "llm";
-      version = "0.24.1.0.20250309.220649";
+      version = "0.24.2.0.20250331.211307";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/llm-0.24.1.0.20250309.220649.tar";
-        sha256 = "005b28kl669mzjbns83z5nd0hkq46v8608py1db4vn30941jjc1a";
+        url = "https://elpa.gnu.org/devel/llm-0.24.2.0.20250331.211307.tar";
+        sha256 = "1n95x8430kasbcrv12j6wv0g12lk4xvbz1cav37y1lig09ak87pz";
       };
       packageRequires = [
         plz
@@ -5241,10 +5415,10 @@
     elpaBuild {
       pname = "lv";
       ename = "lv";
-      version = "0.15.0.0.20221030.224757";
+      version = "0.15.0.0.20250316.223951";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/lv-0.15.0.0.20221030.224757.tar";
-        sha256 = "07m1m2rgwnb7916hzdjccnq4is0z7m5mwmvc0f7mpc4h61sa6cdn";
+        url = "https://elpa.gnu.org/devel/lv-0.15.0.0.20250316.223951.tar";
+        sha256 = "1risk08xjfnam98fjqwfzki80m8rhdmm71h6xhc0glagzd8i15fk";
       };
       packageRequires = [ ];
       meta = {
@@ -5284,10 +5458,10 @@
     elpaBuild {
       pname = "map";
       ename = "map";
-      version = "3.3.1.0.20250123.102904";
+      version = "3.3.1.0.20250329.135944";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/map-3.3.1.0.20250123.102904.tar";
-        sha256 = "0jjx46m5m81vgnl67njnd3x65sbxhwl065kwn2l63jjrwbk7kzq1";
+        url = "https://elpa.gnu.org/devel/map-3.3.1.0.20250329.135944.tar";
+        sha256 = "0gsc71i87dx4a9hhs6vp6b8d4nq6lh7d8zqm8nlwdrkqyv0m57bd";
       };
       packageRequires = [ ];
       meta = {
@@ -5306,10 +5480,10 @@
     elpaBuild {
       pname = "marginalia";
       ename = "marginalia";
-      version = "1.8.0.20250203.101833";
+      version = "2.0.0.20250317.163219";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/marginalia-1.8.0.20250203.101833.tar";
-        sha256 = "0yphb9wkg04c6fqb5cbblbk5vmnn15njhp774kivxhxjr7p282n3";
+        url = "https://elpa.gnu.org/devel/marginalia-2.0.0.20250317.163219.tar";
+        sha256 = "0swxq6v8g0pphfmm883hx09cvkhs6gg60049phy60xcmxf1sdq9w";
       };
       packageRequires = [ compat ];
       meta = {
@@ -5390,10 +5564,10 @@
     elpaBuild {
       pname = "matlab-mode";
       ename = "matlab-mode";
-      version = "6.3.0.20241224.134640";
+      version = "6.3.0.20250401.100138";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/matlab-mode-6.3.0.20241224.134640.tar";
-        sha256 = "02y2ii89safyfj74221rlri99gr7382ir62zq2iqwvy6668srn4r";
+        url = "https://elpa.gnu.org/devel/matlab-mode-6.3.0.20250401.100138.tar";
+        sha256 = "1bfx0n5s24kzppl3m914ax8y2yx56hn8kyj8zxb836crr0ad5yad";
       };
       packageRequires = [ ];
       meta = {
@@ -5572,6 +5746,32 @@
       };
     }
   ) { };
+  minuet = callPackage (
+    {
+      dash,
+      elpaBuild,
+      fetchurl,
+      lib,
+      plz,
+    }:
+    elpaBuild {
+      pname = "minuet";
+      ename = "minuet";
+      version = "0.4.4.0.20250402.134355";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/minuet-0.4.4.0.20250402.134355.tar";
+        sha256 = "0lpm8mvg5xxja60cdpdcfgvb93mb0rgiagbvc529av4l5mk3i9gy";
+      };
+      packageRequires = [
+        dash
+        plz
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/minuet.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   mmm-mode = callPackage (
     {
       cl-lib ? null,
@@ -5603,10 +5803,10 @@
     elpaBuild {
       pname = "modus-themes";
       ename = "modus-themes";
-      version = "4.6.0.0.20250220.64729";
+      version = "4.6.0.0.20250327.84301";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/modus-themes-4.6.0.0.20250220.64729.tar";
-        sha256 = "1gr24821rbfj6jb4qnzka5445jq0k11k30a1xr8xjvy6kq62knqc";
+        url = "https://elpa.gnu.org/devel/modus-themes-4.6.0.0.20250327.84301.tar";
+        sha256 = "0cgrifxm8iy4dnjx48m1csl3g3vai3xsz3b06n1nfkgdffiiimn4";
       };
       packageRequires = [ ];
       meta = {
@@ -5624,10 +5824,10 @@
     elpaBuild {
       pname = "mpdired";
       ename = "mpdired";
-      version = "2.0.20240614.95804";
+      version = "3.0.20250314.151545";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/mpdired-2.0.20240614.95804.tar";
-        sha256 = "0xjfabyc3da6270gapx4cnqc71mxx518jnf7xmi2mz9hpq1202n3";
+        url = "https://elpa.gnu.org/devel/mpdired-3.0.20250314.151545.tar";
+        sha256 = "0mkmmjikckc7x95nrn2ak590hwgriayxn4ci8bswyjgcrad50pyq";
       };
       packageRequires = [ ];
       meta = {
@@ -6163,10 +6363,10 @@
     elpaBuild {
       pname = "orderless";
       ename = "orderless";
-      version = "1.3.0.20250201.234121";
+      version = "1.4.0.20250316.204648";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/orderless-1.3.0.20250201.234121.tar";
-        sha256 = "1skvlpvn49qivvn33c3y9nx0v3mn8ds1cagddd070ykpqyccrihp";
+        url = "https://elpa.gnu.org/devel/orderless-1.4.0.20250316.204648.tar";
+        sha256 = "1v0rqw8s9zzlbnk6ijc588rp31qlflic9wag8ncv9bkjn150c0sa";
       };
       packageRequires = [ compat ];
       meta = {
@@ -6184,10 +6384,10 @@
     elpaBuild {
       pname = "org";
       ename = "org";
-      version = "9.8pre0.20250312.181832";
+      version = "9.8pre0.20250401.155443";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-9.8pre0.20250312.181832.tar";
-        sha256 = "1bp5a6h7f458awla2ywhjj2wjbwj4bqkz891xsfirsj5801bc72i";
+        url = "https://elpa.gnu.org/devel/org-9.8pre0.20250401.155443.tar";
+        sha256 = "1d03254n53x5icvmpzd3mgw7l9xcgcx44mky4gx7prc30pm97gf2";
       };
       packageRequires = [ ];
       meta = {
@@ -6298,16 +6498,20 @@
       elpaBuild,
       fetchurl,
       lib,
+      org,
     }:
     elpaBuild {
       pname = "org-modern";
       ename = "org-modern";
-      version = "1.7.0.20250311.170125";
+      version = "1.7.0.20250402.171258";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-modern-1.7.0.20250311.170125.tar";
-        sha256 = "0xijjr2y15ghjicflmsq3l5ir2laz6pvsfcr0p7jziiz0ax97fx9";
+        url = "https://elpa.gnu.org/devel/org-modern-1.7.0.20250402.171258.tar";
+        sha256 = "1axg6l5gxrmbwgp8v3l7rzlwsf0ys4p6pdabwaqp4fyipdhh5mz4";
       };
-      packageRequires = [ compat ];
+      packageRequires = [
+        compat
+        org
+      ];
       meta = {
         homepage = "https://elpa.gnu.org/devel/org-modern.html";
         license = lib.licenses.free;
@@ -6777,10 +6981,10 @@
     elpaBuild {
       pname = "plz";
       ename = "plz";
-      version = "0.10pre0.20240816.164727";
+      version = "0.10pre0.20250318.183534";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/plz-0.10pre0.20240816.164727.tar";
-        sha256 = "13rimqccllasx5zvb5hm3mkcnhwzy2b2fp5p3klv4xz0szf1981k";
+        url = "https://elpa.gnu.org/devel/plz-0.10pre0.20250318.183534.tar";
+        sha256 = "08iyw80d2431k60fkw26i3z8zw0jk9czmxr1vi7z7hdfrqmw7gc0";
       };
       packageRequires = [ ];
       meta = {
@@ -6948,10 +7152,10 @@
     elpaBuild {
       pname = "popper";
       ename = "popper";
-      version = "0.4.8.0.20250222.131836";
+      version = "0.4.8.0.20250323.144723";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/popper-0.4.8.0.20250222.131836.tar";
-        sha256 = "03h7i6z8zm1najw5vz9kflf6l35vlkcb6gkqp9g94q1r6j8s7bl2";
+        url = "https://elpa.gnu.org/devel/popper-0.4.8.0.20250323.144723.tar";
+        sha256 = "0hfl4krm53blsm9bvki4gf1as43f8i7rszcjivbsiz1r4h99j9v8";
       };
       packageRequires = [ ];
       meta = {
@@ -7033,10 +7237,10 @@
     elpaBuild {
       pname = "preview-auto";
       ename = "preview-auto";
-      version = "0.4.0.20241109.62806";
+      version = "0.4.0.20241203.135521";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/preview-auto-0.4.0.20241109.62806.tar";
-        sha256 = "0vcrwi3pjvp46k1c52l4q774fkq93hn3dbbvrhaz160r6d9b477b";
+        url = "https://elpa.gnu.org/devel/preview-auto-0.4.0.20241203.135521.tar";
+        sha256 = "0pcncvr4nv251fm0c66c3wqazv89vxqcv9j2jq0kvylx9ks2vzaz";
       };
       packageRequires = [ auctex ];
       meta = {
@@ -7077,10 +7281,10 @@
     elpaBuild {
       pname = "project";
       ename = "project";
-      version = "0.11.1.0.20250311.202651";
+      version = "0.11.1.0.20250401.193603";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/project-0.11.1.0.20250311.202651.tar";
-        sha256 = "12d3v449rk70l71i1hyfy9fkvqv82y4gadcdwn9n4hdgqzknj598";
+        url = "https://elpa.gnu.org/devel/project-0.11.1.0.20250401.193603.tar";
+        sha256 = "0s7ih568lf1440h1zmgdx9f5wc5njpwk2ylkqvny9k0nwm8pp73m";
       };
       packageRequires = [ xref ];
       meta = {
@@ -7213,10 +7417,10 @@
     elpaBuild {
       pname = "python";
       ename = "python";
-      version = "0.30.0.20250311.1541";
+      version = "0.30.0.20250329.174949";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/python-0.30.0.20250311.1541.tar";
-        sha256 = "0mx17q36rjf2ax1vy0pm79ya35ys5wg0n97flk98x4w1l5wggx6w";
+        url = "https://elpa.gnu.org/devel/python-0.30.0.20250329.174949.tar";
+        sha256 = "0ri9h0qc2kdlcg5nw9x7yhpqiiblhhzjj5zm1gb8fixx3css3x2m";
       };
       packageRequires = [
         compat
@@ -8202,10 +8406,10 @@
     elpaBuild {
       pname = "so-long";
       ename = "so-long";
-      version = "1.1.2.0.20250101.73917";
+      version = "1.1.2.0.20250315.100518";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20250101.73917.tar";
-        sha256 = "1z9mf5kac7bsqq0kkd2alcx9vvz87vsgbw753shd23y9m7ayapvx";
+        url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20250315.100518.tar";
+        sha256 = "0jjf9y2swl23njng62l43avy37s4ca18z8g647mkp50rx02j9q8b";
       };
       packageRequires = [ ];
       meta = {
@@ -8634,10 +8838,10 @@
     elpaBuild {
       pname = "swiper";
       ename = "swiper";
-      version = "0.15.0.0.20250225.84058";
+      version = "0.15.1.0.20250329.151337";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/swiper-0.15.0.0.20250225.84058.tar";
-        sha256 = "1j0ys0q804w7yghxvs5mw6qbi8f7vw34fp1ng09ds1ylpsxfsxfa";
+        url = "https://elpa.gnu.org/devel/swiper-0.15.1.0.20250329.151337.tar";
+        sha256 = "08glyqqvj3m9bph1i53m32wg58xvxzglc44gidmg2b1gf2w3gl82";
       };
       packageRequires = [ ivy ];
       meta = {
@@ -8857,10 +9061,10 @@
     elpaBuild {
       pname = "tempel";
       ename = "tempel";
-      version = "1.3.0.20250101.92736";
+      version = "1.4.0.20250316.101606";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/tempel-1.3.0.20250101.92736.tar";
-        sha256 = "1jqg7k6pr088jmbvyzqwm5xyzpjlz0a4fk4z5qmrcr6hdzyjlhgi";
+        url = "https://elpa.gnu.org/devel/tempel-1.4.0.20250316.101606.tar";
+        sha256 = "179kwky5k79ci5yl0spj28c32f9jl3ka0q9b0702spgmv8slf5h4";
       };
       packageRequires = [ compat ];
       meta = {
@@ -8921,10 +9125,10 @@
     elpaBuild {
       pname = "tex-parens";
       ename = "tex-parens";
-      version = "0.6.0.20241101.151607";
+      version = "0.7.0.20250322.84812";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/tex-parens-0.6.0.20241101.151607.tar";
-        sha256 = "16b5s137jnjln3l3x97cxxhn4bsxhn6gs6xkbszp4vkx3cww8kzk";
+        url = "https://elpa.gnu.org/devel/tex-parens-0.7.0.20250322.84812.tar";
+        sha256 = "0q8nv125k863vmgclrbh7v4548pnccwmidgl645wjv89198dh5v0";
       };
       packageRequires = [ ];
       meta = {
@@ -9181,10 +9385,10 @@
     elpaBuild {
       pname = "transient";
       ename = "transient";
-      version = "0.8.5.0.20250306.191617";
+      version = "0.8.7.0.20250401.165541";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/transient-0.8.5.0.20250306.191617.tar";
-        sha256 = "1yjq58925f4f13ln7i2hzmyknhswmgpwh1n5dc8bnk7pbfnkzcq3";
+        url = "https://elpa.gnu.org/devel/transient-0.8.7.0.20250401.165541.tar";
+        sha256 = "05kkd8iq2jrx6jxr3kk8cx3ccgq4j9wr5rwm22iynnx1m7abhb5w";
       };
       packageRequires = [
         compat
@@ -9404,10 +9608,10 @@
     elpaBuild {
       pname = "urgrep";
       ename = "urgrep";
-      version = "0.5.2snapshot0.20250304.194036";
+      version = "0.5.2snapshot0.20250315.173144";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/urgrep-0.5.2snapshot0.20250304.194036.tar";
-        sha256 = "0hcskhl9qs9rajv1kxna1xqfkhil5w5mdiyrj0swh7mcaw63fwr1";
+        url = "https://elpa.gnu.org/devel/urgrep-0.5.2snapshot0.20250315.173144.tar";
+        sha256 = "18rnj1dm8551sqkqjfq9485v455n97ixivbnds6lmwxaafrr8yxr";
       };
       packageRequires = [
         compat
@@ -9421,26 +9625,20 @@
   ) { };
   url-http-ntlm = callPackage (
     {
-      cl-lib ? null,
       elpaBuild,
       fetchurl,
       lib,
-      nadvice,
       ntlm ? null,
     }:
     elpaBuild {
       pname = "url-http-ntlm";
       ename = "url-http-ntlm";
-      version = "2.0.5.0.20231024.31412";
+      version = "2.0.5.0.20250314.123040";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.5.0.20231024.31412.tar";
-        sha256 = "1crjiq72fcpzw4nlrm8nh3q2llvxc7bgjqq6vr6ma055d0m6xrsd";
+        url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.5.0.20250314.123040.tar";
+        sha256 = "0wqx83prdprlyjs7rvrxhf1kz6pzsmhiin0kqp74dsn407zq4g34";
       };
-      packageRequires = [
-        cl-lib
-        nadvice
-        ntlm
-      ];
+      packageRequires = [ ntlm ];
       meta = {
         homepage = "https://elpa.gnu.org/devel/url-http-ntlm.html";
         license = lib.licenses.free;
@@ -9456,10 +9654,10 @@
     elpaBuild {
       pname = "url-http-oauth";
       ename = "url-http-oauth";
-      version = "0.8.3.0.20230510.175959";
+      version = "0.8.3.0.20250314.122034";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/url-http-oauth-0.8.3.0.20230510.175959.tar";
-        sha256 = "00shj8zvjvdy7gh29sx08m3cn9lyivjlzmzll0i2zy9389i1l360";
+        url = "https://elpa.gnu.org/devel/url-http-oauth-0.8.3.0.20250314.122034.tar";
+        sha256 = "0f2ih3827r02alggi0hz6f9fyak2acc04x6gjahjmf65vy51rpbi";
       };
       packageRequires = [ ];
       meta = {
@@ -9499,10 +9697,10 @@
     elpaBuild {
       pname = "use-package";
       ename = "use-package";
-      version = "2.4.6.0.20250302.30748";
+      version = "2.4.6.0.20250330.141700";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20250302.30748.tar";
-        sha256 = "0hd0ii901jr7l0f3yl1kmnplnsj34lbcs7c71ndlkfg2qzgys6kj";
+        url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20250330.141700.tar";
+        sha256 = "099884d87xppwcgrg2lk25kmz8dab57qq55i3f1nx4cd36vnrfyb";
       };
       packageRequires = [ bind-key ];
       meta = {
@@ -9622,6 +9820,28 @@
       };
     }
   ) { };
+  vc-jj = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vc-jj";
+      ename = "vc-jj";
+      version = "0.1.0.20250323.115851";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/vc-jj-0.1.0.20250323.115851.tar";
+        sha256 = "15qjv10assm3zn2ny6kz9x0xfl88cmha1sxcj39qc6zaixzfvi2c";
+      };
+      packageRequires = [ compat ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/vc-jj.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   vcard = callPackage (
     {
       elpaBuild,
@@ -9717,10 +9937,10 @@
     elpaBuild {
       pname = "vertico";
       ename = "vertico";
-      version = "2.0.0.20250311.165544";
+      version = "2.0.0.20250401.162832";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/vertico-2.0.0.20250311.165544.tar";
-        sha256 = "1vw6qjrbsymx18kpn47p89ni7gpnwb0zs7prbzzpn1p370bb578r";
+        url = "https://elpa.gnu.org/devel/vertico-2.0.0.20250401.162832.tar";
+        sha256 = "0aczd29i9g2rlvsmnrl5h9vhglp54bggjh97a3pb04mqmp0i0w9p";
       };
       packageRequires = [ compat ];
       meta = {
@@ -9848,10 +10068,10 @@
     elpaBuild {
       pname = "vundo";
       ename = "vundo";
-      version = "2.3.0.0.20250114.230321";
+      version = "2.4.0.0.20250314.193537";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/vundo-2.3.0.0.20250114.230321.tar";
-        sha256 = "1bqv7s4z4vkb1w4n2cyjsf181faycm95g7z2ikcb18hhag1q2fi1";
+        url = "https://elpa.gnu.org/devel/vundo-2.4.0.0.20250314.193537.tar";
+        sha256 = "0pzcaryrj62b460vklxsikbg4n50hkfnkyqlxypzk2j2gavn0cyg";
       };
       packageRequires = [ ];
       meta = {
@@ -9976,10 +10196,10 @@
     elpaBuild {
       pname = "which-key";
       ename = "which-key";
-      version = "3.6.1.0.20250205.202103";
+      version = "3.6.1.0.20250330.141700";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20250205.202103.tar";
-        sha256 = "0n5f6r1kfiycmd96419yfr7vg65aq3g0hhgafhkwi73n6cbd9209";
+        url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20250330.141700.tar";
+        sha256 = "0gg43zbsvfkhzbaw3msvd6kvimkdih2j15g63dz3nfq11m9iw70l";
       };
       packageRequires = [ ];
       meta = {
@@ -10283,10 +10503,10 @@
     elpaBuild {
       pname = "xref";
       ename = "xref";
-      version = "1.7.0.0.20250304.63233";
+      version = "1.7.0.0.20250321.211107";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20250304.63233.tar";
-        sha256 = "0zkawnpgh60nqn5nz1vp4w6klw37v3ay5vyp5dsjz7bz4f3vcnvd";
+        url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20250321.211107.tar";
+        sha256 = "059wmg5ch8smgs3ir2flhjj2dibqpr1875724lni1vk2dr3g6kmq";
       };
       packageRequires = [ ];
       meta = {
@@ -10325,10 +10545,10 @@
     elpaBuild {
       pname = "yaml";
       ename = "yaml";
-      version = "1.2.0.0.20250208.153456";
+      version = "1.2.0.0.20250316.172129";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/yaml-1.2.0.0.20250208.153456.tar";
-        sha256 = "13awmzwcmgs7ciinhr0crcw70zabj7lpxgk6afizcsdd0fahgg4m";
+        url = "https://elpa.gnu.org/devel/yaml-1.2.0.0.20250316.172129.tar";
+        sha256 = "0alwrb50napf86jimcnbjbkpd3nizvizskxa8rpglqn5yllj5qlw";
       };
       packageRequires = [ ];
       meta = {

From 368c0731984399ad0118159e60abff73d78ccf08 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 3 Apr 2025 19:08:12 +0800
Subject: [PATCH 067/225] melpa-packages: updated 2025-04-03 (from overlay)

---
 .../elisp-packages/recipes-archive-melpa.json | 3192 +++++++++--------
 1 file changed, 1737 insertions(+), 1455 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
index 44e8c80f489b..32a85169d3e3 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -2246,6 +2246,40 @@
    "sha256": "03xypgq6vy7819r42g23kgn7p775bc0v9blzhi0zp5c61p4cw8v3"
   }
  },
+ {
+  "ename": "aider",
+  "commit": "940c15a73c1fe351cfb296da35c76a66f464a964",
+  "sha256": "0bkq4ag5zsbjs1ac4rvf2bz8pl0myfz4v43inj96lk0067rgi66b",
+  "fetcher": "github",
+  "repo": "tninja/aider.el",
+  "unstable": {
+   "version": [
+    20250402,
+    316
+   ],
+   "deps": [
+    "magit",
+    "markdown-mode",
+    "transient"
+   ],
+   "commit": "cc353a84b8c2f5c440077ce1d5109292115844da",
+   "sha256": "04ymmlw0m3a8za59j5k8yz7gsrx3421rf23j129cb72p81vf00pc"
+  },
+  "stable": {
+   "version": [
+    0,
+    6,
+    0
+   ],
+   "deps": [
+    "magit",
+    "markdown-mode",
+    "transient"
+   ],
+   "commit": "bf02bfeaf4453a984758b9b28c0f7a261bc3aafa",
+   "sha256": "0s0b9z7m9jji1khkagnnpgvzw12dy15ylyrh0bkcrlhyyapqplzy"
+  }
+ },
  {
   "ename": "aidermacs",
   "commit": "145b2843183e9db03ac1dbd90747e82b2a58e89a",
@@ -2254,11 +2288,27 @@
   "repo": "MatthewZMD/aidermacs",
   "unstable": {
    "version": [
-    20250313,
-    353
+    20250401,
+    2057
    ],
-   "commit": "58b3fc29f5046c195951a6315651fa0fc14511ae",
-   "sha256": "1w0c4sxi1q7lfdpsy7dk20xwchx4aypgxl4ygq58s459qhclaiyz"
+   "deps": [
+    "compat",
+    "transient"
+   ],
+   "commit": "38aa5bfa5c5a66664abb5bb9cd7f191d1ac3d915",
+   "sha256": "15l28149akn1xxcqbqzymyw2r84sr3dafdxil8x7m7cx3260p7ni"
+  },
+  "stable": {
+   "version": [
+    1,
+    2
+   ],
+   "deps": [
+    "compat",
+    "transient"
+   ],
+   "commit": "38aa5bfa5c5a66664abb5bb9cd7f191d1ac3d915",
+   "sha256": "15l28149akn1xxcqbqzymyw2r84sr3dafdxil8x7m7cx3260p7ni"
   }
  },
  {
@@ -3322,11 +3372,11 @@
   "repo": "lujun9972/anki-connect.el",
   "unstable": {
    "version": [
-    20191123,
-    1858
+    20250327,
+    621
    ],
-   "commit": "1324f0c248aa2c6e73d6cf93fad6119d699f7dae",
-   "sha256": "055nzb0dki4fmgmfhq83x7gciyp74r36a233hnl9lyd8wmb2hvqf"
+   "commit": "9cf0c546358690f66c4e4498c8f81011dd56b95e",
+   "sha256": "072fp2ikicydl51rprwlfdkxdr75nsq1nlwjzvqm4q1vgigprhk3"
   }
  },
  {
@@ -3452,11 +3502,11 @@
   "repo": "bastibe/annotate.el",
   "unstable": {
    "version": [
-    20250306,
-    1337
+    20250320,
+    1304
    ],
-   "commit": "f29c91db0b0d4e4be0013bfa7222797b2114d2a9",
-   "sha256": "154v0bljcg2s188sbnnxm56pv3pjzgg51akxjca62s0swqzqh96b"
+   "commit": "7b1c5aa531d30d60c5c1b5317e374b3eeaf123c3",
+   "sha256": "1qkp7qyr780xzi03572kidcsi0bj17jwgk1w9alayddpi98vbn27"
   },
   "stable": {
    "version": [
@@ -3491,11 +3541,11 @@
   "repo": "agda/agda",
   "unstable": {
    "version": [
-    20200914,
-    644
+    20250328,
+    1043
    ],
-   "commit": "aa5e3a127bf17a8c80d947f3c286758a36dadc36",
-   "sha256": "0nwriahnkyg1p0xn50c4h2bxg9idm6d9n8mfl7ddzm98j8gv1vwi"
+   "commit": "ad8ea74ccefd3507006a7ea9a7d9ff5b7a973603",
+   "sha256": "0qiqw69h9vpvwisqngkfdpfqibi5w5ddhxhwvbrv0ah2n29saswr"
   },
   "stable": {
    "version": [
@@ -3623,26 +3673,26 @@
  },
  {
   "ename": "ansible-vault",
-  "commit": "6417ac9acf7f4835d3a36c16cbe12113e46b3d79",
-  "sha256": "0ihnknkn30rm29k7zpr3558g1njwjm9wmw7q83dvamxsna69nwc1",
+  "commit": "7a805888f316a6e7d9b3a2a9dbe1e69f420930af",
+  "sha256": "1rc362a02nhywkccfg5v2sl2p7n9kbw6s96ba76si4ahqfl0b9g5",
   "fetcher": "github",
-  "repo": "zellio/ansible-vault-mode",
+  "repo": "freehck/ansible-vault-mode",
   "unstable": {
    "version": [
-    20211119,
-    1459
+    20250331,
+    2155
    ],
-   "commit": "9b3d82ee49d484a494f2d88927b37fcd6245d51e",
-   "sha256": "1382ks8nakanv864flk070haibk7841ygb3nm262i7414zqsyfrk"
+   "commit": "f0fab5d8d56e4c16f9fa85f22635cb0cec3637e1",
+   "sha256": "15imwyq8zm0s3ccycdrmwfqcb124lz7xrymjmvz67ynsvzh1lcmp"
   },
   "stable": {
    "version": [
     0,
     5,
-    2
+    4
    ],
-   "commit": "9b3d82ee49d484a494f2d88927b37fcd6245d51e",
-   "sha256": "1382ks8nakanv864flk070haibk7841ygb3nm262i7414zqsyfrk"
+   "commit": "206801defa0058da0ab6ed4d58daff0e3ededcb7",
+   "sha256": "0xi263bz2jf9fpbmn2n2vplrhxw49xrg8msg1fnxbr8bcl4612z8"
   }
  },
  {
@@ -3871,11 +3921,11 @@
   "repo": "radian-software/apheleia",
   "unstable": {
    "version": [
-    20250308,
-    1920
+    20250331,
+    2246
    ],
-   "commit": "2c8e8229cbe26c7fd264c2ffe3fbeb9435dad3ae",
-   "sha256": "1g69iiigcscfsa858apk3r7zc6wvjmrqli5n6v6j6fg293gg2696"
+   "commit": "2b491144fe157867ce1cc4538a9562edff57c891",
+   "sha256": "0r48qdi7lmxgvd6zr9s73f58fqcf91gxkg57v6dsrqh1868ngx00"
   },
   "stable": {
    "version": [
@@ -4263,11 +4313,11 @@
   "repo": "sachac/artbollocks-mode",
   "unstable": {
    "version": [
-    20170524,
-    422
+    20250327,
+    1744
    ],
-   "commit": "4a907e470bf345b88c3802c1241ce2b8cf4123ee",
-   "sha256": "1l1dwhdfd5bwx92k84h5v47pv9my4p4wj0wq8hrwvwzwlv8dzn2w"
+   "commit": "1ef30f2cabaa2054e77d66eb7999381dde26eb18",
+   "sha256": "07b116cn3gv35pffxcfwn1nadxdh356j8w4n6pc42rvgxycjrxs4"
   },
   "stable": {
    "version": [
@@ -4553,11 +4603,11 @@
   "repo": "jwiegley/emacs-async",
   "unstable": {
    "version": [
-    20241126,
-    810
+    20250325,
+    509
    ],
-   "commit": "b99658e831bc7e7d20ed4bb0a85bdb5c7dd74142",
-   "sha256": "19vszyfvbp3gh73yxq0wzqigfihgk8jzpp27ihirpy3v6kc3bkr7"
+   "commit": "bb3f31966ed65a76abe6fa4f80a960a2917f554e",
+   "sha256": "0qlfhilaa97kmcycms1ch5gqcn6i56xrkmm69x6175d2lq36lpq1"
   },
   "stable": {
    "version": [
@@ -6416,21 +6466,6 @@
    "sha256": "1469w6rlnkf1wh5a4ar14snamrx61w6mvq6fwpkfmhpgc0fnwdg7"
   }
  },
- {
-  "ename": "axiom-environment",
-  "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953",
-  "sha256": "11ldwj88hi7chbbxfkhdfx58w1xybk4ch6xmh99fa2vl8ybk16p1",
-  "fetcher": "git",
-  "url": "https://bitbucket.org/pdo/axiom-environment",
-  "unstable": {
-   "version": [
-    20220612,
-    1535
-   ],
-   "commit": "01d88daa0c864af9918db5a147fbb5e435dec199",
-   "sha256": "03cxb6zdqmzgjp8r6hcirf8xl772j7xqk2nw17gjkn4xqbwfyn62"
-  }
- },
  {
   "ename": "ayu-theme",
   "commit": "22bdc35d5c432c5d58d751c0fc3f2e5d0fafe583",
@@ -6810,11 +6845,11 @@
   "repo": "tinted-theming/base16-emacs",
   "unstable": {
    "version": [
-    20250223,
-    119
+    20250330,
+    125
    ],
-   "commit": "9f7188e0b26424d3259cd27bd65e4204303f86ce",
-   "sha256": "0srnw6dv9sw1s7q62ng8dfqyn5s4ml1mcy25pzh761m3kizv6mvn"
+   "commit": "73bfd1adebd712f93bab06b5bee471822d8bb2f5",
+   "sha256": "0lfqkbvbd0j1l25q38w55g7qqdrvf970fmzfihspd8aaykf6fycm"
   },
   "stable": {
    "version": [
@@ -8048,15 +8083,15 @@
   "repo": "waymondo/use-package-chords",
   "unstable": {
    "version": [
-    20241115,
-    2228
+    20250330,
+    1852
    ],
    "deps": [
     "bind-key",
     "key-chord"
    ],
-   "commit": "a2b16a1e64b19ae9428a6cd8f3e09b8159707a29",
-   "sha256": "0krskz087vy4iws01w5wxsn7b0pkncsn6s1vj9ywagn5i1z6a34x"
+   "commit": "0793b50e2bf1ec8bfc532b10baeef716c5aa947a",
+   "sha256": "0dkiic5yrdmjkyrahm10ggx0scp4ixqbb184i55f6fpf8yvy6nd8"
   },
   "stable": {
    "version": [
@@ -8714,11 +8749,11 @@
   "repo": "joodland/bm",
   "unstable": {
    "version": [
-    20231008,
-    2005
+    20250318,
+    2308
    ],
-   "commit": "1351e2e15a7666e614c94b41414c8f024dc10a50",
-   "sha256": "0dv3b0bv4rxvmac388j0qfkdvw7mbd72nfnb9skzkz39is39jp9j"
+   "commit": "e69e01ec3afdcd8cf2a8d1553b6172a149a34455",
+   "sha256": "1xzlnp6vfd3kw982qm0gaksnb575xv0xl4fkhp8ma9lv0v32vdf4"
   },
   "stable": {
    "version": [
@@ -9044,28 +9079,28 @@
   "repo": "emacscollective/borg",
   "unstable": {
    "version": [
-    20250301,
-    2325
+    20250401,
+    1806
    ],
    "deps": [
     "epkg",
     "magit"
    ],
-   "commit": "581e11718985bc80df66d34beff6b2d08a9abff8",
-   "sha256": "0vh2mc73jb8brvnq5yanhl0nmn1h8qnl8p0ynhr4bicp1b7gi117"
+   "commit": "dad9508836fc04edec8634e17998708bf48febc6",
+   "sha256": "162jx8y2gac4day1h2cm28gmm7hrxzs73f4ma4izl8pgq3v87rsj"
   },
   "stable": {
    "version": [
     4,
     1,
-    3
+    4
    ],
    "deps": [
     "epkg",
     "magit"
    ],
-   "commit": "581e11718985bc80df66d34beff6b2d08a9abff8",
-   "sha256": "0vh2mc73jb8brvnq5yanhl0nmn1h8qnl8p0ynhr4bicp1b7gi117"
+   "commit": "dad9508836fc04edec8634e17998708bf48febc6",
+   "sha256": "162jx8y2gac4day1h2cm28gmm7hrxzs73f4ma4izl8pgq3v87rsj"
   }
  },
  {
@@ -9256,11 +9291,11 @@
   "repo": "ideasman42/emacs-bray",
   "unstable": {
    "version": [
-    20250225,
-    2239
+    20250322,
+    358
    ],
-   "commit": "99488037cf61cfa6e6694d6a0d9725d23c15add5",
-   "sha256": "1d23c9vy51jcp5gbssjsr4zwfcwvlz26mb4z8qrczbjaxjhq1m0f"
+   "commit": "4e335ef8287881a06841bf1d0bf9b0c59dd2469f",
+   "sha256": "0462mj2c0q2fxfmkcp9wx7d2mpabxphz33k77giwp5sk9xz9psxn"
   }
  },
  {
@@ -9805,11 +9840,11 @@
   "repo": "jamescherti/buffer-terminator.el",
   "unstable": {
    "version": [
-    20250226,
-    1609
+    20250323,
+    1828
    ],
-   "commit": "c426fe97b0d994e8a028dc9070880d8dfcd94ac7",
-   "sha256": "1bz4kxkxgc5095ask59sm5648i05d8p3cdr84yfzvd4qyxhxzj6h"
+   "commit": "60a6dc3b46eea675eb5822b423f02676b2af032a",
+   "sha256": "1sidd0i2nf7ssvda0w7xjr7dy0kbwns7j79qm58cfh1rkjlpyn55"
   },
   "stable": {
    "version": [
@@ -9922,8 +9957,8 @@
   "repo": "alphapapa/bufler.el",
   "unstable": {
    "version": [
-    20240312,
-    552
+    20250327,
+    2246
    ],
    "deps": [
     "burly",
@@ -9933,8 +9968,8 @@
     "map",
     "pretty-hydra"
    ],
-   "commit": "ef3b28bbdcb1e813a1d5b06a91d09774998967c5",
-   "sha256": "0dl1ji045g8nd8739q28csvjrxwmaq9l7vxlsw1nk1hc7apbv1bx"
+   "commit": "b96822d2132fda6bd1dd86f017d7e76e3b990c82",
+   "sha256": "1dbmv6i3yn4kw0bc404nrb3lm72z89cfvdxf18j1sgsj56ykiis0"
   },
   "stable": {
    "version": [
@@ -10846,8 +10881,8 @@
   "repo": "chenyanming/calibredb.el",
   "unstable": {
    "version": [
-    20250224,
-    323
+    20250330,
+    331
    ],
    "deps": [
     "dash",
@@ -10857,8 +10892,8 @@
     "s",
     "transient"
    ],
-   "commit": "77b9c491511c7f6f3a37d688097a035b7dc6d794",
-   "sha256": "0pvczjgnpnqznb8jnmzw0vpmcmk3s1kpxp3vi99klmmrm8ns06zm"
+   "commit": "64c211a461177e675b01be2eeb28526e50a8df6f",
+   "sha256": "0d5gsnpwqijig04lx7k3433p4gsbl0aqxp0bzbsrxqc5wvd7rc3p"
   },
   "stable": {
    "version": [
@@ -10921,20 +10956,20 @@
   "repo": "kickingvegas/calle24",
   "unstable": {
    "version": [
-    20250311,
-    1548
+    20250315,
+    1812
    ],
-   "commit": "aa0e41ea586b0b8a836b267d4e2bfb62e66e8561",
-   "sha256": "0fc46ia1gri7q9y90c09vqspm5dfqab6alf7b0aam1fjrggawjsj"
+   "commit": "2b5bb21c791083c4f509fd57274c601e5dfd6614",
+   "sha256": "1iy4jsh54kx0jjdbs9srfc18dnixliq6xsracyv3p447gjwzxqrn"
   },
   "stable": {
    "version": [
     1,
     0,
-    6
+    8
    ],
-   "commit": "aa0e41ea586b0b8a836b267d4e2bfb62e66e8561",
-   "sha256": "0fc46ia1gri7q9y90c09vqspm5dfqab6alf7b0aam1fjrggawjsj"
+   "commit": "2b5bb21c791083c4f509fd57274c601e5dfd6614",
+   "sha256": "1iy4jsh54kx0jjdbs9srfc18dnixliq6xsracyv3p447gjwzxqrn"
   }
  },
  {
@@ -11048,14 +11083,14 @@
   "repo": "minad/cape",
   "unstable": {
    "version": [
-    20250311,
-    1650
+    20250315,
+    855
    ],
    "deps": [
     "compat"
    ],
-   "commit": "2e86b6deed2844fc1345ff01bc92c3a849a33778",
-   "sha256": "0wm0y982zrfzzbdizpvr39c55bhp9y7l7w1sp8ps1b4ijbmgd0r9"
+   "commit": "f72ebcaeff4252ca0d7a9ac4636d8db0fdf54c55",
+   "sha256": "01wwn54q6izgkrbp0n0lmi3a0vgj3bp9kpy8ldbkq72kf0fj187v"
   },
   "stable": {
    "version": [
@@ -11376,26 +11411,26 @@
   "repo": "kickingvegas/casual",
   "unstable": {
    "version": [
-    20250312,
-    2328
+    20250314,
+    2245
    ],
    "deps": [
     "transient"
    ],
-   "commit": "ea0d69f5fd0aeb3530a7fcbd2e356123f4fdbc59",
-   "sha256": "14kb874xnl2fxzyqbp1r2pl8m1jp0mbcp5pq82ywx9nk4n69p3mv"
+   "commit": "9c476ea12cdff376f508b1199373257d7e9b8715",
+   "sha256": "1jqk5jzj6ykijaa39rpyg85s1czwa4q2qdfv077vnv57wfknzvfy"
   },
   "stable": {
    "version": [
     2,
     4,
-    0
+    1
    ],
    "deps": [
     "transient"
    ],
-   "commit": "ea0d69f5fd0aeb3530a7fcbd2e356123f4fdbc59",
-   "sha256": "14kb874xnl2fxzyqbp1r2pl8m1jp0mbcp5pq82ywx9nk4n69p3mv"
+   "commit": "9c476ea12cdff376f508b1199373257d7e9b8715",
+   "sha256": "1jqk5jzj6ykijaa39rpyg85s1czwa4q2qdfv077vnv57wfknzvfy"
   }
  },
  {
@@ -12017,16 +12052,16 @@
   "repo": "worr/cfn-mode",
   "unstable": {
    "version": [
-    20250209,
-    904
+    20250330,
+    805
    ],
    "deps": [
     "f",
     "s",
     "yaml-mode"
    ],
-   "commit": "a7d9a4914ed71ca4e79de37f11176b9fb253b846",
-   "sha256": "1yr4b206sckqqwpqz9h70i9hfpqhlirhkyzixah8zzm3z3nrg3yd"
+   "commit": "3e3992f739132676db7f38a1ff5860989a80ca03",
+   "sha256": "011bra8xzf7f5kn0vj7nga8cpkksf70p73wqbzsnzy4m6nwqxn16"
   },
   "stable": {
    "version": [
@@ -12116,11 +12151,11 @@
   "repo": "GrammarSoft/cg3",
   "unstable": {
    "version": [
-    20250311,
-    1539
+    20250315,
+    1016
    ],
-   "commit": "51c6f82d7cc686aec96587abd2eabe1b5c1ed9e1",
-   "sha256": "07jh0nirsij9v311nmff5yzcs2hq9izri7abrrml5k0kk115nnpp"
+   "commit": "9cbd0db112347de6f60e52475d435ca1d97626cd",
+   "sha256": "1lah7587npz5jqaavfwybjhrrif4kibk0vhzc9ibqgjczcm2ljs9"
   },
   "stable": {
    "version": [
@@ -12185,14 +12220,14 @@
   "repo": "magnars/change-inner.el",
   "unstable": {
    "version": [
-    20231203,
-    1021
+    20250320,
+    1600
    ],
    "deps": [
     "expand-region"
    ],
-   "commit": "1394f5c07a95a97e39d616a1d7054d7c9bc49ba3",
-   "sha256": "1pi5yik2x2vfg9d51hzymzmrcv5ngql5skwa0mz2jgyh7k6c6q3v"
+   "commit": "675056ff78aa5dc32286e56dd0008d0683ddfc79",
+   "sha256": "0ljnvr17skq2rp4p3vgfgddm6pjc1cvg8lcqm2gr0qf79my1r5q4"
   }
  },
  {
@@ -12290,26 +12325,26 @@
   "repo": "xenodium/chatgpt-shell",
   "unstable": {
    "version": [
-    20250311,
-    2144
+    20250402,
+    1634
    ],
    "deps": [
     "shell-maker"
    ],
-   "commit": "fcc18a1534dfdb91e2a11e09b45ae14dc9dd50f3",
-   "sha256": "04af1f7pkk970x2vrv46x4ipgpyy3hh6v82kxc4gndg0gs78i04y"
+   "commit": "0604df6676b13243692421dcc0b14c52a06a7a9a",
+   "sha256": "16r6v6f23wc7ng6q82rib0v9r1qq6zm5craaldn492zwn8hxdjji"
   },
   "stable": {
    "version": [
     2,
     16,
-    1
+    4
    ],
    "deps": [
     "shell-maker"
    ],
-   "commit": "50745e34082283f2a3a65a3f314629b29c1a883f",
-   "sha256": "1xq4hfr3m5sgi9wrr3nrp6fsnnw8d044gz0y50d4h46cvq8c6f2g"
+   "commit": "b1bf3b331bcedc9487cc3b3656bb49a58812e0ac",
+   "sha256": "1lz1270hm24ghj0xgl0jsqyaqpw4wmrfvp37c11gin7ysf45g85b"
   }
  },
  {
@@ -12320,15 +12355,15 @@
   "repo": "kimim/chatu",
   "unstable": {
    "version": [
-    20250301,
-    319
+    20250403,
+    45
    ],
    "deps": [
     "org",
     "plantuml-mode"
    ],
-   "commit": "b666b53e5a13f722833f856a76b0ce996c1b2bcd",
-   "sha256": "0b50fqfch1c0s5prg7kq2d2xaa6vgrcscd1danc6l1vaa65wq58a"
+   "commit": "d5d06c4efcc54156e6c8be3db488434508ce370f",
+   "sha256": "1540w06ga85a7vdrycqh9minpj78j66c7ia1h3qqkmprcjmzsdji"
   }
  },
  {
@@ -12728,26 +12763,26 @@
   "repo": "breatheoutbreathein/chordpro-mode.el",
   "unstable": {
    "version": [
-    20240819,
-    649
+    20250331,
+    725
    ],
    "deps": [
     "compat"
    ],
-   "commit": "75b5d36f56ede3af921126ea63bf9639c8dfedb5",
-   "sha256": "0b6mv3qlkc4cylhynkbzxb1h2qwfcw9jsd3pw331i8cg30rsggqy"
+   "commit": "8221373d5784efcba50a32eb93a16016ff2f93fe",
+   "sha256": "1mbsw62k35kiaaipi8my1ci33pvipyjgdb4m3cwdvaqb0vkp61dg"
   },
   "stable": {
    "version": [
     2,
-    3,
+    4,
     0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1cff95d5974d1fb13c4e3e76176270a1342ea176",
-   "sha256": "10vhbjds90pwa2yfna5yfg2h4fvbccrd7fkqw932wc2h4fm84pb5"
+   "commit": "d1517c29b702fc9c7c508aaac715ede20d948691",
+   "sha256": "190xzmkyz9fblsd2idh7888lwrp671sawwvxj97p7h4rpvimbpcn"
   }
  },
  {
@@ -12975,8 +13010,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20250313,
-    1410
+    20250401,
+    1936
    ],
    "deps": [
     "clojure-mode",
@@ -12987,8 +13022,8 @@
     "spinner",
     "transient"
    ],
-   "commit": "e125d3eaef7718b6975f12b94f7b4ffa4bd20b58",
-   "sha256": "0lchm6i4zym3swx8hkznnlbxziqn66x9bdkz2dxclrldmw7pf5ks"
+   "commit": "de548e3084f6f6b5802dd7f939fd9ddf36e62038",
+   "sha256": "06c15xj4ls3axnl2rmpbgdbm83l6nc2mbz73g531cd0n1fs0bn2x"
   },
   "stable": {
    "version": [
@@ -13379,6 +13414,26 @@
    "sha256": "07q94iplkx29lggrs5xfzj42rxfcn2cnbr90jgifk29jshcz30pv"
   }
  },
+ {
+  "ename": "citar-org-node",
+  "commit": "d2aea7e3d7d069b6abd7f6098d43de313768d054",
+  "sha256": "15f3ljygmxbvyi158xfnk76pnw8a57wyczs09jxfdw1gbb6s6niw",
+  "fetcher": "github",
+  "repo": "krisbalintona/citar-org-node",
+  "unstable": {
+   "version": [
+    20250402,
+    2014
+   ],
+   "deps": [
+    "citar",
+    "ht",
+    "org-node"
+   ],
+   "commit": "a5df0165af6c0a8b417664b1c194c7ba93ff3025",
+   "sha256": "1d2yws0xs4kjafa1544dp3vii9ikmqxrrca53455jxldb024xf4z"
+  }
+ },
  {
   "ename": "citar-org-roam",
   "commit": "87aefd56251d20a2a832d27e3170a3e39e39870d",
@@ -14447,11 +14502,11 @@
   "repo": "clojure-emacs/clojure-ts-mode",
   "unstable": {
    "version": [
-    20250310,
-    1233
+    20250326,
+    1922
    ],
-   "commit": "b165c6e8d6040e8701f1e3798c1b33f8549b823f",
-   "sha256": "1xi610rz8n2brp61mwg25rzd12p8hacba8ykl3vx86gkfx4xxf8b"
+   "commit": "4cf4bd11428595b62002f5a587a53deaf21123b2",
+   "sha256": "19vm1j61smkmflk9awimdwb6kzd4j9n3pms9xl649kj7n156lq4x"
   },
   "stable": {
    "version": [
@@ -14708,12 +14763,12 @@
   },
   "stable": {
    "version": [
-    3,
-    31,
-    6
+    4,
+    0,
+    0
    ],
-   "commit": "859ca5c4d7396a011a462878179bc173e1283731",
-   "sha256": "1jkp72my1nql39z06ma2ydi78h4rzxca0kakbvyp5b22dadcm37q"
+   "commit": "f76a123f98111896ad9277f680b59b7d53071d4f",
+   "sha256": "0h0n7n6gmnsmv4prj7s4n7ipv0saxsr3264nlygfjj5dqd0gz9la"
   }
  },
  {
@@ -15358,11 +15413,11 @@
   "repo": "purcell/color-theme-sanityinc-tomorrow",
   "unstable": {
    "version": [
-    20250306,
-    1440
+    20250401,
+    1320
    ],
-   "commit": "5e3ed508e2c0a9a6d9af700212dd7ce96a356da6",
-   "sha256": "1v4h94swwkvryafv35y77w24aa0wgwqlyjx3228smhxkqn3j8v84"
+   "commit": "f3a993da26b3b6f778f5943e095e8b2816a6475c",
+   "sha256": "0r8q6ld2zma1bqq5pv61gpy99a4vx6bwx4v820ijzbymmi62vv3z"
   },
   "stable": {
    "version": [
@@ -15530,14 +15585,14 @@
   "repo": "NicholasBHubbard/comint-histories",
   "unstable": {
    "version": [
-    20250204,
-    222
+    20250319,
+    1602
    ],
    "deps": [
     "f"
    ],
-   "commit": "15a2e3c89814927fce0cc01ab01824b09881c652",
-   "sha256": "0vcpw674gcpn5p0swy9sgwmfn1rsi2cd7nj92y9glc8paky3p3m0"
+   "commit": "100173efba855e66e0a9596135f88820501125b9",
+   "sha256": "1kl7wlppy1d6g62xynp5jlj0cdjv13yq453ib2h7yxmma3xb3n6r"
   }
  },
  {
@@ -15973,25 +16028,6 @@
    "sha256": "0x8qc63zn126hspcblwlihxfzs8kvcjb6cpj28ahsb0117j2i789"
   }
  },
- {
-  "ename": "company-axiom",
-  "commit": "8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf",
-  "sha256": "061n8zn11r5a9m96sqnw8kx252n1m401cmcyqla8n9valjbnvsag",
-  "fetcher": "git",
-  "url": "https://bitbucket.org/pdo/axiom-environment",
-  "unstable": {
-   "version": [
-    20220612,
-    1535
-   ],
-   "deps": [
-    "axiom-environment",
-    "company"
-   ],
-   "commit": "01d88daa0c864af9918db5a147fbb5e435dec199",
-   "sha256": "03cxb6zdqmzgjp8r6hcirf8xl772j7xqk2nw17gjkn4xqbwfyn62"
-  }
- },
  {
   "ename": "company-bibtex",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -16423,6 +16459,25 @@
    "sha256": "12cg8amyk1pg1d2n8fb0mmls14jzwx08hq6s6g7wyd9s7y96hkhb"
   }
  },
+ {
+  "ename": "company-forge",
+  "commit": "8400498d4146c72306f6c658ddaaadf9dbc54798",
+  "sha256": "05jnglgxf197917hhjg3ybllsa9k75w4f3mmmsidcpnfxnfx8bhj",
+  "fetcher": "github",
+  "repo": "pkryger/company-forge.el",
+  "unstable": {
+   "version": [
+    20250402,
+    735
+   ],
+   "deps": [
+    "company",
+    "forge"
+   ],
+   "commit": "535139ed9f0fa92f5e53d9c1b89cb4194e5f2cff",
+   "sha256": "0prpblvckpxrdlvgsnrlvmr1265mvrnn5pp7xk4c00c91m5nmg5q"
+  }
+ },
  {
   "ename": "company-fuzzy",
   "commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db",
@@ -17776,20 +17831,20 @@
   "repo": "jamescherti/compile-angel.el",
   "unstable": {
    "version": [
-    20250313,
-    16
+    20250323,
+    1331
    ],
-   "commit": "ec2d0beb0668d66de29510980f8112230757a0a6",
-   "sha256": "108sh6j845pmpj5s6k04z55ylrp6p0jfb70lfbq62bzp5nm2z3xz"
+   "commit": "3b47285e0d47a792decc1fc42f0faf79e4c7477c",
+   "sha256": "0qy5dj61vfccy5q1yfanykgv3h356ivqsxfc3fcwwmlhjv20pzyp"
   },
   "stable": {
    "version": [
     1,
     0,
-    5
+    6
    ],
-   "commit": "84023838fa67621197ab7ad9a0842887d1e9e323",
-   "sha256": "0fzcr75i8jklwfgqlp3s2mfbizr6ajibhyfjq73pza6w2dw9ggcj"
+   "commit": "f5567d4f4ade48e74d24a2b8f3390f7efa18c801",
+   "sha256": "00i2m042yj883sk4l8zbq62ags3lvpsc21ys92ppbz6ldcbpw4fq"
   }
  },
  {
@@ -18260,25 +18315,25 @@
   "repo": "minad/consult",
   "unstable": {
    "version": [
-    20250311,
-    1658
+    20250402,
+    659
    ],
    "deps": [
     "compat"
    ],
-   "commit": "d557305b730f7666d46bc3eb04c87cfcc493a8e5",
-   "sha256": "1d04j6psx05cbnsmc78rqnzg1zpcnqd9m1830d276n1jpfszmh10"
+   "commit": "30a42ac8f3d42f653eda234ee538c1960704f4f2",
+   "sha256": "03kmdpgghbpwss8kkm0w9cprg0cws00ksamv912vryabs8c095zx"
   },
   "stable": {
    "version": [
     2,
-    1
+    2
    ],
    "deps": [
     "compat"
    ],
-   "commit": "d557305b730f7666d46bc3eb04c87cfcc493a8e5",
-   "sha256": "1d04j6psx05cbnsmc78rqnzg1zpcnqd9m1830d276n1jpfszmh10"
+   "commit": "30a42ac8f3d42f653eda234ee538c1960704f4f2",
+   "sha256": "03kmdpgghbpwss8kkm0w9cprg0cws00ksamv912vryabs8c095zx"
   }
  },
  {
@@ -18562,16 +18617,16 @@
   "repo": "armindarvish/consult-gh",
   "unstable": {
    "version": [
-    20250310,
-    350
+    20250328,
+    2026
    ],
    "deps": [
     "consult",
     "markdown-mode",
     "ox-gfm"
    ],
-   "commit": "e21b9e44c6d241a9a3afc6c45b3e7c37a543a744",
-   "sha256": "1qxk12ia5p8qhmvxdy6zz5kb2cz2gmcmn3mg8gz3s823zx0fj4j0"
+   "commit": "063b95ff92308d8fcdcd013c53394c1f9f1d7da0",
+   "sha256": "1nssjni5xnd9xvdarpf9p3pcf1s70wv57xvlk0lld78cb5hxamc4"
   },
   "stable": {
    "version": [
@@ -18595,16 +18650,16 @@
   "repo": "armindarvish/consult-gh",
   "unstable": {
    "version": [
-    20250309,
-    2223
+    20250328,
+    2015
    ],
    "deps": [
     "consult",
     "consult-gh",
     "embark-consult"
    ],
-   "commit": "a1c307ddd9d022a142030e3e868df05ee30656fa",
-   "sha256": "1f7i1h5024d2i5nlcf7q9zzyxdwccakjin89zvb2yp32r8m4m7qq"
+   "commit": "6ed4601dc5ce7d63f6340a6540b2ba7919d14718",
+   "sha256": "1v799kf5hl9bz9gyw136c6ksksznjiqr3xxc0dq6zy11wxci6z4z"
   },
   "stable": {
    "version": [
@@ -18628,16 +18683,16 @@
   "repo": "armindarvish/consult-gh",
   "unstable": {
    "version": [
-    20250309,
-    2223
+    20250328,
+    2015
    ],
    "deps": [
     "consult",
     "consult-gh",
     "forge"
    ],
-   "commit": "a1c307ddd9d022a142030e3e868df05ee30656fa",
-   "sha256": "1f7i1h5024d2i5nlcf7q9zzyxdwccakjin89zvb2yp32r8m4m7qq"
+   "commit": "6ed4601dc5ce7d63f6340a6540b2ba7919d14718",
+   "sha256": "1v799kf5hl9bz9gyw136c6ksksznjiqr3xxc0dq6zy11wxci6z4z"
   },
   "stable": {
    "version": [
@@ -18661,16 +18716,16 @@
   "repo": "armindarvish/consult-gh",
   "unstable": {
    "version": [
-    20250309,
-    2223
+    20250328,
+    2015
    ],
    "deps": [
     "consult",
     "consult-gh",
     "pr-review"
    ],
-   "commit": "a1c307ddd9d022a142030e3e868df05ee30656fa",
-   "sha256": "1f7i1h5024d2i5nlcf7q9zzyxdwccakjin89zvb2yp32r8m4m7qq"
+   "commit": "6ed4601dc5ce7d63f6340a6540b2ba7919d14718",
+   "sha256": "1v799kf5hl9bz9gyw136c6ksksznjiqr3xxc0dq6zy11wxci6z4z"
   },
   "stable": {
    "version": [
@@ -18724,14 +18779,14 @@
   "repo": "ghosty141/consult-git-log-grep",
   "unstable": {
    "version": [
-    20250307,
-    1159
+    20250317,
+    1916
    ],
    "deps": [
     "consult"
    ],
-   "commit": "e85627bb950f6c4ae296a2623d55e8e659e29ba8",
-   "sha256": "0xw4nvv5smy77l7d4gxr7qwm98qqv73mmszcgalm5wki88x1g3br"
+   "commit": "5b1669ebaff9a91000ea185264cfcb850885d21f",
+   "sha256": "12vbgl90m3jp1m5f9amsqa7aa9kxlayf02rzii30mgfi02y7ypl4"
   }
  },
  {
@@ -19233,18 +19288,30 @@
   "repo": "copilot-emacs/copilot.el",
   "unstable": {
    "version": [
-    20250223,
-    139
+    20250402,
+    2229
    ],
    "deps": [
-    "dash",
     "editorconfig",
     "f",
-    "jsonrpc",
-    "s"
+    "jsonrpc"
    ],
-   "commit": "7d105d708a23d16cdfd5240500be8bb02f95a46e",
-   "sha256": "1gc8rnyl60wlxdhqi1a96mq0wfgpnfziyihpvcy9bmnx14s34ch1"
+   "commit": "8f4a04e1c764bea291840387a82d03e55b0a04cf",
+   "sha256": "0m1q9cxd4vbmi8nikvnchbindr0lq3d65l1iv0pzn9nlpizwc6qb"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "editorconfig",
+    "f",
+    "jsonrpc"
+   ],
+   "commit": "5fa27b5194ad84ffb21c51eeb10ef0e9559a1c56",
+   "sha256": "01i0vgrgf27zam7c94wgq23xys3yy86fkvbxx4frr3yc5sz0hfml"
   }
  },
  {
@@ -19255,11 +19322,11 @@
   "repo": "chep/copilot-chat.el",
   "unstable": {
    "version": [
-    20250313,
-    822
+    20250331,
+    737
    ],
    "deps": [
-    "magit",
+    "aio",
     "markdown-mode",
     "org",
     "polymode",
@@ -19267,8 +19334,8 @@
     "shell-maker",
     "transient"
    ],
-   "commit": "0337869a7d19171133198453985009655a846f75",
-   "sha256": "1qmaqqwr38d0br5prc2wrq9qcdwwx09v5312ip7ln1lgzd9a1b18"
+   "commit": "c2b9d40e5909a8d4468ab57ea72a85518106658e",
+   "sha256": "117zhzq458h2h5s3v9ihl1kzav61273gcxy7ln2n1g47w165gfjd"
   },
   "stable": {
    "version": [
@@ -19439,25 +19506,25 @@
   "repo": "minad/corfu",
   "unstable": {
    "version": [
-    20250128,
-    821
+    20250328,
+    1430
    ],
    "deps": [
     "compat"
    ],
-   "commit": "2c476b442ccfda9935e472b26d9cd60d45726560",
-   "sha256": "0yyc64bfqpsjs5iwgwxm171sg85al4mzj4pv3qd4cpmkgmamrrv3"
+   "commit": "061d926d0f0eb2633416deeddc403a1a67b062ae",
+   "sha256": "15vmhbwpjgvc9ly8icrjf74jhbplhigfyfa762s45ipnrq6gyixq"
   },
   "stable": {
    "version": [
-    1,
-    7
+    2,
+    0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "2c476b442ccfda9935e472b26d9cd60d45726560",
-   "sha256": "0yyc64bfqpsjs5iwgwxm171sg85al4mzj4pv3qd4cpmkgmamrrv3"
+   "commit": "061d926d0f0eb2633416deeddc403a1a67b062ae",
+   "sha256": "15vmhbwpjgvc9ly8icrjf74jhbplhigfyfa762s45ipnrq6gyixq"
   }
  },
  {
@@ -19616,28 +19683,28 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20250304,
-    939
+    20250329,
+    1401
    ],
    "deps": [
     "ivy",
     "swiper"
    ],
-   "commit": "db61f55bc281c28beb723ef17cfe74f59580d2f4",
-   "sha256": "0ypbjjmr1lyyq5azlbx03rpbkhpc1fl4fbm6m2zbv48bzyr49hn5"
+   "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429",
+   "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1"
   },
   "stable": {
    "version": [
     0,
     15,
-    0
+    1
    ],
    "deps": [
     "ivy",
     "swiper"
    ],
-   "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742",
-   "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64"
+   "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429",
+   "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1"
   }
  },
  {
@@ -21648,11 +21715,11 @@
   "repo": "mrkkrp/cyphejor",
   "unstable": {
    "version": [
-    20230606,
-    1501
+    20250401,
+    1135
    ],
-   "commit": "5444ae370ccdf3991aabe97b12004c987256c9e5",
-   "sha256": "1p0hs98m366mkfvw8s0p1cngwqkmnrmhs9l40mafh20635gigrzi"
+   "commit": "78bc40555e05f85d5fc2f7a110bee98b614d4cb7",
+   "sha256": "0sb0kymca8ccjnwbyvb3891m6mfnsl7x5ikny2ikyhpifgv97yly"
   },
   "stable": {
    "version": [
@@ -21865,14 +21932,14 @@
   "repo": "xenodium/dall-e-shell",
   "unstable": {
    "version": [
-    20241118,
-    1015
+    20250331,
+    1641
    ],
    "deps": [
     "shell-maker"
    ],
-   "commit": "d7f54f002c9271bc46c7403af898ed12e3abea69",
-   "sha256": "0cf81h9acc1ql5148y00jsl7v80190s2q71wd0q9j70vdghz8xhv"
+   "commit": "efec43ab3338e59f12165110e6c6c957345f6257",
+   "sha256": "1fab097pgqc9by9dhjmsgn3grp905h7pivnz46w9s52pa1pvbrmv"
   },
   "stable": {
    "version": [
@@ -22158,11 +22225,11 @@
   "repo": "sjrmanning/darkokai",
   "unstable": {
    "version": [
-    20200614,
-    1452
+    20250317,
+    1704
    ],
-   "commit": "5820aeddfc8c869ba840cc534eba776936656a66",
-   "sha256": "1bj7l5sh6nzxcw575kjcscjpjqmwlxhvi30qviqg4d6aymzkgr53"
+   "commit": "2b02bf7687433555fc683d59bb4ff7eb3d9e6858",
+   "sha256": "07zs8a9q4z02bwrci3l3g23f9h5a30hwiw64x0i04py9bix5kk12"
   }
  },
  {
@@ -23385,14 +23452,15 @@
   "repo": "swflint/denote-agenda",
   "unstable": {
    "version": [
-    20250302,
-    2012
+    20250402,
+    1838
    ],
    "deps": [
-    "denote"
+    "denote",
+    "seq"
    ],
-   "commit": "ad03c7f4778552f9aa42ed5eadac067f2fe8a6d0",
-   "sha256": "1884gwzzz3k2abr4x7j0p5r258njv7q57mlw1im2h4a4danmzjcg"
+   "commit": "085f4a747498da487e532a23f7c0c452818e63dc",
+   "sha256": "0n8bs0aij6dkp19nmcaz0zip8p9y6ip90m7i8l0z9x553gc6p8vl"
   }
  },
  {
@@ -23455,14 +23523,14 @@
   "repo": "swflint/denote-journal-capture",
   "unstable": {
    "version": [
-    20250302,
-    2013
+    20250315,
+    1919
    ],
    "deps": [
-    "denote"
+    "denote-journal"
    ],
-   "commit": "6c2c81fff472de81b8e7ba9bccf26788f257ffa6",
-   "sha256": "0kxcdgs2rs0r7a3sahkkg6i00ggiky9lmjjmxjy3picpmjlsm1mc"
+   "commit": "64ca22073b01b9a3fca15ff300342ce67932cd3d",
+   "sha256": "0knm1vsrnwykzcps1k608nhhfsmv7j012fdf0k67kar2phz9vzbk"
   }
  },
  {
@@ -23473,14 +23541,32 @@
   "repo": "swflint/denote-project-notes",
   "unstable": {
    "version": [
-    20250304,
-    2322
+    20250328,
+    1347
    ],
    "deps": [
     "denote"
    ],
-   "commit": "f7426374454f43b2846675c72224722422677023",
-   "sha256": "15divkv2b9ypndyb1j6a6aqkfhwqca6yjmsyrrjhm04qjky465n0"
+   "commit": "f1f12a9bc288e0a1c1ed451c905f8e2792d97509",
+   "sha256": "1kz15jlwzf0qln5w552w8cvk5jzblqim34qylcmk3nkyrbcs2nc2"
+  }
+ },
+ {
+  "ename": "denote-regexp",
+  "commit": "b72b9557316707fad9d96a26d30552d547879d72",
+  "sha256": "0h0f2m06gk135i1b14z5512da65i9zq5vxdsh97mwj2292l1c4b3",
+  "fetcher": "sourcehut",
+  "repo": "swflint/denote-regexp",
+  "unstable": {
+   "version": [
+    20250324,
+    146
+   ],
+   "deps": [
+    "denote"
+   ],
+   "commit": "f61b8b895552364d4ce4903beb42d4afb4f4d98c",
+   "sha256": "0ambw2iamkyc2kb8lahzy3jn9bmxfvyxqqzpdr4vrirvsbgz6ls7"
   }
  },
  {
@@ -23724,11 +23810,11 @@
   "repo": "blahgeek/emacs-devdocs-browser",
   "unstable": {
    "version": [
-    20240909,
-    1711
+    20250319,
+    240
    ],
-   "commit": "3de7b1f013cbecebedeeeb16d5fec532ef56c2e2",
-   "sha256": "1sp6r1i2r8ws6l5i2dlb85lszfhwcqh10kx1a1d3gz9r993mb9g3"
+   "commit": "e6ccbaafc795e8be54762b2e930ada2967cec08b",
+   "sha256": "09clfa4ngs86chbfmgzv7s896xvw0wgd0ir56b2zmpra8a9hrln9"
   }
  },
  {
@@ -24008,14 +24094,14 @@
   "repo": "dgutov/diff-hl",
   "unstable": {
    "version": [
-    20250223,
-    2320
+    20250327,
+    314
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "685e99135001da13caecdff71acea1ee20bed373",
-   "sha256": "0wifczw882r4hl03yvc8m7b9fp06vccffsqji1lfiv4c3szli873"
+   "commit": "7da881a957b8c15ddcc754dd73543c95b128d716",
+   "sha256": "0ban6vi5hmxxh1aammq4n25vjw1cn994b1ac8m5k3sjdsmcz1bbf"
   },
   "stable": {
    "version": [
@@ -24478,20 +24564,20 @@
   "repo": "jamescherti/dir-config.el",
   "unstable": {
    "version": [
-    20250121,
-    2019
+    20250330,
+    2325
    ],
-   "commit": "97f127fd2dfb36c854e9455ccc5dc7b953286409",
-   "sha256": "0nin03z7s61aq1yf7rjd9637f2ys02q6f3640m26p0srska95yzg"
+   "commit": "985e86dd79cd661493f3858d172d7452c6fb440e",
+   "sha256": "0bj0767ri5bivk8005cdyzw6lwq42l8z2z3ad80scw7myc04s6q2"
   },
   "stable": {
    "version": [
     1,
     0,
-    1
+    2
    ],
-   "commit": "5cbc2655a5ee734a4747a1b580e331e88c720737",
-   "sha256": "13flkflgbbh41zr0x378hpcnvkbyld5qa2asr76087dd238ygxhz"
+   "commit": "985e86dd79cd661493f3858d172d7452c6fb440e",
+   "sha256": "0bj0767ri5bivk8005cdyzw6lwq42l8z2z3ad80scw7myc04s6q2"
   }
  },
  {
@@ -25426,14 +25512,14 @@
   "repo": "Boruch-Baum/emacs-diredc",
   "unstable": {
    "version": [
-    20240828,
-    1536
+    20250318,
+    2252
    ],
    "deps": [
     "key-assist"
    ],
-   "commit": "447cd0a87dc188793e0482ab8289d09ccdea0bee",
-   "sha256": "0p7pi0qd7np6nd3p4i9dq25d6lrhfqkr688lyh4cn9h3m980ky5k"
+   "commit": "44c8acfef3701dd358a876c7af62caf5556d414b",
+   "sha256": "0rha0jsw05nvda5zk608x4p3g1c4nk3w71x1c58jcbqpawn395kj"
   },
   "stable": {
    "version": [
@@ -25647,11 +25733,14 @@
   "repo": "alexluigit/dirvish",
   "unstable": {
    "version": [
-    20250312,
-    1651
+    20250403,
+    459
    ],
-   "commit": "a8e3a4ddcfe07dce284acb6276515bb813a57e14",
-   "sha256": "13y066sj6ax8czlfp6vy2da310q988vij933wvw31frihwd2v200"
+   "deps": [
+    "compat"
+   ],
+   "commit": "7011a0fbff90c09285cf86905a0ca009d43708f9",
+   "sha256": "0m7k5v14fjmrgkfvdc2z8xfs2b7cw85b53ba04gmjgzywp3yirrm"
   },
   "stable": {
    "version": [
@@ -25914,14 +26003,14 @@
   "repo": "aurtzy/disproject",
   "unstable": {
    "version": [
-    20250309,
-    2015
+    20250327,
+    433
    ],
    "deps": [
     "transient"
    ],
-   "commit": "35a5794fd1cbca11d6070e30a2344f97042e7343",
-   "sha256": "06vhsf997jdprh9y2z5lhz73fxl1mq99z6767lmmyavm2hxbxscp"
+   "commit": "a27b70e7beaa74a8fcebfe8fb1ce4b42c065664f",
+   "sha256": "0k9icpygqkqx0lwncll4spyaw048mkvwhnhfkha0pkn3krnpmbf8"
   },
   "stable": {
    "version": [
@@ -26414,8 +26503,8 @@
   "repo": "Silex/docker.el",
   "unstable": {
    "version": [
-    20250109,
-    810
+    20250313,
+    2007
    ],
    "deps": [
     "aio",
@@ -26424,8 +26513,8 @@
     "tablist",
     "transient"
    ],
-   "commit": "46b597a711492e1c19d1260951f39372450278f5",
-   "sha256": "04szzbb59dzab2sz0kcc2i7gllv6ydcskp07fnh0sshsczm35dlf"
+   "commit": "36cc66f2a975d2a1864545d0bd57dd4b6db3e6a5",
+   "sha256": "0cpka14s620qy69njx9cw44h85f4kfmllg6mvykcxb1r6idza8yv"
   },
   "stable": {
    "version": [
@@ -26558,11 +26647,11 @@
   "repo": "spotify/dockerfile-mode",
   "unstable": {
    "version": [
-    20250225,
-    1527
+    20250315,
+    1426
    ],
-   "commit": "7ce17e054eca4d56ca8bc1e4a6a0dbf58efd8d52",
-   "sha256": "1ilnfv57d2rinf0np3i675gfdv8n6iv8vlls92m6d45yahykqacw"
+   "commit": "8135740bfc6ad96ab82d39d9fe68dbce56180f4c",
+   "sha256": "0flbf53cqwldrpbbbschkacf105bzm42bd0c7pdkjr5bdc37wlai"
   },
   "stable": {
    "version": [
@@ -26815,16 +26904,16 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20250313,
-    703
+    20250401,
+    1348
    ],
    "deps": [
     "compat",
     "nerd-icons",
     "shrink-path"
    ],
-   "commit": "ec27cdb3cf1fec1db63c752b3654c9de28e22089",
-   "sha256": "0rl1z12749zzvibp0l80q38mw854zzff4yycgmhci8pr5avjwk63"
+   "commit": "05fec1d4866b1dd5c7c264bc4671dbfd4b96c556",
+   "sha256": "0f8ixbbrxbxa7wkqz2crnv3dyv28a189ybjzhfjmka50gl9k9frz"
   },
   "stable": {
    "version": [
@@ -27095,14 +27184,14 @@
   "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git",
   "unstable": {
    "version": [
-    20250108,
-    2201
+    20250401,
+    2244
    ],
    "deps": [
     "debian-el"
    ],
-   "commit": "f2708f117cf69ff4c42858448b1101a27b5cb2a3",
-   "sha256": "0n9g3sf7qnj9ixj7p0vsh9km2a2y7hhj49cz85vra3sg9b092bvn"
+   "commit": "1f75d3a714c60762cf56f319c3affe8c4ea2ee04",
+   "sha256": "0m45aic46jc9r63xw1j77sfj1ciq2hpbbai4ibxxlr4whw4n9rrg"
   },
   "stable": {
    "version": [
@@ -27148,11 +27237,11 @@
   "repo": "dracula/emacs",
   "unstable": {
    "version": [
-    20241217,
-    2145
+    20250325,
+    1246
    ],
-   "commit": "a3508f702f96ff262f213de4a49d173449e2cf32",
-   "sha256": "0qzsw6x5d1qpwfr29zkgd5wlafxk9b2x68pm4pyda99bmr9kd0dp"
+   "commit": "ab09e8532c70bf73caed55ab9ce52ba3fb14583e",
+   "sha256": "1d1bph92vnpw9f10vphznhfdmy5fwvl54n6k5j6ip9m1cziwc7gn"
   },
   "stable": {
    "version": [
@@ -27824,11 +27913,11 @@
   "repo": "dylan-lang/dylan-emacs-support",
   "unstable": {
    "version": [
-    20250209,
-    721
+    20250319,
+    1925
    ],
-   "commit": "8cf635979a2233e14a2a72071d44ddb47109edef",
-   "sha256": "0jghp6b8n27dw62qzqz6afrny2a5gyj7ml2r9z0cazgxx4gbz34j"
+   "commit": "342d86a58ad307a581fc95c0f271661444dbc13c",
+   "sha256": "1lpy03lzfpws828wn4f89cqnc0js4d65kk206xrb6rjlx55yv2a9"
   },
   "stable": {
    "version": [
@@ -28295,11 +28384,11 @@
   "repo": "emacs-eask/eask",
   "unstable": {
    "version": [
-    20250226,
-    2354
+    20250403,
+    257
    ],
-   "commit": "8d831ff25d085634e288b35d4774f8c4a48a4d76",
-   "sha256": "03hafc1q3gfk6pcx4ijrrzk1isljc4jka67wx5gv6h7hgwvkwxh7"
+   "commit": "7faf67d059a8271c4b9e2eb23f8e1dc807a974e7",
+   "sha256": "1s7cq89rz26vkrgy9js3195gb1a57fcaz82c8f0c6f339cqwn8f1"
   },
   "stable": {
    "version": [
@@ -28561,26 +28650,20 @@
   "repo": "jamescherti/easysession.el",
   "unstable": {
    "version": [
-    20250308,
-    2208
+    20250318,
+    2203
    ],
-   "deps": [
-    "f"
-   ],
-   "commit": "0e7ce6d69945cfc4a0cbbc758048dc3d50ddda71",
-   "sha256": "1gsd5a9kmmgbkcjyqqvapdgydn2399jgvyl0zng1irl19pkrjjg3"
+   "commit": "4ca5cf06d3ad3ad8c9f7b9d1dcdd885f8da712af",
+   "sha256": "1abgb21skyc8z5ib719nm1br09x3zyck15h7i79aab26vnxmazrv"
   },
   "stable": {
    "version": [
     1,
     1,
-    2
+    3
    ],
-   "deps": [
-    "f"
-   ],
-   "commit": "c2c4fe4da6d11ce8945e20b8d93feb112c05d551",
-   "sha256": "0qwqbfsccmlrywq0lhwv4vl6x7mnyyl8071s8975ip6rv76zyw0b"
+   "commit": "1a72f4e0460d81c7b5c43fd5b96aa743b6340bec",
+   "sha256": "1wrw3x27fvh94bs6sajcfz421q01b1i4kdm3k5m3fd384md5jqr3"
   }
  },
  {
@@ -28656,15 +28739,15 @@
   "repo": "joostkremers/ebib",
   "unstable": {
    "version": [
-    20250222,
-    1322
+    20250325,
+    2311
    ],
    "deps": [
     "compat",
     "parsebib"
    ],
-   "commit": "aa54f33ee2b1205e651da1153014c128d82f1659",
-   "sha256": "028b6dpwaidjfc6h79wlfqggxdc4adng72amgsgm0hik70a604v0"
+   "commit": "7a11f676401434623bf3a6e24b1e0b07d78ce0d6",
+   "sha256": "1pzhdk082kh8j2imw1wmkf8zr345ifs49w9cx1d339rjc0myvkcb"
   },
   "stable": {
    "version": [
@@ -30188,20 +30271,20 @@
   "repo": "meedstrom/el-job",
   "unstable": {
    "version": [
-    20250313,
-    1138
+    20250327,
+    306
    ],
-   "commit": "33ee1713e1219e4f86c7817cb5491e7532750afa",
-   "sha256": "0n7gh9awd3fhr0hnwdbk0wsqx8sl01pyaks2jpvzcr532al2mn7b"
+   "commit": "b80bc0380edca448b1e856441659d8eb4d97a3f7",
+   "sha256": "09zipgg52zh7kfamnslbrrghs2sndkwj0kcmbb8mxwmx5k5zi62d"
   },
   "stable": {
    "version": [
     2,
-    2,
+    4,
     3
    ],
-   "commit": "33ee1713e1219e4f86c7817cb5491e7532750afa",
-   "sha256": "0n7gh9awd3fhr0hnwdbk0wsqx8sl01pyaks2jpvzcr532al2mn7b"
+   "commit": "b80bc0380edca448b1e856441659d8eb4d97a3f7",
+   "sha256": "09zipgg52zh7kfamnslbrrghs2sndkwj0kcmbb8mxwmx5k5zi62d"
   }
  },
  {
@@ -30591,11 +30674,11 @@
   "repo": "vilij/slurpbarf-elcute",
   "unstable": {
    "version": [
-    20241115,
-    1459
+    20250326,
+    2158
    ],
-   "commit": "c6e7d4b5da6f1116b479c71d9c7fa0aca71d4030",
-   "sha256": "1xd8nd55dhdf1dx622x2618zj3xk196p2yr4123hk8hlqlb46h2d"
+   "commit": "47980a15f760d14a7c44a8dbc3e708a47d2f489e",
+   "sha256": "134ra4cshr3ldqwdaqvrv2iiqkdyfrh66i0kh17lc1yyyssn43fl"
   }
  },
  {
@@ -30606,19 +30689,20 @@
   "repo": "emacs-eldev/eldev",
   "unstable": {
    "version": [
-    20250312,
-    1010
+    20250314,
+    2105
    ],
-   "commit": "0d001f26a7e50e46b342a84eccf92940649bd5fe",
-   "sha256": "0h1a0k9fljxvll5q71ki74lf5vgdrjbr3js81wyrjshcasn1nwfa"
+   "commit": "87373ddace0c4b2267d8f45ebd20e4b0eb27f821",
+   "sha256": "19lapjhhq39ffimgh20l148c456811xrgdxnycjlc6iy6zrbdbda"
   },
   "stable": {
    "version": [
     1,
-    11
+    11,
+    1
    ],
-   "commit": "d9b35faade3d361a2a263511c16b8c1fe7614f5b",
-   "sha256": "144wf5im2fy1fv8jjik1s9zfyicphh2pi4dp6q4airrkiirmmr3m"
+   "commit": "ff1e8269fca7e2ee2e50774ade3ce88b79e78cfc",
+   "sha256": "0sf8xyzblc0fs2d65jgcycavnzmrp1wg0sfr29gjkq1kvzyl7phb"
   }
  },
  {
@@ -30653,11 +30737,11 @@
   "repo": "ikirill/eldoc-cmake",
   "unstable": {
    "version": [
-    20190419,
-    2244
+    20250320,
+    2017
    ],
-   "commit": "4453c03b5c95ff32842f13db2fc317fb0fe2f79e",
-   "sha256": "01jhfglj1v4p3qmhiri4k05p0dg10k59pj5608hjls6zsmxf2wbg"
+   "commit": "8ffe7ef0fc01f487834d6bb2468f2d55d68277f1",
+   "sha256": "03a0xw4y5r5dklm3kc338ww7c16znfl6d4b3chibz7rn2lj85prd"
   }
  },
  {
@@ -31231,15 +31315,15 @@
   "repo": "karthink/elfeed-tube",
   "unstable": {
    "version": [
-    20240606,
-    241
+    20250321,
+    1717
    ],
    "deps": [
     "aio",
     "elfeed"
    ],
-   "commit": "0c3fbc21259e1fa794f3179a53b410ba610231f2",
-   "sha256": "0hg2s5yzpd1fsl0fyrfv2cc2m61a67drfg86msfqpqdmkv30pbca"
+   "commit": "79d5a08d76ea3ae96d7def9a5e2ede2e3562462a",
+   "sha256": "0pzxama7qyj9i4x74im5r875b7vv1zrkgfncf5j1qxixj96jzfna"
   },
   "stable": {
    "version": [
@@ -31721,8 +31805,8 @@
   "repo": "s-kostyaev/ellama",
   "unstable": {
    "version": [
-    20250312,
-    1931
+    20250402,
+    1649
    ],
    "deps": [
     "compat",
@@ -31730,14 +31814,14 @@
     "plz",
     "transient"
    ],
-   "commit": "a97cfc250998efadfc728a1021770294d150d77f",
-   "sha256": "1lcrfnb9fbc6nb14hjc0v24cq309vd7wsin80gy9v97y22bdmpnv"
+   "commit": "3b8cb569409ccbef7e9e955aefcd550c4be3e607",
+   "sha256": "1019vwrm95ck2gi29mvwd7sy753zgwa3addw2x0qbhvb3r53620v"
   },
   "stable": {
    "version": [
     1,
-    5,
-    4
+    8,
+    1
    ],
    "deps": [
     "compat",
@@ -31745,8 +31829,8 @@
     "plz",
     "transient"
    ],
-   "commit": "a97cfc250998efadfc728a1021770294d150d77f",
-   "sha256": "1lcrfnb9fbc6nb14hjc0v24cq309vd7wsin80gy9v97y22bdmpnv"
+   "commit": "3b8cb569409ccbef7e9e955aefcd550c4be3e607",
+   "sha256": "1019vwrm95ck2gi29mvwd7sy753zgwa3addw2x0qbhvb3r53620v"
   }
  },
  {
@@ -31776,8 +31860,8 @@
   "repo": "jcollard/elm-mode",
   "unstable": {
    "version": [
-    20230315,
-    1122
+    20250401,
+    915
    ],
    "deps": [
     "f",
@@ -31785,8 +31869,8 @@
     "s",
     "seq"
    ],
-   "commit": "699841865e1bd5b7f2077baa7121510b6bcad3c7",
-   "sha256": "1rbl42hv5b41sqr98p9brckn6pa8wx6smnhcv1bmmyb3cxam79c2"
+   "commit": "90b72cd2c9bc4506f531bcdcd73fa2530d9f4f7c",
+   "sha256": "1if2myy9gr5xzy9sc9sjgvmpys11q39v673rmyncdzvhfjh8q2r4"
   },
   "stable": {
    "version": [
@@ -32231,8 +32315,8 @@
   "repo": "emacs-elsa/Elsa",
   "unstable": {
    "version": [
-    20230621,
-    1005
+    20250316,
+    29
    ],
    "deps": [
     "ansi",
@@ -32244,8 +32328,8 @@
     "lsp-mode",
     "trinary"
    ],
-   "commit": "f719e2404ab6f3323df9341751469cb2e413e013",
-   "sha256": "1098li76wz3g9zdmrl65a93ba39dqd3dqmnazs477bmyjfc6lxyh"
+   "commit": "4ce89b0cf313143cd6b7614f4f50aa8179354df6",
+   "sha256": "173933cg5bpqshy9f7kyh4y4mzj6k6i5rnfvrq8r073pcclx71c2"
   }
  },
  {
@@ -32552,11 +32636,11 @@
   "repo": "tecosaur/emacs-everywhere",
   "unstable": {
    "version": [
-    20240509,
-    1715
+    20250325,
+    1523
    ],
-   "commit": "0b731ca6da351ba40953d090acf69e81757d437b",
-   "sha256": "0y5p0lvggjhv37fvr2li16x4kxf8y6nab8l38bdrmws34cip54cz"
+   "commit": "caeab3948ff02acec4e4bbc2ff17090f56c7040e",
+   "sha256": "1rh28n44jawmb8zqx8vd2cvg27x4q8jnrbw38l07yhza13zjz26l"
   }
  },
  {
@@ -32606,20 +32690,20 @@
   "repo": "magit/emacsql",
   "unstable": {
    "version": [
-    20250301,
-    1637
+    20250401,
+    1500
    ],
-   "commit": "f111b0acc79eadeeb3c6c1332d943f11fd6932ff",
-   "sha256": "08zc3x6cgbn2x67xajz8rnika3bhd86yb6h77q8wg1dxyh1ib2m9"
+   "commit": "5470adaf5dcabebc80c913ac831258fd47a87cbe",
+   "sha256": "0bjw4qbm254r51kgl0bg4scblk998p0y3m140k5lmrdb7k4pnxq2"
   },
   "stable": {
    "version": [
     4,
-    2,
+    3,
     0
    ],
-   "commit": "f111b0acc79eadeeb3c6c1332d943f11fd6932ff",
-   "sha256": "08zc3x6cgbn2x67xajz8rnika3bhd86yb6h77q8wg1dxyh1ib2m9"
+   "commit": "5470adaf5dcabebc80c913ac831258fd47a87cbe",
+   "sha256": "0bjw4qbm254r51kgl0bg4scblk998p0y3m140k5lmrdb7k4pnxq2"
   }
  },
  {
@@ -32979,28 +33063,28 @@
   "url": "https://git.savannah.gnu.org/git/emms.git",
   "unstable": {
    "version": [
-    20250313,
-    1342
+    20250326,
+    1641
    ],
    "deps": [
     "cl-lib",
     "nadvice",
     "seq"
    ],
-   "commit": "3286ac88bf2c306bd66431205eb80ca3bff3e7ef",
-   "sha256": "0gczgnkvls5dr69zh9qcdh4m2f5zqgdx8y6z35cdv3lcbrvc4vkh"
+   "commit": "338462506d7de508f7f74a01d15753f9113cd3cb",
+   "sha256": "0s89r9fr79kv864zydqgkv2fdwxa0n84w5b40v87rj5hlya0kx6v"
   },
   "stable": {
    "version": [
-    21
+    22
    ],
    "deps": [
     "cl-lib",
     "nadvice",
     "seq"
    ],
-   "commit": "a01df752e19458c011dc838bc40a4474728f644e",
-   "sha256": "0dh5iil9liaxmix8g9ha0wyg788zdpmfyabd7z6sn9m7rw48vv22"
+   "commit": "338462506d7de508f7f74a01d15753f9113cd3cb",
+   "sha256": "0s89r9fr79kv864zydqgkv2fdwxa0n84w5b40v87rj5hlya0kx6v"
   }
  },
  {
@@ -33129,29 +33213,29 @@
   "repo": "sarg/emms-spotify",
   "unstable": {
    "version": [
-    20240302,
-    2106
+    20250322,
+    838
    ],
    "deps": [
     "compat",
     "emms",
     "s"
    ],
-   "commit": "3b1e8e5b5306173940d311191b13e2ace4d048b9",
-   "sha256": "1z96pwax3igw5sprk48v4wgxp2pb9qjfbp0dm5jqxqrmhza0qici"
+   "commit": "e553a2157fb2ebf4e0b00594067eea4c680a1940",
+   "sha256": "0avl3qz8l81mn6wnrvhlky7v50lbrb8s8ip9fsf6cdnf82l172n0"
   },
   "stable": {
    "version": [
     0,
-    1
+    2
    ],
    "deps": [
     "compat",
     "emms",
     "s"
    ],
-   "commit": "3b1e8e5b5306173940d311191b13e2ace4d048b9",
-   "sha256": "1z96pwax3igw5sprk48v4wgxp2pb9qjfbp0dm5jqxqrmhza0qici"
+   "commit": "d9e3e2d639b0cd1333cc180f562d9e228b7ac565",
+   "sha256": "12vpdb4ziv0ljgvca6c4x9k74z0mxw896xyvv1p2n9gkg5hqi860"
   }
  },
  {
@@ -33390,15 +33474,15 @@
   "repo": "isamert/empv.el",
   "unstable": {
    "version": [
-    20250225,
-    1652
+    20250331,
+    731
    ],
    "deps": [
     "compat",
     "s"
    ],
-   "commit": "4c660fe44f7ea562896924ce9de28cd37ef15a38",
-   "sha256": "1lb2fcry04rcdyviacfp9s9rz7nsxskyr00md59cm6zflrv6wrgv"
+   "commit": "71515a73d223ab7442581aa0984f8c1512a31f03",
+   "sha256": "0v7whd6hcz7hp3x22l2gm990d5abcazb0l32zmjzgcdk7pcd22zb"
   },
   "stable": {
    "version": [
@@ -33755,15 +33839,15 @@
   "repo": "purcell/envrc",
   "unstable": {
    "version": [
-    20250110,
-    1756
+    20250401,
+    1656
    ],
    "deps": [
     "inheritenv",
     "seq"
    ],
-   "commit": "2b818ca6e4a2f723e7cab70cd0101c2728581c3a",
-   "sha256": "0zz51rs45vxhqhlw423haxw360xc1yk8x32p8vy7pxaylngk950p"
+   "commit": "4ca2166ac72e756d314fc2348ce1c93d807c1a14",
+   "sha256": "1l10nldvdb1dyikz1ahccbmp09i4dhqynl3w4sma7a29n8sciyyl"
   },
   "stable": {
    "version": [
@@ -34402,11 +34486,14 @@
   "repo": "leathekd/ercn",
   "unstable": {
    "version": [
-    20150523,
-    1503
+    20250317,
+    2338
    ],
-   "commit": "8f2493fb40753b9c3699322c205f4dcf0a5bd67b",
-   "sha256": "1hzzfh6fxx03cyb039jbhwdfd0zybfrlaqmcyf14f6dq4d3gvl92"
+   "deps": [
+    "dash"
+   ],
+   "commit": "ac063a64b9e04e4f74ba22b95275cec3bd9dfce1",
+   "sha256": "0i7lrqfj7gryvxi2wkqlnb06gf9391w5s5vmlhkl4lik85jkny64"
   },
   "stable": {
    "version": [
@@ -34557,11 +34644,11 @@
   "repo": "agda/agda",
   "unstable": {
    "version": [
-    20240220,
-    2129
+    20250328,
+    1043
    ],
-   "commit": "d4ac6d038e25bb8d4912da7a4c5df91a856e1c9c",
-   "sha256": "0sfd2y2h606m5800a978sm2ram4sx1cbx2ng1d2hf37qqa950j85"
+   "commit": "ad8ea74ccefd3507006a7ea9a7d9ff5b7a973603",
+   "sha256": "0qiqw69h9vpvwisqngkfdpfqibi5w5ddhxhwvbrv0ah2n29saswr"
   },
   "stable": {
    "version": [
@@ -34625,10 +34712,11 @@
   "stable": {
    "version": [
     27,
-    3
+    3,
+    1
    ],
-   "commit": "05737d130706c7189a8e6750d9c2252d2cc7987e",
-   "sha256": "1g5nhsq26gknz8705k9lk0vgmlwkimzzw90vx1wqswkdm7crsgv5"
+   "commit": "76266a91989378ce53159eee4bd16773e248f5f3",
+   "sha256": "077k6aq141ypr7qx0irycc0z9jkvrv0jrvmn9zc00kmnqk0m3ran"
   }
  },
  {
@@ -36364,20 +36452,20 @@
   "repo": "mekeor/evenok",
   "unstable": {
    "version": [
-    20250309,
-    138
+    20250320,
+    1137
    ],
-   "commit": "9e551dbfb8aea093628ee4f62ba9836c9c437192",
-   "sha256": "10bqnk1sg2adrynp0qvpnbypr7n26hlynw8s8nhwj7ns62104fd5"
+   "commit": "5fc6494c4efba2bb0615e3e5c813f5425be21ec7",
+   "sha256": "0izmcw69wipz1pr2kqs78r9xf71rni90pid9vf0z8c09jw9zjzf7"
   },
   "stable": {
    "version": [
     0,
     12,
-    0
+    1
    ],
-   "commit": "d6600fc808e54dce44d3f8eb2b4e56a60c946c90",
-   "sha256": "0q587f56i8wdaj53dx9vyd0bd00skxjsascqirx7j1fc56bcfbrh"
+   "commit": "5fc6494c4efba2bb0615e3e5c813f5425be21ec7",
+   "sha256": "0izmcw69wipz1pr2kqs78r9xf71rni90pid9vf0z8c09jw9zjzf7"
   }
  },
  {
@@ -36411,16 +36499,16 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20250302,
-    655
+    20250318,
+    1816
    ],
    "deps": [
     "cl-lib",
     "goto-chg",
     "nadvice"
    ],
-   "commit": "ac620beace5f28fbf40cd69765975bf6e915c01c",
-   "sha256": "1shn64qa3ygxzag657096jijpk4fg246qvc9db1d5648qmfya6fd"
+   "commit": "682e87fce99f39ea3155f11f87ee56b6e4593304",
+   "sha256": "17djjfpxnl7a3wmyh0c708w07y05b4d87ii17rnkk9p4w4zimvay"
   },
   "stable": {
    "version": [
@@ -36444,15 +36532,15 @@
   "repo": "emacsorphanage/evil-anzu",
   "unstable": {
    "version": [
-    20220911,
-    1939
+    20250316,
+    1617
    ],
    "deps": [
     "anzu",
     "evil"
    ],
-   "commit": "d1e98ee6976437164627542909a25c6946497899",
-   "sha256": "1i8f360lq5a32knkzbwdw10ql9cxsmgfd4iiwnr7vcwacm34zq88"
+   "commit": "7309650425797420944075c9c1556c7c1ff960b3",
+   "sha256": "1hxxy34ax95xi88gqaj04k2hjph30x0c9dkk2gaw3708zidxykmc"
   },
   "stable": {
    "version": [
@@ -36542,8 +36630,8 @@
   "repo": "emacs-evil/evil-cleverparens",
   "unstable": {
    "version": [
-    20240529,
-    1025
+    20250402,
+    1612
    ],
    "deps": [
     "dash",
@@ -36551,8 +36639,8 @@
     "paredit",
     "smartparens"
    ],
-   "commit": "6637717af0bdac55f97eef98433d53a10395cf77",
-   "sha256": "15vsqm2pgyb1qg2rwnd4b6pny771zyp5x9z4a0p9pc67f11mrwp0"
+   "commit": "01150d7a70169179969ef257f7ab92a93aee9e05",
+   "sha256": "124di9wvsv19z9xj5j8m2p12xp6hq20czyx5bdh1fqhi46wmm7fy"
   }
  },
  {
@@ -36613,15 +36701,15 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20250219,
-    1559
+    20250331,
+    1556
    ],
    "deps": [
     "annalist",
     "evil"
    ],
-   "commit": "cb850ff0d11f644dbd133428cff57e82e655ecd7",
-   "sha256": "1gqzqwnclg2nh9dnicc9adlzsfpn93r97gnz7ghxir36rl4b8ihd"
+   "commit": "3ac7bb303e86c5753aad70571f36aa81e2a72869",
+   "sha256": "1zssfad7698nyk88n1zy871kikygngkdxpwnb54jlxzn53nlmd3g"
   },
   "stable": {
    "version": [
@@ -38962,8 +39050,8 @@
   "repo": "ananthakumaran/exunit.el",
   "unstable": {
    "version": [
-    20240502,
-    431
+    20250325,
+    256
    ],
    "deps": [
     "f",
@@ -38971,8 +39059,8 @@
     "s",
     "transient"
    ],
-   "commit": "b6134ce920a4bbc561f65fac1d1bf37206d97505",
-   "sha256": "1r28j6n373g85rrlwbx0z7mmjz76q9a9fs74grsl5rdjrpab57cn"
+   "commit": "8de56e3fd50832e5f0435bba8eb13c7292cb1ee1",
+   "sha256": "0i3ghgr7diyckp29zqjsg0rq6amap7iki1jy5gkz3fri99w4l2n6"
   }
  },
  {
@@ -39805,8 +39893,8 @@
   "repo": "jumper047/fb2-reader",
   "unstable": {
    "version": [
-    20230805,
-    29
+    20250326,
+    2240
    ],
    "deps": [
     "async",
@@ -39815,8 +39903,8 @@
     "s",
     "visual-fill-column"
    ],
-   "commit": "85777f99483b84f02c1abd6fe0ddbbac7f1258af",
-   "sha256": "0f93s1wssq40z6328klk47zniv2y0x9899xx2wz6z76fxpxssjk5"
+   "commit": "5244d481ed19fc9c4dff7f6394fd68e400b828a3",
+   "sha256": "17b1ib3zfz5hnlbs3c9ps461xfijmq2b96bf9aqanv2x47pbb2ib"
   }
  },
  {
@@ -39890,19 +39978,20 @@
   "repo": "michaelklishin/cucumber.el",
   "unstable": {
    "version": [
-    20240401,
-    242
+    20250401,
+    1008
    ],
-   "commit": "afd49b8a8504e5874027fc0a46283adb1fea26c0",
-   "sha256": "1jlzmd8b03fg0d5hgfvx1czkh5wlw136g34z89cnnmbhi4p4cv3x"
+   "commit": "b788d49624c7a4eb4a3bce475cd4ce1e08d5193d",
+   "sha256": "0lb3s4phqfb5w54zy725lz6j4214nl57x8lkbrfs2zhjdiscbbnr"
   },
   "stable": {
    "version": [
     0,
-    4
+    6,
+    2
    ],
-   "commit": "4bd8f19da816115094beb4b0e085822eb298ac37",
-   "sha256": "1cxjygg05v8s96c8z6plk3hl34jaiwg7s7dl7dsk20rj5f54kgw7"
+   "commit": "76c91c05d15aca7732315b46dd3dcc13ec5235fd",
+   "sha256": "183w5rab7l782h32p1a3qdcdlkc1ibq4slnlv555myp8246gdgl3"
   }
  },
  {
@@ -39913,14 +40002,14 @@
   "repo": "martianh/fedi.el",
   "unstable": {
    "version": [
-    20250102,
-    1603
+    20250316,
+    1151
    ],
    "deps": [
     "markdown-mode"
    ],
-   "commit": "8f0afbb5cd264033f10ba58158a5e1f3737b16d4",
-   "sha256": "0lmjqwq0nrimcqs3j9cadl2yz0nvg250vy2l6czg2648x6fdvcc6"
+   "commit": "460ec9874b8344fb215bc44041ffb3beb1fd20f8",
+   "sha256": "0wabr50jgwpfln8i128226qyrzq4x4qqls268qwis61ikznwc42f"
   },
   "stable": {
    "version": [
@@ -40010,20 +40099,20 @@
   "repo": "technomancy/fennel-mode",
   "unstable": {
    "version": [
-    20250312,
-    1613
+    20250401,
+    732
    ],
-   "commit": "ec185c3ca05703fa6734dfb8934c352f34d54572",
-   "sha256": "1k7pc5ax83ryaphkq36620ddbnr0k70ria6mnbf9ac5y658rq6kj"
+   "commit": "8e5dc2088de6a4d02cd6e4d2bf598112737bdfa8",
+   "sha256": "0p1papj7pj7ib1f4c5bv7hwsa63srhfzzjlnwsp91yml4mjgl4ji"
   },
   "stable": {
    "version": [
     0,
     9,
-    1
+    2
    ],
-   "commit": "1ce807cc664cb209afa0e0331d4d2f0cdbc09f78",
-   "sha256": "0dh50nkfxfiqyf19lfqnbfdpd8xf23q38axfli60d0vcix9nhxpv"
+   "commit": "14c853c1bef5da29c5e56830bdd6d2b88fe4be57",
+   "sha256": "0jkvcq13q4a0r15cn19gyqxg6k2jsm0argykpchac29xhzm4p5v1"
   }
  },
  {
@@ -41173,15 +41262,15 @@
   "repo": "emacsmirror/flim",
   "unstable": {
    "version": [
-    20241125,
-    2201
+    20250330,
+    1802
    ],
    "deps": [
     "apel",
     "oauth2"
    ],
-   "commit": "4ee02945854e4dc94327aad5da2e43d85a777420",
-   "sha256": "04crqqgxwbfkfj1f3rpmbq00w6bakpg1fdv99q2l7dwjksbn35ca"
+   "commit": "4d715b2c846efffe4eb3e8c53940b86c6e703005",
+   "sha256": "1607w38s14jixqyn4yg9q0jwxbi33d17ary4zqj5254slx7zw8c2"
   }
  },
  {
@@ -43444,28 +43533,28 @@
   "repo": "emacs-php/phpstan.el",
   "unstable": {
    "version": [
-    20241107,
-    408
+    20250331,
+    1920
    ],
    "deps": [
     "flycheck",
     "phpstan"
    ],
-   "commit": "b616f5fa5f8aff9aa220c7fe63b39df6d10588a5",
-   "sha256": "0xjr6vi158qm6rnrfvpcmh2grrlvixdd44kik333250298vc3nx3"
+   "commit": "e1aa8b269c0e3281c323bc1fad509edabb668441",
+   "sha256": "1nqsf9bh8pd3pjmpmsiqazy8639h8938jm37qqcmdn13n69n0pxm"
   },
   "stable": {
    "version": [
     0,
-    7,
+    8,
     2
    ],
    "deps": [
     "flycheck",
     "phpstan"
    ],
-   "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
-   "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
+   "commit": "e1aa8b269c0e3281c323bc1fad509edabb668441",
+   "sha256": "1nqsf9bh8pd3pjmpmsiqazy8639h8938jm37qqcmdn13n69n0pxm"
   }
  },
  {
@@ -44313,20 +44402,20 @@
   "repo": "jamescherti/flymake-ansible-lint.el",
   "unstable": {
    "version": [
-    20250121,
-    2019
+    20250313,
+    1901
    ],
-   "commit": "4f9a7a8c5777467e8ccc1495afe02e36db75e671",
-   "sha256": "1qklmvna3rgzdkx85ghnh4l2ahsvc9dczkw4dknxacghimwq1vmi"
+   "commit": "eb5ee90e7dbfbaca4da393fc086a5242fd0b0f79",
+   "sha256": "0lf6hmmk3dcwwsvbjc9g75pr7ljlj0dyag4azy9658jcdrkhmw34"
   },
   "stable": {
    "version": [
     1,
     0,
-    1
+    2
    ],
-   "commit": "0503a9b7ace1d0909ba5d20f9474451621c2011a",
-   "sha256": "0bfv9mpxdd767gxjgyw56h8z18gbhrjl6rqv57wc30vbc3p5frpv"
+   "commit": "eb5ee90e7dbfbaca4da393fc086a5242fd0b0f79",
+   "sha256": "0lf6hmmk3dcwwsvbjc9g75pr7ljlj0dyag4azy9658jcdrkhmw34"
   }
  },
  {
@@ -44352,26 +44441,26 @@
   "repo": "jamescherti/flymake-bashate.el",
   "unstable": {
    "version": [
-    20250121,
-    2019
+    20250313,
+    1933
    ],
    "deps": [
     "flymake-quickdef"
    ],
-   "commit": "dc5cb9efb73f1e5b0f5504d1abf0ab37822c0b97",
-   "sha256": "0zkggbppl5akrp8vsz1nw01dmkd1jmdahvi3x4jfkrfn4ll1ghyv"
+   "commit": "7b0ad8cf05abeabba54ffe74b0ef25770b5ff9eb",
+   "sha256": "04fz0qcclh3ink58w5b2sa8mcnl7180gb28ch9cp2ld9vlpvy8j6"
   },
   "stable": {
    "version": [
     1,
     0,
-    1
+    2
    ],
    "deps": [
     "flymake-quickdef"
    ],
-   "commit": "2339c28cd2aa6e63c5aeb5e904dd5b0060dc264e",
-   "sha256": "0mf0rqg9fjaiwh43v47kvcybnpzygvzj90qxmxc4kcjfblwi606w"
+   "commit": "5d15a0b5263f7fc885a2d7469466c9df58884f67",
+   "sha256": "114jnrlw73z4gy652yid6q9v9cd7nax0d0k04bv3h7v1h0bs100v"
   }
  },
  {
@@ -44698,11 +44787,11 @@
   "repo": "orzechowskid/flymake-eslint",
   "unstable": {
    "version": [
-    20240925,
-    1224
+    20250319,
+    1221
    ],
-   "commit": "66a4f7d619ecf9a8e9ce958482c8e814044f607f",
-   "sha256": "1ygsb7n2hm2d45zjw92c8vk1gg59qa767gwxgfznm4dzkqaa5yyb"
+   "commit": "69aa89346e663a57579848936a18d795655a485b",
+   "sha256": "1wpjj1iz2zm53cxqshvs0kwdliy889d16nhfbq8s5vq8vy22xz0x"
   },
   "stable": {
    "version": [
@@ -45390,26 +45479,26 @@
   "repo": "emacs-php/phpstan.el",
   "unstable": {
    "version": [
-    20231114,
-    1120
+    20250331,
+    1920
    ],
    "deps": [
     "phpstan"
    ],
-   "commit": "495e22f98e3075d0d9a14ebec87771eaf967b996",
-   "sha256": "1khbknia1vhif6a26mcvx1d1mawvkxb84m16ghhp5vfna6g3sk64"
+   "commit": "e1aa8b269c0e3281c323bc1fad509edabb668441",
+   "sha256": "1nqsf9bh8pd3pjmpmsiqazy8639h8938jm37qqcmdn13n69n0pxm"
   },
   "stable": {
    "version": [
     0,
-    7,
+    8,
     2
    ],
    "deps": [
     "phpstan"
    ],
-   "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
-   "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
+   "commit": "e1aa8b269c0e3281c323bc1fad509edabb668441",
+   "sha256": "1nqsf9bh8pd3pjmpmsiqazy8639h8938jm37qqcmdn13n69n0pxm"
   }
  },
  {
@@ -46536,8 +46625,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20250301,
-    2353
+    20250401,
+    1803
    ],
    "deps": [
     "closql",
@@ -46552,14 +46641,14 @@
     "transient",
     "yaml"
    ],
-   "commit": "1c904090dfdcd201d9170997052c43846ddce149",
-   "sha256": "1ps1xwpxhb9vn6bf0wxy8bdba72f973spys0xw1k686swczrb225"
+   "commit": "9db4d386a1ce32b574e413771996d41d9b2407e8",
+   "sha256": "02ks8zc3nqqqqfq2picf0pxsw7wygb5hv9abnva1cv44x091w6zw"
   },
   "stable": {
    "version": [
     0,
-    4,
-    8
+    5,
+    0
    ],
    "deps": [
     "closql",
@@ -46574,8 +46663,27 @@
     "transient",
     "yaml"
    ],
-   "commit": "1c904090dfdcd201d9170997052c43846ddce149",
-   "sha256": "1ps1xwpxhb9vn6bf0wxy8bdba72f973spys0xw1k686swczrb225"
+   "commit": "9db4d386a1ce32b574e413771996d41d9b2407e8",
+   "sha256": "02ks8zc3nqqqqfq2picf0pxsw7wygb5hv9abnva1cv44x091w6zw"
+  }
+ },
+ {
+  "ename": "forge-llm",
+  "commit": "7480ca42e2db5db2bc3bb14283cce7078f6959d4",
+  "sha256": "17gg7iv1caxmb1m08zlmcnvpzgpd960yh2yy4czj2p2wdhwwps8r",
+  "fetcher": "gitlab",
+  "repo": "rogs/forge-llm",
+  "unstable": {
+   "version": [
+    20250331,
+    1948
+   ],
+   "deps": [
+    "forge",
+    "llm"
+   ],
+   "commit": "e0d7c3f532de7cb8d26969786f1ab54e90200142",
+   "sha256": "0zbljik2gn2pf1dwrj217gl414smbi6phhk9qbmzbr6ihvhkssca"
   }
  },
  {
@@ -46803,11 +46911,11 @@
   "repo": "gmlarumbe/fpga",
   "unstable": {
    "version": [
-    20241224,
-    1805
+    20250318,
+    1348
    ],
-   "commit": "7ba64134609cbb9b7a5dd3b960985fa46a582cf0",
-   "sha256": "0sl3s5bfqmicpg4hp2k6qznrgj71dx0lz3dv2jyd48ys67m9x4dx"
+   "commit": "23969f10928a070a86869f5287df0ebae081e113",
+   "sha256": "1l73h0yhkgg005zznqx6wg0xjn3nl286nqijfh1bpwx6i97yajs0"
   },
   "stable": {
    "version": [
@@ -47425,8 +47533,8 @@
   "repo": "FStarLang/fstar-mode.el",
   "unstable": {
    "version": [
-    20250201,
-    28
+    20250402,
+    820
    ],
    "deps": [
     "company",
@@ -47436,8 +47544,8 @@
     "quick-peek",
     "yasnippet"
    ],
-   "commit": "36ffb46259a7bb67e5bfac977aae57d52a4915de",
-   "sha256": "1f2s5nm4rr7v793fa46cqkmijb9fzn0fxn3vywj83bsva3hqsf9z"
+   "commit": "3bbfe93abd077103e9e4417d076d4f4d21e9acab",
+   "sha256": "0vya68as0y19cinjwjf9x0hpbnjazscyfkg4gw8saj551y6xcxmd"
   },
   "stable": {
    "version": [
@@ -47718,20 +47826,20 @@
   "repo": "10sr/fuzzy-finder-el",
   "unstable": {
    "version": [
-    20241219,
-    1044
+    20250318,
+    632
    ],
-   "commit": "ed3fb35d33b38d5baad49ed5a2ea046085de4498",
-   "sha256": "0fqdd9mb81mpi24n517rb6bbm3bi6dymnwcz3kpxydkm65cjvmzh"
+   "commit": "097072165c0ee4a2200229f39851bd85ca0ea92c",
+   "sha256": "0iaax4qlhkwmmpm1vfk7cbjfks12p2zvk7k9k9j0kgsnwdiijjlz"
   },
   "stable": {
    "version": [
     0,
     0,
-    1
+    2
    ],
-   "commit": "f459ee206cbb324c13fe939656b0b9d3a4c3c0b7",
-   "sha256": "0ziziylcaahq491v5m1a8pbrwrifksaj1374rnfvp9d5d9w02lf7"
+   "commit": "097072165c0ee4a2200229f39851bd85ca0ea92c",
+   "sha256": "0iaax4qlhkwmmpm1vfk7cbjfks12p2zvk7k9k9j0kgsnwdiijjlz"
   }
  },
  {
@@ -48992,8 +49100,8 @@
   "repo": "magit/ghub",
   "unstable": {
    "version": [
-    20250301,
-    1641
+    20250401,
+    1509
    ],
    "deps": [
     "compat",
@@ -49001,14 +49109,14 @@
     "llama",
     "treepy"
    ],
-   "commit": "af663777c47a3dce64b2144b4409587b35521e47",
-   "sha256": "1bd8lnhv50brfxqwyk7jmgrig0cahkam7ggwaifaz8vb8m456yar"
+   "commit": "1fbce5379e21565f497c0f59bbe5349773c4be62",
+   "sha256": "00xc8957j700zfjcazbp2mcwk6gj8jyrw017864sw47j50p83wy7"
   },
   "stable": {
    "version": [
     4,
-    2,
-    2
+    3,
+    0
    ],
    "deps": [
     "compat",
@@ -49016,8 +49124,8 @@
     "llama",
     "treepy"
    ],
-   "commit": "af663777c47a3dce64b2144b4409587b35521e47",
-   "sha256": "1bd8lnhv50brfxqwyk7jmgrig0cahkam7ggwaifaz8vb8m456yar"
+   "commit": "1fbce5379e21565f497c0f59bbe5349773c4be62",
+   "sha256": "00xc8957j700zfjcazbp2mcwk6gj8jyrw017864sw47j50p83wy7"
   }
  },
  {
@@ -51771,11 +51879,11 @@
   "repo": "lorniu/go-translate",
   "unstable": {
    "version": [
-    20250304,
-    814
+    20250318,
+    907
    ],
-   "commit": "55efeac0f99f8eff3f9017e62229212e4876f09b",
-   "sha256": "1zk91s2p2sa9v40zyshn54wbpjfn2g5prxad4zzwqncm0dlcjpab"
+   "commit": "a924e0bd6b37d424c222377982e6f71a4ddf4452",
+   "sha256": "0n5w7whg134innyqwrvx86cyqfb2wffm2j0kyddcnbfcmhhr6lrf"
   },
   "stable": {
    "version": [
@@ -52403,8 +52511,8 @@
   "repo": "vmware/govmomi",
   "unstable": {
    "version": [
-    20240208,
-    2356
+    20250325,
+    2024
    ],
    "deps": [
     "dash",
@@ -52412,8 +52520,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "5d7849f71f7080873f4c7d75c999a5bf55d8486d",
-   "sha256": "1a6xx17v5cnz93kkpi4r5f9xzq0pq43iikz7k5smnyl13m3lrm4y"
+   "commit": "f6bae07d1df377a2898bcec6bbe4970ca0240755",
+   "sha256": "1v4yzw4g37k4hdf42pydw4r4x7jrvwzypczsgc680ykdy97s4aq8"
   },
   "stable": {
    "version": [
@@ -52582,28 +52690,28 @@
   "repo": "karthink/gptel",
   "unstable": {
    "version": [
-    20250313,
-    158
+    20250402,
+    1845
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "10e77396bc78e05c922b04a344818bc8ab72d665",
-   "sha256": "1cgm6lqn0yn18cisrgn5cllc6kwx63bawzyqxq5hky7mmrvqfd25"
+   "commit": "4b505e72e9ad0cdbf800457996a4b85c6cb68519",
+   "sha256": "1kfckl05n98smp68mkn2lw7yr3gb39p10w7w2h7p2c62n5h5cnvc"
   },
   "stable": {
    "version": [
     0,
     9,
-    7
+    8
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "5a5cddb93d610bd59ec52a070b0f89a9ec842152",
-   "sha256": "15ny2d04ci04swmxikkyb7lsjr51gvxpr2cj02gwx88bidx34md2"
+   "commit": "975c3e64eb834b939e0d61dfc39fed8395afcc45",
+   "sha256": "1wjzv39pcg6lcmlw6yc4fdfln2cnshzaa0dxgkniq9dfznf7hnmd"
   }
  },
  {
@@ -52614,14 +52722,14 @@
   "repo": "dolmens/gptel-aibo",
   "unstable": {
    "version": [
-    20250311,
-    545
+    20250318,
+    546
    ],
    "deps": [
     "gptel"
    ],
-   "commit": "a8b1550812da3606613b054b05f9458b98067a00",
-   "sha256": "1kw1imwj7ca63d8aszp6rwlj0kih6rv43rbrbsf8r6nifnws5rg7"
+   "commit": "42be3102de37ec988fde513f6fd0768c164d3b99",
+   "sha256": "0sd04s44p7zll3axgv8pg064yq4cls7p8xiddvyya5m0y6gcvq6i"
   }
  },
  {
@@ -52632,26 +52740,26 @@
   "repo": "mwolson/gptel-fn-complete",
   "unstable": {
    "version": [
-    20250313,
-    222
+    20250317,
+    1805
    ],
    "deps": [
     "gptel"
    ],
-   "commit": "fc17166bb0e3ef03dabf9b1550284dc3f441dc0f",
-   "sha256": "0cwlnlwpncysy6qd66j6q1wyqk5r7rgrwjwg66n9s72qfmminbl5"
+   "commit": "6970dfa5c123f420ab06b99be012a222e792b019",
+   "sha256": "0ywf9rzszvjrkqmj9anfnj7qass6ra2yn8szfwmkn7xwyiq2pijw"
   },
   "stable": {
    "version": [
     0,
     3,
-    1
+    2
    ],
    "deps": [
     "gptel"
    ],
-   "commit": "1a28af9c6c37db8a92937316fe43042ef01a1186",
-   "sha256": "18760brg0p4hwphg0wr3hwcv91jizy519fiawr56gv22xvq225sr"
+   "commit": "6970dfa5c123f420ab06b99be012a222e792b019",
+   "sha256": "0ywf9rzszvjrkqmj9anfnj7qass6ra2yn8szfwmkn7xwyiq2pijw"
   }
  },
  {
@@ -53990,20 +54098,20 @@
   "repo": "clarete/hackernews.el",
   "unstable": {
    "version": [
-    20240405,
-    807
+    20250314,
+    1759
    ],
-   "commit": "7c1e9de10fd6b299d45b383302d223d7e3285da9",
-   "sha256": "1006qy4hccjyr056rywnvmc65hypz1fi7j48vlzj2r7c2mqkcns5"
+   "commit": "1d3ba5faf47a3907e270ed5aa4099f73dadfdf6c",
+   "sha256": "1kb34jm81jyp2lv0558c6q109pjb38vxrncq4qaq0b8zir8qcr3y"
   },
   "stable": {
    "version": [
     0,
     7,
-    0
+    1
    ],
-   "commit": "38ad768e95ca651d836ee2fa2d795ac2e84e8e03",
-   "sha256": "100aa0vs1gjwpkfdc7avwv5v3sicj2npqfr1y3dsib3pimp21l6w"
+   "commit": "1d3ba5faf47a3907e270ed5aa4099f73dadfdf6c",
+   "sha256": "1kb34jm81jyp2lv0558c6q109pjb38vxrncq4qaq0b8zir8qcr3y"
   }
  },
  {
@@ -54527,11 +54635,11 @@
   "repo": "haskell/haskell-mode",
   "unstable": {
    "version": [
-    20250305,
-    1349
+    20250401,
+    1742
    ],
-   "commit": "2ada981f2447039c070441d37d28cd32cc2906ca",
-   "sha256": "1194n50xq85y9ymbv4npi3b47zra0fdr6f5hxgp12s07rnh4gf33"
+   "commit": "e9c356739310332afe59b10ffa2e6c3e76f124e3",
+   "sha256": "1mkp9b31ai1z6sccx8cff40viryamw7dm85acig3q82dwlbmxx98"
   },
   "stable": {
    "version": [
@@ -54870,15 +54978,15 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20250228,
-    640
+    20250401,
+    626
    ],
    "deps": [
     "helm-core",
     "wfnames"
    ],
-   "commit": "c0b70dbc2697ff361d9d5bb99e11c654317aa00d",
-   "sha256": "07z3zrdyifsdp91rf0akzxbzxd8ny3rxz49b5j53kppl8l3shxg0"
+   "commit": "87cc8dc495d7213212c98dc80dddcb0c2834c605",
+   "sha256": "0jnlprs36hq4w9q6fsy1kmfz21nam28fwdnall5jxw0mp333c9z8"
   },
   "stable": {
    "version": [
@@ -55760,14 +55868,14 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20250227,
-    1917
+    20250401,
+    650
    ],
    "deps": [
     "async"
    ],
-   "commit": "04104d2add4806130cdeb3c915e9c09fb1de1046",
-   "sha256": "0z5v1nbq55hbcjca3p5gq0jpg20jkml08jvdssbk908jxzcgpyfm"
+   "commit": "f948dc4464d3a02eebd5b75d75a8cd811c18b271",
+   "sha256": "1dsxgxdz2r2ynmivf537c0sfs21alm39vhml5bq582g2wklmb2l9"
   },
   "stable": {
    "version": [
@@ -61105,16 +61213,16 @@
   "repo": "thanhvg/emacs-howdoyou",
   "unstable": {
    "version": [
-    20230928,
-    549
+    20250321,
+    104
    ],
    "deps": [
     "org",
     "promise",
     "request"
    ],
-   "commit": "10f31a10803c3fd4c304f3a4495d57a0b9cf9ab5",
-   "sha256": "04rq68czkw4zlsa5mfcb68hzmpj6wr98jylx5hnas4l8hr0hs081"
+   "commit": "ebecc51c4c1db598d2303d001553ee74fc8fc49a",
+   "sha256": "0z287pfig27hprb5v7mcp5x2m3dyqiywacwhrp7nh23s49nn4la0"
   }
  },
  {
@@ -61125,26 +61233,26 @@
   "repo": "kaorahi/howm",
   "unstable": {
    "version": [
-    20250313,
-    1131
+    20250323,
+    1119
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "347228032d436bd72ec22616ca7cf8f52f32ed17",
-   "sha256": "122yrlmlndlf3kn60fdlclc0g7ic9ma3kn4lk94w9zx9filbsfza"
+   "commit": "53bbfe3b9e4677ac58dd838399da93e2b03db356",
+   "sha256": "1r309zqy7555mrdx51cdhsa8vbyvk71jhx19wqhzmg88ka0fizvc"
   },
   "stable": {
    "version": [
     1,
     5,
-    3
+    4
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "7243d124161ad312a6dd115d7b8195593c9bf24f",
-   "sha256": "1q1srqb852537l4x3acch9k8d5mgmzm35k5jy1kbhjmvmr2kmi09"
+   "commit": "53bbfe3b9e4677ac58dd838399da93e2b03db356",
+   "sha256": "1r309zqy7555mrdx51cdhsa8vbyvk71jhx19wqhzmg88ka0fizvc"
   }
  },
  {
@@ -61720,15 +61828,15 @@
   "repo": "abo-abo/hydra",
   "unstable": {
    "version": [
-    20220910,
-    1206
+    20250316,
+    1254
    ],
    "deps": [
     "cl-lib",
     "lv"
    ],
-   "commit": "317e1de33086637579a7aeb60f77ed0405bf359b",
-   "sha256": "1nbp0kpxb0m4igyjji1b8zi06am4l5m2m6rmxgz0jvks8cyri6dm"
+   "commit": "59a2a45a35027948476d1d7751b0f0215b1e61aa",
+   "sha256": "1mly1mw85n70g6wc68p772a0k1a6w7qsds66jp2qi3xp8179pl9s"
   },
   "stable": {
    "version": [
@@ -61752,11 +61860,11 @@
   "url": "https://git.savannah.gnu.org/git/hyperbole.git",
   "unstable": {
    "version": [
-    20250313,
-    1508
+    20250331,
+    735
    ],
-   "commit": "f6f319eb4012d6eaaec83bc0351d0bb4d5fd699a",
-   "sha256": "0rgkq2v28dwkzd0ycbr2mdx9svgkvmwzjalp6c2c052dqh7pxv06"
+   "commit": "f3ea2cb33889e87165ea63406eabb1615a2c1724",
+   "sha256": "0hchpjfi3s0rmar9rvxav1fqrr7a5793klxnn36bnqmlj77w0q7g"
   },
   "stable": {
    "version": [
@@ -61776,8 +61884,8 @@
   "repo": "ushin/hyperdrive.el",
   "unstable": {
    "version": [
-    20241223,
-    733
+    20250331,
+    427
    ],
    "deps": [
     "compat",
@@ -61788,8 +61896,8 @@
     "taxy-magit-section",
     "transient"
    ],
-   "commit": "9a25b7acbf1566007addf9396d359cb5c86f606f",
-   "sha256": "1s49r8cdk1pbc1ryc3h2lrd2zlk3ij7s3rwrl8lp9ckgarb0gxny"
+   "commit": "1784ae20556990d205360463f069aba319c25909",
+   "sha256": "05p9avasp7nx1wx5mvc5rj85j1n28hw1ibwag0gbxrnpxvrbqvzr"
   },
   "stable": {
    "version": [
@@ -63416,30 +63524,6 @@
    "sha256": "1mx9f8pwnbrm6q9ngdyv64aqkw1izj83m0mf7zqlpww7yfhv1q9b"
   }
  },
- {
-  "ename": "immutant-server",
-  "commit": "d6e906492f9982e2cebd1e4838d7b7c81a295efa",
-  "sha256": "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i",
-  "fetcher": "github",
-  "repo": "leathekd/immutant-server.el",
-  "unstable": {
-   "version": [
-    20140311,
-    2208
-   ],
-   "commit": "2a21e65588acb6a976f2998e30b21fdabdba4dbb",
-   "sha256": "0rbamm9qvipgswxng8g1d7rbdbcj7sgwrccg7imcfapwwq7xhj4h"
-  },
-  "stable": {
-   "version": [
-    1,
-    2,
-    0
-   ],
-   "commit": "6f3d303354a229780a33e6bae64460a95bfefe60",
-   "sha256": "1pf7pqh8yzyvh4gzvp5npfq8kcfjcbzra0kkw7zmz769xxc8v84x"
-  }
- },
  {
   "ename": "impatient-mode",
   "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683",
@@ -63762,6 +63846,40 @@
    "sha256": "0jri2vxd5a4sx93xq6kjcc5zx9yrhv789x3lyq6r2p2422diw2jr"
   }
  },
+ {
+  "ename": "indexed",
+  "commit": "4ca1824396b1b4b0069ef5bdb8dc026331a9d9da",
+  "sha256": "0f11fr50922ghmrh773025nhs9a6g9rch5laqbl4ypp1jj2ahzzn",
+  "fetcher": "github",
+  "repo": "meedstrom/indexed",
+  "unstable": {
+   "version": [
+    20250327,
+    1025
+   ],
+   "deps": [
+    "el-job",
+    "emacsql",
+    "llama"
+   ],
+   "commit": "1a0a8e2776cdc861ffbe9b49f99d5aac70c7d89a",
+   "sha256": "1p1vpv2jjym107fc0xj3iiqqnxijd7n57kx3z9z7w1pahg346w4l"
+  },
+  "stable": {
+   "version": [
+    0,
+    6,
+    3
+   ],
+   "deps": [
+    "el-job",
+    "emacsql",
+    "llama"
+   ],
+   "commit": "1a0a8e2776cdc861ffbe9b49f99d5aac70c7d89a",
+   "sha256": "1p1vpv2jjym107fc0xj3iiqqnxijd7n57kx3z9z7w1pahg346w4l"
+  }
+ },
  {
   "ename": "indian-ext",
   "commit": "04e29d1a745d46ff32ccd9ee787ce1fe92786ec6",
@@ -64226,20 +64344,20 @@
   "repo": "jamescherti/inhibit-mouse.el",
   "unstable": {
    "version": [
-    20250312,
-    1941
+    20250314,
+    1100
    ],
-   "commit": "8052a12c07cfdb8d344d35d4fbc0936dda495986",
-   "sha256": "0s5mrzmayciac8nk3fi83y62w1hc0iapzxw6v2dw6cx177sp8rnx"
+   "commit": "7bac3116a0546f3d40e0eee625b6f01be44095bc",
+   "sha256": "1v15kb5zdz0jw7y8l8f924zy98diiarkmrsdj7qfxb8p9x3z1r1q"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
-   "commit": "ce8180dd631d4aadd8b3c434ecbb77c2f5e31012",
-   "sha256": "0nmwx9nckq4gn3nxsf3gpqmk5cyvgy8lhr89gzvl12070npy8r4z"
+   "commit": "1c59f2106e7a945291309b2342aebcb87b91117f",
+   "sha256": "1d2ha86nc9s8rfi6l8m8c97afilnz4vwwsj5ssdph0j215ixvvml"
   }
  },
  {
@@ -65035,8 +65153,8 @@
  },
  {
   "ename": "iregister",
-  "commit": "a12a51873444b84765758e18c9cf24d85a200e44",
-  "sha256": "0iq1nlj5czi4nblrszfv3grkl1fni7blh8bhcfccidms8v9r3mdm",
+  "commit": "d84a59ad044529a705da3022a7f2d14591c54937",
+  "sha256": "1ii7wkgsjldx4ai0359s25knw9sm2cjk57fnjz1k8xspm0asmksf",
   "fetcher": "github",
   "repo": "atykhonov/iregister.el",
   "unstable": {
@@ -65433,20 +65551,20 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20250224,
-    2125
+    20250329,
+    1401
    ],
-   "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742",
-   "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64"
+   "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429",
+   "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1"
   },
   "stable": {
    "version": [
     0,
     15,
-    0
+    1
    ],
-   "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742",
-   "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64"
+   "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429",
+   "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1"
   }
  },
  {
@@ -65457,28 +65575,28 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20250224,
-    2125
+    20250329,
+    1401
    ],
    "deps": [
     "avy",
     "ivy"
    ],
-   "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742",
-   "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64"
+   "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429",
+   "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1"
   },
   "stable": {
    "version": [
     0,
     15,
-    0
+    1
    ],
    "deps": [
     "avy",
     "ivy"
    ],
-   "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742",
-   "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64"
+   "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429",
+   "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1"
   }
  },
  {
@@ -65824,28 +65942,28 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20250224,
-    2125
+    20250329,
+    1401
    ],
    "deps": [
     "hydra",
     "ivy"
    ],
-   "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742",
-   "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64"
+   "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429",
+   "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1"
   },
   "stable": {
    "version": [
     0,
     15,
-    0
+    1
    ],
    "deps": [
     "hydra",
     "ivy"
    ],
-   "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742",
-   "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64"
+   "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429",
+   "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1"
   }
  },
  {
@@ -67184,14 +67302,14 @@
   "repo": "minad/jinx",
   "unstable": {
    "version": [
-    20250311,
-    1657
+    20250401,
+    1540
    ],
    "deps": [
     "compat"
    ],
-   "commit": "9c778357ffaac972c86f4acd39d70c547abcaf46",
-   "sha256": "1xmhfrxbyw9yqxa845m90rikm6zg3fdhsb74i3qg6pgm5fiwpj1f"
+   "commit": "42e6d7f1f3b12dc95f203753926d252c98f8bbc8",
+   "sha256": "1davdw9ws371dlxkrch2xyjqcx072p0ckriqz5iaa9zzvjkb9wlj"
   },
   "stable": {
    "version": [
@@ -67205,6 +67323,42 @@
    "sha256": "1xmhfrxbyw9yqxa845m90rikm6zg3fdhsb74i3qg6pgm5fiwpj1f"
   }
  },
+ {
+  "ename": "jira",
+  "commit": "28d4e1bb8b8005577272f419935e8d65fc4c7ad7",
+  "sha256": "1b45k1psz67bw3lhipqlc106drbj9w8gba6knsr5csncq1p87adc",
+  "fetcher": "github",
+  "repo": "unmonoqueteclea/jira.el",
+  "unstable": {
+   "version": [
+    20250329,
+    1650
+   ],
+   "deps": [
+    "magit-section",
+    "request",
+    "tablist",
+    "transient"
+   ],
+   "commit": "239b55c83850df97f59c10d1711911015986e424",
+   "sha256": "0zg7qx05i92xpsa43y9gsxbn08gmzng88dvkva7y70zvrzx58zz2"
+  },
+  "stable": {
+   "version": [
+    0,
+    7,
+    0
+   ],
+   "deps": [
+    "magit-section",
+    "request",
+    "tablist",
+    "transient"
+   ],
+   "commit": "239b55c83850df97f59c10d1711911015986e424",
+   "sha256": "0zg7qx05i92xpsa43y9gsxbn08gmzng88dvkva7y70zvrzx58zz2"
+  }
+ },
  {
   "ename": "jira-markup-mode",
   "commit": "e7e0349bff91ed27ad14dfc12178719453a8df55",
@@ -68016,11 +68170,11 @@
   "repo": "DamienCassou/json-process-client",
   "unstable": {
    "version": [
-    20230903,
-    1305
+    20250330,
+    728
    ],
-   "commit": "c4385859ada9b7803698a1f0199fea7fc8880214",
-   "sha256": "1n4spfyv7g88mkvca0cxc34qvp3x8vc838hmyp7x4ijr87lp8inm"
+   "commit": "6485953fe6eff62938fd08720811c6fdd09d7d22",
+   "sha256": "1vqls817hp6x7ydqyn1k7akj2pwdzi7iwp995zas24yk5w04dd5i"
   },
   "stable": {
    "version": [
@@ -68266,11 +68420,11 @@
   "repo": "llemaitre19/jtsx",
   "unstable": {
    "version": [
-    20250307,
-    2319
+    20250316,
+    2
    ],
-   "commit": "4cf3bbbd3b7ca3687494169699140d39b1843d8b",
-   "sha256": "0m3drmx57mzqahjjxfb7vwz753hhdg45akcpyfaj92miljqds3v8"
+   "commit": "02d6a4a969829b8fd8dab69cfe4be3377b1776a4",
+   "sha256": "1z7zfvj7fvzi3qyrcka4j6ljipkw3m4sfviynicsfxhvq7c0bd1p"
   },
   "stable": {
    "version": [
@@ -68290,14 +68444,14 @@
   "repo": "FelipeLema/julia-formatter.el",
   "unstable": {
    "version": [
-    20231130,
-    1512
+    20250320,
+    2047
    ],
    "deps": [
     "session-async"
    ],
-   "commit": "4b40481cc9c0dcb3c9704436e00d613067d44bf5",
-   "sha256": "06rrkpzrmfc67aiz4wcn5l4s4hvjs7fxvxd97d80afaqc4pzrj6d"
+   "commit": "a94b9ff00af3d64a08d447c90bcc2a4499eae55d",
+   "sha256": "0llhazgwjnypdkfy2yipr4k1w3zrpv4xnpsnlmpm6375gw5s7yp4"
   }
  },
  {
@@ -68600,8 +68754,8 @@
   "repo": "emacs-jupyter/jupyter",
   "unstable": {
    "version": [
-    20241203,
-    1917
+    20250402,
+    1740
    ],
    "deps": [
     "cl-lib",
@@ -68610,8 +68764,8 @@
     "websocket",
     "zmq"
    ],
-   "commit": "db8a9e233a010a61063f34220821ec76157a2d84",
-   "sha256": "0gjxi84d95sx5fw8q2a8szfhq6kb4xzwq0xr9a3pirkiga9hxymz"
+   "commit": "3615c2de16988c4dd9d1978bfa10ee3092e85b33",
+   "sha256": "0kmh0m2qjichd07wf3f9w11hrkpnbiy7vli9ad0ric82k56xsbvj"
   },
   "stable": {
    "version": [
@@ -68661,11 +68815,11 @@
   "repo": "leon-barrett/just-ts-mode.el",
   "unstable": {
    "version": [
-    20241014,
-    2252
+    20250328,
+    2115
    ],
-   "commit": "acb598f1edabae9f679a507c8e22c21b3f2da132",
-   "sha256": "0v9pgnlz7xm0kigpq3ymalx0jay1553rl3yra0fmggykmqi9gi17"
+   "commit": "9660d8f7ed48351ca594316d665f9cbbed803388",
+   "sha256": "1821xdznd1mh30nz5hj889shd0i28h545l2yjwgyiji9rgvdcbwi"
   }
  },
  {
@@ -69323,8 +69477,8 @@
   "repo": "jinnovation/kele.el",
   "unstable": {
    "version": [
-    20250112,
-    2243
+    20250318,
+    226
    ],
    "deps": [
     "async",
@@ -69336,8 +69490,8 @@
     "s",
     "yaml"
    ],
-   "commit": "1d23e6a18a031466a2c41f72d0e2f67b5cc45373",
-   "sha256": "1vhhjy7wz6cazi4qfnraxl6km611cyb9gfynya2hmpmjkhdmg7b2"
+   "commit": "9ad25a31103c6deea2dbea86f1f5f752cac3d622",
+   "sha256": "0b04dxzxnvh33zixvba7axdkwrw83688392h69gcn80bcamakj52"
   },
   "stable": {
    "version": [
@@ -69405,20 +69559,20 @@
   "repo": "emacsorphanage/key-chord",
   "unstable": {
    "version": [
-    20240910,
-    1441
+    20250330,
+    2011
    ],
-   "commit": "fc75b1451759121601110da8ddfadcf5156318af",
-   "sha256": "1ikg1kfyb8rgms5yvvg4117kmzw2jlq8h1wyq2l93my99c5qwm2g"
+   "commit": "cb646e815c61f253ad9fdfbe058049dda4e2b32b",
+   "sha256": "1lr5vgkcn13vq0lhyxl4lvwqnmvyf3kk5fs705qrv56l2hl4k2rm"
   },
   "stable": {
    "version": [
     0,
-    7,
-    1
+    8,
+    2
    ],
-   "commit": "fc75b1451759121601110da8ddfadcf5156318af",
-   "sha256": "1ikg1kfyb8rgms5yvvg4117kmzw2jlq8h1wyq2l93my99c5qwm2g"
+   "commit": "cb646e815c61f253ad9fdfbe058049dda4e2b32b",
+   "sha256": "1lr5vgkcn13vq0lhyxl4lvwqnmvyf3kk5fs705qrv56l2hl4k2rm"
   }
  },
  {
@@ -69660,11 +69814,11 @@
   "repo": "Boruch-Baum/emacs-keypress-multi-event",
   "unstable": {
    "version": [
-    20190109,
-    530
+    20250313,
+    1648
    ],
-   "commit": "9de65a27e10d8ae47aa6d28c02c3eb82ee8c0b2e",
-   "sha256": "1ybbayxfix63rwc8p5kl4wxxlk6vg53abw40fqrlkbc6qrr7nm5c"
+   "commit": "8c31b75f6ef4d81d5625e91a4130e204bfd02dd3",
+   "sha256": "1yd23idzczxi0wmbj70qfkypqjzfaq3ibx1y2k9y2hqs411d8nwp"
   },
   "stable": {
    "version": [
@@ -69876,28 +70030,28 @@
   "repo": "khoj-ai/khoj",
   "unstable": {
    "version": [
-    20250218,
-    1324
+    20250329,
+    1300
    ],
    "deps": [
     "dash",
     "transient"
    ],
-   "commit": "0016fe06c96c9e09e6d411a9d3219d290bd34757",
-   "sha256": "02rfmh0mazixzf6i777zpz188c42p79ql74jd72y9gnf9c361b1x"
+   "commit": "713ba06a8d8d11eea02b57d412bfa73884b06883",
+   "sha256": "1n9crapzmcpr6m3znrmii0gm6z1cay9qpdd7b8s2c2n9y69c6fwy"
   },
   "stable": {
    "version": [
     1,
-    36,
-    6
+    38,
+    0
    ],
    "deps": [
     "dash",
     "transient"
    ],
-   "commit": "0016fe06c96c9e09e6d411a9d3219d290bd34757",
-   "sha256": "02rfmh0mazixzf6i777zpz188c42p79ql74jd72y9gnf9c361b1x"
+   "commit": "713ba06a8d8d11eea02b57d412bfa73884b06883",
+   "sha256": "1n9crapzmcpr6m3znrmii0gm6z1cay9qpdd7b8s2c2n9y69c6fwy"
   }
  },
  {
@@ -70598,8 +70752,8 @@
   "repo": "kubernetes-el/kubernetes-el",
   "unstable": {
    "version": [
-    20250310,
-    1057
+    20250330,
+    1936
    ],
    "deps": [
     "dash",
@@ -70610,8 +70764,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "c8a2cceaf328213faa5fc00af758ba395488384d",
-   "sha256": "1m8avcjy64qlqrd0qrz8ffbhzn723icshf010isqm99r5404d2ja"
+   "commit": "938ef502414d093de827bf7f11bdb30843878a37",
+   "sha256": "1z0cadv3kyw3drd971zqisk4qw5hm1y9lwbs9g4g5626ys13wl5r"
   },
   "stable": {
    "version": [
@@ -70943,16 +71097,16 @@
   "repo": "Deducteam/lambdapi",
   "unstable": {
    "version": [
-    20250220,
-    1613
+    20250326,
+    1855
    ],
    "deps": [
     "eglot",
     "highlight",
     "math-symbol-lists"
    ],
-   "commit": "17279fb3a820ea2181a8296debcdd4e6dfc72024",
-   "sha256": "1lj8ifw8cymyxskv4w18pk5magj79rv1q9f0w75mwrs6mbm5fnj6"
+   "commit": "52f444984e3fd435f9fc598182e73c67290d2a6b",
+   "sha256": "1643ji8xz9spc7iv7r6iiqywbmnpqp8z8x6fahlgcqwc7ik7h61s"
   },
   "stable": {
    "version": [
@@ -71915,11 +72069,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20250313,
-    459
+    20250317,
+    529
    ],
-   "commit": "0365501aeaffdd8955f4cad25c9eaf3bee30efe5",
-   "sha256": "1q4sn6xisgq0pyp26j5fj3r69blh7v5vfazwpfryrrlr78s8ni5y"
+   "commit": "d9b664820176bf294fbca5ee99c91920862cf37d",
+   "sha256": "1nvnx28b6xwwqfpswr0hiszc38znr5x56q9aplgnf8n3p3mvash5"
   },
   "stable": {
    "version": [
@@ -71954,32 +72108,30 @@
   "repo": "kaiwk/leetcode.el",
   "unstable": {
    "version": [
-    20250312,
-    806
+    20250314,
+    1045
    ],
    "deps": [
     "aio",
     "log4e",
     "s"
    ],
-   "commit": "b0c466fa58254ee7396ae23310d718fc14a6b3df",
-   "sha256": "05zk1fwcclk74658m3r9igsada1fjyk681pc3x4jkqlwqijbzxsh"
+   "commit": "f61ad97ccf9199de82b9e7d0551c1b14c9337409",
+   "sha256": "163z96ks5hib4dqzy7ms8b6inm0sydqjwsn5v67c5c705nhjihjk"
   },
   "stable": {
    "version": [
     0,
     1,
-    27
+    28
    ],
    "deps": [
     "aio",
-    "dash",
-    "graphql",
     "log4e",
-    "spinner"
+    "s"
    ],
-   "commit": "b95221179bd51b43bb2c5e810e1a2de88ef54d82",
-   "sha256": "1gmap7472cakcigibydgg0zjd5yha4dp22w0ffqk6zl4qrh7hcdb"
+   "commit": "02eb6ff9c75ba8f0a7196f34665e9ed43c4d7598",
+   "sha256": "1hzay0gjykzcp6n59ymbrmla4df79xaga0zhypgflabglmkdnz49"
   }
  },
  {
@@ -73415,11 +73567,11 @@
   "repo": "countvajhula/lithium",
   "unstable": {
    "version": [
-    20250305,
-    2355
+    20250403,
+    156
    ],
-   "commit": "4618600e9443dabf5f9d3856a78645a2099f5987",
-   "sha256": "011hfn1y929r6wg1ld4v3vn9i46cis80pzvc98yp62cxd4145ccn"
+   "commit": "a99437f46b5b823082e2fe4570911dd6cb06ef23",
+   "sha256": "1070xp3dwl0ns2wp4bd98yw4qv9f0n7q48i7q0n2y890505jarvw"
   }
  },
  {
@@ -73600,26 +73752,26 @@
   "repo": "tarsius/llama",
   "unstable": {
    "version": [
-    20250312,
-    1428
+    20250314,
+    2009
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ff77af7c5df678041aebb48497418ff8af0acefc",
-   "sha256": "1a43lm4i7lppigi9mk9alylm3vganqn8prfx7dxiagxdrifif58k"
+   "commit": "48e5bc4919a4a29665362832d59ade8e248b0c3e",
+   "sha256": "0agn4n744fzf1f5i22448p1r7njd0kyxzs763gvml588r2ql2ja5"
   },
   "stable": {
    "version": [
     0,
     6,
-    1
+    2
    ],
    "deps": [
     "compat"
    ],
-   "commit": "c1b320d6308a68d8841116745310cc55ac5ce74b",
-   "sha256": "0pa7sdj7rxj8hr3r2lcwz3z04b8b9k61d9j9a7qr1n3n9x9krdjd"
+   "commit": "48e5bc4919a4a29665362832d59ade8e248b0c3e",
+   "sha256": "0agn4n744fzf1f5i22448p1r7njd0kyxzs763gvml588r2ql2ja5"
   }
  },
  {
@@ -74065,16 +74217,16 @@
   "repo": "doublep/logview",
   "unstable": {
    "version": [
-    20250306,
-    1331
+    20250401,
+    1723
    ],
    "deps": [
     "compat",
     "datetime",
     "extmap"
    ],
-   "commit": "cd990bf63785897bfdfa0ec954db986f0361449f",
-   "sha256": "1zxsyx61nh2x1lx55k1w0w3cj0p541dwc5i5pps7qfwqa0184f22"
+   "commit": "649d878f7e2aad0f938b2cf0a870f1968b4d5e30",
+   "sha256": "0jd9ym4hlj699a021xy3fhk2wr2pfkskw72ifzh5q50bz1nmiy3s"
   },
   "stable": {
    "version": [
@@ -74838,8 +74990,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20250312,
-    2052
+    20250331,
+    802
    ],
    "deps": [
     "dash",
@@ -74850,8 +75002,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "d3110e3d7dfcae2340353e30c523153ab9c1f347",
-   "sha256": "0a73pnm5x1jcx966img8s6w7mps6sgldamjy98j38j7bhimgb6lw"
+   "commit": "7c0df125c19536646634dca9e27ecb3705db7521",
+   "sha256": "018w5356xaaw0q7r073gsgh3cy6i1chawc3qq82k3xlpylzflfly"
   },
   "stable": {
    "version": [
@@ -75197,8 +75349,8 @@
   "repo": "emacs-lsp/lsp-treemacs",
   "unstable": {
    "version": [
-    20250301,
-    131
+    20250328,
+    1727
    ],
    "deps": [
     "dash",
@@ -75207,8 +75359,8 @@
     "lsp-mode",
     "treemacs"
    ],
-   "commit": "2495abd9df2f19335b4a280d9db641e02e2ddcfa",
-   "sha256": "1xnj2kjiwwy4pdaif2yp7n1iirmgpdmi5w9ala0hmqki4yi5rgcc"
+   "commit": "312dee2b3ab776868c2b367d0ac15259689d981a",
+   "sha256": "043zqbx1y98bp9n6cq3cmm490rlhcj35mnm7jf52bny17fldchap"
   },
   "stable": {
    "version": [
@@ -75624,14 +75776,14 @@
   "repo": "amake/macports.el",
   "unstable": {
    "version": [
-    20250128,
-    148
+    20250320,
+    2309
    ],
    "deps": [
     "transient"
    ],
-   "commit": "e80b6a523e49b6e15390ee00745035a4d87aea60",
-   "sha256": "0chnnjzjz62fdwcjpix142ssw1nv879qwjczkmlxd77sfbcxjknf"
+   "commit": "e29f7ac8c17cfa04bb81c9f721f4a713709fe865",
+   "sha256": "13axnbqm2qdcldhz9mhvqfy3b5k6mg31jr0w63h3sxpm41ig8xcy"
   }
  },
  {
@@ -75791,21 +75943,21 @@
  },
  {
   "ename": "magik-mode",
-  "commit": "6f0cac5a5c86d160012cbb19608ad67c97afb9f1",
-  "sha256": "01zsjzxmax65a89x78cvi4ff0dxk1p9jlil0dhn3z2g8z92zhwvv",
+  "commit": "0a0a3425d94f48d9804478c0d1a2d77f41c6d6b9",
+  "sha256": "0i1y6kjsmi5q5jzf51srb1wm544xw8b5glgn48cmyzria277rygg",
   "fetcher": "github",
   "repo": "roadrunner1776/magik",
   "unstable": {
    "version": [
-    20250312,
-    815
+    20250402,
+    1954
    ],
    "deps": [
     "compat",
     "yasnippet"
    ],
-   "commit": "0c5131285845c7147b41dc5bd04372c71b690684",
-   "sha256": "0wkvvdnpaa9079sdv0x3l3l56mhisnklp39mngk30hs7833fnpzq"
+   "commit": "38cbfd51fa9276ee4aff51c0996efb0872855ac9",
+   "sha256": "025d3216irm0yghkmqzwnp5kdnmrw1pwxzb4bphk3dlnwz9wq9dy"
   },
   "stable": {
    "version": [
@@ -75828,8 +75980,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20250312,
-    1432
+    20250401,
+    1753
    ],
    "deps": [
     "compat",
@@ -75839,14 +75991,14 @@
     "transient",
     "with-editor"
    ],
-   "commit": "ed4fa09eeeb531c0cfc3c7bf713d3929c2b2107d",
-   "sha256": "06lshr77f3avgryc1pryiadhayxb3djw8rcvb8qj35g66rpdr6jl"
+   "commit": "bf58615a033b8c827bf630962531c67539789215",
+   "sha256": "0k15p39r5jikin86r5wsf5z9jsaica01f4s4sbwczikjjpfpq9r8"
   },
   "stable": {
    "version": [
     4,
     3,
-    1
+    2
    ],
    "deps": [
     "compat",
@@ -75856,8 +76008,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "28d272ce0bcecc2e312d22ed15a48ad4cea564eb",
-   "sha256": "07harzpyqrskx4xslj4xa1w1d0sza13zw5z0nam9kagi72cklvjv"
+   "commit": "bf58615a033b8c827bf630962531c67539789215",
+   "sha256": "0k15p39r5jikin86r5wsf5z9jsaica01f4s4sbwczikjjpfpq9r8"
   }
  },
  {
@@ -76149,16 +76301,48 @@
   "repo": "douo/magit-gptcommit",
   "unstable": {
    "version": [
-    20250216,
-    922
+    20250327,
+    139
    ],
    "deps": [
     "dash",
     "llm",
     "magit"
    ],
-   "commit": "f943440459eebec979defe4161d7505fb76f4675",
-   "sha256": "1vb361dxjgmh76hryviprvmy3djm2dj723f8sipfbshgrgqwpsl8"
+   "commit": "bd8b2ba558d0a6c44209488404755889d02c1b80",
+   "sha256": "1i82gqdcv30av538cxz927jc7kj5r0c1fq7xbx2iz7gyks93r9sv"
+  }
+ },
+ {
+  "ename": "magit-ido",
+  "commit": "766d5c6e7f8f3f785c2e6ea81bf12951ad0c52f7",
+  "sha256": "01vskbslzkqrznnaksrmlmfsij5ac58j6fmnpiaic58cjmbn8b50",
+  "fetcher": "github",
+  "repo": "emacsorphanage/magit-ido",
+  "unstable": {
+   "version": [
+    20250330,
+    1737
+   ],
+   "deps": [
+    "ido-completing-read+",
+    "magit"
+   ],
+   "commit": "2b94abf65a208e4c844d046217350efbf77cf582",
+   "sha256": "094j6k1cr3v4nbmy464mn3hpw58x02zjj835mqb0crl8vvxmgdpg"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "ido-completing-read+",
+    "magit"
+   ],
+   "commit": "2b94abf65a208e4c844d046217350efbf77cf582",
+   "sha256": "094j6k1cr3v4nbmy464mn3hpw58x02zjj835mqb0crl8vvxmgdpg"
   }
  },
  {
@@ -76261,17 +76445,18 @@
   "repo": "emacsorphanage/magit-p4",
   "unstable": {
    "version": [
-    20220822,
-    2022
+    20250323,
+    2202
    ],
    "deps": [
     "cl-lib",
     "magit",
-    "magit-popup",
-    "p4"
+    "p4",
+    "transient",
+    "with-editor"
    ],
-   "commit": "0fd0f882eb14510714393c15c2ccb8d2c259f01e",
-   "sha256": "0wdclkkqlfswqbsg8ld1gqji1rnxpl8s00ym7imgqdf1is961qj1"
+   "commit": "3a26854f60293d85501d2ee99a54d42ae2e16f98",
+   "sha256": "0kn7l90bwkj3a7jjfwl1wqm3y7008bpagyi98p4q7x2adgybdwwr"
   },
   "stable": {
    "version": [
@@ -76383,30 +76568,30 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20250307,
-    1739
+    20250401,
+    1753
    ],
    "deps": [
     "compat",
     "llama",
     "seq"
    ],
-   "commit": "3f79700f1b9a6f5f6fd6a77fd1e812c1b8e6463b",
-   "sha256": "0hm4wcnr9ybsll507xdhmprb2in93pdn2mw9a1zf7cfvr4ygk0yg"
+   "commit": "bf58615a033b8c827bf630962531c67539789215",
+   "sha256": "0k15p39r5jikin86r5wsf5z9jsaica01f4s4sbwczikjjpfpq9r8"
   },
   "stable": {
    "version": [
     4,
     3,
-    1
+    2
    ],
    "deps": [
     "compat",
     "llama",
     "seq"
    ],
-   "commit": "28d272ce0bcecc2e312d22ed15a48ad4cea564eb",
-   "sha256": "07harzpyqrskx4xslj4xa1w1d0sza13zw5z0nam9kagi72cklvjv"
+   "commit": "bf58615a033b8c827bf630962531c67539789215",
+   "sha256": "0k15p39r5jikin86r5wsf5z9jsaica01f4s4sbwczikjjpfpq9r8"
   }
  },
  {
@@ -77164,25 +77349,25 @@
   "repo": "minad/marginalia",
   "unstable": {
    "version": [
-    20250203,
-    1018
+    20250317,
+    1632
    ],
    "deps": [
     "compat"
    ],
-   "commit": "a527fb03b76a2bce1e360c6e73a095e06922c3f3",
-   "sha256": "0q6n426yplj6iijsfx11lnlaz4l5iddav2dxml1p2zxvc4k2njy5"
+   "commit": "c51fd9e4d4258543e0cd8dedda941789163bec5a",
+   "sha256": "00dzckksfzvwjdy3v1g71nvkxnnpw2bmh8bmhf56qn3nzfj2yr89"
   },
   "stable": {
    "version": [
-    1,
-    8
+    2,
+    0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "006a7cd0a14dd651dcff65ed96c0d52d2067b8c1",
-   "sha256": "12kg0zd1zw2rc3pxi655gh37bxbbkpmdb05yi77rdccl8gh9jwry"
+   "commit": "c51fd9e4d4258543e0cd8dedda941789163bec5a",
+   "sha256": "00dzckksfzvwjdy3v1g71nvkxnnpw2bmh8bmhf56qn3nzfj2yr89"
   }
  },
  {
@@ -77306,11 +77491,11 @@
   "repo": "jrblevin/markdown-mode",
   "unstable": {
    "version": [
-    20250310,
-    417
+    20250402,
+    452
    ],
-   "commit": "dd2cb2cdcd6594c3663cda20b465f09c773fcc90",
-   "sha256": "16myq0adw6n38qlai7zzmrln5ckdhv668nyg52mkdyr5hamcpwp0"
+   "commit": "9d2850ed58719778d3e76411242d112e54998fd3",
+   "sha256": "1m7g12h94bv4m9fbcxa8q4kf81npniqka2mym6cgcbp8s896a783"
   },
   "stable": {
    "version": [
@@ -77666,30 +77851,28 @@
   "repo": "martianh/mastodon.el",
   "unstable": {
    "version": [
-    20250305,
-    2104
+    20250330,
+    1519
    ],
    "deps": [
     "persist",
-    "request",
     "tp"
    ],
-   "commit": "fd59828c89e808d0a6d0d9abab8e830df494b515",
-   "sha256": "1wc3y3pwg9xc27fa6xc2bcv809rxcbjy372r998wl95a81apx32g"
+   "commit": "163ba2b0b89a292b99bff0f574f5584ec888469a",
+   "sha256": "1j4n6ipiahxk6v84dnsrcpzaqsd4v9q2mviqkznm189cp98h6zxk"
   },
   "stable": {
    "version": [
-    1,
-    1,
-    12
+    2,
+    0,
+    0
    ],
    "deps": [
     "persist",
-    "request",
     "tp"
    ],
-   "commit": "fd59828c89e808d0a6d0d9abab8e830df494b515",
-   "sha256": "1wc3y3pwg9xc27fa6xc2bcv809rxcbjy372r998wl95a81apx32g"
+   "commit": "163ba2b0b89a292b99bff0f574f5584ec888469a",
+   "sha256": "1j4n6ipiahxk6v84dnsrcpzaqsd4v9q2mviqkznm189cp98h6zxk"
   }
  },
  {
@@ -77827,11 +78010,11 @@
   "repo": "mathworks/Emacs-MATLAB-Mode",
   "unstable": {
    "version": [
-    20241208,
-    1657
+    20250401,
+    1401
    ],
-   "commit": "935137844e16551a5369f928d2591556be7fb9c2",
-   "sha256": "0gwr1f5mmzgznpvki9nri6lm4lj3qxlv40hsbsjgvmk1921xs6xd"
+   "commit": "8686c85cf376f90549d3aaf8478ed381f22282aa",
+   "sha256": "02zfp0j562rcydkfb3l49jlrjnqmc4wknyax6nwmy5xzd0hb65pr"
   },
   "stable": {
    "version": [
@@ -78421,11 +78604,11 @@
   "repo": "meow-edit/meow",
   "unstable": {
    "version": [
-    20250201,
-    1911
+    20250317,
+    2300
    ],
-   "commit": "0314cd1bc661c8900bae5ef65d55f67a9ddc7193",
-   "sha256": "0knd02sx26cv76lci2w63fzvmvql30i052y2c15j1c9lhn7nz3pq"
+   "commit": "a7edff29d01195580c8ef723c2ab374b19552a5e",
+   "sha256": "0ijhf4if1a14ascprk9pa7wf4y97dx4vx0wg5iy1ppcxi96sx0d5"
   },
   "stable": {
    "version": [
@@ -78445,14 +78628,14 @@
   "repo": "skissue/meow-tree-sitter",
   "unstable": {
    "version": [
-    20241124,
-    2224
+    20250314,
+    1730
    ],
    "deps": [
     "meow"
    ],
-   "commit": "d8e80d5ab97c85340b21be125f1e17edec2f21dd",
-   "sha256": "13r4s6nr0p5fj38swrgz5hnd12cazyigligr18ikwc6sxzz9yj9z"
+   "commit": "3d578e0296a430f6f9d8a058ae7b3e3202422f5f",
+   "sha256": "0ccvvckrwz9z1phh3jrfl7d9pq07mmzczg23m3yb9i925zmgazr2"
   },
   "stable": {
    "version": [
@@ -79248,14 +79431,14 @@
   "repo": "countvajhula/mindstream",
   "unstable": {
    "version": [
-    20250307,
-    1736
+    20250330,
+    201
    ],
    "deps": [
     "magit"
    ],
-   "commit": "ccd154e861223378c59b346319498df327301704",
-   "sha256": "03bnskwaz76f56rzk9j2rn2xh9dbqgkdzfgrx42nrxp24ssry9sl"
+   "commit": "5ebd1846e67cb7cb8480511825cf76269aa32d00",
+   "sha256": "10j10wga3yimg9rgn35h1rj04ziyyk8z97ap0xzjq27w1np5d1md"
   },
   "stable": {
    "version": [
@@ -79685,28 +79868,28 @@
   "repo": "milanglacier/minuet-ai.el",
   "unstable": {
    "version": [
-    20250310,
-    1934
+    20250401,
+    1535
    ],
    "deps": [
     "dash",
     "plz"
    ],
-   "commit": "fffbb3a39a996fabb65b8f06ab5422bb53c500cd",
-   "sha256": "0cq06rmm7j3xxfvsnb5s69byna3pwljcgp7bklfqm395h2d39wyr"
+   "commit": "78175bf60b4536ef1d64a0c7405fb575d4ef8f66",
+   "sha256": "1dcc1fdbpkzcd39sxz2dglah2zy6953w8plkaw6cx239g5dmhll9"
   },
   "stable": {
    "version": [
     0,
-    4,
-    4
+    5,
+    0
    ],
    "deps": [
     "dash",
     "plz"
    ],
-   "commit": "fffbb3a39a996fabb65b8f06ab5422bb53c500cd",
-   "sha256": "0cq06rmm7j3xxfvsnb5s69byna3pwljcgp7bklfqm395h2d39wyr"
+   "commit": "bb1bff593496713ea7be99ea25060087905378dd",
+   "sha256": "1fb9azpxpayx99045ih85hrp377kyndhd4js8zmnkj24xbmin4iw"
   }
  },
  {
@@ -79788,11 +79971,11 @@
   "repo": "szermatt/mistty",
   "unstable": {
    "version": [
-    20250311,
-    2051
+    20250401,
+    1512
    ],
-   "commit": "d7f0b02575e640a724caf26bad2f076ce0d9614d",
-   "sha256": "02af8bd0bhz8n1s7amrnwkxyrwavxaf42gwvrdpzdggcrdf2nv9j"
+   "commit": "37124e957ebc442b7a91de681f913007956aaa7b",
+   "sha256": "01db57s23jl9pqg4vwfbr8d0v51ifpcibym4isxaqqnw9rr6h4gm"
   },
   "stable": {
    "version": [
@@ -80383,15 +80566,15 @@
   "repo": "damon-kwok/modern-sh",
   "unstable": {
    "version": [
-    20211101,
-    1001
+    20250320,
+    858
    ],
    "deps": [
     "eval-in-repl",
     "hydra"
    ],
-   "commit": "8ebebe77304aa8170f7af809e7564c79d3bd45da",
-   "sha256": "00ixkd1586xv7707a1gpshml221wmnv92d3dyk1fzzxvws39zvdg"
+   "commit": "65bc75828f7d13af713f1a728c038e2915944cd3",
+   "sha256": "0dgsn405dk8lxhzm497visz9n0yyn261zxvk7lj7fyk7i2s983xs"
   }
  },
  {
@@ -80441,11 +80624,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20250220,
-    647
+    20250327,
+    843
    ],
-   "commit": "f3cd4d6983566dab0ef3bcddf812cfd565d00d08",
-   "sha256": "1w0hkbpcy08n6czrxmw1v4cr4pfh84brjiiaxl6dnwi525l70b6p"
+   "commit": "55609222f9817f7f76f5832d87e95ac11bba9a86",
+   "sha256": "14w3g3yhlib0piq9k0lclrbdj9dns9mxsgkg9qz5kxmy21phr3wa"
   },
   "stable": {
    "version": [
@@ -80833,11 +81016,11 @@
   "repo": "takaxp/moom",
   "unstable": {
    "version": [
-    20240802,
-    800
+    20250327,
+    141
    ],
-   "commit": "b90adeff532b39568a84f04f72a1eb60dbe4b175",
-   "sha256": "1flsbrw431jd2gqnhw3hddgy5vgp1vm7vqr4617rr6hdiscgx6kd"
+   "commit": "127563df03abad087b68478bb57ee016dd50bede",
+   "sha256": "1fpbjywb5bq6b3an0y0vkd2x27ldxlpsf31g8yqf9c8ppwj1lyhi"
   },
   "stable": {
    "version": [
@@ -80930,20 +81113,20 @@
   "repo": "tarsius/morlock",
   "unstable": {
    "version": [
-    20250312,
-    1417
+    20250314,
+    2018
    ],
-   "commit": "64946a45e9bf02abf9cb39ca3aed98af98e82824",
-   "sha256": "0rkkx0f3lgk64mc5jmrmqil71nqhmsqiszmw5p6synqpk4gbvqaf"
+   "commit": "7f60075bd928948a7c6901a52b560d7e05a688ef",
+   "sha256": "0v8fxlaq95s2hrxi72y3dqcl9nd21jw56lpmdwkmcqjn8rialcas"
   },
   "stable": {
    "version": [
     2,
-    0,
-    1
+    1,
+    0
    ],
-   "commit": "538ce842358172b97fc5028b6faa6fdf2549f0c3",
-   "sha256": "1gmnx2s4qjcbfkhpnvhpc9833ibkb2wkj4jgdkw7i4hda63as4d9"
+   "commit": "7f60075bd928948a7c6901a52b560d7e05a688ef",
+   "sha256": "0v8fxlaq95s2hrxi72y3dqcl9nd21jw56lpmdwkmcqjn8rialcas"
   }
  },
  {
@@ -83043,11 +83226,11 @@
   "repo": "skeeto/nasm-mode",
   "unstable": {
    "version": [
-    20240610,
-    1505
+    20250320,
+    1646
    ],
-   "commit": "7079eb4ce14d94830513facf9bf2fca9e030a4d1",
-   "sha256": "1dacd8yvbl6arvrxwdjws42nnvwflvwxz366y295izf00pl0knaj"
+   "commit": "4e670f6dededab858251670aa5459c950f78d867",
+   "sha256": "12ynvw6l1a9n8x1q4fpm0fz15zf2vp3jibsq5z8si1czgkz0cw97"
   },
   "stable": {
    "version": [
@@ -83362,11 +83545,11 @@
   "repo": "rainstormstudio/nerd-icons.el",
   "unstable": {
    "version": [
-    20250308,
-    1335
+    20250324,
+    147
    ],
-   "commit": "43178575201e3d2ef8c4a507ed4c281b0936f39a",
-   "sha256": "1hvnl3xpn5d3pg6i1minzv6sjc9dahs2snzlsy76wvwf4kcjf9z5"
+   "commit": "14f7278dd7eb5eca762a6ff32467c72c661c0aae",
+   "sha256": "1r5wj13k6khlmkn5wy2q2n674bc551rpxn04x46j0brzgmd85k7g"
   },
   "stable": {
    "version": [
@@ -83405,26 +83588,26 @@
   "repo": "LuigiPiucco/nerd-icons-corfu",
   "unstable": {
    "version": [
-    20250226,
-    1715
+    20250319,
+    2322
    ],
    "deps": [
     "nerd-icons"
    ],
-   "commit": "13166345b290d6c6a2ac6ba94a8d28ec3bb58c67",
-   "sha256": "0ah215zl9f867n4wlim4f8b1lm33xpr3vz3c06pbaznnp9ym18ka"
+   "commit": "55b17ee20a5011c6a9be8beed6a9daf644815b5a",
+   "sha256": "0h2iphhsag77f14nj95fhkz7yv2ql94acj0c835x2ypkprqrs86w"
   },
   "stable": {
    "version": [
     0,
     5,
-    0
+    1
    ],
    "deps": [
     "nerd-icons"
    ],
-   "commit": "13166345b290d6c6a2ac6ba94a8d28ec3bb58c67",
-   "sha256": "0ah215zl9f867n4wlim4f8b1lm33xpr3vz3c06pbaznnp9ym18ka"
+   "commit": "55b17ee20a5011c6a9be8beed6a9daf644815b5a",
+   "sha256": "0h2iphhsag77f14nj95fhkz7yv2ql94acj0c835x2ypkprqrs86w"
   }
  },
  {
@@ -83966,11 +84149,11 @@
   "repo": "mrcnski/nimbus-theme",
   "unstable": {
    "version": [
-    20250307,
-    659
+    20250327,
+    1319
    ],
-   "commit": "6a0b5a9d70a1067df5ada409584952f7e465b947",
-   "sha256": "1xx1njb7h1y9ixr4dm9kywx1g3db37bn46xg8cg2il475hldk0ax"
+   "commit": "cb52913a6875df509f3ac8f2302f869abd65f670",
+   "sha256": "14fiqll57y04qb4phkjvwga2vypla0xs84m0g488hnz7gzlmxhpx"
   },
   "stable": {
    "version": [
@@ -84433,26 +84616,26 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20250304,
-    1951
+    20250401,
+    1510
    ],
    "deps": [
     "compat"
    ],
-   "commit": "de767a4952b2375a2ce1a2f7fe17a417bfbf512e",
-   "sha256": "0cxxkc55jd7mzsdk873jyv0pfj9bzvy7mfyas0mg5kn6g35zh968"
+   "commit": "ea15b1c607d4036ce37326bd5b4b2f4291ddfd60",
+   "sha256": "0bfyd276v32yflxd1ad3x5rlndmw3fk7z4q0p79ff09m993fsb54"
   },
   "stable": {
    "version": [
     1,
     7,
-    5
+    6
    ],
    "deps": [
     "compat"
    ],
-   "commit": "0c119d46cce5c018e162fae4b36fd95ef26a76ac",
-   "sha256": "1qr0spndzv03h0lcs2bjajadp9rg7clm506bnwbcqwfqxz9cxnvx"
+   "commit": "ea15b1c607d4036ce37326bd5b4b2f4291ddfd60",
+   "sha256": "0bfyd276v32yflxd1ad3x5rlndmw3fk7z4q0p79ff09m993fsb54"
   }
  },
  {
@@ -84626,14 +84809,14 @@
   "repo": "lxsameer/noether",
   "unstable": {
    "version": [
-    20250309,
-    1704
+    20250320,
+    1847
    ],
    "deps": [
     "posframe"
    ],
-   "commit": "0a32429a6cf4c0f3f8157a16f778a7996a85e189",
-   "sha256": "00mfqph58022ykfakgvs4qfg1ywignprhfpw45lfrjhf5k670xlv"
+   "commit": "c7b85569181f351ae03c4f4d3f622549332534cd",
+   "sha256": "0klzd6aykyzglrxq2l4cs2nad8njfwvipr1g729jxy8gq8gr09yk"
   }
  },
  {
@@ -84929,20 +85112,19 @@
   "url": "https://git.notmuchmail.org/git/notmuch",
   "unstable": {
    "version": [
-    20250218,
-    1254
+    20250320,
+    1017
    ],
-   "commit": "0e10ca3a625c25c0238ecca2767aab7035b88a22",
-   "sha256": "0h46qgyr5c6g3ylgxcxgjynf0bf51sf6738fpy0bc3n88y87pzph"
+   "commit": "dfc800c26e7bee1e42a8d96c300508ed9d5a109b",
+   "sha256": "0fcqddvb168bw3s62f0cbq8macm3fzi225mh5n0q8dwjxw7krx1m"
   },
   "stable": {
    "version": [
     0,
-    38,
-    3
+    39
    ],
-   "commit": "d0469c5b4c6ed9188b96b12363fced45291813fd",
-   "sha256": "0y9fmd8qaybs3i6xndsmq9f5iskdc852i2bq442k7iyjgj3gw8rd"
+   "commit": "a5214eabb63ba78b84f4563942de1aa8763f0914",
+   "sha256": "1qq9bwhxrklkjysilmjmhzdwhxprc440krvml15mv8rind9xjll4"
   }
  },
  {
@@ -85727,6 +85909,24 @@
    "sha256": "159cjalj49w9kj603lqkxjchpq3zvlqssdi0nijwddsdf9qsd3sy"
   }
  },
+ {
+  "ename": "ob-aider",
+  "commit": "e86bbaabef311af57eb4279d02a1cf56117b71a4",
+  "sha256": "1p5j7jhcdy479s6n8vydm486f5nv9qilz6fg1id0naqhm581kskx",
+  "fetcher": "github",
+  "repo": "localredhead/ob-aider.el",
+  "unstable": {
+   "version": [
+    20250325,
+    1918
+   ],
+   "deps": [
+    "org"
+   ],
+   "commit": "f611b0e733323c04bbbcab710a78a87f47e5fc74",
+   "sha256": "0axzf6cccbpmks62kdw73y000bv1vbz118mxrm4sq1n0sk5c7nxh"
+  }
+ },
  {
   "ename": "ob-applescript",
   "commit": "23b075774be913539c3f057dcb7f24fbc05c37a4",
@@ -85776,24 +85976,6 @@
    "sha256": "10x4hxrjm4pr6vg42a961h9ilqzyd0l0fv7fsbq9clxi439f1nd6"
   }
  },
- {
-  "ename": "ob-axiom",
-  "commit": "8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf",
-  "sha256": "17qh4hsr3aw4d0p81px3qcbax6dv2zjhyn5n9pxqwcp2skm5vff5",
-  "fetcher": "git",
-  "url": "https://bitbucket.org/pdo/axiom-environment",
-  "unstable": {
-   "version": [
-    20220612,
-    1535
-   ],
-   "deps": [
-    "axiom-environment"
-   ],
-   "commit": "01d88daa0c864af9918db5a147fbb5e435dec199",
-   "sha256": "03cxb6zdqmzgjp8r6hcirf8xl772j7xqk2nw17gjkn4xqbwfyn62"
-  }
- },
  {
   "ename": "ob-base64",
   "commit": "d82c7daa606c1c0c2ed4abe7601c16e8b261de12",
@@ -87385,20 +87567,20 @@
   "repo": "tarides/ocaml-eglot",
   "unstable": {
    "version": [
-    20250310,
-    1359
+    20250401,
+    1605
    ],
-   "commit": "52e59e3dba1f8af1e90166c556e6f3b567cd9857",
-   "sha256": "1352ckf64dijgpdmsgqs4mbl7hpd942f2px251br986v7k16vscl"
+   "commit": "049449a28bf8b5be87854df344963865303998ce",
+   "sha256": "0pabbw8kx8f436pmvarlbcky8vfqp2s9hl50bvi363b4sh84vqxg"
   },
   "stable": {
    "version": [
     1,
-    0,
+    1,
     0
    ],
-   "commit": "43e60321cf3b12e7a4137087f8810346e4e1bcfd",
-   "sha256": "04kcs40mizfm792qjqfmabyiapam54vxvsjcc2yyavwrwiz2m94q"
+   "commit": "08b35089c4f3cd1bab18a314b2baa733a0e09e42",
+   "sha256": "0r2y4mfh27lysc77vv3xpaqn25h69j1m7wpa8h37n8dq0pq41746"
   }
  },
  {
@@ -87639,26 +87821,26 @@
   "repo": "oer/oer-reveal",
   "unstable": {
    "version": [
-    20250220,
-    1248
+    20250324,
+    1446
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "86fb46ae523b1c953af4172fb6b468fd62fa3a71",
-   "sha256": "1w8ryyh6f1imibyvkzipjhfby0jqh5mvihs0kni4l0wwpbjys21k"
+   "commit": "c502603057dea68b4e4e96434bb3b6260456fd6e",
+   "sha256": "0k1h27ach29v5clvfpdgj2q2p5sgcijh0k9ch92zlms197rw57zm"
   },
   "stable": {
    "version": [
     4,
-    28,
-    4
+    30,
+    2
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "414a4627a414f3c499637a4347326b345d0768fb",
-   "sha256": "1w8ryyh6f1imibyvkzipjhfby0jqh5mvihs0kni4l0wwpbjys21k"
+   "commit": "c502603057dea68b4e4e96434bb3b6260456fd6e",
+   "sha256": "0k1h27ach29v5clvfpdgj2q2p5sgcijh0k9ch92zlms197rw57zm"
   }
  },
  {
@@ -87839,20 +88021,20 @@
   "repo": "captainflasmr/ollama-buddy",
   "unstable": {
    "version": [
-    20250312,
-    2035
+    20250401,
+    1942
    ],
-   "commit": "b734f1220973bd54a8e96569bddfc6da55f10f56",
-   "sha256": "1a4ygzn25ghd8997d7l201wz5h6ph2zjchnaaxpfiz14qb64qggf"
+   "commit": "8fa0875eb996e961d1f645f5a875a24ecec727bd",
+   "sha256": "1ycafmfvchq94l0zl53rgwr9rn50vzmw79nh6fx22nsw4mjnnrnp"
   },
   "stable": {
    "version": [
     0,
-    1,
+    2,
     0
    ],
-   "commit": "2e200f55c893e7b8c24da3c343e753ace7f9df93",
-   "sha256": "055ffm4ipj85fk1lq31gwbqfnimz44b2b1rns326nqfdgqvsvw4p"
+   "commit": "4b5f89f765b8e8465d51efe6062b9242122de189",
+   "sha256": "0mq74zb3jr0i3p9p4qicm31yym0wmq3i846ayg9qb4vdf94amz4l"
   }
  },
  {
@@ -88184,21 +88366,6 @@
    "sha256": "1qk7xcca7inkwmdwcai4j43pb2nr8s89c4s0hjmc1bp3grryqrqj"
   }
  },
- {
-  "ename": "one-themes",
-  "commit": "504fb2fa2fe17eb008f7e9b8f7fb394f4a3ebd28",
-  "sha256": "11c6py5vani2cv4qjvizlzz9xvr5v57qxy1chcxy2lq3jlz1q5w0",
-  "fetcher": "github",
-  "repo": "balajisivaraman/emacs-one-themes",
-  "unstable": {
-   "version": [
-    20200720,
-    1444
-   ],
-   "commit": "16aa7318490c0f47aca328a8c6cfe3267a80bb76",
-   "sha256": "1dyfb0c5pf20fs6jdi7vsj47jzbvciqfm5fypa2m7lf0093sc5ig"
-  }
- },
  {
   "ename": "one-time-pad-encrypt",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -88466,20 +88633,26 @@
   "repo": "danielfleischer/opensub",
   "unstable": {
    "version": [
-    20240501,
-    1946
+    20250329,
+    717
    ],
-   "commit": "22cc8ef1e119c3cc5f605ca5be4cf680745c503a",
-   "sha256": "1v7cn4j43xzdwgpn9103bv057n5pmd9yrdvciv3lwz85dqimlp9a"
+   "deps": [
+    "plz"
+   ],
+   "commit": "d8b11e979897616a661edd22a759e5cb025af356",
+   "sha256": "0qjlikmy4rhn3rg0g1cjq9aad9q83xqq9mnlwjkr6a0f3d33imbn"
   },
   "stable": {
    "version": [
     0,
-    3,
+    4,
     0
    ],
-   "commit": "22cc8ef1e119c3cc5f605ca5be4cf680745c503a",
-   "sha256": "1v7cn4j43xzdwgpn9103bv057n5pmd9yrdvciv3lwz85dqimlp9a"
+   "deps": [
+    "plz"
+   ],
+   "commit": "d8b11e979897616a661edd22a759e5cb025af356",
+   "sha256": "0qjlikmy4rhn3rg0g1cjq9aad9q83xqq9mnlwjkr6a0f3d33imbn"
   }
  },
  {
@@ -88577,25 +88750,25 @@
   "repo": "oantolin/orderless",
   "unstable": {
    "version": [
-    20250201,
-    2341
+    20250316,
+    2046
    ],
    "deps": [
     "compat"
    ],
-   "commit": "c7cb04499d94ee1c17affb29b1cfcd2a45116c97",
-   "sha256": "1g0qf17fmpabmi7ap057fy1rinqvvb0wa7famnakinhxw96l479d"
+   "commit": "254f2412489bbbf62700f9d3d5f18e537841dcc3",
+   "sha256": "1la91fk322n600h4wnavx7a6rdc44mz4v4gg1fb3cpwjsw746sl8"
   },
   "stable": {
    "version": [
     1,
-    3
+    4
    ],
    "deps": [
     "compat"
    ],
-   "commit": "2b7a1688f24cc8ef5a3c3a6dab8e00d833bcda59",
-   "sha256": "0w7vrhqg3klr0zxnijmfgfgr5nf6z3cmlrbw3qz9y7z2p2ll5w8m"
+   "commit": "254f2412489bbbf62700f9d3d5f18e537841dcc3",
+   "sha256": "1la91fk322n600h4wnavx7a6rdc44mz4v4gg1fb3cpwjsw746sl8"
   }
  },
  {
@@ -90225,6 +90398,21 @@
    "sha256": "05y8k7r9yc8x11v344fnnpc3iq4lcanwhpgy5xnczbbxxlc8x3pk"
   }
  },
+ {
+  "ename": "org-expose-emphasis-markers",
+  "commit": "d789e986057b4b2dfbc0b4c6980d248c705d5214",
+  "sha256": "0p4ms4l6gr9a94vs4yyf9dfc7jgb3jclhcl38mr47w8rmdsn2ww5",
+  "fetcher": "github",
+  "repo": "lorniu/org-expose-emphasis-markers",
+  "unstable": {
+   "version": [
+    20250320,
+    848
+   ],
+   "commit": "79479b72a683faaad01e73ca4ee16deabd11d533",
+   "sha256": "0w65dmm7icyx98vv964frg1zm68y7yz1y85a2vfbksy0y2nic40d"
+  }
+ },
  {
   "ename": "org-fancy-priorities",
   "commit": "712902ae1cf967ceb2052266ed3244e92998f8a7",
@@ -90699,6 +90887,30 @@
    "sha256": "0vjn3n28rwnvgwfd5dcvdyphn0xrbapd45y7mgx8c4dma112r6qj"
   }
  },
+ {
+  "ename": "org-invoice-table",
+  "commit": "7244ee98eea368afe9fe9d09a3a92d46830b1a5c",
+  "sha256": "160y8ikzx0n623wlwc8wg88qv4ga3fl015wl4dy19lflmf51c4mi",
+  "fetcher": "codeberg",
+  "repo": "trevdev/org-invoice-table",
+  "unstable": {
+   "version": [
+    20250330,
+    2308
+   ],
+   "commit": "6bbd8178d8170c4716ef09dae1f8bbf0d181497c",
+   "sha256": "0zg3j2iy5b839751jzpw2z85q2qrj7n33gzxy1qqgpbkh1blhlyb"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    1
+   ],
+   "commit": "fea8084575e82abb024cd7c8cbcc14c7317c962f",
+   "sha256": "0c2vf99d5hz9hs3q4wjg1cayy69m4xgc2fpihhqck3yk1vrs33gl"
+  }
+ },
  {
   "ename": "org-iv",
   "commit": "66dfdd37cd5e58e25d259c5bf925418eb9cd26d0",
@@ -90890,28 +91102,28 @@
   "repo": "gizmomogwai/org-kanban",
   "unstable": {
    "version": [
-    20250312,
-    2032
+    20250329,
+    2201
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "cb96fa3ae526b6b000e279bc8cd650d6d359771b",
-   "sha256": "1f31496pqxx29xmlysw52092bfcw9zkjrf7ds5wdvjiq60qf443c"
+   "commit": "bc7864f2140d3ed510ec0ecd60c6d3d8b8589ea4",
+   "sha256": "0sibmj1phzxa01awb0r32v2s1ysv2nph1zzgkhi3ai5gb47hfqaz"
   },
   "stable": {
    "version": [
     0,
     6,
-    13
+    15
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "cb96fa3ae526b6b000e279bc8cd650d6d359771b",
-   "sha256": "1f31496pqxx29xmlysw52092bfcw9zkjrf7ds5wdvjiq60qf443c"
+   "commit": "bc7864f2140d3ed510ec0ecd60c6d3d8b8589ea4",
+   "sha256": "0sibmj1phzxa01awb0r32v2s1ysv2nph1zzgkhi3ai5gb47hfqaz"
   }
  },
  {
@@ -90984,15 +91196,15 @@
   "url": "https://repo.or.cz/org-link-beautify.git",
   "unstable": {
    "version": [
-    20250314,
-    2312
+    20250331,
+    814
    ],
    "deps": [
     "nerd-icons",
     "qrencode"
    ],
-   "commit": "a8e4c53b5890780b1ce5ddd2b009c80d94c4378a",
-   "sha256": "1ipv16hcm52ba81rnl9wzvkfsamc1bcv6z0g6x2y9gyl47llvrnr"
+   "commit": "f1047d50c2a13a5a7fd010fc1e6a90e7bbc9f72d",
+   "sha256": "0hqmlzn4c1xlj3c3dwi37hn9ncfqc6h5vah11jsf6l58p3fplrj6"
   },
   "stable": {
    "version": [
@@ -91153,11 +91365,11 @@
   "repo": "org-mime/org-mime",
   "unstable": {
    "version": [
-    20241001,
-    415
+    20250318,
+    2155
    ],
-   "commit": "90aa9081ec00a1705552434cb45ff223aa9f8711",
-   "sha256": "12144hhiygvbx2ws01b47z4wqqd5jfbpxx4cn503mkqwcxzvpvgb"
+   "commit": "9571c148eed5e86fdd54eb6bf2814947c2c745a6",
+   "sha256": "0k001ppva1zyb9aahisk5dwqglyxdr0snwnkbhk14qv2hvfjz9x6"
   },
   "stable": {
    "version": [
@@ -91248,14 +91460,15 @@
   "repo": "minad/org-modern",
   "unstable": {
    "version": [
-    20250311,
-    1701
+    20250326,
+    1539
    ],
    "deps": [
-    "compat"
+    "compat",
+    "org"
    ],
-   "commit": "e7a4c5e4a1d309895c60b3a3b3e62ab1f6a926b4",
-   "sha256": "04bmlwc81d8h8n10xb2nhwmcvn1701nr73hxajl6hasswzqqmh70"
+   "commit": "0e0756f319c637abf424cef96ee35617a7d8c320",
+   "sha256": "1vp6bkkh4bdc3fighhqfv00whaaj580qraay16fg5kgci4rkkh10"
   },
   "stable": {
    "version": [
@@ -91482,30 +91695,30 @@
   "repo": "meedstrom/org-node",
   "unstable": {
    "version": [
-    20250313,
-    1124
+    20250326,
+    1504
    ],
    "deps": [
     "el-job",
     "llama",
     "magit-section"
    ],
-   "commit": "983e0ef82598cad83614f88daa259ed0d14e6419",
-   "sha256": "1ypwwbj8dnjrnvpflv8lfg1dsi5kzrjqgmn1ca2s8naj262dlyw9"
+   "commit": "a6d42efe84f1e3c881c0aeca7521b9f5cba3c3f1",
+   "sha256": "03600cxy8dr2sd49d07v61izxpvdxgfyiangjzkbma4qdpbkmjgh"
   },
   "stable": {
    "version": [
     2,
-    3,
-    2
+    4,
+    1
    ],
    "deps": [
     "el-job",
     "llama",
     "magit-section"
    ],
-   "commit": "983e0ef82598cad83614f88daa259ed0d14e6419",
-   "sha256": "1ypwwbj8dnjrnvpflv8lfg1dsi5kzrjqgmn1ca2s8naj262dlyw9"
+   "commit": "cdd28c693986879e6460535ee8a34d4eeeeef35d",
+   "sha256": "0yvc61ydz8c8wms5pwb14v67da7w4l3xvd5w4x83qf81d9f44w9v"
   }
  },
  {
@@ -91516,8 +91729,8 @@
   "repo": "meedstrom/org-node-fakeroam",
   "unstable": {
    "version": [
-    20250306,
-    2208
+    20250316,
+    1005
    ],
    "deps": [
     "compat",
@@ -91525,8 +91738,8 @@
     "org-node",
     "org-roam"
    ],
-   "commit": "9befbb231df050d31fb8b8d01880668bc90f0799",
-   "sha256": "0m7iijjf58hcx0mz80z6nrwszhqzw8fv0r7q81xg3pfzigc3xr7g"
+   "commit": "fda864320606e1e860b5bd9a6b2b08aec9abc8de",
+   "sha256": "0kf9a3fzczjwc2m1gi1kvmka49rw3682867i1f0xzb63hhdln5pg"
   },
   "stable": {
    "version": [
@@ -92196,28 +92409,28 @@
   "repo": "oer/org-re-reveal",
   "unstable": {
    "version": [
-    20250220,
-    1236
+    20250323,
+    840
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "88e9d9e679e75e40acd93566a27a342437419992",
-   "sha256": "1i7r7i6r1s3bzw2vnmb5j052461n95bdj0kj0k8l9vbrhgs602v3"
+   "commit": "53e9be7d89a4ffd96690271bef0d7d5c58b8eae6",
+   "sha256": "1aj225d59isdpmyzghlb6v6ph54vp4v8cylv0p8wiqrf197fyz58"
   },
   "stable": {
    "version": [
     3,
-    34,
-    2
+    35,
+    0
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "88e9d9e679e75e40acd93566a27a342437419992",
-   "sha256": "1i7r7i6r1s3bzw2vnmb5j052461n95bdj0kj0k8l9vbrhgs602v3"
+   "commit": "53e9be7d89a4ffd96690271bef0d7d5c58b8eae6",
+   "sha256": "1aj225d59isdpmyzghlb6v6ph54vp4v8cylv0p8wiqrf197fyz58"
   }
  },
  {
@@ -92469,29 +92682,28 @@
   "repo": "akirak/org-reverse-datetree",
   "unstable": {
    "version": [
-    20240802,
-    1519
+    20250401,
+    1407
    ],
    "deps": [
     "dash",
     "org"
    ],
-   "commit": "d029e2263de23b19ed89f9757ad69b7cb33bda32",
-   "sha256": "08fh2qmzig3zw5106hhq55847b5cz9l2pl82cqsqbwf93ndflygk"
+   "commit": "4ba47f2cd3a08a032858795fa37416212662b585",
+   "sha256": "0y95im68xgxbfnpslkhmh743fw7dik1dnki1jncw8q6nsx2jkvvy"
   },
   "stable": {
    "version": [
     0,
     4,
-    2,
-    2
+    3
    ],
    "deps": [
     "dash",
     "org"
    ],
-   "commit": "3ac9b35ebe872f5a619f2e6abe281df66ebbcfe0",
-   "sha256": "0lfr88wb98yh9fi2hnvd5f3xdcb1d480shqrcyg7gyqcvx64shii"
+   "commit": "4ba47f2cd3a08a032858795fa37416212662b585",
+   "sha256": "0y95im68xgxbfnpslkhmh743fw7dik1dnki1jncw8q6nsx2jkvvy"
   }
  },
  {
@@ -92541,8 +92753,8 @@
   "repo": "org-roam/org-roam",
   "unstable": {
    "version": [
-    20250313,
-    134
+    20250324,
+    2140
    ],
    "deps": [
     "dash",
@@ -92550,8 +92762,8 @@
     "magit-section",
     "org"
    ],
-   "commit": "db4170a459cba06bd3d36fb6dc748364774ec204",
-   "sha256": "1dc9z9xpr13iklz47mncrb9ccqbaa30jaxlki0ymr4pcwb5b4sl2"
+   "commit": "046822b512ffecdee7d110f73dd3a511802ca590",
+   "sha256": "0jbj48glh0r6fkb0lk1xb9067x2myp3krkw2byycijwdq1nlqzv2"
   },
   "stable": {
    "version": [
@@ -93089,20 +93301,20 @@
   "repo": "bastibe/org-static-blog",
   "unstable": {
    "version": [
-    20240727,
-    718
+    20250320,
+    1842
    ],
-   "commit": "34c9a60a00bce7ad70e7c6b28696edec5affcf06",
-   "sha256": "0g0y8w2i0hs9dywdpxv307gkqnpgyibzmi1sbbqxqj9m8gcib90k"
+   "commit": "728968e4a84ba28c5acedc54ece17e49d6811ad9",
+   "sha256": "1b07q89j153i7al78cg9pxaz93yk0qbdf4mwaalrwiqfkdbm5msn"
   },
   "stable": {
    "version": [
     1,
-    6,
+    7,
     0
    ],
-   "commit": "61a3ab0e2e8e1ac0ef8772e89ae320c07142f7f5",
-   "sha256": "0p3bhnp91x65xr5d40kdmyj7vgyq62bvq3b1gfwv7881sh8p6hr9"
+   "commit": "728968e4a84ba28c5acedc54ece17e49d6811ad9",
+   "sha256": "1b07q89j153i7al78cg9pxaz93yk0qbdf4mwaalrwiqfkdbm5msn"
   }
  },
  {
@@ -93871,11 +94083,11 @@
   "repo": "pinoaffe/org-vcard",
   "unstable": {
    "version": [
-    20240309,
-    839
+    20250325,
+    1512
    ],
-   "commit": "fab5ea81d8a4bb1123cdc0287b9b58c062d5b372",
-   "sha256": "1p0zx59m2839gpnizn7df1zw57s8i9c35xbw9fbqshbs8lv0ag4j"
+   "commit": "c15d70fd8cc983f185b86c884dee0e2e0dadaf07",
+   "sha256": "1lyfiwpqq96qnjygw0m7r91ykikc749g7pz80par5bww2km3ika1"
   },
   "stable": {
    "version": [
@@ -94410,30 +94622,30 @@
   "repo": "magit/orgit",
   "unstable": {
    "version": [
-    20250301,
-    2339
+    20250401,
+    1810
    ],
    "deps": [
     "compat",
     "magit",
     "org"
    ],
-   "commit": "6ad0dc35c8df54fae4ef27e5145760e22fbbf890",
-   "sha256": "0yi73l7hm6x5pyalfmcv0mnklhc574xij35q8zkh6ahrnfbyv8ks"
+   "commit": "efd98e5caaac1d08677dae95be40fab65dcda2c8",
+   "sha256": "0pzcmd4d82nmg98nrnk73qr02k1hy0qyagsbrxyjdpfzrg3ysmp9"
   },
   "stable": {
    "version": [
     2,
     0,
-    1
+    2
    ],
    "deps": [
     "compat",
     "magit",
     "org"
    ],
-   "commit": "6ad0dc35c8df54fae4ef27e5145760e22fbbf890",
-   "sha256": "0yi73l7hm6x5pyalfmcv0mnklhc574xij35q8zkh6ahrnfbyv8ks"
+   "commit": "efd98e5caaac1d08677dae95be40fab65dcda2c8",
+   "sha256": "0pzcmd4d82nmg98nrnk73qr02k1hy0qyagsbrxyjdpfzrg3ysmp9"
   }
  },
  {
@@ -94444,8 +94656,8 @@
   "repo": "magit/orgit-forge",
   "unstable": {
    "version": [
-    20240808,
-    1947
+    20250401,
+    1810
    ],
    "deps": [
     "compat",
@@ -94454,14 +94666,14 @@
     "org",
     "orgit"
    ],
-   "commit": "2718a6aaf0f64cb52c64c419053fbc80eb358c8d",
-   "sha256": "1xcv7kqsrv39rk8fjd2sbl2wrr8mdb6y1xipifki4q7mry1c6v6w"
+   "commit": "764820769e321a76622aaafe7617b4231985b5f0",
+   "sha256": "0v79xc4ss9c4wz6spplrlfzzgynfs264c6gxhzjffpa9vqnvbc6g"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
    "deps": [
     "compat",
@@ -94470,8 +94682,8 @@
     "org",
     "orgit"
    ],
-   "commit": "2718a6aaf0f64cb52c64c419053fbc80eb358c8d",
-   "sha256": "1xcv7kqsrv39rk8fjd2sbl2wrr8mdb6y1xipifki4q7mry1c6v6w"
+   "commit": "764820769e321a76622aaafe7617b4231985b5f0",
+   "sha256": "0v79xc4ss9c4wz6spplrlfzzgynfs264c6gxhzjffpa9vqnvbc6g"
   }
  },
  {
@@ -94613,20 +94825,20 @@
   "repo": "tgbugs/orgstrap",
   "unstable": {
    "version": [
-    20230408,
-    2232
+    20250316,
+    1815
    ],
-   "commit": "f35bccde556b0f82515e79ee69f4379469276356",
-   "sha256": "1z0zwx2ccyzd5rk93xffz3h9c8b8riadkx5n9k38p2agnsq07h52"
+   "commit": "67f4f61716750b4cf4da715b40a19c5ed4bb505c",
+   "sha256": "09cqq0wh1fql56rb07lwl8xdb8vz9wsbg8qkdsprjhjrfw6cpdgm"
   },
   "stable": {
    "version": [
     1,
     5,
-    5
+    6
    ],
-   "commit": "f35bccde556b0f82515e79ee69f4379469276356",
-   "sha256": "1z0zwx2ccyzd5rk93xffz3h9c8b8riadkx5n9k38p2agnsq07h52"
+   "commit": "67f4f61716750b4cf4da715b40a19c5ed4bb505c",
+   "sha256": "09cqq0wh1fql56rb07lwl8xdb8vz9wsbg8qkdsprjhjrfw6cpdgm"
   }
  },
  {
@@ -94637,11 +94849,11 @@
   "repo": "tbanel/orgaggregate",
   "unstable": {
    "version": [
-    20250303,
-    1454
+    20250328,
+    1730
    ],
-   "commit": "51a95f9322ffa61db5b3f037206085d3e44d59be",
-   "sha256": "0kr4i8331mjlv6vcs4mcw111xawvcaasnwhc4wp9bkga31brhyxj"
+   "commit": "20060ab4d7a73beffe141145ee319d6a6b86d891",
+   "sha256": "0cph5p8b24s4pg0284q69ffk25jl3bkxyf9mw61qdrnk0wcpcigr"
   }
  },
  {
@@ -95168,11 +95380,11 @@
   "repo": "jamescherti/outline-indent.el",
   "unstable": {
    "version": [
-    20250227,
-    1641
+    20250320,
+    1659
    ],
-   "commit": "ff1b6ecf642c673936f3c258d329c76c45e30854",
-   "sha256": "044qxaczp50bxpdwcyyxi6lqpq2rdm4yfjv7g3867kz44nxvwspq"
+   "commit": "e844d1e4b34bd3e2d0ccfd4cd289c90972673606",
+   "sha256": "0p517kmx85c225wqmff6b4s5rw49b4vaq28rmv03s1q26im7q7ip"
   },
   "stable": {
    "version": [
@@ -95527,26 +95739,26 @@
   "repo": "mmitch/ox-bb",
   "unstable": {
    "version": [
-    20240903,
-    2115
+    20240907,
+    1042
    ],
    "deps": [
     "org"
    ],
-   "commit": "129ea37caf6de6f43845bd36f16fd78251a3afe9",
-   "sha256": "1qbaqfbz43z2acyxgsjbj07xldm04jrf2ncjdzcwbnkz29prflqd"
+   "commit": "4d0a3ea6c4509ecb73a288da11140b588a902e76",
+   "sha256": "0fx6wq5wjf6c6qpd5ipr4c801mxw9lfan5kzjsin9nh493yq03sw"
   },
   "stable": {
    "version": [
     0,
     0,
-    1
+    2
    ],
    "deps": [
     "org"
    ],
-   "commit": "37e22316afac9dd73dec072ac6420e5c1c4471b6",
-   "sha256": "0a2vp4br1s4zjvjz7z7j3kzzlnb4rzmash1425rz55zg2v3zsi0a"
+   "commit": "4d0a3ea6c4509ecb73a288da11140b588a902e76",
+   "sha256": "0fx6wq5wjf6c6qpd5ipr4c801mxw9lfan5kzjsin9nh493yq03sw"
   }
  },
  {
@@ -95562,6 +95774,14 @@
    ],
    "commit": "647e7ef74c559ca189b46f1e79e9fcf8146a2af3",
    "sha256": "0v450b65mixl73sp3iwyv5lkik65575wpynbhy4y9wxcgkyvz98p"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "commit": "647e7ef74c559ca189b46f1e79e9fcf8146a2af3",
+   "sha256": "0v450b65mixl73sp3iwyv5lkik65575wpynbhy4y9wxcgkyvz98p"
   }
  },
  {
@@ -96172,14 +96392,14 @@
   "repo": "msnoigrs/ox-rst",
   "unstable": {
    "version": [
-    20200815,
-    1511
+    20250402,
+    923
    ],
    "deps": [
     "org"
    ],
-   "commit": "99fa790da55b57a3f2e9aa187493ba434a64250e",
-   "sha256": "0dxadzbha2fvg42jh4ng8hjb582mv7avlzmpxlzf32qxf6x8r638"
+   "commit": "a196a3e5284cb9d16a49ae6c23fb08eaaad1ea7b",
+   "sha256": "078qj8l4p8h9981klr7cbgmv3mv5f4pi3myz4a3gwjcfnz8qwy29"
   }
  },
  {
@@ -96392,14 +96612,14 @@
   "repo": "jmpunkt/ox-typst",
   "unstable": {
    "version": [
-    20241130,
-    1002
+    20250326,
+    1817
    ],
    "deps": [
     "org"
    ],
-   "commit": "d00fc1d21657f925c7bd92e9b9cab51047bbcb2f",
-   "sha256": "1qqcajy5kssjrd49nf8cl5gg82scl77z341kwrci5kz5jjkpbhhd"
+   "commit": "0cb0aa7f0c54bb2239516a0a4b02ce5ff7458a84",
+   "sha256": "0qw2r32d3dld409k3806i56vcny7nnjmlcp11wgqdfx32vy6hz02"
   }
  },
  {
@@ -96681,14 +96901,14 @@
   "repo": "purcell/package-lint",
   "unstable": {
    "version": [
-    20250307,
-    912
+    20250324,
+    1912
    ],
    "deps": [
     "let-alist"
    ],
-   "commit": "6170c1e5b79f9b9f606ab17ab4d9ffb9bce3ebde",
-   "sha256": "1fvi79pwlvvdakcmvf6jv9ba400lqfjsdcshg2q4rnj5v1a797pn"
+   "commit": "d6554e3bd4b8399be6fcc22e887fe3f9865c995a",
+   "sha256": "0m666f94h9kzhgpsnviyk7kyf4klk85i4mm3h22kbhdnh1hrqfw6"
   },
   "stable": {
    "version": [
@@ -97473,19 +97693,19 @@
   "repo": "joostkremers/parsebib",
   "unstable": {
    "version": [
-    20250225,
-    840
+    20250316,
+    2257
    ],
-   "commit": "735e308fc5b7aaed975764f6c7139d1c4bf28d0c",
-   "sha256": "0zr4i8gaa6vnkm4ggrgpc7fsdayfxxb8wi59c3dhkyydmvcdzqsp"
+   "commit": "7bfde4e4679413424a9a9af099203d5c23e32cd2",
+   "sha256": "180lvlq6xfri1lag85s6478x8cv4iccj6qk2rag9nm19yrhxfh7a"
   },
   "stable": {
    "version": [
     6,
-    6
+    7
    ],
-   "commit": "a25621930e67e267133b08698a72fa80a42edfc8",
-   "sha256": "0gh8bv6q9041q0b9spw7glj3lfvkj8yl743b4xc1y5mjj8alb466"
+   "commit": "7bfde4e4679413424a9a9af099203d5c23e32cd2",
+   "sha256": "180lvlq6xfri1lag85s6478x8cv4iccj6qk2rag9nm19yrhxfh7a"
   }
  },
  {
@@ -98267,14 +98487,14 @@
   "repo": "krisbalintona/pdf-meta-edit",
   "unstable": {
    "version": [
-    20250114,
-    2348
+    20250321,
+    2317
    ],
    "deps": [
     "compat"
    ],
-   "commit": "74af23554ee929c191c734794f322cbb854f880d",
-   "sha256": "19vk7zvajm99asrm7dai3ip53clfsjs1bfxv6sqqb0d1vlxm056r"
+   "commit": "8c2690f070d79e7cb495c0d3e04b48db2a2bbc3e",
+   "sha256": "0nlk2m652jzccy1lcpxmhjhjdcbkikg8nggpdlsscimrf9hid0f6"
   },
   "stable": {
    "version": [
@@ -98982,25 +99202,25 @@
   "repo": "emarsden/pg-el",
   "unstable": {
    "version": [
-    20250308,
-    1028
+    20250329,
+    1244
    ],
    "deps": [
     "peg"
    ],
-   "commit": "e1815943e14b97ff03aa81b4e6bddb2bb582da52",
-   "sha256": "08sjsgjkzi53xwi8l1vjb48qc6clnsknlrv3pikr81dhbjr986i8"
+   "commit": "b5978eab882e65b23b7fdf1c3cf7adc834e9e8bf",
+   "sha256": "03m4rqplfdny94akpgpznzr320sdhkhfx16jsdvxgmlsfajm1cvc"
   },
   "stable": {
    "version": [
     0,
-    49
+    51
    ],
    "deps": [
     "peg"
    ],
-   "commit": "f957bb6679dce1a24b06e245f695c04556977752",
-   "sha256": "0k7fyr7bkmbb2s0w36rachn3qh5xczgla5vps49kzavqfcfhk9fc"
+   "commit": "b5978eab882e65b23b7fdf1c3cf7adc834e9e8bf",
+   "sha256": "03m4rqplfdny94akpgpznzr320sdhkhfx16jsdvxgmlsfajm1cvc"
   }
  },
  {
@@ -99327,11 +99547,11 @@
   "repo": "emacs-php/php-mode",
   "unstable": {
    "version": [
-    20250109,
-    2103
+    20250331,
+    1736
    ],
-   "commit": "0f756a8c0782ebdc00557addc68763305c91ca51",
-   "sha256": "12alin9lfp8lxrd8g9d1nld8cha4zmfbpjz6mjzmi1midv4b0zdc"
+   "commit": "df830a1894ad9e17f4cd9803c0353942179bfdcb",
+   "sha256": "0233y6gaqfryv6i91wygf9w67ssn73wwl50gcdsgyl7giw8nrf14"
   },
   "stable": {
    "version": [
@@ -99439,8 +99659,8 @@
   "repo": "emacs-php/phpactor.el",
   "unstable": {
    "version": [
-    20250307,
-    1931
+    20250331,
+    1310
    ],
    "deps": [
     "async",
@@ -99448,8 +99668,8 @@
     "f",
     "php-runtime"
    ],
-   "commit": "005f5bff81d66ac362a163778fd433eef43dabfc",
-   "sha256": "0jaccwf00xjm7nhwl51q9v3lwha8rwn7wm511klkc1g7dq0mzzaf"
+   "commit": "e22e9820992aae9220a81ee4f04faece0265215d",
+   "sha256": "0b46kag95b1hk6vw2fdwiv0nqwdsz2yy10xxack7iv7isp73h2ja"
   },
   "stable": {
    "version": [
@@ -99473,21 +99693,21 @@
   "repo": "emacs-php/phpstan.el",
   "unstable": {
    "version": [
-    20241107,
-    408
+    20250331,
+    1920
    ],
    "deps": [
     "compat",
     "php-mode",
     "php-runtime"
    ],
-   "commit": "b616f5fa5f8aff9aa220c7fe63b39df6d10588a5",
-   "sha256": "0xjr6vi158qm6rnrfvpcmh2grrlvixdd44kik333250298vc3nx3"
+   "commit": "e1aa8b269c0e3281c323bc1fad509edabb668441",
+   "sha256": "1nqsf9bh8pd3pjmpmsiqazy8639h8938jm37qqcmdn13n69n0pxm"
   },
   "stable": {
    "version": [
     0,
-    7,
+    8,
     2
    ],
    "deps": [
@@ -99495,8 +99715,8 @@
     "php-mode",
     "php-runtime"
    ],
-   "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
-   "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
+   "commit": "e1aa8b269c0e3281c323bc1fad509edabb668441",
+   "sha256": "1nqsf9bh8pd3pjmpmsiqazy8639h8938jm37qqcmdn13n69n0pxm"
   }
  },
  {
@@ -100493,11 +100713,11 @@
   "repo": "flexibeast/plisp-mode",
   "unstable": {
    "version": [
-    20221130,
-    524
+    20250328,
+    45
    ],
-   "commit": "3a0ec9741ae7ca67852022c6fa85519fcb4b69ba",
-   "sha256": "1lfn6bylpsam2la8r1k0gb3aik1fbbvpln37zc0hmdj3k0w4clci"
+   "commit": "062c333343e64427dd70a2739ab9225fd23e550a",
+   "sha256": "15562wnrw14s9pjrjfwz03jzsppf0l6mrvj88vglsghaayyps3r9"
   }
  },
  {
@@ -101528,11 +101748,11 @@
   "repo": "karthink/popper",
   "unstable": {
    "version": [
-    20250222,
-    2118
+    20250323,
+    2147
    ],
-   "commit": "91b71955db19014d7139191660272c736458d87d",
-   "sha256": "1x1nnc0li8jd609lnmmax2hl69wmbq84c6b2mdg0wb7zf0k29lba"
+   "commit": "49f4904480cf4ca5c6db83fcfa9e6ea8d4567d96",
+   "sha256": "0ylgqail51zzml8b8qc2wirpkvwj8317qp67y68rlz4kzi3zjxj2"
   },
   "stable": {
    "version": [
@@ -102083,8 +102303,8 @@
   "repo": "blahgeek/emacs-pr-review",
   "unstable": {
    "version": [
-    20250305,
-    1646
+    20250328,
+    132
    ],
    "deps": [
     "ghub",
@@ -102092,8 +102312,8 @@
     "magit-section",
     "markdown-mode"
    ],
-   "commit": "47bc3b00fd509a7bfd0bf5697cf9f7cb9cfacdd3",
-   "sha256": "0c28xbgq837694z9dag24y48mb3r4ffalci1zxp8hgqrijfqmakd"
+   "commit": "6b3895c7919762b87a57e4373920ff3592e4a696",
+   "sha256": "0xlqkfy71ncn6kpwq5243a396j2mz092z4vg21bhr0zq0g91ak54"
   },
   "stable": {
    "version": [
@@ -102237,14 +102457,14 @@
   "repo": "zonuexe/emacs-presentation-mode",
   "unstable": {
    "version": [
-    20180427,
-    224
+    20250327,
+    202
    ],
    "deps": [
-    "cl-lib"
+    "compat"
    ],
-   "commit": "b1948e6d8b37b6df9290d77d181e1b1d58dd33c0",
-   "sha256": "0wm7rg7gvyngps3b7agpyhhbi2r7z0n5x8wxzahl8l1bm820y8jk"
+   "commit": "42f13613b0d01ef78c36fc352ae8976cffc50e71",
+   "sha256": "12v8pcc5ayn26mhm2xbp5pb8269yc0mh0y5j34r54ajpsb9cwl1h"
   },
   "stable": {
    "version": [
@@ -102696,16 +102916,16 @@
   "repo": "rejeep/prodigy.el",
   "unstable": {
    "version": [
-    20250130,
-    845
+    20250401,
+    1948
    ],
    "deps": [
     "dash",
     "f",
     "s"
    ],
-   "commit": "99908d13beeb86cea6c7675af5885133192bf6dd",
-   "sha256": "174zldzv3id6vgfr1ynximgxbh3alxsr6dypy9v5aly7zlwwclhw"
+   "commit": "7bd89fdd544209afb28d6abe828728ad62257617",
+   "sha256": "051mcwyigybrp6vnn6b88jh4y18m54mfi8n776ps42pgijgpmjg8"
   },
   "stable": {
    "version": [
@@ -103067,11 +103287,11 @@
   "repo": "bbatsov/projectile",
   "unstable": {
    "version": [
-    20250312,
-    1659
+    20250402,
+    715
    ],
-   "commit": "55db082cdf7b849335ccf24b7ba5aa2607d6fe93",
-   "sha256": "1h0kz0k0vjlw59q6r3vi84agwyqp66qps70bs10g8aag1im0zcx4"
+   "commit": "4dd84b02c9cd7b04616dc2d01ba7bc87f0d15be8",
+   "sha256": "1cjq9bdm13j6km1vvl1hsdpq86nlgv9wmf03ylfr85p0lwgy841w"
   },
   "stable": {
    "version": [
@@ -103566,11 +103786,11 @@
   "repo": "ProofGeneral/PG",
   "unstable": {
    "version": [
-    20250125,
-    1556
+    20250402,
+    804
    ],
-   "commit": "3c3a21e4dad205dc17a54e568ed387e59ae2ff69",
-   "sha256": "1f330abya5cf6gvhfb9l9j2vbhz3ryd473lf98sipmxkw6a06lm1"
+   "commit": "a78543cba785a7b0b0d1a8d4fe343305c6264d15",
+   "sha256": "159bhxj7xw66600l3rgpkfd792qvx45f5ijpmhrgl0299b99m4aw"
   },
   "stable": {
    "version": [
@@ -103679,10 +103899,10 @@
   "stable": {
    "version": [
     30,
-    0
+    2
    ],
-   "commit": "d295af5c3002c08e1bfd9d7f9e175d0a4d015f1e",
-   "sha256": "1yini3rs17yf122ldzq19rywa4rl11gqayqwrwpvnixj7f3m560c"
+   "commit": "43e1626812c1b543e56a7bec59dc09eb18248bd2",
+   "sha256": "002l7bi6jbxv7bvs56s5dw3qj7i1sp110w64a1zlvhisym010i4j"
   }
  },
  {
@@ -105277,11 +105497,11 @@
   "repo": "python-mode-devs/python-mode",
   "unstable": {
    "version": [
-    20250224,
-    1104
+    20250325,
+    1815
    ],
-   "commit": "7a4a93e972152ae224e88c25183115fb64ab87d0",
-   "sha256": "0gmd018zna46p7wbzq8d1ibp3vlskfqngn2amxyg8nkgvbqmahma"
+   "commit": "c33cf01d8d0c7cb5b0cca983158323bf12536837",
+   "sha256": "04wksvhr3a4ikwcjq9803hzwjvzp8q4v3wm06ly2p02r1vygvicv"
   },
   "stable": {
    "version": [
@@ -105819,20 +106039,20 @@
   "repo": "jamescherti/quick-sdcv.el",
   "unstable": {
    "version": [
-    20250304,
-    216
+    20250313,
+    1703
    ],
-   "commit": "c114a2917845d51942cb893bd819e07580e6dbdc",
-   "sha256": "03ak9prizffazmv91c7mxpj3ckq786lirjs360pv9n4kxchldcdc"
+   "commit": "f94099124e4df92b44086c46d59e286f21bfafa8",
+   "sha256": "19ywfnf5ws40h9iv03xibjfk1hfpnb67zf9702px3yg5j1mhr845"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
-   "commit": "ef24026f1f03d3df8ed999e5c75f5c3bbc70860e",
-   "sha256": "0z83fziijw6262i4iq4wd881ps3w1wd9f2x4966bjxgavd0ijfp7"
+   "commit": "f94099124e4df92b44086c46d59e286f21bfafa8",
+   "sha256": "19ywfnf5ws40h9iv03xibjfk1hfpnb67zf9702px3yg5j1mhr845"
   }
  },
  {
@@ -106060,11 +106280,11 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20250212,
-    1523
+    20250324,
+    1144
    ],
-   "commit": "eef5e9ab2c8991e7c73d4232bde28a77124005a5",
-   "sha256": "1shjcrdqw1fpwlksk7wpr2m1s30lhy144wik2kx8hjdbna4ygl0f"
+   "commit": "6b9a51828a5d08ac9ee4d96a21f6cff95f0e6a17",
+   "sha256": "1p8sr96bga4nhfm5md8m1p5x0dp444z63m7xrrbg337wsyqq49h7"
   }
  },
  {
@@ -107986,6 +108206,21 @@
    "sha256": "1jka61j6zrc0yzjcplnyg1kp1d45ikwnkmayjg41v9w0pfrzzim3"
   }
  },
+ {
+  "ename": "repeat-fu",
+  "commit": "641cd90a1b5507648c6903fc9dc0f198ca41a06a",
+  "sha256": "1p3ipdsqip7xvwgbvgia4214hw7nw2gc3m0m55ggwi3gcikvx2xp",
+  "fetcher": "codeberg",
+  "repo": "ideasman42/emacs-repeat-fu",
+  "unstable": {
+   "version": [
+    20250331,
+    818
+   ],
+   "commit": "409f954adf295a3beb3d2e481c773ebef8bf8f9f",
+   "sha256": "0247gi4ds0fzhalmvdq5f8j68jrrfsdkg1x143njmj89lvysmzbf"
+  }
+ },
  {
   "ename": "repeat-help",
   "commit": "0f9283ef3cea68b0d581ae544ec4192b83eb4998",
@@ -108843,6 +109078,21 @@
    "sha256": "1adici6hs4ivz7lqhrgdm9g1rz0mgvrsa7pkr2pcx6mg1f0qnlmr"
   }
  },
+ {
+  "ename": "rg-themes",
+  "commit": "f4841296d637d7cf0134bf354cd62c5e448692d3",
+  "sha256": "1mkwdfvsnczdympffgpr70vxjnkcrdwlhw97rqzmq22ih1v1l8z2",
+  "fetcher": "github",
+  "repo": "raegnald/rg-themes",
+  "unstable": {
+   "version": [
+    20250324,
+    1454
+   ],
+   "commit": "e5bfe9b71587b0c247f433261419eafbf4e2c5a9",
+   "sha256": "1s2l9mwpgrvzfzznlwmfzi8k0zxdg5q1s78ybh3sc7jb6jpdcbyh"
+  }
+ },
  {
   "ename": "rgb",
   "commit": "a6207f5129ffd2bedbc83aa8a41d83fe4f6e41be",
@@ -109277,11 +109527,11 @@
   "repo": "jgkamat/rmsbolt",
   "unstable": {
    "version": [
-    20241229,
-    1855
+    20250325,
+    50
    ],
-   "commit": "38f83b717cf5d5c4ee105c140f4f2341b3d2032b",
-   "sha256": "02bxccg34dc893hnbw1j9fybkqmlkknp8c3zk959bg643x5ycrvd"
+   "commit": "05c4795226f859009bc570940139473b6b6f7555",
+   "sha256": "13hrvq0hsvgnysi474c16s0j3mdxny210pszp5ch9jfk9l98r7zf"
   }
  },
  {
@@ -109632,11 +109882,11 @@
   "repo": "Thaodan/rpm-spec-mode",
   "unstable": {
    "version": [
-    20241209,
-    2001
+    20250329,
+    139
    ],
-   "commit": "283d2aac4ede343586a1fb9e9d2a5917f34809a1",
-   "sha256": "160kkf4jswlnv0prwxws2l93cq7b1x21kkkrics0cg7kfkkyrvrr"
+   "commit": "8cd329b78c7bc6285b7b9f2c65a58a9e778a59ca",
+   "sha256": "02ll930smiixlgaf3bxs2g30gc5alc1yd1fv8spx6d4hxrp9jvy5"
   },
   "stable": {
    "version": [
@@ -112340,15 +112590,15 @@
   "repo": "MaximeWack/seriestracker",
   "unstable": {
    "version": [
-    20230821,
-    1858
+    20250315,
+    1813
    ],
    "deps": [
     "dash",
     "transient"
    ],
-   "commit": "49b1e7a822c973c48007dc6461577ee68124ddc8",
-   "sha256": "0gfm7ss3bwj3m2y1mb4sdmsv85mjnpkgmzasa3yfj69zbq46glhn"
+   "commit": "03e5937abe7911fef6286601cbe54e0a6bc9ec3f",
+   "sha256": "0kdyb3k94ln2nk86kga838kvias1cxzdpmdcprixlsyd1d5yra15"
   },
   "stable": {
    "version": [
@@ -112573,10 +112823,10 @@
  },
  {
   "ename": "sexy-theme",
-  "commit": "fce1e2e203a53dea0077d0806d1918c4ebe0987d",
-  "sha256": "118nmw29izb7q6kzkb4swdbz45alp16p203ksi8csfdv79ky3qxw",
+  "commit": "3c721d77616bda8bc4b7819a24698690c737c07e",
+  "sha256": "0pfnn880iyjzsr4fcrrpc65d0z5a9s4iy4bgrz7qrrjfygdni6fz",
   "fetcher": "github",
-  "repo": "bgcicca/sexy-theme.el",
+  "repo": "thebigcicca/sexy-theme.el",
   "unstable": {
    "version": [
     20250312,
@@ -112864,11 +113114,11 @@
   "repo": "xenodium/shell-maker",
   "unstable": {
    "version": [
-    20250301,
-    2230
+    20250320,
+    908
    ],
-   "commit": "98780ec0a8ac4fe1d6be9e2f8047195cdfad5f70",
-   "sha256": "0pmk9c2xbbqy3d0q5kjf74d06wxdnxyfpd10qmnzj384nkaqwm8w"
+   "commit": "db0c2726922657e0891e224ca4a5523be01e55c1",
+   "sha256": "1p9ksnfpvbshiy92br3lyh7q0aamzx0pv5cp05ga6iikjhjp062d"
   },
   "stable": {
    "version": [
@@ -113155,11 +113405,11 @@
   "repo": "ideasman42/emacs-shift-number",
   "unstable": {
    "version": [
-    20250313,
-    1138
+    20250314,
+    234
    ],
-   "commit": "8d910a7f0f42027f6526fc0bb0d145c196c19b52",
-   "sha256": "17ganlyvb3d7ibpyapnywhj9a1667h66g8hiwajgryciar958mnj"
+   "commit": "b25fc4fc02a0755c1f5bd6483a65c970fbd30190",
+   "sha256": "1pf979dsrsrjs1q657flpycqfqfz7r8km7rbvsy8r0fxawjjjgai"
   },
   "stable": {
    "version": [
@@ -113402,15 +113652,15 @@
   "repo": "chenyanming/shrface",
   "unstable": {
    "version": [
-    20250308,
-    1630
+    20250330,
+    1106
    ],
    "deps": [
     "language-detection",
     "org"
    ],
-   "commit": "779c94b561177210ae03c042f191a7a6cec663c2",
-   "sha256": "0jbmp1f9bdv18k9xfkblyv2gxawcj8hwacd76ygr2xrgj3i5d89p"
+   "commit": "beabf1c7dfc4f1dc69f2cbcc438a74b5497a90ec",
+   "sha256": "1f1kd0hdhn4536vabvv4kplbwmy0mznhvhzn3pa581h580jzg9hf"
   },
   "stable": {
    "version": [
@@ -113810,14 +114060,14 @@
   "repo": "emacs-sideline/sideline-flymake",
   "unstable": {
    "version": [
-    20250201,
-    1749
+    20250330,
+    2040
    ],
    "deps": [
     "sideline"
    ],
-   "commit": "87459e2b083674520d7fc4ee36b6b04c990b2e4f",
-   "sha256": "0cncgf404ckcilhgzyr79wsr0bgkhklcdcd0scbnmfrn72dyzq9p"
+   "commit": "cece68ca230e8a539b91ef5cb89934a938ea3970",
+   "sha256": "0i8w5bwqr1b6ry9fhrsj2ycf4fby0ik4bjbwk2vfv672bdml1rir"
   },
   "stable": {
    "version": [
@@ -114309,11 +114559,11 @@
   "repo": "laishulu/emacs-smart-input-source",
   "unstable": {
    "version": [
-    20250207,
-    1321
+    20250328,
+    142
    ],
-   "commit": "e09728891a99a078470cc29a30a6e32f814682fe",
-   "sha256": "02r8z2dng0ian1qig5c1g5xwfa4azpkja9r5lwi4qyd9mkw5cjzy"
+   "commit": "f7881a9af563b99db9f8efa47af738d0748f83d8",
+   "sha256": "1p7zismv1gm3r5kv7jan9wf7afza2lz4xrk30xk84pyk6xaq8kcj"
   }
  },
  {
@@ -114324,8 +114574,8 @@
   "repo": "magit/sisyphus",
   "unstable": {
    "version": [
-    20250302,
-    1547
+    20250401,
+    1807
    ],
    "deps": [
     "compat",
@@ -114333,14 +114583,14 @@
     "llama",
     "magit"
    ],
-   "commit": "a93f6329efddbd1273f774046904886b6d2f20c3",
-   "sha256": "1qm9bwbbkypnd5dp8f1ag3hfwsg6f0snggymwhc082bvdifpmxxk"
+   "commit": "e3f6ea4b720ed384c3ba34fa047bb66280906fad",
+   "sha256": "1mdslx756828ljhbnmqr1hvcbw0pislqisnlsw1y38c535hwns0f"
   },
   "stable": {
    "version": [
     0,
     2,
-    2
+    3
    ],
    "deps": [
     "compat",
@@ -114348,8 +114598,8 @@
     "llama",
     "magit"
    ],
-   "commit": "f04a145396e5534e09d381d218ec051e2137c9e0",
-   "sha256": "1fq9axf5h3l3qk6pgv2vzz33hbl2fmbv4vsg9l0il7vhwlj7k04a"
+   "commit": "e3f6ea4b720ed384c3ba34fa047bb66280906fad",
+   "sha256": "1mdslx756828ljhbnmqr1hvcbw0pislqisnlsw1y38c535hwns0f"
   }
  },
  {
@@ -114592,8 +114842,8 @@
   "repo": "emacs-slack/emacs-slack",
   "unstable": {
    "version": [
-    20250310,
-    2351
+    20250327,
+    1218
    ],
    "deps": [
     "alert",
@@ -114605,8 +114855,8 @@
     "ts",
     "websocket"
    ],
-   "commit": "7fc183f9deadc7e3d4e0c89776cdc2968bba0164",
-   "sha256": "1fimrkd4p15pm2vy8g7j9cxv4l5i1n7pgkzhzyd0jlha5g8il8ij"
+   "commit": "ac4d42928fd2250f0558b8a2bd7664142ab8fba8",
+   "sha256": "1pzqcdv2fjcxwgim0dmaglyxi5rax62q63q30b8283r9sz3x3xnk"
   }
  },
  {
@@ -114664,14 +114914,14 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20250310,
-    2032
+    20250330,
+    1740
    ],
    "deps": [
     "macrostep"
    ],
-   "commit": "9bba7e93105ab4d8517423894eaaa9b097543b1e",
-   "sha256": "0f2fhiv12jg7pld5zhv14v6hg466bhi7pff8iv91bnfmr1cv0d1c"
+   "commit": "36878496d6f9d06cd3e4dfa3f51ab57acc5fe95f",
+   "sha256": "0ilqdgnhim5jlampgfnjim2njkxhv8yxkrlgdgy151f5dkxxwbpg"
   },
   "stable": {
    "version": [
@@ -114916,11 +115166,11 @@
   "repo": "vilij/slurpbarf-elcute",
   "unstable": {
    "version": [
-    20241115,
-    1459
+    20250325,
+    1442
    ],
-   "commit": "c6e7d4b5da6f1116b479c71d9c7fa0aca71d4030",
-   "sha256": "1xd8nd55dhdf1dx622x2618zj3xk196p2yr4123hk8hlqlb46h2d"
+   "commit": "97b4c3b0bd3e22d4d4b1a9aed3435b5a58b09259",
+   "sha256": "098wr42lra37f9hy35y8sb6x1zbj0gvvcnchy1f2nb57wh6xy9r2"
   }
  },
  {
@@ -116442,16 +116692,16 @@
   "repo": "artenator/somafm.el",
   "unstable": {
    "version": [
-    20220402,
-    2131
+    20250316,
+    2337
    ],
    "deps": [
     "cl-lib",
     "dash",
     "request"
    ],
-   "commit": "90b661fb1abc652feb6508eb61735919d02e9687",
-   "sha256": "0n8y8aj42j646vfjarl6w1dxn7wxqx3w6vjwbm8wj4i8nm17a77z"
+   "commit": "549fea7df8f7bb3c70939275c04f88ff84e0b5a8",
+   "sha256": "0gwgs4isg9nms6wwk9k509bvcs9mwarhg5182hwrlcxpxhp035fi"
   }
  },
  {
@@ -117191,15 +117441,15 @@
   "repo": "dakra/speed-type",
   "unstable": {
    "version": [
-    20250302,
-    2246
+    20250402,
+    1911
    ],
    "deps": [
     "compat",
     "dash"
    ],
-   "commit": "9602ac6a794ff16393f6665afe7096b2690e4393",
-   "sha256": "1iwvv8m8xmyvjwyqs6vjyw17qifx53c7ybwykd802lciqpxiixlw"
+   "commit": "2bf592aaf2b6d8109cef60c05ba4e5a06f9d0ee7",
+   "sha256": "1j4iqcgj6dm53lj2pc51qkmpmk149wzd2i81rmy306d6nj6sxh14"
   },
   "stable": {
    "version": [
@@ -117921,11 +118171,11 @@
   "repo": "srfi-explorations/emacs-srfi",
   "unstable": {
    "version": [
-    20250208,
-    2126
+    20250326,
+    2022
    ],
-   "commit": "53196f48d35ea745a14573ab5ee4f3725728ebdc",
-   "sha256": "1ibbv82513za7vd6cm1cynxank78yq423rygrdbycfj8c5h03q4r"
+   "commit": "97da6f7c5b8f5fc35a647434d7af87aba01c1b23",
+   "sha256": "0s6kczjwnh2jhlrkyfzy8wc739qpgz6dij0z2bly1xs80r8aclwm"
   },
   "stable": {
    "version": [
@@ -118768,6 +119018,30 @@
    "sha256": "08gk3z185jhvl8azkn8rccgv72imp14rqw44mlszhrvqjafdd3z0"
   }
  },
+ {
+  "ename": "stripspace",
+  "commit": "4c0930637278ad9ba4efc66e8b7e5574afc73d10",
+  "sha256": "17j3sdmvhm90nf5s7zic12j6sd1hg67f99xgsc22h5m2is7jx3ni",
+  "fetcher": "github",
+  "repo": "jamescherti/stripspace.el",
+  "unstable": {
+   "version": [
+    20250330,
+    2329
+   ],
+   "commit": "70eac3a2f99feedcc3fcd03ceb3b2c51b82fb1bf",
+   "sha256": "1b1v3jkvrgk0fcdwgv1gd4fzdksrzmp69ly58ahj7df6frm4am6n"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    1
+   ],
+   "commit": "70eac3a2f99feedcc3fcd03ceb3b2c51b82fb1bf",
+   "sha256": "1b1v3jkvrgk0fcdwgv1gd4fzdksrzmp69ly58ahj7df6frm4am6n"
+  }
+ },
  {
   "ename": "stumpwm-mode",
   "commit": "270e13913999312a4e8ae16cfb0bb8aad0068043",
@@ -119731,26 +120005,26 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20250224,
-    2125
+    20250329,
+    1401
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742",
-   "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64"
+   "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429",
+   "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1"
   },
   "stable": {
    "version": [
     0,
     15,
-    0
+    1
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "7a0d554aaf4ebbb2c45f2451d77747df4f7e2742",
-   "sha256": "0219m3afsn7s7188hphpq1nh7fqbgjxixaw0js0mmcmzhbzh5x64"
+   "commit": "e33b028ed4b1258a211c87fd5fe801bed25de429",
+   "sha256": "1yv40k0swdywk0zwxs2s95s4y1pa9k2m3s25fx7gv9pnmf7yw8p1"
   }
  },
  {
@@ -119832,11 +120106,11 @@
   "repo": "dimitri/switch-window",
   "unstable": {
    "version": [
-    20241028,
-    314
+    20250401,
+    839
    ],
-   "commit": "61e425e703bee66825c33f4be11fabac1a3d992a",
-   "sha256": "1wj9rm2yvl72irahq486h78caqqmlf7v1r17ysz69l2kwiqfjidv"
+   "commit": "8f771b571a1e60fac2d2a9845c0a5a52d5b440df",
+   "sha256": "0q3zhrylla6knyqjrckdwnwfwhk3pp9mr4zjks9rxccldmr8b1b4"
   },
   "stable": {
    "version": [
@@ -120956,17 +121230,26 @@
  },
  {
   "ename": "tangonov-theme",
-  "commit": "a3645b08cb46e3d91081da7baa982b5283918447",
-  "sha256": "1nd3aymqi7xz0j48rmvdlhaqyzqa0bdb615yaygji23zj6a3vy1d",
-  "fetcher": "sourcehut",
+  "commit": "f86dc9c83daf2ff759a432bfd78d8931b2b11b84",
+  "sha256": "194gjn4l3667bzvzph5cd4l7aw0dmdc1ky8bbgg7g050k3cl0qa1",
+  "fetcher": "codeberg",
   "repo": "trevdev/tangonov-theme",
   "unstable": {
    "version": [
-    20230425,
-    1456
+    20250325,
+    1357
    ],
-   "commit": "bfeafe22d38877d4064670adec55ba1e8d09d830",
-   "sha256": "1m5rvfp1mlcf2rrj79ah2ssy55nxgwp1h96v92zv8fcpdii4qzrx"
+   "commit": "eda1e6cd9bb6faeace30385648f44d2cac9c7309",
+   "sha256": "0fphhphajj2cn7l0wiyqcd2x1fh9s1jjv1g3z96dzbpkfh0zn6ra"
+  },
+  "stable": {
+   "version": [
+    1,
+    5,
+    1
+   ],
+   "commit": "ab5d75805187018fcd0b698bbc05019477afa94a",
+   "sha256": "139h5nrzdsi8365hpqhfwfn9xh42j29z2d76mdjz841za3d89yc8"
   }
  },
  {
@@ -121361,25 +121644,25 @@
   "repo": "minad/tempel",
   "unstable": {
    "version": [
-    20250101,
-    927
+    20250316,
+    1016
    ],
    "deps": [
     "compat"
    ],
-   "commit": "12a2072ce97d7489296dbb950da946b77d215506",
-   "sha256": "1yjp2fk0fzvj9xsshvbha9csranqgrwhf8ggx52qmfn4shssxrn7"
+   "commit": "f52a99ebf6ee52a30d435ef1583dc8df3e5f2ca5",
+   "sha256": "1dlrcdyj0l4hbk0xhb3yj88naq4m76n5hfd180qqwjpc83g9fqs3"
   },
   "stable": {
    "version": [
     1,
-    3
+    4
    ],
    "deps": [
     "compat"
    ],
-   "commit": "40a85c3dc9a7f073e36fb05b835814a4e68fa5b3",
-   "sha256": "0sh477bx437d3lz6v0m418bk1iwr3mjj8xf396qdi7kiiaic0drz"
+   "commit": "f52a99ebf6ee52a30d435ef1583dc8df3e5f2ca5",
+   "sha256": "1dlrcdyj0l4hbk0xhb3yj88naq4m76n5hfd180qqwjpc83g9fqs3"
   }
  },
  {
@@ -122352,11 +122635,11 @@
   "repo": "tanrax/thankful-eyes-theme.el",
   "unstable": {
    "version": [
-    20250302,
-    1920
+    20250319,
+    921
    ],
-   "commit": "5d2e4fdf7b9b7206cfcfbf06f2de3211f9b9e630",
-   "sha256": "1x9mkk90p4pairhwxlgzz2l3ia1rcaqyhfqvn7npc7ln07nm0cwi"
+   "commit": "71d5528aa7550be16e92eb5f8d2278775dd1fb1f",
+   "sha256": "0q7wvamgckd2c28wi4q3xfbcarfax1lm68s5jxlpy7saw18aanfh"
   }
  },
  {
@@ -122591,21 +122874,21 @@
   "repo": "facebook/fbthrift",
   "unstable": {
    "version": [
-    20250310,
-    1351
+    20250330,
+    1638
    ],
-   "commit": "772356bade276e39d537812d57f28a2880f5a72a",
-   "sha256": "1lhs2ss03fbj89ga522l8pin8c3b6jkj4l9aw8xns6llz569ylys"
+   "commit": "eeb175ae401943d897d20d66fbc2f17d3aff23ae",
+   "sha256": "0y9x0633gy6bq3lxyp0kl5phyzwvyyvmfzqzqc49avl8aib1qazn"
   },
   "stable": {
    "version": [
     2025,
     3,
-    10,
+    31,
     0
    ],
-   "commit": "772356bade276e39d537812d57f28a2880f5a72a",
-   "sha256": "1lhs2ss03fbj89ga522l8pin8c3b6jkj4l9aw8xns6llz569ylys"
+   "commit": "eeb175ae401943d897d20d66fbc2f17d3aff23ae",
+   "sha256": "0y9x0633gy6bq3lxyp0kl5phyzwvyyvmfzqzqc49avl8aib1qazn"
   }
  },
  {
@@ -122995,11 +123278,11 @@
   "repo": "aimebertrand/timu-caribbean-theme",
   "unstable": {
    "version": [
-    20250107,
-    1439
+    20250320,
+    125
    ],
-   "commit": "ef46da7bf6c3f597a49be9e38aa0acecc07fa587",
-   "sha256": "16ns9f7600nw4aj6cyi2a43kflyrsrxdp5v1f24w5wa527iqp4dv"
+   "commit": "5b0b96b5aa2407c9a071fe7eb96c09e9327d702f",
+   "sha256": "0fi7ddnd9rswhsc89w0hc501105gi2w7wz3fa2vml1swqpmym4zg"
   },
   "stable": {
    "version": [
@@ -123018,11 +123301,11 @@
   "repo": "aimebertrand/timu-line",
   "unstable": {
    "version": [
-    20250226,
-    2325
+    20250228,
+    2053
    ],
-   "commit": "b2ad1e2353b2b425537ddf5eb5ebedde5cd826b2",
-   "sha256": "07kh8raxz6kbak091g2m4hrhnmr49jvxk6qskji19spvfmpzrhy9"
+   "commit": "b57cc4716ca9ced3ebd8df3e689f6b1a21816f7d",
+   "sha256": "17hvf57f1iy085crpqzzvcx00r9g1h4asblvb43vxl292bngbiql"
   },
   "stable": {
    "version": [
@@ -123041,11 +123324,11 @@
   "repo": "aimebertrand/timu-macos-theme",
   "unstable": {
    "version": [
-    20250306,
-    1122
+    20250320,
+    125
    ],
-   "commit": "f5810cd705ae7e8c82894847fbbce9eb9556b53f",
-   "sha256": "0m1j8a6pb77l9v03myw6a6lv8vxl2539nmccgz4shjpn63lmw885"
+   "commit": "437a52fa460dbcbc51c82006c9d9db88a8916a71",
+   "sha256": "1b385w8wwrikz4mpp3lv6vpwsb9z9hy55pk0957gl4b2b2whpdnh"
   },
   "stable": {
    "version": [
@@ -123064,11 +123347,11 @@
   "repo": "aimebertrand/timu-rouge-theme",
   "unstable": {
    "version": [
-    20250107,
-    1435
+    20250320,
+    124
    ],
-   "commit": "143dbef14cff70bd111ca4a6d15ad863146eb9b8",
-   "sha256": "1iypnzgd2f7p6pgs0g321a0s8g69myx262i25jk13vn1x93qci5z"
+   "commit": "20aa8cee01e52fcd22549585cf4a918437893243",
+   "sha256": "0qgvhk04nbmx55i1pjpgr1ypdgmrbcy441bd010macpnrq4pkwqi"
   },
   "stable": {
    "version": [
@@ -123087,11 +123370,11 @@
   "repo": "aimebertrand/timu-spacegrey-theme",
   "unstable": {
    "version": [
-    20250107,
-    1423
+    20250320,
+    124
    ],
-   "commit": "cc5133287bb4949f8b286e98a7f7f034e06cda07",
-   "sha256": "1ddsn8a3gx28pnj1fs489nq7m5ci6khk73cg5mpkhk3pjvrxab96"
+   "commit": "41b599c60a82ca31b1fbb67ad23203c1dfbefb65",
+   "sha256": "1h6026y1ir94m4kslpxhyqf13lr8ipqj62dff0wg0cg27p3s28y6"
   },
   "stable": {
    "version": [
@@ -123592,20 +123875,20 @@
   "repo": "jamescherti/tomorrow-night-deepblue-theme.el",
   "unstable": {
    "version": [
-    20250307,
-    2022
+    20250331,
+    1758
    ],
-   "commit": "5263c0a561913b09d21d9c6e9a32703e7f7d48d5",
-   "sha256": "17l3gvhv3qp1v0blr7daxaw6wfprd6bx0r75nshhrmaxl11y8vlg"
+   "commit": "c7fb285218c685972f48a43a82247eddd3da8102",
+   "sha256": "0g9r17rj571sh7jmdjl8g66y3lhc3ssjfrhaf81piscnxbq0myfa"
   },
   "stable": {
    "version": [
     1,
     2,
-    0
+    1
    ],
-   "commit": "cebf87c7c19eff0cb7a81225dc052e21861b12ae",
-   "sha256": "0gmy84p30g16nhx4scwyyjg2jsisrpki577m9hyiyg7wjwq2x85b"
+   "commit": "6be1f422f2388a8b39945a1823030d080ed10290",
+   "sha256": "1qzaygdxhnaqbv7impmh4vli8k7nzk2r0giv4yacd0waq3flqmj6"
   }
  },
  {
@@ -124137,28 +124420,28 @@
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20250306,
-    1916
+    20250401,
+    1655
    ],
    "deps": [
     "compat",
     "seq"
    ],
-   "commit": "4030862396130b3dcfedabe509a4fc6cb218c49f",
-   "sha256": "0qyc1gp6i8hznz7smab7xlxi76sphl6sy49zlciq7rhl4k87hka8"
+   "commit": "afc88b24e4faa5c7e246303648e70b4507652f32",
+   "sha256": "1p3l2j1jrs39j1arzhczwi1ndcqmj5wvbq0y88brk3srzkwj69dr"
   },
   "stable": {
    "version": [
     0,
     8,
-    5
+    7
    ],
    "deps": [
     "compat",
     "seq"
    ],
-   "commit": "b51a52a9c7a6562c19d03de4ce30b9c071bca8d2",
-   "sha256": "0f1gdxdj7mrmjmqswlj2lwagr6dpfhkm7732gh0jcgc4iy40vac9"
+   "commit": "afc88b24e4faa5c7e246303648e70b4507652f32",
+   "sha256": "1p3l2j1jrs39j1arzhczwi1ndcqmj5wvbq0y88brk3srzkwj69dr"
   }
  },
  {
@@ -124626,13 +124909,13 @@
    "version": [
     0,
     12,
-    264
+    267
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "ca28bd803de0af069a8a931bc4b3295af02633cc",
-   "sha256": "03hbb94miz2rd11inp3cmwxzchvwxpkbjgd5p8zs4sl3lzq37w7m"
+   "commit": "ddc021402295b9c5591a173e3447f8c25a2bd0a0",
+   "sha256": "1jq55zzh8jmmp5sa3fl603r823pp5vck3a65mgbbf96j9y5jrny3"
   }
  },
  {
@@ -124709,8 +124992,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20250105,
-    1321
+    20250322,
+    1303
    ],
    "deps": [
     "ace-window",
@@ -124722,13 +125005,13 @@
     "pfuture",
     "s"
    ],
-   "commit": "32bb3dd02ddfca85661614b3b227e770fab821e2",
-   "sha256": "0ys4mn9rgx4mc7s701hz2a4z7ymghbd1248yj26ygal89jpar9sq"
+   "commit": "96a808f06760ec8c595d27eb5c991ea905c948f6",
+   "sha256": "0wqrv7nvz6jjq9kw104wz6jj1pawdkz7fxpgi6785grn08r3m4m9"
   },
   "stable": {
    "version": [
     3,
-    1
+    2
    ],
    "deps": [
     "ace-window",
@@ -124740,8 +125023,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
-   "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   }
  },
  {
@@ -124752,27 +125035,27 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20240131,
-    2042
+    20250320,
+    2145
    ],
    "deps": [
     "all-the-icons",
     "treemacs"
    ],
-   "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4",
-   "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   },
   "stable": {
    "version": [
     3,
-    1
+    2
    ],
    "deps": [
     "all-the-icons",
     "treemacs"
    ],
-   "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
-   "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   }
  },
  {
@@ -124783,27 +125066,27 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20241222,
-    1336
+    20250320,
+    2145
    ],
    "deps": [
     "evil",
     "treemacs"
    ],
-   "commit": "011f310eeb51db0ccad7b00b7cbd0f1ccddbb588",
-   "sha256": "1d988i32j4y3c1w4b5sh4962z2j78nyi4x0r6l4rp171g6649k1v"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   },
   "stable": {
    "version": [
     3,
-    1
+    2
    ],
    "deps": [
     "evil",
     "treemacs"
    ],
-   "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
-   "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   }
  },
  {
@@ -124814,25 +125097,25 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20241017,
-    2046
+    20250320,
+    2145
    ],
    "deps": [
     "treemacs"
    ],
-   "commit": "63e80d4b96c2a411da0beaee8a1e46f116e05e27",
-   "sha256": "1bibbphybx0qbc0w8lhr8zpc9fl9pfcn3721vmjmr3qkh0w695rk"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   },
   "stable": {
    "version": [
     3,
-    1
+    2
    ],
    "deps": [
     "treemacs"
    ],
-   "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
-   "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   }
  },
  {
@@ -124843,29 +125126,29 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20240131,
-    2042
+    20250320,
+    2145
    ],
    "deps": [
     "magit",
     "pfuture",
     "treemacs"
    ],
-   "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4",
-   "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   },
   "stable": {
    "version": [
     3,
-    1
+    2
    ],
    "deps": [
     "magit",
     "pfuture",
     "treemacs"
    ],
-   "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
-   "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   }
  },
  {
@@ -124908,29 +125191,29 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20240131,
-    2042
+    20250320,
+    2145
    ],
    "deps": [
     "dash",
     "persp-mode",
     "treemacs"
    ],
-   "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4",
-   "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   },
   "stable": {
    "version": [
     3,
-    1
+    2
    ],
    "deps": [
     "dash",
     "persp-mode",
     "treemacs"
    ],
-   "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
-   "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   }
  },
  {
@@ -124941,29 +125224,29 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20240131,
-    2042
+    20250320,
+    2145
    ],
    "deps": [
     "dash",
     "perspective",
     "treemacs"
    ],
-   "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4",
-   "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   },
   "stable": {
    "version": [
     3,
-    1
+    2
    ],
    "deps": [
     "dash",
     "perspective",
     "treemacs"
    ],
-   "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
-   "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   }
  },
  {
@@ -124974,27 +125257,27 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20240131,
-    2042
+    20250320,
+    2206
    ],
    "deps": [
     "projectile",
     "treemacs"
    ],
-   "commit": "bcba09c1581c4bd93ff0217d464aead04f6d26d4",
-   "sha256": "051x78qpzclzr8mic5z3rpr1j3f5a5apcnn9rhah1rnxg5z9gqa7"
+   "commit": "f80a309319c2374585babcb3e00ea6f3314160f3",
+   "sha256": "0b7k6nq6nqbw5qbia4srg1ci6c078f3ziwz1jpn2gmiy1w1parcc"
   },
   "stable": {
    "version": [
     3,
-    1
+    2
    ],
    "deps": [
     "projectile",
     "treemacs"
    ],
-   "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
-   "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   }
  },
  {
@@ -125005,27 +125288,27 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20241202,
-    2117
+    20250320,
+    2145
    ],
    "deps": [
     "dash",
     "treemacs"
    ],
-   "commit": "4364a660447fa5f322c172f6b310115bbc091d12",
-   "sha256": "0kaj5yhi9380xhdgkybn6qwlm92d8j53rd00qf516nvwjg1fsnys"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   },
   "stable": {
    "version": [
     3,
-    1
+    2
    ],
    "deps": [
     "dash",
     "treemacs"
    ],
-   "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
-   "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
+   "commit": "55079b017fb821a34ace398cd3d8c5b556a22f6d",
+   "sha256": "0z8pc7y8p32vhlv5ibr11mrd8r8fk09dfgsj7a63d48r992p7gih"
   }
  },
  {
@@ -125623,26 +125906,26 @@
   "repo": "szermatt/turtles",
   "unstable": {
    "version": [
-    20250113,
-    1249
+    20250315,
+    1650
    ],
    "deps": [
     "compat"
    ],
-   "commit": "3b7a9fdfd5b12decaef86e4988314e5a027959bb",
-   "sha256": "0rrkbmdjlr26yphfagsbdkl9ndprkm9ag2y9cgmzml6g2m7jpai9"
+   "commit": "7dca66a67173c63b27d5c6d8aa3e0248fd7f8b83",
+   "sha256": "1p87ll90v30z62a3wqs0s3zyabz4a38p56zkgqx3pxgfk82drzsf"
   },
   "stable": {
    "version": [
     2,
     0,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "08bd2c218f1ab75711c62bfa549beb2094009270",
-   "sha256": "0gwnsrfiiizcrcccbs3pyx030wydg6xmh7vy9r7lvbh8hmxghbyg"
+   "commit": "c46eb01d73601449f8ae48786bb8f22d17f137da",
+   "sha256": "1cipfgzx8ws79lzx7dfqr9lbirxf5fl332y8m5wz46455421avgi"
   }
  },
  {
@@ -125758,15 +126041,15 @@
   "repo": "tmalsburg/txl.el",
   "unstable": {
    "version": [
-    20240916,
-    618
+    20250318,
+    726
    ],
    "deps": [
     "guess-language",
     "request"
    ],
-   "commit": "b60b2127cd342d54cb4f54984e84f6e39da68678",
-   "sha256": "101kj77jvdkjlnn64h6k8x3flwi0qxmr3ydagarn8as9dvxxsf6l"
+   "commit": "95064614df192c563b37e6135f5986c786a6826e",
+   "sha256": "0rxq13nviz7681ajmlklys87iwv6i940r5jk8z06dxxp8a7a65ri"
   }
  },
  {
@@ -126767,14 +127050,14 @@
   "repo": "tbanel/uniline",
   "unstable": {
    "version": [
-    20250309,
-    1626
+    20250331,
+    1141
    ],
    "deps": [
     "hydra"
    ],
-   "commit": "6ee84401a55f446f53cb2785760914dbd85aa36a",
-   "sha256": "1rb06224xn5zwfw4wm8ih847qg8122g5x53h20ac61pwlpi1hzwr"
+   "commit": "d7b1e74010c732c721d96d4d1adf964d31aded2f",
+   "sha256": "0qb0xbpgbjqk4mmail99r9lxbvmqcbgi5s35bzg8baxqh0dlrqzf"
   }
  },
  {
@@ -127330,8 +127613,8 @@
   "repo": "waymondo/use-package-chords",
   "unstable": {
    "version": [
-    20241115,
-    2228
+    20250330,
+    1852
    ],
    "deps": [
     "bind-chord",
@@ -127339,8 +127622,8 @@
     "key-chord",
     "use-package"
    ],
-   "commit": "a2b16a1e64b19ae9428a6cd8f3e09b8159707a29",
-   "sha256": "0krskz087vy4iws01w5wxsn7b0pkncsn6s1vj9ywagn5i1z6a34x"
+   "commit": "0793b50e2bf1ec8bfc532b10baeef716c5aa947a",
+   "sha256": "0dkiic5yrdmjkyrahm10ggx0scp4ixqbb184i55f6fpf8yvy6nd8"
   },
   "stable": {
    "version": [
@@ -128248,15 +128531,15 @@
   "repo": "applied-science/emacs-vega-view",
   "unstable": {
    "version": [
-    20210401,
-    1115
+    20250327,
+    1716
    ],
    "deps": [
     "cider",
     "parseedn"
    ],
-   "commit": "3793025a523a86acc6255b4183b12ebfc95e1116",
-   "sha256": "0w8v0ivwq3i42mxfxk5zvlx1lz4di06dpd93j2j13ns5h46vxhc0"
+   "commit": "36e7cc84b25e67b50c5ca677d5ca0f7b7c27469f",
+   "sha256": "18xl1m25v5yp2g5fbsb5vbm5708mdv633a5ad1nj5pak228p6lhk"
   }
  },
  {
@@ -128297,20 +128580,20 @@
   "repo": "federicotdn/verb",
   "unstable": {
    "version": [
-    20250309,
-    2043
+    20250318,
+    2150
    ],
-   "commit": "151ed6bbfff71939a1481b60b9cfd2d720d56785",
-   "sha256": "1wh0a7ilgdm76xjpjcj7salxbkgcacyks5rkjdx41kl1r0rbsc63"
+   "commit": "2e778afd08b8a9872b8273528052f52d53c2bd45",
+   "sha256": "12y2shqhbl21xj18hldg17n03pq3qcycwmswxdwr0pnac8613pq6"
   },
   "stable": {
    "version": [
     3,
-    0,
+    1,
     0
    ],
-   "commit": "2c46542a64e79919496f5a8255b7321f6ba00fd1",
-   "sha256": "0kkdlckbmj8sq1r8if53c6hdqgy92vxvcx5c2dm8byndmjnqqc2n"
+   "commit": "2e778afd08b8a9872b8273528052f52d53c2bd45",
+   "sha256": "12y2shqhbl21xj18hldg17n03pq3qcycwmswxdwr0pnac8613pq6"
   }
  },
  {
@@ -128358,8 +128641,8 @@
   "repo": "gmlarumbe/verilog-ext",
   "unstable": {
    "version": [
-    20250225,
-    2258
+    20250318,
+    1344
    ],
    "deps": [
     "ag",
@@ -128374,8 +128657,8 @@
     "verilog-ts-mode",
     "yasnippet"
    ],
-   "commit": "f742d531412733b0217147eb862fecfa09fa3753",
-   "sha256": "04iwmybmgasz12gc2ghqm36q36537srgkz4c6w3s836sg3ahzljm"
+   "commit": "028bac2b106079c147dddfc361e60b644b449426",
+   "sha256": "0sfv0ilakg2rgycfw6ab9mp2afcfw7cfirdwlp8pxmjj653sv45v"
   },
   "stable": {
    "version": [
@@ -128408,14 +128691,14 @@
   "repo": "gmlarumbe/verilog-ts-mode",
   "unstable": {
    "version": [
-    20250303,
-    1538
+    20250320,
+    1821
    ],
    "deps": [
     "verilog-mode"
    ],
-   "commit": "dc26feeff79afb4206723f5b7e0d69f0baec298c",
-   "sha256": "009kzdkvvpv4r329d03bciz890d2sbcil5b6i2z5s7f4gf861fjn"
+   "commit": "7f5682603de99ff8922f108ab42066a48ba85b6a",
+   "sha256": "1plczm4pdivqjxj905z5k8k974p1hxwx6018j1ba3jnqlw3ig4q7"
   },
   "stable": {
    "version": [
@@ -128498,14 +128781,14 @@
   "repo": "baron42bba/vertica-snippets",
   "unstable": {
    "version": [
-    20240917,
-    1129
+    20250314,
+    927
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "1b6f234c81aaf1b0f0e445d1ad91a7580a4c8630",
-   "sha256": "1rw0j11x8mq8lm9pvp35qhdl217w40i1d16d8bcm69lwrfkx39kf"
+   "commit": "5a77be72074c196cc419852d58c14703ff5ba55a",
+   "sha256": "06gla1xi27hwhlj7gw1ryzzjf1mmr4mz304djlrgsp1hgs9q2q7c"
   }
  },
  {
@@ -128516,14 +128799,14 @@
   "repo": "minad/vertico",
   "unstable": {
    "version": [
-    20250311,
-    1655
+    20250318,
+    1630
    ],
    "deps": [
     "compat"
    ],
-   "commit": "026a81a9c893b1d73cdbcb12436a0fad3ebdeb5f",
-   "sha256": "0qgw0mhfrjylhyznjmjf7wqs5p3xvdv0lq19pql54plbnr6fspqk"
+   "commit": "c3b788b6bea10e3493ebc05a96bbde294824cff6",
+   "sha256": "0z35pl6rn5a7f8aq7vp4vv7862miah8c0yza6843rgyri4qff6ra"
   },
   "stable": {
    "version": [
@@ -128623,8 +128906,8 @@
   "repo": "gmlarumbe/vhdl-ext",
   "unstable": {
    "version": [
-    20241205,
-    1630
+    20250318,
+    1348
    ],
    "deps": [
     "ag",
@@ -128636,8 +128919,8 @@
     "ripgrep",
     "vhdl-ts-mode"
    ],
-   "commit": "3f5f0778e87d9d4272903797a2366e603f9f1641",
-   "sha256": "0vgmhsgrh8x8br5grnh1jnf01r2q148xxyf028jgaq09wwjkdvkc"
+   "commit": "277cfaa9a1a4fa051ae94b331c59a02336adbafe",
+   "sha256": "13rj7ahh6pplpclgdjq1l59lf073s26wwwxp49fk9dwzphb9yq84"
   },
   "stable": {
    "version": [
@@ -128700,11 +128983,11 @@
   "repo": "gmlarumbe/vhdl-ts-mode",
   "unstable": {
    "version": [
-    20250110,
-    117
+    20250318,
+    1346
    ],
-   "commit": "0c0b8f769de13f9e63d84032e50bd4a8578335ed",
-   "sha256": "0n2x8ghh5n28v5nzlks5yf9wh38cyd9l7kvwad9qmwxga0mm36sr"
+   "commit": "3fb4af3653323979eb66b4c01f850fa03335046a",
+   "sha256": "19v3l37qzhkl22ignn5a8j0fw4az1gc185j4cs9rfh6byq8glpi3"
   },
   "stable": {
    "version": [
@@ -129035,20 +129318,19 @@
   "repo": "joostkremers/visual-fill-column",
   "unstable": {
    "version": [
-    20250204,
-    2336
+    20250323,
+    1529
    ],
-   "commit": "d4464130a21733671a53f915a697dea65888473f",
-   "sha256": "1a7xqc4cnpwy8rd4grp539zmb7qaqjvx906qbzdixcb3dq7szj3b"
+   "commit": "30fc3e4ea9aa415eccc873e5d7c4f1bbc0491495",
+   "sha256": "0sy01jx8z229ival3y4bj0jrb3w2ys8kiw3bmy6ssjwbl7xlyxxj"
   },
   "stable": {
    "version": [
     2,
-    6,
-    3
+    7
    ],
-   "commit": "e04d3521b6dc2435de4c4a4b9cac5feb194f0d5b",
-   "sha256": "1bsymwzpvp4rqljidrixp3kc7kxjwsy5mkap6jw9rvpm6apy3b0n"
+   "commit": "30fc3e4ea9aa415eccc873e5d7c4f1bbc0491495",
+   "sha256": "0sy01jx8z229ival3y4bj0jrb3w2ys8kiw3bmy6ssjwbl7xlyxxj"
   }
  },
  {
@@ -129119,11 +129401,11 @@
   "repo": "szermatt/visual-replace",
   "unstable": {
    "version": [
-    20250102,
-    2043
+    20250324,
+    1842
    ],
-   "commit": "a2ae4d0116192d34d5142857cb7c27c8091c4da5",
-   "sha256": "054z8p1kw698ifigcx5pyb8wnz988h0k2hny89515n84p3d0z0m0"
+   "commit": "2897c4b323cf38b58a23a78ecb5b081192dea3b7",
+   "sha256": "0xvdn4y5w5d49cmjkmd2s1jjc8kjm683i96x310k45hp7hvq11px"
   },
   "stable": {
    "version": [
@@ -129225,11 +129507,11 @@
   "repo": "k-talo/volatile-highlights.el",
   "unstable": {
    "version": [
-    20240913,
-    2206
+    20250402,
+    1217
    ],
-   "commit": "afccb5ce83848c3daa937098da83af45b50b71b4",
-   "sha256": "0rlqwj6whxbvzgkf78d8arjva49aphj4bd2wkpv8djykcmi8nf6m"
+   "commit": "ca4c7fed9d85d5f5119e9a0f895629804dcb2e99",
+   "sha256": "1bj0klr1zcbnfrmqld9dync5dh9v6yaaw72xpcyq6cm7sanhfcp3"
   },
   "stable": {
    "version": [
@@ -129929,16 +130211,16 @@
   "repo": "emacsmirror/wanderlust",
   "unstable": {
    "version": [
-    20241125,
-    2206
+    20250330,
+    1813
    ],
    "deps": [
     "apel",
     "flim",
     "semi"
    ],
-   "commit": "dddd7d64f27747cfa546d6656beee6ec4e5c55cf",
-   "sha256": "0qd6d6yd2sr3mv8wb22py7yvnib6nk9jpqfj0fkib0x0w9anfxz8"
+   "commit": "840bb4b137a2e35cb30f4b78437b11b852ef6389",
+   "sha256": "1g8kx22i2j9pl4xz5frf5gf6ccklwpna63jfnsxqkmvq4m2qpa88"
   }
  },
  {
@@ -130009,11 +130291,11 @@
   "repo": "gmlarumbe/wavedrom-mode",
   "unstable": {
    "version": [
-    20240329,
-    1800
+    20250318,
+    1349
    ],
-   "commit": "758a29e975e76ad616bbe18b657a5ce78fd32d32",
-   "sha256": "091aagn1mi1in4kn94b2cvcw0hfm7zfypgsc7gg5bq8hklg000vq"
+   "commit": "249aec11fdab12ae6228c2bc2580b581d16e3443",
+   "sha256": "1anw072va8w3648zdb62437mjg76b098jq6jhy0bc3qpbxb74cai"
   },
   "stable": {
    "version": [
@@ -132338,17 +132620,17 @@
  },
  {
   "ename": "ws-butler",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "1k5nhj37r51i0czrlafra53wir73p0nbq83jjccqmw4p4xk6axl3",
-  "fetcher": "github",
-  "repo": "lewang/ws-butler",
+  "commit": "3b41910f55e0c8e10668c788614cd61c480e860b",
+  "sha256": "1amzz3xjxf3gp7qfxf33pclk82iwnlcm462iy4fz3ikvck08cbbz",
+  "fetcher": "git",
+  "url": "https://git.savannah.gnu.org/git/emacs/nongnu.git",
   "unstable": {
    "version": [
-    20241107,
-    519
+    20250310,
+    205
    ],
-   "commit": "d3927f6131f215e9cd3e1f747be5a91e5be8ca9a",
-   "sha256": "17f73isx2wdwzjcxparyy7ngl4cha0g69da1d72b3yidzim1kh6h"
+   "commit": "9ee5a7657a22e836618813c2e2b64a548d27d2ff",
+   "sha256": "0ivpgib2bxv7x6cp04mj8crc1a60d7c77jcc59sj14scq4jqbmjb"
   },
   "stable": {
    "version": [
@@ -132512,14 +132794,14 @@
   "repo": "jobbflykt/x509-mode",
   "unstable": {
    "version": [
-    20250225,
-    632
+    20250317,
+    1016
    ],
    "deps": [
     "compat"
    ],
-   "commit": "fe2ebffaf4f1d876108df5c386ae55e0154eed02",
-   "sha256": "0fgfvr64gbdfgqjvng5bqg2jpg5s5d99di77fn3vfkay2zadpmji"
+   "commit": "a59a548f087bfad4f81d9410b6facdcf0fdd98f9",
+   "sha256": "15mypcysz2f4f027j7k9yh6inrj24dllpiqxjc89srw8j6k770qb"
   }
  },
  {
@@ -132642,8 +132924,8 @@
   "repo": "dandavison/xenops",
   "unstable": {
    "version": [
-    20250103,
-    1420
+    20250318,
+    1613
    ],
    "deps": [
     "aio",
@@ -132653,8 +132935,8 @@
     "f",
     "s"
    ],
-   "commit": "6d9a8d654a6102484ac9087f25931f0664e7dd07",
-   "sha256": "1sasm6rrhvsqndcwm74cgmlk96g2wx81fk9z32rq095yvim4y5qq"
+   "commit": "de8bce9af99476b58742679a77ac09bdb7ea0c76",
+   "sha256": "0jmhfrj0gk9zlgn6d9wkaml3mrk9jzc8awc7q2mi3cwzbw1x94af"
   },
   "stable": {
    "version": [
@@ -133381,11 +133663,11 @@
   "repo": "zkry/yaml.el",
   "unstable": {
    "version": [
-    20250208,
-    1534
+    20250316,
+    1721
    ],
-   "commit": "09e46d563f1f3ff948852e08360c7d3c76e2acba",
-   "sha256": "131g2nv18fjcqgc9v17b0a7zyw2m6ydbhj6riahihd340bci2s6w"
+   "commit": "f99ef76c80e6fc3fcf650c4fe34e10726594a4c4",
+   "sha256": "1fpfyrbi8dzbcck0k1whszqr9qmyw4x6rk68sxzz7zr5sqw69172"
   },
   "stable": {
    "version": [

From c9ffa49527c9aa3aa80de8b50bf96ea195d8688a Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 3 Apr 2025 19:08:12 +0800
Subject: [PATCH 068/225] nongnu-packages: updated 2025-04-03 (from overlay)

---
 .../emacs/elisp-packages/nongnu-generated.nix | 115 ++++++++++++------
 1 file changed, 80 insertions(+), 35 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index 78ad55af8236..a22f7dd49068 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -42,6 +42,32 @@
       };
     }
   ) { };
+  aidermacs = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "aidermacs";
+      ename = "aidermacs";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/aidermacs-1.1.tar";
+        sha256 = "1g1p5prz9b2giy01hja04zqf90s53yckjxfwkrznpqvpar25l1nz";
+      };
+      packageRequires = [
+        compat
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/aidermacs.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   alect-themes = callPackage (
     {
       elpaBuild,
@@ -93,10 +119,10 @@
     elpaBuild {
       pname = "annotate";
       ename = "annotate";
-      version = "2.3.0";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/annotate-2.3.0.tar";
-        sha256 = "0l5pw9z4i1mlf346dg7brha37jmlrq6pyvjdj2mxhdfs6nzddaba";
+        url = "https://elpa.nongnu.org/nongnu/annotate-2.3.1.tar";
+        sha256 = "1s5v3zxr7fvwm0xz176vl3y50rl7mvn748jgn19b8x7zn4zsnf42";
       };
       packageRequires = [ ];
       meta = {
@@ -1138,10 +1164,10 @@
     elpaBuild {
       pname = "eglot-inactive-regions";
       ename = "eglot-inactive-regions";
-      version = "0.6.3";
+      version = "0.6.5";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/eglot-inactive-regions-0.6.3.tar";
-        sha256 = "03958dgr48zqak06qjqdz6qgfxn5rs60425qcvb7wdv2jb4400hc";
+        url = "https://elpa.nongnu.org/nongnu/eglot-inactive-regions-0.6.5.tar";
+        sha256 = "133wbmmzxfhzkjlm3sjllg3wl5r2dyprs2rmwi8r7nq3p831ak0n";
       };
       packageRequires = [ ];
       meta = {
@@ -1222,10 +1248,10 @@
     elpaBuild {
       pname = "emacsql";
       ename = "emacsql";
-      version = "4.2.0";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/emacsql-4.2.0.tar";
-        sha256 = "03nxfdbha7apar6qhjg57pa4cawjjwswlkci2wm9044wps87734c";
+        url = "https://elpa.nongnu.org/nongnu/emacsql-4.3.0.tar";
+        sha256 = "18nr7fvrdhny59lmr7x3z48y7kjsmrrdwi659dsqjnnlxz0xcl11";
       };
       packageRequires = [ ];
       meta = {
@@ -2365,10 +2391,10 @@
     elpaBuild {
       pname = "gptel";
       ename = "gptel";
-      version = "0.9.7";
+      version = "0.9.8";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/gptel-0.9.7.tar";
-        sha256 = "0sh8q80q620d6yr4437ddrjrzygd15iwkc9jvwh3pw9sncv2laqn";
+        url = "https://elpa.nongnu.org/nongnu/gptel-0.9.8.tar";
+        sha256 = "1rym3y1fcwfw9dh51nhw7v8rbap8ixysjlrv39v4hksfwv17gvbr";
       };
       packageRequires = [
         compat
@@ -3060,10 +3086,10 @@
     elpaBuild {
       pname = "llama";
       ename = "llama";
-      version = "0.6.1";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/llama-0.6.1.tar";
-        sha256 = "0ri0pql710v6yrsnl5hv7xqax6ap1whk4xip9xx732a59fws60cg";
+        url = "https://elpa.nongnu.org/nongnu/llama-0.6.2.tar";
+        sha256 = "1adafy7klbx2h0pjrbl989czh7yf2m8gmk5s87c26ih01sjiwwwz";
       };
       packageRequires = [ compat ];
       meta = {
@@ -3239,10 +3265,10 @@
     elpaBuild {
       pname = "magit";
       ename = "magit";
-      version = "4.3.1";
+      version = "4.3.2";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/magit-4.3.1.tar";
-        sha256 = "1wac8k466pmq79qvh70k7hfr1c5pyh2ignjsh4df46n08y2c67ys";
+        url = "https://elpa.nongnu.org/nongnu/magit-4.3.2.tar";
+        sha256 = "1pi69z1h5h6qlwmvwl2i2n5gcv9anp9zpgv9knqwrq8j2d5ialgr";
       };
       packageRequires = [
         compat
@@ -3270,10 +3296,10 @@
     elpaBuild {
       pname = "magit-section";
       ename = "magit-section";
-      version = "4.3.1";
+      version = "4.3.2";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/magit-section-4.3.1.tar";
-        sha256 = "0rkr6lw1m4mc695k4pqpsfc5fnbp94pgl7j6y6c5f96d4dzvcx24";
+        url = "https://elpa.nongnu.org/nongnu/magit-section-4.3.2.tar";
+        sha256 = "0dnmwciz26wrsmp48h9axmj6qjgzhz9i7g3bvlpsq3i8y32xwdf6";
       };
       packageRequires = [
         compat
@@ -3313,20 +3339,18 @@
       fetchurl,
       lib,
       persist,
-      request,
       tp,
     }:
     elpaBuild {
       pname = "mastodon";
       ename = "mastodon";
-      version = "1.1.12";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/mastodon-1.1.12.tar";
-        sha256 = "1yad0f5qbz3q0h3g4ckmzjha6y1ql954h0p19ibi8rl1kqb6f574";
+        url = "https://elpa.nongnu.org/nongnu/mastodon-2.0.0.tar";
+        sha256 = "0zn1hr36bm1hqsa78q78c5qqwlwg4l23sqsds4gi8nmkcq7yrjlz";
       };
       packageRequires = [
         persist
-        request
         tp
       ];
       meta = {
@@ -3848,10 +3872,10 @@
     elpaBuild {
       pname = "orgit";
       ename = "orgit";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/orgit-2.0.1.tar";
-        sha256 = "0fisk3gkqlkndkv185xffxn75msd26wsv77m0m0a25fr6xlvn2hn";
+        url = "https://elpa.nongnu.org/nongnu/orgit-2.0.2.tar";
+        sha256 = "1sad3vhmlld60c9lx8hv102d61ihq2ydzb8app97hbk4cs8m3q8j";
       };
       packageRequires = [
         compat
@@ -4222,10 +4246,10 @@
     elpaBuild {
       pname = "racket-mode";
       ename = "racket-mode";
-      version = "1.0.20250212.102351";
+      version = "1.0.20250324.74422";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250212.102351.tar";
-        sha256 = "14c7y8n562x7dy03078db4xxvyvvxb5kkw9vgg1296xrcpj7mls2";
+        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250324.74422.tar";
+        sha256 = "0iwcm689jhqv4wzj7awfljmczmn2hzsjaj2yc2zkf9yzlzzbrkxf";
       };
       packageRequires = [ ];
       meta = {
@@ -4381,6 +4405,27 @@
       };
     }
   ) { };
+  rpm-spec-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rpm-spec-mode";
+      ename = "rpm-spec-mode";
+      version = "0.16";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/rpm-spec-mode-0.16.tar";
+        sha256 = "0gc50kn1wmvz6k9afra7zcnsk7z76cc50vkvw3q8i7p911z55rfj";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/rpm-spec-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   rubocop = callPackage (
     {
       elpaBuild,
@@ -5552,10 +5597,10 @@
     elpaBuild {
       pname = "xah-fly-keys";
       ename = "xah-fly-keys";
-      version = "26.10.20250308091402";
+      version = "26.11.20250325184849";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.10.20250308091402.tar";
-        sha256 = "1rni5rjz7m4lxjcxhn2h4cds4d67hbd6c8hf731n6ygygarhjp9p";
+        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.11.20250325184849.tar";
+        sha256 = "0j5a89pq304bzyg8qb6y8yysw5z6p4436fyy7lk61kbavc5srqvs";
       };
       packageRequires = [ ];
       meta = {

From 2c01631297754f1d0807f591d35ea35c8bdb599e Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 3 Apr 2025 19:08:12 +0800
Subject: [PATCH 069/225] nongnu-devel-packages: updated 2025-04-03 (from
 overlay)

---
 .../elisp-packages/nongnu-devel-generated.nix | 274 ++++++++++--------
 1 file changed, 160 insertions(+), 114 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
index 2c4833c44564..c73cb63a67eb 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
@@ -42,6 +42,32 @@
       };
     }
   ) { };
+  aidermacs = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "aidermacs";
+      ename = "aidermacs";
+      version = "1.1.0.20250401.165709";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/aidermacs-1.1.0.20250401.165709.tar";
+        sha256 = "1jk832psy61ss04dr7h0563np2v6j57qxbf78b5kpzfsc0x1m946";
+      };
+      packageRequires = [
+        compat
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/aidermacs.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   alect-themes = callPackage (
     {
       elpaBuild,
@@ -93,10 +119,10 @@
     elpaBuild {
       pname = "annotate";
       ename = "annotate";
-      version = "2.3.0.0.20250306.133745";
+      version = "2.3.1.0.20250320.130448";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/annotate-2.3.0.0.20250306.133745.tar";
-        sha256 = "14p1yaxzns3zmi0d799fn76pca3d0ayl5v73bdssr0fq6rq04q5a";
+        url = "https://elpa.nongnu.org/nongnu-devel/annotate-2.3.1.0.20250320.130448.tar";
+        sha256 = "16djnp8mknq8rdk4sa4szsmbbg879677dx736pqg621gdy0p2p8m";
       };
       packageRequires = [ ];
       meta = {
@@ -263,10 +289,10 @@
     elpaBuild {
       pname = "base32";
       ename = "base32";
-      version = "1.0.0.20250312.191912";
+      version = "1.0.0.20250312.200047";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/base32-1.0.0.20250312.191912.tar";
-        sha256 = "1aglwd9mm2c53nqm7j6hrh02mag9gg5x5yc25jmaajqy9qrbh54n";
+        url = "https://elpa.nongnu.org/nongnu-devel/base32-1.0.0.20250312.200047.tar";
+        sha256 = "0l6mshnk25iadh1wymdxzfx4g5pvlh4q1hr1x9xfg5xbimiwfkki";
       };
       packageRequires = [ ];
       meta = {
@@ -544,10 +570,10 @@
     elpaBuild {
       pname = "cider";
       ename = "cider";
-      version = "1.18.0snapshot0.20250305.132250";
+      version = "1.18.0snapshot0.20250401.193622";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/cider-1.18.0snapshot0.20250305.132250.tar";
-        sha256 = "09a7kin91dmhhbyzvlalijiyjnzal2mqjcqbmrzq6nm1lswdrzvx";
+        url = "https://elpa.nongnu.org/nongnu-devel/cider-1.18.0snapshot0.20250401.193622.tar";
+        sha256 = "08grbaz79nlylmjkza6qw6rh1kzqp0v7ydx6867wfi5xg15xvik2";
       };
       packageRequires = [
         clojure-mode
@@ -594,10 +620,10 @@
     elpaBuild {
       pname = "clojure-ts-mode";
       ename = "clojure-ts-mode";
-      version = "0.2.4snapshot0.20250310.123844";
+      version = "0.2.4snapshot0.20250326.192250";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.4snapshot0.20250310.123844.tar";
-        sha256 = "0nnw6bwcca9nxwhg3a1m25c8n2s4x6frkmi1j7x0dlxiy5hj8ddb";
+        url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.4snapshot0.20250326.192250.tar";
+        sha256 = "1s32fz618kiglhspdy51p8pa7rmyr0djg4f5kpii3xvcn7lhfa77";
       };
       packageRequires = [ ];
       meta = {
@@ -916,6 +942,7 @@
   ) { };
   dirvish = callPackage (
     {
+      compat,
       elpaBuild,
       fetchurl,
       lib,
@@ -923,12 +950,12 @@
     elpaBuild {
       pname = "dirvish";
       ename = "dirvish";
-      version = "2.2.7.0.20250312.165153";
+      version = "2.2.7.0.20250402.153806";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.2.7.0.20250312.165153.tar";
-        sha256 = "1k6y9simcqfszyq5s0vb41s6pjmr9pd3djbnjdk5vvqhqyphig21";
+        url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.2.7.0.20250402.153806.tar";
+        sha256 = "0zqyvcqmvxjrbnj8s47phmmx3fxdgj6613i27w8mjjd8p3l6ggn7";
       };
-      packageRequires = [ ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.nongnu.org/nongnu-devel/dirvish.html";
         license = lib.licenses.free;
@@ -965,10 +992,10 @@
     elpaBuild {
       pname = "dockerfile-mode";
       ename = "dockerfile-mode";
-      version = "1.9.0.20250225.102722";
+      version = "1.9.0.20250315.102635";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/dockerfile-mode-1.9.0.20250225.102722.tar";
-        sha256 = "1mmylgvlmx7cdppfsi28hnf2s3v6qnpk5ii2r2qjbyj7vnbnk97g";
+        url = "https://elpa.nongnu.org/nongnu-devel/dockerfile-mode-1.9.0.20250315.102635.tar";
+        sha256 = "057drkn59pq5m68900lxy2nzsf3qnqhc6vglx8zl4yc32vhqa2w4";
       };
       packageRequires = [ ];
       meta = {
@@ -986,10 +1013,10 @@
     elpaBuild {
       pname = "dracula-theme";
       ename = "dracula-theme";
-      version = "1.8.2.0.20241217.214522";
+      version = "1.8.2.0.20250325.124646";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20241217.214522.tar";
-        sha256 = "0dizqwzgygkim66lxkxpwcidhhi7ppwazi57nqkahyd3n03ka2f9";
+        url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20250325.124646.tar";
+        sha256 = "13jry36wqjqdljk0lq2zm6gcs2hr33aj30l69jkhk6y4yiicjm9j";
       };
       packageRequires = [ ];
       meta = {
@@ -1114,10 +1141,10 @@
     elpaBuild {
       pname = "eglot-inactive-regions";
       ename = "eglot-inactive-regions";
-      version = "0.6.3.0.20250313.74527";
+      version = "0.6.5.0.20250326.53650";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/eglot-inactive-regions-0.6.3.0.20250313.74527.tar";
-        sha256 = "1vrrngpbfi9gbkx9bn2fqznr8wg8m9msdj438nsysl8175ai0c1d";
+        url = "https://elpa.nongnu.org/nongnu-devel/eglot-inactive-regions-0.6.5.0.20250326.53650.tar";
+        sha256 = "0xj16f49mjm1i3zdd6cpd9sjir6dwvh3s3lqs6fpp0sknpj0i5in";
       };
       packageRequires = [ ];
       meta = {
@@ -1198,10 +1225,10 @@
     elpaBuild {
       pname = "emacsql";
       ename = "emacsql";
-      version = "4.2.0.0.20250301.163737";
+      version = "4.3.0.0.20250401.150013";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.2.0.0.20250301.163737.tar";
-        sha256 = "1rzxgfykrckxw6sbgw71dd99s8rnz0jjjpddsf8rsy7ialjzw4w4";
+        url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.3.0.0.20250401.150013.tar";
+        sha256 = "1bx0mg3i45m6qa3a7iar0kjmapqf5xqpxvfskqrvxgc5ac3kvxs1";
       };
       packageRequires = [ ];
       meta = {
@@ -1243,10 +1270,10 @@
     elpaBuild {
       pname = "evil";
       ename = "evil";
-      version = "1.15.0.0.20250302.65539";
+      version = "1.15.0.0.20250318.181600";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20250302.65539.tar";
-        sha256 = "0xvdcvqimz2vk6hibip8cgn6jxgibxial6awl46vxq4b8g6bbply";
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20250318.181600.tar";
+        sha256 = "0qbz4gpiychd57370kpj73zcqdjl1gap80zjs4896smyj1pbr9c4";
       };
       packageRequires = [
         cl-lib
@@ -1270,10 +1297,10 @@
     elpaBuild {
       pname = "evil-anzu";
       ename = "evil-anzu";
-      version = "0.2.0.20220911.193944";
+      version = "0.2.0.20250316.121704";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/evil-anzu-0.2.0.20220911.193944.tar";
-        sha256 = "0ap13nrpcjm9q7pia8jy544sc08gc44bgyqi7yvkh2yk8cw96g8m";
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-anzu-0.2.0.20250316.121704.tar";
+        sha256 = "0wr47dx4axy2xvnn1y354scvwka2mh8z9kgdclgnfvnhhdqzi2h0";
       };
       packageRequires = [
         anzu
@@ -2348,10 +2375,10 @@
     elpaBuild {
       pname = "gptel";
       ename = "gptel";
-      version = "0.9.7.0.20250312.185844";
+      version = "0.9.8.0.20250402.114541";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.7.0.20250312.185844.tar";
-        sha256 = "16jrv9aw5h40vfwhv2wmlgngbzgbi68pianx6flfx6fzmlsdxpww";
+        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.8.0.20250402.114541.tar";
+        sha256 = "0nc9dxhva2wrdsan84vxjhc9pavzrnsjs4zm916rg46bmm8z01j1";
       };
       packageRequires = [
         compat
@@ -2479,10 +2506,10 @@
     elpaBuild {
       pname = "haskell-mode";
       ename = "haskell-mode";
-      version = "17.5.0.20250305.134904";
+      version = "17.5.0.20250401.174200";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250305.134904.tar";
-        sha256 = "10pn6b4hml8wzzliynlag1fr7lnc526gzbfqbhs3kzh6qx5rf8zn";
+        url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250401.174200.tar";
+        sha256 = "1dxfwd4yhwzy59d55hnz0z23dg5vh1fzkrpicdaz93m9yvfzy1aa";
       };
       packageRequires = [ ];
       meta = {
@@ -2522,10 +2549,10 @@
     elpaBuild {
       pname = "haskell-ts-mode";
       ename = "haskell-ts-mode";
-      version = "1.0.20250202.61612";
+      version = "1.0.20250315.43516";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20250202.61612.tar";
-        sha256 = "1i3is0js2sjr61bd7w1jz05a9gl4aj5b0ivar5iq1l0kmnhq7w54";
+        url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20250315.43516.tar";
+        sha256 = "1a6jdmx8h9w9naqhj80v1vq7ms1a9sr58zqnq634xnj35jygzlib";
       };
       packageRequires = [ ];
       meta = {
@@ -2545,10 +2572,10 @@
     elpaBuild {
       pname = "helm";
       ename = "helm";
-      version = "4.0.2.0.20250228.64018";
+      version = "4.0.2.0.20250401.65011";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.2.0.20250228.64018.tar";
-        sha256 = "1mjgc22vp68wk1klq7f5i74pqr5wmwb53cc81n04zi6jynv2rimm";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.2.0.20250401.65011.tar";
+        sha256 = "09fs2fd7vdywg2z7gwy7z6vbi7ya65nz4sscd34v41pqhzqnc9bw";
       };
       packageRequires = [
         helm-core
@@ -2570,10 +2597,10 @@
     elpaBuild {
       pname = "helm-core";
       ename = "helm-core";
-      version = "4.0.2.0.20250228.64018";
+      version = "4.0.2.0.20250401.65011";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.2.0.20250228.64018.tar";
-        sha256 = "1i7f8n4gk7fppxdlylm1hwp8ab2dqpg9h30ppv46nzp6bp0fywyw";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.2.0.20250401.65011.tar";
+        sha256 = "0zlv04s1l487hszx0zs08awn5lcx1ngkiw6pkmndgxy1dhwqc4j9";
       };
       packageRequires = [ async ];
       meta = {
@@ -2703,10 +2730,10 @@
     elpaBuild {
       pname = "hyperdrive";
       ename = "hyperdrive";
-      version = "0.6pre0.20241222.235250";
+      version = "0.6pre0.20250330.212748";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.6pre0.20241222.235250.tar";
-        sha256 = "0a9z9kbnlzbv21w62zyw3mpbvjfnl5vhjmlpq65w7cc4d1qd2jp5";
+        url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.6pre0.20250330.212748.tar";
+        sha256 = "01lz4aak0ccqfffp61d8gfwpscbhdy9132bwbxpsrfiasxvkbfl8";
       };
       packageRequires = [
         compat
@@ -3044,10 +3071,10 @@
     elpaBuild {
       pname = "llama";
       ename = "llama";
-      version = "0.6.1.0.20250312.142844";
+      version = "0.6.2.0.20250314.200910";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/llama-0.6.1.0.20250312.142844.tar";
-        sha256 = "099m6knzf6rh4r9x6f285mimg8i7znrays1bsi1y22hvik5mmgl2";
+        url = "https://elpa.nongnu.org/nongnu-devel/llama-0.6.2.0.20250314.200910.tar";
+        sha256 = "0x39lvrjdqdyfdy5v88s9mpsgvdjvk1q3v2556sjdrw1q571d5wf";
       };
       packageRequires = [ compat ];
       meta = {
@@ -3068,10 +3095,10 @@
     elpaBuild {
       pname = "logview";
       ename = "logview";
-      version = "0.19.3snapshot0.20250306.133154";
+      version = "0.19.3snapshot0.20250401.172309";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/logview-0.19.3snapshot0.20250306.133154.tar";
-        sha256 = "0lkjp8y7f3npvbd63c2n7jfplp63qschbpq0ngqjs7q6254yfk9i";
+        url = "https://elpa.nongnu.org/nongnu-devel/logview-0.19.3snapshot0.20250401.172309.tar";
+        sha256 = "0vr34ixpidz1lp6y87axlvi0pac11lfkm5g0d310wphihnjmyssr";
       };
       packageRequires = [
         compat
@@ -3223,10 +3250,10 @@
     elpaBuild {
       pname = "magit";
       ename = "magit";
-      version = "4.3.1.0.20250312.143226";
+      version = "4.3.2.0.20250401.175331";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.3.1.0.20250312.143226.tar";
-        sha256 = "0mba1qf1z6dsbhrzl7d4rz8f6xbqqlwrxa16dbi9gl5ibaf4kx0p";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.3.2.0.20250401.175331.tar";
+        sha256 = "1way4hifyj0p5ly2p84as1amivv67qr22ph292rgwizrj0d5j60y";
       };
       packageRequires = [
         compat
@@ -3254,10 +3281,10 @@
     elpaBuild {
       pname = "magit-section";
       ename = "magit-section";
-      version = "4.3.1.0.20250312.143226";
+      version = "4.3.2.0.20250401.175331";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.3.1.0.20250312.143226.tar";
-        sha256 = "1s9dz5bayf852bdmd656zdzsch5w2jj687hnbpbmb2zbj050r45g";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.3.2.0.20250401.175331.tar";
+        sha256 = "1wif3d5vb04f39g38w2nbamqcbb89ivh2w5b0w362k3pk0vq2a70";
       };
       packageRequires = [
         compat
@@ -3279,10 +3306,10 @@
     elpaBuild {
       pname = "markdown-mode";
       ename = "markdown-mode";
-      version = "2.8alpha0.20250310.105434";
+      version = "2.8alpha0.20250402.45223";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.8alpha0.20250310.105434.tar";
-        sha256 = "1hs8kaw22r9fskh6pwchv1343k3phcfk1a1zdk41wvvc622pl11m";
+        url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.8alpha0.20250402.45223.tar";
+        sha256 = "1j8axf1p9ijx4kgyr8qnhhy2rs9y52kammqq8zpqp25zh0a8ydjr";
       };
       packageRequires = [ ];
       meta = {
@@ -3297,20 +3324,18 @@
       fetchurl,
       lib,
       persist,
-      request,
       tp,
     }:
     elpaBuild {
       pname = "mastodon";
       ename = "mastodon";
-      version = "1.1.12.0.20250305.210452";
+      version = "2.0.0.0.20250330.151927";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.1.12.0.20250305.210452.tar";
-        sha256 = "1dnii6hwxjbprm9cskah40vk41hgnbnvxnjykf8hssf2d5g1qsg3";
+        url = "https://elpa.nongnu.org/nongnu-devel/mastodon-2.0.0.0.20250330.151927.tar";
+        sha256 = "16xfvaacilfd075nln38hijzmx1wr30gmibrksn6zhfl6mj0lhnk";
       };
       packageRequires = [
         persist
-        request
         tp
       ];
       meta = {
@@ -3379,10 +3404,10 @@
     elpaBuild {
       pname = "meow";
       ename = "meow";
-      version = "1.5.0.0.20250216.181716";
+      version = "1.5.0.0.20250317.230021";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20250216.181716.tar";
-        sha256 = "0cmn4v9xzw42k98i17mbzh0vd2llw4cf79di2camgkc8gf07g01r";
+        url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20250317.230021.tar";
+        sha256 = "1m7nf329y7jq4543mganpwl5sy6ci854ln468qbb3ik3lf8c8bq0";
       };
       packageRequires = [ ];
       meta = {
@@ -3506,10 +3531,10 @@
     elpaBuild {
       pname = "nasm-mode";
       ename = "nasm-mode";
-      version = "1.1.1.0.20240610.150504";
+      version = "1.1.1.0.20250320.164627";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/nasm-mode-1.1.1.0.20240610.150504.tar";
-        sha256 = "1kkv7r6j02472d6c91xsrg9qlfvl70iyi538w2mh3s2adfkh7ps9";
+        url = "https://elpa.nongnu.org/nongnu-devel/nasm-mode-1.1.1.0.20250320.164627.tar";
+        sha256 = "0dm1zg15q18v9y4mx2p8hdqvql4dikw8chkj3i3jb1jp9d0v2rf3";
       };
       packageRequires = [ ];
       meta = {
@@ -3710,10 +3735,10 @@
     elpaBuild {
       pname = "org-mime";
       ename = "org-mime";
-      version = "0.3.4.0.20241001.42820";
+      version = "0.3.4.0.20250318.215555";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.4.0.20241001.42820.tar";
-        sha256 = "1xcdk15z18s073q3hlg7dck8p5ssgap35a6m0f6cbmd5dbd3r05f";
+        url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.4.0.20250318.215555.tar";
+        sha256 = "0plqmcyszpc1x35v691zlgxmnbga80yxxcjyb5mvxdri45z4458d";
       };
       packageRequires = [ ];
       meta = {
@@ -3825,10 +3850,10 @@
     elpaBuild {
       pname = "orgit";
       ename = "orgit";
-      version = "2.0.1.0.20250301.233925";
+      version = "2.0.2.0.20250401.181022";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.0.1.0.20250301.233925.tar";
-        sha256 = "0adppm61dn3cfkgdyc5ik42z0byvyc2dkwhjdzvw66nnl3fjb3ch";
+        url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.0.2.0.20250401.181022.tar";
+        sha256 = "1imiy9h0yrr995x5swy7mlrzn7zmgscr11a1g4b53dxcinywndcj";
       };
       packageRequires = [
         compat
@@ -3872,10 +3897,10 @@
     elpaBuild {
       pname = "package-lint";
       ename = "package-lint";
-      version = "0.25.0.20250307.91203";
+      version = "0.25.0.20250324.192216";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.25.0.20250307.91203.tar";
-        sha256 = "11yx2k7bsyi4ql8jhyz36s0pcxr0d6ssnnv7w128qfy9k0bklnr7";
+        url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.25.0.20250324.192216.tar";
+        sha256 = "0m1a5bs4kiplxqva0fmsznpxbq3jhpprgji3dpf0jq226cjm45d9";
       };
       packageRequires = [ let-alist ];
       meta = {
@@ -4072,10 +4097,10 @@
     elpaBuild {
       pname = "php-mode";
       ename = "php-mode";
-      version = "1.26.1.0.20250224.145951";
+      version = "1.26.1.0.20250331.173641";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20250224.145951.tar";
-        sha256 = "0fcfm286x9q8cgqagw4d1n512g2g0bcllwyn2b591fam9nfzx800";
+        url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20250331.173641.tar";
+        sha256 = "16glbb3rinpqpqb3vd9j9h3ldgsjc18ics324rfajx3kilwp00gv";
       };
       packageRequires = [ ];
       meta = {
@@ -4135,10 +4160,10 @@
     elpaBuild {
       pname = "projectile";
       ename = "projectile";
-      version = "2.9.1.0.20250312.165928";
+      version = "2.9.1.0.20250402.71553";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.1.0.20250312.165928.tar";
-        sha256 = "0wqgzph6vkgq55h5669l0rxqjxz7chbzrrjxb16r6pisxnw4b2dd";
+        url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.1.0.20250402.71553.tar";
+        sha256 = "0cnidaysnma7bvzzw5vbkggy3z9zq51zlg4k2kd5b1f8dagjlzv7";
       };
       packageRequires = [ ];
       meta = {
@@ -4156,10 +4181,10 @@
     elpaBuild {
       pname = "proof-general";
       ename = "proof-general";
-      version = "4.6snapshot0.20250129.125602";
+      version = "4.6snapshot0.20250402.90650";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20250129.125602.tar";
-        sha256 = "1w7s5sdxa05m80nicykqagk5y50q76gmr86ivwl09sibmwb6c9kh";
+        url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20250402.90650.tar";
+        sha256 = "0ay9r63scg3zray4cx0vp7qrl74sfz9vl7kj2bw31jf891sal4s1";
       };
       packageRequires = [ ];
       meta = {
@@ -4199,10 +4224,10 @@
     elpaBuild {
       pname = "racket-mode";
       ename = "racket-mode";
-      version = "1.0.20250212.102351";
+      version = "1.0.20250324.74422";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250212.102351.tar";
-        sha256 = "1byfpwv7nk4ncqd1cx3qphs37xllmw8mx9gdxd86l66qr1hyp22j";
+        url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250324.74422.tar";
+        sha256 = "0pwn822nyzbysq1h2gvyrwcxbrg7dbsn7rxv02sg7bl4nsmqzjjk";
       };
       packageRequires = [ ];
       meta = {
@@ -4304,10 +4329,10 @@
     elpaBuild {
       pname = "reformatter";
       ename = "reformatter";
-      version = "0.8.0.20241204.105138";
+      version = "0.8.0.20250324.192239";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20241204.105138.tar";
-        sha256 = "1j78naw4jikh7nby67gdbx9banchmf1q5fysal1328gxnyqknmzi";
+        url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20250324.192239.tar";
+        sha256 = "0kg01an6pf9laaqqdh4h09y508k94l85xjqb038dg9whv2bf0h3a";
       };
       packageRequires = [ ];
       meta = {
@@ -4358,6 +4383,27 @@
       };
     }
   ) { };
+  rpm-spec-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rpm-spec-mode";
+      ename = "rpm-spec-mode";
+      version = "0.16.0.20250329.13938";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/rpm-spec-mode-0.16.0.20250329.13938.tar";
+        sha256 = "1gmqnv1ckypns7aiz4w5kb3l8m66bfxlw8z19i3ag5im8rlpc9lp";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/rpm-spec-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   rubocop = callPackage (
     {
       elpaBuild,
@@ -4563,10 +4609,10 @@
     elpaBuild {
       pname = "slime";
       ename = "slime";
-      version = "2.31snapshot0.20250310.203219";
+      version = "2.31snapshot0.20250330.174001";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250310.203219.tar";
-        sha256 = "0f9j1phl36xnjh4g1263nkfqnjc79jrk1c0yqawykhljal87xyka";
+        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250330.174001.tar";
+        sha256 = "03hmilx1w1jf4gcz2bmlidpfd99znhpjrs540qgy6grrrnhqny3s";
       };
       packageRequires = [ macrostep ];
       meta = {
@@ -5144,10 +5190,10 @@
     elpaBuild {
       pname = "typst-ts-mode";
       ename = "typst-ts-mode";
-      version = "0.11.0.0.20250221.91757";
+      version = "0.11.0.0.20250318.13735";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.11.0.0.20250221.91757.tar";
-        sha256 = "0829ah70ib1q0va6f18xlbh13laa1cn196i8xa3jji4ljmcxkfyj";
+        url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.11.0.0.20250318.13735.tar";
+        sha256 = "1b710ynajshrdjqga5hdkkcsxq4avckh9qzjajg72jxdwpv02f6h";
       };
       packageRequires = [ ];
       meta = {
@@ -5270,10 +5316,10 @@
     elpaBuild {
       pname = "visual-fill-column";
       ename = "visual-fill-column";
-      version = "2.6.3.0.20250204.233635";
+      version = "2.6.3.0.20250323.152945";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column-2.6.3.0.20250204.233635.tar";
-        sha256 = "0516ccjk21bkfdv24mp59xb9pdzc4hwnz4cfyfg0xnrd1kiihggq";
+        url = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column-2.6.3.0.20250323.152945.tar";
+        sha256 = "0rcn0wxdylcb0ci0cjipbjc5hrrvigrj5in2qh3fpj742pqda6mm";
       };
       packageRequires = [ ];
       meta = {
@@ -5538,10 +5584,10 @@
     elpaBuild {
       pname = "xah-fly-keys";
       ename = "xah-fly-keys";
-      version = "26.10.20250308091402.0.20250308.122854";
+      version = "26.11.20250325184849.0.20250325.185005";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.10.20250308091402.0.20250308.122854.tar";
-        sha256 = "0c0afwkjp8p445qs2rfg7n9gs842bq46di95q10ab9s8qcg4j7d8";
+        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.11.20250325184849.0.20250325.185005.tar";
+        sha256 = "1ihvslx530i6q1iwz58wailwjqk1qmq07s2c8kpnynrpbi53jr3h";
       };
       packageRequires = [ ];
       meta = {

From e51150d79daecc8ec500435e6ea59f061b4bf2f2 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Thu, 3 Apr 2025 17:28:23 +0530
Subject: [PATCH 070/225] nixos/cosmic-greeter: add autologin support

---
 nixos/modules/services/display-managers/cosmic-greeter.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/display-managers/cosmic-greeter.nix b/nixos/modules/services/display-managers/cosmic-greeter.nix
index aa4243cfa700..e7aa9da63321 100644
--- a/nixos/modules/services/display-managers/cosmic-greeter.nix
+++ b/nixos/modules/services/display-managers/cosmic-greeter.nix
@@ -12,6 +12,7 @@
 
 let
   cfg = config.services.displayManager.cosmic-greeter;
+  cfgAutoLogin = config.services.displayManager.autoLogin;
 in
 
 {
@@ -35,6 +36,10 @@ in
           user = "cosmic-greeter";
           command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-greeter ${lib.getExe pkgs.cosmic-comp} ${lib.getExe cfg.package}'';
         };
+        initial_session = lib.mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) {
+          user = cfgAutoLogin.user;
+          command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-session ${lib.getExe pkgs.cosmic-session}'';
+        };
       };
     };
 

From ff079b35b5a79d09dfab3cdecf3fead21631f470 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 12:37:59 +0000
Subject: [PATCH 071/225] cariddi: 1.3.5 -> 1.3.6

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

diff --git a/pkgs/by-name/ca/cariddi/package.nix b/pkgs/by-name/ca/cariddi/package.nix
index 443623316b53..4c2e59842534 100644
--- a/pkgs/by-name/ca/cariddi/package.nix
+++ b/pkgs/by-name/ca/cariddi/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "cariddi";
-  version = "1.3.5";
+  version = "1.3.6";
 
   src = fetchFromGitHub {
     owner = "edoardottt";
     repo = "cariddi";
     tag = "v${version}";
-    hash = "sha256-mRrUTRknax3b4hs3frQMzg0GyB3WjMDZJk0RQSAC88U=";
+    hash = "sha256-ixjHPO0FXKbWOfjMVz1YD+wWpL8wcn2CCO46KF1zb0U=";
   };
 
-  vendorHash = "sha256-ML1aLbrYhs2IxnN2ywKFOpvAV6yuYb8GI+dtoxwJl4A=";
+  vendorHash = "sha256-7v92+iDAYG0snJjVCX35rLKV/ZEzaVX2au4HOwa/ILU=";
 
   ldflags = [
     "-w"

From 08fdacb5a7e9c1eb320c58a9b812d8cb7086cd4a Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 1 Apr 2025 18:25:56 +0000
Subject: [PATCH 072/225] pythonPackages.canonical-sphinx-extensions: init at
 0.0.27

---
 .../canonical-sphinx-extensions/default.nix   | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/canonical-sphinx-extensions/default.nix

diff --git a/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix b/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix
new file mode 100644
index 000000000000..1ad27acb2833
--- /dev/null
+++ b/pkgs/development/python-modules/canonical-sphinx-extensions/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  beautifulsoup4,
+  docutils,
+  gitpython,
+  requests,
+  sphinx,
+}:
+
+buildPythonPackage rec {
+  pname = "canonical-sphinx-extensions";
+  version = "0.0.27";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "canonical_sphinx_extensions";
+    inherit version;
+    hash = "sha256-ZorSmn+PAVS8xO7X3zk6u3W7pn3JB9w0PhFAXzv6l78=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    beautifulsoup4
+    docutils
+    gitpython
+    requests
+    sphinx
+  ];
+
+  doCheck = false;
+
+  meta = {
+    description = "A collection of Sphinx extensions used by Canonical documentation";
+    homepage = "https://pypi.org/project/canonical-sphinx-extensions";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6d1b37581114..d7ac01cb0adf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2192,6 +2192,10 @@ self: super: with self; {
 
   canmatrix = callPackage ../development/python-modules/canmatrix { };
 
+  canonical-sphinx-extensions =
+    callPackage ../development/python-modules/canonical-sphinx-extensions
+      { };
+
   canonicaljson = callPackage ../development/python-modules/canonicaljson { };
 
   canopen = callPackage ../development/python-modules/canopen { };

From d8187600ca4bbf5bc61c33728616bda4337acf33 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 12 Mar 2025 19:43:20 +0100
Subject: [PATCH 073/225] metabase: 0.52.8 -> 0.54.1

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

diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix
index 6510f0dda84d..1a7af0ffce8f 100644
--- a/pkgs/by-name/me/metabase/package.nix
+++ b/pkgs/by-name/me/metabase/package.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "metabase";
-  version = "0.52.8";
+  version = "0.54.1";
 
   src = fetchurl {
     url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar";
-    hash = "sha256-Z14BuKaSAMzlgdtqppc/3ItCxVZwE4E1EQUVMVR6JwQ=";
+    hash = "sha256-gHLugoL3wCvlCzN2fNJtCt+1iSW+kKPzWPpqqHAn/D0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 95f5b2d446f04db328d9a3dfe495d9e9188d93cc Mon Sep 17 00:00:00 2001
From: WeetHet <stas.ale66@gmail.com>
Date: Thu, 3 Apr 2025 17:32:02 +0300
Subject: [PATCH 074/225] koji: add WeetHet to maintainers

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

diff --git a/pkgs/by-name/ko/koji/package.nix b/pkgs/by-name/ko/koji/package.nix
index fb3729958667..a8790f348275 100644
--- a/pkgs/by-name/ko/koji/package.nix
+++ b/pkgs/by-name/ko/koji/package.nix
@@ -34,12 +34,15 @@ rustPlatform.buildRustPackage rec {
     openssl.dev
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Interactive CLI for creating conventional commits";
     homepage = "https://github.com/its-danny/koji";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ByteSudoer ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      ByteSudoer
+      WeetHet
+    ];
     mainProgram = "koji";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

From 4c0eb34244eb2270b31901968dec7642df4eee61 Mon Sep 17 00:00:00 2001
From: WeetHet <stas.ale66@gmail.com>
Date: Thu, 3 Apr 2025 17:34:57 +0300
Subject: [PATCH 075/225] koji: 2.2.0 -> 3.2.0

---
 pkgs/by-name/ko/koji/package.nix | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ko/koji/package.nix b/pkgs/by-name/ko/koji/package.nix
index a8790f348275..414d9623131e 100644
--- a/pkgs/by-name/ko/koji/package.nix
+++ b/pkgs/by-name/ko/koji/package.nix
@@ -1,39 +1,51 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
   perl,
   udev,
   openssl,
+  gitMinimal,
+  writableTmpDirAsHomeHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "koji";
-  version = "2.2.0";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
-    owner = "its-danny";
+    owner = "cococonscious";
     repo = "koji";
-    rev = version;
-    hash = "sha256-2kBjHX7izo4loJ8oyPjE9FtCvUODC3Sm4T8ETIdeGZM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+xtq4btFbOfiyFMDHXo6riSBMhAwTLQFuE91MUHtg5Q=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ZHti7nMfHiYur1kjxj+ySIF4/l0UU9q2urabUWZyk6E=";
+  cargoHash = "sha256-WiFXDXLJc2ictv29UoRFRpIpAqeJlEBEOvThXhLXLJA=";
 
   OPENSSL_NO_VENDOR = 1;
 
   nativeBuildInputs = [
     pkg-config
     perl
-    udev
   ];
 
   buildInputs = [
-    openssl.dev
+    openssl
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];
+
+  nativeCheckInputs = [
+    gitMinimal
+    writableTmpDirAsHomeHook
   ];
 
+  preCheck = ''
+    git config --global user.name 'nix-user'
+    git config --global user.email 'nix-user@example.com'
+  '';
+
   meta = {
     description = "Interactive CLI for creating conventional commits";
     homepage = "https://github.com/its-danny/koji";
@@ -45,4 +57,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "koji";
     platforms = lib.platforms.unix;
   };
-}
+})

From 798b0863a6a6d3feaf1dabda9bdc6d14c211c979 Mon Sep 17 00:00:00 2001
From: WeetHet <stas.ale66@gmail.com>
Date: Thu, 3 Apr 2025 17:35:50 +0300
Subject: [PATCH 076/225] koji: install completions, check version

---
 pkgs/by-name/ko/koji/package.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/by-name/ko/koji/package.nix b/pkgs/by-name/ko/koji/package.nix
index 414d9623131e..42f605d553c1 100644
--- a/pkgs/by-name/ko/koji/package.nix
+++ b/pkgs/by-name/ko/koji/package.nix
@@ -9,6 +9,8 @@
   openssl,
   gitMinimal,
   writableTmpDirAsHomeHook,
+  installShellFiles,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -30,6 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     perl
+    installShellFiles
   ];
 
   buildInputs = [
@@ -46,6 +49,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
     git config --global user.email 'nix-user@example.com'
   '';
 
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd koji \
+      --bash <($out/bin/koji completions bash) \
+      --fish <($out/bin/koji completions fish) \
+      --zsh <($out/bin/koji completions zsh)
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+
   meta = {
     description = "Interactive CLI for creating conventional commits";
     homepage = "https://github.com/its-danny/koji";

From e0a0c7872fef5cf94135e1c36c44b8f4896df173 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 3 Apr 2025 23:22:11 +0800
Subject: [PATCH 077/225] emacs.pkgs.company-forge: fix build

https://hydra.nix-community.org/build/4644595
---
 .../editors/emacs/elisp-packages/melpa-packages.nix             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 54f265d66fe8..f38e54d464f2 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -1045,6 +1045,8 @@ let
           # depends on distel which is not on any ELPA https://github.com/massemanet/distel/issues/21
           company-distel = ignoreCompilationError super.company-distel;
 
+          company-forge = buildWithGit super.company-forge;
+
           # qmltypes-table.el causing native-compiler-error-empty-byte
           company-qml = ignoreCompilationError super.company-qml;
 

From bc519cfdb8c61ddbf8e5fc427fb504e529913291 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 1 Apr 2025 21:33:16 +0200
Subject: [PATCH 078/225] jnv: use finalAttrs pattern

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

diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix
index e42b7fb671f9..908956c6dc9a 100644
--- a/pkgs/by-name/jn/jnv/package.nix
+++ b/pkgs/by-name/jn/jnv/package.nix
@@ -5,14 +5,15 @@
   stdenv,
   darwin,
 }:
-rustPlatform.buildRustPackage rec {
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jnv";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "ynqa";
     repo = "jnv";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-HKZ+hF5Y7vTA4EODSAd9xYJHaipv5YukTl470ejPLtM=";
   };
 
@@ -37,4 +38,4 @@ rustPlatform.buildRustPackage rec {
       nshalman
     ];
   };
-}
+})

From a8300afe2dbfe36d72f9089434b50f648375d327 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 1 Apr 2025 21:33:34 +0200
Subject: [PATCH 079/225] jnv: use tag in fetchFromGitHub

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

diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix
index 908956c6dc9a..a59702ed9ad7 100644
--- a/pkgs/by-name/jn/jnv/package.nix
+++ b/pkgs/by-name/jn/jnv/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ynqa";
     repo = "jnv";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-HKZ+hF5Y7vTA4EODSAd9xYJHaipv5YukTl470ejPLtM=";
   };
 

From c197699159fd1ed3cd3be0cab664a67853c91952 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 1 Apr 2025 21:34:34 +0200
Subject: [PATCH 080/225] jnv: remove `with lib;`

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

diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix
index a59702ed9ad7..42b0d20bb625 100644
--- a/pkgs/by-name/jn/jnv/package.nix
+++ b/pkgs/by-name/jn/jnv/package.nix
@@ -28,12 +28,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ]
   );
 
-  meta = with lib; {
+  meta = {
     description = "Interactive JSON filter using jq";
     mainProgram = "jnv";
     homepage = "https://github.com/ynqa/jnv";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [
       nealfennimore
       nshalman
     ];

From afcb71c4817cddc454fdeb13d5801069b206c1ef Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 1 Apr 2025 21:48:43 +0200
Subject: [PATCH 081/225] jnv: remove obsolete buildInputs

---
 pkgs/by-name/jn/jnv/package.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix
index 42b0d20bb625..1b03847a1c83 100644
--- a/pkgs/by-name/jn/jnv/package.nix
+++ b/pkgs/by-name/jn/jnv/package.nix
@@ -2,8 +2,6 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  stdenv,
-  darwin,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -20,14 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-VLVoURqmUhhekNZ0a75bwjvSiLfaQ79IlltbmWVyBrI=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin (
-    with darwin.apple_sdk.frameworks;
-    [
-      CoreGraphics
-      AppKit
-    ]
-  );
-
   meta = {
     description = "Interactive JSON filter using jq";
     mainProgram = "jnv";

From 2843b39e60c86fd9962bc2e208b7e2df12aebc3e Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 1 Apr 2025 21:50:44 +0200
Subject: [PATCH 082/225] jnv: add versionCheckHook

---
 pkgs/by-name/jn/jnv/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix
index 1b03847a1c83..b5b4140e1b31 100644
--- a/pkgs/by-name/jn/jnv/package.nix
+++ b/pkgs/by-name/jn/jnv/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -18,6 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   useFetchCargoVendor = true;
   cargoHash = "sha256-VLVoURqmUhhekNZ0a75bwjvSiLfaQ79IlltbmWVyBrI=";
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = {
     description = "Interactive JSON filter using jq";
     mainProgram = "jnv";

From 5b86a3c7cbb0b79577807c7c59a4edc5f4119965 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 1 Apr 2025 21:50:56 +0200
Subject: [PATCH 083/225] jnv: add updateScript

---
 pkgs/by-name/jn/jnv/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix
index b5b4140e1b31..819bbeb3abd5 100644
--- a/pkgs/by-name/jn/jnv/package.nix
+++ b/pkgs/by-name/jn/jnv/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -23,6 +24,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Interactive JSON filter using jq";
     mainProgram = "jnv";

From 9d55c960ba2c44941d18d0b6815987667b492fad Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 1 Apr 2025 18:25:56 +0000
Subject: [PATCH 084/225] pythonPackages.sphinx-reredirects: init at 0.1.6

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

diff --git a/pkgs/development/python-modules/sphinx-reredirects/default.nix b/pkgs/development/python-modules/sphinx-reredirects/default.nix
new file mode 100644
index 000000000000..8fc57ab6d1f0
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-reredirects/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  sphinx,
+}:
+
+buildPythonPackage rec {
+  pname = "sphinx-reredirects";
+  version = "0.1.6";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "sphinx_reredirects";
+    inherit version;
+    hash = "sha256-xJHLpUX2e+lpdQhyeBjYYmYmNmJFrmRFb+KfN+m76mQ=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    sphinx
+  ];
+
+  pythonImportsCheck = [
+    "sphinx_reredirects"
+  ];
+
+  meta = {
+    description = "Handles redirects for moved pages in Sphinx documentation projects";
+    homepage = "https://pypi.org/project/sphinx-reredirects";
+    license = with lib.licenses; [
+      bsd3
+      mit
+    ];
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d7ac01cb0adf..d638ae3aba7b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16171,6 +16171,8 @@ self: super: with self; {
 
   sphinx-pytest = callPackage ../development/python-modules/sphinx-pytest { };
 
+  sphinx-reredirects = callPackage ../development/python-modules/sphinx-reredirects { };
+
   sphinx-rtd-dark-mode = callPackage ../development/python-modules/sphinx-rtd-dark-mode { };
 
   sphinx-rtd-theme = callPackage ../development/python-modules/sphinx-rtd-theme { };

From e06dd5475e7bd5ea408a5797b9a21311e569a7e7 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 1 Apr 2025 18:25:56 +0000
Subject: [PATCH 085/225] pythonPackages.pyspelling: init at 2.10

---
 .../python-modules/pyspelling/default.nix     | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyspelling/default.nix

diff --git a/pkgs/development/python-modules/pyspelling/default.nix b/pkgs/development/python-modules/pyspelling/default.nix
new file mode 100644
index 000000000000..78b5871c07b1
--- /dev/null
+++ b/pkgs/development/python-modules/pyspelling/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  beautifulsoup4,
+  html5lib,
+  lxml,
+  markdown,
+  pyyaml,
+  soupsieve,
+  wcmatch,
+}:
+
+buildPythonPackage rec {
+  pname = "pyspelling";
+  version = "2.10";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-rNZxM8G3zs1BDj1EieYfLksfC2rPGubEjCQPuyFynDc=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    beautifulsoup4
+    html5lib
+    lxml
+    markdown
+    pyyaml
+    soupsieve
+    wcmatch
+  ];
+
+  pythonImportsCheck = [
+    "pyspelling"
+  ];
+
+  meta = {
+    description = "Spell checker";
+    homepage = "https://pypi.org/project/pyspelling";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d638ae3aba7b..18b328e3f7c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13326,6 +13326,8 @@ self: super: with self; {
 
   pyspellchecker = callPackage ../development/python-modules/pyspellchecker { };
 
+  pyspelling = callPackage ../development/python-modules/pyspelling { };
+
   pyspf = callPackage ../development/python-modules/pyspf { };
 
   pyspice = callPackage ../development/python-modules/pyspice { };

From 923ae1752801ed0be8adb897237c66c1afbf2845 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 1 Apr 2025 18:25:56 +0000
Subject: [PATCH 086/225] pythonPackages.sphinx-remove-toctrees: init at
 1.0.0.post1

---
 .../sphinx-remove-toctrees/default.nix        | 60 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinx-remove-toctrees/default.nix

diff --git a/pkgs/development/python-modules/sphinx-remove-toctrees/default.nix b/pkgs/development/python-modules/sphinx-remove-toctrees/default.nix
new file mode 100644
index 000000000000..7f381ff997bd
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-remove-toctrees/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  sphinx,
+  pre-commit,
+  ipython,
+  myst-parser,
+  sphinx-book-theme,
+  pytest,
+}:
+
+buildPythonPackage rec {
+  pname = "sphinx-remove-toctrees";
+  version = "1.0.0.post1";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "sphinx_remove_toctrees";
+    inherit version;
+    hash = "sha256-SAjR7fFRwG7/bSw5Iux+vJ/Tqhdi3hsuFnSjf1rJzi0=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    sphinx
+  ];
+
+  optional-dependencies = {
+    code_style = [
+      pre-commit
+    ];
+    docs = [
+      ipython
+      myst-parser
+      sphinx-book-theme
+    ];
+    tests = [
+      ipython
+      myst-parser
+      pytest
+      sphinx-book-theme
+    ];
+  };
+
+  pythonImportsCheck = [
+    "sphinx_remove_toctrees"
+  ];
+
+  meta = {
+    description = "Reduce your documentation build size by selectively removing toctrees from pages";
+    homepage = "https://pypi.org/project/sphinx-remove-toctrees/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 18b328e3f7c8..49d580780596 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16175,6 +16175,8 @@ self: super: with self; {
 
   sphinx-reredirects = callPackage ../development/python-modules/sphinx-reredirects { };
 
+  sphinx-remove-toctrees = callPackage ../development/python-modules/sphinx-remove-toctrees { };
+
   sphinx-rtd-dark-mode = callPackage ../development/python-modules/sphinx-rtd-dark-mode { };
 
   sphinx-rtd-theme = callPackage ../development/python-modules/sphinx-rtd-theme { };

From 21197daa39ee07363242a7211145db641b40d879 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 1 Apr 2025 18:25:56 +0000
Subject: [PATCH 087/225] incus: build and expose documentation

---
 nixos/modules/virtualisation/incus.nix |  1 +
 nixos/tests/incus/ui.nix               |  4 +++
 pkgs/by-name/in/incus/docs.patch       | 26 +++++++++++++++
 pkgs/by-name/in/incus/generic.nix      | 45 ++++++++++++++++++++++----
 4 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/in/incus/docs.patch

diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 136cd20eee55..6637141d0330 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -129,6 +129,7 @@ let
 
   environment = lib.mkMerge [
     {
+      INCUS_DOCUMENTATION = "${cfg.package.doc}/html";
       INCUS_EDK2_PATH = ovmf;
       INCUS_LXC_HOOK = "${cfg.lxcPackage}/share/lxc/hooks";
       INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config";
diff --git a/nixos/tests/incus/ui.nix b/nixos/tests/incus/ui.nix
index 27b90c218d78..300388a19f93 100644
--- a/nixos/tests/incus/ui.nix
+++ b/nixos/tests/incus/ui.nix
@@ -66,6 +66,7 @@ import ../make-test-python.nix (
 
     testScript = ''
       machine.wait_for_unit("incus.service")
+      machine.wait_for_unit("incus-preseed.service")
 
       # Check that the INCUS_UI environment variable is populated in the systemd unit
       machine.succeed("systemctl cat incus.service | grep 'INCUS_UI'")
@@ -73,6 +74,9 @@ import ../make-test-python.nix (
       # Ensure the endpoint returns an HTML page with 'Incus UI' in the title
       machine.succeed("curl -kLs https://localhost:8443/ui | grep '<title>Incus UI</title>'")
 
+      # Ensure the documentation is rendering correctly
+      machine.succeed("curl -kLs https://localhost:8443/documentation/ | grep '<title>Incus documentation</title>'")
+
       # Ensure the application is actually rendered by the Javascript
       machine.succeed("PYTHONUNBUFFERED=1 selenium-script")
     '';
diff --git a/pkgs/by-name/in/incus/docs.patch b/pkgs/by-name/in/incus/docs.patch
new file mode 100644
index 000000000000..6857df48e230
--- /dev/null
+++ b/pkgs/by-name/in/incus/docs.patch
@@ -0,0 +1,26 @@
+diff --git i/doc/conf.py w/doc/conf.py
+index 8d042818b..b4f0572bd 100644
+--- i/doc/conf.py
++++ w/doc/conf.py
+@@ -8,10 +8,6 @@ import yaml
+ from git import Repo
+ import filecmp
+ 
+-# Download and link swagger-ui files
+-if not os.path.isdir('.sphinx/deps/swagger-ui'):
+-    Repo.clone_from('https://github.com/swagger-api/swagger-ui', '.sphinx/deps/swagger-ui', depth=1)
+-
+ os.makedirs('.sphinx/_static/swagger-ui/', exist_ok=True)
+ 
+ if not os.path.islink('.sphinx/_static/swagger-ui/swagger-ui-bundle.js'):
+@@ -151,10 +147,6 @@ if os.path.exists("./related_topics.yaml"):
+     with open("./related_topics.yaml", "r") as fd:
+         myst_substitutions.update(yaml.safe_load(fd.read()))
+ 
+-intersphinx_mapping = {
+-    'cloud-init': ('https://cloudinit.readthedocs.io/en/latest/', None)
+-}
+-
+ if ("LOCAL_SPHINX_BUILD" in os.environ) and (os.environ["LOCAL_SPHINX_BUILD"] == "True"):
+     swagger_url_scheme = "/api/#{{path}}"
+ else:
diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix
index be969c84e4a6..2620ea098c24 100644
--- a/pkgs/by-name/in/incus/generic.nix
+++ b/pkgs/by-name/in/incus/generic.nix
@@ -13,6 +13,7 @@
   buildGoModule,
   fetchFromGitHub,
   acl,
+  buildPackages,
   cowsql,
   incus-ui-canonical,
   libcap,
@@ -27,11 +28,30 @@
 
 let
   pname = "incus${lib.optionalString lts "-lts"}";
+  docsPython = buildPackages.python3.withPackages (
+    py: with py; [
+      furo
+      gitpython
+      linkify-it-py
+      canonical-sphinx-extensions
+      myst-parser
+      pyspelling
+      sphinx
+      sphinx-autobuild
+      sphinx-copybutton
+      sphinx-design
+      sphinx-notfound-page
+      sphinx-remove-toctrees
+      sphinx-reredirects
+      sphinx-tabs
+      sphinxcontrib-jquery
+      sphinxext-opengraph
+    ]
+  );
 in
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   inherit
-    patches
     pname
     vendorHash
     version
@@ -40,15 +60,18 @@ buildGoModule rec {
   outputs = [
     "out"
     "agent_loader"
+    "doc"
   ];
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "incus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     inherit hash;
   };
 
+  patches = [ ./docs.patch ] ++ patches;
+
   excludedPackages = [
     # statically compile these
     "cmd/incus-agent"
@@ -61,6 +84,7 @@ buildGoModule rec {
   nativeBuildInputs = [
     installShellFiles
     pkg-config
+    docsPython
   ];
 
   buildInputs = [
@@ -82,6 +106,13 @@ buildGoModule rec {
   CGO_LDFLAGS_ALLOW = "(-Wl,-wrap,pthread_create)|(-Wl,-z,now)";
 
   postBuild = ''
+    # build docs
+    mkdir -p .sphinx/deps
+    ln -s ${buildPackages.python3.pkgs.swagger-ui-bundle.src} .sphinx/deps/swagger-ui
+    substituteInPlace Makefile --replace-fail '. $(SPHINXENV) ; ' ""
+    make doc-incremental
+
+    # build some static executables
     make incus-agent incus-migrate
   '';
 
@@ -111,18 +142,20 @@ buildGoModule rec {
     cp internal/server/instance/drivers/agent-loader/systemd/incus-agent.service $agent_loader/etc/systemd/system/
     cp internal/server/instance/drivers/agent-loader/systemd/incus-agent.rules $agent_loader/lib/udev/rules.d/99-incus-agent.rules
     substituteInPlace $agent_loader/etc/systemd/system/incus-agent.service --replace-fail 'TARGET/systemd' "$agent_loader/bin"
+
+    mkdir $doc
+    cp -R doc/html $doc/
   '';
 
   passthru = {
     client = callPackage ./client.nix {
       inherit
         lts
-        meta
         patches
-        src
         vendorHash
         version
         ;
+      inherit (finalAttrs) meta src;
     };
 
     tests = if lts then nixosTests.incus-lts.all else nixosTests.incus.all;
@@ -143,4 +176,4 @@ buildGoModule rec {
     platforms = lib.platforms.linux;
     mainProgram = "incus";
   };
-}
+})

From 366ca58cb9349fbcce25d8cae6aa4ba7a21b78c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 18:01:32 +0000
Subject: [PATCH 088/225] cozette: 1.27.0 -> 1.28.0

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

diff --git a/pkgs/by-name/co/cozette/package.nix b/pkgs/by-name/co/cozette/package.nix
index d62f7930f3b5..ad640a6a6077 100644
--- a/pkgs/by-name/co/cozette/package.nix
+++ b/pkgs/by-name/co/cozette/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cozette";
-  version = "1.27.0";
+  version = "1.28.0";
 
   src = fetchzip {
     url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${
       builtins.replaceStrings [ "." ] [ "-" ] version
     }.zip";
-    hash = "sha256-L/C1fohaLSVbrxAr4v3R83x1/Yt8fI3Lo+c84cZvEHY=";
+    hash = "sha256-KxlChsydFtm26CFugbWqeJi5DQP0BxONSz5mOcyiE28=";
   };
 
   installPhase = ''

From 1c3ad78889350f176b1bc9a3ce0b641b3de8c95b Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 3 Apr 2025 18:21:39 +0000
Subject: [PATCH 089/225] uiua: 0.14.1 -> 0.15.0

---
 pkgs/by-name/ui/uiua/stable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix
index 59cb86f7329d..a46416c8c21c 100644
--- a/pkgs/by-name/ui/uiua/stable.nix
+++ b/pkgs/by-name/ui/uiua/stable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.14.1";
+  version = "0.15.0";
   tag = version;
-  hash = "sha256-+FiJYxB2Lb1B7l9QEuB/XzdEYgJZmYAQpKimRIhWwhc=";
-  cargoHash = "sha256-bDj7pvZORP1cc2PXd1W9TWptWCvIKW9TXzaQAmni6hg=";
+  hash = "sha256-XjU8XPi8jTydJ439X6hjyZhXho2zbtt4Fqq3uIQg09M=";
+  cargoHash = "sha256-tMNIk52nq4dYfJU+nP2IKW21ex13YdrDvrEm2GSAAF4=";
   updateScript = ./update-stable.sh;
 }

From 9c04c26f4c9fb795d2580539cf708128d2a900d6 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 3 Apr 2025 18:22:21 +0000
Subject: [PATCH 090/225] uiua-unstable: 0.15.0-rc.2 -> 0.15.0

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

diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix
index 8212d238c290..a245509ec20c 100644
--- a/pkgs/by-name/ui/uiua/unstable.nix
+++ b/pkgs/by-name/ui/uiua/unstable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.15.0-rc.2";
+  version = "0.15.0";
   tag = version;
-  hash = "sha256-nGuSofBDstaBJNRS6MHdSD6nXyUqkGE/rcnAjaJICtk=";
-  cargoHash = "sha256-FzO5YOYrnwfcdrQHMJR5dR2qdFNL3Jfmyqpu1iPeN2o=";
+  hash = "sha256-XjU8XPi8jTydJ439X6hjyZhXho2zbtt4Fqq3uIQg09M=";
+  cargoHash = "sha256-tMNIk52nq4dYfJU+nP2IKW21ex13YdrDvrEm2GSAAF4=";
   updateScript = ./update-unstable.sh;
 }

From 4c7653cc3928aa05fd79ddd4e01ef915b40ed43c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 3 Apr 2025 18:27:22 +0000
Subject: [PATCH 091/225] vscode-extensions.uiua-lang.uiua-vscode: 0.0.61 ->
 0.0.62

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index af8b2895dd41..5ffe51880b44 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5038,8 +5038,8 @@ let
         mktplcRef = {
           name = "uiua-vscode";
           publisher = "uiua-lang";
-          version = "0.0.61";
-          hash = "sha256-cKiIva4nzROp+bbwkMxBvguLMXVe/9uGcdhVhLxmae0=";
+          version = "0.0.62";
+          hash = "sha256-Fq3NmCL17QVAmOmFWSkxc0qRwCRDsRbkeRzwyP02Nq4=";
         };
         meta = {
           description = "VSCode language extension for Uiua";

From 6ecd837dec93443c23b2b7138b1ccc5a9211e422 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 3 Apr 2025 14:35:40 -0400
Subject: [PATCH 092/225] modrinth-app-unwrapped: rec -> finalAttrs

---
 pkgs/by-name/mo/modrinth-app-unwrapped/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index 6731686e16c8..bc3bf955a44c 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -18,14 +18,15 @@
 let
   pnpm = pnpm_9;
 in
-rustPlatform.buildRustPackage rec {
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "modrinth-app-unwrapped";
   version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "modrinth";
     repo = "code";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-h+zj4Hm7v8SU6Zy0rIWbOknXVdSDf8b1d4q6M12J5Lc=";
   };
 
@@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-RrXSBgVh4UZFHcgUWhUjE7rEm/RZFDSDCpXS22gVjZ0=";
 
   pnpmDeps = pnpm.fetchDeps {
-    inherit pname version src;
+    inherit (finalAttrs) pname version src;
     hash = "sha256-nFuPFgwJw38XVxhW0QXmU31o+hqJKGJysnPg2YSg2D0=";
   };
 
@@ -91,4 +92,4 @@ rustPlatform.buildRustPackage rec {
     # See https://github.com/modrinth/code/issues/776#issuecomment-1742495678
     broken = !stdenv.hostPlatform.isx86_64 && !stdenv.hostPlatform.isDarwin;
   };
-}
+})

From 776bff65fd53f65d1ed284fdc40a79960d432a50 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 3 Apr 2025 14:36:35 -0400
Subject: [PATCH 093/225] modrinth-app-unwrapped: add updateScript

---
 pkgs/by-name/mo/modrinth-app-unwrapped/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index bc3bf955a44c..b392149009a1 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -6,6 +6,7 @@
   desktop-file-utils,
   fetchFromGitHub,
   makeBinaryWrapper,
+  nix-update-script,
   nodejs,
   openssl,
   pkg-config,
@@ -73,6 +74,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
         $out/share/applications/Modrinth\ App.desktop
     '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Modrinth's game launcher";
     longDescription = ''

From 17f460f50e178cd4fb76f2d2815270aad7ab405b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 18:39:49 +0000
Subject: [PATCH 094/225] python312Packages.mailsuite: 1.9.20 -> 1.10.0

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

diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix
index 52700d5c168a..46a9888eccd1 100644
--- a/pkgs/development/python-modules/mailsuite/default.nix
+++ b/pkgs/development/python-modules/mailsuite/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "mailsuite";
-  version = "1.9.20";
+  version = "1.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1DS0TzEejvviF3BPBiiCVJLOOi8RQuGoDIpKRm+CNHo=";
+    hash = "sha256-xYM4/Ou91WtYwiobE9ihlYGu8ViNTVbSLFGi8Y9yPc4=";
   };
 
   pythonRelaxDeps = [ "mail-parser" ];

From b02b1e2bf0e19970cd613c4d735018dc5af90bc1 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 3 Apr 2025 18:35:41 +0000
Subject: [PATCH 095/225] concessio: 0.1.9 -> 0.1.10

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

diff --git a/pkgs/by-name/co/concessio/package.nix b/pkgs/by-name/co/concessio/package.nix
index 803182fc4686..c8fa52d89ce4 100644
--- a/pkgs/by-name/co/concessio/package.nix
+++ b/pkgs/by-name/co/concessio/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "concessio";
-  version = "0.1.9";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
     owner = "ronniedroid";
     repo = "concessio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XH+4oEZSKa6lAS0zXxdlCsVJcGDglKSgaD+zoRM6Pws=";
+    hash = "sha256-GDiwpErxz6GiYajcRBOnX0RO1jeaSmpLLxqEsB3nJLA=";
   };
 
   strictDeps = true;

From 98a4fdc45ff9061f7b1e9a7d6ffa1bbaea48b0b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 18:59:46 +0000
Subject: [PATCH 096/225] rmfakecloud: 0.0.23 -> 0.0.24

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

diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix
index b76e3a3b9567..30a1709b67a5 100644
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "rmfakecloud";
-  version = "0.0.23";
+  version = "0.0.24";
 
   src = fetchFromGitHub {
     owner = "ddvk";
     repo = "rmfakecloud";
     rev = "v${version}";
-    hash = "sha256-XlKqh6GKGreWLPjS8XfEUJCMMxiOw8pP2qX8otD+RCo=";
+    hash = "sha256-ZsYq1+Bb6SyMGdbiy5UzanDiUiFOt4uhttiPKC0ESis=";
   };
 
-  vendorHash = "sha256-9tfxE03brUvCYusmewiqNpCkKyIS9qePqylrzDWrJLY=";
+  vendorHash = "sha256-S2P80uhX86IVUVEoR4tZ7e6qMe7CK+6bmmjBgjXGZmo=";
 
   # if using webUI build it
   # use env because of https://github.com/NixOS/nixpkgs/issues/358844

From f1857d70a4ba723f4750899ca73be75414d53935 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 19:18:20 +0000
Subject: [PATCH 097/225] obs-studio-plugins.obs-move-transition: 3.1.1 ->
 3.1.2

---
 .../video/obs-studio/plugins/obs-move-transition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
index bdedeeed9c78..9e542067069d 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-move-transition";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-move-transition";
     rev = version;
-    sha256 = "sha256-kCiRgfpcFdxoK6e8jtrtzkBD4w5B/ilO1YyBHCG13gg=";
+    sha256 = "sha256-BCivYK18T4b+lRo6Qf9qFwmjAyjCPZDekQVi03QBLHc=";
   };
 
   nativeBuildInputs = [ cmake ];

From 207fdeebe7bea68443ce897ef9b0b6191abe49bf Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 3 Apr 2025 18:36:41 +0000
Subject: [PATCH 098/225] mangojuice: 0.8.2 -> 0.8.3

Diff: https://github.com/radiolamp/mangojuice/compare/0.8.2...0.8.3

Changelog: https://github.com/radiolamp/mangojuice/releases/tag/0.8.3
---
 pkgs/by-name/ma/mangojuice/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix
index aab7000014e8..5c2908802ff9 100644
--- a/pkgs/by-name/ma/mangojuice/package.nix
+++ b/pkgs/by-name/ma/mangojuice/package.nix
@@ -25,13 +25,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mangojuice";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "radiolamp";
     repo = "mangojuice";
     tag = finalAttrs.version;
-    hash = "sha256-NpNsYwktcce9R1LpoIL2vh5UzsgDqdPyS0D3mhM3F0w=";
+    hash = "sha256-373Ws+U7fuwWLrKOnj1dD9gIJPKOd1b6I78VWOtOjTM=";
   };
 
   patches = [
@@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Convenient alternative to GOverlay for setting up MangoHud";
     homepage = "https://github.com/radiolamp/mangojuice";
+    changelog = "https://github.com/radiolamp/mangojuice/releases/tag/${finalAttrs.version}";
     license = with lib.licenses; [ gpl3Only ];
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [

From e910c0a547ecf1c4202fc2b2d49a066568af8da0 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 3 Apr 2025 18:37:07 +0000
Subject: [PATCH 099/225] refine: 0.5.5 -> 0.5.6

Diff: https://gitlab.gnome.org/TheEvilSkeleton/Refine/-/compare/0.5.5..0.5.6
---
 pkgs/by-name/re/refine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix
index 648818481f40..c5bee1e438de 100644
--- a/pkgs/by-name/re/refine/package.nix
+++ b/pkgs/by-name/re/refine/package.nix
@@ -34,7 +34,7 @@ in
 
 python3Packages.buildPythonApplication rec {
   pname = "refine";
-  version = "0.5.5";
+  version = "0.5.6";
   pyproject = false; # uses meson
 
   src = fetchFromGitLab {
@@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec {
     owner = "TheEvilSkeleton";
     repo = "Refine";
     tag = version;
-    hash = "sha256-b2dNhd5UJqH/l5BOEgcOUZrhCZa8ErdBzNw5g4VjtM8=";
+    hash = "sha256-cIJWTzeLm2YP8Pm/nzcYHIGzBOmQlPe0lQ+b6BufIMg=";
   };
 
   nativeBuildInputs = [

From b3f5d1adb3a8317d78db9c27cd6dd34d1e234bae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 19:35:21 +0000
Subject: [PATCH 100/225] krep: 0.3.4 -> 0.3.6

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

diff --git a/pkgs/by-name/kr/krep/package.nix b/pkgs/by-name/kr/krep/package.nix
index b94232de2330..12426c953ed1 100644
--- a/pkgs/by-name/kr/krep/package.nix
+++ b/pkgs/by-name/kr/krep/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "krep";
-  version = "0.3.4";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "davidesantangelo";
     repo = "krep";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-kAsOAcEFjfxlJs6fJvB0viCMxGFCG1BUs9qPgGMvBpM=";
+    hash = "sha256-wfMNyqZgqoEkp51gompWUn65kaeVZIMfvo0VStW4EPA=";
   };
 
   makeFlags = [

From acfe7788814f9af4127359f9dc1111684846a738 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 19:50:19 +0000
Subject: [PATCH 101/225] fly: 7.12.1 -> 7.13.0

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

diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix
index 79ad4b5c6899..c915657f0c08 100644
--- a/pkgs/by-name/fl/fly/package.nix
+++ b/pkgs/by-name/fl/fly/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "fly";
-  version = "7.12.1";
+  version = "7.13.0";
 
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
     rev = "v${version}";
-    hash = "sha256-3RsFtU2C3XxBddyW5liAwia9I7Fc8f2+TsziiJy6rHg=";
+    hash = "sha256-myvYACdTqnEb8aBpBeCA1qvcnF0lwYbSo6kMgSz7iiA=";
   };
 
-  vendorHash = "sha256-up77TV/A/C39LjgQ+1uQExWfMlbruLhY3H6820cRnt0=";
+  vendorHash = "sha256-WC4uzTgvW15IumwmsWXXeiF5qagbeb5XWRaSjd1XLvA=";
 
   subPackages = [ "fly" ];
 

From 2f070ae293669fe2206d7018d320bf2a68578913 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 20:57:54 +0000
Subject: [PATCH 102/225] mirrord: 3.136.0 -> 3.137.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index 8ce5d1aa22f8..d77f266b7c00 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.136.0",
+  "version": "3.137.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_linux_x86_64",
-      "hash": "sha256-MV6S23Ly0g2FPAhp2+RIMSC8D+s6NakVbMqLSwEr/2o="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.137.0/mirrord_linux_x86_64",
+      "hash": "sha256-IrsvX7Z+8k3OvtojhWuSeeiO75Okth6MCF3sPs3jIZo="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_linux_aarch64",
-      "hash": "sha256-zwistetfQCucaQ3yE1XHNChDhVCnSUq2ttl4XMnAQJU="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.137.0/mirrord_linux_aarch64",
+      "hash": "sha256-E5Jhx3FsaVNCbvC1SH0D2GPsgQDwKkMPe/wR9MoVzKs="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_mac_universal",
-      "hash": "sha256-eSHJvtbCBxegYUjfplyBND2kinEqr5LlXJs9mm2U9wI="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.137.0/mirrord_mac_universal",
+      "hash": "sha256-PKW2K5ITt1wagtET6MVx2rTn9CcqqujKaYt0XleIyzY="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.136.0/mirrord_mac_universal",
-      "hash": "sha256-eSHJvtbCBxegYUjfplyBND2kinEqr5LlXJs9mm2U9wI="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.137.0/mirrord_mac_universal",
+      "hash": "sha256-PKW2K5ITt1wagtET6MVx2rTn9CcqqujKaYt0XleIyzY="
     }
   }
 }

From 828bbb775a200eaff1a49a034ad694a2d23cf2e8 Mon Sep 17 00:00:00 2001
From: John Garcia <jgarcia3788@yahoo.co.uk>
Date: Thu, 3 Apr 2025 22:25:20 +0100
Subject: [PATCH 103/225] remnote: 1.18.49 -> 1.19.8

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

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index b63543b59cad..9e00c8711a80 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.18.49";
+  version = "1.19.8";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-LSjPQbRYl61c7I/TT0ePSoXkXqiVuCD8RdaFFJsK02M=";
+    hash = "sha256-xMr+UftIWxtlYzzdOtidCJWisSwJd+xEtaKyoZnyVXc=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From d0c4d479ce44c516988eec814930944e020d0d22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 23:48:06 +0000
Subject: [PATCH 104/225] descent3-unwrapped: 1.5.0-beta-unstable-2025-03-22 ->
 1.5.0-beta-unstable-2025-03-25

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

diff --git a/pkgs/by-name/de/descent3-unwrapped/package.nix b/pkgs/by-name/de/descent3-unwrapped/package.nix
index d97165bd9093..cdb4c73d07e2 100644
--- a/pkgs/by-name/de/descent3-unwrapped/package.nix
+++ b/pkgs/by-name/de/descent3-unwrapped/package.nix
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
   # the wrapped version of Descent 3. Once there’s a stable version of Descent
   # 3 that supports the -additionaldir command-line option, we can stop using
   # an unstable version of Descent 3.
-  version = "1.5.0-beta-unstable-2025-03-22";
+  version = "1.5.0-beta-unstable-2025-03-25";
   src = fetchFromGitHub {
     owner = "DescentDevelopers";
     repo = "Descent3";
-    rev = "55827d453f835df944b7071ed336ba6a5c30a976";
+    rev = "67244d953588c8c63baa17c150076153c526258b";
     leaveDotGit = true;
     # Descent 3 is supposed to display its Git commit hash in the bottom right
     # corner of the main menu. That feature only works if either the .git
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
       git rev-parse --verify HEAD | tr --delete '\n' > git-hash.txt
       rm -r .git
     '';
-    hash = "sha256-RZCkApFwbBtAnBWimupsaTcItwAWNJCntIu6S0UOcyU=";
+    hash = "sha256-lRTzy5GQJ5J9ban7Q6pBmHHXgHNpgemlYYlzmUnvFW0=";
   };
 
   hardeningDisable = [ "format" ];

From c0803d8a14895a99134cd1015a03fa14bc40ffc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 00:34:08 +0000
Subject: [PATCH 105/225] ab-av1: 0.9.3 -> 0.9.4

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

diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix
index bf0bdb0bc06f..436e38f35b79 100644
--- a/pkgs/by-name/ab/ab-av1/package.nix
+++ b/pkgs/by-name/ab/ab-av1/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ab-av1";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "alexheretic";
     repo = "ab-av1";
     rev = "v${version}";
-    hash = "sha256-rj02Opkwi4M249Ya4uBl4u1l8Mx+FBcRcxDgD6ng9kg=";
+    hash = "sha256-dDD0hnKov5cgNoc1m/0rG/cx2ZaB7TmLfcXdm8myRUQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Vi38eNn+SnhQx7Gp1T2RPIBeu3bUAZ74dr0mMG5Mha0=";
+  cargoHash = "sha256-01tH5uvfrPIKRv+iYJWm/5QyQZtz1d/nEtN/tmGXD14=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 36d62f0c85a45c3500b14834549a1485549a5c59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 00:35:37 +0000
Subject: [PATCH 106/225] azurehound: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix
index e21a59cc6f69..74ed95caac07 100644
--- a/pkgs/by-name/az/azurehound/package.nix
+++ b/pkgs/by-name/az/azurehound/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "azurehound";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
     tag = "v${version}";
-    hash = "sha256-BbwQ3u1SD4AjNjHzT6QB0x7QJAZ59m1DtvhjZapLIx4=";
+    hash = "sha256-12ae0y3hjeNPwB33J+XP26h+JfFN5M8+bF8CSon1jp4=";
   };
 
   vendorHash = "sha256-FG3207OTzkMEoSvQsTH7Ky9T3ur7glG7k0ERfd12SO0=";

From 17360ac80fc3535b746ca9727c1d6888d9a2248a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 00:39:40 +0000
Subject: [PATCH 107/225] fabric-installer: 1.0.1 -> 1.0.3

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

diff --git a/pkgs/by-name/fa/fabric-installer/package.nix b/pkgs/by-name/fa/fabric-installer/package.nix
index 21fdd3945316..09b9f44f225e 100644
--- a/pkgs/by-name/fa/fabric-installer/package.nix
+++ b/pkgs/by-name/fa/fabric-installer/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fabric-installer";
-  version = "1.0.1";
+  version = "1.0.3";
 
   src = fetchurl {
     url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar";
-    sha256 = "sha256-Yu3xcL3MQe3qhdM6zz64VHQlhpmz1B+UGNKGyDbLCI0=";
+    sha256 = "sha256-OKqCqx74KbeqPyFD/Mk7unBqjhiDW+cx0P3yMdJ0sH8=";
   };
 
   dontUnpack = true;

From 7b3259fbe9ada59d6edd616d891a242bc805fe41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 01:26:45 +0000
Subject: [PATCH 108/225] trufflehog: 3.88.20 -> 3.88.21

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

diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index b82459d22d84..847e42feaf2f 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.88.20";
+  version = "3.88.21";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     tag = "v${version}";
-    hash = "sha256-JLBHg1hCTOOBRTJbjXJitILD/HSmH1WDuzm0t3/OJaA=";
+    hash = "sha256-hUBUpsfVKifeQ9DpeNKwBGnoLH1OK2T4IOb7yFWxz+Q=";
   };
 
   vendorHash = "sha256-vJl2gIS14NA9nV9j+81xKv3NnsDce4V7XoeipOZV+wI=";

From 9e05bbe161e79f4e65833636a2650ca0714b4a7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 02:13:14 +0000
Subject: [PATCH 109/225] tfswitch: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix
index c62723fe880b..b4558be4d273 100644
--- a/pkgs/by-name/tf/tfswitch/package.nix
+++ b/pkgs/by-name/tf/tfswitch/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "tfswitch";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "warrensbox";
     repo = "terraform-switcher";
     rev = "v${version}";
-    sha256 = "sha256-y9MoDtF0104HRjDqpRuMfBbsNqseynq2azKnXNdRhso=";
+    sha256 = "sha256-5Zyu0SLF+xjemFKInzRKCcDZs72gwAJN7bacO+5StMg=";
   };
 
-  vendorHash = "sha256-m3QzNSAcUrI4Pg7LMDZftlBbk4Uhjirc6eNSrQxxwLA=";
+  vendorHash = "sha256-EjbS+1osM6Qauoi95JHLOdxeLOz0Jgz6ZaTFtfs6IgM=";
 
   # Disable tests since it requires network access and relies on the
   # presence of release.hashicorp.com

From 3564baaf75199b4c6c35703c492e0056e1741c4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 02:46:47 +0000
Subject: [PATCH 110/225] zwave-js-ui: 9.32.0 -> 10.1.2

---
 pkgs/by-name/zw/zwave-js-ui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
index d8dd3c074eb1..fc38ef746f90 100644
--- a/pkgs/by-name/zw/zwave-js-ui/package.nix
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "9.32.0";
+  version = "10.1.2";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-DZm3IoLc28YMbwWL6+qHd5BSyRQswRatEvGmwuIzBZM=";
+    hash = "sha256-j56kDnMw/YX6ONkIjPjopsu6xE2Kt1cZV5u+tX2TqlM=";
   };
-  npmDepsHash = "sha256-FZ/iStpC5DiNthV42/QAzek261ZUAL1DOEIixVlArZ0=";
+  npmDepsHash = "sha256-hkfDztDtLug9qdxi9NRWnzCN6Parv27stVknZ0cSYpo=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 

From a2e886428b4a52bd908a3eccd5c4a6f48993dccf Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Thu, 3 Apr 2025 23:18:10 -0400
Subject: [PATCH 111/225] firefox: copy *.dylibs on darwin

Without these, some functionality seems broken (e.g. Crypto API).

Resolves #394029

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index c753b04fb700..f6244310858a 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -405,10 +405,12 @@ let
         + lib.optionalString isDarwin ''
           cd "${appPath}"
 
-          # These files have to be copied and not symlinked, otherwise tabs crash.
+          # The omni.ja files have to be copied and not symlinked, otherwise tabs crash.
           # Maybe related to how omni.ja file is mmapped into memory. See:
           # https://github.com/mozilla/gecko-dev/blob/b1662b447f306e6554647914090d4b73ac8e1664/modules/libjar/nsZipArchive.cpp#L204
-          for file in $(find . -type l -name "omni.ja"); do
+          #
+          # The *.dylib files are copied, otherwise some basic functionality, e.g. Crypto API, is broken.
+          for file in $(find . -name "omni.ja" -o -name "*.dylib"); do
             rm "$file"
             cp "${browser}/${appPath}/$file" "$file"
           done

From b559c1b2bf6c8b59329765998f4a2b61dd3d8c74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 03:52:54 +0000
Subject: [PATCH 112/225] python312Packages.pure-protobuf: 3.1.3 -> 3.1.4

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

diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix
index 5b481b09f7d9..0ea2944d77d1 100644
--- a/pkgs/development/python-modules/pure-protobuf/default.nix
+++ b/pkgs/development/python-modules/pure-protobuf/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pure-protobuf";
-  version = "3.1.3";
+  version = "3.1.4";
 
   format = "pyproject";
   # < 3.10 requires get-annotations which isn't packaged yet
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "eigenein";
     repo = "protobuf";
     tag = version;
-    hash = "sha256-AsiJDi3SF3nlWKFvZujUsoHY8AJ21JKzEuTdR9FtFQI=";
+    hash = "sha256-k67AvY9go62BZN7kCg+kFo9+bQB3wGJVbLra5pOhkPU=";
   };
 
   build-system = [
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python implementation of Protocol Buffers with dataclass-based schemas";
     homepage = "https://github.com/eigenein/protobuf";
-    changelog = "https://github.com/eigenein/protobuf/releases/tag/${version}";
+    changelog = "https://github.com/eigenein/protobuf/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ chuangzhu ];
   };

From ce0c3c7649eb88d3f61551c924000e76720ea38a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 04:43:03 +0000
Subject: [PATCH 113/225] python312Packages.mkdocs-awesome-nav: 3.0.0 -> 3.1.0

---
 .../python-modules/mkdocs-awesome-nav/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
index 2bb5cb2c1644..a84bacb4a974 100644
--- a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
+++ b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
@@ -16,14 +16,14 @@
 }:
 buildPythonPackage rec {
   pname = "mkdocs-awesome-nav";
-  version = "3.0.0";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lukasgeiter";
     repo = "mkdocs-awesome-nav";
     tag = "v${version}";
-    hash = "sha256-EgHiphpMAL+1ZC+I8PxRHMk1gcyAgHcUm4eoVu67+Qc=";
+    hash = "sha256-UxqOaAXy5Sc41FYE3mSKDBpWWJ3g0YwkRkOeSXwqz7o=";
   };
 
   build-system = [ flit-core ];
@@ -57,7 +57,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Plugin for customizing the navigation structure of your MkDocs site";
     homepage = "https://github.com/lukasgeiter/mkdocs-awesome-nav";
-    changelog = "https://github.com/lukasgeiter/mkdocs-awesome-nav/blob/v${version}/CHANGELOG";
+    changelog = "https://github.com/lukasgeiter/mkdocs-awesome-nav/blob/${src.tag}/CHANGELOG";
     license = licenses.mit;
     maintainers = with maintainers; [ phaer ];
   };

From 0c02d1f7c81dc43510c698289af20e41ed70b07a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 05:25:15 +0000
Subject: [PATCH 114/225] cobalt: 0.19.8 -> 0.19.9

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

diff --git a/pkgs/by-name/co/cobalt/package.nix b/pkgs/by-name/co/cobalt/package.nix
index 7ee588a34ef1..fc3e31e941e6 100644
--- a/pkgs/by-name/co/cobalt/package.nix
+++ b/pkgs/by-name/co/cobalt/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cobalt";
-  version = "0.19.8";
+  version = "0.19.9";
 
   src = fetchFromGitHub {
     owner = "cobalt-org";
     repo = "cobalt.rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-neOJ3UqRisCcyarRIXfHyl9nAe2Wl9IXVDNwIYEQYys=";
+    hash = "sha256-T88XyrMVCLfhsz3RWD85ErHxAmuTXprOAiS5B8GkH9s=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-j2xmEoMV7lVhqj4lKWA3QdEDEGUpRlZc4ikZoDQJlB8=";
+  cargoHash = "sha256-0BJAbxBbw6wfnDcZkOic13iuWTBEslJ2mQ9nfq+/RXc=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

From af2ef85a8049794e1a79fda30a0d26e1a4dfafde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 05:54:48 +0000
Subject: [PATCH 115/225] python312Packages.xiaomi-ble: 0.35.0 -> 0.36.0

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

diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix
index b0c8020c06e4..b24845d9b3d1 100644
--- a/pkgs/development/python-modules/xiaomi-ble/default.nix
+++ b/pkgs/development/python-modules/xiaomi-ble/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "xiaomi-ble";
-  version = "0.35.0";
+  version = "0.36.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "xiaomi-ble";
     tag = "v${version}";
-    hash = "sha256-+mXn5R9zRjTPKqzB0vFHSO2+Jx+61K7/Ksp+jmMUDo4=";
+    hash = "sha256-qk8eoPuyU8deEuQkRRtTt1AxIpjaXaS/byDxMfZnLgI=";
   };
 
   build-system = [ poetry-core ];
@@ -57,7 +57,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library for Xiaomi BLE devices";
     homepage = "https://github.com/Bluetooth-Devices/xiaomi-ble";
-    changelog = "https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/v${version}";
+    changelog = "https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 1af9e80c8614f6ec38798f01010587a17d382289 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 06:16:55 +0000
Subject: [PATCH 116/225] python312Packages.ihm: 2.3 -> 2.4

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

diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix
index 65d839375f15..902bdf44b985 100644
--- a/pkgs/development/python-modules/ihm/default.nix
+++ b/pkgs/development/python-modules/ihm/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "ihm";
-  version = "2.3";
+  version = "2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ihmwg";
     repo = "python-ihm";
     tag = version;
-    hash = "sha256-oznORD5iN0izC19NeHo1G1nORJQgiC4iZNlThHJyd/8=";
+    hash = "sha256-vlt1YDF8TiWOfql/pasHU1Q7N0EU1wz60yh3+KAVnvM=";
   };
 
   nativeBuildInputs = [ swig ];

From aff6004b25f94a5935ce84accffd2c4e8f9a01dc Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Fri, 4 Apr 2025 08:28:17 +0200
Subject: [PATCH 117/225] tailwindcss_4: 4.1.1 -> 4.1.2

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

diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index d59c7182488a..12b37a768b44 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
 }:
 let
-  version = "4.1.1";
+  version = "4.1.2";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
 
@@ -22,10 +22,10 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-moydWSkhoHmxd+4zeWwgneUNHOlJ9yqPXlGHhCQmYXA=";
-      aarch64-linux = "sha256-zTW+fGIkpwWRYMRJjZRJmO4YI5J6gOXOKUfq9KtGxKI=";
-      x86_64-darwin = "sha256-JPnnUj30uQVvj+dnq7+fG4Trt7ArLVPsP4G1RVUeZAA=";
-      x86_64-linux = "sha256-jIW4NmIW7dk3iTS0JY5V7PF9LfnWIVEDcYOUP0nWp1Y=";
+      aarch64-darwin = "sha256-6kR+iOsfIeHvNRdLP72Mv8nKkCN877dcKl1FNG4ij/A=";
+      aarch64-linux = "sha256-m6uFYOQ4P52WhA73/ZAZxt3hAnq+xhreueDoXOOKF88=";
+      x86_64-darwin = "sha256-6C12gk9WnGP5nhSBBZT2q8SoCCdyOHCszHtAQi1d+0A=";
+      x86_64-linux = "sha256-2g+J98RrSheoUp1LJCzFa1mivMoVLFpQPSAOV8eA8Gw=";
     }
     .${system} or throwSystem;
 in

From fbfba47cab9f9c0780b1d7f9b24858431a190530 Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Fri, 4 Apr 2025 08:29:56 +0200
Subject: [PATCH 118/225] claude-code: 0.2.59 -> 0.2.62

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

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 9e1f0bc44794..56560fe90f17 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^0.2.59"
+        "@anthropic-ai/claude-code": "^0.2.62"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "0.2.59",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.59.tgz",
-      "integrity": "sha512-hcUHEiPUmkgU00J4/1dlLgWvf5ZkWOjMpUrXhMq2o143LOElKuTGxPGt2RtmFHKk6DesFZcV/gabZYkcTqraBw==",
+      "version": "0.2.62",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.62.tgz",
+      "integrity": "sha512-Mod9/kbqKy344lm5YmDJLn8dR3HYlA2zGCQy4exU7hmECNqg3KlTAz8u4O4YdiRMxXeUJ3Izi9YSJUT7oZOKdg==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index f213dbb17bd8..d7dc872039d9 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "0.2.59";
+  version = "0.2.62";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-XHHWmDw9qBM4fQ975wSk12hJnr4+1H4AhlNc+IBV3qs=";
+    hash = "sha256-O6jkpx3OxEh/npZjyJb+osoeJrG+HZ6NRB9T4EMkdf8=";
   };
 
-  npmDepsHash = "sha256-KorQlEB90EDE+NIxyUh1apqCDzgrCpwcaOy2mt2mz1s=";
+  npmDepsHash = "sha256-tVA4VbPaPc+KwZzUK0QI9In3QSXXoELaNM2U65wxGGA=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From aed60364918c223ef0e1fc8788374c6e96af8d10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 06:42:17 +0000
Subject: [PATCH 119/225] cpp-utilities: 5.27.3 -> 5.28.0

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

diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix
index 400aa112808a..add68cdfa169 100644
--- a/pkgs/by-name/cp/cpp-utilities/package.nix
+++ b/pkgs/by-name/cp/cpp-utilities/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpp-utilities";
-  version = "5.27.3";
+  version = "5.28.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "cpp-utilities";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-/602rIjPZ6b9bMTpfjKz+XWpAlKoTHyCKUyGIA9qpto=";
+    sha256 = "sha256-EdqM7RsvJzMQWtwqnohbC5JJRVZJYgpTLJW1rPmTB4s=";
   };
 
   nativeBuildInputs = [ cmake ];

From 31e51f5d444cf30111a85511d05bdf50425262cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 07:09:43 +0000
Subject: [PATCH 120/225] giza: 1.4.4 -> 1.5.0

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

diff --git a/pkgs/by-name/gi/giza/package.nix b/pkgs/by-name/gi/giza/package.nix
index c8ce0ee8205b..6a00faae2da1 100644
--- a/pkgs/by-name/gi/giza/package.nix
+++ b/pkgs/by-name/gi/giza/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "giza";
-  version = "1.4.4";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "danieljprice";
     repo = "giza";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-FlD+emPrdXYmalHqQ6jKmkZudyLtlbeHtUOjT/D6UOA=";
+    hash = "sha256-tNz0Lh6bzQPxsd/Vz3jh8u0JiRXT0O43hyfgbGTJUeE=";
   };
 
   nativeBuildInputs = [

From 4a9e0387dda2318814eb13b6d3db04fae978d522 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 07:13:21 +0000
Subject: [PATCH 121/225] go-judge: 1.9.2 -> 1.9.3

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

diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix
index 7a96e9827c25..c94afc6622b9 100644
--- a/pkgs/by-name/go/go-judge/package.nix
+++ b/pkgs/by-name/go/go-judge/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-judge";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "criyle";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-4KBMDqHw8EJGSDK9+jCZvaxkQymhw4RRGByrFngiIug=";
+    hash = "sha256-AmbhfCKUpvZt/me73EhBQqw8yDnItn1zKiemf/JRz24=";
   };
 
-  vendorHash = "sha256-FnX3u6DLB9qPE4+Hy/+00mD4U/6Pa+CsZoEroi7cNO0=";
+  vendorHash = "sha256-eUtkelLucf11ANT6vkWuBOaL5bgb+9D8YsVsZTMMjmg=";
 
   tags = [
     "nomsgpack"

From 698726164206845f48bfd024efb31ccde858c33b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 07:13:56 +0000
Subject: [PATCH 122/225] hyprlandPlugins.hyprsplit: 0.48.0 -> 0.48.1

---
 .../window-managers/hyprwm/hyprland-plugins/hyprsplit.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
index 03f3f6453386..2ddb895e7fbb 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
@@ -9,13 +9,13 @@
 }:
 mkHyprlandPlugin hyprland rec {
   pluginName = "hyprsplit";
-  version = "0.48.0";
+  version = "0.48.1";
 
   src = fetchFromGitHub {
     owner = "shezdy";
     repo = "hyprsplit";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FTp5mkrrgo/plCFHuFnx+EtDnQQoChq0mdKpb2a4LrQ=";
+    hash = "sha256-MN7eipww5r/I4tlEPTN6U+RZAkXPyf1YYx/YSCqVmoU=";
   };
 
   nativeBuildInputs = [

From 979caf8f05c7cfe8196f60059b972f9ecb14d6b8 Mon Sep 17 00:00:00 2001
From: "PAEPCKE, Michael" <git@paepcke.de>
Date: Fri, 4 Apr 2025 07:18:40 +0000
Subject: [PATCH 123/225] prometheus-ecoflow-exporter: init ecoflow nixos
 module integration

---
 .../monitoring/prometheus/exporters.nix       |   1 +
 .../prometheus/exporters/ecoflow.nix          | 151 ++++++++++++++++++
 2 files changed, 152 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/ecoflow.nix

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index caf7afcc1e07..60c2023c8b04 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -56,6 +56,7 @@ let
         "blackbox"
         "borgmatic"
         "buildkite-agent"
+        "ecoflow"
         "chrony"
         "collectd"
         "deluge"
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/ecoflow.nix b/nixos/modules/services/monitoring/prometheus/exporters/ecoflow.nix
new file mode 100644
index 000000000000..0b85f614016f
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/ecoflow.nix
@@ -0,0 +1,151 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.prometheus.exporters.ecoflow;
+  inherit (lib) mkOption types;
+in
+{
+  port = 2112;
+  extraOpts = {
+    exporterType = mkOption {
+      type = types.enum [
+        "rest"
+        "mqtt"
+      ];
+      default = "rest";
+      example = "mqtt";
+      description = ''
+        The type of exporter you'd like to use.
+        Possible values: "rest" and "mqtt". Default value is "rest".
+        Choose "rest" for the ecoflow online cloud api use "rest" and define: accessKey, secretKey.
+        Choose "mqtt" for the lan realtime integration use "mqtt" and define: email, password, devices.
+      '';
+    };
+    ecoflowAccessKeyFile = mkOption {
+      type = types.path;
+      default = /etc/ecoflow-access-key;
+      description = ''
+        Path to the file with your personal api access string from the Ecoflow development website https://developer-eu.ecoflow.com.
+        Do to share or commit your plaintext scecrets to a public repo use: agenix or soaps.
+      '';
+    };
+    ecoflowSecretKeyFile = mkOption {
+      type = types.path;
+      default = /etc/ecoflow-secret-key;
+      description = ''
+        Path to the file with your personal api secret string from the Ecoflow development website https://developer-eu.ecoflow.com.
+        Do to share or commit your plaintext scecrets to a public repo use: agenix or soaps.
+      '';
+    };
+    ecoflowEmailFile = mkOption {
+      type = types.path;
+      default = /etc/ecoflow-email;
+      description = ''
+        Path to the file with your personal ecoflow app login email address.
+        Do to share or commit your plaintext scecrets to a public repo use: agenix or soaps.
+      '';
+    };
+    ecoflowPasswordFile = mkOption {
+      type = types.path;
+      default = /etc/ecoflow-password;
+      description = ''
+        Path to the file with your personal ecoflow app login email password.
+        Do to share or commit your plaintext passwords to a public repo use: agenix or soaps here!
+      '';
+    };
+    ecoflowDevicesFile = mkOption {
+      type = types.path;
+      default = /etc/ecoflow-devices;
+      description = ''
+        File must contain one line, example: R3300000,R3400000,NC430000,....
+        The list of devices serial numbers separated by comma. For instance: SN1,SN2,SN3.
+        Instead of "devicesFile" you can specify "devicesPrettynamesFile" which will also work. You can specify both.
+        Do to share or commit your plaintext serial numbers to a public repo use: agenix or soaps.
+      '';
+    };
+    ecoflowDevicesPrettyNamesFile = mkOption {
+      type = types.path;
+      default = /etc/ecoflow-devices-pretty-names;
+      description = ''
+        File must contain one line, example: {"R3300000":"Delta 2","R3400000":"Delta Pro",...}
+        The key/value map of custom names for your devices. Key is a serial number, value is a device name you want
+        to see in Grafana Dashboard. It's helpful to see a meaningful name in Grafana dashboard instead of a serialnumber.
+        Do to share or commit your plaintext serial numbers to a public repo use: agenix or soaps.
+      '';
+    };
+    debug = mkOption {
+      type = types.str;
+      default = "0";
+      example = "1";
+      description = ''
+        Enable debug log messages. Disabled by default. Set to "1" to enable.
+      '';
+    };
+    prefix = mkOption {
+      type = types.str;
+      default = "ecoflow";
+      example = "ecoflow_privateSite";
+      description = ''
+        The prefix that will be added to all metrics. Default value is ecoflow.
+        For instance metric bms_bmsStatus.minCellTemp will be exported to prometheus as ecoflow.bms_bmsStatus.minCellTemp.
+        With default value "ecoflow" you can use Grafana Dashboard with ID 17812 without any changes.
+      '';
+    };
+    scrapingInterval = mkOption {
+      type = types.ints.positive;
+      default = 30;
+      example = 120;
+      description = ''
+        Scrapping interval in seconds. How often should the exporter execute requests to Ecoflow Rest API in order to get the data.
+        Default value is 30 seconds. Align this value with your prometheus scraper interval settings.
+      '';
+    };
+    mqttDeviceOfflineThreshold = mkOption {
+      type = types.ints.positive;
+      default = 60;
+      example = 120;
+      description = ''
+        The threshold in seconds which indicates how long we should wait for a metric message from MQTT broker.
+        Default value: 60 seconds. If we don't receive message within 60 seconds we consider that device is offline.
+        If we don't receive messages within the threshold for all devices, we'll try to reconnect to the MQTT broker.
+        There is a strange behavior that MQTT stop sends messages if you open Ecoflow mobile app and then close it).
+      '';
+    };
+  };
+  serviceOpts = {
+    environment = {
+      PROMETHEUS_ENABLED = "1";
+      EXPORTER_TYPE = cfg.exporterType;
+      DEBUG_ENABLED = cfg.debug;
+      METRIC_PREFIX = cfg.prefix;
+      SCRAPING_INTERVAL = toString cfg.scrapingInterval;
+      MQTT_DEVICE_OFFLINE_THRESHOLD_SECONDS = toString cfg.mqttDeviceOfflineThreshold;
+    };
+    script = ''
+      export ECOFLOW_ACCESS_KEY="$(cat ${toString cfg.ecoflowAccessKeyFile})"
+      export ECOFLOW_SECRET_KEY="$(cat ${toString cfg.ecoflowSecretKeyFile})"
+      export ECOFLOW_EMAIL="$(cat ${toString cfg.ecoflowEmailFile})"
+      export ECOFLOW_PASSWORD="$(cat ${toString cfg.ecoflowPasswordFile})"
+      export ECOFLOW_DEVICES="$(cat ${toString cfg.ecoflowDevicesFile})"
+      export ECOFLOW_DEVICES_PRETTY_NAMES="$(cat ${toString cfg.ecoflowDevicesPrettyNamesFile})"
+      exec ${lib.getExe pkgs.go-ecoflow-exporter}'';
+    serviceConfig = {
+      AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+      CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+      MemoryDenyWriteExecute = true;
+      NoNewPrivileges = true;
+      ProtectSystem = "strict";
+      Restart = "on-failure";
+      RestrictAddressFamilies = [
+        "AF_INET"
+        "AF_INET6"
+      ];
+      RestrictNamespaces = true;
+      User = "prometheus"; # context needed to runtime access encrypted token and secrets
+    };
+  };
+}

From 72857eab9f577157ca606015cec5861ba104b63f Mon Sep 17 00:00:00 2001
From: "PAEPCKE, Michael" <git@paepcke.de>
Date: Fri, 4 Apr 2025 07:19:56 +0000
Subject: [PATCH 124/225] prometheus-tibber-exporter: init tibber nixos module
 integration

---
 .../monitoring/prometheus/exporters.nix       |  1 +
 .../prometheus/exporters/tibber.nix           | 44 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/tibber.nix

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index caf7afcc1e07..fd3a66b0eac4 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -122,6 +122,7 @@ let
         "statsd"
         "surfboard"
         "systemd"
+        "tibber"
         "unbound"
         "unpoller"
         "v2ray"
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/tibber.nix b/nixos/modules/services/monitoring/prometheus/exporters/tibber.nix
new file mode 100644
index 000000000000..670f23a54d20
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/tibber.nix
@@ -0,0 +1,44 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.prometheus.exporters.tibber;
+  inherit (lib) mkOption types concatStringsSep;
+in
+{
+  port = 9489;
+  extraOpts = {
+    apiTokenPath = mkOption {
+      type = types.path;
+      default = null;
+      description = ''
+        Add here the path to your personal Tibber API Token ('Bearer Token') File.
+        Get your personal Tibber API Token here: https://developer.tibber.com
+        Do not share your personal plaintext Tibber API Token via github. (see: ryantm/agenix, mic92/sops)
+      '';
+    };
+  };
+  serviceOpts = {
+    script = ''
+      export TIBBER_TOKEN="$(cat ${toString cfg.apiTokenPath})"
+      exec ${pkgs.prometheus-tibber-exporter}/bin/tibber-exporter --listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " \\\n  " cfg.extraFlags}
+    '';
+    serviceConfig = {
+      AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+      CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+      MemoryDenyWriteExecute = true;
+      NoNewPrivileges = true;
+      ProtectSystem = "strict";
+      Restart = "on-failure";
+      RestrictAddressFamilies = [
+        "AF_INET"
+        "AF_INET6"
+      ];
+      RestrictNamespaces = true;
+      User = "prometheus"; # context needed to runtime access encrypted token and secrets
+    };
+  };
+}

From d6c28d909f1e3ba09f7dfae63fbdc70d772f52f2 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 4 Apr 2025 13:07:31 +0530
Subject: [PATCH 125/225] dprint-plugins: update

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix       | 6 +++---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix    | 6 +++---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix   | 6 +++---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix       | 6 +++---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix | 6 +++---
 pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix            | 6 +++---
 pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix       | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
index 2d8702539a0a..01b0c1bdfaa3 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "JSON/JSONC code formatter.";
-  hash = "sha256-Sw+HkUb4K2wrLuQRZibr8gOCR3Rz36IeId4Vd4LijmY=";
+  hash = "sha256-uFcFLi9aYsBrAqkhFmg9GI+LKiV19LxdNjxQ85EH9To=";
   initConfig = {
     configExcludes = [ "**/*-lock.json" ];
     configKey = "json";
@@ -9,6 +9,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-json";
   updateUrl = "https://plugins.dprint.dev/dprint/json/latest.json";
-  url = "https://plugins.dprint.dev/json-0.19.4.wasm";
-  version = "0.19.4";
+  url = "https://plugins.dprint.dev/json-0.20.0.wasm";
+  version = "0.20.0";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix
index f1ac0eae9708..6d3533bf2f61 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "Jupyter notebook code block formatter.";
-  hash = "sha256-877CEZbMlj9cHkFtl16XCnan37SeEGUL3BHaUKUv8S4=";
+  hash = "sha256-IlGwt2TnKeH9NwmUmU1keaTInXgYQVLIPNnr30A9lsM=";
   initConfig = {
     configExcludes = [ ];
     configKey = "jupyter";
@@ -9,6 +9,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-jupyter";
   updateUrl = "https://plugins.dprint.dev/dprint/jupyter/latest.json";
-  url = "https://plugins.dprint.dev/jupyter-0.1.5.wasm";
-  version = "0.1.5";
+  url = "https://plugins.dprint.dev/jupyter-0.2.0.wasm";
+  version = "0.2.0";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix
index 0d17600f6827..d33a4a32311c 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "Markdown code formatter.";
-  hash = "sha256-PIEN9UnYC8doJpdzS7M6QEHQNQtj7WwXAgvewPsTjqs=";
+  hash = "sha256-fBy+G+DkJqhrCyyaMjmXRe1VeSeCYO+XmJ8ogwAoptA=";
   initConfig = {
     configExcludes = [ ];
     configKey = "markdown";
@@ -9,6 +9,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-markdown";
   updateUrl = "https://plugins.dprint.dev/dprint/markdown/latest.json";
-  url = "https://plugins.dprint.dev/markdown-0.17.8.wasm";
-  version = "0.17.8";
+  url = "https://plugins.dprint.dev/markdown-0.18.0.wasm";
+  version = "0.18.0";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix
index c45e02804f64..de518669f248 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "TOML code formatter.";
-  hash = "sha256-4g/nu8Wo7oF+8OAyXOzs9MuGpt2RFGvD58Bafnrr3ZQ=";
+  hash = "sha256-ASbIESaRVC0wtSpjkHbsyD4Hus6HdjjO58aRX9Nrhik=";
   initConfig = {
     configExcludes = [ ];
     configKey = "toml";
@@ -9,6 +9,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-toml";
   updateUrl = "https://plugins.dprint.dev/dprint/toml/latest.json";
-  url = "https://plugins.dprint.dev/toml-0.6.4.wasm";
-  version = "0.6.4";
+  url = "https://plugins.dprint.dev/toml-0.7.0.wasm";
+  version = "0.7.0";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
index a3a805827ec0..bef6fad48093 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "TypeScript/JavaScript code formatter.";
-  hash = "sha256-urgKQOjgkoDJCH/K7DWLJCkD0iH0Ok+rvrNDI0i4uS0=";
+  hash = "sha256-/N6TH5hYsTHJcBWwpz874EDRxBv+SRhyPO8IyN5dzDU=";
   initConfig = {
     configExcludes = [ "**/node_modules" ];
     configKey = "typescript";
@@ -16,6 +16,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-typescript";
   updateUrl = "https://plugins.dprint.dev/dprint/typescript/latest.json";
-  url = "https://plugins.dprint.dev/typescript-0.93.3.wasm";
-  version = "0.93.3";
+  url = "https://plugins.dprint.dev/typescript-0.94.0.wasm";
+  version = "0.94.0";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
index c01cad63c064..81bb3435fdaf 100644
--- a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "CSS, SCSS, Sass and Less formatter.";
-  hash = "sha256-zt7F1tgPhPAn+gtps6+JB5RtvjIZw2n/G85Bv6kazgU=";
+  hash = "sha256-mFlhfqtglKtKNls96PO/2AWLL1fNC5msQCd9EgdKauE=";
   initConfig = {
     configExcludes = [ "**/node_modules" ];
     configKey = "malva";
@@ -14,6 +14,6 @@ mkDprintPlugin {
   };
   pname = "g-plane-malva";
   updateUrl = "https://plugins.dprint.dev/g-plane/malva/latest.json";
-  url = "https://plugins.dprint.dev/g-plane/malva-v0.11.1.wasm";
-  version = "0.11.1";
+  url = "https://plugins.dprint.dev/g-plane/malva-v0.11.2.wasm";
+  version = "0.11.2";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
index b948d3569013..98823309f6d0 100644
--- a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, and Vento formatter.";
-  hash = "sha256-G8UnJbc+oZ60V3oi8W2SS6H06zEYfY3wpmSUp+1GF8k=";
+  hash = "sha256-fCvurr8f79io/jIjwCfwr/WGjvcKZtptRrx9GFfytSI=";
   initConfig = {
     configExcludes = [ ];
     configKey = "markup";
@@ -19,6 +19,6 @@ mkDprintPlugin {
   };
   pname = "g-plane-markup_fmt";
   updateUrl = "https://plugins.dprint.dev/g-plane/markup_fmt/latest.json";
-  url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.18.0.wasm";
-  version = "0.18.0";
+  url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.19.0.wasm";
+  version = "0.19.0";
 }

From c57db49783197cf983b6d6cd19079e34636c9896 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 07:51:49 +0000
Subject: [PATCH 126/225] kdePackages.qtutilities: 6.14.6 -> 6.15.0

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

diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix
index 02300531ef34..18007415ad3f 100644
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtutilities";
-  version = "6.14.6";
+  version = "6.15.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "qtutilities";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-A61X6WKrP7CVgcRyB6phrVQo/B9VESRo0xTZV49KA3M=";
+    hash = "sha256-FWDvcUATod1n8CICmlQl/RA57c0EjLtwZ05mmVzc6Ec=";
   };
 
   nativeBuildInputs = [

From 7236ac70cbc0b3ff08c18dce12ae1f7315581b60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 08:33:40 +0000
Subject: [PATCH 127/225] tagparser: 12.4.0 -> 12.5.0

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

diff --git a/pkgs/by-name/ta/tagparser/package.nix b/pkgs/by-name/ta/tagparser/package.nix
index 6910a8f1900d..5bd6c959a538 100644
--- a/pkgs/by-name/ta/tagparser/package.nix
+++ b/pkgs/by-name/ta/tagparser/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tagparser";
-  version = "12.4.0";
+  version = "12.5.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "tagparser";
     rev = "v${version}";
-    hash = "sha256-wVdE1lgSQsH4g10/lxa8bZlYT141Vd7gRhefxyz8kRM=";
+    hash = "sha256-Xu6pvqyBWew3xD0nD5k7QKUOEpDchF1FiuSN7oHfYME=";
   };
 
   nativeBuildInputs = [ cmake ];

From 43d457772b6b5e7e58dd8bdca6ed3335c682361e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 4 Apr 2025 10:26:29 +0200
Subject: [PATCH 128/225] python312Packages.qcodes: 0.51.0 -> 0.52.0

Diff: https://github.com/microsoft/Qcodes/compare/refs/tags/v0.51.0...v0.52.0

Changelog: https://github.com/QCoDeS/Qcodes/releases/tag/v0.52.0
---
 pkgs/development/python-modules/qcodes/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix
index 757e82e773ff..c89d785f6c7b 100644
--- a/pkgs/development/python-modules/qcodes/default.nix
+++ b/pkgs/development/python-modules/qcodes/default.nix
@@ -51,6 +51,7 @@
   lxml,
   pip,
   pytest-asyncio,
+  pytest-cov-stub,
   pytest-mock,
   pytest-rerunfailures,
   pytest-xdist,
@@ -60,14 +61,14 @@
 
 buildPythonPackage rec {
   pname = "qcodes";
-  version = "0.51.0";
+  version = "0.52.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "Qcodes";
     tag = "v${version}";
-    hash = "sha256-QgCMoZrC3ZCo8yayRXw9fvBj5xi+XH2x/E1MuQFULPo=";
+    hash = "sha256-AQBzYKD4RsPQBtq/FxFwYnSUf8wW87JOb2cOnk9MHDY=";
   };
 
   postPatch = ''
@@ -142,6 +143,7 @@ buildPythonPackage rec {
     lxml
     pip
     pytest-asyncio
+    pytest-cov-stub
     pytest-mock
     pytest-rerunfailures
     pytest-xdist

From 2728be7c3150573a0e45c7cd77c03000520541f9 Mon Sep 17 00:00:00 2001
From: MunsMan <munsman.github@gmail.com>
Date: Thu, 3 Apr 2025 23:01:32 +0200
Subject: [PATCH 129/225] nixos/glance: fix broken server stats

---
 nixos/modules/services/web-apps/glance.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/glance.nix b/nixos/modules/services/web-apps/glance.nix
index fbc310daea77..69170858f7c8 100644
--- a/nixos/modules/services/web-apps/glance.nix
+++ b/nixos/modules/services/web-apps/glance.nix
@@ -125,7 +125,7 @@ in
         ProtectKernelModules = true;
         ProtectKernelTunables = true;
         ProtectControlGroups = true;
-        ProcSubset = "pid";
+        ProcSubset = "all";
         RestrictNamespaces = true;
         RestrictRealtime = true;
         SystemCallArchitectures = "native";

From d3780887fa0c2d81bd73ba5d055ecc41f5765085 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 4 Apr 2025 11:02:38 +0200
Subject: [PATCH 130/225] python312Packages.qcodes-contrib-drivers: 0.22.0 ->
 0.23.0

Diff: https://github.com/QCoDeS/Qcodes_contrib_drivers/compare/refs/tags/v0.22.0...v0.23.0

Changelog: https://github.com/QCoDeS/Qcodes_contrib_drivers/releases/tag/v0.23.0
---
 .../qcodes-contrib-drivers/default.nix        | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
index 9f4bd2cf0de6..ef5048090a7a 100644
--- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
+++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
@@ -1,65 +1,65 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
-  fetchpatch2,
+
+  # build-system
   setuptools,
   versioningit,
+
+  # dependencies
+  autobahn,
   cffi,
-  qcodes,
   packaging,
   pandas,
-  pytestCheckHook,
+  qcodes,
+  python-dotenv,
+
+  # tests
   pytest-mock,
+  pytestCheckHook,
   pyvisa-sim,
-  stdenv,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "qcodes-contrib-drivers";
-  version = "0.22.0";
+  version = "0.23.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "QCoDeS";
     repo = "Qcodes_contrib_drivers";
     tag = "v${version}";
-    sha256 = "sha256-/W5oC5iqYifMR3/s7aSQ2yTJNmkemkc0KVxIU0Es3zY=";
+    hash = "sha256-m2idBaQl2OVhrY5hcLTeXY6BycGf0ufa/ySgxaU2L/4=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "numpy-v2-compat.patch";
-      url = "https://github.com/QCoDeS/Qcodes_contrib_drivers/commit/fc792779dbc0b023bdccfe8877dac192d75a88db.patch?full_index=1";
-      hash = "sha256-G+/IVG9a4mOFudpqEpI+Q/+WwF6lm2nRKjODCdzWHe0=";
-    })
-  ];
-
   build-system = [
     setuptools
     versioningit
   ];
 
   dependencies = [
+    autobahn
     cffi
-    qcodes
     packaging
     pandas
+    qcodes
+    python-dotenv
   ];
 
   nativeCheckInputs = [
-    pytestCheckHook
     pytest-mock
+    pytestCheckHook
     pyvisa-sim
+    writableTmpDirAsHomeHook
   ];
 
   pythonImportsCheck = [ "qcodes_contrib_drivers" ];
 
   disabledTests =
-    lib.optionals (stdenv.hostPlatform.isDarwin) [
+    lib.optionals stdenv.hostPlatform.isDarwin [
       # At index 13 diff: 'sour6:volt 0.29000000000000004' != 'sour6:volt 0.29'
       "test_stability_diagram_external"
     ]
@@ -68,10 +68,6 @@ buildPythonPackage rec {
       "test_stability_diagram_external"
     ];
 
-  postInstall = ''
-    export HOME="$TMPDIR"
-  '';
-
   meta = {
     description = "User contributed drivers for QCoDeS";
     homepage = "https://github.com/QCoDeS/Qcodes_contrib_drivers";

From ed26b7b0c374e946dbd774e00d7f0aa1b8fde87f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 4 Apr 2025 11:37:33 +0200
Subject: [PATCH 131/225] nixos/onlyoffice: misc cleanup

---
 nixos/modules/services/web-apps/onlyoffice.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix
index 5d2e03147a68..48e51b13bb39 100644
--- a/nixos/modules/services/web-apps/onlyoffice.nix
+++ b/nixos/modules/services/web-apps/onlyoffice.nix
@@ -114,7 +114,7 @@ in
               proxy_pass http://onlyoffice-docservice/$2$3;
             '';
             # /etc/nginx/includes/ds-docservice.conf
-            #disable caching for api.js
+            # disable caching for api.js
             "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(web-apps\\/apps\\/api\\/documents\\/api\\.js)$".extraConfig =
               ''
                 expires -1;
@@ -124,26 +124,23 @@ in
             "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(document_editor_service_worker\\.js)$".extraConfig =
               ''
                 expires 365d;
-                # gzip_static on;
-                alias  ${cfg.package}/var/www/onlyoffice/documentserver/sdkjs/common/serviceworker/$2;
+                alias ${cfg.package}/var/www/onlyoffice/documentserver/sdkjs/common/serviceworker/$2;
               '';
-            #suppress logging the unsupported locale error in web-apps
+            # suppress logging the unsupported locale error in web-apps
             "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(web-apps)(\\/.*\\.json)$".extraConfig = ''
               expires 365d;
               error_log /dev/null crit;
               alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3;
             '';
-            #suppress logging the unsupported locale error in plugins
+            # suppress logging the unsupported locale error in plugins
             "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(sdkjs-plugins)(\\/.*\\.json)$".extraConfig = ''
               expires 365d;
               error_log /dev/null crit;
-              # gzip_static on;
               alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3;
             '';
             "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(web-apps|sdkjs|sdkjs-plugins|fonts|dictionaries)(\\/.*)$".extraConfig =
               ''
                 expires 365d;
-                # gzip_static on;
                 alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3;
               '';
             "~* ^(\\/cache\\/files.*)(\\/.*)".extraConfig = ''
@@ -302,9 +299,8 @@ in
               ' /run/onlyoffice/config/default.json | sponge /run/onlyoffice/config/default.json
 
             chmod u+w /run/onlyoffice/config/production-linux.json
-            jq '
-              .FileConverter.converter.x2tPath = "${cfg.x2t}/bin/x2t"
-              ' /run/onlyoffice/config/production-linux.json | sponge /run/onlyoffice/config/production-linux.json
+            jq '.FileConverter.converter.x2tPath = "${cfg.x2t}/bin/x2t"' \
+              /run/onlyoffice/config/production-linux.json | sponge /run/onlyoffice/config/production-linux.json
 
             if psql -d onlyoffice -c "SELECT 'task_result'::regclass;" >/dev/null; then
               psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/removetbl.sql

From dbb3bdb4d4d981692cefe88436eb36f3a59f9d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 4 Apr 2025 11:37:49 +0200
Subject: [PATCH 132/225] onlyoffice-documentserver: fail loudly when
 HASH_POSTFIX would change

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

diff --git a/pkgs/by-name/on/onlyoffice-documentserver/package.nix b/pkgs/by-name/on/onlyoffice-documentserver/package.nix
index a86bf31a641f..0d828b87580c 100644
--- a/pkgs/by-name/on/onlyoffice-documentserver/package.nix
+++ b/pkgs/by-name/on/onlyoffice-documentserver/package.nix
@@ -61,9 +61,9 @@ let
       mkdir -p var/lib/onlyoffice/ var/www/onlyoffice/documentserver/fonts/
 
       # see usr/bin/documentserver-flush-cache.sh
-      cp var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js.tpl var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js
-      HASH=$(basename $out | cut -d '-' -f 1)
-      sed -i "s/{{HASH_POSTFIX}}/$HASH/g" var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js
+      cp var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js{.tpl,}
+      substituteInPlace var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js \
+        --replace-fail '{{HASH_POSTFIX}}' "$(basename $out | cut -d '-' -f 1)"
 
       mv * $out/
     '';

From 7256f29179189f6ee5bc2b36eec9d2825137ecec Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 4 Apr 2025 12:47:28 +0300
Subject: [PATCH 133/225] splash: 3.11.1 -> 3.11.2

Diff: https://github.com/danieljprice/splash/compare/v3.11.1...v3.11.2
---
 pkgs/by-name/sp/splash/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/splash/package.nix b/pkgs/by-name/sp/splash/package.nix
index 722b6f139dbb..ff66011a3629 100644
--- a/pkgs/by-name/sp/splash/package.nix
+++ b/pkgs/by-name/sp/splash/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "splash";
-  version = "3.11.1";
+  version = "3.11.2";
 
   src = fetchFromGitHub {
     owner = "danieljprice";
     repo = "splash";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zENMQpLsm6GlqrXsFDjEnMbtODcqwhB3jGfGHLuGcYw=";
+    hash = "sha256-YB0cgxpRlya8/7fYxPKWBCovHvE/N7HY/7nwKnzYiJc=";
   };
 
   nativeBuildInputs = [

From 915d70217de01d00d365369abf64c5be6fa2139d Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Fri, 4 Apr 2025 17:54:55 +0800
Subject: [PATCH 134/225] aider-chat: 0.80.0 -> 0.81.0, enable update script

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

diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index 5cd871b868d3..519738bfad42 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -112,6 +112,7 @@
   torch,
   nltk,
   boto3,
+  nix-update-script,
 }:
 
 let
@@ -123,7 +124,7 @@ let
     ];
   };
 
-  version = "0.80.0";
+  version = "0.81.0";
   aider-chat = buildPythonPackage {
     pname = "aider-chat";
     inherit version;
@@ -136,7 +137,7 @@ let
       owner = "Aider-AI";
       repo = "aider";
       tag = "v${version}";
-      hash = "sha256-W3GO5+0rprQHmn1upL3pcXuv2e9Wir6TW0tUnvZj48E=";
+      hash = "sha256-xWOXsffLAVBZvJM8PuAJ12IrmNLfXuqHrbIMtPM1leE=";
     };
 
     pythonRelaxDeps = true;
@@ -365,6 +366,8 @@ let
             makeWrapperArgs = makeWrapperArgs ++ playwrightArgs ++ helpArgs;
           }
         );
+
+      updateScript = nix-update-script { };
     };
 
     meta = {

From 36be2e2a525ac379085673ad47901299f1bca402 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 09:56:31 +0000
Subject: [PATCH 135/225] rain: 1.21.0 -> 1.22.0

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

diff --git a/pkgs/by-name/ra/rain/package.nix b/pkgs/by-name/ra/rain/package.nix
index 05b2b0189e8b..eb1a8ec4d010 100644
--- a/pkgs/by-name/ra/rain/package.nix
+++ b/pkgs/by-name/ra/rain/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "rain";
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "aws-cloudformation";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-2yb965fDzNgrPXT2xMRdqD/inyvlwdKlkMj16YSFHBk=";
+    sha256 = "sha256-0FjJXOmLHM0At0TJdcsYTafgDbw+C37BH11ft+UjEl0=";
   };
 
-  vendorHash = "sha256-TlS9SfqMJa5w+JMUx+7ZMF0xk/VsnjOScSGXEw1dVkU=";
+  vendorHash = "sha256-A+fQCiA2jArnhxbKxNmRQB6wY5mcmrY+fMtZQX5aBmU=";
 
   subPackages = [ "cmd/rain" ];
 

From ccbc5c1282e114d123e9cf06cf96a9a5fd6735dc Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 23 Feb 2025 02:43:46 +0100
Subject: [PATCH 136/225] gpupad: init at 2.4.0

---
 .../gp/gpupad/glslang-use-combined-lib.patch  | 15 +++++
 pkgs/by-name/gp/gpupad/package.nix            | 63 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 pkgs/by-name/gp/gpupad/glslang-use-combined-lib.patch
 create mode 100644 pkgs/by-name/gp/gpupad/package.nix

diff --git a/pkgs/by-name/gp/gpupad/glslang-use-combined-lib.patch b/pkgs/by-name/gp/gpupad/glslang-use-combined-lib.patch
new file mode 100644
index 000000000000..945712009db1
--- /dev/null
+++ b/pkgs/by-name/gp/gpupad/glslang-use-combined-lib.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a05c447..20a5c98 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -276,8 +276,8 @@ endif()
+ 
+ # link glslang
+ find_package(glslang CONFIG REQUIRED)
+-target_link_libraries(${PROJECT_NAME} PRIVATE glslang::OSDependent glslang::glslang 
+-    glslang::MachineIndependent glslang::GenericCodeGen glslang::glslang-default-resource-limits 
++target_link_libraries(${PROJECT_NAME} PRIVATE glslang::glslang 
++    glslang::glslang-default-resource-limits 
+     glslang::SPVRemapper glslang::SPIRV)
+ 
+ # link SPIRV-Cross
diff --git a/pkgs/by-name/gp/gpupad/package.nix b/pkgs/by-name/gp/gpupad/package.nix
new file mode 100644
index 000000000000..7b076839a3d5
--- /dev/null
+++ b/pkgs/by-name/gp/gpupad/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+
+  glslang,
+  imath,
+  ktx-tools,
+  openimageio,
+  qt6Packages,
+  spdlog,
+  spirv-cross,
+  vulkan-memory-allocator,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gpupad";
+  version = "2.4.0";
+
+  src = fetchFromGitHub {
+    owner = "houmain";
+    repo = "gpupad";
+    tag = finalAttrs.version;
+    hash = "sha256-yCoLvocfqYOwbsGn2r3+2iThDZCkRAUrNI71fIH7XXU=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    # the current version of glslang no longer separates its libs into sublibs
+    ./glslang-use-combined-lib.patch
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    qt6Packages.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    glslang
+    imath # needed for openimageio
+    ktx-tools
+    openimageio
+    qt6Packages.qtbase
+    qt6Packages.qtdeclarative
+    qt6Packages.qtmultimedia
+    spdlog
+    spirv-cross
+    vulkan-memory-allocator
+  ];
+
+  meta = {
+    description = "Flexible GLSL and HLSL shader editor and IDE";
+    homepage = "https://github.com/houmain/gpupad";
+    changelog = "https://github.com/houmain/gpupad/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ tomasajt ];
+    mainProgram = "gpupad";
+    platforms = lib.platforms.linux;
+  };
+})

From b038877f0203013915bfb6dd49908cf86c333620 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Apr 2025 09:45:24 +0000
Subject: [PATCH 137/225] mosdepth: 0.3.10 -> 0.3.11

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

diff --git a/pkgs/by-name/mo/mosdepth/package.nix b/pkgs/by-name/mo/mosdepth/package.nix
index 9e270b3b4e74..befa0db0636f 100644
--- a/pkgs/by-name/mo/mosdepth/package.nix
+++ b/pkgs/by-name/mo/mosdepth/package.nix
@@ -8,7 +8,7 @@
 
 buildNimPackage (finalAttrs: {
   pname = "mosdepth";
-  version = "0.3.10";
+  version = "0.3.11";
 
   requiredNimVersion = 1;
 
@@ -16,7 +16,7 @@ buildNimPackage (finalAttrs: {
     owner = "brentp";
     repo = "mosdepth";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-RAE3k2yA2zsIr5JFYb5bPaMzdoEKms7TKaqVhPS5LzY=";
+    hash = "sha256-EzzDuzPAyNkL2tFWre86U+kx3SvLPbWto2/vfLdwHGI=";
   };
 
   lockFile = ./lock.json;

From edef4448e8c89b8a8acfc0b91cb5304b77363006 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 10:03:54 +0000
Subject: [PATCH 138/225] tippecanoe: 2.75.1 -> 2.77.0

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

diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix
index e298a641dc70..e7d7ab976153 100644
--- a/pkgs/by-name/ti/tippecanoe/package.nix
+++ b/pkgs/by-name/ti/tippecanoe/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tippecanoe";
-  version = "2.75.1";
+  version = "2.77.0";
 
   src = fetchFromGitHub {
     owner = "felt";
     repo = "tippecanoe";
     tag = finalAttrs.version;
-    hash = "sha256-rBuk34lOrp9aW7yK0LOTRqFJg3J8IogR01kcFhgK12Y=";
+    hash = "sha256-7yRrUn1U0iERlix/8/oaMaizlpzqdiSIHj298ykaJjE=";
   };
 
   buildInputs = [

From e1964791d66993a8aa5b9f19c1c6dd5827851355 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Mar 2025 17:04:36 +0000
Subject: [PATCH 139/225] dxx-rebirth: 0.60.0-beta2-unstable-2025-03-01 ->
 0.60.0-beta2-unstable-2025-03-29

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

diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index 0200e2991468..378cc9bb60dd 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -24,13 +24,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "dxx-rebirth";
-  version = "0.60.0-beta2-unstable-2025-03-01";
+  version = "0.60.0-beta2-unstable-2025-03-29";
 
   src = fetchFromGitHub {
     owner = "dxx-rebirth";
     repo = "dxx-rebirth";
-    rev = "d96665375a8bd273dcc0d0b21c87249861b0e00f";
-    hash = "sha256-HoGRpqfgPh7nBYbX5ZGETgNNKtDs22IarVzvSTWLi58=";
+    rev = "ddc84fa623ed508073cf99244db731bd73f36b6b";
+    hash = "sha256-VZ3PQ4YECM+z+V1zPSNdgIIBFjRIAunEmhENJAUj+P8=";
   };
 
   nativeBuildInputs = [

From 7361e6d6b1f44410c79d431f95b7b48addbe669f Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Fri, 4 Apr 2025 12:07:54 +0200
Subject: [PATCH 140/225] bird3: 3.0.1 -> 3.1.0 (#395932)

Changelog: https://gitlab.nic.cz/labs/bird/-/blob/v3.1.0/NEWS
---
 pkgs/by-name/bi/bird3/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bird3/package.nix b/pkgs/by-name/bi/bird3/package.nix
index 279199cafb4f..40459a43611f 100644
--- a/pkgs/by-name/bi/bird3/package.nix
+++ b/pkgs/by-name/bi/bird3/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bird";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchurl {
     url = "https://bird.network.cz/download/bird-${version}.tar.gz";
-    hash = "sha256-iGhAPKqE4lVLtuYK2+fGV+e7fErEGRDjmPNeI2upD6E=";
+    hash = "sha256-xxY49Xb0MWcEN++dkL6lZZK8VjcB3nhpg/RCJk7Hdiw=";
   };
 
   nativeBuildInputs = [

From 64abab71e51268536d8a5b368170bdfb5c65d5e6 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 4 Apr 2025 13:12:23 +0300
Subject: [PATCH 141/225] vencord: 1.11.7 -> 1.11.8

Diff: https://github.com/Vendicated/Vencord/compare/v1.11.7...v1.11.8
---
 pkgs/by-name/ve/vencord/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 48c98890d081..63c97ea03c01 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -15,18 +15,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.11.7";
+  version = "1.11.8";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-WzmRz0wf/Ss90FmXXp6gaylC0k/k/QkFaFddlnLo+Xk=";
+    hash = "sha256-Ej04ONaeNt55mbQ5RTKM4MySYsw3UJky9ZK9h1gMEzo=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname src;
-    hash = "sha256-g9BSVUKpn74D9eIDj/lS1Y6w/+AnhCw++st4s4REn+A=";
+    hash = "sha256-hO6QKRr4jTfesRDAEGcpFeJmGTGLGMw6EgIvD23DNzw=";
   };
 
   nativeBuildInputs = [
@@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
     ESBUILD_BINARY_PATH = lib.getExe (
       esbuild.overrideAttrs (
         final: _: {
-          version = "0.25.0";
+          version = "0.25.1";
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
             rev = "v${final.version}";
-            hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA=";
+            hash = "sha256-vrhtdrvrcC3dQoJM6hWq6wrGJLSiVww/CNPlL1N5kQ8=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
         }

From 81758d399f9bc7e3c666464dfd4e24734be78cec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 10:21:39 +0000
Subject: [PATCH 142/225] moosefs: 4.57.5 -> 4.57.6

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

diff --git a/pkgs/by-name/mo/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix
index 56944ad6be76..37dc19b74b25 100644
--- a/pkgs/by-name/mo/moosefs/package.nix
+++ b/pkgs/by-name/mo/moosefs/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "moosefs";
-  version = "4.57.5";
+  version = "4.57.6";
 
   src = fetchFromGitHub {
     owner = "moosefs";
     repo = "moosefs";
     rev = "v${version}";
-    sha256 = "sha256-5sVnr+bUbmIc4qYC/h+d/s1ow3cxeL2Yo/JitCs6cbE=";
+    sha256 = "sha256-vCwRM6UIcT71e6u5QZzcTW6LK/VNlVG/19XxsHnn2a8=";
   };
 
   nativeBuildInputs = [

From 375215442b6865df1d2efdf17b3b71be837d622b Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Fri, 28 Mar 2025 22:12:14 -0700
Subject: [PATCH 143/225] coreboot-toolchain: 24.12 -> 25.03

---
 pkgs/development/tools/misc/coreboot-toolchain/default.nix | 4 ++--
 pkgs/development/tools/misc/coreboot-toolchain/stable.nix  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix
index 6ca15bf142d8..a0d9a450ff55 100644
--- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix
+++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix
@@ -26,12 +26,12 @@ let
 
       stdenvNoCC.mkDerivation (finalAttrs: {
         pname = "coreboot-toolchain-${arch}";
-        version = "24.12";
+        version = "25.03";
 
         src = fetchgit {
           url = "https://review.coreboot.org/coreboot";
           rev = finalAttrs.version;
-          hash = "sha256-vK2kxLJZFz7QqWYRF6JIGrM2Hobmzp31HtQMpb1mx9M=";
+          hash = "sha256-zyfBQKVton+2vjYd6fqrUqkHY9bci411pujRGabvTjQ=";
           fetchSubmodules = false;
           leaveDotGit = true;
           postFetch = ''
diff --git a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix
index a2cbc3c57de0..d8ecb7b969d2 100644
--- a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix
+++ b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix
@@ -36,10 +36,10 @@
     };
   }
   {
-    name = "acpica-unix-20230628.tar.gz";
+    name = "acpica-unix-20241212.tar.gz";
     archive = fetchurl {
-      sha256 = "1kjwzyfrmw0fhawjvpqib3l5jxdlcpj3vv92sb7ls8ixbrs6m1w6";
-      url = "https://downloadmirror.intel.com/783534/acpica-unix-20230628.tar.gz";
+      sha256 = "0q8rqc9nxvyg4310rc93az04j01p91q7ipzvhl2722rrxv7q7jlx";
+      url = "https://github.com/acpica/acpica/releases/download/R2024_12_12/acpica-unix-20241212.tar.gz";
     };
   }
   {

From 3cf5c2fa15ce4b8c9325d695301789fa9f0d60d2 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Fri, 28 Mar 2025 22:12:28 -0700
Subject: [PATCH 144/225] coreboot-utils: 24.12 -> 25.03

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

diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix
index 7f2777b3a5d4..e0892eda4b57 100644
--- a/pkgs/tools/misc/coreboot-utils/default.nix
+++ b/pkgs/tools/misc/coreboot-utils/default.nix
@@ -16,7 +16,7 @@
 }:
 
 let
-  version = "24.12";
+  version = "25.03";
 
   commonMeta = {
     description = "Various coreboot-related tools";
@@ -45,7 +45,7 @@ let
         src = fetchgit {
           url = "https://review.coreboot.org/coreboot";
           rev = version;
-          hash = "sha256-PtHvzMf9sKvrgWVT5XVCy4BbMklCKcpnJAE+WeE2Cgs=";
+          hash = "sha256-tsNdsH+GxjLUTd7KXHMZUTNTIAWeKJ3BNy1Lehjo8Eo=";
         };
 
         enableParallelBuilding = true;

From 2c4d04f74a1bb9165402bac494d83f226b1cb95e Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Fri, 28 Mar 2025 07:41:15 +0000
Subject: [PATCH 145/225] profanity: 0.14.0 -> 0.15.0

- switch to finalAttrs pattern
---
 .../instant-messengers/profanity/default.nix       | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 5ea2ed6bc1b3..fa4ca8190625 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -37,15 +37,15 @@
   gtk3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "profanity";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "profanity-im";
     repo = "profanity";
-    rev = version;
-    hash = "sha256-u/mp+vtMj602LfrulA+nhLNH8K6sqKIOuPJzhZusVmE=";
+    rev = finalAttrs.version;
+    hash = "sha256-3TmnbTnL8SPSd3seThavOOJVELi8kWLSlZlAub24KZ4=";
   };
 
   patches = [
@@ -106,10 +106,6 @@ stdenv.mkDerivation rec {
     ++ lib.optionals pythonPluginSupport [ "--enable-python-plugins" ]
     ++ lib.optionals omemoSupport [ "--enable-omemo" ];
 
-  preAutoreconf = ''
-    mkdir m4
-  '';
-
   doCheck = true;
 
   LC_ALL = "en_US.utf8";
@@ -126,4 +122,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.devhell ];
     platforms = platforms.unix;
   };
-}
+})

From 439fee9f72c3d8173249e2186b23d7371a681567 Mon Sep 17 00:00:00 2001
From: usertam <code@usertam.dev>
Date: Wed, 26 Mar 2025 17:49:34 +0800
Subject: [PATCH 146/225] maintainers: update usertam email and keys

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f06d2c2cfdcd..014ac42e06cd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24957,10 +24957,11 @@
     name = "Mason Mackaman";
   };
   usertam = {
-    email = "nix@usertam.dev";
+    name = "Samuel Tam";
+    email = "code@usertam.dev";
     github = "usertam";
     githubId = 22500027;
-    name = "Samuel Tam";
+    keys = [ { fingerprint = "EC4E E490 3C82 3698 2CAB  D206 2D87 60B0 229E 2560"; } ];
   };
   uskudnik = {
     email = "urban.skudnik@gmail.com";

From edc90eb00a1b886807fcc863c620ca9ae7c07373 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Wed, 19 Mar 2025 13:16:10 -0500
Subject: [PATCH 147/225] nimble: 0.16.0 -> 0.18.0

---
 pkgs/by-name/ni/nimble/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nimble/package.nix b/pkgs/by-name/ni/nimble/package.nix
index c5ea0e9dc59b..6ae6fa28fde7 100644
--- a/pkgs/by-name/ni/nimble/package.nix
+++ b/pkgs/by-name/ni/nimble/package.nix
@@ -5,18 +5,20 @@
   nim,
   openssl,
   makeWrapper,
+
+  nix-update-script,
 }:
 
 buildNimPackage (
   final: prev: {
     pname = "nimble";
-    version = "0.16.4";
+    version = "0.18.0";
 
     src = fetchFromGitHub {
       owner = "nim-lang";
       repo = "nimble";
       rev = "v${final.version}";
-      hash = "sha256-ASodRov4rO/IhjQRRdqVnLWMG1voXWM9F6R6VJd9qkM=";
+      hash = "sha256-HFuJiozRsRlVIXIv+vRjsfosrBlWfnUYtep27Fy/PPA=";
       fetchSubmodules = true;
     };
 
@@ -32,6 +34,8 @@ buildNimPackage (
         --suffix PATH : ${lib.makeBinPath [ nim ]}
     '';
 
+    passthru.updateScript = nix-update-script { };
+
     meta = {
       description = "Package manager for the Nim programming language";
       homepage = "https://github.com/nim-lang/nimble";

From 5345e43b4944f1207d8b2a7424614f3400ca022d Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Wed, 19 Mar 2025 13:20:52 -0500
Subject: [PATCH 148/225] nimble: add daylinmorgan as maintainer

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

diff --git a/pkgs/by-name/ni/nimble/package.nix b/pkgs/by-name/ni/nimble/package.nix
index 6ae6fa28fde7..55883d1bcb1b 100644
--- a/pkgs/by-name/ni/nimble/package.nix
+++ b/pkgs/by-name/ni/nimble/package.nix
@@ -41,6 +41,7 @@ buildNimPackage (
       homepage = "https://github.com/nim-lang/nimble";
       license = lib.licenses.bsd3;
       mainProgram = "nimble";
+      maintainers = [ lib.maintainers.daylinmorgan ];
     };
   }
 )

From 7f100c8ea89b35db7c24da0a88c298ee150c6f93 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Mon, 24 Mar 2025 09:33:02 -0500
Subject: [PATCH 149/225] nimble: add changelog

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

diff --git a/pkgs/by-name/ni/nimble/package.nix b/pkgs/by-name/ni/nimble/package.nix
index 55883d1bcb1b..b495f71d01cf 100644
--- a/pkgs/by-name/ni/nimble/package.nix
+++ b/pkgs/by-name/ni/nimble/package.nix
@@ -39,6 +39,7 @@ buildNimPackage (
     meta = {
       description = "Package manager for the Nim programming language";
       homepage = "https://github.com/nim-lang/nimble";
+      changelog = "https://github.com/nim-lang/nimble/releases/tag/v${final.version}";
       license = lib.licenses.bsd3;
       mainProgram = "nimble";
       maintainers = [ lib.maintainers.daylinmorgan ];

From 5c8db99f60db399957f579bd23442283371d6050 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@slow.janky.email>
Date: Wed, 19 Mar 2025 11:23:17 +0000
Subject: [PATCH 150/225] ma: init at version 11

http://call-with-current-continuation.org/ma/ma.html
---
 pkgs/by-name/ma/ma/package.nix | 46 ++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/ma/ma/package.nix

diff --git a/pkgs/by-name/ma/ma/package.nix b/pkgs/by-name/ma/ma/package.nix
new file mode 100644
index 000000000000..50063cca5c35
--- /dev/null
+++ b/pkgs/by-name/ma/ma/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  tclPackages,
+  fetchurl,
+}:
+
+stdenv.mkDerivation {
+  pname = "ma";
+  version = "11";
+
+  src = fetchurl {
+    url = "http://call-with-current-continuation.org/ma/ma.tar.gz";
+    hash = "sha256-1UVxXbN2jSNm13BjyoN3jbKtkO3DUEEHaDOC2Ibbxf4=";
+  };
+
+  buildInputs = [
+    tclPackages.tk
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    ./build
+    for f in B ma ma-eval; do
+      substituteInPlace $f --replace-fail \
+        'set exec_prefix ""' "set exec_prefix \"$out/bin/\""
+    done
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -Dt $out/bin \
+      B awd ma ma-eval plumb pty win
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "minimalistic variant of the Acme editor";
+    homepage = "http://call-with-current-continuation.org/ma/ma.html";
+    mainProgram = "ma";
+    maintainers = with lib.maintainers; [ ehmry ];
+    license = lib.licenses.free;
+    inherit (tclPackages.tk.meta) platforms;
+  };
+}

From bc073b4c29e4fb4f5757144e04096e0c16c81932 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 10:39:53 +0000
Subject: [PATCH 151/225] lokalise2-cli: 3.1.1 -> 3.1.2

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

diff --git a/pkgs/by-name/lo/lokalise2-cli/package.nix b/pkgs/by-name/lo/lokalise2-cli/package.nix
index 6614c9a3382d..32cfb4202228 100644
--- a/pkgs/by-name/lo/lokalise2-cli/package.nix
+++ b/pkgs/by-name/lo/lokalise2-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "lokalise2-cli";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "lokalise";
     repo = "lokalise-cli-2-go";
     rev = "v${version}";
-    sha256 = "sha256-CFZB1nELQOBNOuISTjes4vhXMr8Pjq4Rj83nq/FfpMY=";
+    sha256 = "sha256-R8vzHuWkNznq/eeXUVHm9SJJmRV2B2WXKQFEHil+HiY=";
   };
 
-  vendorHash = "sha256-sM4v1EWxXPUFKFWcl9EBc8ZTmm2STOVoeGH9Zv+KEng=";
+  vendorHash = "sha256-thD8NtG9uVI4KwNQiNsVCUdyUcgAmnr+szsUQ2Ika1c=";
 
   doCheck = false;
 

From ed7eae38b4598bd4787aaf198e7c5b89773fdd7e Mon Sep 17 00:00:00 2001
From: Mitsuo HEIJO <mitsuo.heijo@gmail.com>
Date: Fri, 4 Apr 2025 20:11:45 +0900
Subject: [PATCH 152/225] gojq: install zsh completion

---
 pkgs/by-name/go/gojq/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/go/gojq/package.nix b/pkgs/by-name/go/gojq/package.nix
index bc2f9dea992c..365b7bc336c0 100644
--- a/pkgs/by-name/go/gojq/package.nix
+++ b/pkgs/by-name/go/gojq/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   testers,
   gojq,
+  installShellFiles,
 }:
 
 buildGoModule rec {
@@ -24,6 +25,12 @@ buildGoModule rec {
     "-w"
   ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion --cmd gojq --zsh _gojq
+  '';
+
   passthru.tests.version = testers.testVersion {
     package = gojq;
   };

From 6e164676985976249f8befa6415646c7b3c4f997 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Fri, 4 Apr 2025 17:13:02 +0530
Subject: [PATCH 153/225] lswt: add patch fixing JSON formatting of identifier
 string

---
 pkgs/by-name/ls/lswt/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ls/lswt/package.nix b/pkgs/by-name/ls/lswt/package.nix
index 1bd9c04df8f3..d69a7b509f43 100644
--- a/pkgs/by-name/ls/lswt/package.nix
+++ b/pkgs/by-name/ls/lswt/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromSourcehut,
+  fetchpatch,
   wayland-scanner,
   wayland,
 }:
@@ -17,6 +18,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-8jP6I2zsDt57STtuq4F9mcsckrjvaCE5lavqKTjhNT0=";
   };
 
+  patches = [
+    # Subject: [PATCH] fix JSON formatting of identifier string
+    (fetchpatch {
+      url = "https://git.sr.ht/~leon_plickat/lswt/commit/d35786da4383388c19f5437128fd393a6f16f74f.patch";
+      hash = "sha256-3RTq8BXRR7MgKV0BueoOjPORMrYVAKNbKR74hZ75W/Y=";
+    })
+  ];
+
   nativeBuildInputs = [ wayland-scanner ];
   buildInputs = [ wayland ];
 

From 8807f45da070cec9c6b5bb10da865a128cfde570 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Fri, 4 Apr 2025 13:44:11 +0200
Subject: [PATCH 154/225] nixosTests.librenms: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |   2 +-
 nixos/tests/librenms.nix  | 178 +++++++++++++++++++-------------------
 2 files changed, 89 insertions(+), 91 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5ffcaccf17f9..8176aeaccbc3 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -691,7 +691,7 @@ in
   leaps = handleTest ./leaps.nix { };
   lemmy = handleTest ./lemmy.nix { };
   libinput = handleTest ./libinput.nix { };
-  librenms = handleTest ./librenms.nix { };
+  librenms = runTest ./librenms.nix;
   libresprite = handleTest ./libresprite.nix { };
   libreswan = runTest ./libreswan.nix;
   libreswan-nat = runTest ./libreswan-nat.nix;
diff --git a/nixos/tests/librenms.nix b/nixos/tests/librenms.nix
index 05821dfa1000..d8d3e5eb92fa 100644
--- a/nixos/tests/librenms.nix
+++ b/nixos/tests/librenms.nix
@@ -1,106 +1,104 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 
-  let
-    api_token = "f87f42114e44b63ad1b9e3c3d33d6fbe"; # random md5 hash
-    wrong_api_token = "e68ba041fcf1eab923a7a6de3af5f726"; # another random md5 hash
-  in
-  {
-    name = "librenms";
-    meta.maintainers = lib.teams.wdz.members;
+let
+  api_token = "f87f42114e44b63ad1b9e3c3d33d6fbe"; # random md5 hash
+  wrong_api_token = "e68ba041fcf1eab923a7a6de3af5f726"; # another random md5 hash
+in
+{
+  name = "librenms";
+  meta.maintainers = lib.teams.wdz.members;
 
-    nodes.librenms = {
-      time.timeZone = "Europe/Berlin";
+  nodes.librenms = {
+    time.timeZone = "Europe/Berlin";
 
-      environment.systemPackages = with pkgs; [
-        curl
-        jq
-      ];
+    environment.systemPackages = with pkgs; [
+      curl
+      jq
+    ];
 
-      services.librenms = {
-        enable = true;
-        hostname = "librenms";
-        database = {
-          createLocally = true;
-          host = "localhost";
-          database = "librenms";
-          username = "librenms";
-          passwordFile = pkgs.writeText "librenms-db-pass" "librenmsdbpass";
-        };
-        nginx = {
-          default = true;
-        };
-        enableOneMinutePolling = true;
-        settings = {
-          enable_billing = true;
-        };
+    services.librenms = {
+      enable = true;
+      hostname = "librenms";
+      database = {
+        createLocally = true;
+        host = "localhost";
+        database = "librenms";
+        username = "librenms";
+        passwordFile = pkgs.writeText "librenms-db-pass" "librenmsdbpass";
       };
-
-      # systemd oneshot to create a dummy admin user and a API token for testing
-      systemd.services.lnms-api-init = {
-        description = "LibreNMS API init";
-        after = [ "librenms-setup.service" ];
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          User = "root";
-          Group = "root";
-        };
-        script = ''
-          API_USER_NAME=api
-          API_TOKEN=${api_token} # random md5 hash
-
-          # seeding database to get the admin roles
-          ${pkgs.librenms}/artisan db:seed --force --no-interaction
-
-          # we don't need to know the password, it just has to exist
-          API_USER_PASS=$(${pkgs.pwgen}/bin/pwgen -s 64 1)
-          ${pkgs.librenms}/artisan user:add $API_USER_NAME -r admin -p $API_USER_PASS
-          API_USER_ID=$(${pkgs.mariadb}/bin/mysql -D librenms -N -B -e "SELECT user_id FROM users WHERE username = '$API_USER_NAME';")
-
-          ${pkgs.mariadb}/bin/mysql -D librenms -e "INSERT INTO api_tokens (user_id, token_hash, description) VALUES ($API_USER_ID, '$API_TOKEN', 'API User')"
-        '';
+      nginx = {
+        default = true;
+      };
+      enableOneMinutePolling = true;
+      settings = {
+        enable_billing = true;
       };
     };
 
-    nodes.snmphost = {
-
-      services.snmpd = {
-        enable = true;
-        openFirewall = true;
-
-        configText = ''
-          com2sec readonly default public
-
-          group MyROGroup v2c        readonly
-          view all    included  .1                               80
-          access MyROGroup ""      any       noauth    exact  all    none   none
-
-          syslocation Testcity, Testcountry
-          syscontact Testi mc Test <test@example.com>
-        '';
-
+    # systemd oneshot to create a dummy admin user and a API token for testing
+    systemd.services.lnms-api-init = {
+      description = "LibreNMS API init";
+      after = [ "librenms-setup.service" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        User = "root";
+        Group = "root";
       };
+      script = ''
+        API_USER_NAME=api
+        API_TOKEN=${api_token} # random md5 hash
+
+        # seeding database to get the admin roles
+        ${pkgs.librenms}/artisan db:seed --force --no-interaction
+
+        # we don't need to know the password, it just has to exist
+        API_USER_PASS=$(${pkgs.pwgen}/bin/pwgen -s 64 1)
+        ${pkgs.librenms}/artisan user:add $API_USER_NAME -r admin -p $API_USER_PASS
+        API_USER_ID=$(${pkgs.mariadb}/bin/mysql -D librenms -N -B -e "SELECT user_id FROM users WHERE username = '$API_USER_NAME';")
+
+        ${pkgs.mariadb}/bin/mysql -D librenms -e "INSERT INTO api_tokens (user_id, token_hash, description) VALUES ($API_USER_ID, '$API_TOKEN', 'API User')"
+      '';
     };
+  };
 
-    testScript = ''
-      start_all()
+  nodes.snmphost = {
 
-      snmphost.wait_for_unit("snmpd.service")
+    services.snmpd = {
+      enable = true;
+      openFirewall = true;
 
-      librenms.wait_for_unit("lnms-api-init.service")
-      librenms.wait_for_open_port(80)
+      configText = ''
+        com2sec readonly default public
 
-      # Test that we can authenticate against the API
-      librenms.succeed("curl --fail -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0")
-      librenms.fail("curl --fail -H 'X-Auth-Token: ${wrong_api_token}' http://localhost/api/v0")
+        group MyROGroup v2c        readonly
+        view all    included  .1                               80
+        access MyROGroup ""      any       noauth    exact  all    none   none
 
-      # add snmphost as a device
-      librenms.succeed("curl --fail -X POST -d '{\"hostname\":\"snmphost\",\"version\":\"v2c\",\"community\":\"public\"}' -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0/devices")
+        syslocation Testcity, Testcountry
+        syscontact Testi mc Test <test@example.com>
+      '';
 
-      # wait until snmphost gets polled
-      librenms.wait_until_succeeds("test $(curl -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0/devices/snmphost | jq -Mr .devices[0].last_polled) != 'null'")
-    '';
-  }
-)
+    };
+  };
+
+  testScript = ''
+    start_all()
+
+    snmphost.wait_for_unit("snmpd.service")
+
+    librenms.wait_for_unit("lnms-api-init.service")
+    librenms.wait_for_open_port(80)
+
+    # Test that we can authenticate against the API
+    librenms.succeed("curl --fail -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0")
+    librenms.fail("curl --fail -H 'X-Auth-Token: ${wrong_api_token}' http://localhost/api/v0")
+
+    # add snmphost as a device
+    librenms.succeed("curl --fail -X POST -d '{\"hostname\":\"snmphost\",\"version\":\"v2c\",\"community\":\"public\"}' -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0/devices")
+
+    # wait until snmphost gets polled
+    librenms.wait_until_succeeds("test $(curl -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0/devices/snmphost | jq -Mr .devices[0].last_polled) != 'null'")
+  '';
+}

From 470a936f46fed1e6dd699fd286757592b3b5f95d Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Fri, 4 Apr 2025 13:55:33 +0200
Subject: [PATCH 155/225] nixosTests.tuxguitar: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/tuxguitar.nix | 50 ++++++++++++++++++---------------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9ee7f01fef1b..0de678f814b1 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1350,7 +1350,7 @@ in
   tuptime = handleTest ./tuptime.nix { };
   turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix { };
   turn-rs = handleTest ./turn-rs.nix { };
-  tuxguitar = handleTest ./tuxguitar.nix { };
+  tuxguitar = runTest ./tuxguitar.nix;
   twingate = runTest ./twingate.nix;
   typesense = handleTest ./typesense.nix { };
   ucarp = handleTest ./ucarp.nix { };
diff --git a/nixos/tests/tuxguitar.nix b/nixos/tests/tuxguitar.nix
index e491f96a89ce..d0df7d5c5bb5 100644
--- a/nixos/tests/tuxguitar.nix
+++ b/nixos/tests/tuxguitar.nix
@@ -1,29 +1,25 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "tuxguitar";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ ];
+{ ... }:
+{
+  name = "tuxguitar";
+  meta.maintainers = [ ];
+
+  nodes.machine =
+    { config, pkgs, ... }:
+    {
+      imports = [
+        ./common/x11.nix
+      ];
+
+      services.xserver.enable = true;
+
+      environment.systemPackages = [ pkgs.tuxguitar ];
     };
 
-    nodes.machine =
-      { config, pkgs, ... }:
-      {
-        imports = [
-          ./common/x11.nix
-        ];
-
-        services.xserver.enable = true;
-
-        environment.systemPackages = [ pkgs.tuxguitar ];
-      };
-
-    testScript = ''
-      machine.wait_for_x()
-      machine.succeed("tuxguitar >&2 &")
-      machine.wait_for_window("TuxGuitar - Untitled.tg")
-      machine.sleep(1)
-      machine.screenshot("tuxguitar")
-    '';
-  }
-)
+  testScript = ''
+    machine.wait_for_x()
+    machine.succeed("tuxguitar >&2 &")
+    machine.wait_for_window("TuxGuitar - Untitled.tg")
+    machine.sleep(1)
+    machine.screenshot("tuxguitar")
+  '';
+}

From e6067eeed96dd759fa6e49701e9b4dd77b96e549 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Fri, 4 Apr 2025 14:06:16 +0200
Subject: [PATCH 156/225] nixfmt-rfc-style: 2025-03-03 -> 2025-04-04

Probably the last unstable update before stabilising nixfmt. Includes:
- Crucial fixes for the merge tool: https://github.com/NixOS/nixfmt/pull/291
- Recursive mode deprecation warning informing of nixfmt-tree: https://github.com/NixOS/nixfmt/pull/287
---
 pkgs/by-name/ni/nixfmt-rfc-style/date.txt              | 2 +-
 pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt
index 323e1df227fb..24a34eca600b 100644
--- a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt
+++ b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt
@@ -1 +1 @@
-2025-03-03
+2025-04-04
diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix
index 95e0871add42..1da633e8999d 100644
--- a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix
+++ b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix
@@ -25,8 +25,8 @@ mkDerivation {
   pname = "nixfmt";
   version = "0.6.0";
   src = fetchzip {
-    url = "https://github.com/nixos/nixfmt/archive/3261d1016ecc753c59ff92767a257f91b587e705.tar.gz";
-    sha256 = "0jk6mgp710iwxyc7wa5kzz0p0rpcwbbs21smnv14cyii0jniz42s";
+    url = "https://github.com/nixos/nixfmt/archive/65af4b69133d19f534d97746c97c2d5b464f43b4.tar.gz";
+    sha256 = "0l0w3janvss1n1j7qkcml97zndm2jm2gbrzzs9d8l0ixnrw0cd5r";
   };
   isLibrary = true;
   isExecutable = true;

From 8f0d4225d4aca60386844933164e92b6660d00b3 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Fri, 4 Apr 2025 14:14:45 +0200
Subject: [PATCH 157/225] nixosTests.lighttpd: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/lighttpd.nix  | 42 +++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9ee7f01fef1b..2c6fa25761a4 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -703,7 +703,7 @@ in
   libvirtd = handleTest ./libvirtd.nix { };
   lidarr = handleTest ./lidarr.nix { };
   lightdm = handleTest ./lightdm.nix { };
-  lighttpd = handleTest ./lighttpd.nix { };
+  lighttpd = runTest ./lighttpd.nix;
   limesurvey = handleTest ./limesurvey.nix { };
   limine = import ./limine { inherit runTest; };
   listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix { };
diff --git a/nixos/tests/lighttpd.nix b/nixos/tests/lighttpd.nix
index 271dc19ef68c..db08fdf3de22 100644
--- a/nixos/tests/lighttpd.nix
+++ b/nixos/tests/lighttpd.nix
@@ -1,25 +1,23 @@
-import ./make-test-python.nix (
-  { lib, pkgs, ... }:
-  {
-    name = "lighttpd";
-    meta.maintainers = with lib.maintainers; [ bjornfor ];
+{ lib, pkgs, ... }:
+{
+  name = "lighttpd";
+  meta.maintainers = with lib.maintainers; [ bjornfor ];
 
-    nodes = {
-      server = {
-        services.lighttpd.enable = true;
-        services.lighttpd.document-root = pkgs.runCommand "document-root" { } ''
-          mkdir -p "$out"
-          echo "hello nixos test" > "$out/file.txt"
-        '';
-      };
+  nodes = {
+    server = {
+      services.lighttpd.enable = true;
+      services.lighttpd.document-root = pkgs.runCommand "document-root" { } ''
+        mkdir -p "$out"
+        echo "hello nixos test" > "$out/file.txt"
+      '';
     };
+  };
 
-    testScript = ''
-      start_all()
-      server.wait_for_unit("lighttpd.service")
-      res = server.succeed("curl --fail http://localhost/file.txt")
-      assert "hello nixos test" in res, f"bad server response: '{res}'"
-      server.succeed("systemctl reload lighttpd")
-    '';
-  }
-)
+  testScript = ''
+    start_all()
+    server.wait_for_unit("lighttpd.service")
+    res = server.succeed("curl --fail http://localhost/file.txt")
+    assert "hello nixos test" in res, f"bad server response: '{res}'"
+    server.succeed("systemctl reload lighttpd")
+  '';
+}

From d86c274b99b9c40ac54e0423cc99e9ab44105497 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Fri, 4 Apr 2025 14:23:09 +0200
Subject: [PATCH 158/225] nixosTests.starship: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/starship.nix  | 92 +++++++++++++++++++--------------------
 2 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9ee7f01fef1b..c4928d9e52e5 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1202,7 +1202,7 @@ in
   sssd-ldap = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-ldap.nix { };
   stalwart-mail = handleTest ./stalwart-mail.nix { };
   stargazer = runTest ./web-servers/stargazer.nix;
-  starship = handleTest ./starship.nix { };
+  starship = runTest ./starship.nix;
   stash = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stash.nix { };
   static-web-server = handleTest ./web-servers/static-web-server.nix { };
   step-ca = handleTestOn [ "x86_64-linux" ] ./step-ca.nix { };
diff --git a/nixos/tests/starship.nix b/nixos/tests/starship.nix
index 23e103fc000e..382666d8f176 100644
--- a/nixos/tests/starship.nix
+++ b/nixos/tests/starship.nix
@@ -1,53 +1,51 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "starship";
-    meta.maintainers = pkgs.starship.meta.maintainers;
+{ pkgs, ... }:
+{
+  name = "starship";
+  meta.maintainers = pkgs.starship.meta.maintainers;
 
-    nodes.machine = {
-      programs = {
-        fish.enable = true;
-        zsh.enable = true;
+  nodes.machine = {
+    programs = {
+      fish.enable = true;
+      zsh.enable = true;
 
-        starship = {
-          enable = true;
-          settings.format = "<starship>";
-        };
+      starship = {
+        enable = true;
+        settings.format = "<starship>";
       };
-
-      environment.systemPackages =
-        map
-          (
-            shell:
-            pkgs.writeScriptBin "expect-${shell}" ''
-              #!${pkgs.expect}/bin/expect -f
-
-              spawn env TERM=xterm ${shell} -i
-
-              expect "<starship>" {
-                send "exit\n"
-              } timeout {
-                send_user "\n${shell} failed to display Starship\n"
-                exit 1
-              }
-
-              expect eof
-            ''
-          )
-          [
-            "bash"
-            "fish"
-            "zsh"
-          ];
     };
 
-    testScript = ''
-      start_all()
-      machine.wait_for_unit("default.target")
+    environment.systemPackages =
+      map
+        (
+          shell:
+          pkgs.writeScriptBin "expect-${shell}" ''
+            #!${pkgs.expect}/bin/expect -f
 
-      machine.succeed("expect-bash")
-      machine.succeed("expect-fish")
-      machine.succeed("expect-zsh")
-    '';
-  }
-)
+            spawn env TERM=xterm ${shell} -i
+
+            expect "<starship>" {
+              send "exit\n"
+            } timeout {
+              send_user "\n${shell} failed to display Starship\n"
+              exit 1
+            }
+
+            expect eof
+          ''
+        )
+        [
+          "bash"
+          "fish"
+          "zsh"
+        ];
+  };
+
+  testScript = ''
+    start_all()
+    machine.wait_for_unit("default.target")
+
+    machine.succeed("expect-bash")
+    machine.succeed("expect-fish")
+    machine.succeed("expect-zsh")
+  '';
+}

From 3c6b1cf6f60dd2e786c6ed11a22eab790863d41b Mon Sep 17 00:00:00 2001
From: Neyts Zupan <zupo@users.noreply.github.com>
Date: Thu, 3 Apr 2025 20:25:28 +0100
Subject: [PATCH 159/225] paretosecurity: 0.0.96 -> 0.1.3

Also:
 * Fix PATH for systemd services
 * Make UI tests faster and more robust by setting low resolution
---
 nixos/modules/services/security/paretosecurity.nix | 14 ++++++++++++++
 nixos/tests/paretosecurity.nix                     | 11 +++++++++--
 pkgs/by-name/pa/paretosecurity/package.nix         |  6 +++---
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/security/paretosecurity.nix b/nixos/modules/services/security/paretosecurity.nix
index 9ec196eee6a0..a1080ede8431 100644
--- a/nixos/modules/services/security/paretosecurity.nix
+++ b/nixos/modules/services/security/paretosecurity.nix
@@ -24,6 +24,17 @@
     # dependencies here. This creates the necessary symlinks in the proper locations.
     systemd.sockets.paretosecurity.wantedBy = [ "sockets.target" ];
 
+    # In NixOS, systemd services are configured with minimal PATH. However,
+    # paretosecurity helper looks for installed software to do its job, so
+    # it needs the full system PATH. For example, it runs `iptables` to see if
+    # firewall is configured. And it looks for various password managers to see
+    # if one is installed.
+    # The `paretosecurity-user` timer service that is configured lower has
+    # the same need.
+    systemd.services.paretosecurity.serviceConfig.Environment = [
+      "PATH=${config.system.path}/bin:${config.system.path}/sbin"
+    ];
+
     # Enable the tray icon and timer services if the trayIcon option is enabled
     systemd.user = lib.mkIf config.services.paretosecurity.trayIcon {
       services.paretosecurity-trayicon = {
@@ -31,6 +42,9 @@
       };
       services.paretosecurity-user = {
         wantedBy = [ "graphical-session.target" ];
+        serviceConfig.Environment = [
+          "PATH=${config.system.path}/bin:${config.system.path}/sbin"
+        ];
       };
       timers.paretosecurity-user = {
         wantedBy = [ "timers.target" ];
diff --git a/nixos/tests/paretosecurity.nix b/nixos/tests/paretosecurity.nix
index a2b9317c678f..bf9af17e2f5e 100644
--- a/nixos/tests/paretosecurity.nix
+++ b/nixos/tests/paretosecurity.nix
@@ -29,6 +29,8 @@
         package = patchedPareto;
       };
 
+      networking.firewall.enable = true;
+
     };
 
   nodes.dashboard =
@@ -64,6 +66,12 @@
       services.displayManager.autoLogin = {
         enable = true;
         user = "alice";
+
+      };
+
+      virtualisation.resolution = {
+        x = 640;
+        y = 480;
       };
 
       environment.systemPackages = [ pkgs.xdotool ];
@@ -94,7 +102,6 @@
       + " --skip 21830a4e-84f1-48fe-9c5b-beab436b2cdb"  # Disk encryption
       + " --skip 44e4754a-0b42-4964-9cc2-b88b2023cb1e"  # Pareto Security is up to date
       + " --skip f962c423-fdf5-428a-a57a-827abc9b253e"  # Password manager installed
-      + " --skip 2e46c89a-5461-4865-a92e-3b799c12034a"  # Firewall is enabled
       + "'"
     )
 
@@ -117,7 +124,7 @@
     ]:
         status, out = xfce.systemctl("is-enabled " + unit, "alice")
         assert status == 0, f"Unit {unit} is not enabled (status: {status}): {out}"
-    xfce.succeed("xdotool mousemove 850 10")
+    xfce.succeed("xdotool mousemove 460 10")
     xfce.wait_for_text("Pareto Security")
     xfce.succeed("xdotool click 1")
     xfce.wait_for_text("Run Checks")
diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index e6b5232d75cb..25728d4e32a3 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "paretosecurity";
-  version = "0.0.96";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
     repo = "agent";
     rev = version;
-    hash = "sha256-SyeIGSDvrnOvyOJ0zC8CulpaMa+iZeRaMTJUSydz2tw=";
+    hash = "sha256-ovyfHqLCf5U3UR1HfoA+UQhqLZ6IaILcpqptPRQsb60=";
   };
 
-  vendorHash = "sha256-O/OF3Y6HiiikMxf657k9eIM7UfkicIImAUxVVf/TgR8=";
+  vendorHash = "sha256-7mKAFkKGpBOjXc3J/sfF3k3pJF53tFybXZgbfJInuSY=";
   proxyVendor = true;
 
   ldflags = [

From 2c525864bcd332763cd839457b6aaf28998df46d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 13:14:30 +0000
Subject: [PATCH 160/225] libmt32emu: 2.7.1 -> 2.7.2

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

diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix
index 31db8595ca10..7015d978d394 100644
--- a/pkgs/applications/audio/munt/libmt32emu.nix
+++ b/pkgs/applications/audio/munt/libmt32emu.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libmt32emu";
-  version = "2.7.1";
+  version = "2.7.2";
 
   src = fetchFromGitHub {
     owner = "munt";
     repo = "munt";
     rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "sha256-zY1AFcm8uvFkrKUZHsqtKY2CYTY4bWmkTJ7bZPqXoxk=";
+    sha256 = "sha256-wXIvdGoup/AOQggkeXvtbi3pXhyKUKWmyt/ZbGzufds=";
   };
 
   outputs = [

From 0f8342b5f490334c96e2f2984c089a6d21b01032 Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Fri, 4 Apr 2025 15:15:34 +0200
Subject: [PATCH 161/225] mkosi: rename python3 -> python

---
 pkgs/tools/virtualization/mkosi/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix
index 6f2fdc6eefe4..1163a909fec3 100644
--- a/pkgs/tools/virtualization/mkosi/default.nix
+++ b/pkgs/tools/virtualization/mkosi/default.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitHub,
   stdenv,
+  python,
   systemd,
   pandoc,
   kmod,
@@ -15,13 +16,11 @@
   replaceVars,
 
   # Python packages
-  python,
   setuptools,
   setuptools-scm,
   wheel,
   buildPythonApplication,
   pytestCheckHook,
-  pefile,
 
   # Optional dependencies
   withQemu ? false,
@@ -46,7 +45,7 @@ let
     withKernelInstall = true;
   };
 
-  python3pefile = python.withPackages (_: [ pefile ]);
+  pythonWithPefile = python.withPackages (ps: [ ps.pefile ]);
 
   deps =
     [
@@ -85,7 +84,7 @@ buildPythonApplication rec {
     [
       (replaceVars ./0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch {
         UKIFY = "${systemdForMkosi}/lib/systemd/ukify";
-        PYTHON_PEFILE = "${python3pefile}/bin/python3.12";
+        PYTHON_PEFILE = lib.getExe pythonWithPefile;
         NIX_PATH = toString (lib.makeBinPath deps);
         MKOSI_SANDBOX = null; # will be replaced in postPatch
       })

From 2789c83e9c0d696bc44516c80c599c87c8279316 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 13:54:00 +0000
Subject: [PATCH 162/225] gosec: 2.22.2 -> 2.22.3

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

diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix
index c066b645df68..79b2d9bfd682 100644
--- a/pkgs/by-name/go/gosec/package.nix
+++ b/pkgs/by-name/go/gosec/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gosec";
-  version = "2.22.2";
+  version = "2.22.3";
 
   src = fetchFromGitHub {
     owner = "securego";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-j9MRMtINGPn4Hn9Z3+19/Q+Weu277WVONXKtJf9x5Cc=";
+    hash = "sha256-MQ/dDK2t9H7bSsr5MMtlKySLAJIDimRbpATHyOYxrBo=";
   };
 
-  vendorHash = "sha256-lZFTmf4/J3NDdawfp2WpPoaVxepbyazIyC8ahOwPcZo=";
+  vendorHash = "sha256-R1w+dHx3Aond6DmwCHRVZXmUABWfpsbLgcDW67Ukz0E=";
 
   subPackages = [
     "cmd/gosec"

From 9fbc4bf2d3c2f8c8339e536c1abd69c7c89617fe Mon Sep 17 00:00:00 2001
From: Yohann Boniface <edhyjox@gmail.com>
Date: Fri, 4 Apr 2025 15:56:11 +0200
Subject: [PATCH 163/225] linux-doc: fix build (#395281)

---
 pkgs/os-specific/linux/kernel/htmldocs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/htmldocs.nix b/pkgs/os-specific/linux/kernel/htmldocs.nix
index f6c02fc5ea7e..bfd7de475e17 100644
--- a/pkgs/os-specific/linux/kernel/htmldocs.nix
+++ b/pkgs/os-specific/linux/kernel/htmldocs.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     patchShebangs \
       Documentation/sphinx/parse-headers.pl \
       scripts/{get_abi.pl,get_feat.pl,kernel-doc,sphinx-pre-install} \
-      tools/net/ynl/ynl-gen-rst.py
+      tools/net/ynl/pyynl/ynl_gen_rst.py
   '';
 
   FONTCONFIG_FILE = makeFontsConf {

From 57ddd56634b85ea00171bc58b2c59d1c9b3c47cd Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 4 Apr 2025 13:56:45 +0000
Subject: [PATCH 164/225] grafana-loki: 3.4.2 -> 3.4.3

https://github.com/grafana/loki/releases/tag/v3.4.3
---
 pkgs/by-name/gr/grafana-loki/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index 8aeda3eb7495..69f76cdf2946 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -12,14 +12,14 @@
 }:
 
 buildGoModule rec {
-  version = "3.4.2";
+  version = "3.4.3";
   pname = "grafana-loki";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
     rev = "v${version}";
-    hash = "sha256-GE92NlFCOk6qFtrgeBvLDI0OkmWaJ1j07Q14+jgi9+w=";
+    hash = "sha256-1tI9X2eIKuWEWJBbN4UAw8yeRrjgfqcenJyTNMk5rqU=";
   };
 
   vendorHash = null;

From 428cee5acf1970b3aa0f5710de38d3ef5af492b8 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 4 Apr 2025 14:00:02 +0000
Subject: [PATCH 165/225] erlang_27: 27.3.1 -> 27.3.2

https://github.com/erlang/otp/releases/tag/OTP-27.3.2
---
 pkgs/development/interpreters/erlang/27.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix
index 8a2955813656..8acd7815772c 100644
--- a/pkgs/development/interpreters/erlang/27.nix
+++ b/pkgs/development/interpreters/erlang/27.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "27.3.1";
-  sha256 = "sha256-VuVRwcS2TgDYT7buLMHOe8r0AWM+R9DxydcHErAy8xw=";
+  version = "27.3.2";
+  sha256 = "sha256-Pybkcm3pLt0wV+S9ia/BAmM1AKp/nVSAckEzNn4KjSg=";
 }

From b494878375c609b59ec0d09855e775f5ced90a01 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 4 Apr 2025 16:06:36 +0200
Subject: [PATCH 166/225] nix-update: 1.10.0 -> 1.11.0

Diff: https://github.com/Mic92/nix-update/compare/refs/tags/1.10.0...1.11.0

Changelog: https://github.com/Mic92/nix-update/releases/tag/1.11.0
---
 pkgs/by-name/ni/nix-update/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix
index 6e32a46cbe6c..fd0194e180f6 100644
--- a/pkgs/by-name/ni/nix-update/package.nix
+++ b/pkgs/by-name/ni/nix-update/package.nix
@@ -11,14 +11,14 @@
 let
   self = python3Packages.buildPythonApplication {
     pname = "nix-update";
-    version = "1.10.0";
+    version = "1.11.0";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "Mic92";
       repo = "nix-update";
       tag = self.version;
-      hash = "sha256-fGs/EdCEoDA9N5gPtHU6CaDZo9e/aqW6pm6atsjK7PI=";
+      hash = "sha256-G5YehePEMhTgxCnLp8Dg+bDHvOe+QltlCkQHVwMtYx0=";
     };
 
     build-system = [ python3Packages.setuptools ];

From 991ddfebd8539981f77c2567ac99b394935a2f4a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 4 Apr 2025 16:11:25 +0200
Subject: [PATCH 167/225] nix-update: simplify expression

---
 pkgs/by-name/ni/nix-update/package.nix | 98 +++++++++++++-------------
 1 file changed, 48 insertions(+), 50 deletions(-)

diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix
index fd0194e180f6..ce343a85db56 100644
--- a/pkgs/by-name/ni/nix-update/package.nix
+++ b/pkgs/by-name/ni/nix-update/package.nix
@@ -6,57 +6,55 @@
   nix-prefetch-git,
   nixpkgs-review,
   python3Packages,
+  nix-update,
 }:
 
-let
-  self = python3Packages.buildPythonApplication {
-    pname = "nix-update";
-    version = "1.11.0";
-    pyproject = true;
+python3Packages.buildPythonApplication rec {
+  pname = "nix-update";
+  version = "1.11.0";
+  pyproject = true;
 
-    src = fetchFromGitHub {
-      owner = "Mic92";
-      repo = "nix-update";
-      tag = self.version;
-      hash = "sha256-G5YehePEMhTgxCnLp8Dg+bDHvOe+QltlCkQHVwMtYx0=";
-    };
-
-    build-system = [ python3Packages.setuptools ];
-
-    makeWrapperArgs = [
-      "--prefix"
-      "PATH"
-      ":"
-      (lib.makeBinPath [
-        nix
-        nix-prefetch-git
-        nixpkgs-review
-      ])
-    ];
-
-    checkPhase = ''
-      runHook preCheck
-
-      $out/bin/nix-update --help >/dev/null
-
-      runHook postCheck
-    '';
-
-    passthru = {
-      nix-update-script = callPackage ./nix-update-script.nix { nix-update = self; };
-    };
-
-    meta = {
-      description = "Swiss-knife for updating nix packages";
-      homepage = "https://github.com/Mic92/nix-update/";
-      changelog = "https://github.com/Mic92/nix-update/releases/tag/${self.version}";
-      license = lib.licenses.mit;
-      maintainers = with lib.maintainers; [
-        figsoda
-        mic92
-      ];
-      mainProgram = "nix-update";
-    };
+  src = fetchFromGitHub {
+    owner = "Mic92";
+    repo = "nix-update";
+    tag = version;
+    hash = "sha256-G5YehePEMhTgxCnLp8Dg+bDHvOe+QltlCkQHVwMtYx0=";
   };
-in
-self
+
+  build-system = [ python3Packages.setuptools ];
+
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [
+      nix
+      nix-prefetch-git
+      nixpkgs-review
+    ])
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    $out/bin/nix-update --help >/dev/null
+
+    runHook postCheck
+  '';
+
+  passthru = {
+    nix-update-script = callPackage ./nix-update-script.nix { inherit nix-update; };
+  };
+
+  meta = {
+    description = "Swiss-knife for updating nix packages";
+    homepage = "https://github.com/Mic92/nix-update/";
+    changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      figsoda
+      mic92
+    ];
+    mainProgram = "nix-update";
+  };
+}

From e6629c356440121a45d6c7d5b3effb1acda8b215 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 4 Apr 2025 17:25:56 +0300
Subject: [PATCH 168/225] bluespec: Fix wrong executable name for `bsc`

and also use `makeBinaryWrapper` because it inherits argv0 better.
Wrapping `/bin/bsc` with `makeBinaryWrapper` didn't fix the scriptname
issue.

```
Error Bluespec executable not found: /nix/store/nhsa69in3vhyjx2hxnilzkqmb8j2m2mp-bluespec-2024.07/bin/core/.bsc-wrapped
```
---
 pkgs/by-name/bl/bluespec/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix
index 766bc20cfdaf..13ac23bcd26b 100644
--- a/pkgs/by-name/bl/bluespec/package.nix
+++ b/pkgs/by-name/bl/bluespec/package.nix
@@ -22,7 +22,7 @@
   asciidoctor,
   texliveFull,
   which,
-  makeWrapper,
+  makeBinaryWrapper,
   cctools,
   targetPackages,
   # install -m 644 lib/libstp.dylib /private/tmp/nix-build-bluespec-2024.07.drv-5/source/inst/lib/SAT
@@ -168,7 +168,7 @@ stdenv.mkDerivation rec {
       pkg-config
       texliveFull
       tcl
-      makeWrapper
+      makeBinaryWrapper
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # https://github.com/B-Lang-org/bsc/blob/main/src/comp/bsc.hs#L1838
@@ -212,9 +212,12 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     # https://github.com/B-Lang-org/bsc/blob/65e3a87a17f6b9cf38cbb7b6ad7a4473f025c098/src/comp/bsc.hs#L1839
-    wrapProgram $out/bin/bsc --prefix PATH : ${
-      lib.makeBinPath (if stdenv.hostPlatform.isDarwin then [ cctools ] else [ targetPackages.stdenv.cc ])
-    }
+    # `/bin/bsc` is a bash script which the script name to call the binary in the `/bin/core` directory
+    # thus wrapping `/bin/bsc` messes up the scriptname detection in it.
+    wrapProgram $out/bin/core/bsc \
+      --prefix PATH : ${
+        lib.makeBinPath (if stdenv.hostPlatform.isDarwin then [ cctools ] else [ targetPackages.stdenv.cc ])
+      }
   '';
 
   doCheck = true;

From 366a24706ebccb15b1d7c4eaae528bddc3da2864 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 4 Apr 2025 17:28:15 +0300
Subject: [PATCH 169/225] bluespec: Conditionalize `withDocs` deps

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

diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix
index 13ac23bcd26b..3a7ca3d8d7be 100644
--- a/pkgs/by-name/bl/bluespec/package.nix
+++ b/pkgs/by-name/bl/bluespec/package.nix
@@ -160,16 +160,18 @@ stdenv.mkDerivation rec {
     [
       automake
       autoconf
-      asciidoctor
       bison
       flex
       ghcWithPackages
       perl
       pkg-config
-      texliveFull
       tcl
       makeBinaryWrapper
     ]
+    ++ lib.optionals withDocs [
+      texliveFull
+      asciidoctor
+    ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # https://github.com/B-Lang-org/bsc/blob/main/src/comp/bsc.hs#L1838
       # /nix/store/7y0vlsf6l8lr3vjsbrirqrsbx4mwqiwf-cctools-binutils-darwin-1010.6/bin/strip: error: unknown argument '-u'

From c4500a94e4676ae4520af302430da88a84ad2169 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 14:34:55 +0000
Subject: [PATCH 170/225] python312Packages.posthog: 3.18.1 -> 3.23.0

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

diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix
index 98496c26958f..d3ffd2b75a3c 100644
--- a/pkgs/development/python-modules/posthog/default.nix
+++ b/pkgs/development/python-modules/posthog/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "posthog";
-  version = "3.18.1";
+  version = "3.23.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PostHog";
     repo = "posthog-python";
     tag = "v${version}";
-    hash = "sha256-1jJACzDf8J4Vsrvtj0PgeK1Ck2Bzy5ThHm0Ohd+LyYs=";
+    hash = "sha256-+nmCmO1vPnNgZJdZSWwapeFfckNXEcdc/129yaLygf8=";
   };
 
   build-system = [ setuptools ];

From 4bbc09a1d0a044f2e894a4b42e5d5c485aefa36b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 14:41:15 +0000
Subject: [PATCH 171/225] beam26Packages.erlfmt: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/development/beam-modules/erlfmt/default.nix b/pkgs/development/beam-modules/erlfmt/default.nix
index 8a51cd792009..405aec021fc3 100644
--- a/pkgs/development/beam-modules/erlfmt/default.nix
+++ b/pkgs/development/beam-modules/erlfmt/default.nix
@@ -6,12 +6,12 @@
 
 rebar3Relx rec {
   pname = "erlfmt";
-  version = "1.6.0";
+  version = "1.6.1";
   releaseType = "escript";
   src = fetchFromGitHub {
     owner = "WhatsApp";
     repo = "erlfmt";
-    sha256 = "sha256-p4cdnKDY02XqdFOkijhOo527eZenfMF8J2dbuvH/hcY=";
+    sha256 = "sha256-O7+7dMgmnNd9hHuRcJqMAI0gmONz5EO3qSlUC3tufh0=";
     rev = "v${version}";
   };
   meta = with lib; {

From fd4d38d9315327da30f7a3cd81ad4fa3eeb0305d Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 4 Apr 2025 18:07:39 +0300
Subject: [PATCH 172/225] bluespec: Add a simple `installCheckPhase`

---
 pkgs/by-name/bl/bluespec/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix
index 3a7ca3d8d7be..5f9fd46c3aa0 100644
--- a/pkgs/by-name/bl/bluespec/package.nix
+++ b/pkgs/by-name/bl/bluespec/package.nix
@@ -223,6 +223,7 @@ stdenv.mkDerivation rec {
   '';
 
   doCheck = true;
+  doInstallCheck = true;
 
   # TODO To fix check-suite:
   # On darwin
@@ -281,6 +282,13 @@ stdenv.mkDerivation rec {
     )
   '';
 
+  installCheckPhase = ''
+    output="$($out/bin/bsc 2>&1 || true)"
+    echo "bsc output:"
+    echo "$output"
+    echo "$output" | grep -q "to get help"
+  '';
+
   meta = {
     description = "Toolchain for the Bluespec Hardware Definition Language";
     homepage = "https://github.com/B-Lang-org/bsc";

From f7f726bc891ed71c5cd9be7d46c4572697c31249 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 15:08:34 +0000
Subject: [PATCH 173/225] all-the-package-names: 2.0.2117 -> 2.0.2128

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

diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index 2b578f86bb47..545cdc0548ed 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2117";
+  version = "2.0.2128";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-jcExEGUtBMeKesdYVkkJSlJ59HhHZUAqhVvXkJVZp8g=";
+    hash = "sha256-x//g+TetH8wT6RP3W4f+exPOpiTBMTfEIJr2SgxyrmE=";
   };
 
-  npmDepsHash = "sha256-2SrPy3OybchYATCs0bmU1dZGBCKGhto1M1fPk68V/h8=";
+  npmDepsHash = "sha256-MUDeXJk+WqKGEuUlEqb3SUdh3P/gQMWgF78SboksJ2M=";
 
   passthru.updateScript = nix-update-script { };
 

From 7afa349ea8b05e500c37e72e5e70f15e35a242eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 23 Dec 2024 04:43:33 +0100
Subject: [PATCH 174/225] nixos/paperless: mirror upstream admin user creation
 more closely

Closes #249767

Before we only created the admin user when passwordFile was set.
Now it is possible to set PAPERLESS_ADMIN_USER and
PAPERLESS_ADMIN_PASSWORD directly to create the admin user, like in the
upstream Docker image.
---
 nixos/modules/services/misc/paperless.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index db703ce77883..c1f35526bd9b 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -421,8 +421,7 @@ in
           };
           environment = env;
 
-          preStart =
-            ''
+          preStart = ''
               # remove old papaerless-manage symlink
               # TODO: drop with NixOS 25.11
               [[ -L '${cfg.dataDir}/paperless-manage' ]] && rm '${cfg.dataDir}/paperless-manage'
@@ -448,13 +447,15 @@ in
                   ${cfg.package}/bin/paperless-ngx document_index reindex
                 fi
 
-                echo ${cfg.package.version} > "$versionFile"
-              fi
-            ''
-            + lib.optionalString (cfg.passwordFile != null) ''
+              echo ${cfg.package.version} > "$versionFile"
+            fi
+
+            if ${lib.boolToString (cfg.passwordFile != null)} || [[ -n $PAPERLESS_ADMIN_PASSWORD ]]; then
               export PAPERLESS_ADMIN_USER="''${PAPERLESS_ADMIN_USER:-admin}"
-              PAPERLESS_ADMIN_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD")
-              export PAPERLESS_ADMIN_PASSWORD
+              if [[ -e $CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD ]]; then
+                PAPERLESS_ADMIN_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD")
+                export PAPERLESS_ADMIN_PASSWORD
+              fi
               superuserState="$PAPERLESS_ADMIN_USER:$PAPERLESS_ADMIN_PASSWORD"
               superuserStateFile="${cfg.dataDir}/superuser-state"
 
@@ -462,7 +463,8 @@ in
                 ${cfg.package}/bin/paperless-ngx manage_superuser
                 echo "$superuserState" > "$superuserStateFile"
               fi
-            '';
+            fi
+          '';
           requires = lib.optional cfg.database.createLocally "postgresql.service";
           after =
             lib.optional enableRedis "redis-paperless.service"

From 895df12b3fcbc96ed756ad9577813344a1c87afb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 4 Apr 2025 18:19:59 +0200
Subject: [PATCH 175/225] python312Packages.mypy-boto3-chime-sdk-voice: 1.37.0
 -> 1.37.27

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5195b54bc1e5..a4541aee42f8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -206,8 +206,8 @@ rec {
       "sha256-c7p/kch9H2Skn48ue8emfMkt5+mTmLZWEeuAuAhvX0w=";
 
   mypy-boto3-chime-sdk-voice =
-    buildMypyBoto3Package "chime-sdk-voice" "1.37.0"
-      "sha256-FINgDMmIhMn5M/qVGE3rzZJZEU121rDXNQYa39veAYk=";
+    buildMypyBoto3Package "chime-sdk-voice" "1.37.27"
+      "sha256-j7HoSHz0ZBmVBruvlMNFfYMgGrYYvKSPVy/NoGXsE70=";
 
   mypy-boto3-cleanrooms =
     buildMypyBoto3Package "cleanrooms" "1.37.25"

From 40bd63a475c362475ef10d4ff3a3dcce4d166fe8 Mon Sep 17 00:00:00 2001
From: Qiming Chu <cchuqiming@gmail.com>
Date: Fri, 4 Apr 2025 23:39:58 +0800
Subject: [PATCH 176/225] home-assistant: pin jellyfin-apiclient-python to
 version 1.10.0

Signed-off-by: Qiming Chu <cchuqiming@gmail.com>
---
 pkgs/servers/home-assistant/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 78eff4e2231f..1a25a9bf1007 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -151,6 +151,18 @@ let
         ];
       });
 
+      # Pinned due to home-assistant still needing 1.10.0 verison
+      # Remove this when home-assistant upates the jellyfin-apiclient-python version
+      jellyfin-apiclient-python = super.jellyfin-apiclient-python.overridePythonAttrs (oldAttrs: rec {
+        version = "1.10.0";
+        src = fetchFromGitHub {
+          owner = "jellyfin";
+          repo = "jellyfin-apiclient-python";
+          tag = "v${version}";
+          hash = "sha256-H1FqypNuVIZ17cFdNDEmmKICswxJkUGq2LhlingbCVk=";
+        };
+      });
+
       # acme and thus hass-nabucasa doesn't support josepy v2
       # https://github.com/certbot/certbot/issues/10185
       josepy = super.josepy.overridePythonAttrs (old: rec {

From ff43a052bc34d339405a7d08d033eb0c7168b967 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 4 Apr 2025 18:20:45 +0200
Subject: [PATCH 177/225] python312Packages.mypy-boto3-opensearch: 1.37.0 ->
 1.37.27

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a4541aee42f8..49ea86bfbb56 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -970,8 +970,8 @@ rec {
       "sha256-L+XFhueTb9fq32oyVVbysBMXgds1UlXryqRwiDOI+Io=";
 
   mypy-boto3-opensearch =
-    buildMypyBoto3Package "opensearch" "1.37.0"
-      "sha256-i+EBCV4AIOaSam0MYrtnqD+BPvr5CraDzOownJ18VmI=";
+    buildMypyBoto3Package "opensearch" "1.37.27"
+      "sha256-I6WTuWXwC7c8LcRUTKn2VRNntm5DYmxnT8NEjha0LGA=";
 
   mypy-boto3-opensearchserverless =
     buildMypyBoto3Package "opensearchserverless" "1.37.0"

From 81ee1f148c22de39cb0c9b47e38d47fcdf9a1ade Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 4 Apr 2025 18:20:55 +0200
Subject: [PATCH 178/225] python312Packages.mypy-boto3-route53: 1.37.15 ->
 1.37.27

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 49ea86bfbb56..ecfb97eb817e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1134,8 +1134,8 @@ rec {
       "sha256-axaTu4XmHGc3a/Uzs1/0IqLJdZFBfEQ9pzi42XW11y0=";
 
   mypy-boto3-route53 =
-    buildMypyBoto3Package "route53" "1.37.15"
-      "sha256-sXSxaqe0kqx1ZCinJKI67ekBZW81RwoC1fSEDrlCDc4=";
+    buildMypyBoto3Package "route53" "1.37.27"
+      "sha256-9K+1O7X5Ey2xED7rFT5Qfv8XGAxzGYIdf2SGqb95KqE=";
 
   mypy-boto3-route53-recovery-cluster =
     buildMypyBoto3Package "route53-recovery-cluster" "1.37.0"

From 8266265f6960c54101c73ada862afba988883385 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 4 Apr 2025 18:20:58 +0200
Subject: [PATCH 179/225] python312Packages.mypy-boto3-sagemaker: 1.37.25 ->
 1.37.27

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ecfb97eb817e..3fd6545374cc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1174,8 +1174,8 @@ rec {
       "sha256-c0vXkW5sR7JkdzvsS/rMFme9EwY1x5eZAbRWYKew0v4=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.37.25"
-      "sha256-HDTInC3myzlGgbJ/mSUmcSdoUuRxC0RP/D1BicDy0P8=";
+    buildMypyBoto3Package "sagemaker" "1.37.27"
+      "sha256-DgY+LFW6PzwYsFbJ7Fjs4fzlWe45ZEAa2zo1is87a8Y=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.37.0"

From efa192cc9b97f60919e7ae50d459be98ec15c050 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 4 Apr 2025 18:21:03 +0200
Subject: [PATCH 180/225] python312Packages.mypy-boto3-sesv2: 1.37.24 ->
 1.37.27

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3fd6545374cc..ca0f359deae8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1254,8 +1254,8 @@ rec {
       "sha256-hD2HVQKPSoNJ/t8VVOkaz+kVV3bF9DXLvYh6vG15GvM=";
 
   mypy-boto3-sesv2 =
-    buildMypyBoto3Package "sesv2" "1.37.24"
-      "sha256-g0RNkpXVarw0EbB04cby6HLjCuyPwWEeN9pjI3/jL2U=";
+    buildMypyBoto3Package "sesv2" "1.37.27"
+      "sha256-rJ0eb2xRnLf0LO1DW7L955QcCBdE3LtWjsvDUN+HFi8=";
 
   mypy-boto3-shield =
     buildMypyBoto3Package "shield" "1.37.0"

From a38c7fd8bef26c21973a84bceb844dc9e7f7a85e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 4 Apr 2025 18:21:11 +0200
Subject: [PATCH 181/225] python312Packages.mypy-boto3-transcribe: 1.37.5 ->
 1.37.27

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ca0f359deae8..5e6e21d41b90 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1366,8 +1366,8 @@ rec {
       "sha256-mGqJUJF826MADOYCDXwPNbk+x82zumHRb+cTazCEzAY=";
 
   mypy-boto3-transcribe =
-    buildMypyBoto3Package "transcribe" "1.37.5"
-      "sha256-UonLSCWk8CUYjVBkxwbwxnR+NdQnsFTx11dZXIesDv0=";
+    buildMypyBoto3Package "transcribe" "1.37.27"
+      "sha256-UW0b40n+M8za5guDPxhU5cRvtbkqzX6G7M2UaxNq5ws=";
 
   mypy-boto3-transfer =
     buildMypyBoto3Package "transfer" "1.37.24"

From b0871fb1ed4ef24ebeeb4e3016ce202a770ee1f4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 4 Apr 2025 18:21:18 +0200
Subject: [PATCH 182/225] python313Packages.botocore-stubs: 1.37.26 -> 1.37.27

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index eb51061c0cb5..3dec178205d4 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.37.26";
+  version = "1.37.27";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-EwXFEbYgeQgh36bosFKAXELob5jnwBe/isZQKuYqU1U=";
+    hash = "sha256-ezb+79/Sp0VwQNQ0MiJa3ws0xGMk9dECkbNPoVWHsSM=";
   };
 
   nativeBuildInputs = [ setuptools ];

From edb3bdd29947dd590fdba9aa4abd26d4fa00a955 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 4 Apr 2025 18:21:22 +0200
Subject: [PATCH 183/225] python313Packages.boto3-stubs: 1.37.26 -> 1.37.27

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 8e533813fbe1..bd67e851476d 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.37.26";
+  version = "1.37.27";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-GdIYvWcTsvcxbIauQAg6xVSL7RmFA8YM+YhqTQGJZeI=";
+    hash = "sha256-qzErE4igpVsgwKCnm+etOUux6ueK4TofCe8aE0Mwf3E=";
   };
 
   build-system = [ setuptools ];

From fdcba6e9d5358959436f4ced8c362d5f96533a5c Mon Sep 17 00:00:00 2001
From: Victor Rodriguez <awtgerry@gmail.com>
Date: Fri, 4 Apr 2025 10:57:33 -0600
Subject: [PATCH 184/225] ytui-music: replace youtube-dl with yt-dlp

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

diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix
index 8bc1d7e5334f..53ca6814919d 100644
--- a/pkgs/by-name/yt/ytui-music/package.nix
+++ b/pkgs/by-name/yt/ytui-music/package.nix
@@ -8,7 +8,7 @@
   stdenv,
   darwin,
   mpv,
-  youtube-dl,
+  yt-dlp,
   makeBinaryWrapper,
 }:
 
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = ''
     wrapProgram $out/bin/ytui_music \
-      --prefix PATH : ${lib.makeBinPath [ youtube-dl ]}
+      --prefix PATH : ${lib.makeBinPath [ yt-dlp ]}
   '';
 
   doInstallCheck = true;

From 249b8edca06f58cd5ac3a16950bb6d6c724f35ca Mon Sep 17 00:00:00 2001
From: Mirza Arnaut <mirza.arnaut45@gmail.com>
Date: Fri, 4 Apr 2025 18:58:21 +0200
Subject: [PATCH 185/225] copilot-language-server: add fhs version (#393260)

---
 .../co/copilot-language-server/package.nix    | 29 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index c0d97ed5723a..f03224ab18f4 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenvNoCC,
+  buildFHSEnv,
   fetchzip,
   nix-update-script,
 }:
@@ -24,8 +25,24 @@ let
     }
     ."${stdenvNoCC.hostPlatform.system}"
       or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
-in
 
+  executableName = "copilot-language-server";
+  fhs =
+    { package }:
+    buildFHSEnv {
+      name = package.meta.mainProgram;
+      version = package.version;
+      targetPkgs = pkgs: [ pkgs.stdenv.cc.cc.lib ];
+      runScript = lib.getExe package;
+
+      meta = package.meta // {
+        description =
+          package.meta.description
+          + " (FHS-wrapped, expand package details for further information when to use it)";
+        longDescription = "Use this version if you encounter an error like `Could not start dynamically linked executable` or `SyntaxError: Invalid or unexpected token` (see nixpkgs issue [391730](https://github.com/NixOS/nixpkgs/issues/391730)).";
+      };
+    };
+in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
   version = "1.294.0";
@@ -36,18 +53,20 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     stripRoot = false;
   };
 
-  npmDepsHash = "sha256-PLX/mN7xu8gMh2BkkyTncP3+rJ3nBmX+pHxl0ONXbe4=";
   installPhase = ''
     runHook preInstall
 
-    install -Dt "$out"/bin "${os}-${arch}"/copilot-language-server
+    install "${os}-${arch}/${executableName}" -Dm755 -t "$out"/bin
 
     runHook postInstall
   '';
 
   dontStrip = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+    fhs = fhs { package = finalAttrs.finalPackage; };
+  };
 
   meta = {
     description = "Use GitHub Copilot with any editor or IDE via the Language Server Protocol";
@@ -60,7 +79,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       shortName = "GitHub Copilot License";
       url = "https://github.com/customer-terms/github-copilot-product-specific-terms";
     };
-    mainProgram = "copilot-language-server";
+    mainProgram = executableName;
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11a44028da68..e7687e393439 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -359,6 +359,8 @@ with pkgs;
 
   coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { });
 
+  copilot-language-server-fhs = copilot-language-server.fhs;
+
   curv = callPackage ../by-name/cu/curv/package.nix {
     openexr = openexr_3;
   };

From 20d81559e36235edd3324a4455baa9c59e98b62f Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Fri, 4 Apr 2025 10:55:58 -0400
Subject: [PATCH 186/225] rssguard: move package to by-name scheme

---
 .../rssguard/default.nix => by-name/rs/rssguard/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/feedreaders/rssguard/default.nix => by-name/rs/rssguard/package.nix} (100%)

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/by-name/rs/rssguard/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/rssguard/default.nix
rename to pkgs/by-name/rs/rssguard/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11a44028da68..d5ab629e7342 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15592,8 +15592,6 @@ with pkgs;
   roxctl = callPackage ../applications/networking/cluster/roxctl {
   };
 
-  rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
-
   scx = recurseIntoAttrs (callPackage ../os-specific/linux/scx { });
 
   shogun = callPackage ../applications/science/machine-learning/shogun {

From a44e3553f776154baba862e12c22e64c7303d2d7 Mon Sep 17 00:00:00 2001
From: Thibault Gagnaux <thibault.gagnaux@bit.admin.ch>
Date: Fri, 4 Apr 2025 17:19:52 +0200
Subject: [PATCH 187/225] bashunit: init at 0.19.0

Co-authored-by: emaryn <197520219+emaryn@users.noreply.github.com>
---
 pkgs/by-name/ba/bashunit/package.nix | 78 ++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 pkgs/by-name/ba/bashunit/package.nix

diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix
new file mode 100644
index 000000000000..d458858dfdd0
--- /dev/null
+++ b/pkgs/by-name/ba/bashunit/package.nix
@@ -0,0 +1,78 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+  bash,
+  which,
+  versionCheckHook,
+  coreutils,
+  makeBinaryWrapper,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "bashunit";
+  version = "0.19.0";
+  src = fetchFromGitHub {
+    owner = "TypedDevs";
+    repo = "bashunit";
+    tag = finalAttrs.version;
+    hash = "sha256-EoCCqESzmCW12AuAqA3qh2VcE8gyUPIGJEoCcZhMA/Y=";
+    forceFetchGit = true; # needed to include the tests directory for the check phase
+  };
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postConfigure = ''
+    patchShebangs src tests build.sh bashunit
+    substituteInPlace Makefile \
+      --replace-fail "SHELL=/bin/bash" "SHELL=${lib.getExe bash}"
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    ./build.sh
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -m755 -D bin/bashunit $out/bin/bashunit
+    runHook postInstall
+  '';
+
+  # some tests are currently broken on linux and it is not easy to disable them
+  # reenable them after https://github.com/TypedDevs/bashunit/pull/397 has been merged
+  doCheck = false;
+  nativeCheckInputs = [ which ];
+  checkPhase = ''
+    runHook preCheck
+    make test
+    runHook postCheck
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/bashunit \
+      --prefix PATH : "${
+        lib.makeBinPath [
+          coreutils
+          which
+        ]
+      }"
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Simple testing framework for bash scripts";
+    homepage = "https://bashunit.typeddevs.com";
+    changelog = "https://github.com/TypedDevs/bashunit/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tricktron ];
+    mainProgram = "bashunit";
+  };
+})

From e6ee7d8b116d3e0ebe8bcc9cb93bad88f39e2e86 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 18:41:57 +0000
Subject: [PATCH 188/225] vscode-extensions.ms-python.isort: 2023.13.13171013
 -> 2025.0.0

---
 .../editors/vscode/extensions/ms-python.isort/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix
index 06b7c1dceab7..599216b831ea 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-python";
     name = "isort";
-    version = "2023.13.13171013";
-    hash = "sha256-UBV9i3LPVv60+toy+kJvESAuJHRmH/uEIwjTidYUXLc=";
+    version = "2025.0.0";
+    hash = "sha256-nwt9Pv084jt9nWvxSXLIWu7981UGSbCgVRTrFfJA6q4=";
   };
   meta = with lib; {
     description = "Import sorting extension for Visual Studio Code using isort";

From d395872e2b8904e8061f1e7d675a4f76c9f20463 Mon Sep 17 00:00:00 2001
From: Tanya <tanyaarora1866@gmail.com>
Date: Sat, 5 Apr 2025 00:12:36 +0530
Subject: [PATCH 189/225] fangfrisch 1.9.0 -> 1.9.2

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

diff --git a/pkgs/by-name/fa/fangfrisch/package.nix b/pkgs/by-name/fa/fangfrisch/package.nix
index 529b57f48f16..48e1726c7518 100644
--- a/pkgs/by-name/fa/fangfrisch/package.nix
+++ b/pkgs/by-name/fa/fangfrisch/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 let
-  version = "1.9.0";
+  version = "1.9.2";
 in
 python3.pkgs.buildPythonApplication {
   pname = "fangfrisch";
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication {
     owner = "rseichter";
     repo = "fangfrisch";
     tag = version;
-    hash = "sha256-B2fVXVYzrtWMh/WjgFBOqrq8Jt+jqudbtpY/w4rJG08=";
+    hash = "sha256-8upIh9Z+ismvuKcuEe+gJ4W9NLw/Wq15zjFpy8X9yVo=";
   };
 
   nativeBuildInputs = [

From 1ae8dc30ed63051529618f5c055eb8f64f81923d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 18:42:47 +0000
Subject: [PATCH 190/225] vscode-extensions.mongodb.mongodb-vscode: 1.12.1 ->
 1.13.0

---
 .../vscode/extensions/mongodb.mongodb-vscode/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
index 531be9bba85e..4d5cbbc44878 100644
--- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "mongodb-vscode";
     publisher = "mongodb";
-    version = "1.12.1";
-    hash = "sha256-jbR6NGYgDYArCHqMHKPXuht7UViw0Ii3Uc8IqTGTe8k=";
+    version = "1.13.0";
+    hash = "sha256-xOwffd2//P7wS+uuUmuIU0ITOH1pj35h53F1HhvGNMo=";
   };
 
   meta = {

From 43023159f699aa8e9787d78300030eeadf04be76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 18:46:27 +0000
Subject: [PATCH 191/225] trdl-client: 0.8.7 -> 0.9.0

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

diff --git a/pkgs/by-name/tr/trdl-client/package.nix b/pkgs/by-name/tr/trdl-client/package.nix
index 121c792fbc58..b0ba4f81af4e 100644
--- a/pkgs/by-name/tr/trdl-client/package.nix
+++ b/pkgs/by-name/tr/trdl-client/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule rec {
   pname = "trdl-client";
-  version = "0.8.7";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "trdl";
     rev = "v${version}";
-    hash = "sha256-4RN2vrTP4horjDvuuFJbQhToL/4boIuaG+efoTbmebI=";
+    hash = "sha256-f7gyGGClMk/5+FCivuLasiIG/Ty17yeJ8qQ/GVEbC14=";
   };
 
   sourceRoot = "${src.name}/client";
 
-  vendorHash = "sha256-f7FPeR+us3WvwqzcSQLbkKv905CCIAAm+HNV2FFF8OY=";
+  vendorHash = "sha256-veSgWyk1ytHRNHuuZJBV+1rqGDsdEb01CImm+EexFCk=";
 
   subPackages = [ "cmd/trdl" ];
 

From 0d2a3fe1b3f910322e283ab3a56932712d4dc64c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 18:49:07 +0000
Subject: [PATCH 192/225] svd2rust: 0.36.0 -> 0.36.1

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

diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix
index 1dd1dda5dbd7..62d524001654 100644
--- a/pkgs/by-name/sv/svd2rust/package.nix
+++ b/pkgs/by-name/sv/svd2rust/package.nix
@@ -6,15 +6,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "svd2rust";
-  version = "0.36.0";
+  version = "0.36.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-HdE4XWAM1e25kRwryMzGqo2sUpzgwk2aiWsi+qXZ7bU=";
+    hash = "sha256-+wVcUpSlJsd6GAZgBor7eAu6IYnlfJwzZDYKqUKpa9M=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-JiGTGdrudmDCNmJOtHgIBwTVCLB3m4RCqxlypa2KdDQ=";
+  cargoHash = "sha256-rZusngSIwdDfNe7tIA2WtIzzje6UBxyz/hfeRLqJHUY=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''

From 92d438cec90b6fab400335306ab38b72780a76f5 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Fri, 4 Apr 2025 20:49:57 +0200
Subject: [PATCH 193/225] nixosTests.moodle: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/moodle.nix    | 44 +++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 132bd5d64d22..dda3a6df7667 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -795,7 +795,7 @@ in
       defaults.services.mongodb.package = config.node.pkgs.mongodb-ce;
     }
   );
-  moodle = handleTest ./moodle.nix { };
+  moodle = runTest ./moodle.nix;
   moonraker = handleTest ./moonraker.nix { };
   mopidy = handleTest ./mopidy.nix { };
   morph-browser = runTest ./morph-browser.nix;
diff --git a/nixos/tests/moodle.nix b/nixos/tests/moodle.nix
index 4bf1c5e6c702..f3eee04b0d62 100644
--- a/nixos/tests/moodle.nix
+++ b/nixos/tests/moodle.nix
@@ -1,26 +1,24 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
-  {
-    name = "moodle";
-    meta.maintainers = [ lib.maintainers.aanderse ];
+{ lib, ... }:
+{
+  name = "moodle";
+  meta.maintainers = [ lib.maintainers.aanderse ];
 
-    nodes.machine =
-      { ... }:
-      {
-        services.moodle.enable = true;
-        services.moodle.virtualHost.hostName = "localhost";
-        services.moodle.virtualHost.adminAddr = "root@example.com";
-        services.moodle.initialPassword = "correcthorsebatterystaple";
+  nodes.machine =
+    { ... }:
+    {
+      services.moodle.enable = true;
+      services.moodle.virtualHost.hostName = "localhost";
+      services.moodle.virtualHost.adminAddr = "root@example.com";
+      services.moodle.initialPassword = "correcthorsebatterystaple";
 
-        # Ensure the virtual machine has enough memory to avoid errors like:
-        # Fatal error: Out of memory (allocated 152047616) (tried to allocate 33554440 bytes)
-        virtualisation.memorySize = 2000;
-      };
+      # Ensure the virtual machine has enough memory to avoid errors like:
+      # Fatal error: Out of memory (allocated 152047616) (tried to allocate 33554440 bytes)
+      virtualisation.memorySize = 2000;
+    };
 
-    testScript = ''
-      start_all()
-      machine.wait_for_unit("phpfpm-moodle.service", timeout=1800)
-      machine.wait_until_succeeds("curl http://localhost/ | grep 'You are not logged in'")
-    '';
-  }
-)
+  testScript = ''
+    start_all()
+    machine.wait_for_unit("phpfpm-moodle.service", timeout=1800)
+    machine.wait_until_succeeds("curl http://localhost/ | grep 'You are not logged in'")
+  '';
+}

From 10de31a04d457bcc78663d3fa2891cd4ea189718 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Fri, 4 Apr 2025 20:57:18 +0200
Subject: [PATCH 194/225] nixosTests.bind: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix | 2 +-
 nixos/tests/bind.nix      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 132bd5d64d22..e7046842e22a 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -243,7 +243,7 @@ in
     imports = [ ./binary-cache.nix ];
     _module.args.compression = "xz";
   };
-  bind = handleTest ./bind.nix { };
+  bind = runTest ./bind.nix;
   bird = handleTest ./bird.nix { };
   birdwatcher = handleTest ./birdwatcher.nix { };
   bitbox-bridge = runTest ./bitbox-bridge.nix;
diff --git a/nixos/tests/bind.nix b/nixos/tests/bind.nix
index 5eb75392a382..3b2edec9d19e 100644
--- a/nixos/tests/bind.nix
+++ b/nixos/tests/bind.nix
@@ -1,4 +1,5 @@
-import ./make-test-python.nix {
+{ ... }:
+{
   name = "bind";
 
   nodes.machine =

From 5b5017d5cef8b5ccfc3d9c7760b03fe7c05f4da5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 14:15:50 +0000
Subject: [PATCH 195/225] lighttpd: 1.4.78 -> 1.4.79

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

diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix
index 5abe45061795..edfd21231602 100644
--- a/pkgs/by-name/li/lighttpd/package.nix
+++ b/pkgs/by-name/li/lighttpd/package.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lighttpd";
-  version = "1.4.78";
+  version = "1.4.79";
 
   src = fetchurl {
     url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
-    sha256 = "sha256-PAc56Lx1yen8HPqJ4cME3UsOSruHrcZGodILxqLbKj4=";
+    sha256 = "sha256-OymmJbOtiHAtH+pPX0K7fYdIjy5O/Jd9fxhTKcpghL0=";
   };
 
   separateDebugInfo = true;

From 8504b83df5cb799c49088529be63a64446dccd72 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 4 Apr 2025 12:00:19 -0700
Subject: [PATCH 196/225] python312Packages.langgraph: rm
 langgraph-checkpoint-duckdb

---
 pkgs/development/python-modules/langgraph/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index f99b92d1de14..855d854f3d8c 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -17,7 +17,6 @@
   dataclasses-json,
   grandalf,
   httpx,
-  langgraph-checkpoint-duckdb,
   langgraph-checkpoint-postgres,
   langgraph-checkpoint-sqlite,
   langsmith,
@@ -142,7 +141,6 @@ buildPythonPackage rec {
     dataclasses-json
     grandalf
     httpx
-    langgraph-checkpoint-duckdb
     langgraph-checkpoint-postgres
     langgraph-checkpoint-sqlite
     langsmith

From 0211ef4939d83b1c92ff3332df0e6fd95b76416b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Apr 2025 19:06:38 +0000
Subject: [PATCH 197/225] rime-ls: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/by-name/ri/rime-ls/package.nix b/pkgs/by-name/ri/rime-ls/package.nix
index ec6260e7b101..c65b9b63e245 100644
--- a/pkgs/by-name/ri/rime-ls/package.nix
+++ b/pkgs/by-name/ri/rime-ls/package.nix
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "rime-ls";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "wlh320";
     repo = "rime-ls";
     rev = "v${version}";
-    hash = "sha256-IhrfUPC+7Gsg2n6nsGiK/wRoFGKtLXsRLQBw6XIVu0U=";
+    hash = "sha256-bVpFE25Maady0oyrwWf2l7FCW/VHN6mJsnEefmStxIU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-beppHZXtNni8tLgZaC6CyL2HMBK7xy5/kP1jFr6JW+M=";
+  cargoHash = "sha256-j3wAGbKJCcv88C3P8iMoFlDhjXufulFXCnVpwWIAHyU=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 

From 33f2784b7c7feb227c67b2d90b7de312a60b7b57 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Fri, 4 Apr 2025 21:08:27 +0200
Subject: [PATCH 198/225] nixosTests.cgit: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |   2 +-
 nixos/tests/cgit.nix      | 192 +++++++++++++++++++-------------------
 2 files changed, 96 insertions(+), 98 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 132bd5d64d22..b9e35151dec5 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -294,7 +294,7 @@ in
   ] ./ceph-single-node-bluestore-dmcrypt.nix { };
   certmgr = handleTest ./certmgr.nix { };
   cfssl = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cfssl.nix { };
-  cgit = handleTest ./cgit.nix { };
+  cgit = runTest ./cgit.nix;
   charliecloud = handleTest ./charliecloud.nix { };
   chromadb = runTest ./chromadb.nix;
   chromium = (handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./chromium.nix { }).stable or { };
diff --git a/nixos/tests/cgit.nix b/nixos/tests/cgit.nix
index fce3dc16b854..2c48e6bde47d 100644
--- a/nixos/tests/cgit.nix
+++ b/nixos/tests/cgit.nix
@@ -1,113 +1,111 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  let
-    robotsTxt = pkgs.writeText "cgit-robots.txt" ''
-      User-agent: *
-      Disallow: /
-    '';
-  in
-  {
-    name = "cgit";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ schnusch ];
-    };
+{ pkgs, ... }:
+let
+  robotsTxt = pkgs.writeText "cgit-robots.txt" ''
+    User-agent: *
+    Disallow: /
+  '';
+in
+{
+  name = "cgit";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ schnusch ];
+  };
 
-    nodes = {
-      server =
-        { ... }:
-        {
-          services.cgit."localhost" = {
-            enable = true;
-            package = pkgs.cgit.overrideAttrs (
-              { postInstall, ... }:
-              {
-                postInstall = ''
-                  ${postInstall}
-                  cp ${robotsTxt} "$out/cgit/robots.txt"
-                '';
-              }
-            );
-            nginx.location = "/(c)git/";
-            repos = {
-              some-repo = {
-                path = "/tmp/git/some-repo";
-                desc = "some-repo description";
-              };
-            };
-            settings = {
-              readme = [
-                ":README.md"
-                ":date.txt"
-              ];
+  nodes = {
+    server =
+      { ... }:
+      {
+        services.cgit."localhost" = {
+          enable = true;
+          package = pkgs.cgit.overrideAttrs (
+            { postInstall, ... }:
+            {
+              postInstall = ''
+                ${postInstall}
+                cp ${robotsTxt} "$out/cgit/robots.txt"
+              '';
+            }
+          );
+          nginx.location = "/(c)git/";
+          repos = {
+            some-repo = {
+              path = "/tmp/git/some-repo";
+              desc = "some-repo description";
             };
           };
-
-          environment.systemPackages = [ pkgs.git ];
+          settings = {
+            readme = [
+              ":README.md"
+              ":date.txt"
+            ];
+          };
         };
-    };
 
-    testScript =
-      { nodes, ... }:
-      ''
-        start_all()
+        environment.systemPackages = [ pkgs.git ];
+      };
+  };
 
-        server.wait_for_unit("nginx.service")
-        server.wait_for_unit("network.target")
-        server.wait_for_open_port(80)
+  testScript =
+    { nodes, ... }:
+    ''
+      start_all()
 
-        server.succeed("curl -fsS http://localhost/%28c%29git/cgit.css")
+      server.wait_for_unit("nginx.service")
+      server.wait_for_unit("network.target")
+      server.wait_for_open_port(80)
 
-        server.succeed("curl -fsS http://localhost/%28c%29git/robots.txt | diff -u - ${robotsTxt}")
+      server.succeed("curl -fsS http://localhost/%28c%29git/cgit.css")
 
-        server.succeed(
-            "curl -fsS http://localhost/%28c%29git/ | grep -F 'some-repo description'"
-        )
+      server.succeed("curl -fsS http://localhost/%28c%29git/robots.txt | diff -u - ${robotsTxt}")
 
-        server.fail("curl -fsS http://localhost/robots.txt")
+      server.succeed(
+          "curl -fsS http://localhost/%28c%29git/ | grep -F 'some-repo description'"
+      )
 
-        server.succeed("sudo -u cgit ${pkgs.writeShellScript "setup-cgit-test-repo" ''
-          set -e
-          git init --bare -b master /tmp/git/some-repo
-          git init -b master reference
-          cd reference
-          git remote add origin /tmp/git/some-repo
-          { echo -n "cgit NixOS Test at "; date; } > date.txt
-          git add date.txt
-          git -c user.name=test -c user.email=test@localhost commit -m 'add date'
-          git push -u origin master
-        ''}")
+      server.fail("curl -fsS http://localhost/robots.txt")
 
-        # test web download
-        server.succeed(
-            "curl -fsS 'http://localhost/%28c%29git/some-repo/plain/date.txt?id=master' | diff -u reference/date.txt -"
-        )
+      server.succeed("sudo -u cgit ${pkgs.writeShellScript "setup-cgit-test-repo" ''
+        set -e
+        git init --bare -b master /tmp/git/some-repo
+        git init -b master reference
+        cd reference
+        git remote add origin /tmp/git/some-repo
+        { echo -n "cgit NixOS Test at "; date; } > date.txt
+        git add date.txt
+        git -c user.name=test -c user.email=test@localhost commit -m 'add date'
+        git push -u origin master
+      ''}")
 
-        # test http clone
-        server.succeed(
-           "git clone http://localhost/%28c%29git/some-repo && diff -u reference/date.txt some-repo/date.txt"
-        )
+      # test web download
+      server.succeed(
+          "curl -fsS 'http://localhost/%28c%29git/some-repo/plain/date.txt?id=master' | diff -u reference/date.txt -"
+      )
 
-        # test list settings by greping for the fallback readme
-        server.succeed(
-            "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'"
-        )
+      # test http clone
+      server.succeed(
+         "git clone http://localhost/%28c%29git/some-repo && diff -u reference/date.txt some-repo/date.txt"
+      )
 
-        # add real readme
-        server.succeed("sudo -u cgit ${pkgs.writeShellScript "cgit-commit-readme" ''
-          set -e
-          echo '# cgit NixOS test README' > reference/README.md
-          git -C reference add README.md
-          git -C reference -c user.name=test -c user.email=test@localhost commit -m 'add readme'
-          git -C reference push
-        ''}")
+      # test list settings by greping for the fallback readme
+      server.succeed(
+          "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'"
+      )
 
-        # test list settings by greping for the real readme
-        server.succeed(
-            "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F '# cgit NixOS test README'"
-        )
-        server.fail(
-            "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'"
-        )
-      '';
-  }
-)
+      # add real readme
+      server.succeed("sudo -u cgit ${pkgs.writeShellScript "cgit-commit-readme" ''
+        set -e
+        echo '# cgit NixOS test README' > reference/README.md
+        git -C reference add README.md
+        git -C reference -c user.name=test -c user.email=test@localhost commit -m 'add readme'
+        git -C reference push
+      ''}")
+
+      # test list settings by greping for the real readme
+      server.succeed(
+          "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F '# cgit NixOS test README'"
+      )
+      server.fail(
+          "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'"
+      )
+    '';
+}

From 8717786cc3f3cf2721e7860e11a5a9f826553a60 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 4 Apr 2025 21:11:12 +0200
Subject: [PATCH 199/225] vale: 3.11.0 -> 3.11.1

Diff: https://github.com/errata-ai/vale/compare/v3.11.0...v3.11.1

Changelog: https://github.com/errata-ai/vale/releases/tag/v3.11.1
---
 pkgs/by-name/va/vale/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix
index b75fe852fb43..33bf556a4031 100644
--- a/pkgs/by-name/va/vale/package.nix
+++ b/pkgs/by-name/va/vale/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "vale";
-  version = "3.11.0";
+  version = "3.11.1";
 
   subPackages = [ "cmd/vale" ];
 
@@ -19,7 +19,7 @@ buildGoModule rec {
     owner = "errata-ai";
     repo = "vale";
     rev = "v${version}";
-    hash = "sha256-NJ8QmF2ZGlbkHhc0OQSVl11pQDHO88KL/MLr+8ABLYs=";
+    hash = "sha256-UPbeml7W90ICmbDjvNIy+DmolAAYF6Tci4R/kZa5cr8=";
   };
 
   vendorHash = "sha256-Zhhp/qbwGTQEZ28S+p7GJodwQcnkFNqNU7WCZKdeoz0=";

From 492cc1d81eff6673aae527493e7d6da35f20e81d Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 30 Nov 2024 12:42:02 +0100
Subject: [PATCH 200/225] opencascade-occt: Build with rapidjson to enable glTF
 export in FreeCAD

This is to enable glTF export support in FreeCAD. FreeCAD depends on
the JSON support in OpenCascade to be able to export to
glTF (https://forum.freecad.org/viewtopic.php?t=63440).

And it turns out that OpenCascade doesn't default to having this
enabled by default:
https://dev.opencascade.org/content/building-linux-rapidjson
---
 pkgs/by-name/op/opencascade-occt/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/op/opencascade-occt/package.nix b/pkgs/by-name/op/opencascade-occt/package.nix
index 85ee2f4d1683..293eac8660b2 100644
--- a/pkgs/by-name/op/opencascade-occt/package.nix
+++ b/pkgs/by-name/op/opencascade-occt/package.nix
@@ -5,6 +5,7 @@
   fetchpatch,
   cmake,
   ninja,
+  rapidjson,
   tcl,
   tk,
   libGL,
@@ -48,9 +49,11 @@ stdenv.mkDerivation rec {
     libXext
     libXmu
     libXi
+    rapidjson
   ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa;
 
   NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
+  cmakeFlags = [ "-DUSE_RAPIDJSON=ON" ];
 
   meta = with lib; {
     description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";

From 8fbb437033d8c44c2075b340bc2af9aa35453170 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Fri, 4 Apr 2025 21:16:05 +0200
Subject: [PATCH 201/225] nixosTests.homepage-dashboard: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix          |  2 +-
 nixos/tests/homepage-dashboard.nix | 44 ++++++++++++++----------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 132bd5d64d22..cb41b17e77a4 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -584,7 +584,7 @@ in
   herbstluftwm = handleTest ./herbstluftwm.nix { };
   homebox = handleTest ./homebox.nix { };
   homer = handleTest ./homer { };
-  homepage-dashboard = handleTest ./homepage-dashboard.nix { };
+  homepage-dashboard = runTest ./homepage-dashboard.nix;
   honk = runTest ./honk.nix;
   installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });
   invidious = handleTest ./invidious.nix { };
diff --git a/nixos/tests/homepage-dashboard.nix b/nixos/tests/homepage-dashboard.nix
index ed70ead01820..d654dcaf53df 100644
--- a/nixos/tests/homepage-dashboard.nix
+++ b/nixos/tests/homepage-dashboard.nix
@@ -1,28 +1,26 @@
-import ./make-test-python.nix (
-  { lib, ... }:
-  {
-    name = "homepage-dashboard";
-    meta.maintainers = with lib.maintainers; [ jnsgruk ];
+{ lib, ... }:
+{
+  name = "homepage-dashboard";
+  meta.maintainers = with lib.maintainers; [ jnsgruk ];
 
-    nodes.machine = _: {
-      services.homepage-dashboard = {
-        enable = true;
-        settings.title = "test title rodUsEagid"; # something random/unique
-      };
+  nodes.machine = _: {
+    services.homepage-dashboard = {
+      enable = true;
+      settings.title = "test title rodUsEagid"; # something random/unique
     };
+  };
 
-    testScript = ''
-      # Ensure the services are started on managed machine
-      machine.wait_for_unit("homepage-dashboard.service")
-      machine.wait_for_open_port(8082)
-      machine.succeed("curl --fail http://localhost:8082/")
+  testScript = ''
+    # Ensure the services are started on managed machine
+    machine.wait_for_unit("homepage-dashboard.service")
+    machine.wait_for_open_port(8082)
+    machine.succeed("curl --fail http://localhost:8082/")
 
-      # Ensure /etc/homepage-dashboard is created.
-      machine.succeed("test -d /etc/homepage-dashboard")
+    # Ensure /etc/homepage-dashboard is created.
+    machine.succeed("test -d /etc/homepage-dashboard")
 
-      # Ensure that we see the custom title *only in the managed config*
-      page = machine.succeed("curl --fail http://localhost:8082/")
-      assert "test title rodUsEagid" in page, "Custom title not found"
-    '';
-  }
-)
+    # Ensure that we see the custom title *only in the managed config*
+    page = machine.succeed("curl --fail http://localhost:8082/")
+    assert "test title rodUsEagid" in page, "Custom title not found"
+  '';
+}

From 5f62a3f0a711c81264fc09d27a4d19555105cc25 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 4 Apr 2025 11:31:37 -0700
Subject: [PATCH 202/225] python312Packages.langgraph-checkpoint-duckdb:
 removed

---
 .../langgraph-checkpoint-duckdb/default.nix   | 64 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  4 --
 3 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix

diff --git a/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix
deleted file mode 100644
index a0ca4c328599..000000000000
--- a/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  langgraph-checkpoint,
-  aiosqlite,
-  duckdb,
-  pytest-asyncio,
-  pytestCheckHook,
-  langgraph-sdk,
-  poetry-core,
-}:
-
-buildPythonPackage rec {
-  pname = "langgraph-checkpoint-duckdb";
-  version = "2.0.2";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "langchain-ai";
-    repo = "langgraph";
-    tag = "checkpointduckdb==${version}";
-    hash = "sha256-ppgViNRkkCTOGPfdB04DOnEzFgHN1KGDLLVjuwhRgNE=";
-  };
-
-  sourceRoot = "${src.name}/libs/checkpoint-duckdb";
-
-  build-system = [ poetry-core ];
-
-  dependencies = [
-    aiosqlite
-    duckdb
-    langgraph-checkpoint
-  ];
-
-  # Checkpoint clients are lagging behind langgraph-checkpoint
-  pythonRelaxDeps = [ "langgraph-checkpoint" ];
-
-  pythonImportsCheck = [ "langgraph.checkpoint.duckdb" ];
-
-  nativeCheckInputs = [
-    pytest-asyncio
-    pytestCheckHook
-  ];
-
-  disabledTests = [ "test_basic_store_ops" ]; # depends on networking
-
-  passthru = {
-    inherit (langgraph-sdk) updateScript;
-
-    skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898
-  };
-
-  meta = {
-    changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointduckdb==${version}";
-    description = "Library with a DuckDB implementation of LangGraph checkpoint saver";
-    homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-duckdb";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      drupol
-      sarahec
-    ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 478748b31ff4..75fbb300afc2 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -349,6 +349,7 @@ mapAliases ({
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
   langchain-standard-tests = langchain-tests; # added 2025-01-22
   langchainplus-sdk = langsmith; # added 2023-08-01
+  langgraph-checkpoint-duckdb = throw "langgraph-checkpoint-duckdb has been removed as of langgraph 0.2.63"; # added 2025-04-04
   lazr_config = lazr-config; # added 2023-11-03
   lazr_delegates = lazr-delegates; # added 2023-11-03
   lazy_import = lazy-import; # added 2024-01-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7270fd25d512..1356cb3ff171 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7450,10 +7450,6 @@ self: super: with self; {
 
   langgraph-checkpoint = callPackage ../development/python-modules/langgraph-checkpoint { };
 
-  langgraph-checkpoint-duckdb =
-    callPackage ../development/python-modules/langgraph-checkpoint-duckdb
-      { };
-
   langgraph-checkpoint-postgres =
     callPackage ../development/python-modules/langgraph-checkpoint-postgres
       { };

From e2e5759330fc247b93d6fc627f5b74863a345d8d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 4 Apr 2025 22:20:48 +0200
Subject: [PATCH 203/225] zigbee2mqtt_2: 2.2.0 -> 2.2.1

https://github.com/Koenkk/zigbee2mqtt/releases/tag/2.2.1
---
 pkgs/by-name/zi/zigbee2mqtt_2/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
index b52d9615b64a..795565e78913 100644
--- a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix
@@ -16,18 +16,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zigbee2mqtt";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "Koenkk";
     repo = "zigbee2mqtt";
     tag = finalAttrs.version;
-    hash = "sha256-Tkfly1icG/T/szkziXABtG0tvvgq/evJ3qN7ShYtdAM=";
+    hash = "sha256-hct761D92PqgiXUtclk/X2ifySSSta7dgDQEibqPBaM=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-uFFLXEByK9fpMQone7hodrQyAtRBc5Tk3u+Jtq0MkyA=";
+    hash = "sha256-0ophLiyTbdYEZcm4nO63OCRxENr5X2CXepHkfy1+QJM=";
   };
 
   nativeBuildInputs = [

From 338792101e893ac2b92e2671bed35d7f3e9a009b Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Fri, 4 Apr 2025 22:46:48 +0200
Subject: [PATCH 204/225] ungoogled-chromium: 134.0.6998.165-1 ->
 135.0.7049.52-1

https://chromereleases.googleblog.com/2025/04/stable-channel-update-for-desktop.html

This update includes 14 security fixes.

CVEs:
CVE-2025-3066 CVE-2025-3067 CVE-2025-3068 CVE-2025-3069 CVE-2025-3070
CVE-2025-3071 CVE-2025-3072 CVE-2025-3073 CVE-2025-3074
---
 .../networking/browsers/chromium/info.json    | 288 +++++++++---------
 1 file changed, 144 insertions(+), 144 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index b687e910b4b7..29f084a35e29 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -787,27 +787,27 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "134.0.6998.165",
+    "version": "135.0.7049.52",
     "deps": {
       "depot_tools": {
-        "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
-        "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk="
+        "rev": "85ec2718b5a29990c7eb67778348c9f76a00f392",
+        "hash": "sha256-eWlHnSRfLFcd3OoyCTIFewDf0eC9KQowScQOnphgfg8="
       },
       "gn": {
-        "rev": "ed1abc107815210dc66ec439542bee2f6cbabc00",
-        "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U="
+        "rev": "4a8016dc391553fa1644c0740cc04eaac844121e",
+        "hash": "sha256-8NynNvLNCHxy8EYmsnPovKhXu9DcDcYBhg4A6d2QIfY="
       },
       "ungoogled-patches": {
-        "rev": "134.0.6998.165-1",
-        "hash": "sha256-Uia8tI3ZpryD+YVV9duH6sAmB/gKvsFg9RZVKYo/HX0="
+        "rev": "135.0.7049.52-1",
+        "hash": "sha256-i7fSJsbuXgzDvh/4RJwHvVEalS134SoRzvcJZbYsIIo="
       },
-      "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A="
+      "npmHash": "sha256-wNrZaugdKJCyV1WchkKXzr/I1OW1AtjiC2p7qTZZOqU="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "fd886e2cb29dd984c13deec032832dee68d8abe3",
-        "hash": "sha256-xD06hGSrccTGB6fUGw0b7RrGNBQjNmdGKPaRqhXVVOY=",
+        "rev": "9ba7e609d28c509a8ce9265c2247065d8d251173",
+        "hash": "sha256-PjvfckdlaMq9HWefGxFppgBumlqh7xoCoxYFwk/r630=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -817,23 +817,23 @@
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "2e25154d49c29fa9aa42c30ad4a027bd30123434",
-        "hash": "sha256-QxEbtsEKCs2Xgulq7nVWtAeOGkIYFOy/L1ROfXa5u8U="
+        "rev": "7f8b68f91ca8b192375f5e71cd81fb3ed9650ef3",
+        "hash": "sha256-1P+p5MPXm0WkeYgzIxG2SBKZVPWplUlEo7xYI//Y0uw="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "634228a732a1d9ae1a6d459556e8fc58707cf961",
-        "hash": "sha256-ln/DCNYJXVksbwdDBnxCfc4VwtjQlJXF7ktl/NxLupg="
+        "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d",
+        "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "e55d8cf51c6db1fdd4bb56c158945ec59772c8ee",
-        "hash": "sha256-JazjgI+ch9RgnsDgu6p4cT4UmCBor4x4sRi1ClLISAY="
+        "rev": "62e217a12ee1133833d9890b2f7adde900e4efbd",
+        "hash": "sha256-FBMrvCCVwm0mmaQHDvKXljxxLwthpsFqhPE8yqBx5Aw="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "6d0c8ee02e2fd44e69ac30e721e13be463035ee5",
-        "hash": "sha256-bF4hV9fY0GLYAHUnxSXkCxdZLMKR3wYWaqYJaM9aQiE="
+        "rev": "a02de4d0d992b110c8b180fdec91258e7b60265f",
+        "hash": "sha256-LtxaimMmnman7BKLKpSR8rJtbEvHsmGVeHvzEukB4EY="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -852,8 +852,8 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "600fc3a0b121d5007b4bb97b001e756625e6d418",
-        "hash": "sha256-f3Tdz0ykxQ2FHbNweJwPdAZHA8eVpjPuxqRpxwhYtRM="
+        "rev": "441c86221443f48e818335d51f84cf1880c35aa4",
+        "hash": "sha256-nMLn2wTAr+3U1VpqWWq93zJHrlT+f1Yky8ONKk0kWjg="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -862,8 +862,8 @@
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "e7d001c82ee5bead5140481671828d5e156a525a",
-        "hash": "sha256-5YFqWgkyQ/PUKTkk1j3mAFD8JMbI+E4XRdSq34HFMWA="
+        "rev": "25a56e315359eaebb2ff4213771016a4978a346d",
+        "hash": "sha256-ZkrAaNgCqG09CufQN35wFi09TVxvbf/U4jGNNMRLY0M="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -877,13 +877,13 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "914c97c116e09ef01a99fbbbe9cd28cda56552c7",
-        "hash": "sha256-Y4eX8YHwVXiXW4U8KGbFd4fTU/v/EAUpfwv6lB127Y4="
+        "rev": "079266db445215380befce453b1ab3bbdfeaf73d",
+        "hash": "sha256-Bcm9wxlLqp/ANg+cPvsuwAlaxVmef6g+12L5ZE4uCGA="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
-        "rev": "cb550a25c75a99ae0def91a02e16ae29d73e6d1e",
-        "hash": "sha256-kqBpWHCxUl1ekmrbdPn6cL2y75nK4FxECJ5mo83Zgf4="
+        "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8",
+        "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw="
       },
       "src/third_party/angle/third_party/rapidjson/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson",
@@ -892,8 +892,8 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "48e7f3020f52ef9adc31aa0f5db01dc42cc487cd",
-        "hash": "sha256-g59uC7feByGR1Ema8LqUCr5XWKpDMeXXvlS2thOo5Ks="
+        "rev": "ba86fb95004331f2cf571dd9adefe2458290ee11",
+        "hash": "sha256-wl/T/WxVNctM4m4VSFFqqtJ0xkEBiuILYywAylqa0Oo="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
@@ -907,13 +907,13 @@
       },
       "src/third_party/dav1d/libdav1d": {
         "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "42b2b24fb8819f1ed3643aa9cf2a62f03868e3aa",
-        "hash": "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g="
+        "rev": "7d4b789f55389dad1820d6caf6a650038dad06e2",
+        "hash": "sha256-O6WOm6qTSgRmDR+yY2wH6t+7ob+TtZIA5Gax1ysEZh0="
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "7056f50fdefc6bc46aa442e720d0336e2855b570",
-        "hash": "sha256-aYlcplXSGjFov9dqql6d+a1PxJWtZJNQaaezof0u9QQ="
+        "rev": "bdc68b25b620d7302a955e2c38c548ebfe74ef31",
+        "hash": "sha256-R9SQiKUjLkLmPJwuWpw7fcibrWxSlXWkDsCra7Ci0UQ="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -922,8 +922,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "c2ed9ad4ee775f3de903ce757c994aecc59a5306",
-        "hash": "sha256-jecGwARtdSr2OEC68749mpFUAHuYP/IzYUZyj23CwJE="
+        "rev": "0a1143572d107c8b6980df092b84a79190ec1fbd",
+        "hash": "sha256-sUSQTOi0EuIHX9h27RXb5HnbcdfkG/U1K6EbBdjSto8="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -942,8 +942,8 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "24d5dfa7725d6ece31941c3f3343ba6362986d6b",
-        "hash": "sha256-AEGYE2rSsPcRzJSm97DGsrPVbhCH+lyVI61Z4qavKc8="
+        "rev": "ce91fc1d085136f9c7ddca684d1764689d49b337",
+        "hash": "sha256-SsxohjLb+uoN5cMXU5DJDrtF1QVk8EWK/qvTLxCleUI="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -957,8 +957,8 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "ea42fe28775844ec8fe0444fc421398be42d51fe",
-        "hash": "sha256-g9i5v11uZy/3Smn8zSCFmC27Gdp5VP2b0ROrj+VmP1k="
+        "rev": "673e61fc215b178a90c0e67858bbf162c8158993",
+        "hash": "sha256-8Dl6Aol33o2FYID3oIw9grB0jY9VJnnnhmiNdyycTlU="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
@@ -967,13 +967,13 @@
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
-        "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05",
-        "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c="
+        "rev": "dcb3d2e87cebe20b6dda06d8b29abb9af27ca422",
+        "hash": "sha256-e8+rQhEU5+FfwjyEE1TM6emO0cUntuS4GN7y/BuC/U8="
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "d5166861902b565df446e15181eba270fe168275",
-        "hash": "sha256-xkvz743+w0xsI0w4reAo2rfC4J7opl1biA3eNYuRn+o="
+        "rev": "93e56257a5089dc49f1dfd1240c527f5fe1b237f",
+        "hash": "sha256-K5sOlXx72YmXlm7cc7jWf3lKmHcMdVHTwVueJo5CoHY="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -982,8 +982,8 @@
       },
       "src/third_party/chromium-variations": {
         "url": "https://chromium.googlesource.com/chromium-variations.git",
-        "rev": "84c18c7a0205fbd0a27b0214b16ded7fc44dc062",
-        "hash": "sha256-zXAmoKyj104BaIe4Rug18WbVKkyAsyWPCTPPEerinVo="
+        "rev": "270a25f8795caf0a798ebf5a7d69284e3d830d19",
+        "hash": "sha256-ZkETD+Pka5vItN70nhlGQelycFAEnb1Qfv9k2aDXZSE="
       },
       "src/third_party/cld_3/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git",
@@ -1002,8 +1002,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6",
-        "hash": "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo="
+        "rev": "aaac07ee499895770c89163ce0920ef8bb41ed23",
+        "hash": "sha256-A86nAbKs7trVwwa1HFUNbV//6O1minvlHTpZR3vabrU="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -1012,23 +1012,23 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "ea21b22629965105426f3df5e58190513e95a17e",
-        "hash": "sha256-xUaGf4MaEXg2RHgrGS1Uuz97vq5Vbt4HFV/AXYB4lCA="
+        "rev": "b8d797a61689892adb182c9bec457c9bd24b26d2",
+        "hash": "sha256-44bD1nG7CRrvBcd9NbU4yksn7Ly9WYsWETXat/L3f0I="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "0391f0d11cbf3cf3c5bcf82e19e9d9839b1936ed",
-        "hash": "sha256-EL+lOTe1Vzg4JW2q7t3UoXzHHiEmLjf7khH9fXdplbo="
+        "rev": "bf8d1d3aaf469343576db89f81df26aeb16bd62b",
+        "hash": "sha256-XscXxoCUSVGsBCB8xymEsaLc4WgzZPXu6zkRbv8ZQZw="
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
-        "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk="
+        "rev": "85ec2718b5a29990c7eb67778348c9f76a00f392",
+        "hash": "sha256-eWlHnSRfLFcd3OoyCTIFewDf0eC9KQowScQOnphgfg8="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "65b3f414b81ffe4df49202af6fc75bc26a3cb109",
-        "hash": "sha256-rdBpJWdQ5VtFnIfbr/Vq1q1euSvkbY8iIqyuTMAS2KM="
+        "rev": "ad4e2fc82183b1463ac870818c28680bbc3de889",
+        "hash": "sha256-HS5O+r0GFe3Dfh+86JQlsEC+5Gcs1xmUkDyZ7qixqXw="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1037,8 +1037,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "2a35a917be47766a895be610bedd66006980b7e6",
-        "hash": "sha256-WG7uiduuMnXrvEpXJNGksrYkBsim+l7eiu5N+mx0Yr0="
+        "rev": "4c38131a16803130b66266a912029504f2cf23cd",
+        "hash": "sha256-dOq8RJ/V8kulSMK0OUWzHruiwJSP3f/86ih5gk2MMWQ="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -1052,8 +1052,8 @@
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
-        "rev": "d10a0f8bf5ddcce572df95105152bc74041cae0c",
-        "hash": "sha256-OXumpRb9XB38dOCJmL3jDcabiJ08wAvydVlJwMgpCoQ="
+        "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6",
+        "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM="
       },
       "src/third_party/flac": {
         "url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -1080,15 +1080,10 @@
         "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
         "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA="
       },
-      "src/third_party/grpc/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git",
-        "rev": "a363b6c001139b9c8ffb7cd63f60a72f15349c3b",
-        "hash": "sha256-RKGZWtH2JmP2mXN+4ln/nCJvOyzynrYcfrxSY8k1vVg="
-      },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "b1f47850878d232eea372ab167e760ccac4c4e32",
-        "hash": "sha256-YxWz3O9see1dktqZnC551V12yU5jcOERTB1Hn1lwUNM="
+        "rev": "5d4e649f740c675426fbe4cdaffc53ee2a4cb954",
+        "hash": "sha256-DxLHuzIvw7WIKKMCRBz4ne97j9DufoohXQZV6yZ5zfY="
       },
       "src/third_party/freetype-testing/src": {
         "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
@@ -1102,8 +1097,8 @@
       },
       "src/third_party/harfbuzz-ng/src": {
         "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-        "rev": "6d8035a99c279e32183ad063f0de201ef1b2f05c",
-        "hash": "sha256-isQvwaVdL4cM465A8Gs06VioAu8RvZFrwXDsXhfOoFo="
+        "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce",
+        "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw="
       },
       "src/third_party/ink/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
@@ -1137,8 +1132,8 @@
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "e235eb34c6c4fed790ccdad4b16394301360dcd4",
-        "hash": "sha256-jpXIcz5Uy6fDEvxTq8rTFx/M+0+SQ6TCDaqnp7nMtng="
+        "rev": "24a9e940d481f992ba852599c78bb2217362847b",
+        "hash": "sha256-oLknxClUh7l72ZAx7sxNDM6dUhMT0vUE2IdDjRLDKtk="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -1167,8 +1162,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "44ac6c2594a880edbb9cb1e4e197c2b53d078130",
-        "hash": "sha256-AKXKxXqOMUb3APf5r15NmIMyhJ4ZmW5+t7y5XdgdZkw="
+        "rev": "a32ca113e3b050693e4bb379525dfae519ebd0d9",
+        "hash": "sha256-eoV+g/QVzcI7PqDmAic5Ra9K/ba4IV1wXE4RFecuMuk="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -1182,18 +1177,18 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "3990233fc06a35944d6d33797e63931802122a95",
-        "hash": "sha256-4NOQug0MlWZ18527V3IDuGcxGEJ4b+mZZbdzugWoBgQ="
+        "rev": "99fcd816eeaa7da46688bc4b9f4f9e71be13c2e8",
+        "hash": "sha256-SOIvGkR3k7TAs9KFA3mFbBSq5h4eJghKo38IVioOK3U="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "c5938b119ef52f9ff628436c1e66c9a5322ece83",
-        "hash": "sha256-+6339vcd0KJj5V11dvJvs0YpQpTxsLmDuBoYVzyn9Ec="
+        "rev": "a75457c637a365910508f3c2c2b986a701b03a2e",
+        "hash": "sha256-v3+Rj3jS/lCYZNjjAXB6zohdvM45PKayB43jX37ntsU="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "97690c6996f683a6f3e07d75fc4557958c55ac7b",
-        "hash": "sha256-d1D9/6d7a1+27nD8VijhzRMglE2PqvAMK8+GbMeesSQ="
+        "rev": "45d6317a64aad3d5060b800db267f7cea3f27198",
+        "hash": "sha256-SmU+c9YveQ4N13bteuhtmo0uvySeCnmZYpC5NYiMJuo="
       },
       "src/third_party/beto-core/src": {
         "url": "https://beto-core.googlesource.com/beto-core.git",
@@ -1210,21 +1205,26 @@
         "rev": "d6b5ffea959ad31e231c203d7446bf8b39e987ce",
         "hash": "sha256-lCwGk4Q+OXwO8vOlOQrkgygYqLrwpku/PkR03oEdX3Y="
       },
+      "src/third_party/speedometer/v3.1": {
+        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
+        "rev": "cc9ee085ae18f05961ff3dfa1ee1a90d67b7f8ee",
+        "hash": "sha256-28vGPZLaD9xSwursTRRK1xndedeBUZ5TF/4hdy0RjFc="
+      },
       "src/third_party/speedometer/v3.0": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
         "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
         "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU="
       },
-      "src/third_party/speedometer/v2.0": {
-        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
-        "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
-        "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4="
-      },
       "src/third_party/speedometer/v2.1": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
         "rev": "8bf7946e39e47c875c00767177197aea5727e84a",
         "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM="
       },
+      "src/third_party/speedometer/v2.0": {
+        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
+        "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
+        "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4="
+      },
       "src/third_party/ukey2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git",
         "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
@@ -1232,8 +1232,8 @@
       },
       "src/third_party/cros-components/src": {
         "url": "https://chromium.googlesource.com/external/google3/cros_components.git",
-        "rev": "1f1c782f06956a2deb5d33f09c466e4852099c71",
-        "hash": "sha256-80WqSMP5Vlc4OY+gfpU3SRGavs7fJbTQVW1AIhq6jmE="
+        "rev": "97dc8c7a1df880206cc54d9913a7e9d73677072a",
+        "hash": "sha256-CT9c4LqTwhldsxoEny8MesULwQC4k95F4tfCtRZErGM="
       },
       "src/third_party/libdrm/src": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -1267,8 +1267,8 @@
       },
       "src/third_party/libprotobuf-mutator/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git",
-        "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf",
-        "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614="
+        "rev": "7bf98f78a30b067e22420ff699348f084f802e12",
+        "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE="
       },
       "src/third_party/libsrtp": {
         "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git",
@@ -1287,8 +1287,8 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "7b3fa8114cf8ef23cbf91e50c368c1ca768d95d5",
-        "hash": "sha256-2FgBb0HzgMihGsWbEtQqyN2EXZs/y5+ToWL1ZXG35W0="
+        "rev": "2bfb9f9e0a9cca18cd5a0045e931b49dac390c79",
+        "hash": "sha256-BWid6iU7CDEElh8j13a+S767vwnO8qQg26Vp5nQGEHc="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -1302,8 +1302,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "5a9a6ea936085310f3b9fbd4a774868e6a984ec4",
-        "hash": "sha256-E5ePVHrEXMM8mS1qaUwPTqYO0BdP7TYuUhfX+BCiq/0="
+        "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad",
+        "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1332,18 +1332,18 @@
       },
       "src/third_party/openh264/src": {
         "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264",
-        "rev": "33f7f48613258446decb33b3575fc0a3c9ed14e3",
-        "hash": "sha256-lZlZjX8GCJOc77VJ9i1fSWn63pfVOEcwwlzh0UpIgy4="
+        "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f",
+        "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg="
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "38d1445b41d1eb597fcd100688dbaff98aa072ed",
-        "hash": "sha256-KGVFyGp7ItKeapub3Bd+htXH/gMaaBd+k8iC7hLtvl0="
+        "rev": "b756f3c04ba53983a94cd12eb29b7f22e472fd58",
+        "hash": "sha256-P6vAoVF1/geM6MjihcEBQtbf8CxE8sPSKTRLz8/c2yE="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
-        "rev": "56013b77b6c0a650d00bde40e750e7c3b7c6bc3d",
-        "hash": "sha256-Dz7wMYQHVR7sjCGaQe2nxIxZsAxsK6GGDNpDvypPefo="
+        "rev": "00459762409cb29cecf398a23cdb0cae918b7515",
+        "hash": "sha256-QXGJRGyyuN0EPDAF7CAzcTSbjHkz8FRjhqd1JEFF/1o="
       },
       "src/third_party/openscreen/src/third_party/tinycbor/src": {
         "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git",
@@ -1352,23 +1352,23 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "12f7715a6390050c5cffb7e4c9b2be1c2f2956d0",
-        "hash": "sha256-/u+HYjmxSIX2GlriEWYZQJ8TDFNfzSufATGq1j9zx9w="
+        "rev": "9afffebfa895ea6cdcc05516908c50bd7fe72797",
+        "hash": "sha256-89rJdhwUJtJCMO7FvVoTYO80swFRkoWUB/ZYs1tOLzE="
       },
       "src/third_party/perfetto": {
         "url": "https://android.googlesource.com/platform/external/perfetto.git",
-        "rev": "0d78d85c2bfb993ab8dd9a85b6fee6caa6a0f357",
-        "hash": "sha256-bjgSwq4LPz9qN9rVqIJUTHetRguCx67Uq5oe1ksPqGE="
+        "rev": "aa4d8267bafad6782a1f2c8d979104f2aaa622a0",
+        "hash": "sha256-smVQykQVZdhybEUz7BlRLc+FVNH0UyGh+0eSxP8Jzrc="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
-        "rev": "e34549db516f8712f678fcd4bc411613b5cc5295",
-        "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U="
+        "rev": "426b2e025aa59c23a1b6e19fbacd6b4a11bfad16",
+        "hash": "sha256-5uieIE6ygM4Ooz9xbu1NVKCHHsPn6Ekz6OzqfWiA7/M="
       },
       "src/third_party/pthreadpool/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "e1469417238e13eebaa001779fa031ed25c59def",
-        "hash": "sha256-cFRELaRtWspZaqtmdKmVPqM7HVskHlFMAny+Zv/Zflw="
+        "rev": "f94ab76fe99754960035d520dce28e15b647e8cf",
+        "hash": "sha256-NdKKMnXZ6rYOC2wA6a1bPNStxpemzGckN6PPWom6mFA="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -1387,8 +1387,8 @@
       },
       "src/third_party/re2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/re2.git",
-        "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca",
-        "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc="
+        "rev": "c84a140c93352cdabbfb547c531be34515b12228",
+        "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis="
       },
       "src/third_party/ruy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
@@ -1397,13 +1397,13 @@
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "6dc3b54b420e6e03a34ee7259fcd2b1978fac5f3",
-        "hash": "sha256-8RY3AU2V4iZKEmVwT7Z1Q3QlcTXDIdeyYwnQoyJcAUY="
+        "rev": "48ba13bfb5488755a5d72aa60ff4a47069be498f",
+        "hash": "sha256-//z0HlMOkGTcp1IjbS0m+0dmgVYsG7EkfCiK2vvG2wU="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125",
-        "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw="
+        "rev": "b99f146a03d3c98049768fd91c2bbe6594b02b2c",
+        "hash": "sha256-tl1GDmcStkuKMmzzsYuRG6Nrk4xDqgYYBoa1VsQNOwY="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1422,8 +1422,8 @@
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "86cf34f50cbe5a9f35da7eedad0f4d4127fb8342",
-        "hash": "sha256-PSkIU8zC+4AVcYu0vaYo6I1SSykrHgcgGVMBJanux8o="
+        "rev": "c12c13839d689f411911326b1f72e96eb525686c",
+        "hash": "sha256-C8y5ShwMffNZpFuILYNw3WOMVJp/jPen/wNbFl1vqBY="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -1432,18 +1432,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "51c6eed226abcfeeb46864e837d01563cc5b907b",
-        "hash": "sha256-qXHENS/6NwHAr1/16eb079XzmwAnpLtVZuva8uGCf+8="
+        "rev": "d120e39920c0e61cc1227bc1abe50fd6ecd3ce66",
+        "hash": "sha256-9p0/tR3bPvCJn+6eofmQXKbyfzxfbeVexdvuHpn50wk="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "2e4b45a53a0e2e66bcb6540ae384c53a517218d0",
-        "hash": "sha256-9ebWETg/fsS4MYZg74XHs/Nz3nX6BXBNVRN2PmyWXWM="
+        "rev": "c1c31f4d17a9e4b2af40d85c89d573eb43187e0d",
+        "hash": "sha256-uEsy4PBhO3EBJF6YdWj32GmMabgKWQJUeW3cWInAinE="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "0549c7127c2fbab2904892c9d6ff491fa1e93751",
-        "hash": "sha256-LwspMo771iaV5YeEJWgdb8xi37KMa0rsSdvO3uqMOAI="
+        "rev": "8b822ee8ac2c3e52926820f46ad858532a895951",
+        "hash": "sha256-hPd5roeHOgMiz2VUx13bUsKKDSvgQAXRdk7wfdi6e48="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -1452,38 +1452,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "e7294a8ebed84f8c5bd3686c68dbe12a4e65b644",
-        "hash": "sha256-/p7kBW7mwpG/Uz0goMM7L3zjpOMBzGiuN+0ZBEOpORo="
+        "rev": "54a521dd130ae1b2f38fef79b09515702d135bdd",
+        "hash": "sha256-PScDq8HhQPFUs78N75QyL9oEykmjZmAhdxCAqQ0LJds="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "ce37fd67f83cd1e8793b988d2e4126bbf72b19dd",
-        "hash": "sha256-SJcxmKdzOjg6lOJk/3m8qo7puvtci1YEU6dXKjthx0Q="
+        "rev": "f289d047f49fb60488301ec62bafab85573668cc",
+        "hash": "sha256-2Wv0dxVQ8NvuDRTcsXkH1GKmuA6lsIuwTl0j6kbTefo="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "39f924b810e561fd86b2558b6711ca68d4363f68",
-        "hash": "sha256-twJJVBfnZbH/8Wn273h45K3BOnlAicqL2zJl6OfLm2E="
+        "rev": "952f776f6573aafbb62ea717d871cd1d6816c387",
+        "hash": "sha256-LfJ7um+rzc4HdkJerHWkuPWeEc7ZFSBafbP+svAjklk="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "0508dee4ff864f5034ae6b7f68d34cb2822b827d",
-        "hash": "sha256-QqFC3Iyhw9Pq6TwBHxa0Ss7SW0bHo0Uz5N18oxl2ROg="
+        "rev": "809941a4ca137df69dc9c6e8eb456bd70309197c",
+        "hash": "sha256-FPXAofnMfgUkwwRGh8rqtXrmLjouP5A8umXV1pHm1ck="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "c52931f012cb7b48e42bbf2050a7fb2183b76406",
-        "hash": "sha256-nIzrishMMxWzOuD3aX8B6Iuq2kPsUF0Uuvz7GijTulY="
+        "rev": "fb8f5a5d69f4590ff1f5ecacb5e3957b6d11daee",
+        "hash": "sha256-fO6fkWOMYbf/um7gKFyjtrFE21g1kYx3lLvPv4gY7qw="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "fe7a09b13899c5c77d956fa310286f7a7eb2c4ed",
-        "hash": "sha256-zI3y5aoP4QcYp677Oxj5Ef7lJyJwOMdGsaRBe+X9vpI="
+        "rev": "2d8f273ebd4b843c402d9ee881616895b854e42f",
+        "hash": "sha256-nD/WTBTwCnfZdwdNKldDVpcuirSghCIeJRBeX+uQXBk="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "a30aa23cfaff4f28f039c025c159128a6c336a7e",
-        "hash": "sha256-foa5hzqf1hPwOj3k57CloCe/j0qXW3zCQ4mwCT4epF4="
+        "rev": "4e7b0c905b1a0401e24333800937cc8792efa037",
+        "hash": "sha256-CCpfWpyGki9klgHInjs6gAhw5shPXlzmFgccCHNfGQY="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -1492,8 +1492,8 @@
       },
       "src/third_party/wasm_tts_engine/src": {
         "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
-        "rev": "7a91dbfddd93afa096a69fb7d292e22d4afecad2",
-        "hash": "sha256-bV+1YFEtCyTeZujsZtZiexT/aUTN3MaVerR2UdkUPBY="
+        "rev": "6ab3e63276a2d66ba3e7db4f87c5b7cb00e22130",
+        "hash": "sha256-ZcnKKnHsN1UyztAXClc2EUwfeX3yuLtMM2Zjwpnh62U="
       },
       "src/third_party/wayland/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -1527,8 +1527,8 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "fb2b951ac3c23e453335edf35c9b3bad431d9009",
-        "hash": "sha256-tjY5ADd5tMFsYHk6xT+TXwsDYV5eI2oOywmyTjjAxYc="
+        "rev": "dcfb0d153f1e19905b0af26e640470c9ec5578e7",
+        "hash": "sha256-726p6OfKAzHtnjz/8WtMcsRxuq4wqyJv3+DHOHDTeYY="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
@@ -1537,8 +1537,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "8d78f5de6c27b2c793039989ea381f1428fb0100",
-        "hash": "sha256-IsjTrEnxIqINYYjWJmDp7rlubl5dJ2YMpJf/DrG/mRM="
+        "rev": "04413d62f754a7b1a3a2d8c3df23bcde040112b2",
+        "hash": "sha256-sFoBgpPeMJQNSjNp8dDEUlB/7lJUpIXTpu0eRq94cGk="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1557,18 +1557,18 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "0824e2965f6edc2297e55c8dff5a8ac4cb12aaad",
-        "hash": "sha256-eb9B9lXPB2GiC4qehB/HOU36W1e9RZ0N2oEbIifyrHE="
+        "rev": "7702e723fa25102db8b633ead4e3c221a5121487",
+        "hash": "sha256-n3FxY4HESzNyccQLENbuisU29v79c2x+7fYOsUrQnFg="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "ea0aa030cdf31f7897c5bfc153f0d36e92768095",
-        "hash": "sha256-UJsuaSzR4V8alLdtxzpla1v9WYHPKPp13YrgA4Y6/yA="
+        "rev": "ef2bf5781112a4cd6b62ac1817f7842bbdc7ea8f",
+        "hash": "sha256-hDDNrUXGxG/o1oZnypAnuLyIeM16Hy6x1KacGu9Hhmw="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6",
-        "hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8="
+        "rev": "e2591684c45463aa1e46ebefc3fd35deee63f37c",
+        "hash": "sha256-tbGzFdqmkoSiVGk1WMRroWC3NR5GaHRuMwGzPhVodxk="
       }
     }
   }

From 08e64d47792410ae1115219b1cee55e3cd047e93 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 15 Nov 2024 10:13:41 +0100
Subject: [PATCH 205/225] zrc: init at 2.1

---
 pkgs/by-name/zr/zrc/package.nix | 36 +++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/zr/zrc/package.nix

diff --git a/pkgs/by-name/zr/zrc/package.nix b/pkgs/by-name/zr/zrc/package.nix
new file mode 100644
index 000000000000..d28906026580
--- /dev/null
+++ b/pkgs/by-name/zr/zrc/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  bison,
+  flex,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zrc";
+  version = "2.1";
+
+  src = fetchFromGitHub {
+    owner = "Edd12321";
+    repo = "zrc";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-prUbuXyhIJczCvjqwm9pp2n75LY10+6SzYaOHd+S748=";
+  };
+
+  nativeBuildInputs = [
+    bison
+    flex
+  ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    description = "UNIX shell and scripting language with syntax similar to Tcl";
+    homepage = "https://github.com/Edd12321/zrc";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fgaz ];
+    mainProgram = "zrc";
+    platforms = lib.platforms.all;
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+})

From f3a10f311dd2914c083f914bc87a5960abae5d95 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Wed, 26 Mar 2025 11:10:22 +0100
Subject: [PATCH 206/225] drawpile: 2.2.1 -> 2.2.2

Diff: https://github.com/drawpile/drawpile/compare/2.2.1...2.2.2
---
 pkgs/applications/graphics/drawpile/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index 2b51e4cf207b..82362ee6d90c 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -19,6 +19,7 @@
   qtsvg,
   qttools,
   libsecret,
+  libwebp,
 
   # optional client deps
   giflib,
@@ -51,6 +52,7 @@ let
     qtsvg
     qttools
     libsecret
+    libwebp
     # optional:
     giflib # gif animation export support
     kdnssd # local server discovery with Zeroconf
@@ -67,18 +69,18 @@ let
 in
 mkDerivation rec {
   pname = "drawpile";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "drawpile";
     repo = "drawpile";
     rev = version;
-    sha256 = "sha256-NS1aQlWpn3f+SW0oUjlYwHtOS9ZgbjFTrE9grjK5REM=";
+    sha256 = "sha256-xcutcSpbFt+pb7QP1E/RG6iNnZwpfhIZTxr+1usLKHc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-rY4zWSCBfVXvl6p9GvtDg/PFZfLkWTl8FTYdlKTzWYM=";
+    hash = "sha256-VUX6J7TfxWpa07HPFZ8JzpltIwJUYAl5TABIpBmGYYo=";
   };
 
   nativeBuildInputs = [

From f5af80763364a4b5613da6fda0c302c01155e4bb Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 7 Mar 2025 16:52:47 +0100
Subject: [PATCH 207/225] tower-pixel-dungeon: 0.3.2 -> 0.5.4

---
 .../tower-pixel-dungeon/default.nix                      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
index e51f7d067f52..c17d6d1507b9 100644
--- a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
@@ -6,22 +6,23 @@
 
 callPackage ../generic.nix rec {
   pname = "tower-pixel-dungeon";
-  version = "0.3.2";
+  version = "0.5.4";
 
   src = fetchFromGitHub {
     owner = "FixAkaTheFix";
     repo = "Tower-Pixel-Dungeon";
-    rev = "TPDv${lib.replaceStrings [ "." ] [ "" ] version}";
-    hash = "sha256-ZyqrrSuA++L7FOUj6Ytk2lld0YMY4B7WOCzpohOKhdU=";
+    tag = "TPDv${lib.replaceStrings [ "." ] [ "" ] version}";
+    hash = "sha256-6b7EC7rye7nSevMJhRwSKJU7zuzta6KUCgzizWPFk8I=";
   };
 
   sourceRoot = src.name + "/pixel-towers-master";
 
   desktopName = "Tower Pixel Dungeon";
 
-  # Sprite sources (Paint.NET files) interfere with the build process.
+  # Sprite sources (Paint.NET files) and other files interfere with the build process.
   postPatch = ''
     rm core/src/main/assets/{levelsplashes,sprites}/*.pdn
+    rm core/src/main/assets/environment/*.lnk
   '';
 
   meta = {

From f9f91492042402e41a4894d0e356da6c0b62c524 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 08:53:38 +1000
Subject: [PATCH 208/225] hyprprop: 0.1-unstable-2025-03-17 ->
 0.1-unstable-2025-03-31 (#395882)

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

diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix
index d37a8e05b0c6..8552abed3d0a 100644
--- a/pkgs/by-name/hy/hyprprop/package.nix
+++ b/pkgs/by-name/hy/hyprprop/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "hyprprop";
-  version = "0.1-unstable-2025-03-17";
+  version = "0.1-unstable-2025-03-31";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "contrib";
-    rev = "bd81329944be53b0ffb99e05864804b95f1d7c65";
-    hash = "sha256-I8JVdQRu8eWvY5W8XWYZkdd5pojDHkxeqQV7mMIsbhs=";
+    rev = "bc2ad24e0b2e66c3e164994c4897cd94a933fd10";
+    hash = "sha256-YItzk1pj8Kz+b7VlC9zN1pSZ6CuX35asYy3HuMQ3lBQ=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/hyprprop";

From 8e79d17301e3abea13093fea64f0b0a573ad9439 Mon Sep 17 00:00:00 2001
From: offset---cyan <offsetcyan@proton.me>
Date: Fri, 4 Apr 2025 21:29:18 +0100
Subject: [PATCH 209/225] erlang_language_platform: rename to
 erlang-language-platform

erlang_language_platform using underscores in all-packages.nix but
hypens in by-name seems to trigger r-ryantm to open PRs for both package
names. this PR fixes the naming and creates an alias.
---
 pkgs/top-level/aliases.nix      | 2 ++
 pkgs/top-level/all-packages.nix | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 042b02d713a4..6010ea721ff8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -580,6 +580,8 @@ mapAliases {
   erlangR26_javac = throw "erlangR26_javac has been removed in favor of erlang_26_javac"; # added 2024-05-24
   erlangR26_odbc_javac = throw "erlangR26_odbc_javac has been removed in favor of erlang_26_odbc_javac"; # added 2024-05-24
 
+  erlang_language_platform = throw "erlang_language_platform has been renamed erlang-language-platform"; # added 2025-04-04
+
   ethabi = throw "ethabi has been removed due to lack of maintainence upstream and no updates in Nixpkgs"; # Added 2024-07-16
   eww-wayland = lib.warnOnInstantiate "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 398bd086ccfb..3ab5698e8162 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7424,8 +7424,6 @@ with pkgs;
   # 28 is pre-release
   beamMinimal28Packages = dontRecurseIntoAttrs beam_minimal.packages.erlang_28.beamPackages;
 
-  erlang_language_platform = callPackage ../by-name/er/erlang-language-platform/package.nix { };
-
   gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage {
     inherit (llvmPackages) openmp;
     inherit (darwin.apple_sdk.frameworks) Cocoa;

From 9939d8cb2203aac2ef5da05742ebc3c53d551dae Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 4 Apr 2025 21:59:57 -0400
Subject: [PATCH 210/225] python312Packages.captum: 0.7.0 -> 0.8.0

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 .../python-modules/captum/default.nix         | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/captum/default.nix b/pkgs/development/python-modules/captum/default.nix
index e85901a65905..a39f00634ac4 100644
--- a/pkgs/development/python-modules/captum/default.nix
+++ b/pkgs/development/python-modules/captum/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  pythonOlder,
+  fetchpatch,
   buildPythonPackage,
   pytestCheckHook,
   setuptools,
@@ -13,11 +13,13 @@
   tqdm,
   flask,
   flask-compress,
+  parameterized,
+  scikit-learn,
 }:
 
 buildPythonPackage rec {
   pname = "captum";
-  version = "0.7.0";
+  version = "0.8.0";
   pyproject = true;
 
   build-system = [ setuptools ];
@@ -26,7 +28,7 @@ buildPythonPackage rec {
     owner = "pytorch";
     repo = "captum";
     tag = "v${version}";
-    hash = "sha256-1VOvPqxn6CNnmv7M8fl7JrqRfJQUH2tnXRCUqKnl7i0=";
+    hash = "sha256-WuKbMYZPHWaTYYhVseSSkwXQk9LBzGuWfmneDw9V2hg=";
   };
 
   dependencies = [
@@ -37,36 +39,24 @@ buildPythonPackage rec {
     tqdm
   ];
 
+  pythonRelaxDeps = [
+    "numpy"
+  ];
+
   pythonImportsCheck = [ "captum" ];
 
   nativeCheckInputs = [
     pytestCheckHook
     flask
     flask-compress
+    parameterized
+    scikit-learn
   ];
 
   disabledTestPaths =
-    [
-      # These tests requires `parametrized` module (https://pypi.org/project/parametrized/) which seem to be unavailable on Nix.
-      "tests/attr/test_dataloader_attr.py"
-      "tests/attr/test_interpretable_input.py"
-      "tests/attr/test_llm_attr.py"
-      "tests/influence/_core/test_dataloader.py"
-      "tests/influence/_core/test_tracin_aggregate_influence.py"
-      "tests/influence/_core/test_tracin_intermediate_quantities.py"
-      "tests/influence/_core/test_tracin_k_most_influential.py"
-      "tests/influence/_core/test_tracin_regression.py"
-      "tests/influence/_core/test_tracin_self_influence.py"
-      "tests/influence/_core/test_tracin_show_progress.py"
-      "tests/influence/_core/test_tracin_validation.py"
-      "tests/influence/_core/test_tracin_xor.py"
-      "tests/insights/test_contribution.py"
-      "tests/module/test_binary_concrete_stochastic_gates.py"
-      "tests/module/test_gaussian_stochastic_gates.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # These tests are failing on macOS:
-      # > E   AttributeError: module 'torch.distributed' has no attribute 'init_process_group'
+    lib.optionals stdenv.hostPlatform.isDarwin [
+      # These tests may fail if multiple builds run them at the same time due
+      # to hardcoded port number used for rendezvous
       "tests/attr/test_data_parallel.py"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
@@ -76,8 +66,8 @@ buildPythonPackage rec {
 
   disabledTests = [
     # Failing tests
-    "test_softmax_classification_batch_multi_target"
     "test_softmax_classification_batch_zero_baseline"
+    "test_tracin_identity_regression_9_check_idx_none_ArnoldiInfluenceFunction"
   ];
 
   meta = {

From 6e7ec65548331f487c96c41ef2e1766dd5297368 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 03:08:27 +0000
Subject: [PATCH 211/225] ollama: 0.6.2 -> 0.6.4

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

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 8e45f3811933..38fd8c7a490c 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -43,17 +43,17 @@ assert builtins.elem acceleration [
 let
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.6.2";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${version}";
-    hash = "sha256-ZQiBbVQbMYxC73DAPyWi6Yn/cPySpsPcTiCOHK3F35w=";
+    hash = "sha256-d8TPVa/kujFDrHbjwv++bUe2txMlkOxAn34t7wXg4qE=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-Zpzn2YWpiDAl4cwgrrSpN8CFy4GqqhE1mWsRxtYwdDA=";
+  vendorHash = "sha256-4wYgtdCHvz+ENNMiHptu6ulPJAznkWetQcdba3IEB6s=";
 
   validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [
     "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, "

From a9e9363a1101283aa5f7059eb322e3076a96ea91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 00:49:11 +0000
Subject: [PATCH 212/225] geant4: 11.3.0 -> 11.3.1

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

diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix
index c2ce7289690b..13bc349112e6 100644
--- a/pkgs/by-name/ge/geant4/package.nix
+++ b/pkgs/by-name/ge/geant4/package.nix
@@ -38,12 +38,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "11.3.0";
+  version = "11.3.1";
   pname = "geant4";
 
   src = fetchurl {
     url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz";
-    hash = "sha256-HaQxiz+W+H9NR1WKMtqyabjz/JVnCAOMKOcqGAsO+6Y=";
+    hash = "sha256-yTyplvbzWqQ/lI/8q6lgNGjfAd7rYvYcM7p2kifDGf4=";
   };
 
   # Fix broken paths in a .pc

From b994d821fb3d2912154648508dc97663a26ab9fd Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Apr 2025 12:47:02 +0800
Subject: [PATCH 213/225] jujutsu: 0.27.0 -> 0.28.1

---
 pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch | 52 ---------------------
 pkgs/by-name/ju/jujutsu/package.nix         | 11 ++---
 2 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch

diff --git a/pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch b/pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch
deleted file mode 100644
index fc68f2ffe0f4..000000000000
--- a/pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b4f936ac302ee835aa274e4dd186b436781d5d2f Mon Sep 17 00:00:00 2001
-From: Rui Chen <rui@chenrui.dev>
-Date: Thu, 9 Jan 2025 09:51:47 -0500
-Subject: [PATCH] chore(deps): update git2 to use libgit2 1.9
-
-Signed-off-by: Rui Chen <rui@chenrui.dev>
----
- Cargo.lock | 8 ++++----
- Cargo.toml | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 69398f4d6d..3ec8dfdacc 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -913,9 +913,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
- 
- [[package]]
- name = "git2"
--version = "0.19.0"
-+version = "0.20.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
-+checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
- dependencies = [
-  "bitflags",
-  "libc",
-@@ -2109,9 +2109,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
- 
- [[package]]
- name = "libgit2-sys"
--version = "0.17.0+1.8.1"
-+version = "0.18.0+1.9.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
-+checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
- dependencies = [
-  "cc",
-  "libc",
-diff --git a/Cargo.toml b/Cargo.toml
-index 0fc4393cb5..b955fd6aa1 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -46,7 +46,7 @@ dirs = "5.0.1"
- dunce = "1.0.5"
- either = "1.13.0"
- futures = "0.3.31"
--git2 = { version = "0.19.0", features = [
-+git2 = { version = "0.20.0", features = [
-     # Do *not* disable this feature even if you'd like dynamic linking. Instead,
-     # set the environment variable `LIBGIT2_NO_VENDOR=1` if dynamic linking must
-     # be used (this will override the Cargo feature), and allow static linking
diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index f07cb3d35ce5..54634945b0c1 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -19,7 +19,7 @@
 }:
 
 let
-  version = "0.27.0";
+  version = "0.28.1";
 in
 
 rustPlatform.buildRustPackage {
@@ -30,17 +30,12 @@ rustPlatform.buildRustPackage {
     owner = "jj-vcs";
     repo = "jj";
     tag = "v${version}";
-    hash = "sha256-fBgJrSglH46+NHu3spk5mC51ASDHWnOoW6veKZ0R2YA=";
+    hash = "sha256-LDMHMFg9fjEMi8I2Fc3TEyWMctqJurAbckubCgkkZiM=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoPatches = [
-    # <https://github.com/jj-vcs/jj/pull/5315>
-    ./libgit2-1.9.0.patch
-  ];
-
-  cargoHash = "sha256-35DJdAUXc2gb/EXECScwinSzzp7uaxFbUxedjqRGfj8=";
+  cargoHash = "sha256-y/GQSzI7bVPieuAmQKdZY1qticmmRYibBtgXSEJ7dU4=";
 
   nativeBuildInputs = [
     installShellFiles

From 0f86a39ed5f8e54ba63d9dd9351192ee97ee8e20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 05:00:49 +0000
Subject: [PATCH 214/225] phpunit: 12.0.10 -> 12.1.0

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

diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
index de9210c102a6..207250c207fb 100644
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -10,16 +10,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpunit";
-  version = "12.0.10";
+  version = "12.1.0";
 
   src = fetchFromGitHub {
     owner = "sebastianbergmann";
     repo = "phpunit";
     tag = finalAttrs.version;
-    hash = "sha256-JFJauSTUOZzUbpvKx6IrD3QDum/rNa+5JZZsoThA4TM=";
+    hash = "sha256-1nxhutWHaIVTlmf1N2vDjCFdRS0EIyR2cErf2SkUkos=";
   };
 
-  vendorHash = "sha256-fjed7Zm/Iq1VS7eakvrvZs1Yy1t3it3p5U61FKUB2zI=";
+  vendorHash = "sha256-D583XaLEAsLcN8C6QIhUWD0bbWk7tvNIIF/nvTpitws=";
 
   passthru = {
     updateScript = nix-update-script { };

From 62bea66cf40f988a0bbed6bdf8a6ab69e77e1f72 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 06:53:35 +0000
Subject: [PATCH 215/225] arkade: 0.11.37 -> 0.11.38

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

diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix
index e19dd01c1622..90e3c5ac8608 100644
--- a/pkgs/by-name/ar/arkade/package.nix
+++ b/pkgs/by-name/ar/arkade/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "arkade";
-  version = "0.11.37";
+  version = "0.11.38";
 
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
     rev = version;
-    hash = "sha256-eo2Kh9b+zQMS/MEiM8cZE0QYUub4zEKFtwBMJnva+Dk=";
+    hash = "sha256-V6ms3Av0/g2S7Q2NLltz7CnnvE1m+cemmwoHKL1e0tM=";
   };
 
   env.CGO_ENABLED = 0;

From 920aa51c931b901dc092ce4e40a0f36fadc40d7f Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sat, 5 Apr 2025 15:19:12 +0800
Subject: [PATCH 216/225] emacs.pkgs.forge-llm: fix build

---
 .../editors/emacs/elisp-packages/melpa-packages.nix             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index f38e54d464f2..2e058bb5349b 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -1250,6 +1250,8 @@ let
 
           fold-dwim-org = ignoreCompilationError super.fold-dwim-org; # elisp error
 
+          forge-llm = buildWithGit super.forge-llm;
+
           frontside-javascript = super.frontside-javascript.overrideAttrs (
             finalAttrs: previousAttrs: {
               # https://github.com/melpa/melpa/pull/9182

From 041fe59b264bbe484adc691b35f39d2743933513 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 07:28:01 +0000
Subject: [PATCH 217/225] nwg-panel: 0.9.62 -> 0.10.0

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

diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix
index dcf88c90c63b..2eb0cc2ba36c 100644
--- a/pkgs/by-name/nw/nwg-panel/package.nix
+++ b/pkgs/by-name/nw/nwg-panel/package.nix
@@ -23,13 +23,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nwg-panel";
-  version = "0.9.62";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-panel";
     tag = "v${version}";
-    hash = "sha256-h+lhk3gqJj3/GZ8S4vnUE8UaunmT1KcaGquSb/I+kpI=";
+    hash = "sha256-DdDWOIT9/a4z3UTQcGJfGQEl0XyR11WsKg96HfYpEeE=";
   };
 
   # No tests
@@ -91,7 +91,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     homepage = "https://github.com/nwg-piotr/nwg-panel";
-    changelog = "https://github.com/nwg-piotr/nwg-panel/releases/tag/v${version}";
+    changelog = "https://github.com/nwg-piotr/nwg-panel/releases/tag/${src.tag}";
     description = "GTK3-based panel for Sway window manager";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;

From ab43bf8066b691b68db716da02eb5ceed73bdff4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 5 Apr 2025 09:56:21 +0200
Subject: [PATCH 218/225] python313Packages.cyclopts: 3.11.2 -> 3.12.0

Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.11.2...v3.12.0

Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.12.0
---
 pkgs/development/python-modules/cyclopts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index e52889481745..53358facc149 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "cyclopts";
-  version = "3.11.2";
+  version = "3.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "BrianPugh";
     repo = "cyclopts";
     tag = "v${version}";
-    hash = "sha256-4OFMZPgKA+5DhZ9sT7tr//R1oZdpZ85afQ0c/h7Z0Qs=";
+    hash = "sha256-VV2C9SvVOF2452lP20WJaSppXrenUhSf2QTh0t3WjgM=";
   };
 
   build-system = [

From 591e0db3cac95484c3da55185b6600fb44b5b1dc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 5 Apr 2025 09:56:49 +0200
Subject: [PATCH 219/225] python313Packages.garminconnect: 0.2.25 -> 0.2.26

Diff: https://github.com/cyberjunky/python-garminconnect/compare/refs/tags/0.2.25...0.2.26

Changelog: https://github.com/cyberjunky/python-garminconnect/releases/tag/0.2.26
---
 pkgs/development/python-modules/garminconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix
index 988f6427188c..72e5c7656c76 100644
--- a/pkgs/development/python-modules/garminconnect/default.nix
+++ b/pkgs/development/python-modules/garminconnect/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "garminconnect";
-  version = "0.2.25";
+  version = "0.2.26";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "cyberjunky";
     repo = "python-garminconnect";
     tag = version;
-    hash = "sha256-V+i+e1McE9YFVuq2fuQtD3RKTHw9u3u0bZ2zCi9yZCM=";
+    hash = "sha256-Tvou4GLOjn+ZJvY8fSpi7gspXl16SsELBUCwcZrU8HI=";
   };
 
   pythonRelaxDeps = [

From d07b06e70d68ba6057f0fab7cba3560f0699167a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 5 Apr 2025 09:57:19 +0200
Subject: [PATCH 220/225] python313Packages.inkbird-ble: 0.9.0 -> 0.10.1

Diff: https://github.com/Bluetooth-Devices/inkbird-ble/compare/refs/tags/v0.9.0...v0.10.1

Changelog: https://github.com/Bluetooth-Devices/inkbird-ble/blob/v0.10.1/CHANGELOG.md
---
 pkgs/development/python-modules/inkbird-ble/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix
index a8a922961b77..62397baf4f0d 100644
--- a/pkgs/development/python-modules/inkbird-ble/default.nix
+++ b/pkgs/development/python-modules/inkbird-ble/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "inkbird-ble";
-  version = "0.9.0";
+  version = "0.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "inkbird-ble";
     tag = "v${version}";
-    hash = "sha256-WggKjgoYhlzDAnmhpNwjZwOUkqRKMNCwuFuoJJ6irog=";
+    hash = "sha256-i6Vr8dl0svMew7uJrWp11EkVFU01uAHkGvUUr1ecfRw=";
   };
 
   build-system = [ poetry-core ];

From fd9457839d79a67bce08eee4fe1e6e99b8f46eb3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 5 Apr 2025 09:58:08 +0200
Subject: [PATCH 221/225] python313Packages.playwrightcapture: 1.28.4 -> 1.28.5

Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.28.4...v1.28.5

Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.28.5
---
 pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix
index 44bc8f204ac2..96a8b8f280ba 100644
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "playwrightcapture";
-  version = "1.28.4";
+  version = "1.28.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "Lookyloo";
     repo = "PlaywrightCapture";
     tag = "v${version}";
-    hash = "sha256-w3ZQqur/fj36n64Li/qNnhJ8b7Lu3cna2eNj4hxhZ/8=";
+    hash = "sha256-CJ4hq3Eeub426jU0mXMEvqynJb9ekAG2QhfZxbgxV8U=";
   };
 
   pythonRelaxDeps = [

From 3dfe425d83652ccae60057e92a7fe5ca99113dba Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 5 Apr 2025 09:58:32 +0200
Subject: [PATCH 222/225] python313Packages.lacuscore: 1.13.8 -> 1.13.9

Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.13.8...v1.13.9

Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.13.9
---
 pkgs/development/python-modules/lacuscore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index 0facc5227ec0..6b7028d6ad4f 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "lacuscore";
-  version = "1.13.8";
+  version = "1.13.9";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "ail-project";
     repo = "LacusCore";
     tag = "v${version}";
-    hash = "sha256-N49q1+m6BzRCoYnTslZQqbXLvpOXf23Lsg0NMhGMCoE=";
+    hash = "sha256-knAM4cdevww4/dheOw7AnGtegXuMiXt9R0Tmw1wNV80=";
   };
 
   pythonRelaxDeps = [

From 8127e1ed20ea4bcf7aaeb1bdf32e8d416d3d4cc1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 5 Apr 2025 09:59:05 +0200
Subject: [PATCH 223/225] python313Packages.pyenphase: 1.25.4 -> 1.25.5

Diff: https://github.com/pyenphase/pyenphase/compare/refs/tags/v1.25.4...v1.25.5

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

diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix
index 7d05195d4a68..b308b8e131cd 100644
--- a/pkgs/development/python-modules/pyenphase/default.nix
+++ b/pkgs/development/python-modules/pyenphase/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "pyenphase";
-  version = "1.25.4";
+  version = "1.25.5";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "pyenphase";
     repo = "pyenphase";
     tag = "v${version}";
-    hash = "sha256-J7MxHoFffdmPESxyt5CnFd9Y9klP5PiRhG8nzPMaYxw=";
+    hash = "sha256-prYrs8JPw6KXqS981GvaXYIdo5+khf+vnxH60kKGvKE=";
   };
 
   pythonRelaxDeps = [ "tenacity" ];

From f18f6fa1788ff019d49e372d036836d7f19e1d01 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Thu, 3 Apr 2025 13:26:48 +0800
Subject: [PATCH 224/225] sqlc: use finalAttrs

---
 pkgs/by-name/sq/sqlc/package.nix | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/sq/sqlc/package.nix b/pkgs/by-name/sq/sqlc/package.nix
index 6500ff955674..59b99f19cb28 100644
--- a/pkgs/by-name/sq/sqlc/package.nix
+++ b/pkgs/by-name/sq/sqlc/package.nix
@@ -4,21 +4,17 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
-  testers,
-  sqlc,
+  versionCheckHook,
 }:
 
-let
-  version = "1.28.0";
-in
-buildGoModule {
+buildGoModule (finalAttrs: {
   pname = "sqlc";
-  inherit version;
+  version = "1.28.0";
 
   src = fetchFromGitHub {
     owner = "sqlc-dev";
     repo = "sqlc";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-kACZusfwEIO78OooNGMXCXQO5iPYddmsHCsbJ3wkRQs=";
   };
 
@@ -41,11 +37,9 @@ buildGoModule {
       --zsh <($out/bin/sqlc completion zsh)
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = sqlc;
-    command = "sqlc version";
-    version = "v${version}";
-  };
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
 
   meta = {
     description = "Generate type-safe code from SQL";
@@ -54,4 +48,4 @@ buildGoModule {
     maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "sqlc";
   };
-}
+})

From 1654e34185add441cb99de742d52b83dfddf8c28 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 5 Apr 2025 10:08:03 +0200
Subject: [PATCH 225/225] python313Packages.opower: 0.9.0 -> 0.10.0

Diff: https://github.com/tronikos/opower/compare/refs/tags/v0.9.0...v0.10.0

Changelog: https://github.com/tronikos/opower/releases/tag/v0.10.0
---
 pkgs/development/python-modules/opower/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index 7ff79cd4a8cc..33689c5344fc 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "opower";
-  version = "0.9.0";
+  version = "0.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "tronikos";
     repo = "opower";
     tag = "v${version}";
-    hash = "sha256-1g7B4r1CDapi4yfnOLTHNE2Y1TYYqtkdfHwcptxXL9E=";
+    hash = "sha256-2ENP67OD466T6jLyyUxOz5CXKzVRhucpEycOXj42Ue0=";
   };
 
   build-system = [ setuptools ];