Merge remote-tracking branch 'origin/staging-next' into staging

.git-blame-ignore-revs

@@ -300,3 +300,6 @@ f7611cad5154a9096faa26d156a4079577bfae17
 90e7159c559021ac4f4cc1222000f08a91feff69 # !autorebase nix-shell --run treefmt
 c283f32d296564fd649ef3ed268c1f1f7b199c49 # !autorebase nix-shell --run treefmt
 91a8fee3aaf79348aa2dc1552a29fc1b786c5133 # !autorebase nix-shell --run treefmt
+
+# aliases: keep-sorted
+48ce0739044bd6eba83c3a43bd4ad1046399cdad # !autorebase nix-shell --run treefmt

.github/workflows/backport.yml

@@ -40,6 +40,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           token: ${{ steps.app-token.outputs.token }}
+          persist-credentials: false
 
       - name: Log current API rate limits
         env:

.github/workflows/build.yml

@@ -46,6 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout the merge commit
         uses: ./.github/actions/checkout

.github/workflows/check.yml

@@ -34,6 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           path: trusted
           sparse-checkout: |
             ci/github-script
@@ -73,6 +74,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout merge and target commits
         uses: ./.github/actions/checkout

.github/workflows/eval.yml

@@ -34,6 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           path: trusted
           sparse-checkout: |
             ci/supportedVersions.nix
@@ -41,6 +42,7 @@ jobs:
       - name: Check out the PR at the test merge commit
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           ref: ${{ inputs.mergedSha }}
           path: untrusted
           sparse-checkout: |
@@ -84,6 +86,7 @@ jobs:
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Check out the PR at merged and target commits
         uses: ./.github/actions/checkout
@@ -155,6 +158,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Check out the PR at the target commit
         uses: ./.github/actions/checkout
@@ -181,8 +185,9 @@ jobs:
       - name: Compare against the target branch
         env:
           AUTHOR_ID: ${{ github.event.pull_request.user.id }}
+          TARGET_SHA: ${{ inputs.mergedSha }}
         run: |
-          git -C nixpkgs/trusted diff --name-only ${{ inputs.mergedSha }} \
+          git -C nixpkgs/trusted diff --name-only "$TARGET_SHA" \
             | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
 
           # Use the target branch to get accurate maintainer info
@@ -318,6 +323,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout the merge commit
         uses: ./.github/actions/checkout

.github/workflows/labels.yml

@@ -46,6 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: |
             ci/github-script
 

.github/workflows/lint.yml

@@ -26,6 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout the merge commit
         uses: ./.github/actions/checkout
@@ -60,6 +61,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout the merge commit
         uses: ./.github/actions/checkout
@@ -87,6 +89,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout merge and target commits
         uses: ./.github/actions/checkout

.github/workflows/merge-group.yml

@@ -24,6 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: |
             ci/supportedSystems.json
 

.github/workflows/periodic-merge-24h.yml

@@ -43,4 +43,5 @@ jobs:
       from: ${{ matrix.pairs.from }}
       into: ${{ matrix.pairs.into }}
     name: ${{ matrix.pairs.name || format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
-    secrets: inherit
+    secrets:
+      NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}

.github/workflows/periodic-merge-6h.yml

@@ -42,4 +42,5 @@ jobs:
       from: ${{ matrix.pairs.from }}
       into: ${{ matrix.pairs.into }}
     name: ${{ format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
-    secrets: inherit
+    secrets:
+      NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}

.github/workflows/periodic-merge.yml

@@ -11,6 +11,9 @@ on:
         description: Target branch to merge into.
         required: true
         type: string
+    secrets:
+      NIXPKGS_CI_APP_PRIVATE_KEY:
+        required: true
 
 defaults:
   run:
@@ -32,6 +35,8 @@ jobs:
           permission-pull-requests: write
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
 
       - name: Find merge base between two branches
         if: contains(inputs.from, ' ')

.github/workflows/pr.yml

@@ -34,6 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout-cone-mode: true # default, for clarity
           sparse-checkout: |
             ci/github-script

.github/workflows/reviewers.yml

@@ -29,6 +29,7 @@ jobs:
       - name: Check out the PR at the base commit
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           path: trusted
           sparse-checkout: ci
 
@@ -146,6 +147,7 @@ jobs:
         if: ${{ steps.app-token.outputs.token }}
         env:
           GH_TOKEN: ${{ github.token }}
+          APP_GH_TOKEN: ${{ steps.app-token.outputs.token }}
           REPOSITORY: ${{ github.repository }}
           NUMBER: ${{ github.event.number }}
           AUTHOR: ${{ github.event.pull_request.user.login }}
@@ -156,7 +158,7 @@ jobs:
           # There appears to be no API to request reviews based on GitHub IDs
           jq -r 'keys[]' comparison/maintainers.json \
             | while read -r id; do gh api /user/"$id" --jq .login; done \
-            | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
+            | GH_TOKEN="$APP_GH_TOKEN" result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
 
       - name: Log current API rate limits (app-token)
         if: ${{ steps.app-token.outputs.token }}

.github/workflows/test.yml

@@ -21,6 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout-cone-mode: true # default, for clarity
           sparse-checkout: |
             ci/github-script

.github/zizmor.yml

@@ -0,0 +1,12 @@
+# This file defines the ignore rules for zizmor.
+#
+# For rules that contain a high number of false positives, prefer listing them here
+# instead of adding ignore comments. Note that zizmor cannot ignore by line-within-a-string, so
+# there are some ignore items that encompass multiple problems within one `run` block. An issue
+# tracking this is at https://github.com/woodruffw/zizmor/issues/648.
+#
+# For more info, see the documentation: https://woodruffw.github.io/zizmor/usage/#ignoring-results
+
+rules:
+  dangerous-triggers:
+    disable: true

ci/default.nix

@@ -136,6 +136,8 @@ let
             [ "--config=${config}" ];
           includes = [ "*.md" ];
         };
+
+        programs.zizmor.enable = true;
       };
       fs = pkgs.lib.fileset;
       nixFilesSrc = fs.toSource {

doc/release-notes/rl-2511.section.md

@@ -82,6 +82,9 @@
 
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
 
+- The default glibc ELF ABI for the powerpc64-linux platform has been changed from ELFv2 back to ELFv1, due to the latter having less remaining issues when bootstrapping & building Nixpkgs packages on hardware.
+  If glibc ELFv2 is desired, use a fuller target triplet like `powerpc64-unknown-linux-gnuabielfv2` or the provided `ppc64-elfv2` platform example.
+
 - `python3Packages.bjoern` has been removed, as the upstream is unmaintained and it depends on a 14-year-old version of http-parser with numerous vulnerabilities.
 
 - `buildGoModule` removes the compatibility layer of `CGO_ENABLED` not specified via `env`.

maintainers/maintainer-list.nix

@@ -5960,6 +5960,12 @@
     githubId = 49904992;
     name = "Dawid Sowa";
   };
+  dawnofmidnight = {
+    email = "dawnofmidnight@duck.com";
+    github = "dawnofmidnight";
+    githubId = 78233879;
+    name = "whispers";
+  };
   dawoox = {
     email = "contact@antoinebellanger.fr";
     github = "Dawoox";
@@ -7017,6 +7023,13 @@
     name = "Will Dietz";
     keys = [ { fingerprint = "389A 78CB CD88 5E0C 4701  DEB9 FD42 C7D0 D414 94C8"; } ];
   };
+  dudeofawesome = {
+    email = "tourist-04.iced@icloud.com";
+    github = "dudeofawesome";
+    githubId = 1683595;
+    name = "Louis Orleans";
+    keys = [ { fingerprint = "llSOkL8Tn5+LOmWa4PDci+dQXZIRy11NSumDiFzNkAM"; } ];
+  };
   dudymas = {
     email = "jeremy.white@cloudposse.com";
     github = "dudymas";
@@ -29155,6 +29168,12 @@
     githubId = 332534;
     name = "Zach Shipko";
   };
+  zstg = {
+    email = "zestig@duck.com";
+    github = "zstg";
+    githubId = 69384921;
+    name = "ZeStig";
+  };
   ztzg = {
     email = "dd@crosstwine.com";
     github = "ztzg";

nixos/modules/services/cluster/kubernetes/kubelet.nix

@@ -108,9 +108,7 @@ let
       };
     };
 
-  taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (
-    mapAttrsToList (n: v: v) cfg.taints
-  );
+  taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (attrValues cfg.taints);
 in
 {
   imports = [

nixos/modules/services/databases/pgbouncer.nix

@@ -420,7 +420,7 @@ in
         User = cfg.user;
         Group = cfg.group;
         ExecStart = utils.escapeSystemdExecArgs [
-          (lib.getExe pkgs.pgbouncer)
+          (lib.getExe cfg.package)
           "/etc/${configPath}"
         ];
         RuntimeDirectory = "pgbouncer";

nixos/modules/services/hardware/buffyboard.nix

@@ -109,6 +109,22 @@ in
               This has a negative performance impact.
             '';
           };
+          options.quirks.ignore_unused_terminals = mkOption {
+            type = types.nullOr types.bool;
+            default = null;
+            description = ''
+              If true, buffyboard won't automatically update the layout of a new terminal and
+              draw the keyboard, if the terminal is not opened by any process. In this case
+              SIGUSR1 should be sent to buffyboard to update the layout. This quirk was introduced
+              to resolve a race between buffyboard and systemd-logind according to the following scenario:
+              - A user switches to a new virtual terminal
+              - Buffyboard opens the terminal and changes the number of rows
+              - systemd-logind sees that the terminal is opened by some other process and don't start getty@.service
+
+              The race is resolved by enabling this option and installing a drop-in file
+              for getty@.service that sends SIGUSR1 to buffyboard.
+            '';
+          };
         };
         default = { };
       };
@@ -132,7 +148,6 @@ in
         ))
       ];
       wantedBy = [ "getty.target" ];
-      before = [ "getty.target" ];
     };
   };
 }

nixos/modules/services/monitoring/karma.nix

@@ -117,7 +117,7 @@ in
         Type = "simple";
         DynamicUser = true;
         Restart = "on-failure";
-        ExecStart = "${pkgs.karma}/bin/karma --config.file ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraOptions}";
+        ExecStart = "${lib.getExe cfg.package} --config.file ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraOptions}";
       };
     };
     networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.listen.port ];

nixos/modules/services/network-filesystems/orangefs/server.nix

@@ -7,7 +7,7 @@
 let
   cfg = config.services.orangefs.server;
 
-  aliases = lib.mapAttrsToList (alias: url: alias) cfg.servers;
+  aliases = lib.attrNames cfg.servers;
 
   # Maximum handle number is 2^63
   maxHandle = 9223372036854775806;

nixos/modules/services/networking/dhcpcd.nix

@@ -30,7 +30,7 @@ let
     map (i: i.name) (
       lib.filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) interfaces
     )
-    ++ lib.mapAttrsToList (i: _: i) config.networking.sits
+    ++ lib.attrNames config.networking.sits
     ++ lib.concatLists (lib.attrValues (lib.mapAttrs (n: v: v.interfaces) config.networking.bridges))
     ++ lib.flatten (
       lib.concatMap (

nixos/modules/services/web-servers/nginx/default.nix

@@ -10,7 +10,7 @@ with lib;
 let
   cfg = config.services.nginx;
   inherit (config.security.acme) certs;
-  vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts;
+  vhostsConfigs = attrValues virtualHosts;
   acmeEnabledVhosts = filter (
     vhostConfig: vhostConfig.enableACME || vhostConfig.useACMEHost != null
   ) vhostsConfigs;

nixos/modules/tasks/network-interfaces-systemd.nix

@@ -347,7 +347,7 @@ in
                         driverOpt:
                         assertTrace (elem driverOpt (knownOptions ++ unknownOptions))
                           "The bond.driverOption `${driverOpt}` cannot be mapped to the list of known networkd bond options. Please add it to the mapping above the assert or to `unknownOptions` should it not exist in networkd."
-                      ) (mapAttrsToList (k: _: k) do);
+                      ) (attrNames do);
                       "";
                     # get those driverOptions that have been set
                     filterSystemdOptions = filterAttrs (sysDOpt: kOpts: any (kOpt: do ? ${kOpt}) kOpts.optNames);

pkgs/applications/editors/vim/plugins/generated.nix

