Merge staging-next-24.11 into staging-24.11

.github/workflows/check-maintainers-sorted.yml

@@ -1,28 +0,0 @@
-name: "Check that maintainer list is sorted"
-
-on:
-  pull_request_target:
-    paths:
-      - 'maintainers/maintainer-list.nix'
-
-permissions: {}
-
-jobs:
-  nixos:
-    name: maintainer-list-check
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          ref: refs/pull/${{ github.event.pull_request.number }}/merge
-          # Only these directories to perform the check
-          sparse-checkout: |
-            lib
-            maintainers
-
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
-        with:
-          extra_nix_config: sandbox = true
-
-      - name: Check that maintainer-list.nix is sorted
-        run: nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix

.github/workflows/check-nix-format.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
           extra_nix_config: sandbox = true
 

.github/workflows/check-nixf-tidy.yml

@@ -34,7 +34,7 @@ jobs:
           rev=$(jq -r .rev ci/pinned-nixpkgs.json)
           echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV"
 
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
           extra_nix_config: sandbox = true
           nix_path: nixpkgs=${{ env.url }}

.github/workflows/check-shell.yml

@@ -27,7 +27,7 @@ jobs:
         with:
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
 
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
       - name: Build shell
         run: nix-build shell.nix

.github/workflows/codeowners-v2.yml

@@ -45,7 +45,7 @@ jobs:
     needs: get-merge-commit
     if: github.repository_owner == 'NixOS' && needs.get-merge-commit.outputs.mergedSha
     steps:
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -92,7 +92,7 @@ jobs:
     runs-on: ubuntu-24.04
     if: github.repository_owner == 'NixOS'
     steps:
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
       # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head.
       # This is intentional, because we need to request the review of owners as declared in the base branch.

.github/workflows/editorconfig-v2.yml

@@ -32,7 +32,7 @@ jobs:
         with:
           ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
           # nixpkgs commit is pinned so that it doesn't break
           # editorconfig-checker 2.4.0

.github/workflows/eval-lib-tests.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
           extra_nix_config: sandbox = true
 

.github/workflows/eval.yml

@@ -43,7 +43,7 @@ jobs:
           echo "targetSha=$targetSha" >> "$GITHUB_OUTPUT"
 
       - name: Install Nix
-        uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -71,7 +71,7 @@ jobs:
           path: nixpkgs
 
       - name: Install Nix
-        uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -111,7 +111,7 @@ jobs:
           path: nixpkgs
 
       - name: Install Nix
-        uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -152,7 +152,7 @@ jobs:
           path: nixpkgs
 
       - name: Install Nix
-        uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -260,7 +260,7 @@ jobs:
           path: comparison
 
       - name: Install Nix
-        uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
       # Important: This workflow job runs with extra permissions,
       # so we need to make sure to not run untrusted code from PRs

.github/workflows/keep-sorted.yml

@@ -27,7 +27,7 @@ jobs:
           rev=$(jq -r .rev ci/pinned-nixpkgs.json)
           echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV"
 
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
           extra_nix_config: sandbox = true
           nix_path: nixpkgs=${{ env.url }}

.github/workflows/manual-nixos-v2.yml

@@ -33,7 +33,7 @@ jobs:
         with:
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
 
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
           extra_nix_config: sandbox = true
 

.github/workflows/manual-nixpkgs-v2.yml

@@ -20,7 +20,7 @@ jobs:
         with:
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
 
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
           extra_nix_config: sandbox = true
 

.github/workflows/nix-parse-v2.yml

@@ -32,7 +32,7 @@ jobs:
           ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
         if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }}
 
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
         with:
           extra_nix_config: sandbox = true
           nix_path: nixpkgs=channel:nixpkgs-unstable

.github/workflows/nixpkgs-vet.yml

@@ -43,7 +43,7 @@ jobs:
           git worktree add "$target" "$(git rev-parse HEAD^1)"
           echo "target=$target" >> "$GITHUB_ENV"
 
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
+      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
       - name: Fetching the pinned tool
         # Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh

maintainers/scripts/check-maintainers-sorted.nix