@@ -3872,6 +3872,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  dart-nvim = buildVimPlugin {
+    pname = "dart.nvim";
+    version = "2025-10-23";
+    src = fetchFromGitHub {
+      owner = "iofq";
+      repo = "dart.nvim";
+      rev = "71421e7ef5aee8267e24dc562fdd07a83bda192e";
+      sha256 = "1jny6xq5ami3msa8b22hp7yrraljwg7vfkwj7rps8j7whrdxkfjh";
+    };
+    meta.homepage = "https://github.com/iofq/dart.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   dart-vim-plugin = buildVimPlugin {
     pname = "dart-vim-plugin";
     version = "2024-07-02";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -297,6 +297,7 @@ https://github.com/JachymPutta/dailies.nvim/,HEAD,
 https://github.com/Koalhack/darcubox-nvim/,HEAD,
 https://github.com/ptdewey/darkearth-nvim/,HEAD,
 https://github.com/dart-lang/dart-vim-plugin/,,
+https://github.com/iofq/dart.nvim/,HEAD,
 https://github.com/rizzatti/dash.vim/,HEAD,
 https://github.com/nvimdev/dashboard-nvim/,,
 https://github.com/Shougo/ddc-filter-matcher_head/,HEAD,

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -91,11 +91,11 @@
     "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
   },
   "baidubce_baiducloud": {
-    "hash": "sha256-zKkXfSIVVW0QxQB/fJNowy1mQPfXlv6HFcNaNlBSIvY=",
+    "hash": "sha256-2SXMBb/Ho7OOhqYzQHw2Seg3oi1B5aIa1Q606TVZQvY=",
     "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
     "owner": "baidubce",
     "repo": "terraform-provider-baiducloud",
-    "rev": "v1.22.11",
+    "rev": "v1.22.12",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -264,13 +264,13 @@
     "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
   },
   "datadog_datadog": {
-    "hash": "sha256-NJjU+x4AWXuBKdszE4AmebodhPLEoX70DjvYXTBrolY=",
+    "hash": "sha256-6TWsoB6v7mqln4qcq1Dhk8GnkNVUFGyZhR9sJ1Ri/yU=",
     "homepage": "https://registry.terraform.io/providers/DataDog/datadog",
     "owner": "DataDog",
     "repo": "terraform-provider-datadog",
-    "rev": "v3.76.0",
+    "rev": "v3.77.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-3RqIhSu7C770Zl7QngqKMNdo40DGDoZSQpuABQxajK8="
+    "vendorHash": "sha256-9Xl32qeUvpvID4+REuQZlCFarz8cEdtOzROU4jrordw="
   },
   "datadrivers_nexus": {
     "hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=",
@@ -363,29 +363,29 @@
     "vendorHash": "sha256-Q3H/6mpkWn1Gw0NRMtKtkBRGHjPJZGBFdGwfalyQ4Z0="
   },
   "equinix_equinix": {
-    "hash": "sha256-QE8ukiQHZqhSsZyFnInIpnGvsSlFuFMun7paK/Z3HTM=",
+    "hash": "sha256-QO0XcYXfRNRpyEMxS0c80e3lr0Zf4j+6feb8hu5NPq0=",
     "homepage": "https://registry.terraform.io/providers/equinix/equinix",
     "owner": "equinix",
     "repo": "terraform-provider-equinix",
-    "rev": "v4.3.0",
+    "rev": "v4.4.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-BzlSPZ11K9wZXd66jh3CAL+5qco6m0Hb/QiVtAi1Ub8="
+    "vendorHash": "sha256-LuOymPvWBQs29fghb7uDW6PSAibMmC9igdLMpuhf2vw="
   },
   "exoscale_exoscale": {
-    "hash": "sha256-tTFGYzDwx7VXzS287eNUUjsAuwY/Rh2zuOsGwLT6BRU=",
+    "hash": "sha256-w7OI4cieF5RtClKUrlnOTE0HSmI1lZ8X+hqMJpzQENo=",
     "homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
     "owner": "exoscale",
     "repo": "terraform-provider-exoscale",
-    "rev": "v0.65.1",
+    "rev": "v0.66.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
   "f5networks_bigip": {
-    "hash": "sha256-oJIIhIBQXx5u2OwYcyMo4uRdzWdWLz2PlO9r9ZSRIzo=",
+    "hash": "sha256-iUKdsdJ38GE5Q0rbLpnWthKBFBylfe59rfjmQGbCDY0=",
     "homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
     "owner": "F5Networks",
     "repo": "terraform-provider-bigip",
-    "rev": "v1.24.0",
+    "rev": "v1.24.1",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -462,13 +462,13 @@
     "vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U="
   },
   "grafana_grafana": {
-    "hash": "sha256-wpzR+IhA0L3o8ng1PcB9wyIpaOg6wC5L7kyaXepHvO4=",
+    "hash": "sha256-RHADl2x2Tr22P53PJ0gXrAmxe+1mm6A3k0B8+92iDYg=",
     "homepage": "https://registry.terraform.io/providers/grafana/grafana",
     "owner": "grafana",
     "repo": "terraform-provider-grafana",
-    "rev": "v4.11.1",
+    "rev": "v4.12.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-FTzmvIgv0pPczM/QLyUvNQ0eDVGvlx7nFQneiw/9sAo="
+    "vendorHash": "sha256-xCwnCYP3QjIGkO844rczU6cHd6Pk8SKzRfO3mJK3XVc="
   },
   "gridscale_gridscale": {
     "hash": "sha256-XdBGD94kMLcB3ycZABVT+skiPg7rYyR4ycfvnubj6JM=",
@@ -498,13 +498,13 @@
     "vendorHash": "sha256-93DyqAPi6hirke0KyR6gggC7cgAZOOByUIIA6C+6LZU="
   },
   "hashicorp_awscc": {
-    "hash": "sha256-Zv333wYeP8mpCBWxRbGQoxKI0p+zooUOnUB5Pp0CyRg=",
+    "hash": "sha256-SrJQG1F9V/HThL6TDduT/qEA2x3tzII56+JMVDFpqEk=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
     "owner": "hashicorp",
     "repo": "terraform-provider-awscc",
-    "rev": "v1.60.0",
+    "rev": "v1.61.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-LCmk72ySR7Ncb+sqKYXP2PLbO3dirXwBhdEdis+49VA="
+    "vendorHash": "sha256-WKshejs/cOtCGpMLxrnzRV+eKDPkPWIjK2nvwDodoDk="
   },
   "hashicorp_azuread": {
     "hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=",
@@ -516,11 +516,11 @@
     "vendorHash": null
   },
   "hashicorp_azurerm": {
-    "hash": "sha256-y1bQcrFb6BPdE/xVz+UKH0pwMIQ/j32LNk4QAKISYCQ=",
+    "hash": "sha256-sWSz/ixfrJOf5hS5PV70jXfsAD+nhL3PS8wLLGnndQI=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v4.49.0",
+    "rev": "v4.50.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -534,13 +534,13 @@
     "vendorHash": "sha256-bD8BHhP4jxBRnFjmZE1MMkBn2/sMqNEaxTlQRMj2Crw="
   },
   "hashicorp_consul": {
-    "hash": "sha256-kLoJKnqbjsrzBqFNPpG59UOYlp2UKYsS7b6cu5xImp8=",
+    "hash": "sha256-SlXzhH9EQJAAcSAog6XzbeenzseXNEUfXdYtURpUcUw=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/consul",
     "owner": "hashicorp",
     "repo": "terraform-provider-consul",
-    "rev": "v2.22.0",
+    "rev": "v2.22.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ODAqEy04jptTR2dggCm9Vs2xxVt02SVVgGAUa06+9YY="
+    "vendorHash": "sha256-HQXioE9mbc+0Qf6MGiXKXSfmbUUtkUafA01GEXbLQfE="
   },
   "hashicorp_dns": {
     "hash": "sha256-+M4i5tvGrjGRBwB9bFp6YYhbz3qGRcg9W6PhD59Rfbk=",
@@ -561,22 +561,22 @@
     "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
   },
   "hashicorp_google": {
-    "hash": "sha256-9PhfOOqtJWMy65aoQ1TuCpIBNYmIglHPxq2dfWvzVGM=",
+    "hash": "sha256-ozIqR6M7E6Y6Zvw7ymdVeW49v5a2jt9axacM/0TvXc8=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "repo": "terraform-provider-google",
-    "rev": "v7.7.0",
+    "rev": "v7.8.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-vRvBFktCOlp8oIr3hYj5x5v6FrG6OrEbWq/mMUjLGAc="
+    "vendorHash": "sha256-kSFeWcuoym3FJP/E/diWuafEv1sffYinAzCjZ6z7B84="
   },
   "hashicorp_google-beta": {
-    "hash": "sha256-S6Q1hxH67pCgB1f+bgW8tOyo5L9t8pcnhWmyMZPE/0A=",
+    "hash": "sha256-ejjyVzNQY8w1kvZyvuIMGSDhu5jea1/6TFiIG5bvrSw=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v7.7.0",
+    "rev": "v7.8.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-xNiVciw6AWwgInSBIYjjqFjEOA6YFImebxIy/w0D/h4="
+    "vendorHash": "sha256-tc7PInjXPEAI/sYtrYZsQxQV3Gk04ov/4SBQ1fHqkIQ="
   },
   "hashicorp_helm": {
     "hash": "sha256-i4ceWiEXJYL1x9DmqAfcUidiW5+x/sRCxevDz4MnzHs=",
@@ -705,20 +705,20 @@
     "vendorHash": "sha256-jwDezL9gI6A9pCdD1CUgEOJT8dqVuPX/sFjTO4Jiqs4="
   },
   "huaweicloud_huaweicloud": {
-    "hash": "sha256-8hAfZZuRzQ/Q2yEPBclpRGbuBfT1GvOyg5Y9xS8x9Lw=",
+    "hash": "sha256-X/pEv7osVytLe16B/ERbp8izuPLtMb/TeMiQVI0jZWc=",
     "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
     "owner": "huaweicloud",
     "repo": "terraform-provider-huaweicloud",
-    "rev": "v1.79.1",
+    "rev": "v1.79.2",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
   "ibm-cloud_ibm": {
-    "hash": "sha256-JrBH2tmzJJSO/AekVXg0IdsUa41Lt/LpfRwSrDkZcIY=",
+    "hash": "sha256-QnXzIWs6Ts6qAz9qiTT+9Zd7gKx3tQGswgDH2D7z7gw=",
     "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
     "owner": "IBM-Cloud",
     "repo": "terraform-provider-ibm",
-    "rev": "v1.84.1",
+    "rev": "v1.84.3",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-AfdcXD39h5y+AJF7pQ76qxH7FgOp/ya5AWFo/pAUoxc="
   },
@@ -741,11 +741,11 @@
     "vendorHash": null
   },
   "integrations_github": {
-    "hash": "sha256-rmIoyGlkw2f56UwD0mfI5MiHPDFDuhtsoPmerIrJcGs=",
+    "hash": "sha256-OexDIuEHRSOeHq0lRZcaaezdQpm5tgINGcka6jk+bK0=",
     "homepage": "https://registry.terraform.io/providers/integrations/github",
     "owner": "integrations",
     "repo": "terraform-provider-github",
-    "rev": "v6.6.0",
+    "rev": "v6.7.0",
     "spdx": "MIT",
     "vendorHash": null
   },
@@ -832,13 +832,13 @@
     "vendorHash": "sha256-b9+0YLuv9AVszGDQ2v+VbYameN16PCdE3jUhL9efK6M="
   },
   "linode_linode": {
-    "hash": "sha256-ofgX6ih/UHd1Lm36KgS7BG8QY7ENhywHY2IhQ/ebfqM=",
+    "hash": "sha256-DMvmTryqgZyhuaDL3cslwMhMnj1x8iNsE5yyhehhANo=",
     "homepage": "https://registry.terraform.io/providers/linode/linode",
     "owner": "linode",
     "repo": "terraform-provider-linode",
-    "rev": "v3.4.0",
+    "rev": "v3.5.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-iZGbGd16fHtYKXh25O7LLcrjwm4Ceeak5dTN9t5rZGk="
+    "vendorHash": "sha256-8LbFq29JvQX3Trn81fr3YMjFwW+OTWAyK6OVAkh0I3A="
   },
   "loafoe_htpasswd": {
     "hash": "sha256-ALTyTTVyS2HHenmk8HVwtQenCmJX05kyXifJTzzmnHE=",
@@ -859,13 +859,13 @@
     "vendorHash": "sha256-vcuUt3WIo1TnLApch410JgtyCzliQRYMQQQ2Z9diDZ8="
   },
   "lxc_incus": {
-    "hash": "sha256-ecTodsExnc96AoyYKutPLNu5UQrVObcWQwFUcv9oCB4=",
+    "hash": "sha256-N+3OHJGK67iITA8DGDMZSYmCdkhPkXRlv4NzOLpu4y8=",
     "homepage": "https://registry.terraform.io/providers/lxc/incus",
     "owner": "lxc",
     "repo": "terraform-provider-incus",
-    "rev": "v0.5.1",
+    "rev": "v1.0.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-gyU+RiCtf5gl5RDuAalYHgXqvU2sioxnL6ZfOwn6vYE="
+    "vendorHash": "sha256-eTCRjnC86O2q6YZj6ltOfiBKbFCeFR1zsF3QiJ73SYA="
   },
   "marcofranssen_dexidp": {
     "hash": "sha256-un+jAmcK1MYljcAFyIHw0AFmvz4GltAsWxTOd/zXxyU=",
@@ -913,13 +913,13 @@
     "vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU="
   },
   "mongodb_mongodbatlas": {
-    "hash": "sha256-evMjL6I9q80olTkuigJLbAHTDU4nYXNaMVf8cq6yZsM=",
+    "hash": "sha256-a5oTDhV1e0wX7HR1xyZM1KM9D4/8EghhKFF0PkvPjqM=",
     "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
     "owner": "mongodb",
     "repo": "terraform-provider-mongodbatlas",
-    "rev": "v2.0.1",
+    "rev": "v2.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-BWItAEI+ST5wN/CyTHljFJvutJiDHYjV4HEeLtmhC2o="
+    "vendorHash": "sha256-MejX7qApT4Aq/LzUExpi92yCb4Id/yfY6z/rduOs+so="
   },
   "namecheap_namecheap": {
     "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
@@ -949,22 +949,22 @@
     "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
   },
   "newrelic_newrelic": {
-    "hash": "sha256-6hBzwp9FG/eL7SPWuEkMvZ/phHabmnJ+oTF/lUn02fQ=",
+    "hash": "sha256-/vHE+Eys773WyYMDe7xG3p0pgKvRc9U73s4jSDijNxY=",
     "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
     "owner": "newrelic",
     "repo": "terraform-provider-newrelic",
-    "rev": "v3.72.3",
+    "rev": "v3.73.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-45psSf69IetY0o8LjBDEv2GnOxaOzaQcPCnV2YHPXGs="
   },
   "ns1-terraform_ns1": {
-    "hash": "sha256-JJ+Zcf7r8bB1a8l+DtHhjT4Ce2VqRIkD1fS+EWI6QtI=",
+    "hash": "sha256-S0ji/gZsbMTgug7DwPODAcPx3IfRaw1JHYPJ6V+tqeM=",
     "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",
     "owner": "ns1-terraform",
     "repo": "terraform-provider-ns1",
-    "rev": "v2.7.1",
+    "rev": "v2.7.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-HC2MCVF3gS4nXKplC1pGrdjbhjRzr03ajqZ7pQIgSOc="
+    "vendorHash": "sha256-TBMJn9UIRub0N2yI+eGgPMvxSsPQo+xRSMB7qDO8lyw="
   },
   "numtide_linuxbox": {
     "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",
@@ -1030,29 +1030,29 @@
     "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
   },
   "opentelekomcloud_opentelekomcloud": {
-    "hash": "sha256-PC8IKp4HirFgdz9azof88jBz+mGr0vqjwtbuIMNHp4U=",
+    "hash": "sha256-VrhloC601pG6jcBbrKc/ldhtWwzJzhkLdHj1/UPOUqk=",
     "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
     "owner": "opentelekomcloud",
     "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.50",
+    "rev": "v1.36.51",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-SWWB8WX/cSaLPfr6XxsKnW5ufmuGrU3nx8neGvphvJg="
+    "vendorHash": "sha256-57F7YS7r+/O8qSWfNhrT/5XAaq7CfX7RchY/45WBauw="
   },
   "opsgenie_opsgenie": {
-    "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=",
+    "hash": "sha256-Mhpqi/9qgkRXZ/b2u2VFsJQBYwVgrJ5boqszvUKFu7A=",
     "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie",
     "owner": "opsgenie",
     "repo": "terraform-provider-opsgenie",
-    "rev": "v0.6.37",
+    "rev": "v0.6.38",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
   "oracle_oci": {
-    "hash": "sha256-LnR1bXTr+j7tKALZll/dwUI+o9TepPGS0mAHGxYK7g0=",
+    "hash": "sha256-KrsIw2GQNA3Nlhui4Ib8HwuBuQPCZaecKvws6A18mcI=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v7.22.0",
+    "rev": "v7.23.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1075,11 +1075,11 @@
     "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw="
   },
   "pagerduty_pagerduty": {
-    "hash": "sha256-vVhZOPKtxKye4RkEYo9VS0BZmIUdEjLKtJHh108PmP0=",
+    "hash": "sha256-ydLlwg7gnyp0tbDWUzYgigqycgTnfoJRswH61kD0P4k=",
     "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
     "owner": "PagerDuty",
     "repo": "terraform-provider-pagerduty",
-    "rev": "v3.30.3",
+    "rev": "v3.30.4",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1129,11 +1129,11 @@
     "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="
   },
   "rootlyhq_rootly": {
-    "hash": "sha256-HlUjEeyomuLqlKFq5U+dpgyBOxrxHALqywVbJM9Fm/s=",
+    "hash": "sha256-4YjmP7DMaqsDADi0+B39Wn0CA2M3MEhV3VKA+M/gHMg=",
     "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
     "owner": "rootlyhq",
     "repo": "terraform-provider-rootly",
-    "rev": "v4.3.2",
+    "rev": "v4.3.3",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-auyQLDDQ+tfMQCqICDR5tfvaYrO89Eani7lAsfoPwwU="
   },
@@ -1147,11 +1147,11 @@
     "vendorHash": null
   },
   "sacloud_sakuracloud": {
-    "hash": "sha256-TiSsNgmkZMk71IKFTxoQLDHRNHUGsdbfo/6CEEEwDEs=",
+    "hash": "sha256-kiAl/qdLbXzBCwgms3Y7TD/Ez2Hq0ifZ1SLVIPa9Bmk=",
     "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud",
     "owner": "sacloud",
     "repo": "terraform-provider-sakuracloud",
-    "rev": "v2.31.0",
+    "rev": "v2.31.1",
     "spdx": "Apache-2.0",
     "vendorHash": "sha256-BREv9hd6Oa/S8NjpRoLcF8uUFykEyffQO0LCuA3WFmc="
   },
@@ -1174,13 +1174,13 @@
     "vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8="
   },
   "scaleway_scaleway": {
-    "hash": "sha256-FT9V0qAs6NSULqOMsW9uolc1WgueUnU4vfL4rntMA1A=",
+    "hash": "sha256-ArjX1/OCR9rKGAGg4o5Rd98n8n8l7+Toz5XlH5A/LSE=",
     "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
     "owner": "scaleway",
     "repo": "terraform-provider-scaleway",
-    "rev": "v2.60.4",
+    "rev": "v2.60.5",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-OcKCtH4ciGrKwidTQC+yTWMyMfShJMsTnsKOyBxwLDg="
+    "vendorHash": "sha256-PWUXuCrZz78ggiXo4DVb/C75cB8gzbQD9H0vdJZCUII="
   },
   "scottwinkler_shell": {
     "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
@@ -1228,31 +1228,31 @@
     "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
   },
   "spacelift-io_spacelift": {
-    "hash": "sha256-yOsvmx4N550Sb5Qri3aAT6f9w46vec6/sx4uP2oOc6k=",
+    "hash": "sha256-lmg7PUwcX1NwuyBEGcZZJbRhpUT9eVUQAf740gk9aAU=",
     "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
     "owner": "spacelift-io",
     "repo": "terraform-provider-spacelift",
-    "rev": "v1.35.0",
+    "rev": "v1.35.1",
     "spdx": "MIT",
-    "vendorHash": "sha256-DLiS2fqr/gNdZGkhvqjdgpICY0QTlE/Ejl3m29Vanm4="
+    "vendorHash": "sha256-cX5K221Jnq701Nb+2bC1LmXVL7YvkZ8dkc2wYjDNOSw="
   },
   "splunk-terraform_signalfx": {
-    "hash": "sha256-ia+1xcAQp0UIkkn9NgOkne8g+FmcnCCo5NxXjw/Q6AI=",
+    "hash": "sha256-kErd5DLViYA9yHyBAHxntPRJET9QmpCMWcpbFx/Qwhk=",
     "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
     "owner": "splunk-terraform",
     "repo": "terraform-provider-signalfx",
-    "rev": "v9.22.1",
+    "rev": "v9.22.2",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-epwHFW1lGk/HUtv5bS0Dyi59POjICsoJln2xgmH5320="
   },
   "spotinst_spotinst": {
-    "hash": "sha256-bbQ7WDizMnCF95E/iXOSSx0e5K2wMtUW39OxT/45Jn4=",
+    "hash": "sha256-h1GtNFwf5zVM3/0AJHpyF9GpMm1pbPbNkEconmrthpk=",
     "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
     "owner": "spotinst",
     "repo": "terraform-provider-spotinst",
-    "rev": "v1.228.0",
+    "rev": "v1.229.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-huHeWKzq/4cHAU4P7q9bOiJ2cAFqevZ80BsCyPiujxw="
+    "vendorHash": "sha256-45cgtu5LzP3ydkHl3RpB0tw0Lz101bL1TpTKl0pnyKc="
   },
   "statuscakedev_statuscake": {
     "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=",
@@ -1273,11 +1273,11 @@
     "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
   },
   "sysdiglabs_sysdig": {
-    "hash": "sha256-nLZgUNWv2e3yTl7/ntSP//BNAaidJxzYA5+v2pJCYDM=",
+    "hash": "sha256-b30SVfem2G3lBX9J5KGyxow0KK7kksOZLZ9135PyYPY=",
     "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
     "owner": "sysdiglabs",
     "repo": "terraform-provider-sysdig",
-    "rev": "v2.1.0",
+    "rev": "v3.0.1",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
   },
@@ -1309,11 +1309,11 @@
     "vendorHash": "sha256-9GjhP/Oh2HlVuMcuXFhS7MUmF3eS4qlUsW5XhugaK14="
   },
   "tencentcloudstack_tencentcloud": {
-    "hash": "sha256-Feuf+efTnYMK1398u0HvEkDNxNWFM/mZo4N6hZ/Fo/Y=",
+    "hash": "sha256-e9Mr5QK0MFtk2IRakLCy2smkwKBau5sAH8BE/IIfp3A=",
     "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
     "owner": "tencentcloudstack",
     "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.82.30",
+    "rev": "v1.82.32",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1336,13 +1336,13 @@
     "vendorHash": "sha256-SF11E60OQiRdf+Pf6XyJg60yGRnGOcSzhrYccrWaeYE="
   },
   "terraform-lxd_lxd": {
-    "hash": "sha256-ToK0Zua7e4CPm+8ZLIVw+dpt4bbahqWvvCKhjrAeW7s=",
+    "hash": "sha256-bbu7GRwIWcAFB/ZcB47IFlaloUt3D05l6QKTQMSljFU=",
     "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd",
     "owner": "terraform-lxd",
     "repo": "terraform-provider-lxd",
-    "rev": "v2.5.0",
+    "rev": "v2.6.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-zGHbDQhr1UjF6jcK4NHw90eTVrC+R76G8Fg7vJht20c="
+    "vendorHash": "sha256-yUQaUkqc8Q8vLtfBWsgzraxIiRWAEKZVOAycIFc5r5c="
   },
   "terraform-provider-openstack_openstack": {
     "hash": "sha256-vACjj5wo2zqNls0VgKeylEW5rrsNv1jz5iKoEywBAEc=",
@@ -1489,12 +1489,12 @@
     "vendorHash": "sha256-Y6zsbhLNehO3i/BRjKggVhcM15Qesbd6HbARFH/arM8="
   },
   "yandex-cloud_yandex": {
-    "hash": "sha256-6g4/ZuZ63LcRWcZ/WCdflqSEBk+Qkx2KcPnMLyXaauI=",
+    "hash": "sha256-jzACS+vNAiUp7GJt3jO8lTbQZpSj5vUhB1aD0iRi6Gk=",
     "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
     "owner": "yandex-cloud",
     "repo": "terraform-provider-yandex",
-    "rev": "v0.165.0",
+    "rev": "v0.168.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-2UCLAK9MtDD0RF34MPdaD4E7n3cDjbn1emU2Vu7c2zs="
+    "vendorHash": "sha256-NCUk8tBJnIKziowss/nm6pEgI2Yn/q6hnfvoMTTP8nQ="
   }
 }

pkgs/applications/networking/protonvpn-cli/2.nix

@@ -1,57 +0,0 @@
-{
-  lib,
-  buildPythonApplication,
-  fetchFromGitHub,
-  pythonOlder,
-  requests,
-  docopt,
-  pythondialog,
-  jinja2,
-  distro,
-  dialog,
-  iptables,
-  openvpn,
-}:
-
-buildPythonApplication rec {
-  pname = "protonvpn-cli_2";
-  version = "2.2.12";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.5";
-
-  src = fetchFromGitHub {
-    owner = "Rafficer";
-    repo = "linux-cli-community";
-    # There is a tag and branch with the same name
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-vNbqjdkIRK+MkYRKUUe7W5Ytc1PU1t5ZLr9fPDOZXUs=";
-  };
-
-  propagatedBuildInputs = [
-    requests
-    docopt
-    pythondialog
-    jinja2
-    distro
-    dialog
-    openvpn
-    iptables
-  ];
-
-  # No tests
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Linux command-line client for ProtonVPN using Openvpn";
-    homepage = "https://github.com/Rafficer/linux-cli-community";
-    maintainers = with maintainers; [
-      jtcoolen
-      jefflabonte
-      shamilton
-    ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    mainProgram = "protonvpn";
-  };
-}

pkgs/applications/networking/protonvpn-cli/default.nix

@@ -1,60 +0,0 @@
-{
-  lib,
-  buildPythonApplication,
-  pythonOlder,
-  fetchFromGitHub,
-  protonvpn-nm-lib,
-  pythondialog,
-  dialog,
-  wrapGAppsNoGuiHook,
-  gobject-introspection,
-  glib,
-}:
-
-buildPythonApplication rec {
-  pname = "protonvpn-cli";
-  version = "3.13.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.5";
-
-  src = fetchFromGitHub {
-    owner = "protonvpn";
-    repo = "linux-cli";
-    tag = version;
-    sha256 = "sha256-KhfogC23i7THe6YZJ6Sy1+q83vZupHsS69NurHCeo8I=";
-  };
-
-  nativeBuildInputs = [
-    wrapGAppsNoGuiHook
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    glib
-  ];
-
-  propagatedBuildInputs = [
-    protonvpn-nm-lib
-    pythondialog
-    dialog
-  ];
-
-  dontWrapGApps = true;
-
-  makeWrapperArgs = [
-    "\${gappsWrapperArgs[@]}"
-  ];
-
-  # Project has a dummy test
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Linux command-line client for ProtonVPN";
-    homepage = "https://github.com/protonvpn/linux-cli";
-    maintainers = [ ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    mainProgram = "protonvpn-cli";
-  };
-}

pkgs/applications/office/libreoffice/default.nix

@@ -313,18 +313,24 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
     ./readd-explicit-zlib-link.patch
-
+  ]
+  ++ lib.optionals (lib.versionOlder version "25.8.2.1") [
     # Backport patch to fix build with Poppler 25.09
     (fetchpatch2 {
       url = "https://github.com/LibreOffice/core/commit/7848e02819c007026952a3fdc9da0961333dc079.patch";
       includes = [ "sdext/*" ];
       hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU=";
     })
-  ]
-  ++ lib.optionals (lib.versionAtLeast version "25.8") [
     # Fix build with Poppler 25.10
     (fetchpatch2 {
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/41e58e117c356af2be83993595caf61f9f30cc89/poppler-25.10.patch";
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
+      hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
+    })
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "25.8.2.2") [
+    # Fix build with Poppler 25.10
+    (fetchpatch2 {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/f7b0e4385108b95c134599502a7bccf0a41925c8/poppler-25.10.patch";
       hash = "sha256-KMsjDtRRH8Vy/FXaVwxUo0Ww10PCE0sK8+ZL0Ja2kJQ=";
     })
   ]

pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix

@@ -32,5 +32,8 @@ perlPackages.buildPerlPackage rec {
     homepage = "https://github.com/mkamensky/Text-Bidi";
     maintainers = with maintainers; [ doronbehar ];
     platforms = with platforms; unix;
+    # Quote from the README:
+    # same terms as the Perl 5 programming language system itself
+    license = perlPackages.perl.meta.license;
   };
 }

pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "urxvt-tabbedex";
-  version = "19.21";
+  version = "22.32";
 
   src = fetchFromGitHub {
     owner = "mina86";
     repo = "urxvt-tabbedex";
     rev = "v${version}";
-    sha256 = "06msd156h6r8ss7qg66sjz5jz8613qfq2yvp0pc24i6mxzj8vl77";
+    sha256 = "sha256-4+4iPFoy1j5xjXRM5kBauhff44Y7/ik/+ZLZ1prc+Xo=";
   };
 
   nativeBuildInputs = [ perl ];
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mina86/urxvt-tabbedex";
     maintainers = [ ];
     platforms = with platforms; unix;
+    license = lib.licenses.gpl3Plus;
   };
 }

pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix

@@ -16,7 +16,9 @@
 }:
 
 let
-  availablePlugins = lib.filterAttrs (_: v: lib.isDerivation v) rxvt-unicode-plugins;
+  availablePlugins = lib.filterAttrs (
+    _: v: (lib.isDerivation v && (v.meta.license.free or false))
+  ) rxvt-unicode-plugins;
 
   # Transform the string "self" to the plugin itself.
   # It's needed for plugins like bidi who depends on the perl

pkgs/applications/video/kodi/addons/controller-topology-project/default.nix

@@ -8,13 +8,13 @@
 let
   drv = stdenv.mkDerivation rec {
     pname = "controller-topology-project";
-    version = "1.0.7";
+    version = "1.0.8";
 
     src = fetchFromGitHub {
       owner = "kodi-game";
       repo = "controller-topology-project";
       rev = "v${version}";
-      sha256 = "sha256-LzwMKsoip+ajmmk4qUJynOmhhf3Auivn8Af8VRGWkTA=";
+      sha256 = "sha256-hYakxkGAF6kh2nTLwKdnLVqtQLvEgayvexTfqvfoLuw=";
     };
 
     postPatch = ''

pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix

@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bign-handheld-thumbnailer";
-  version = "1.1.3";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "MateusRodCosta";
     repo = "bign-handheld-thumbnailer";
     tag = "v${version}";
-    hash = "sha256-qS1bKEkZPmNMfiLUZVlx8EAXMMYCcGGTTZFhWwlZ3gQ=";
+    hash = "sha256-+iWf5ybCUHlZz3Ybw3bwLKzlsmiVwep2alVDvL9bG2A=";
   };
 
-  cargoHash = "sha256-LyT0HDR51/bYnXtavgtff1nCKuJn41UmZuH/uJmykkk=";
+  cargoHash = "sha256-vfTbfg1CAbc//UZtI5trw6znqnNGy6AiCSQNE68vch8=";
 
   strictDeps = true;
 

pkgs/by-name/bu/buffybox/package.nix

@@ -1,6 +1,5 @@
 {
   fetchFromGitLab,
-  fetchpatch2,
   inih,
   lib,
   libdrm,
@@ -16,30 +15,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "buffybox";
-  version = "3.3.0";
+  version = "3.4.2-unstable-2025-10-25";
+  # 3.4.2 would be preferred but there are 3 commits past 3.4.2 that are really nice to have
 
   src = fetchFromGitLab {
     domain = "gitlab.postmarketos.org";
     owner = "postmarketOS";
     repo = "buffybox";
     fetchSubmodules = true; # to use its vendored lvgl
-    rev = "dce41a6f07a2b63c3136409b7bcd0078299fadf9";
-    hash = "sha256-n5RQg7kGS+lg7sRe5Defl3nDEha0vhc/FbwywD5wBsg=";
+    rev = "437ff2cbd7fd35ba6ca2d46624e7fcf8c5f3f954";
+    hash = "sha256-1GRsntNc3byHmZKLG/ZRXvbo96DjmLrA0bVYtMAlKsQ=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # This fixes a bug that might annoy you if you use something like PKCS#11
-      url = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/commit/d8214b522a3cc72cd4639a1dd114103a02e9218c.patch";
-      hash = "sha256-WxKuioJ1Fo5ARRYF/R4yULDVB4pq11phljzVGdWTV6s=";
-    })
-    (fetchpatch2 {
-      # Fixes up UB
-      url = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/commit/4e13c312241420cbb3e5cc7d4f0dd3e5d17449be.patch";
-      hash = "sha256-7yX6gGsptwijx+ZedSJWJKhwaoBVpxIbGK+ZiMLsIhc=";
-    })
-  ];
-
   depsBuildBuild = [
     pkg-config
   ];

pkgs/by-name/ca/cargo-binstall/package.nix

@@ -6,20 +6,21 @@
   bzip2,
   xz,
   zstd,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-binstall";
-  version = "1.15.7";
+  version = "1.15.9";
 
   src = fetchFromGitHub {
     owner = "cargo-bins";
     repo = "cargo-binstall";
-    rev = "v${version}";
-    hash = "sha256-EQhEI4MqYNwjqb8awROTLfxjGsoPKeT7VHt642uSgCc=";
+    tag = "v${version}";
+    hash = "sha256-v/tilaoDLZDV0VbMTT/DfqSNO4Ezyu3AWGzMftMubqc=";
   };
 