@@ -1,87 +0,0 @@
-let
-  lib = import ../../lib;
-  inherit (lib)
-    add
-    attrNames
-    elemAt
-    foldl'
-    genList
-    length
-    replaceStrings
-    sort
-    toLower
-    trace
-    ;
-
-  maintainers = import ../maintainer-list.nix;
-  simplify = replaceStrings [ "-" "_" ] [ "" "" ];
-  compare = a: b: simplify (toLower a) < simplify (toLower b);
-  namesSorted = sort (a: b: a.key < b.key) (
-    map (
-      n:
-      let
-        pos = builtins.unsafeGetAttrPos n maintainers;
-      in
-      assert pos == null -> throw "maintainers entry ${n} is malformed";
-      {
-        name = n;
-        line = pos.line;
-        key = toLower (simplify n);
-      }
-    ) (attrNames maintainers)
-  );
-  before =
-    {
-      name,
-      line,
-      key,
-    }:
-    foldl' (
-      acc: n: if n.key < key && (acc == null || n.key > acc.key) then n else acc
-    ) null namesSorted;
-  errors = foldl' add 0 (
-    map (
-      i:
-      let
-        a = elemAt namesSorted i;
-        b = elemAt namesSorted (i + 1);
-        lim =
-          let
-            t = before a;
-          in
-          if t == null then "the initial {" else t.name;
-      in
-      if a.line >= b.line then
-        trace (
-          "maintainer ${a.name} (line ${toString a.line}) should be listed "
-          + "after ${lim}, not after ${b.name} (line ${toString b.line})"
-        ) 1
-      else
-        0
-    ) (genList (i: i) (length namesSorted - 1))
-  );
-in
-assert errors == 0;
-"all good!"
-
-# generate edit commands to sort the list.
-# may everything following the last current entry (closing } ff) in the wrong place
-# with lib;
-# concatStringsSep
-#   "\n"
-#   (let first = foldl' (acc: n: if n.line < acc then n.line else acc) 999999999 namesSorted;
-#        commands = map
-#          (i: let e = elemAt namesSorted i;
-#                  begin = foldl'
-#                    (acc: n: if n.line < e.line && n.line > acc then n.line else acc)
-#                    1
-#                    namesSorted;
-#                  end =
-#                    foldl' (acc: n: if n.line > e.line && n.line < acc then n.line else acc)
-#                      999999999
-#                      namesSorted;
-#              in "${toString e.line},${toString (end - 1)} p")
-#          (genList (i: i) (length namesSorted));
-#    in map
-#      (c: "sed -ne '${c}' maintainers/maintainer-list.nix")
-#      ([ "1,${toString (first - 1)} p" ] ++ commands))

pkgs/applications/networking/browsers/librewolf/librewolf.nix

@@ -16,7 +16,7 @@ rec {
 
   extraPostPatch = ''
     while read patch_name; do
-      if [ "$patch_name" -neq "patches/macos-import-vector.patch"]; then
+      if [ "$patch_name" != "patches/macos-import-vector.patch" ]; then
         echo "applying LibreWolf patch: $patch_name"
         patch -p1 < ${source}/$patch_name
       else

pkgs/by-name/am/amazon-q-cli/package.nix

@@ -3,27 +3,37 @@
   fetchFromGitHub,
   rustPlatform,
   protobuf_26,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "amazon-q-cli";
-  version = "1.8.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli";
-    tag = "v${version}";
-    hash = "sha256-fOz9oz+xNwX2Bzl6szgQ9oai6lqP+EzbaCNzHPUT2cA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-BiVCiMBL5LLm8RYw58u6P7yqQq9XnN8b6fTbxNE2QsA=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-H9bCke3vQDuS6RDEg8dzeFiBWCex64A8KSRhfgyp8e8=";
+  cargoHash = "sha256-7zUgWLGTZx3Ex7RYxb3eZimWdy6AxkNwpCDUwiAr2JE=";
 
   cargoBuildFlags = [
     "-p"
     "q_cli"
   ];
+
+  nativeBuildInputs = [
+    protobuf_26
+  ];
+
+  postInstall = ''
+    install -m 0755 $out/bin/q_cli $out/bin/amazon-q
+  '';
+
   cargoTestFlags = [
     "-p"
     "q_cli"
@@ -52,13 +62,10 @@ rustPlatform.buildRustPackage rec {
     "--skip=init_lint_zsh_pre_zshrc"
   ];
 
-  nativeBuildInputs = [
-    protobuf_26
-  ];
-
-  postInstall = ''
-    mv $out/bin/q_cli $out/bin/amazon-q
-  '';
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/amazon-q";
+  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Amazon Q Developer AI coding agent CLI";
@@ -67,7 +74,8 @@ rustPlatform.buildRustPackage rec {
       mit
       asl20
     ];
+    mainProgram = "amazon-q";
     maintainers = [ lib.maintainers.jamesward ];
     platforms = lib.platforms.linux;
   };
-}
+})

pkgs/by-name/bi/bird2/package.nix

@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bird";
-  version = "2.17";
+  version = "2.17.1";
 
   src = fetchurl {
     url = "https://bird.network.cz/download/bird-${version}.tar.gz";
-    hash = "sha256-ebvMd8Y+nht6EKSDichvT3WwU/097Ejjxsvg3xuoHrM=";
+    hash = "sha256-v9cY36WWgZs4AWiHgyElFLRnFjMprsm7zQ+j3uA+EOk=";
   };
 
   nativeBuildInputs = [

pkgs/os-specific/linux/kernel/kernels-org.json

@@ -1,7 +1,7 @@
 {
     "testing": {
-        "version": "6.15-rc4",
-        "hash": "sha256:0zg817b9bbpl80cjmxgmxivi6xr80hng704mdl6m5knrl0v4ay5j"
+        "version": "6.15-rc5",
+        "hash": "sha256:158bpvdbgaknywz4wh3k72qf85p5n3szk5h74cnpya8ic5z5qpmb"
     },
     "6.1": {
         "version": "6.1.136",