-  cargoHash = "sha256-a9X8L4AZWhlcQ5lVo0I1GL2wpCjOClNuZLy+GwHJDcA=";
+  cargoHash = "sha256-itYqZi1tSWVwqGfNFSBh4/+PoLrQZQTnla4lOCjoX8Q=";
 
   nativeBuildInputs = [
     pkg-config
@@ -57,6 +58,10 @@ rustPlatform.buildRustPackage rec {
     "--skip=gh_api_client::test::test_gh_api_client_cargo_binstall_v0_20_1"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "-V";
+
   meta = {
     description = "Tool for installing rust binaries as an alternative to building from source";
     mainProgram = "cargo-binstall";

pkgs/by-name/ch/cherry-studio/missing-hashes.json

@@ -1,4 +1,12 @@
 {
+  "@biomejs/cli-darwin-arm64@npm:2.2.4": "5cd937e3a57ce9ba97e63e1062fd2b2cdfa1ba6506bee78e9b62a5e1499b8d9845e7a197e62de98a284012505a5abdd1b66a203613972166e46628ca02567e19",
+  "@biomejs/cli-darwin-x64@npm:2.2.4": "75cd8b221a7e4be8871650e0494016dc4116974fce8fff2e8f9cf085745abafcfa9e06a08c845f1d01f6a87d45fb5a5672972fbb51fbd891f35a49ec15cd2ce0",
+  "@biomejs/cli-linux-arm64-musl@npm:2.2.4": "5deb4f40d412442e81cbaf878d3e1adbf1fdae22cf5d178f5d56ce984bc6566962f99f162d7347201de0500a317ee3727ef32730b0ee6237a0814755f1ed7307",
+  "@biomejs/cli-linux-arm64@npm:2.2.4": "20c86551b3b71c342264e60cc9ceab2c16bfef935f318701d384dec26721e38757f94811a108cdabd3360b99309be44bb005388290d91f11b5869aba80d13a1d",
+  "@biomejs/cli-linux-x64-musl@npm:2.2.4": "6163fa95778bcee9b79aedb36117df9865f0f784bbb8bf55ba6df4544fd3b7fa5cf3e32eb77d863034d480c3c7c5014dadc5d137b8688e64e64e5093d5c1be1c",
+  "@biomejs/cli-linux-x64@npm:2.2.4": "84fbf9d4b681ad4426c5de492b4ab9200a15d4f61a71c69d4b6bfbe8f03f46e69bb951a93a85d71e0073bcf3ee1874530dad2eac3dbdd72c6084dfb59c83a1fd",
+  "@biomejs/cli-win32-arm64@npm:2.2.4": "39d4e2ac5a41b7c092bc9a3ef1889a557b47eb15f9057db823681c1483702ee6fe96a5b2e54a444ca6e867db5d41f2e9f6a1a6dd86d13fcb686dab5d19d02333",
+  "@biomejs/cli-win32-x64@npm:2.2.4": "741c77e74d4fcfbf74f3f5db2e29cb6bca90cd7b1c5e6af3b0cc8b5c3210b0b1f82019733e9849d18fa9fc4fe96fb4633974a2146447cc914249caf0636741e7",
   "@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a",
   "@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74",
   "@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183",
@@ -57,19 +65,20 @@
   "@napi-rs/system-ocr-darwin-x64@npm:1.0.2": "92b68b7e6a4be82b24fcc952d2c820e07bf68fb625d3c69edbcbf13227be508302f87ba9b0ff50d415c76ac16493d11040b6cc55a5b25f4414f3af5c00ab4597",
   "@napi-rs/system-ocr-win32-arm64-msvc@npm:1.0.2": "5c6945c5053380ee33df277df77ac813cc44763e9f305ea0b0990d3960269676ffe88bdd33038fa378d055c9986b7ecc31cbabc7f8fb51e077c59364a9ea29ec",
   "@napi-rs/system-ocr-win32-x64-msvc@npm:1.0.2": "9d6ebdaa753cea6f6e2e5b1b01ba293a7cd79ffd265bf5144f96f09bd596df21612662d7f62973886dd75725a029971cc3f11451ab95933bca5441b02593f352",
-  "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a",
-  "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79",
-  "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b",
-  "@parcel/watcher-freebsd-x64@npm:2.5.1": "cbd2b7884bc92422edabc0c74c3fbc06512bb7300fc137aaff2e96f46f61e5272265a0b5d230acc82a0e777b0c11661f0b8b7f89a9342c0920b752436dd2c750",
-  "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "f2e1ec14dbb0f85a84a75f55fd7721598694976ba3ad439832b57e558b0d9240cc80ff83053fb8cf7caffb0592d51bb39d325112763ec1734924b49d4ba9c144",
-  "@parcel/watcher-linux-arm-musl@npm:2.5.1": "83344c7ecda2e79db59d711bcee0c3fa26922989139c031bd762cf3d5bfb191797e22e9ed6072690b822dfd62629623ba4e7eedb3c41930a987fc3d4106000e1",
-  "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "562231feb159a294752378bebecc69a2d33366a9d877835844578799f8536398006e0e570849f9e2db04085a3ea82131459cd10fd6b42dea10cd73bd0c9ca13e",
-  "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "f62db52a90ebbaa29ca9900e6b9bd3fc6e5c650741bbde9a2742cbc332c678b753fc6a596d67659394fd9262aa826463ea667d18cc554bcaaac9e8da1a2a29d0",
-  "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "425e557991fde5092d6a9e20be71810600415e5fa157dca0b39bd8db86653d3ee7b037305261c8782d1a065f2a64d235e17b57876b26f5bb0dd7a9bdbe364690",
-  "@parcel/watcher-linux-x64-musl@npm:2.5.1": "4dbb066ba9478c8b8de39e3c1083cbb74f86f03eaf4445603e69909d6c072134644316faa20a2445419b9fe1a8063ade7b5331a5766d807ee0b15b8a70c59a2d",
-  "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628",
-  "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c",
-  "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963",
+  "@oxlint-tsgolint/darwin-arm64@npm:0.2.0": "89b0844bb4be9406efbda457fcf9be852039f6c48dc24547135451417e98fe1cd5c0a13a66cd559cad1b70901fc6ee55532dc9975929384c09e071256e6cfb70",
+  "@oxlint-tsgolint/darwin-x64@npm:0.2.0": "307de5743240c6f01d7087c6c620b608b0c51d36431df7e345a6699939ea16129494c449b6dd8351277bc37c92ba1e92020cc1155a88efbe2a124f44fc78b5b1",
+  "@oxlint-tsgolint/linux-arm64@npm:0.2.0": "4292cc00a8f5b6d06eb83abd8bfb80b369eb5d7ede91b6e80716bf81a81df557b47a59690a3af7ab858008ce4d02b50c74bbe0fc7530eaadbcc12cd8f1ff0c4c",
+  "@oxlint-tsgolint/linux-x64@npm:0.2.0": "c73ebab4bc4c7891873043479ee89894a575ba93f91fc0793cfc2f38f68d58b8b09980c5c9ebd037c404687e38d2f15966e9bfeab9685b40522266ef909fb047",
+  "@oxlint-tsgolint/win32-arm64@npm:0.2.0": "6735f85196fc4c2aa5885cb7bf8b956b460f6b003589959bb83d0cab049a7fe8257a228e7bba403dba08e57b944c2a78c97087ded3e104edb340d964f604fd77",
+  "@oxlint-tsgolint/win32-x64@npm:0.2.0": "3621b288e32c42bc71ff33b083e5ae7c941a6b13654d10a1647ebe706fe3077ae581fc85cffc70ca6d956d610abeeb254fc19ecfc3d3ecb4dde2ce1ef3b5be03",
+  "@oxlint/darwin-arm64@npm:1.15.0": "f6350a1c41a9056730dcd2cf7c10475a179f9561b01587e02becbb690c40ad597ed2796c9798c709ef8fcd43f789fea99734e51cb307f5ae9a35484fa0b95122",
+  "@oxlint/darwin-x64@npm:1.15.0": "ee808953fb0091ae283bac113b393a7cbf7820b26d5f8447d9a6b4357202260f9ef0612fb4fdb4ce7e386945c3bf5eb2ecaa5950d32f1e3400b6f0a977c9bfed",
+  "@oxlint/linux-arm64-gnu@npm:1.15.0": "fce42e368fff682bfdd374cc414e1f942dc37a168c58d1ca3ab67f3ea11596aa7f0a7f7ed59bef7d1701708df283f6b076ea89f6684f3ce9efcdccf8db392dee",
+  "@oxlint/linux-arm64-musl@npm:1.15.0": "35029e792bbfe5eb70dfeecd59a20f7cfc7b55f88ed15c3d02fa5ce64f12e4136b640a245f432e195217dec028f1f389c6236c079d35de2309e68b1f6bf9e8b6",
+  "@oxlint/linux-x64-gnu@npm:1.15.0": "959f2887182015cd034a877fc0f8c5beaeb95a1800978a8ad3c1ba036ff3d3308fe0c4bbd99094cdc24b83bdd0314e638e376670a5b8ba6e1c926adb94110e4d",
+  "@oxlint/linux-x64-musl@npm:1.15.0": "47e0ced945de40ae987067d25c1c8968b5650efd2ea1baa3319677d197130376ab7077d71c2dc940d8ab4bb2fed41d9049dd10e9312f7f1039cf42e68ace06d6",
+  "@oxlint/win32-arm64@npm:1.15.0": "d5e2933f5cff87c4e2a676e14345a1874b8c806b65ac662384a8ce93f8855132d6ea6092bee370f531e8d80d9bdd62721659f38370b0841476c4fc488d4e850a",
+  "@oxlint/win32-x64@npm:1.15.0": "f54c36908a63656f2a8e803ab94be45d7b59bfcbe7519ec951d1ae2f42f9019d247c97a1e61a1d74acaa05bba19873999c15a2cd1dc0cefc4e2a7a5be92e88c6",
   "@rolldown/binding-android-arm64@npm:1.0.0-beta.34": "98334e08fe3f9acafa1e0c337d74138a93892dbb2b03e53b79ab3fff5cecb34406493af97e454b3c76e27ac1f9f65496d54cf7c904a2cdba4bf1eabddb5bbd50",
   "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.34": "d753421b3ee4da8ed6b67072064947a17122e138609652ce5534e97aff420e63a463c2fab0a678a1b0483b1e323c8392d671e5c8b415ade92f54e98235ebde62",
   "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.9-commit.d91dfb5": "a4636b96d36bfaccc655f9de258cef17daedd025463309657ed213b63b4226aeb6901eaa05d00d577e486bfb4d4ef99ee1457d8d7a8b5170afe07c86d2a5c18d",
@@ -97,16 +106,35 @@
   "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.34": "70bbbc04e01c437a58c89f7b8ec249a9e43eb7b4336323efaf7abf46fa6445f087ee1286edb454658b9f4f4e54daf906059cc8484613be2d5b174c905dc44518",
   "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "9e50f65fb7ad451a6eb4f9305650605e7a4efdd6873ad9412520edb8fd4c7f0bb67aa9922dbf1bad055c01a0de677eace73abf4285409cb9defae93956a83b24",
   "@rollup/rollup-linux-x64-gnu@npm:4.45.1": "baf9081b367a5f557cfcd17ae60b196c00a933e87c5b16045efa312cb142518c91706ae3e6a4be1d09f7fbf2b133d386fc4ff3f6dd2d5b7149ac139af4a63391",
-  "@swc/core-darwin-arm64@npm:1.11.21": "6f228ce5497f8b797d9b838af6d51c8fc27d1643d13b033ed762ab5247047da91efa3e61f38040b5ff326bfb6af0ed663f5ec8319574db1c0e355d64c9c2b665",
-  "@swc/core-darwin-x64@npm:1.11.21": "8f7fcf910f17ab6d30fe55d7498f0ff2ac47e1e0fad749e01151891d5257f49c6354dae31917cc5097230940f9a068fcd981441e7c9581b1373e9e9c4d1ff9aa",
-  "@swc/core-linux-arm-gnueabihf@npm:1.11.21": "5f0d964b13b3c138fe0b3249b852db4330707d4584ed5d5b0b71fb72023e3b35f3faa88c6b8f49970f7adee57976e7e1fc9115be194b91f435249b6531602e1c",
-  "@swc/core-linux-arm64-gnu@npm:1.11.21": "203995730e55bfe640055a7adbb0c6b133c698aa018394d0338d00d311b10f874e46cdc0579585fb443505a3361b3da185436ad9fea553ecbed697a4f810ea7e",
-  "@swc/core-linux-arm64-musl@npm:1.11.21": "9618139c32eefd5acf184fc0c5e09986f170cec1069296a274c32b694a5a2129ae7aa21b8d016d5c186574929f05d456c6f4babdd0e528021dee4c51605da2d8",
-  "@swc/core-linux-x64-gnu@npm:1.11.21": "886a4f4a3ad6d0d3b437a250bf36b0395b34f4731381ce1cbbe43b05fb7ab4aa12a23c3f0e33bc4b2703ebcdad9a7e3fc18b7481a79e372ecc331c1e3eca1437",
-  "@swc/core-linux-x64-musl@npm:1.11.21": "069f33ba7b9376494f7345efed1c845e201857bbe5ba165ca8026760989344eaf0e5efbbc7f711a6c776385aa5ad383cee75543687c024854acb296c4e4752c1",
-  "@swc/core-win32-arm64-msvc@npm:1.11.21": "05ea5df6614075ec8487a91cb047a30aebeef3f142232a2feb0a475c85f2d64a876aef4183849f43480b9b5786afad7b3cb2bc1f53060d71ab6ff439a71317f3",
-  "@swc/core-win32-ia32-msvc@npm:1.11.21": "ad1ba754c36131238f2ac8ec51ffc4b987888b45b3008c0fbdd31d85d6fc039f8dd9c5d188c24cb72c4f4f345090a4dcfbcbfd840e954b7aeeb2974e0baf0e4a",
-  "@swc/core-win32-x64-msvc@npm:1.11.21": "0fb0c108c2e4a3bd82251f7552c9daa8c243829617bee7d954d1b0e021214184ead5c08dd108b3a5ac2d501797db794246a25867970ef2082f844f47b5b25070",
+  "@swc/core-darwin-arm64@npm:1.13.3": "f3cdf75ccc7b66d8c4b2bb7a5664542a904821bd7f08f91e3e399112dcb4436ee9a7df306a80e58a80a31b20b9b69f830a2dca91d74e62bbe6c72cde84c75d66",
+  "@swc/core-darwin-x64@npm:1.13.3": "c3515f878f50eb6730da948c10aec867b16f64fefbbc72fdfd9bde385ce84cfc606e87534dd77fbc817fc08bb144a2ea61e1c3e5fffd6b2e9a68b71eebb49a77",
+  "@swc/core-linux-arm-gnueabihf@npm:1.13.3": "8ec4f056982f779e55ad7d52f4f5ee4928ee48620977b2c4d3f47232d5cea119f47adaad9ca7bb7b1f261535ce5c19c0b2506c41da76e90c7fc7fc3a0e505d06",
+  "@swc/core-linux-arm64-gnu@npm:1.13.3": "d2804f542f5f78681ad4cc643dd32c7c948d94b7d2878fadcc465d0cbc4480147ed99298b4eed8f3c5d9cceba8bd1b1cc0f79e1754f23d6af5ccdcb6616b37b6",
+  "@swc/core-linux-arm64-musl@npm:1.13.3": "5d62f789505e5d72a08add9c35a12d85c23c18068dc627fb97deaea8be6d4910e2fd7afb63c03bbcefdf95a45ab4bf0c8534edf12d177c7facd2571d1c0ec2a5",
+  "@swc/core-linux-x64-gnu@npm:1.13.3": "a3d17ea9fb821fbced3d251fb03558bc25d29d5c289f96d87001f2ce17838c6de4e31365da9b95d21ed68b1dcfb6790c34457d7e0ce5c8a38dac7c0ed51937db",
+  "@swc/core-linux-x64-musl@npm:1.13.3": "fc7f7197f7fac7c068fd408d454ad62ff91f956db603d17b6133db7f28f606899fcd31075ca206970e9fce6a69a9e18dc33a82e1094ec142fc906b02be3a5d19",
+  "@swc/core-win32-arm64-msvc@npm:1.13.3": "bb4b197e4ffbf02dd5d3714af345fd41f7b6d6606d08f88f164be468ddade90c2e9912964b7da18863246ebe5b368dfd6a6f52fae4ffa517ab52f73d3cd9b8b3",
+  "@swc/core-win32-ia32-msvc@npm:1.13.3": "c244aa591eb71dac4316b2062e19217710f76fa217c84517e3c64c5cbbfa6a74ccab3322a92f183d47f34fff371bc1ddce93ad2c88c2f72a0265a6d009b0dbeb",
+  "@swc/core-win32-x64-msvc@npm:1.13.3": "b1ab6ee1ce12249259995c2997586e289225eb12066c95d14f829152a48a389eb5a3f99312f7953e4f62a1e0468c61900d59e3583be53b64d7854df2a4716b80",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.13": "fbdff27e98b9781cd54b1e959b8ab5dc60ef7a9dd9cb0b01b947441f0e88c9b0e25b66a72de37c8a099e09e444f38e134f33be13490af6d35070c6f9375a55b0",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.13": "1814b1f5773b1e5f70f86bcb533733bc64ffe9b01200d999981052dbfac2c05c92e3a79c08aa42a78725dadaa04b67652b4466738494a94135dce5d2996ae4be",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.13": "bfb11311a1d76631543dcfdbba1fa9a96464bd4730d51c8b6694745de62f08f93d07f5763aaea5895e3f35998d185be44373605a8d6da95b2df4a2db9a450d55",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.13": "e7ed50f10e35bbc3ef46a0bf8b12a478ec09de8fb4d2054605106b2f9402eda8a2c0e2521a85cb740ad0407ff4c9aa367021b1577e5cd75fac91a365cbf55804",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.13": "bd882a8a8c34e6d6f6318fd4e717995e811a0eee322e2de37a9abd6e488bc2771fd0ba14bbca237e3e544a2d9fc9c1cf33620a77eb45cf1848d03ee27b17baef",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.13": "9d575d7e6b7fae40e363c8de6f7d8db06e057c9b1cec12279e2e794e07af22d1866de0f2e7d7387d6de505e03efd042385b862303b89438cb903458ffd351fd3",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.13": "9a43e73d911da442b9014f90c5dada89fa58d114f92509c8a706cd26fe17630abf3de8ae1cb32e651389ca2349ce42f99b8d4837eafc399cfef65e9894e61013",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.13": "15ba6fea2bd318e0053497e73638bffae4501762536796483442ef8dd6600d9085cb29916573286acab15533fe10139853e11f4c1fc59ba4da3192c0b0915b56",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.13": "364d9299460d703c0ef4d8fbe413f30288233e2aee81f1a77984a8c7831e4e997a4c49bfe0f16d0495b7102444db6abc82b75bac99babe4b78929fd906a5136e",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.13": "39f07aca836ff9c24c498af84d504fd1e28e21d7eb9202156217ae9ce519274532d5dfa6056c5ae62d175753e2cf74d6f0d6077f28c3c0b75dca468573eed9f0",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.13": "99c2cbdcb0144164f84ba2a31241232a7bb2cf68201e8f0c22da57be47a92a2b5302ec3c1f822fe48cb49ba4e1dc587374b07f004360c3de724c3ad5f9ba4b0f",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.13": "ce35239ff4439e717aec9c31f5315ece74b47e444eccb288ee195ac63d84699d4116397e87698e717f7dd1b8b27be1049f3605e04fb7a78b720d25cde5b82340",
+  "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20250915.1": "9aaa1e3b19f80dd19df4e0aeeba682ab8df25855a0673dc8e4fa9a60fdf5c330f66776c7fac0ed0d4308792e115f75dc6e6fa9c0557647715b4d35c4fd440927",
+  "@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20250915.1": "44b68a689879364b150b38d9075814d5d502fae9188b7b73b630c5812e0a4f2c3fe07b854f5df6ddc87802a5bbc566b9240f187c78de855d647654980d5508e0",
+  "@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20250915.1": "9f7b57723ffba13e32e535f5de7cd98e8b607b3609c8cc830b97c09415e1a0a93b09555da12d9994efbbfdcbdfb1e2724b9ee4fa272490757241493f3e15934b",
+  "@typescript/native-preview-linux-arm@npm:7.0.0-dev.20250915.1": "b39223bc14371d963bc6614c8b0e0215c81a2a39cbed686e0848a47511c379e23491a8b086d2b44df7f519994ef2314039153b1101d6ad188c61f0fadad2f1e8",
+  "@typescript/native-preview-linux-x64@npm:7.0.0-dev.20250915.1": "c4efcb6cd0ca92eb12f31f6032d2025d3771a9e6ef98f5fe22de97cc6bc4b09e8793fd5e3bf3136a6bf5999534db299794a5d7f59a7ba42dcf4b49ffa538783d",
+  "@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20250915.1": "e32b96a6fff599b138965903c50c546290ea257f812f6c5ad85d84d9c2550039d314f1eb801f00728aecbe757f39a7361f890dcc39798277c2c662c7c3caff84",
+  "@typescript/native-preview-win32-x64@npm:7.0.0-dev.20250915.1": "6df4add8a206102964baf252953444ef21861d89eeba7936311e8bd4ac2c37b01e3a870fcb1fe6bed6b2b402ed80cc229bdf11e4c13bf32b6fe942e4f11abf10",
   "dmg-license@npm:1.0.11": "feef35cfb45270a72daadcca9584be5cb840f924448b9d4e543fcd61f1b6d471151049f277c91de1d8b003fad6203d0176066a5f427a01df5fb073402cb8c8b7",
   "iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43",
   "lightningcss-darwin-arm64@npm:1.30.1": "bbdce4ee14b3952699e6d07c539cf4bd678853bfd974e3107742198dac38dfa6d40c6ea80163a7026aff662dd7d3a462a2bee9a18448c75c788659ceebe2746a",

pkgs/by-name/ch/cherry-studio/package.nix

@@ -4,8 +4,8 @@
   fetchFromGitHub,
   yarn-berry_4,
   nodejs,
-  python3,
   electron_37,
+  autoPatchelfHook,
   makeWrapper,
   writableTmpDirAsHomeHook,
   makeDesktopItem,
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.5.11";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XJFqoluI3ZwmqxhKpJANqOxkYP3Va7pXXyWOHSLopwc=";
+    hash = "sha256-9oEMnGaloY3tFY/qpjTlYbO7n1ORIK49s3N9SGSMvHE=";
   };
 
   postPatch = ''
@@ -42,17 +42,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-k23HzIN8QAkV/IREM5fHHeaMjO+cIthpLNrLKn4g7tY=";
+    hash = "sha256-LstTTVKXVL6hIC5TiUKeBIcDFaRPdmEjO2LmvVXB7dQ=";
   };
 
   nativeBuildInputs = [
     yarn-berry.yarnBerryConfigHook
     yarn-berry
+    autoPatchelfHook
     makeWrapper
     writableTmpDirAsHomeHook
     copyDesktopItems
-    (python3.withPackages (ps: with ps; [ setuptools ]))
     nodejs
+    (nodejs.python.withPackages (ps: with ps; [ setuptools ]))
   ];
 
   env = {
@@ -63,11 +64,15 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
+    cp -r "${electron.dist}" $HOME/.electron-dist
+    chmod -R u+w $HOME/.electron-dist
+
     yarn run electron-vite build
-    yarn run electron-builder --linux --dir \
-      --config electron-builder.yml \
-      -c.electronDist="${electron}/libexec/electron" \
-      -c.electronVersion=${electron.version}
+    yarn run electron-builder --dir \
+      --config=electron-builder.yml \
+      --config.mac.identity=null \
+      --config.electronDist="$HOME/.electron-dist" \
+      --config.electronVersion=${electron.version}
 
     runHook postBuild
   '';
@@ -88,7 +93,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    mv "dist/mac-${stdenv.hostPlatform.darwinArch}/Cherry Studio.app" "$out/Applications/Cherry Studio.app"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
     mkdir -p $out/opt/cherry-studio
     ${
       if stdenv.hostPlatform.isAarch64 then
@@ -102,7 +112,8 @@ stdenv.mkDerivation (finalAttrs: {
       --add-flags $out/opt/cherry-studio/resources/app.asar \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
-
+  ''
+  + ''
     runHook postInstall
   '';
 
@@ -113,8 +124,8 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/CherryHQ/cherry-studio";
     changelog = "https://github.com/CherryHQ/cherry-studio/releases/tag/v${finalAttrs.version}";
     mainProgram = "cherry-studio";
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ xiaoxiangmoe ];
     license = with lib.licenses; [ agpl3Only ];
   };
 })

pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix

@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "chirpstack-mqtt-forwarder";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-mqtt-forwarder";
     rev = "v${version}";
-    hash = "sha256-HopcEwj/WOialvttVJ6bTyRRTqrgfIJ/dYKti5T87Os=";
+    hash = "sha256-qkktkydg5Xe6q5IFalkxtGjO2zK9mZVMnKOBassiEtk=";
   };
 
-  cargoHash = "sha256-uR+Y8+/XbIQdbGOoS/tHBo/r7DLiwiRiaXQ7CjaPpoI=";
+  cargoHash = "sha256-rQPmFmra9Gd8XDP9HuTZZru780RmmqWEKX2iuuRkZQw=";
 
   nativeBuildInputs = [ protobuf ];
 

pkgs/by-name/cl/cljfmt/package.nix

@@ -8,11 +8,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "cljfmt";
-  version = "0.14.0";
+  version = "0.15.3";
 
   src = fetchurl {
     url = "https://github.com/weavejester/cljfmt/releases/download/${finalAttrs.version}/cljfmt-${finalAttrs.version}-standalone.jar";
-    hash = "sha256-A12co+7Ux9rGCcBMRMqwTH7s4hllfs0Ku/+HFQJ4XGE=";
+    hash = "sha256-DlPnni5p0zdauAtBEoCrh6S/STT8nvZJAJ90VjXlZLA=";
   };
 
   extraNativeImageBuildArgs = [

pkgs/by-name/co/cotton/package.nix

@@ -1,30 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-}:
-
-rustPlatform.buildRustPackage {
-  pname = "cotton";
-  version = "0-unstable-2023-09-13";
-
-  src = fetchFromGitHub {
-    owner = "danielhuang";
-    repo = "cotton";
-    rev = "df9d79a4b0bc4b140e87ddd7795924a93775a864";
-    sha256 = "sha256-ZMQaVMH8cuOb4PQ19g0pAFAMwP8bR60+eWFhiXk1bYE=";
-  };
-
-  cargoHash = "sha256-y162tjxPGZQiYBJxFk4QN9ZqSH8jrqa5Y961Sx2zrRs=";
-
-  meta = with lib; {
-    description = "Package manager for JavaScript projects";
-    mainProgram = "cotton";
-    homepage = "https://github.com/danielhuang/cotton";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
-      dit7ya
-      figsoda
-    ];
-  };
-}

pkgs/by-name/cu/curl-impersonate/chrome/default.nix

@@ -175,9 +175,7 @@ stdenv.mkDerivation rec {
 
     # Find the correct boringssl source file
     boringssl-source = builtins.head (
-      lib.mapAttrsToList (_: file: file) (
-        lib.filterAttrs (name: _: lib.strings.hasPrefix "boringssl-" name) passthru.deps
-      )
+      lib.attrValues (lib.filterAttrs (name: _: lib.strings.hasPrefix "boringssl-" name) passthru.deps)
     );
     boringssl-go-modules =
       (buildGoModule {

pkgs/by-name/di/diesel-cli/package.nix

@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-JNDFXBNmwCWpk+Lub453wS+7lVMZcdiJBmPoVAedpug=";
+    hash = "sha256-AgPESgFLnL3jiYBP8DiWb0hLzsx5tJA+gcO/fdV5Cvo=";
   };
 
-  cargoHash = "sha256-qfXa6DuuhKbXCdOvhuPNx6xlDIouoDVJUMob9Fc5XgI=";
+  cargoHash = "sha256-yco4l/4UiYnqnZZLYm3EkHmYiQJhMC2xloFg0brDfsg=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/ec/ecspresso/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "ecspresso";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "kayac";
     repo = "ecspresso";
     tag = "v${version}";
-    hash = "sha256-kZKfhGOxtuZM6oytt/36AW8R2XVoKuLZdaj7NvoRWGA=";
+    hash = "sha256-9C/OJ1rnH77jcF3hDr2uyXcNViAkM84LjmkJsKmQkXo=";
   };
 
   subPackages = [

pkgs/by-name/ed/edgetx/package.nix

@@ -15,6 +15,7 @@
   miniz,
   yaml-cpp,
   udevCheckHook,
+  applyPatches,
   # List of targets to build simulators for
   targetsToBuild ? import ./targets.nix,
 }:
@@ -36,18 +37,24 @@ let
       libclang
     ]
   );
+
+  # paches are needed to fix build with CMake 4
+  yaml-cppSrc = applyPatches {
+    inherit (yaml-cpp) src;
+    patches = yaml-cpp.patches or [ ];
+  };
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "edgetx";
-  version = "2.11.2";
+  version = "2.11.3";
 
   src = fetchFromGitHub {
     owner = "EdgeTX";
     repo = "edgetx";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-F3T1lX0FSSUIQxSlqLQHj7JrfF+20Ndv63zDA0sRzFQ=";
+    hash = "sha256-vlJsfebTWhdh6HDpUEA1QJJSVGMlcL49XFwIx4A9zHs=";
   };
 
   nativeBuildInputs = [
@@ -93,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Unvendoring these libraries is infeasible. At least lets reuse the same sources.
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MINIZ" "${miniz.src}")
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cpp.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cppSrc}")
     # Custom library https://github.com/edgetx/maxLibQt.
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MAXLIBQT" "${maxlibqt}")
     (lib.cmakeFeature "DFU_UTIL_ROOT_DIR" "${lib.getBin dfu-util}/bin")
@@ -168,6 +175,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion finalAttrs.version));
     homepage = "https://edgetx.org/";
+    changelog = "https://github.com/EdgeTX/edgetx/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl2Only;
     platforms = [
       "i686-linux"

pkgs/by-name/fi/filebeat8/package.nix

@@ -8,18 +8,18 @@
 
 buildGoModule rec {
   pname = "filebeat";
-  version = "8.19.5";
+  version = "8.19.6";
 
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "beats";
     tag = "v${version}";
-    hash = "sha256-0s0ZGVEPl8NsNj6uWDXsTn0COwexmNNTPt85dk2Xi80=";
+    hash = "sha256-bqgO+dj0EXjEPZKmC31MiPtcgwnitkb0GKuDlqJJw+I=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
 
-  vendorHash = "sha256-dr7jtXx5+51JOvLgasNWdjwaPaOMKBWSHiGYZBOAuMs=";
+  vendorHash = "sha256-RcpOENxElWbbwt1aXQWDRvQ9cQj4aSewzfzkM+bLSoo=";
 
   subPackages = [ "filebeat" ];
 

pkgs/by-name/ge/gemini-cli-bin/package.nix

@@ -8,11 +8,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gemini-cli-bin";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
-    hash = "sha256-nUuO+03WqWjW8GGQNyVBdDSVEKNBDDsDta7MP6YzcX8=";
+    hash = "sha256-jwyx5HWjPi2S5GQFxV+VeuwrmjmLi+F1nzw4YMfNSiA=";
   };
 
   dontUnpack = true;

pkgs/by-name/gi/git-fork/package.nix

@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  undmg,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "git-fork";
+  version = "2.57.1";
+  src = fetchurl {
+    url = "https://cdn.fork.dev/mac/Fork-${finalAttrs.version}.dmg";
+    hash = "sha256-hIrR655lCKBDkZS6cF7BD+WMvX13T9180rpAfUYc8YA=";
+  };
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ undmg ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/"{bin,Applications}
+    mv Fork.app "$out/Applications/"
+    ln -s "$out/Applications/Fork.app/Contents/MacOS/Fork" "$out/bin/fork"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Git client";
+    homepage = "https://git-fork.com";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ dudeofawesome ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    mainProgram = "fork";
+  };
+})

pkgs/by-name/gi/github-copilot-cli/package-lock.json

@@ -1,58 +0,0 @@
-{
-  "name": "@github/copilot",
-  "version": "0.0.328",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@github/copilot",
-      "version": "0.0.328",
-      "dependencies": {
-        "keytar-forked-forked": "^7.10.2",
-        "node-pty": "npm:@devm33/node-pty@^1.0.8"
-      },
-      "bin": {
-        "copilot": "index.js"
-      },
-      "engines": {
-        "node": ">=22"
-      }
-    },
-    "node_modules/keytar-forked-forked": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/keytar-forked-forked/-/keytar-forked-forked-7.10.3.tgz",
-      "integrity": "sha512-ipErTUO1NPXmngYhnMrda0yOIOPSNbVJ2BRjk3kNozLx3UmGICnzCfEDemuLY6HgP+rV0c9F+Opt+89+Ydbw6w==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "node-addon-api": "^8.3.0"
-      }
-    },
-    "node_modules/node-addon-api": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.5.0.tgz",
-      "integrity": "sha512-/bRZty2mXUIFY/xU5HLvveNHlswNJej+RnxBjOMkidWfwZzgTbPG1E3K5TOxRLOR+5hX7bSofy8yf1hZevMS8A==",
-      "license": "MIT",
-      "engines": {
-        "node": "^18 || ^20 || >= 21"
-      }
-    },
-    "node_modules/node-pty": {
-      "name": "@devm33/node-pty",
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@devm33/node-pty/-/node-pty-1.0.9.tgz",
-      "integrity": "sha512-5yzbTTywkaFk1iRwte2aWEpyDfcpDjCofVD1BiOUQI+fsCvp/+RdJnB4jgnULrdlWOEWuBf+bg4/NZKVApPhoQ==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "node-addon-api": "^7.1.0"
-      }
-    },
-    "node_modules/node-pty/node_modules/node-addon-api": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "license": "MIT"
-    }
-  }
-}

pkgs/by-name/gi/github-copilot-cli/package.nix

@@ -1,11 +1,14 @@
 {
   lib,
-  buildNpmPackage,
+  stdenv,
   fetchzip,
+  nodejs,
+  makeBinaryWrapper,
+  versionCheckHook,
   nix-update-script,
 }:
 
-buildNpmPackage (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "github-copilot-cli";
   version = "0.0.328";
 
@@ -14,15 +17,25 @@ buildNpmPackage (finalAttrs: {
     hash = "sha256-9oTaVjvwyS8KY8N5kUEiAs+l6vEd/BZ0AGJI0p9Jie0=";
   };
 
-  npmDepsHash = "sha256-WK6t3IW4uF+MDu7Y5GRinbm8iDcYB8RhJ15GE9VBcjQ=";
+  nativeBuildInputs = [ makeBinaryWrapper ];
 
-  postPatch = ''
-    cp ${./package-lock.json} package-lock.json
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/node_modules/@github/copilot
+    cp -r . $out/lib/node_modules/@github/copilot
+
+    mkdir -p $out/bin
+    makeBinaryWrapper ${nodejs}/bin/node $out/bin/copilot \
+      --add-flags "$out/lib/node_modules/@github/copilot/index.js"
+
+    runHook postInstall
   '';
 
-  dontNpmBuild = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
 
-  passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "GitHub Copilot CLI brings the power of Copilot coding agent directly to your terminal";

pkgs/by-name/go/gofumpt/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gofumpt";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "gofumpt";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2JahPQQfiYfctMi7AqNB9Y1dS1Pg8usLtzM2wSlC5E0=";
+    hash = "sha256-ngqg8YJHqW08hvZp+E+RLLjGArOZJov7/xKCMAWFI1E=";
   };
 
-  vendorHash = "sha256-ziqhBWkfWQ0T+gLFqv352PtNcpyCTRFHBfV6iilVGLs=";
+  vendorHash = "sha256-qCXpFxTZIhDDvvwytvftBnMwOHopO6/FkBWcLZhBDp8=";
 
   env.CGO_ENABLED = "0";
 

pkgs/by-name/gu/guile-hoot/package.nix

@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "guile-hoot";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "spritely";
     repo = "hoot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y3UWKSjJQnYh+06p+Oi0Fa0ul2T8QWemgNm9A0su5WQ=";
+    hash = "sha256-mthEqyVsBrFhwz29VwatbFp4QgGmZ9sDoyTpRIEsOmI=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ho/home-manager/package.nix

@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2025-10-18";
+  version = "0-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "870883ba11ba1c84f756c0c1f9fa74cdb2a16c1e";
-    hash = "sha256-OxGcFcQdfOK8veZkPdQuqXIotFYiy4sBQB58dMNLeHY=";
+    rev = "c644cb018f9fdec55f5ac2afb4713a8c7beb757c";
+    hash = "sha256-6LNSptFYhiAd0M/maJoixJw7V0Kp5BSoMRtIahcfu3M=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/in/intel-gpu-tools/package.nix

@@ -43,14 +43,14 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gpu-tools";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "drm";
     repo = "igt-gpu-tools";
     rev = "refs/tags/v${version}";
-    hash = "sha256-O//tL7AuYmrpTlZ61YzpSKOxbtM6u6zlcANzXWTTbhw=";
+    hash = "sha256-Lt/mqx13nHyD5QiDl8oWGiYIiK006uQvbbzHH44LB/0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/io/ionic-cli/package.nix

@@ -0,0 +1,32 @@
+{
+  buildNpmPackage,
+  fetchzip,
+  lib,
+}:
+buildNpmPackage (finalAttrs: {
+  pname = "ionic-cli";
+  version = "7.2.1";
+
+  src = fetchzip {
+    url = "https://registry.npmjs.org/@ionic/cli/-/cli-${finalAttrs.version}.tgz";
+    hash = "sha256-nrZMMyzoiO7ZJbNrPSRA1sOEy3OpgEXdyNS0JzAaTjY=";
+  };
+
+  postPatch = ''
+    cp ${./package-lock.json} package-lock.json
+  '';
+
+  npmDepsHash = "sha256-Nu4AWwFaGBakGAxUNllx4etUm4H5ygxAeMs1RWhzRQQ=";
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "Your go-to tool for developing Ionic apps";
+    homepage = "https://ionicframework.com/";
+    license = lib.licenses.mit;
+    mainProgram = "ionic";
+    maintainers = with lib.maintainers; [
+      albertlarsan68
+    ];
+  };
+})

pkgs/by-name/ja/jart-jsoncpp/package.nix

@@ -0,0 +1,82 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  copyPkgconfigItems,
+  makePkgconfigItem,
+  lib,
+  testers,
+  ctestCheckHook,
+  ninja,
+  double-conversion,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "json.cpp";
+  version = "0-unstable-2025-10-25";
+
+  src = fetchFromGitHub {
+    owner = "jart";
+    repo = "json.cpp";
+    rev = "6ec4e44a5bbaadbe677473378c3d2133644c58a1";
+    hash = "sha256-kUFtyFPoHGCFWTGRD8SoBsqHYCplGPw/AcpMR9T0Ffk=";
+  };
+
+  doCheck = true;
+
+  cmakeFlags = [
+    (lib.cmakeBool "JSON_CPP_BUILD_TESTS" true)
+    (lib.cmakeBool "DOUBLE_CONVERSION_VENDORED" false)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    copyPkgconfigItems
+    ctestCheckHook
+    ninja
+  ];
+
+  buildInputs = [
+    double-conversion
+  ];
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  passthru = {
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  # https://github.com/jart/json.cpp/issues/17
+  pkgconfigItems = [
+    (makePkgconfigItem rec {
+      name = "json.cpp";
+      inherit (finalAttrs) version;
+      cflags = [ "-I${variables.includedir}" ];
+      libs = [
+        "-L${variables.libdir}"
+        "-ljson"
+      ];
+      libsPrivate = [
+        # nixpkgs double-conversion does not support pkg-config
+        # as of yet.
+        "-ldouble-conversion"
+      ];
+      variables = {
+        includedir = "${placeholder "dev"}/include";
+        libdir = "${placeholder "out"}/lib";
+      };
+      inherit (finalAttrs.meta) description;
+    })
+  ];
+
+  meta = {
+    pkgConfigModules = [ "json.cpp" ];
+    description = "JSON for Classic C++";
+    homepage = "https://github.com/jart/json.cpp";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fzakaria ];
+  };
+})

pkgs/by-name/ke/kea/package.nix

@@ -119,6 +119,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
+    # error: in-class initializer for static data member is not a constant expression
+    broken = stdenv.hostPlatform.isDarwin;
     changelog = "https://gitlab.isc.org/isc-projects/kea/-/wikis/Release-Notes/release-notes-${finalAttrs.version}";
     homepage = "https://kea.isc.org/";
     description = "High-performance, extensible DHCP server by ISC";

pkgs/by-name/le/ledger-live-desktop/package.nix

@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.131.0";
+  version = "2.131.1";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-GOKXW3yhYuk9hDNqVeC/btFkxiT6URF9TtHy8uN5iXI=";
+    hash = "sha256-O5pdrnnAfDrgP8s4A0R/mf7Mx6U2VWPNqaky+rExzgc=";
   };
 
   appimageContents = appimageTools.extractType2 {

pkgs/by-name/le/level-zero/package.nix

@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
     addDriverRunpath $out/lib/libze_loader.so
   '';
 
+  setupHook = ./setup-hook.sh;
+
   passthru = {
     tests = {
       inherit intel-compute-runtime openvino;

pkgs/by-name/le/level-zero/setup-hook.sh

@@ -0,0 +1,7 @@
+if [ -d /run/opengl-driver/lib ]; then
+  export LD_LIBRARY_PATH="/run/opengl-driver/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH:-}"
+fi
+
+if [ -d /run/opengl-driver-32/lib ]; then
+  export LD_LIBRARY_PATH="/run/opengl-driver-32/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH:-}"
+fi

pkgs/by-name/li/limine/package.nix

@@ -47,14 +47,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "10.1.1";
+  version = "10.2.0";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-pDhA8N7a5cTorIW8OgCimOxxfZ2slUhp3K+cb8KIAzc=";
+    hash = "sha256-eKoKjRJ+JbawucYXNvYrRMtkdybnxB3G1xk/7KR4YSI=";
   };
 
   enableParallelBuilding = true;

pkgs/by-name/lo/lockbook-desktop/package.nix

@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "lockbook-desktop";
-  version = "25.10.13";
+  version = "25.10.23";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-TxNJpHQc18VVEnETNGpDSOn5yh+vHRyha8wXfipyyII=";
+    hash = "sha256-WZ6XbsIqoLfVRtxnqBPaspQQPYdn4gOrsz5WPrKFiH4=";
   };
 
-  cargoHash = "sha256-UBzngkgfTObhoh9MSq80gZqpJtmB6hFDtW2dYuGgQB4=";
+  cargoHash = "sha256-t7/UK/PwnUyw61mw9BlSQuT0qSeBKvFaKkS2ocmAViE=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/lo/lockbook/package.nix

@@ -12,16 +12,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "lockbook";
-  version = "25.10.13";
+  version = "25.10.23";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-TxNJpHQc18VVEnETNGpDSOn5yh+vHRyha8wXfipyyII=";
+    hash = "sha256-WZ6XbsIqoLfVRtxnqBPaspQQPYdn4gOrsz5WPrKFiH4=";
   };
 
-  cargoHash = "sha256-UBzngkgfTObhoh9MSq80gZqpJtmB6hFDtW2dYuGgQB4=";
+  cargoHash = "sha256-t7/UK/PwnUyw61mw9BlSQuT0qSeBKvFaKkS2ocmAViE=";
 
   doCheck = false; # there are no cli tests
   cargoBuildFlags = [

pkgs/by-name/mo/mopac/package.nix

@@ -13,13 +13,13 @@ assert blas.isILP64 == lapack.isILP64;
 
 stdenv.mkDerivation rec {
   pname = "mopac";
-  version = "23.2";
+  version = "23.2.1";
 
   src = fetchFromGitHub {
     owner = "openmopac";
     repo = "mopac";
     rev = "v${version}";
-    hash = "sha256-P2BEXzclHJHSoaIIgCKVC3j63Af+J6rO0acwjv9ybbA=";
+    hash = "sha256-2+6mIxawYOqgsKRWDBLXMhP53VJTTGFN4AKunq4YD4o=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/nc/ncdu/package.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch2,
   ncurses,
   pkg-config,
   zig_0_15,
@@ -14,21 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ncdu";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchurl {
     url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
-    hash = "sha256-v9EJThQA7onP1ZIA6rlA8CXM3AwjgGcQXJhKPEhXv34=";
+    hash = "sha256-6RE1KBy2ZWnyykwLrCdyRpkeflJSTAyoy6PeXI6Bzsk=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # Fix infinite loop when reading config file on Zig 0.15.2
-      url = "https://code.blicky.net/yorhel/ncdu/commit/f45224457687a55aa885aca8e7300f1fbf0af59b.patch";
-      hash = "sha256-80Igx1MOINdeufCsNoisNo3dJ2iUTpZIxyXy/KzQ1Ng=";
-    })
-  ];
-
   nativeBuildInputs = [
     zig_0_15.hook
     installShellFiles

pkgs/by-name/ne/necesse-server/package.nix

@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.0.1-20495154";
+  version = "1.0.1-20510020";
   urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
 
 in
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
-    hash = "sha256-1k+4ywYjVddAb4yyGx1Fi/RXMyJzPIiQIyUzA0VhpAI=";
+    hash = "sha256-e2pnyexvl0mbhlX2Y+4NKJz1VqR1LoV9VlSfqOgXy7E=";
   };
 
   # removing packaged jre since we use our own

pkgs/by-name/ol/olivetin/package.nix

@@ -86,13 +86,13 @@ buildGoModule (
 
   {
     pname = "olivetin";
-    version = "2025.7.29";
+    version = "2025.10.24";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-QNwPc+qr26S2hl4deLVx58Xh9hkSfZyrxrdaO1NCTDc=";
+      hash = "sha256-JarySndKRjyY2zu8QAntx9xr4vnK7/fp/zz5ibOB+ok=";
     };
 
     modRoot = "service";

pkgs/by-name/ol/olivetin/update.sh

@@ -3,7 +3,7 @@
 
 set -euo pipefail
 
-nix-update olivetin --src-only
+nix-update olivetin --src-only --version-regex '^(2\d+\.\d+\.\d+)$'
 update-source-version olivetin --source-key=gen --ignore-same-version
 update-source-version olivetin --source-key=webui.npmDeps --ignore-same-version
 update-source-version olivetin --source-key=goModules --ignore-same-version

pkgs/by-name/or/orogene/package.nix

@@ -1,61 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  pkg-config,
-  openssl,
-  versionCheckHook,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "orogene";
-  version = "0.3.34";
-
-  src = fetchFromGitHub {
-    owner = "orogene";
-    repo = "orogene";
-    tag = "v${version}";
-    hash = "sha256-GMWrlvZZ2xlcvcRG3u8jS8KiewHpyX0brNe4pmCpHbM=";
-    fetchSubmodules = true;
-  };
-
-  cargoPatches = [
-    # Workaround to avoid "error[E0282]"
-    # ref: https://github.com/orogene/orogene/pull/315
-    ./update-outdated-lockfile.patch
-  ];
-
-  cargoHash = "sha256-I08mqyogEuadp+V10svMmCm0i0zOZWiocOpM9E3lgag=";
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    openssl
-  ];
-
-  preCheck = ''
-    export CI=true
-    export HOME=$(mktemp -d)
-  '';
-
-  doInstallCheck = true;
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
-  versionCheckProgram = "${placeholder "out"}/bin/oro";
-  versionCheckProgramArg = "--version";
-
-  meta = with lib; {
-    description = "Package manager for tools that use node_modules";
-    homepage = "https://github.com/orogene/orogene";
-    changelog = "https://github.com/orogene/orogene/blob/${src.rev}/CHANGELOG.md";
-    license = with licenses; [
-      asl20
-      isc
-    ];
-    maintainers = with maintainers; [ figsoda ];
-    mainProgram = "oro";
-  };
-}

pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix

@@ -54,6 +54,9 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${axios} ThirdPartyDownloads/axios-0.19.0.tar.gz
     ln -s ${font-awesome} ThirdPartyDownloads/Font-Awesome-4.7.0.tar.gz
     ln -s ${babel-polyfill} ThirdPartyDownloads/babel-polyfill-6.26.0.min.js.gz
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   SourceRoot = "${finalAttrs.src.name}/Build";

pkgs/by-name/pi/pinnwand/package.nix

@@ -46,6 +46,8 @@ buildPythonApplication rec {
   disabledTestPaths = [
     # out-of-date browser tests
     "test/e2e"
+    # click 8.2.0 exits with 2 instead of 0 when no args are passed
+    "test/integration/test_command.py::test_main"
   ];
 
   __darwinAllowLocalNetworking = true;

pkgs/by-name/po/pods/cve-2025-62516.patch

@@ -0,0 +1,200 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index e799bfd1..efd6601a 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -86,6 +86,21 @@ dependencies = [
+  "zbus",
+ ]
+ 
++[[package]]
++name = "astral-tokio-tar"
++version = "0.5.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ec179a06c1769b1e42e1e2cbe74c7dcdb3d6383c838454d063eaac5bbb7ebbe5"
++dependencies = [
++ "filetime",
++ "futures-core",
++ "libc",
++ "portable-atomic",
++ "rustc-hash",
++ "tokio",
++ "tokio-stream",
++]
++
+ [[package]]
+ name = "async-broadcast"
+ version = "0.7.2"
+@@ -147,12 +162,6 @@ version = "0.13.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+ 
+-[[package]]
+-name = "bitflags"
+-version = "1.3.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+-
+ [[package]]
+ name = "bitflags"
+ version = "2.9.0"
+@@ -213,7 +222,7 @@ version = "0.20.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ae50b5510d86cf96ac2370e66d8dc960882f3df179d6a5a1e52bd94a1416c0f7"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "cairo-sys-rs",
+  "glib",
+  "libc",
+@@ -833,7 +842,7 @@ version = "0.20.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "707b819af8059ee5395a2de9f2317d87a53dbad8846a2f089f0bb44703f37686"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "futures-channel",
+  "futures-core",
+  "futures-executor",
+@@ -1368,9 +1377,9 @@ version = "0.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "libc",
+- "redox_syscall 0.5.10",
++ "redox_syscall",
+ ]
+ 
+ [[package]]
+@@ -1488,7 +1497,7 @@ version = "0.29.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "cfg-if",
+  "cfg_aliases",
+  "libc",
+@@ -1842,6 +1851,7 @@ version = "2.2.0"
+ dependencies = [
+  "anyhow",
+  "ashpd",
++ "astral-tokio-tar",
+  "futures",
+  "gettext-rs",
+  "gtk4",
+@@ -1860,11 +1870,16 @@ dependencies = [
+  "syslog",
+  "tokio",
+  "tokio-stream",
+- "tokio-tar",
+  "vte",
+  "vte4",
+ ]
+ 
++[[package]]
++name = "portable-atomic"
++version = "1.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
++
+ [[package]]
+ name = "powerfmt"
+ version = "0.2.0"
+@@ -1973,22 +1988,13 @@ dependencies = [
+  "getrandom 0.3.2",
+ ]
+ 
+-[[package]]
+-name = "redox_syscall"
+-version = "0.3.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+-dependencies = [
+- "bitflags 1.3.2",
+-]
+-
+ [[package]]
+ name = "redox_syscall"
+ version = "0.5.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+ ]
+ 
+ [[package]]
+@@ -2026,6 +2032,12 @@ version = "0.1.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+ 
++[[package]]
++name = "rustc-hash"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
++
+ [[package]]
+ name = "rustc_version"
+ version = "0.4.1"
+@@ -2041,7 +2053,7 @@ version = "1.0.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "errno",
+  "libc",
+  "linux-raw-sys",
+@@ -2434,20 +2446,6 @@ dependencies = [
+  "tokio",
+ ]
+ 
+-[[package]]
+-name = "tokio-tar"
+-version = "0.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75"
+-dependencies = [
+- "filetime",
+- "futures-core",
+- "libc",
+- "redox_syscall 0.3.5",
+- "tokio",
+- "tokio-stream",
+-]
+-
+ [[package]]
+ name = "toml"
+ version = "0.8.20"
+@@ -2862,7 +2860,7 @@ version = "0.39.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+ ]
+ 
+ [[package]]
+diff --git a/Cargo.toml b/Cargo.toml
+index 9a0b95d7..7d818fbf 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -8,6 +8,7 @@ edition = "2024"
+ adw = { version = "0.7", package = "libadwaita", features = ["v1_7"] }
+ anyhow = "1"
+ ashpd = { version = "0.11", default-features = false, features = ["gtk4", "tokio"] }
++astral-tokio-tar = { version = "0.5.6", default-features = false }
+ futures = { version = "0.3", default-features = false }
+ gettext-rs = { version = "=0.7.0", features = ["gettext-system"] }
+ gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] }
+@@ -25,7 +26,6 @@ sourceview5 = { version = "0.9" }
+ syslog = "7"
+ tokio = "1"
+ tokio-stream = { version = "0.1", default-features = false }
+-tokio-tar = { version = "0.3", default-features = false }
+ vte = { version = "0.15", default-features = false }
+ vte4 = "0.8"
+ 

pkgs/by-name/po/pods/package.nix

@@ -2,6 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  applyPatches,
+  fetchpatch2,
   cargo,
   desktop-file-utils,
   glib,
@@ -16,22 +18,32 @@
   libadwaita,
   libpanel,
   vte-gtk4,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
   pname = "pods";
-  version = "2.1.2";
+  version = "2.2.0";
 
-  src = fetchFromGitHub {
-    owner = "marhkb";
-    repo = "pods";
-    tag = "v${version}";
-    hash = "sha256-S84Qb+hySjIxcznuA7Sh8n9XFvdZpf32Yznb1Sj+owY=";
+  src = applyPatches {
+    name = "pods-patched";
+    src = fetchFromGitHub {
+      owner = "marhkb";
+      repo = "pods";
+      tag = "v${version}";
+      hash = "sha256-m+0XjxY0nDAJbVX3r/Jfg+G+RU8Q51e0ZXxkdH69SiQ=";
+    };
+
+    # Based on upstream PR: https://github.com/marhkb/pods/pull/895
+    # which cannot be merged into 2.2.0 because dependencies were bumped since its release.
+    # Hopefully 2.2.1 will be released soon
+    patches = [ ./cve-2025-62516.patch ];
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-UBInZdoluWXq1jm2rhS5wBwXQ/zYFPSEeWhpSmkc2aY=";
+    hash = "sha256-GBWaGCNXYCiT/favrIYB30VGMMoQQk1iUh4GTNPerK8=";
   };
 
   nativeBuildInputs = [
@@ -55,6 +67,14 @@ stdenv.mkDerivation rec {
     vte-gtk4
   ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Podman desktop application";
     homepage = "https://github.com/marhkb/pods";

pkgs/by-name/po/ponyc/package.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  nix-update-script,
   stdenv,
   fetchFromGitHub,
   apple-sdk,
@@ -23,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ponyc";
-  version = "0.59.0";
+  version = "0.60.3";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     tag = version;
-    hash = "sha256-4gDv8UWTk0RWVNC4PU70YKSK9fIMbWBsQbHboVls2BA=";
+    hash = "sha256-VlmIy2i7BZ8jK96KVnTzdjyXWTyOuWE5M3yNp7gcVCA=";
     fetchSubmodules = true;
   };
 
@@ -41,12 +42,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-5xDg1duixLoWIuy59WT0r5ZBAvTR6RPP7YrhBYkMxc8=";
   };
 
-  googletestRev = "1.15.2";
+  googletestRev = "1.17.0";
   googletest = fetchFromGitHub {
     owner = "google";
     repo = "googletest";
     rev = "v${googletestRev}";
-    hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM=";
+    hash = "sha256-HIHMxAUR4bjmFLoltJeIAVSulVQ6kVuIT2Ku+lwAx/4=";
   };
 
   nativeBuildInputs = [
@@ -95,7 +96,7 @@ stdenv.mkDerivation rec {
     # Replace downloads with local copies.
     substituteInPlace lib/CMakeLists.txt \
         --replace-fail "https://github.com/google/benchmark/archive/v$benchmarkRev.tar.gz" "$NIX_BUILD_TOP/deps/benchmark-$benchmarkRev.tar" \
-        --replace-fail "https://github.com/google/googletest/archive/refs/tags/v$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar"
+        --replace-fail "https://github.com/google/googletest/releases/download/v$googletestRev/googletest-$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar"
   '';
 
   preBuild = ''
@@ -111,6 +112,8 @@ stdenv.mkDerivation rec {
     make configure "''${extraFlags[@]}"
   '';
 
+  enableParallelBuilding = true;
+
   makeFlags = [
     "PONYC_VERSION=${version}"
     "prefix=${placeholder "out"}"
@@ -124,6 +127,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  enableParallelChecking = true;
+
   nativeCheckInputs = [ procps ];
 
   installPhase = ''
@@ -152,7 +157,10 @@ stdenv.mkDerivation rec {
   # Stripping breaks linking for ponyc
   dontStrip = true;
 
-  passthru.tests.pony-corral = pony-corral;
+  passthru = {
+    tests.pony-corral = pony-corral;
+    updateScript = nix-update-script { };
+  };
 
   meta = with lib; {
     description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";

pkgs/by-name/pr/pro-office-calculator/package.nix

@@ -0,0 +1,42 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  tinyxml-2,
+  cmake,
+  qt5,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  version = "1.0.13";
+  pname = "pro-office-calculator";
+
+  src = fetchFromGitHub {
+    owner = "RobJinman";
+    repo = "pro_office_calc";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7cYItmWOBDP/ajanwYnyBZobVny/9HumI7e+rLRn5ew=";
+  };
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qtmultimedia
+    tinyxml-2
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    qt5.wrapQtAppsHook
+  ];
+
+  meta = {
+    description = "Completely normal office calculator";
+    mainProgram = "procalc";
+    homepage = "https://proofficecalculator.com/";
+    maintainers = with lib.maintainers; [
+      pmiddend
+      iedame
+    ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Only;
+  };
+})

pkgs/by-name/pr/procfd/package.nix

@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "procfd";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "deshaw";
     repo = "procfd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M2VFy7WqvoxgzEpS0qd7nGLRt2pKGZlfU9uUHlwDC7Y=";
+    hash = "sha256-KhnSHtPT9H9CWotwQIA9gFvwgm0PKsmDjQS817PxMw0=";
   };
 
-  cargoHash = "sha256-YmUzcJ8SM3iwjeDZXWBrDcT793ZyF6QdwxuYDh69xZw=";
+  cargoHash = "sha256-srFXs+h+ZMXeWRwGQUAqMACJG4ZUgztWr2ff6sRfkU8=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

pkgs/by-name/pr/prometheus-rasdaemon-exporter/package.nix

@@ -2,46 +2,27 @@
   lib,
   python3Packages,
   fetchFromGitHub,
-  fetchpatch2,
+  unstableGitUpdater,
 }:
 
-python3Packages.buildPythonApplication {
+python3Packages.buildPythonApplication rec {
   pname = "prometheus-rasdaemon-exporter";
-  version = "0-unstable-2023-03-15";
+  version = "0-unstable-2025-01-02";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sanecz";
     repo = "prometheus-rasdaemon-exporter";
-    rev = "e37084edeb4d397dd360298cb22f18f83a35ff46";
-    hash = "sha256-O0Zzog+5jDixFRGbqmjPYi6JDpHbxpU4hKfsqTnexS8=";
+    rev = "06cf02a4fa277fdc422275d9c4fe930786fc3f78";
+    hash = "sha256-QPbCwEpbG7gDPOSRcgu82QEqKkmW0uRhmSOWGgwVMDI=";
   };
 
-  patches = [
-    # Normalization of metric names
-    # https://github.com/sanecz/prometheus-rasdaemon-exporter/pull/1
-    (fetchpatch2 {
-      url = "https://github.com/sanecz/prometheus-rasdaemon-exporter/commit/46d379ba205c2340a0b266bf3cd48ec88ce025d0.patch";
-      hash = "sha256-kqo1Tjn51M1FzArS4K0ylQ2/rFDOAiZU3OUt/oBhGhM=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/sanecz/prometheus-rasdaemon-exporter/commit/c9ab08e8918497edb8f1ab0f933fa270cb7860a8.patch";
-      hash = "sha256-QtjzXuxPG7e+cgUDVbAVNY4VyBp3W5+vQDAvFJ9t92I=";
-    })
-    # Fix sqlite3.connect URI passing
-    # https://github.com/sanecz/prometheus-rasdaemon-exporter/pull/2
-    (fetchpatch2 {
-      url = "https://github.com/sanecz/prometheus-rasdaemon-exporter/commit/52f6c47b77f480cd7f83853a2baffffb45f77b37.patch";
-      hash = "sha256-XYeWMkAhWJIOUKLeTstIJr3P37Jwt8tzRURCvlrrxVs=";
-    })
-  ];
-
   build-system = with python3Packages; [
     setuptools
     setuptools-scm
   ];
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.1.dev9+ge37084e";
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.1.dev+g${lib.substring 0 7 src.rev}";
 
   dependencies = with python3Packages; [
     prometheus-client
@@ -53,6 +34,8 @@ python3Packages.buildPythonApplication {
 
   doCheck = false; # no tests
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = {
     description = "Rasdaemon exporter for Prometheus";
     homepage = "https://github.com/sanecz/prometheus-rasdaemon-exporter";

pkgs/by-name/py/pywal16/package.nix

@@ -9,14 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "pywal16";
-  version = "3.8.10";
+  version = "3.8.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eylles";
     repo = "pywal16";
     tag = version;
-    hash = "sha256-OSWv6Pxmd5U1xydL45dVT6m7gu4Rx6Yln3R4dTFZoVE=";
+    hash = "sha256-BZd8ditvcLLJDCWaWtSEUkOBgLM2LvtX5UbKOMz7eno=";
   };
 
   build-system = [ python3.pkgs.setuptools ];

pkgs/by-name/ri/rime-wanxiang/package.nix

@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rime-wanxiang";
-  version = "13.1.7";
+  version = "13.1.9";
 
   src = fetchFromGitHub {
     owner = "amzxyz";
     repo = "rime_wanxiang";
     tag = "v" + finalAttrs.version;
-    hash = "sha256-meuTuzrj2i4ByJ4TV638a6N1AVb0MrIhdRxXl6sPRoE=";
+    hash = "sha256-OQhjOXJ0wyJfMx9GMkmTdhf9vF6tX4t8o7a1xl6s6wk=";
   };
 
   installPhase = ''

pkgs/by-name/ri/ripes/package.nix

@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
     rm -r external/VSRTL/external/cereal
     substituteInPlace {src/serializers.h,src/io/iobase.h} \
       --replace-fail "VSRTL/external/cereal/include/cereal/cereal.hpp" "cereal/cereal.hpp"
+
+    substituteInPlace external/libelfin/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

pkgs/by-name/se/servo/package.nix

@@ -65,13 +65,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0.0.1-unstable-2025-10-22";
+  version = "0.0.1-unstable-2025-10-26";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "efc8c0f6647e542e35bac732585bc3aef6578028";
-    hash = "sha256-mLXs0OaOLD12hFQ8w/3xnDV+4fhjRKToRjZZMPDJ9X8=";
+    rev = "504a8d819f207833240b90fe5d61e81ff9f5d82b";
+    hash = "sha256-mToBb9bcdUx7ZWQkax88SLqTS85lUNMGK1sYASWGt4o=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -81,7 +81,7 @@ rustPlatform.buildRustPackage {
     '';
   };
 
-  cargoHash = "sha256-POMWoM5NVeas/t1XivqBDrhZy7qRvIL3e01Wu3893L4=";
+  cargoHash = "sha256-vyfiMsJlxt7dG9FeZ1XL6Qb7oma4pB+Aq7heaWKiyvY=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)

pkgs/by-name/sh/shipwright/package.nix

@@ -29,25 +29,32 @@
   fixDarwinDylibNames,
   applyPatches,
   shipwright,
+  libopus,
+  opusfile,
+  libogg,
+  libvorbis,
+  bzip2,
+  libX11,
+  sdl_gamecontrollerdb,
 }:
 
 let
 
   # The following would normally get fetched at build time, or a specific version is required
 
-  gamecontrollerdb = fetchFromGitHub {
-    owner = "mdqinc";
-    repo = "SDL_GameControllerDB";
-    rev = "a74711e1e87733ccdf02d7020d8fa9e4fa67176e";
-    hash = "sha256-rXC4akz9BaKzr/C2CryZC6RGk6+fGVG7RsQryUFUUk0=";
+  dr_libs = fetchFromGitHub {
+    owner = "mackron";
+    repo = "dr_libs";
+    rev = "da35f9d6c7374a95353fd1df1d394d44ab66cf01";
+    hash = "sha256-ydFhQ8LTYDBnRTuETtfWwIHZpRciWfqGsZC6SuViEn0=";
   };
 
   imgui' = applyPatches {
     src = fetchFromGitHub {
       owner = "ocornut";
       repo = "imgui";
-      tag = "v1.91.6-docking";
-      hash = "sha256-28wyzzwXE02W5vbEdRCw2iOF8ONkb3M3Al8XlYBvz1A=";
+      tag = "v1.91.9b-docking";
+      hash = "sha256-mQOJ6jCN+7VopgZ61yzaCnt4R1QLrW7+47xxMhFRHLQ=";
     };
     patches = [
       "${shipwright.src}/libultraship/cmake/dependencies/patches/imgui-fixes-and-config.patch"
@@ -64,8 +71,8 @@ let
   prism = fetchFromGitHub {
     owner = "KiritoDv";
     repo = "prism-processor";
-    rev = "fb3f8b4a2d14dfcbae654d0f0e59a73b6f6ca850";
-    hash = "sha256-gGdQSpX/TgCNZ0uyIDdnazgVHpAQhl30e+V0aVvTFMM=";
+    rev = "bbcbc7e3f890a5806b579361e7aa0336acd547e7";
+    hash = "sha256-jRPwO1Vub0cH12YMlME6kd8zGzKmcfIrIJZYpQJeOks=";
   };
 
   stb_impl = writeTextFile {
@@ -110,12 +117,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shipwright";
-  version = "9.0.5";
+  version = "9.1.0";
   src = fetchFromGitHub {
     owner = "harbourmasters";
     repo = "shipwright";
     tag = finalAttrs.version;
-    hash = "sha256-F5d4u3Nq/+yYiOgkH/bwWPhZDxgBpJ5ktee0Hc5UmEo=";
+    hash = "sha256-sRUg6wa0KOG+hoR+6QEVyPe/9O9yEefNB69BMO+H+iU=";
     fetchSubmodules = true;
     deepClone = true;
     postFetch = ''
@@ -160,6 +167,12 @@ stdenv.mkDerivation (finalAttrs: {
     nlohmann_json
     tinyxml-2
     spdlog
+    (lib.getDev libopus)
+    (lib.getDev opusfile)
+    libogg
+    libvorbis
+    bzip2
+    libX11
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
@@ -170,11 +183,14 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "BUILD_REMOTE_CONTROL" true)
     (lib.cmakeBool "NON_PORTABLE" true)
     (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DR_LIBS" "${dr_libs}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
+    (lib.cmakeFeature "OPUS_INCLUDE_DIR" "${lib.getDev libopus}/include/opus")
+    (lib.cmakeFeature "OPUSFILE_INCLUDE_DIR" "${lib.getDev opusfile}/include/opus")
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_METALCPP" "${metalcpp}")
@@ -183,6 +199,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int -Wno-elaborated-enum-base";
 
+  strictDeps = true;
+
   dontAddPrefix = true;
 
   # Linking fails without this
@@ -205,16 +223,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   postBuild = ''
     port_ver=$(grep CMAKE_PROJECT_VERSION: "$PWD/CMakeCache.txt" | cut -d= -f2)
-    cp ${gamecontrollerdb}/gamecontrollerdb.txt gamecontrollerdb.txt
-    mv ../libultraship/src/graphic/Fast3D/shaders ../soh/assets/custom
+    cp ${sdl_gamecontrollerdb}/share/gamecontrollerdb.txt gamecontrollerdb.txt
+    mv ../libultraship/src/fast/shaders ../soh/assets/custom
     pushd ../OTRExporter
-    python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.otr --port-ver $port_ver
+    python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.o2r --port-ver $port_ver
     popd
   '';
 
   preInstall = ''
     # Cmake likes it here for its install paths
-    cp ../OTRExporter/soh.otr soh/soh.otr
+    cp ../OTRExporter/soh.o2r soh/soh.o2r
   '';
 
   postInstall =

pkgs/by-name/sn/snakemake/package.nix

@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
-  version = "9.13.2";
+  version = "9.13.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake";
     tag = "v${version}";
-    hash = "sha256-7XEs+BTy6xPQidbuafrzELvfNjpzU9RcatXpRwHZ+1A=";
+    hash = "sha256-SNI9MS1rQ7G27HBeORQ83JOCaCNgp+6h5GeK6sXU2Lg=";
   };
 
   postPatch = ''

pkgs/by-name/st/steel/package.nix

@@ -19,13 +19,13 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "steel";
-  version = "0-unstable-2025-10-14";
+  version = "0-unstable-2025-10-24";
 
   src = fetchFromGitHub {
     owner = "mattwparas";
     repo = "steel";
-    rev = "c83d48f657f28017912cc3c1b604c33ab5de0a41";
-    hash = "sha256-VVrMXpJwcaUTSR6AElkc7Xu8If0/bUzKklOyo87CdLI=";
+    rev = "0b89c955668a48e8aab4344d5f7d3a44360ec73e";
+    hash = "sha256-hbjCJeWJi71mY+2oW8KOIuYppYL2YIhwImm8GFxD9O4=";
   };
 
   cargoHash = "sha256-CrmQhOfh7SQ5GvBywmYkfU6wMlgZq2x61+T+mIeQ7z4=";

pkgs/by-name/st/stellarium/package.nix

@@ -2,22 +2,15 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   perl,
   wrapGAppsHook3,
-  wrapQtAppsHook,
-  qtbase,
-  qtcharts,
-  qtpositioning,
-  qtmultimedia,
-  qtserialport,
-  qtwayland,
-  qtwebengine,
+  qt6,
+  qt6Packages,
   calcmysky,
-  qxlsx,
   indilib,
   libnova,
-  qttools,
   exiv2,
   nlopt,
   testers,
@@ -37,31 +30,38 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-9uQ6u1+dSszmKG8eY6kSXhqsCPRGw6tulCTCrLByIxc=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/stellarium/-/raw/ab559b6e9349569278f83c2dfc83990e971a8cb2/qt-6.10.patch";
+      hash = "sha256-a7zC9IQOj93VnPy8Bj/fLe4oJux7I4Edgj5OaKI4TZU=";
+    })
+  ];
+
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace CMakeLists.txt \
       --replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
                 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
     substituteInPlace src/CMakeLists.txt \
-      --replace-fail "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/"
+      --replace-fail "\''${_qt_bin_dir}/../" "${qt6.qtmultimedia}/lib/qt-6/"
   '';
 
   nativeBuildInputs = [
     cmake
     perl
     wrapGAppsHook3
-    wrapQtAppsHook
-    qttools
+    qt6.wrapQtAppsHook
+    qt6.qttools
   ];
 
   buildInputs = [
-    qtbase
-    qtcharts
-    qtpositioning
-    qtmultimedia
-    qtserialport
-    qtwebengine
+    qt6.qtbase
+    qt6.qtcharts
+    qt6.qtpositioning
+    qt6.qtmultimedia
+    qt6.qtserialport
+    qt6.qtwebengine
     calcmysky
-    qxlsx
+    qt6Packages.qxlsx
     indilib
     libnova
     exiv2
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     nlopt
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
+    qt6.qtwayland
   ];
 
   preConfigure = ''
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # fatal error: 'QtSerialPort/QSerialPortInfo' file not found
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${qtserialport}/lib";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${qt6.qtserialport}/lib";
 
   dontWrapGApps = true;
 

pkgs/by-name/sw/switchfin/package.nix

@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/dragonflylee/switchfin/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.k900 ];
-    mainProgram = "switchfin";
+    mainProgram = "Switchfin";
     platforms = lib.platforms.all;
   };
 }

pkgs/by-name/sy/synapse-admin-etkecc/package.nix

@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "synapse-admin-etkecc";
-  version = "0.11.1-etke48";
+  version = "0.11.1-etke49";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "synapse-admin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1bxkC91OPXPjwPgbjRlCvUth/Q7w7O4WeW3vYaGmo5A=";
+    hash = "sha256-PbqO+Y740GWqfh584W6OS4HeQtO6Rkz6lc5IaTjadq0=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-Vv/keQXNBxBDgKXNBHLFuNDNHEnEWJuFa/pU+ejpDCY=";
+    hash = "sha256-4o6TVbOSDm7btMDd4ItQR+jCFNZGhTXvycqcIh0FQnk=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/vi/vicinae/package.nix

@@ -0,0 +1,104 @@
+{
+  cmake,
+  cmark-gfm,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  grpc-tools,
+  kdePackages,
+  lib,
+  libqalculate,
+  minizip,
+  ninja,
+  nodejs,
+  npmHooks,
+  pkg-config,
+  protobuf,
+  qt6,
+  rapidfuzz-cpp,
+  stdenv,
+  wayland,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vicinae";
+  version = "0.15.5";
+
+  src = fetchFromGitHub {
+    owner = "vicinaehq";
+    repo = "vicinae";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3pKexTUWfohL/S/yWsVMShmtMlBFI9zsd7NFzySKG0w=";
+  };
+
+  apiDeps = fetchNpmDeps {
+    src = "${finalAttrs.src}/typescript/api";
+    hash = "sha256-dSHEzw15lSRRbldl9PljuWFf2htdG+HgSeKPAB88RBg=";
+  };
+
+  extensionManagerDeps = fetchNpmDeps {
+    src = "${finalAttrs.src}/typescript/extension-manager";
+    hash = "sha256-TCT7uZRZn4rsLA/z2yLeK5Bt4DJPmdSC4zkmuCxTtc8=";
+  };
+
+  cmakeFlags = lib.mapAttrsToList lib.cmakeFeature {
+    "VICINAE_GIT_TAG" = "v${finalAttrs.version}";
+    "VICINAE_PROVENANCE" = "nix";
+    "INSTALL_NODE_MODULES" = "OFF";
+    "CMAKE_INSTALL_PREFIX" = placeholder "out";
+    "CMAKE_INSTALL_DATAROOTDIR" = "share";
+    "CMAKE_INSTALL_BINDIR" = "bin";
+    "CMAKE_INSTALL_LIBDIR" = "lib";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    nodejs
+    pkg-config
+    protobuf
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    cmark-gfm
+    grpc-tools
+    kdePackages.layer-shell-qt
+    kdePackages.qtkeychain
+    libqalculate
+    minizip
+    nodejs
+    protobuf
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qtwayland
+    rapidfuzz-cpp
+    wayland
+  ];
+
+  postPatch = ''
+    local postPatchHooks=()
+    source ${npmHooks.npmConfigHook}/nix-support/setup-hook
+    npmRoot=typescript/api npmDeps=${finalAttrs.apiDeps} npmConfigHook
+    npmRoot=typescript/extension-manager npmDeps=${finalAttrs.extensionManagerDeps} npmConfigHook
+  '';
+
+  qtWrapperArgs = [
+    "--prefix PATH :  ${
+      lib.makeBinPath [
+        nodejs
+        (placeholder "out")
+      ]
+    }"
+  ];
+
+  meta = {
+    description = "A focused launcher for your desktop — native, fast, extensible";
+    homepage = "https://github.com/vicinaehq/vicinae";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      dawnofmidnight
+      zstg
+    ];
+    platforms = lib.platforms.linux;
+    mainProgram = "vicinae";
+  };
+})

pkgs/by-name/wi/wivrn/package.nix

@@ -90,6 +90,15 @@ stdenv.mkDerivation (finalAttrs: {
     fi
   '';
 
+  patches = [
+    # See https://github.com/WiVRn/WiVRn/pull/557
+    (fetchpatch {
+      name = "wivrn-fix-qt6.10-build.patch";
+      url = "https://github.com/WiVRn/WiVRn/commit/2204fdd39682cfc052556d58fdb9404dd8ecf63f.patch?full_index=1";
+      hash = "sha256-05MLfJNCznBt6eaggUfSk1jaNDB2/eou6CfexUkIHZE=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     git

pkgs/by-name/ya/yamlfmt/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "yamlfmt";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "yamlfmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SIjWBXhi5uy34KySxMCTrTDdXXvtVCWWj4LhYcXq5MU=";
+    hash = "sha256-KMIkll7seKslvb4ErelpKxWg/T2P9FLYKfTyAEWlbWk=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > "$out/.git_head"

pkgs/development/compilers/llvm/common/bolt/default.nix

@@ -12,7 +12,7 @@
   libclang,
   version,
   python3,
-  buildLlvmTools,
+  buildLlvmPackages,
   patches ? [ ],
   devExtraCmakeFlags ? [ ],
   fetchpatch,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
+    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/llvm-tblgen")
   ]
   ++ devExtraCmakeFlags;
 

pkgs/development/compilers/llvm/common/clang/default.nix

@@ -12,7 +12,7 @@
   release_version,
   version,
   python3,
-  buildLlvmTools,
+  buildLlvmPackages,
   fixDarwinDylibNames,
   enableManpages ? false,
   enableClangToolsExtra ? true,
@@ -96,9 +96,9 @@ stdenv.mkDerivation (
       (lib.cmakeBool "CLANGD_BUILD_XPC" false)
       (lib.cmakeBool "LLVM_ENABLE_RTTI" true)
       (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)
-      (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
-      (lib.cmakeFeature "CLANG_TABLEGEN" "${buildLlvmTools.tblgen}/bin/clang-tblgen")
-      (lib.cmakeFeature "CLANG_TIDY_CONFUSABLE_CHARS_GEN" "${buildLlvmTools.tblgen}/bin/clang-tidy-confusable-chars-gen")
+      (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/llvm-tblgen")
+      (lib.cmakeFeature "CLANG_TABLEGEN" "${buildLlvmPackages.tblgen}/bin/clang-tblgen")
+      (lib.cmakeFeature "CLANG_TIDY_CONFUSABLE_CHARS_GEN" "${buildLlvmPackages.tblgen}/bin/clang-tidy-confusable-chars-gen")
     ]
     ++ lib.optional (lib.versionAtLeast release_version "20") (
       lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm"
@@ -115,7 +115,7 @@ stdenv.mkDerivation (
     ]
     ++ lib.optionals (lib.versionOlder release_version "20") [
       # clang-pseudo removed in LLVM20: https://github.com/llvm/llvm-project/commit/ed8f78827895050442f544edef2933a60d4a7935
-      (lib.cmakeFeature "CLANG_PSEUDO_GEN" "${buildLlvmTools.tblgen}/bin/clang-pseudo-gen")
+      (lib.cmakeFeature "CLANG_PSEUDO_GEN" "${buildLlvmPackages.tblgen}/bin/clang-pseudo-gen")
     ]
     ++ devExtraCmakeFlags;
 

pkgs/development/compilers/llvm/common/default.nix

@@ -1,34 +1,31 @@
 {
   lowPrio,
-  newScope,
   pkgs,
   targetPackages,
   lib,
   stdenv,
-  libxcrypt,
-  substitute,
-  replaceVars,
   fetchFromGitHub,
-  fetchpatch,
-  fetchpatch2,
   overrideCC,
   wrapCCWith,
   wrapBintoolsWith,
-  buildPackages,
-  buildLlvmTools, # tools, but from the previous stage, for cross
-  targetLlvmLibraries, # libraries, but from the next stage, for cross
-  targetLlvm,
+  makeScopeWithSplicing',
+  otherSplices,
+  splicePackages,
   # This is the default binutils, but with *this* version of LLD rather
   # than the default LLVM version's, if LLD is the choice. We use these for
   # the `useLLVM` bootstrapping below.
-  bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,
-  bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
+  bootBintoolsNoLibc,
+  bootBintools,
   darwin,
   gitRelease ? null,
   officialRelease ? null,
   monorepoSrc ? null,
   version ? null,
   patchesFn ? lib.id,
+  cmake,
+  cmakeMinimal,
+  python3,
+  python3Minimal,
   # Allows passthrough to packages via newScope. This makes it possible to
   # do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get
   # an llvmPackages whose packages are overridden in an internally consistent way.
@@ -110,11 +107,24 @@ let
       };
   };
 
-  tools = lib.makeExtensible (
-    tools:
+  buildLlvmPackages = otherSplices.selfBuildHost;
+in
+makeScopeWithSplicing' {
+  inherit otherSplices;
+  extra = _spliced0: args // metadata // { inherit buildLlvmPackages; };
+  f =
+    self:
     let
-      callPackage = newScope (tools // args // metadata);
+      targetLlvmPackages =
+        if otherSplices.selfTargetTarget == { } then self else otherSplices.selfTargetTarget;
+
+      # FIXME: This is a tragic and unprincipled hack, but I don’t
+      # know what would actually be good instead.
+      newScope = scope: self.newScope ({ inherit (args) stdenv; } // scope);
+      callPackage = newScope { };
+
       clangVersion = lib.versions.major metadata.release_version;
+
       mkExtraBuildCommands0 =
         cc:
         ''
@@ -134,37 +144,40 @@ let
               ln -s "${lib.getLib cc}/lib/clang/${clangVersion}/include" "$rsrc"
             ''
         );
+
       mkExtraBuildCommandsBasicRt =
         cc:
         mkExtraBuildCommands0 cc
         + ''
-          ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/lib" "$rsrc/lib"
+          ln -s "${targetLlvmPackages.compiler-rt-no-libc.out}/lib" "$rsrc/lib"
         '';
+
       mkExtraBuildCommands =
         cc:
         mkExtraBuildCommands0 cc
         + ''
-          ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
-          ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
+          ln -s "${targetLlvmPackages.compiler-rt.out}/lib" "$rsrc/lib"
+          ln -s "${targetLlvmPackages.compiler-rt.out}/share" "$rsrc/share"
         '';
 
-      bintoolsNoLibc' = if bootBintoolsNoLibc == null then tools.bintoolsNoLibc else bootBintoolsNoLibc;
-      bintools' = if bootBintools == null then tools.bintools else bootBintools;
+      bintoolsNoLibc' = if bootBintoolsNoLibc == null then self.bintoolsNoLibc else bootBintoolsNoLibc;
+      bintools' = if bootBintools == null then self.bintools else bootBintools;
     in
     {
-      libllvm = callPackage ./llvm {
-      };
+      inherit (metadata) release_version;
+
+      libllvm = callPackage ./llvm { };
 
       # `llvm` historically had the binaries.  When choosing an output explicitly,
       # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-      llvm = tools.libllvm;
+      llvm = self.libllvm;
 
       tblgen = callPackage ./tblgen.nix {
         patches =
           builtins.filter
             # Crude method to drop polly patches if present, they're not needed for tblgen.
             (p: (!lib.hasInfix "-polly" p))
-            tools.libllvm.patches;
+            self.libllvm.patches;
         clangPatches = [
           # Would take tools.libclang.patches, but this introduces a cycle due
           # to replacements depending on the llvm outpath (e.g. the LLVMgold patch).
@@ -173,20 +186,19 @@ let
         ];
       };
 
-      libclang = callPackage ./clang {
-      };
+      libclang = callPackage ./clang { };
 
-      clang-unwrapped = tools.libclang;
+      clang-unwrapped = self.libclang;
 
       llvm-manpages = lowPrio (
-        tools.libllvm.override {
+        self.libllvm.override {
           enableManpages = true;
           python3 = pkgs.python3; # don't use python-boot
         }
       );
 
       clang-manpages = lowPrio (
-        tools.libclang.override {
+        self.libclang.override {
           enableManpages = true;
           python3 = pkgs.python3; # don't use python-boot
         }
@@ -198,55 +210,59 @@ let
       # pick clang appropriate for package set we are targeting
       clang =
         if stdenv.targetPlatform.libc == null then
-          tools.clangNoLibc
+          self.clangNoLibc
         else if stdenv.targetPlatform.isDarwin then
-          tools.systemLibcxxClang
+          self.systemLibcxxClang
         else if stdenv.targetPlatform.useLLVM or false then
-          tools.clangUseLLVM
-        else if (pkgs.targetPackages.stdenv or args.stdenv).cc.isGNU then
-          tools.libstdcxxClang
+          self.clangUseLLVM
+        else if (targetPackages.stdenv or stdenv).cc.isGNU then
+          self.libstdcxxClang
         else
-          tools.libcxxClang;
+          self.libcxxClang;
 
       libstdcxxClang = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper.
         libcxx = null;
-        extraPackages = [ targetLlvmLibraries.compiler-rt ];
+        extraPackages = [ targetLlvmPackages.compiler-rt ];
         extraBuildCommands = mkExtraBuildCommands cc;
       };
 
       libcxxClang = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
-        libcxx = targetLlvmLibraries.libcxx;
-        extraPackages = [ targetLlvmLibraries.compiler-rt ];
+        cc = self.clang-unwrapped;
+        libcxx = targetLlvmPackages.libcxx;
+        extraPackages = [ targetLlvmPackages.compiler-rt ];
         extraBuildCommands = mkExtraBuildCommands cc;
       };
 
       # Darwin uses the system libc++ by default. It is set up as its own clang definition so that `libcxxClang`
       # continues to use the libc++ from LLVM.
       systemLibcxxClang = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = darwin.libcxx;
-        extraPackages = [ targetLlvmLibraries.compiler-rt ];
+        extraPackages = [ targetLlvmPackages.compiler-rt ];
         extraBuildCommands = mkExtraBuildCommands cc;
       };
 
-      lld = callPackage ./lld {
-      };
+      lld = callPackage ./lld { };
 
-      lldbPlugins = lib.makeExtensible (
-        lldbPlugins:
-        let
-          callPackage = newScope (lldbPlugins // tools // args // metadata);
-        in
-        lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
+      lldbPlugins = lib.recurseIntoAttrs (
+        lib.makeScopeWithSplicing'
+          {
+            inherit splicePackages newScope;
+          }
+          {
+            otherSplices = lib.mapAttrs (_: selfSplice: selfSplice.lldbPlugins or { }) otherSplices;
+            f = selfLldbPlugins: {
+              llef = selfLldbPlugins.callPackage ./lldb-plugins/llef.nix { };
+            };
+          }
       );
 
       lldb = callPackage ./lldb { };
 
       lldb-manpages = lowPrio (
-        tools.lldb.override {
+        self.lldb.override {
           enableManpages = true;
           python3 = pkgs.python3; # don't use python-boot
         }
@@ -262,27 +278,29 @@ let
       bintools-unwrapped = callPackage ./bintools.nix { };
 
       bintoolsNoLibc = wrapBintoolsWith {
-        bintools = tools.bintools-unwrapped;
+        bintools = self.bintools-unwrapped;
         libc = targetPackages.preLibcHeaders;
       };
 
-      bintools = wrapBintoolsWith { bintools = tools.bintools-unwrapped; };
+      bintools = wrapBintoolsWith {
+        bintools = self.bintools-unwrapped;
+      };
 
       clangUseLLVM = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
-        libcxx = targetLlvmLibraries.libcxx;
+        cc = self.clang-unwrapped;
+        libcxx = targetLlvmPackages.libcxx;
         bintools = bintools';
         extraPackages = [
-          targetLlvmLibraries.compiler-rt
+          targetLlvmPackages.compiler-rt
         ]
         ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [
-          targetLlvmLibraries.libunwind
+          targetLlvmPackages.libunwind
         ];
         extraBuildCommands = mkExtraBuildCommands cc;
         nixSupport.cc-cflags = [
           "-rtlib=compiler-rt"
           "-Wno-unused-command-line-argument"
-          "-B${targetLlvmLibraries.compiler-rt}/lib"
+          "-B${targetLlvmPackages.compiler-rt}/lib"
         ]
         ++ lib.optional (
           !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
@@ -295,16 +313,19 @@ let
         ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
         nixSupport.cc-ldflags = lib.optionals (
           !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
-        ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
+        ) [ "-L${targetLlvmPackages.libunwind}/lib" ];
       };
 
       clangWithLibcAndBasicRtAndLibcxx = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         # This is used to build compiler-rt. Make sure to use the system libc++ on Darwin.
-        libcxx = if stdenv.hostPlatform.isDarwin then darwin.libcxx else targetLlvmLibraries.libcxx;
+        #
+        # FIXME: This should almost certainly use
+        # `stdenv.targetPlatform` and `targetPackages.darwin.libcxx`.
+        libcxx = if stdenv.hostPlatform.isDarwin then darwin.libcxx else targetLlvmPackages.libcxx;
         bintools = bintools';
         extraPackages = [
-          targetLlvmLibraries.compiler-rt-no-libc
+          targetLlvmPackages.compiler-rt-no-libc
         ]
         ++
           lib.optionals
@@ -312,13 +333,13 @@ let
               !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
             )
             [
-              targetLlvmLibraries.libunwind
+              targetLlvmPackages.libunwind
             ];
         extraBuildCommands = mkExtraBuildCommandsBasicRt cc;
         nixSupport.cc-cflags = [
           "-rtlib=compiler-rt"
           "-Wno-unused-command-line-argument"
-          "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+          "-B${targetLlvmPackages.compiler-rt-no-libc}/lib"
         ]
         ++ lib.optional (
           !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
@@ -331,50 +352,50 @@ let
         ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
         nixSupport.cc-ldflags = lib.optionals (
           !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
-        ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
+        ) [ "-L${targetLlvmPackages.libunwind}/lib" ];
       };
 
       clangWithLibcAndBasicRt = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = null;
         bintools = bintools';
-        extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];
+        extraPackages = [ targetLlvmPackages.compiler-rt-no-libc ];
         extraBuildCommands = mkExtraBuildCommandsBasicRt cc;
         nixSupport.cc-cflags = [
           "-rtlib=compiler-rt"
-          "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+          "-B${targetLlvmPackages.compiler-rt-no-libc}/lib"
           "-nostdlib++"
         ]
         ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
       };
 
       clangNoLibcWithBasicRt = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = null;
         bintools = bintoolsNoLibc';
-        extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];
+        extraPackages = [ targetLlvmPackages.compiler-rt-no-libc ];
         extraBuildCommands = mkExtraBuildCommandsBasicRt cc;
         nixSupport.cc-cflags = [
           "-rtlib=compiler-rt"
-          "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+          "-B${targetLlvmPackages.compiler-rt-no-libc}/lib"
         ]
         ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
       };
 
       clangNoLibcNoRt = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = null;
         bintools = bintoolsNoLibc';
         extraPackages = [ ];
-        # "-nostartfiles" used to be needed for pkgsLLVM, causes problems so don't include it.
         extraBuildCommands = mkExtraBuildCommands0 cc;
+        # "-nostartfiles" used to be needed for pkgsLLVM, causes problems so don't include it.
         nixSupport.cc-cflags = lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
       };
 
       # This is an "oddly ordered" bootstrap just for Darwin. Probably
       # don't want it otherwise.
       clangNoCompilerRtWithLibc = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = null;
         bintools = bintools';
         extraPackages = [ ];
@@ -383,126 +404,100 @@ let
       };
 
       # Aliases
-      clangNoCompilerRt = tools.clangNoLibcNoRt;
-      clangNoLibc = tools.clangNoLibcWithBasicRt;
-      clangNoLibcxx = tools.clangWithLibcAndBasicRt;
+      clangNoCompilerRt = self.clangNoLibcNoRt;
+      clangNoLibc = self.clangNoLibcWithBasicRt;
+      clangNoLibcxx = self.clangWithLibcAndBasicRt;
+
+      compiler-rt-libc = callPackage ./compiler-rt (
+        let
+          # temp rename to avoid infinite recursion
+          stdenv =
+            # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
+            if args.stdenv.hostPlatform.isDarwin then
+              overrideCC darwin.bootstrapStdenv buildLlvmPackages.clangWithLibcAndBasicRtAndLibcxx
+            else if args.stdenv.hostPlatform.useLLVM or false then
+              overrideCC args.stdenv buildLlvmPackages.clangWithLibcAndBasicRtAndLibcxx
+            else
+              args.stdenv;
+        in
+        {
+          inherit stdenv;
+        }
+      );
+
+      compiler-rt-no-libc = callPackage ./compiler-rt {
+        doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;
+        stdenv =
+          # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
+          if stdenv.hostPlatform.isDarwin then
+            overrideCC darwin.bootstrapStdenv buildLlvmPackages.clangNoLibcNoRt
+          else
+            overrideCC stdenv buildLlvmPackages.clangNoLibcNoRt;
+      };
+
+      compiler-rt =
+        if
+          stdenv.hostPlatform.libc == null
+          # Building the with-libc compiler-rt and WASM doesn't yet work,
+          # because wasilibc doesn't provide some expected things. See
+          # compiler-rt's file for further details.
+          || stdenv.hostPlatform.isWasm
+          # Failing `#include <term.h>` in
+          # `lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp`
+          # sanitizers, not sure where to get it.
+          || stdenv.hostPlatform.isFreeBSD
+        then
+          self.compiler-rt-no-libc
+        else
+          self.compiler-rt-libc;
+
+      stdenv = overrideCC stdenv buildLlvmPackages.clang;
+
+      libcxxStdenv = overrideCC stdenv buildLlvmPackages.libcxxClang;
+
+      libcxx = callPackage ./libcxx {
+        stdenv =
+          if stdenv.hostPlatform.isDarwin then
+            overrideCC darwin.bootstrapStdenv buildLlvmPackages.clangWithLibcAndBasicRt
+          else
+            overrideCC stdenv buildLlvmPackages.clangWithLibcAndBasicRt;
+      };
+
+      libunwind = callPackage ./libunwind {
+        stdenv = overrideCC stdenv buildLlvmPackages.clangWithLibcAndBasicRt;
+      };
+
+      openmp = callPackage ./openmp { };
 
       mlir = callPackage ./mlir { };
 
       libclc = callPackage ./libclc { };
     }
     // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") {
-      bolt = callPackage ./bolt {
-      };
+      bolt = callPackage ./bolt { };
     }
     // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {
-      flang = callPackage ./flang {
-        mlir = tools.mlir;
+      flang = callPackage ./flang { };
+
+      libc-overlay = callPackage ./libc {
+        isFullBuild = false;
+        # Use clang due to "gnu::naked" not working on aarch64.
+        # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
+        stdenv = overrideCC stdenv buildLlvmPackages.clang;
       };
-    }
-  );
 
-  libraries = lib.makeExtensible (
-    libraries:
-    let
-      callPackage = newScope (libraries // buildLlvmTools // args // metadata);
-    in
-    (
-      {
-        compiler-rt-libc = callPackage ./compiler-rt (
-          let
-            # temp rename to avoid infinite recursion
-            stdenv =
-              # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
-              if args.stdenv.hostPlatform.isDarwin then
-                overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
-              else if args.stdenv.hostPlatform.useLLVM or false then
-                overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
-              else
-                args.stdenv;
-          in
-          {
-            inherit stdenv;
-          }
-        );
+      libc-full = callPackage ./libc {
+        isFullBuild = true;
+        # Use clang due to "gnu::naked" not working on aarch64.
+        # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
+        stdenv = overrideCC stdenv buildLlvmPackages.clangNoLibcNoRt;
+        # FIXME: This should almost certainly be `stdenv.hostPlatform`.
+        cmake = if stdenv.targetPlatform.libc == "llvm" then cmakeMinimal else cmake;
+        python3 = if stdenv.targetPlatform.libc == "llvm" then python3Minimal else python3;
+      };
 
-        compiler-rt-no-libc = callPackage ./compiler-rt {
-          doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;
-          stdenv =
-            # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
-            if stdenv.hostPlatform.isDarwin then
-              overrideCC darwin.bootstrapStdenv buildLlvmTools.clangNoLibcNoRt
-            else
-              overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
-        };
-
-        compiler-rt =
-          if
-            stdenv.hostPlatform.libc == null
-            # Building the with-libc compiler-rt and WASM doesn't yet work,
-            # because wasilibc doesn't provide some expected things. See
-            # compiler-rt's file for further details.
-            || stdenv.hostPlatform.isWasm
-            # Failing `#include <term.h>` in
-            # `lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp`
-            # sanitizers, not sure where to get it.
-            || stdenv.hostPlatform.isFreeBSD
-          then
-            libraries.compiler-rt-no-libc
-          else
-            libraries.compiler-rt-libc;
-
-        stdenv = overrideCC stdenv buildLlvmTools.clang;
-
-        libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
-
-        libcxx = callPackage ./libcxx {
-          stdenv =
-            if stdenv.hostPlatform.isDarwin then
-              overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt
-            else
-              overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
-        };
-
-        libunwind = callPackage ./libunwind {
-          stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
-        };
-
-        openmp = callPackage ./openmp {
-        };
-      }
-      // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {
-        libc-overlay = callPackage ./libc {
-          isFullBuild = false;
-          # Use clang due to "gnu::naked" not working on aarch64.
-          # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
-          stdenv = overrideCC stdenv buildLlvmTools.clang;
-        };
-
-        libc-full = callPackage ./libc {
-          isFullBuild = true;
-          # Use clang due to "gnu::naked" not working on aarch64.
-          # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
-          stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
-          cmake =
-            if stdenv.targetPlatform.libc == "llvm" then buildPackages.cmakeMinimal else buildPackages.cmake;
-          python3 =
-            if stdenv.targetPlatform.libc == "llvm" then
-              buildPackages.python3Minimal
-            else
-              buildPackages.python3;
-        };
-
-        libc = if stdenv.targetPlatform.libc == "llvm" then libraries.libc-full else libraries.libc-overlay;
-      }
-    )
-  );
-
-  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];
-in
-{
-  inherit tools libraries;
-  inherit (metadata) release_version;
+      libc =
+        # FIXME: This should almost certainly be `stdenv.hostPlatform`.
+        if stdenv.targetPlatform.libc == "llvm" then self.libc-full else self.libc-overlay;
+    };
 }
-// (noExtend libraries)
-// (noExtend tools)

pkgs/development/compilers/llvm/common/flang/default.nix

@@ -15,7 +15,7 @@
   mlir,
   version,
   python3,
-  buildLlvmTools,
+  buildLlvmPackages,
   devExtraCmakeFlags ? [ ],
 }:
 
@@ -64,11 +64,12 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
     (lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm")
-    (lib.cmakeFeature "LLVM_TOOLS_BINARY_DIR" "${buildLlvmTools.tblgen}/bin/")
-    (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${buildLlvmTools.tblgen}/bin/llvm-lit")
+    # TODO: Needs patches and the `lit` package like other LLVM builds?
+    (lib.cmakeFeature "LLVM_TOOLS_BINARY_DIR" "${buildLlvmPackages.tblgen}/bin/")
+    (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${buildLlvmPackages.tblgen}/bin/llvm-lit")
     (lib.cmakeFeature "CLANG_DIR" "${libclang.dev}/lib/cmake/clang")
     (lib.cmakeFeature "MLIR_DIR" "${mlir.dev}/lib/cmake/mlir")
-    (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/mlir-tblgen")
+    (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/mlir-tblgen")
     (lib.cmakeFeature "MLIR_TABLEGEN_TARGET" "MLIR-TBLGen")
     (lib.cmakeBool "LLVM_BUILD_EXAMPLES" false)
     (lib.cmakeBool "LLVM_ENABLE_PLUGINS" false)

pkgs/development/compilers/llvm/common/libclc/default.nix

@@ -6,7 +6,7 @@
   monorepoSrc,
   llvm,
   buildPackages,
-  buildLlvmTools,
+  buildLlvmPackages,
   ninja,
   cmake,
   python3,
@@ -15,7 +15,7 @@
 }:
 let
   spirv-llvm-translator = buildPackages.spirv-llvm-translator.override {
-    inherit (buildLlvmTools) llvm;
+    inherit (buildLlvmPackages) llvm;
   };
 
   # The build requires an unwrapped clang but wrapped clang++ thus we need to
@@ -23,7 +23,7 @@ let
   # unwrapped clang++
   clang-only = runCommand "clang-only" { } ''
     mkdir -p "$out"/bin
-    ln -s "${lib.getExe' buildLlvmTools.clang.cc "clang"}" "$out"/bin
+    ln -s "${lib.getExe' buildLlvmPackages.clang.cc "clang"}" "$out"/bin
   '';
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -59,13 +59,13 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionalString (lib.versionOlder release_version "19") ''
       substituteInPlace CMakeLists.txt \
         --replace-fail 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
-                  'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \
+                  'find_program( LLVM_CLANG clang PATHS "${buildLlvmPackages.clang.cc}/bin" NO_DEFAULT_PATH )' \
         --replace-fail 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
-                  'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \
+                  'find_program( LLVM_AS llvm-as PATHS "${buildLlvmPackages.llvm}/bin" NO_DEFAULT_PATH )' \
         --replace-fail 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
-                  'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \
+                  'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmPackages.llvm}/bin" NO_DEFAULT_PATH )' \
         --replace-fail 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
-                  'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \
+                  'find_program( LLVM_OPT opt PATHS "${buildLlvmPackages.llvm}/bin" NO_DEFAULT_PATH )' \
         --replace-fail 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
                   'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )'
     ''
@@ -74,13 +74,13 @@ stdenv.mkDerivation (finalAttrs: {
         ''
           substituteInPlace CMakeLists.txt \
             --replace-fail 'COMMAND prepare_builtins' \
-                           'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins'
+                           'COMMAND ${buildLlvmPackages.libclc.dev}/bin/prepare_builtins'
         ''
       else
         ''
           substituteInPlace CMakeLists.txt \
             --replace-fail 'set( prepare_builtins_exe prepare_builtins )' \
-                           'set( prepare_builtins_exe ${buildLlvmTools.libclc.dev}/bin/prepare_builtins )'
+                           'set( prepare_builtins_exe ${buildLlvmPackages.libclc.dev}/bin/prepare_builtins )'
         ''
     );
 
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (lib.versionAtLeast release_version "19") [
     clang-only
-    buildLlvmTools.llvm
+    llvm
     spirv-llvm-translator
   ];
   buildInputs = [ llvm ];