From d7f3dd319524c0c7ee6a1f60550c5941239c055c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 6 May 2025 01:58:51 +0200 Subject: [PATCH 1/9] linux_testing: 6.15-rc4 -> 6.15-rc5 (cherry picked from commit 1b482d9b094f89dfcb71e96383db7e6c0ec4df5f) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5edbe112a8f1..92970af95b55 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/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", From 7e6376f74c14c878dd4d8975003e42cd54d11f4a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 6 May 2025 09:52:26 +0200 Subject: [PATCH 2/9] amazon-q-cli: 1.8.0 -> 1.9.1 (cherry picked from commit 0ec3b2c9524c3fa599e3b1e2553e363e6db90bf1) --- pkgs/by-name/am/amazon-q-cli/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix index fb941a20c72e..6ca3ba1d0494 100644 --- a/pkgs/by-name/am/amazon-q-cli/package.nix +++ b/pkgs/by-name/am/amazon-q-cli/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { 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="; + hash = "sha256-BiVCiMBL5LLm8RYw58u6P7yqQq9XnN8b6fTbxNE2QsA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-H9bCke3vQDuS6RDEg8dzeFiBWCex64A8KSRhfgyp8e8="; + cargoHash = "sha256-7zUgWLGTZx3Ex7RYxb3eZimWdy6AxkNwpCDUwiAr2JE="; cargoBuildFlags = [ "-p" @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - mv $out/bin/q_cli $out/bin/amazon-q + install -m 0755 $out/bin/q_cli $out/bin/amazon-q ''; meta = { @@ -67,6 +67,7 @@ rustPlatform.buildRustPackage rec { mit asl20 ]; + mainProgram = "amazon-q"; maintainers = [ lib.maintainers.jamesward ]; platforms = lib.platforms.linux; }; From fbb709c183094ed2fcd0a0aac9ac078cb007d0c6 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 6 May 2025 10:20:41 +0200 Subject: [PATCH 3/9] amazon-q-cli: use `finalAttrs` pattern (cherry picked from commit 33bac1c2ccca63b568b307d968a87b4b5b2e4435) --- pkgs/by-name/am/amazon-q-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix index 6ca3ba1d0494..404cad014e9b 100644 --- a/pkgs/by-name/am/amazon-q-cli/package.nix +++ b/pkgs/by-name/am/amazon-q-cli/package.nix @@ -5,14 +5,14 @@ protobuf_26, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "amazon-q-cli"; version = "1.9.1"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-q-developer-cli"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BiVCiMBL5LLm8RYw58u6P7yqQq9XnN8b6fTbxNE2QsA="; }; @@ -71,4 +71,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.jamesward ]; platforms = lib.platforms.linux; }; -} +}) From 95a7aa68c4564ba09f946aa59380d3409c7e7a86 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 6 May 2025 10:43:49 +0200 Subject: [PATCH 4/9] amazon-q-cli: add `versionCheckHook` (cherry picked from commit 57c566abdc68181e66998dc667f1d10f861bddac) --- pkgs/by-name/am/amazon-q-cli/package.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix index 404cad014e9b..32bd757e68a3 100644 --- a/pkgs/by-name/am/amazon-q-cli/package.nix +++ b/pkgs/by-name/am/amazon-q-cli/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, rustPlatform, protobuf_26, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -24,6 +25,15 @@ rustPlatform.buildRustPackage (finalAttrs: { "-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 (finalAttrs: { "--skip=init_lint_zsh_pre_zshrc" ]; - nativeBuildInputs = [ - protobuf_26 - ]; - - postInstall = '' - install -m 0755 $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"; From 6ffbc805c4d33cce975b3dfcb544f865c67fc671 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 6 May 2025 14:07:32 -0400 Subject: [PATCH 5/9] librewolf: fix syntax error causing patches to not be applied Broken in e948371e72144f586c0a0bf5b484343f212a0169. (cherry picked from commit 9a35e88613124de6ec97337779ab16f9da0739de) --- pkgs/applications/networking/browsers/librewolf/librewolf.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index 7806f7e9f9a2..f6bb47b35959 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/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 From d41560f5afb3297912bb98fc152450dcff742c58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 11:37:17 +0000 Subject: [PATCH 6/9] build(deps): bump cachix/install-nix-action from 31.2.0 to 31.3.0 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.2.0 to 31.3.0. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md) - [Commits](https://github.com/cachix/install-nix-action/compare/754537aaedb35f72ab11a60cc162c49ef3016495...526118121621777ccd86f79b04685a9319637641) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-version: 31.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit f068c68b2e8fd8cdddf6c2fbe7068c12f032b5b6) --- .github/workflows/check-maintainers-sorted.yml | 2 +- .github/workflows/check-nix-format.yml | 2 +- .github/workflows/check-nixf-tidy.yml | 2 +- .github/workflows/check-shell.yml | 2 +- .github/workflows/codeowners-v2.yml | 4 ++-- .github/workflows/editorconfig-v2.yml | 2 +- .github/workflows/eval-lib-tests.yml | 2 +- .github/workflows/eval.yml | 10 +++++----- .github/workflows/keep-sorted.yml | 2 +- .github/workflows/manual-nixos-v2.yml | 2 +- .github/workflows/manual-nixpkgs-v2.yml | 2 +- .github/workflows/nix-parse-v2.yml | 2 +- .github/workflows/nixpkgs-vet.yml | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/check-maintainers-sorted.yml b/.github/workflows/check-maintainers-sorted.yml index dcc4806e9375..3b9b5ee7fba2 100644 --- a/.github/workflows/check-maintainers-sorted.yml +++ b/.github/workflows/check-maintainers-sorted.yml @@ -20,7 +20,7 @@ jobs: lib maintainers - - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 + - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 with: extra_nix_config: sandbox = true diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 910403e0bb00..8c35196e4944 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.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 diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml index 91a5d4c6c90f..1bb43c746bc5 100644 --- a/.github/workflows/check-nixf-tidy.yml +++ b/.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 }} diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml index 9c02e26be178..d148563c4311 100644 --- a/.github/workflows/check-shell.yml +++ b/.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 diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index 37e269c9c8bb..98c769236b22 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.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. diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml index 436b7c339e8c..c2428ce64e29 100644 --- a/.github/workflows/editorconfig-v2.yml +++ b/.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 diff --git a/.github/workflows/eval-lib-tests.yml b/.github/workflows/eval-lib-tests.yml index 84d9562c220d..722371ac19a2 100644 --- a/.github/workflows/eval-lib-tests.yml +++ b/.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 diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 15dfedb1fb55..1c823b519585 100644 --- a/.github/workflows/eval.yml +++ b/.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 diff --git a/.github/workflows/keep-sorted.yml b/.github/workflows/keep-sorted.yml index 8c7688ad42e3..ec2237f52bd9 100644 --- a/.github/workflows/keep-sorted.yml +++ b/.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 }} diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml index abe8ac3d2d4f..26fa03aba9b4 100644 --- a/.github/workflows/manual-nixos-v2.yml +++ b/.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 diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml index 88356e1d229f..a97bd0aac719 100644 --- a/.github/workflows/manual-nixpkgs-v2.yml +++ b/.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 diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml index f149dc481ca7..cc988e20bd6e 100644 --- a/.github/workflows/nix-parse-v2.yml +++ b/.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 diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index b46f926d8cad..80d6ba0b9aba 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.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 From 3d1d2f97f0e88f710a8ad666010f151d614bc4de Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 6 May 2025 20:54:06 +0200 Subject: [PATCH 7/9] workflows/check-maintainers-sorted: drop and replace with keep-sorted We already have a generic keep-sorted workflow, so we don't need to roll our own for the maintainers list. This will result in a slightly different order, because the nix script ignored "-" and "_", while keep-sorted sorts them first. But, the order is consistent and that's what matters. (cherry picked from commit 224de839f1473399e894f1d11fc2b98bb4a14a59) --- .../workflows/check-maintainers-sorted.yml | 28 ------ maintainers/maintainer-list.nix | 3 + .../scripts/check-maintainers-sorted.nix | 87 ------------------- 3 files changed, 3 insertions(+), 115 deletions(-) delete mode 100644 .github/workflows/check-maintainers-sorted.yml delete mode 100644 maintainers/scripts/check-maintainers-sorted.nix diff --git a/.github/workflows/check-maintainers-sorted.yml b/.github/workflows/check-maintainers-sorted.yml deleted file mode 100644 index 3b9b5ee7fba2..000000000000 --- a/.github/workflows/check-maintainers-sorted.yml +++ /dev/null @@ -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@526118121621777ccd86f79b04685a9319637641 # 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 diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f135d64e8d83..323529b8100b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -65,6 +65,8 @@ file located in the root of the Nixpkgs repo. */ { + # keep-sorted start case=no numeric=no block=yes + _0b11stan = { name = "Tristan Auvinet Pinaudeau"; email = "tristan@tic.sh"; @@ -24947,5 +24949,6 @@ githubId = 59917878; name = "Mathias Zhang"; }; + # keep-sorted end } # Keep the list alphabetically sorted. diff --git a/maintainers/scripts/check-maintainers-sorted.nix b/maintainers/scripts/check-maintainers-sorted.nix deleted file mode 100644 index 606a72c0aa9b..000000000000 --- a/maintainers/scripts/check-maintainers-sorted.nix +++ /dev/null @@ -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)) From c44c037cc30fdfce3f88e009d43457c2349b81cb Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 6 May 2025 20:54:18 +0200 Subject: [PATCH 8/9] maintainer-list: run keep-sorted (cherry picked from commit d74522fef072c0155ca7ccf270c6ba888c302b99) --- maintainers/maintainer-list.nix | 851 ++++++++++++++++---------------- 1 file changed, 424 insertions(+), 427 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 323529b8100b..4510f264a09d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -270,18 +270,18 @@ githubId = 92977828; name = "Mori Zen"; }; - _8aed = { - email = "8aed@riseup.net"; - github = "8aed"; - githubId = 140662578; - name = "Huit Aed"; - }; _8-bit-fox = { email = "sebastian@markwaerter.de"; github = "8-bit-fox"; githubId = 43320117; name = "Sebastian Marquardt"; }; + _8aed = { + email = "8aed@riseup.net"; + github = "8aed"; + githubId = 140662578; + name = "Huit Aed"; + }; _9999years = { email = "rbt@fastmail.com"; github = "9999years"; @@ -316,6 +316,18 @@ githubId = 119095935; name = "9yokuro"; }; + a-camarillo = { + name = "Anthony Camarillo"; + email = "anthony.camarillo.96@gmail.com"; + github = "a-camarillo"; + githubId = 58638902; + }; + a-kenji = { + email = "aks.kenji@protonmail.com"; + github = "a-kenji"; + githubId = 65275785; + name = "Alexander Kenji Berthold"; + }; A1ca7raz = { email = "aya@wtm.moe"; github = "A1ca7raz"; @@ -483,12 +495,6 @@ githubId = 1517066; name = "Aiken Cairncross"; }; - a-camarillo = { - name = "Anthony Camarillo"; - email = "anthony.camarillo.96@gmail.com"; - github = "a-camarillo"; - githubId = 58638902; - }; acesyde = { name = "Pierre-Emmanuel Mercier"; email = "acesyde@gmail.com"; @@ -841,12 +847,6 @@ githubId = 14914796; name = "Samy Lahfa"; }; - a-kenji = { - email = "aks.kenji@protonmail.com"; - github = "a-kenji"; - githubId = 65275785; - name = "Alexander Kenji Berthold"; - }; akgrant43 = { name = "Alistair Grant"; email = "akg1012@fastmail.com.au"; @@ -992,6 +992,18 @@ githubId = 117545308; name = "Alex"; }; + alex-fu27 = { + email = "alex.fu27@gmail.com"; + github = "alex-fu27"; + githubId = 49982580; + name = "Alexander Fuchs"; + }; + alex-nt = { + email = "nix@azuremyst.org"; + github = "alex-nt"; + githubId = 12470950; + name = "AN"; + }; ALEX11BR = { email = "alexioanpopa11@gmail.com"; github = "ALEX11BR"; @@ -1034,24 +1046,12 @@ githubId = 2335822; name = "Alexandre Esteves"; }; - alex-fu27 = { - email = "alex.fu27@gmail.com"; - github = "alex-fu27"; - githubId = 49982580; - name = "Alexander Fuchs"; - }; alexnortung = { name = "alexnortung"; email = "alex_nortung@live.dk"; github = "Alexnortung"; githubId = 1552267; }; - alex-nt = { - email = "nix@azuremyst.org"; - github = "alex-nt"; - githubId = 12470950; - name = "AN"; - }; alexoundos = { email = "alexoundos@gmail.com"; github = "AleXoundOS"; @@ -1327,6 +1327,12 @@ githubId = 18249234; name = "Christopher Crouse"; }; + an-empty-string = { + name = "Tris Emmy Wilson"; + email = "tris@tris.fyi"; + github = "an-empty-string"; + githubId = 681716; + }; anas = { email = "anas.elgarhy.dev@gmail.com"; github = "0x61nas"; @@ -1461,12 +1467,6 @@ githubId = 2085567; name = "Aneesh Agrawal"; }; - an-empty-string = { - name = "Tris Emmy Wilson"; - email = "tris@tris.fyi"; - github = "an-empty-string"; - githubId = 681716; - }; angaz = { name = "Angus Dippenaar"; github = "angaz"; @@ -2330,6 +2330,12 @@ githubId = 9315; name = "Zhong Jianxin"; }; + b-rodrigues = { + email = "bruno@brodrigues.co"; + github = "b-rodrigues"; + githubId = 2998834; + name = "Bruno Rodrigues"; + }; b4dm4n = { email = "fabianm88@gmail.com"; github = "B4dM4n"; @@ -2887,12 +2893,6 @@ githubId = 185443; name = "Alexey Lebedeff"; }; - binarycat = { - email = "binarycat@envs.net"; - github = "lolbinarycat"; - githubId = 19915050; - name = "binarycat"; - }; binary-eater = { email = "sergeantsagara@protonmail.com"; github = "Binary-Eater"; @@ -2900,6 +2900,12 @@ name = "Rahul Rameshbabu"; keys = [ { fingerprint = "678A 8DF1 D9F2 B51B 7110 BE53 FF24 7B3E 5411 387B"; } ]; }; + binarycat = { + email = "binarycat@envs.net"; + github = "lolbinarycat"; + githubId = 19915050; + name = "binarycat"; + }; binsky = { email = "timo@binsky.org"; github = "binsky08"; @@ -3254,12 +3260,6 @@ name = "Billy Rhoades"; keys = [ { fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E"; } ]; }; - b-rodrigues = { - email = "bruno@brodrigues.co"; - github = "b-rodrigues"; - githubId = 2998834; - name = "Bruno Rodrigues"; - }; broke = { email = "broke@in-fucking.space"; github = "broke"; @@ -3386,6 +3386,12 @@ githubId = 2647566; name = "Bruno Bzeznik"; }; + c-h-johnson = { + name = "Charles Johnson"; + email = "charles@charlesjohnson.name"; + github = "c-h-johnson"; + githubId = 138403247; + }; c00w = { email = "nix@daedrum.net"; github = "c00w"; @@ -3929,12 +3935,6 @@ githubId = 14790226; name = "Hubert Jasudowicz"; }; - c-h-johnson = { - name = "Charles Johnson"; - email = "charles@charlesjohnson.name"; - github = "c-h-johnson"; - githubId = 138403247; - }; chkno = { email = "scottworley@scottworley.com"; github = "chkno"; @@ -3985,18 +3985,18 @@ githubId = 538538; name = "Bryan Richter"; }; - chrisjefferson = { - email = "chris@bubblescope.net"; - github = "ChrisJefferson"; - githubId = 811527; - name = "Christopher Jefferson"; - }; chris-martin = { email = "ch.martin@gmail.com"; github = "chris-martin"; githubId = 399718; name = "Chris Martin"; }; + chrisjefferson = { + email = "chris@bubblescope.net"; + github = "ChrisJefferson"; + githubId = 811527; + name = "Christopher Jefferson"; + }; chrispattison = { email = "chpattison@gmail.com"; github = "ChrisPattison"; @@ -4021,6 +4021,13 @@ githubId = 1103294; name = "Christopher Rosset"; }; + christoph-heiss = { + email = "christoph@c8h4.io"; + github = "christoph-heiss"; + githubId = 7571069; + name = "Christoph Heiss"; + keys = [ { fingerprint = "9C56 1D64 30B2 8D6B DCBC 9CEB 73D5 E7FD EE3D E49A"; } ]; + }; christophcharles = { github = "christophcharles"; githubId = 23055925; @@ -4032,13 +4039,6 @@ githubId = 2245737; name = "Christopher Mark Poole"; }; - christoph-heiss = { - email = "christoph@c8h4.io"; - github = "christoph-heiss"; - githubId = 7571069; - name = "Christoph Heiss"; - keys = [ { fingerprint = "9C56 1D64 30B2 8D6B DCBC 9CEB 73D5 E7FD EE3D E49A"; } ]; - }; chrpinedo = { github = "chrpinedo"; githubId = 2324630; @@ -4765,6 +4765,24 @@ githubId = 217899; name = "Cyryl Płotnicki"; }; + d-brasher = { + github = "d-brasher"; + githubId = 175485311; + name = "D. Brasher"; + }; + d-goldin = { + email = "dgoldin+github@protonmail.ch"; + github = "d-goldin"; + githubId = 43349662; + name = "Dima"; + keys = [ { fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; } ]; + }; + d-xo = { + email = "hi@d-xo.org"; + github = "d-xo"; + githubId = 6689924; + name = "David Terry"; + }; d3vil0p3r = { name = "Antonio Voza"; email = "vozaanthony@gmail.com"; @@ -4821,6 +4839,13 @@ githubId = 217543; name = "Damien Cassou"; }; + dan-theriault = { + email = "nix@theriault.codes"; + github = "Dan-Theriault"; + githubId = 13945563; + matrix = "@dan:matrix.org"; + name = "Daniel Theriault"; + }; dan4ik605743 = { email = "6057430gu@gmail.com"; github = "dan4ik605743"; @@ -4871,6 +4896,12 @@ githubId = 124387056; name = "DaniD3v"; }; + daniel-fahey = { + name = "Daniel Fahey"; + email = "daniel.fahey+nixpkgs@pm.me"; + github = "daniel-fahey"; + githubId = 7294692; + }; danielalvsaaker = { email = "daniel.alvsaaker@proton.me"; github = "danielalvsaaker"; @@ -4895,12 +4926,6 @@ githubId = 49398; name = "Daniël de Kok"; }; - daniel-fahey = { - name = "Daniel Fahey"; - email = "daniel.fahey+nixpkgs@pm.me"; - github = "daniel-fahey"; - githubId = 7294692; - }; danielfullmer = { email = "danielrf12@gmail.com"; github = "danielfullmer"; @@ -4945,13 +4970,6 @@ githubId = 28959268; keys = [ { fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; } ]; }; - dan-theriault = { - email = "nix@theriault.codes"; - github = "Dan-Theriault"; - githubId = 13945563; - matrix = "@dan:matrix.org"; - name = "Daniel Theriault"; - }; dariof4 = { name = "dariof4"; email = "dazedtank@gmail.com"; @@ -4977,13 +4995,6 @@ githubId = 97746; name = "Raphael Das Gupta"; }; - dasisdormax = { - email = "dasisdormax@mailbox.org"; - github = "dasisdormax"; - githubId = 3714905; - keys = [ { fingerprint = "E59B A198 61B0 A9ED C1FA 3FB2 02BA 0D44 80CA 6C44"; } ]; - name = "Maximilian Wende"; - }; das_j = { email = "janne@hess.ooo"; matrix = "@janne.hess:helsinki-systems.de"; @@ -4991,6 +5002,13 @@ githubId = 4971975; name = "Janne Heß"; }; + dasisdormax = { + email = "dasisdormax@mailbox.org"; + github = "dasisdormax"; + githubId = 3714905; + keys = [ { fingerprint = "E59B A198 61B0 A9ED C1FA 3FB2 02BA 0D44 80CA 6C44"; } ]; + name = "Maximilian Wende"; + }; dasj19 = { email = "daniel@serbanescu.dk"; github = "dasj19"; @@ -5018,6 +5036,12 @@ { fingerprint = "FFC4 92C1 5320 B05D 0F8D 7D58 ABF6 737C 6339 6D35"; } ]; }; + dav-wolff = { + email = "dav-wolff@outlook.com"; + github = "dav-wolff"; + githubId = 130931508; + name = "David Wolff"; + }; davegallant = { name = "Dave Gallant"; email = "davegallant@gmail.com"; @@ -5030,6 +5054,31 @@ github = "DavHau"; githubId = 42246742; }; + david-hamelin = { + email = "david.hamelin@outlook.fr"; + github = "HamelinDavid"; + githubId = 118536343; + name = "David Hamelin"; + }; + David-Kopczynski = { + name = "David Elias Chris Kopczynski"; + email = "mail@davidkopczynski.com"; + github = "David-Kopczynski"; + githubId = 53194670; + }; + david-r-cox = { + email = "david@integrated-reasoning.com"; + github = "david-r-cox"; + githubId = 4259949; + name = "David Cox"; + keys = [ { fingerprint = "0056 A3F6 9918 1E0D 8FF0 BCDE 65BB 07FA A4D9 4634"; } ]; + }; + david-sawatzke = { + email = "d-nix@sawatzke.dev"; + github = "david-sawatzke"; + githubId = 11035569; + name = "David Sawatzke"; + }; david50407 = { email = "me@davy.tw"; github = "david50407"; @@ -5055,37 +5104,12 @@ githubId = 10701143; name = "David Crompton"; }; - david-hamelin = { - email = "david.hamelin@outlook.fr"; - github = "HamelinDavid"; - githubId = 118536343; - name = "David Hamelin"; - }; - David-Kopczynski = { - name = "David Elias Chris Kopczynski"; - email = "mail@davidkopczynski.com"; - github = "David-Kopczynski"; - githubId = 53194670; - }; - david-r-cox = { - email = "david@integrated-reasoning.com"; - github = "david-r-cox"; - githubId = 4259949; - name = "David Cox"; - keys = [ { fingerprint = "0056 A3F6 9918 1E0D 8FF0 BCDE 65BB 07FA A4D9 4634"; } ]; - }; davidrusu = { email = "davidrusu.me@gmail.com"; github = "davidrusu"; githubId = 1832378; name = "David Rusu"; }; - david-sawatzke = { - email = "d-nix@sawatzke.dev"; - github = "david-sawatzke"; - githubId = 11035569; - name = "David Sawatzke"; - }; davidtwco = { email = "david@davidtw.co"; github = "davidtwco"; @@ -5111,12 +5135,6 @@ githubId = 11422515; name = "David Sánchez"; }; - dav-wolff = { - email = "dav-wolff@outlook.com"; - github = "dav-wolff"; - githubId = 130931508; - name = "David Wolff"; - }; dawidd6 = { email = "dawidd0811@gmail.com"; github = "dawidd6"; @@ -5172,11 +5190,6 @@ githubId = 3179832; name = "D. Bohdan"; }; - d-brasher = { - github = "d-brasher"; - githubId = 175485311; - name = "D. Brasher"; - }; dbrgn = { email = "nix@dbrgn.ch"; github = "dbrgn"; @@ -5535,13 +5548,6 @@ githubId = 33262214; name = "Dawid Gliwka"; }; - d-goldin = { - email = "dgoldin+github@protonmail.ch"; - github = "d-goldin"; - githubId = 43349662; - name = "Dima"; - keys = [ { fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; } ]; - }; dgollings = { email = "daniel.gollings+nixpkgs@gmail.com"; github = "dgollings"; @@ -6108,12 +6114,6 @@ githubId = 6884440; name = "Ding Xiang Fei"; }; - d-xo = { - email = "hi@d-xo.org"; - github = "d-xo"; - githubId = 6689924; - name = "David Terry"; - }; dxwil = { email = "dovydas@kersys.lt"; github = "dxwil"; @@ -7051,6 +7051,12 @@ github = "hatch01"; githubId = 42416805; }; + f--t = { + email = "git@f-t.me"; + github = "f--t"; + githubId = 2817965; + name = "f--t"; + }; f2k1de = { name = "f2k1de"; email = "hi@f2k1.de"; @@ -7637,6 +7643,12 @@ githubId = 1010248; name = "Frank Lanitz"; }; + fro_ozen = { + email = "fro_ozen@gmx.de"; + github = "froozen"; + githubId = 1943632; + name = "fro_ozen"; + }; frogamic = { email = "frogamic@protonmail.com"; github = "frogamic"; @@ -7659,12 +7671,6 @@ githubId = 868283; name = "Fatih Altinok"; }; - fro_ozen = { - email = "fro_ozen@gmx.de"; - github = "froozen"; - githubId = 1943632; - name = "fro_ozen"; - }; Frostman = { email = "me@slukjanov.name"; github = "Frostman"; @@ -7697,12 +7703,6 @@ githubId = 2881922; name = "Francis St-Amour"; }; - f--t = { - email = "git@f-t.me"; - github = "f--t"; - githubId = 2817965; - name = "f--t"; - }; ftrvxmtrx = { email = "ftrvxmtrx@gmail.com"; github = "ftrvxmtrx"; @@ -7835,6 +7835,12 @@ githubId = 33058747; name = "Gaetan Lepage"; }; + gal_bolle = { + email = "florent.becker@ens-lyon.org"; + github = "FlorentBecker"; + githubId = 7047019; + name = "Florent Becker"; + }; galagora = { email = "lightningstrikeiv@gmail.com"; github = "Galagora"; @@ -7849,12 +7855,6 @@ githubId = 148551648; keys = [ { fingerprint = "48CA 3873 9E9F CA8E 76A0 835A E3DE CF85 4212 E1EA"; } ]; }; - gal_bolle = { - email = "florent.becker@ens-lyon.org"; - github = "FlorentBecker"; - githubId = 7047019; - name = "Florent Becker"; - }; galen = { github = "galenhuntington"; githubId = 1851962; @@ -8658,18 +8658,18 @@ name = "Rohit Goswami"; keys = [ { fingerprint = "74B1 F67D 8E43 A94A 7554 0768 9CCC E364 02CB 49A6"; } ]; }; - happyalu = { - email = "alok@parlikar.com"; - github = "happyalu"; - githubId = 231523; - name = "Alok Parlikar"; - }; happy-river = { email = "happyriver93@runbox.com"; github = "happy-river"; githubId = 54728477; name = "Happy River"; }; + happyalu = { + email = "alok@parlikar.com"; + github = "happyalu"; + githubId = 231523; + name = "Alok Parlikar"; + }; happysalada = { email = "raphael@megzari.com"; matrix = "@happysalada:matrix.org"; @@ -8974,7 +8974,6 @@ github = "higebu"; githubId = 733288; }; - hikari = { email = "HikariNee@protonmail.com"; github = "HikariNee"; @@ -8987,7 +8986,6 @@ githubId = 19825977; name = "Hiren Shah"; }; - hiro98 = { email = "hiro@protagon.space"; github = "vale981"; @@ -9279,6 +9277,11 @@ githubId = 140937; name = "Henner Zeller"; }; + i-al-istannen = { + name = "I Al Istannen"; + github = "I-Al-Istannen"; + githubId = 20284688; + }; i077 = { email = "nixpkgs@imranhossa.in"; github = "i077"; @@ -9291,11 +9294,6 @@ name = "Iago Manoel Brito"; keys = [ { fingerprint = "DF90 9D58 BEE4 E73A 1B8C 5AF3 35D3 9F9A 9A1B C8DA"; } ]; }; - i-al-istannen = { - name = "I Al Istannen"; - github = "I-Al-Istannen"; - githubId = 20284688; - }; iammrinal0 = { email = "nixpkgs@mrinalpurohit.in"; matrix = "@iammrinal0:nixos.dev"; @@ -9340,11 +9338,6 @@ github = "icewind1991"; githubId = 1283854; }; - icyrockcom = { - github = "icyrockcom"; - githubId = 785140; - name = "icyrock"; - }; icy-thought = { name = "Icy-Thought"; email = "gilganyx@pm.me"; @@ -9352,6 +9345,11 @@ github = "Icy-Thought"; githubId = 53710398; }; + icyrockcom = { + github = "icyrockcom"; + githubId = 785140; + name = "icyrock"; + }; id3v1669 = { name = "id3v1669"; email = "id3v1669@gmail.com"; @@ -9370,18 +9368,18 @@ githubId = 1550265; name = "Dominic Steinitz"; }; - ifd3f = { - github = "ifd3f"; - githubId = 7308591; - email = "astrid@astrid.tech"; - name = "ifd3f"; - }; if-loop69420 = { github = "if-loop69420"; githubId = 81078181; email = "j.sztavi@pm.me"; name = "Jeremy Sztavinovszki"; }; + ifd3f = { + github = "ifd3f"; + githubId = 7308591; + email = "astrid@astrid.tech"; + name = "ifd3f"; + }; iFreilicht = { github = "iFreilicht"; githubId = 9742635; @@ -9727,24 +9725,42 @@ github = "ius"; githubId = 529626; }; + iv-nn = { + name = "iv-nn"; + github = "iv-nn"; + githubId = 49885246; + keys = [ { fingerprint = "6358 EF87 86E0 EF2F 1628 103F BAB5 F165 1C71 C9C3"; } ]; + }; ivan = { email = "ivan@ludios.org"; github = "ivan"; githubId = 4458; name = "Ivan Kozik"; }; - ivan770 = { - email = "ivan@ivan770.me"; - github = "ivan770"; - githubId = 14003886; - name = "Ivan Leshchenko"; - }; ivan-babrou = { email = "nixpkgs@ivan.computer"; name = "Ivan Babrou"; github = "bobrik"; githubId = 89186; }; + ivan-timokhin = { + email = "nixpkgs@ivan.timokhin.name"; + name = "Ivan Timokhin"; + github = "ivan-timokhin"; + githubId = 9802104; + }; + ivan-tkatchev = { + email = "tkatchev@gmail.com"; + github = "ivan-tkatchev"; + githubId = 650601; + name = "Ivan Tkatchev"; + }; + ivan770 = { + email = "ivan@ivan770.me"; + github = "ivan770"; + githubId = 14003886; + name = "Ivan Leshchenko"; + }; ivanbrennan = { email = "ivan.brennan@gmail.com"; github = "ivanbrennan"; @@ -9764,30 +9780,12 @@ githubId = 10843250; name = "ivan@ivmoreau.com"; }; - ivan-timokhin = { - email = "nixpkgs@ivan.timokhin.name"; - name = "Ivan Timokhin"; - github = "ivan-timokhin"; - githubId = 9802104; - }; - ivan-tkatchev = { - email = "tkatchev@gmail.com"; - github = "ivan-tkatchev"; - githubId = 650601; - name = "Ivan Tkatchev"; - }; ivarmedi = { email = "ivar@larsson.me"; github = "ivarmedi"; githubId = 1318743; name = "Ivar"; }; - iv-nn = { - name = "iv-nn"; - github = "iv-nn"; - githubId = 49885246; - keys = [ { fingerprint = "6358 EF87 86E0 EF2F 1628 103F BAB5 F165 1C71 C9C3"; } ]; - }; ivyfanchiang = { email = "dev@ivyfanchiang.ca"; github = "hexadecimalDinosaur"; @@ -9824,6 +9822,24 @@ githubId = 26877687; name = "Yurii Izorkin"; }; + j-brn = { + email = "me@bricker.io"; + github = "j-brn"; + githubId = 40566146; + name = "Jonas Braun"; + }; + j-hui = { + email = "j-hui@cs.columbia.edu"; + github = "j-hui"; + githubId = 11800204; + name = "John Hui"; + }; + j-keck = { + email = "jhyphenkeck@gmail.com"; + github = "j-keck"; + githubId = 3081095; + name = "Jürgen Keck"; + }; j03 = { email = "github@johannesloetzsch.de"; github = "johannesloetzsch"; @@ -10127,12 +10143,6 @@ matrix = "@jboy:utwente.io"; name = "John Boy"; }; - j-brn = { - email = "me@bricker.io"; - github = "j-brn"; - githubId = 40566146; - name = "Jonas Braun"; - }; jc = { name = "Josh Cooper"; email = "josh@cooper.is"; @@ -10450,12 +10460,6 @@ githubId = 2881268; name = "John Hollowell"; }; - j-hui = { - email = "j-hui@cs.columbia.edu"; - github = "j-hui"; - githubId = 11800204; - name = "John Hui"; - }; jiegec = { name = "Jiajie Chen"; email = "c@jia.je"; @@ -10504,12 +10508,6 @@ githubId = 1204734; name = "Emil Karlson"; }; - j-keck = { - email = "jhyphenkeck@gmail.com"; - github = "j-keck"; - githubId = 3081095; - name = "Jürgen Keck"; - }; jl178 = { email = "jeredlittle1996@gmail.com"; github = "jl178"; @@ -10739,6 +10737,18 @@ githubId = 117805; name = "Johannes Bornhold"; }; + john-rodewald = { + email = "jnrodewald99@gmail.com"; + github = "john-rodewald"; + githubId = 51028009; + name = "John Rodewald"; + }; + john-shaffer = { + email = "jdsha@proton.me"; + github = "john-shaffer"; + githubId = 53870456; + name = "John Shaffer"; + }; johnazoidberg = { email = "git@danielschaefer.me"; github = "JohnAZoidberg"; @@ -10781,24 +10791,12 @@ githubId = 6321578; name = "John Rinehart"; }; - john-rodewald = { - email = "jnrodewald99@gmail.com"; - github = "john-rodewald"; - githubId = 51028009; - name = "John Rodewald"; - }; johnrtitor = { email = "masumrezarock100@gmail.com"; github = "johnrtitor"; githubId = 50095635; name = "Masum Reza"; }; - john-shaffer = { - email = "jdsha@proton.me"; - github = "john-shaffer"; - githubId = 53870456; - name = "John Shaffer"; - }; johntitor = { email = "huyuumi.dev@gmail.com"; github = "JohnTitor"; @@ -11350,17 +11348,17 @@ githubId = 44864956; keys = [ { fingerprint = "3F87 0A7C A7B4 3731 2F13 6083 749F D4DF A2E9 4236"; } ]; }; + kai-tub = { + name = "Kai Norman Clasen"; + github = "kai-tub"; + githubId = 46302524; + }; kaiha = { email = "kai.harries@gmail.com"; github = "KaiHa"; githubId = 6544084; name = "Kai Harries"; }; - kai-tub = { - name = "Kai Norman Clasen"; - github = "kai-tub"; - githubId = 46302524; - }; kalbasit = { email = "wael.nasreddine@gmail.com"; matrix = "@kalbasit:matrix.org"; @@ -11836,7 +11834,6 @@ github = "Kmeakin"; githubId = 19665139; }; - kmein = { email = "kmein@posteo.de"; name = "Kierán Meinhardt"; @@ -12024,18 +12021,18 @@ githubId = 4032; name = "Kristoffer Thømt Ravneberg"; }; - kristianan = { - email = "kristian@krined.no"; - github = "KristianAN"; - githubId = 80984519; - name = "Kristian Alvestad Nedevold-Hansen"; - }; kristian-brucaj = { email = "kbrucaj@gmail.com"; github = "Flameslice"; githubId = 8893110; name = "Kristian Brucaj"; }; + kristianan = { + email = "kristian@krined.no"; + github = "KristianAN"; + githubId = 80984519; + name = "Kristian Alvestad Nedevold-Hansen"; + }; kristoff3r = { email = "k.soeholm@gmail.com"; github = "kristoff3r"; @@ -12212,6 +12209,14 @@ keys = [ { fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372"; } ]; }; + l-as = { + email = "las@protonmail.ch"; + matrix = "@Las:matrix.org"; + github = "L-as"; + githubId = 22075344; + keys = [ { fingerprint = "A093 EA17 F450 D4D1 60A0 1194 AC45 8A7D 1087 D025"; } ]; + name = "Las Safin"; + }; l0b0 = { email = "victor@engmark.name"; github = "l0b0"; @@ -12299,14 +12304,6 @@ githubId = 182024; name = "Lars Rasmusson"; }; - l-as = { - email = "las@protonmail.ch"; - matrix = "@Las:matrix.org"; - github = "L-as"; - githubId = 22075344; - keys = [ { fingerprint = "A093 EA17 F450 D4D1 60A0 1194 AC45 8A7D 1087 D025"; } ]; - name = "Las Safin"; - }; lasandell = { email = "lasandell@gmail.com"; github = "lasandell"; @@ -12861,6 +12858,12 @@ githubId = 5624721; name = "Ben Wolsieffer"; }; + lord-valen = { + name = "Lord Valen"; + matrix = "@lord-valen:matrix.org"; + github = "Lord-Valen"; + githubId = 46138807; + }; lordmzte = { name = "Moritz Thomae"; email = "lord@mzte.de"; @@ -12869,12 +12872,6 @@ githubId = 28735087; keys = [ { fingerprint = "AB47 3D70 53D2 74CA DC2C 230C B648 02DC 33A6 4FF6"; } ]; }; - lord-valen = { - name = "Lord Valen"; - matrix = "@lord-valen:matrix.org"; - github = "Lord-Valen"; - githubId = 46138807; - }; lorenz = { name = "Lorenz Brun"; email = "lorenz@brun.one"; @@ -12906,17 +12903,17 @@ githubId = 1422781; name = "Will Young"; }; + louis-thevenet = { + name = "Louis Thevenet"; + github = "louis-thevenet"; + githubId = 55986107; + }; louisdk1 = { email = "louis@louis.dk"; github = "LouisDK1"; githubId = 4969294; name = "Louis Tim Larsen"; }; - louis-thevenet = { - name = "Louis Thevenet"; - github = "louis-thevenet"; - githubId = 55986107; - }; lovek323 = { email = "jason@oconal.id.au"; github = "lovek323"; @@ -13014,12 +13011,6 @@ githubId = 35580196; name = "Luca Guerra"; }; - lucasbergman = { - email = "lucas@bergmans.us"; - github = "lucasbergman"; - githubId = 3717454; - name = "Lucas Bergman"; - }; lucas-deangelis = { email = "deangelis.lucas@outlook.com"; github = "lucas-deangelis"; @@ -13027,6 +13018,12 @@ name = "Lucas De Angelis"; keys = [ { fingerprint = "3C8B D3AD 93BB 1F36 B8FF 30BD 8627 E5ED F74B 5BF4"; } ]; }; + lucasbergman = { + email = "lucas@bergmans.us"; + github = "lucasbergman"; + githubId = 3717454; + name = "Lucas Bergman"; + }; lucasew = { email = "lucas59356@gmail.com"; github = "lucasew"; @@ -13348,6 +13345,11 @@ githubId = 5741741; keys = [ { fingerprint = "71EF 8F1F 0C24 8B4D 5CDC 1B47 74B3 D790 77EE 37A8"; } ]; }; + mac-chaffee = { + name = "Mac Chaffee"; + github = "mac-chaffee"; + githubId = 7581860; + }; macalinao = { email = "me@ianm.com"; name = "Ian Macalinao"; @@ -13355,11 +13357,6 @@ githubId = 401263; keys = [ { fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; } ]; }; - mac-chaffee = { - name = "Mac Chaffee"; - github = "mac-chaffee"; - githubId = 7581860; - }; madjar = { email = "georges.dubus@compiletoi.net"; github = "madjar"; @@ -13492,6 +13489,12 @@ githubId = 1780588; name = "Malte Poll"; }; + malte-v = { + email = "nixpkgs@mal.tc"; + github = "malte-v"; + githubId = 34393802; + name = "Malte Voos"; + }; maltejanz = { email = "service.malte.j@protonmail.com"; github = "MalteJanz"; @@ -13503,12 +13506,6 @@ githubId = 5301202; name = "Malte Neuss"; }; - malte-v = { - email = "nixpkgs@mal.tc"; - github = "malte-v"; - githubId = 34393802; - name = "Malte Voos"; - }; malyn = { email = "malyn@strangeGizmo.com"; github = "malyn"; @@ -13801,6 +13798,12 @@ github = "matrss"; githubId = 9308656; }; + matt-snider = { + email = "matt.snider@protonmail.com"; + github = "matt-snider"; + githubId = 11810057; + name = "Matt Snider"; + }; mattchrist = { email = "nixpkgs-matt@christ.systems"; github = "mattchrist"; @@ -13813,6 +13816,12 @@ githubId = 3139724; name = "Matteo Pacini"; }; + matthew-levan = { + email = "matthew@coeli.network"; + github = "matthew-levan"; + githubId = 91502660; + name = "Matthew LeVan"; + }; matthewbauer = { email = "mjbauer95@gmail.com"; github = "matthewbauer"; @@ -13825,12 +13834,6 @@ githubId = 26458780; name = "Matthew Croughan"; }; - matthew-levan = { - email = "matthew@coeli.network"; - github = "matthew-levan"; - githubId = 91502660; - name = "Matthew LeVan"; - }; matthewpi = { email = "me+nix@matthewp.io"; github = "matthewpi"; @@ -13888,12 +13891,6 @@ githubId = 2075353; name = "Matt Polzin"; }; - matt-snider = { - email = "matt.snider@protonmail.com"; - github = "matt-snider"; - githubId = 11810057; - name = "Matt Snider"; - }; MattSturgeon = { email = "matt@sturgeon.me.uk"; github = "MattSturgeon"; @@ -13940,6 +13937,13 @@ githubId = 137820334; name = "Max Ambaum"; }; + max-niederman = { + email = "max@maxniederman.com"; + github = "max-niederman"; + githubId = 19580458; + name = "Max Niederman"; + keys = [ { fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; } ]; + }; maxbrunet = { email = "max@brnt.mx"; github = "maxbrunet"; @@ -13977,13 +13981,6 @@ githubId = 1472826; name = "Max Smolin"; }; - max-niederman = { - email = "max@maxniederman.com"; - github = "max-niederman"; - githubId = 19580458; - name = "Max Niederman"; - keys = [ { fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; } ]; - }; maxstrid = { email = "mxwhenderson@gmail.com"; github = "maxstrid"; @@ -14152,6 +14149,12 @@ githubId = 241257; name = "Matt Russell"; }; + me-and = { + name = "Adam Dinwoodie"; + email = "nix.thunder.wayne@post.dinwoodie.org"; + github = "me-and"; + githubId = 1397507; + }; meain = { email = "mail@meain.io"; matrix = "@meain:matrix.org"; @@ -14159,12 +14162,6 @@ githubId = 14259816; name = "Abin Simon"; }; - me-and = { - name = "Adam Dinwoodie"; - email = "nix.thunder.wayne@post.dinwoodie.org"; - github = "me-and"; - githubId = 1397507; - }; meatcar = { email = "nixpkgs@denys.me"; github = "meatcar"; @@ -15351,6 +15348,13 @@ githubId = 16916972; name = "Martin Zacho"; }; + n-hass = { + email = "nick@hassan.host"; + github = "n-hass"; + githubId = 72363381; + name = "n-hass"; + keys = [ { fingerprint = "FDEE 6116 DBA7 8840 7323 4466 A371 5973 2728 A6A6"; } ]; + }; n00b0ss = { email = "nixpkgs@n00b0ss.de"; github = "n00b0ss"; @@ -15661,6 +15665,12 @@ github = "nessdoor"; githubId = 25993494; }; + net-mist = { + email = "archimist.linux@gmail.com"; + github = "Net-Mist"; + githubId = 13920346; + name = "Sébastien Iooss"; + }; netali = { name = "Jennifer Graul"; email = "me@netali.de"; @@ -15688,12 +15698,6 @@ githubId = 1488603; name = "François Espinet"; }; - net-mist = { - email = "archimist.linux@gmail.com"; - github = "Net-Mist"; - githubId = 13920346; - name = "Sébastien Iooss"; - }; netthier = { email = "netthier@proton.me"; name = "nett_hier"; @@ -15745,13 +15749,6 @@ githubId = 399535; name = "Niklas Hambüchen"; }; - n-hass = { - email = "nick@hassan.host"; - github = "n-hass"; - githubId = 72363381; - name = "n-hass"; - keys = [ { fingerprint = "FDEE 6116 DBA7 8840 7323 4466 A371 5973 2728 A6A6"; } ]; - }; nhnn = { matrix = "@nhnn:nhnn.dev"; github = "thenhnn"; @@ -15954,6 +15951,11 @@ github = "nitsky"; githubId = 492793; }; + nix-julia = { + name = "nix-julia"; + github = "nix-julia"; + githubId = 149073815; + }; nixbitcoin = { email = "nixbitcoin@i2pmail.org"; github = "nixbitcoin"; @@ -15968,11 +15970,6 @@ githubId = 66913205; name = "Rick Sanchez"; }; - nix-julia = { - name = "nix-julia"; - github = "nix-julia"; - githubId = 149073815; - }; nixy = { email = "nixy@nixy.moe"; github = "nixy"; @@ -16094,6 +16091,13 @@ github = "nosewings"; githubId = 24929858; }; + not-my-segfault = { + email = "michal@tar.black"; + matrix = "@michal:tar.black"; + github = "not-my-segfault"; + githubId = 30374463; + name = "Michal S."; + }; NotAShelf = { name = "NotAShelf"; email = "raf@notashelf.dev"; @@ -16108,13 +16112,6 @@ githubId = 1254858; keys = [ { fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; } ]; }; - not-my-segfault = { - email = "michal@tar.black"; - matrix = "@michal:tar.black"; - github = "not-my-segfault"; - githubId = 30374463; - name = "Michal S."; - }; notthebee = { email = "moe@notthebe.ee"; github = "notthebee"; @@ -16758,6 +16755,19 @@ githubId = 8976745; name = "Ossian Mapes"; }; + p-h = { + email = "p@hurlimann.org"; + github = "p-h"; + githubId = 645664; + name = "Philippe Hürlimann"; + }; + p-rintz = { + email = "nix@rintz.net"; + github = "p-rintz"; + githubId = 13933258; + name = "Philipp Rintz"; + matrix = "@philipp:srv.icu"; + }; p3psi = { name = "Elliot Boo"; email = "p3psi.boo@gmail.com"; @@ -17226,12 +17236,6 @@ githubId = 3438604; name = "Petter Storvik"; }; - p-h = { - email = "p@hurlimann.org"; - github = "p-h"; - githubId = 645664; - name = "Philippe Hürlimann"; - }; phaer = { name = "Paul Haerle"; email = "nix@phaer.org"; @@ -17859,13 +17863,6 @@ githubId = 2730968; keys = [ { fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; } ]; }; - p-rintz = { - email = "nix@rintz.net"; - github = "p-rintz"; - githubId = 13933258; - name = "Philipp Rintz"; - matrix = "@philipp:srv.icu"; - }; prit342 = { email = "prithak342@gmail.com"; github = "prit342"; @@ -18212,18 +18209,18 @@ name = "Quentin Smith"; keys = [ { fingerprint = "1C71 A066 5400 AACD 142E B1A0 04EE 05A8 FCEF B697"; } ]; }; - quentini = { - email = "quentini@airmail.cc"; - github = "QuentinI"; - githubId = 18196237; - name = "Quentin Inkling"; - }; quentin-m = { email = "me+nix@quentin-machu.fr"; github = "Quentin-M"; githubId = 1332289; name = "Quentin Machu"; }; + quentini = { + email = "quentini@airmail.cc"; + github = "QuentinI"; + githubId = 18196237; + name = "Quentin Inkling"; + }; quincepie = { email = "flaky@quincepie.dev"; github = "Quince-Pie"; @@ -18275,6 +18272,12 @@ matrix = "@qyriad:katesiria.org"; name = "Qyriad"; }; + r-burns = { + email = "rtburns@protonmail.com"; + github = "r-burns"; + githubId = 52847440; + name = "Ryan Burns"; + }; r3dl3g = { email = "redleg@rothfuss-web.de"; github = "r3dl3g"; @@ -18536,11 +18539,11 @@ githubId = 743058; name = "Rob Brewer"; }; - r-burns = { - email = "rtburns@protonmail.com"; - github = "r-burns"; - githubId = 52847440; - name = "Ryan Burns"; + rc-zb = { + name = "Xiao Haifan"; + email = "rc-zb@outlook.com"; + github = "rc-zb"; + githubId = 161540043; }; rcmlz = { email = "haguga-nixos@yahoo.com"; @@ -18561,12 +18564,6 @@ name = "Roland Conybeare"; keys = [ { fingerprint = "bw5Cr/4ul1C2UvxopphbZbFI1i5PCSnOmPID7mJ/Ogo"; } ]; }; - rc-zb = { - name = "Xiao Haifan"; - email = "rc-zb@outlook.com"; - github = "rc-zb"; - githubId = 161540043; - }; rdnetto = { email = "rdnetto@gmail.com"; github = "rdnetto"; @@ -19656,6 +19653,13 @@ githubId = 115821; name = "Sam Rose"; }; + samuel-martineau = { + name = "Samuel Martineau"; + email = "samuel@smartineau.me"; + github = "Samuel-Martineau"; + githubId = 44237969; + keys = [ { fingerprint = "79A1 CC17 67C7 32B6 A8A2 BF4F 71E0 8761 642D ACD2"; } ]; + }; samuela = { email = "skainsworth@gmail.com"; github = "samuela"; @@ -19669,13 +19673,6 @@ githubId = 92163673; keys = [ { fingerprint = "3BA5 A3DB 3239 E2AC 1F3B 68A0 0DB8 3F58 B259 6271"; } ]; }; - samuel-martineau = { - name = "Samuel Martineau"; - email = "samuel@smartineau.me"; - github = "Samuel-Martineau"; - githubId = 44237969; - keys = [ { fingerprint = "79A1 CC17 67C7 32B6 A8A2 BF4F 71E0 8761 642D ACD2"; } ]; - }; samuelrivas = { email = "samuelrivas@gmail.com"; github = "samuelrivas"; @@ -20177,12 +20174,6 @@ githubId = 918365; name = "Stefan Frijters"; }; - sgo = { - email = "stig@stig.io"; - github = "stigtsp"; - githubId = 75371; - name = "Stig Palmquist"; - }; sg-qwt = { email = "hello@edgerunners.eu.org"; matrix = "@dhl:edgerunners.eu.org"; @@ -20190,6 +20181,12 @@ name = "sg-qwt"; githubId = 115715554; }; + sgo = { + email = "stig@stig.io"; + github = "stigtsp"; + githubId = 75371; + name = "Stig Palmquist"; + }; sgraf = { email = "sgraf1337@gmail.com"; github = "sgraf812"; @@ -21237,18 +21234,18 @@ githubId = 113068; name = "Stefan Siegl"; }; - stevebob = { - email = "stephen@sherra.tt"; - github = "gridbugs"; - githubId = 417118; - name = "Stephen Sherratt"; - }; steve-chavez = { email = "stevechavezast@gmail.com"; github = "steve-chavez"; githubId = 1829294; name = "Steve Chávez"; }; + stevebob = { + email = "stephen@sherra.tt"; + github = "gridbugs"; + githubId = 417118; + name = "Stephen Sherratt"; + }; steveej = { email = "mail@stefanjunker.de"; github = "steveeJ"; @@ -21446,18 +21443,18 @@ githubId = 1040871; name = "Mathis Antony"; }; - svend = { - email = "svend@svends.net"; - github = "svend"; - githubId = 306190; - name = "Svend Sorensen"; - }; sven-of-cord = { email = "sven@cord.com"; github = "sven-of-cord"; githubId = 98333944; name = "Sven Over"; }; + svend = { + email = "svend@svends.net"; + github = "svend"; + githubId = 306190; + name = "Svend Sorensen"; + }; Svenum = { email = "s.ziegler@holypenguin.net"; github = "Svenum"; @@ -21764,6 +21761,11 @@ githubId = 125365236; name = "Ice Layer"; }; + tc-kaluza = { + github = "tc-kaluza"; + githubId = 101565936; + name = "Tautvydas Cerniauskas"; + }; tcbravo = { email = "tomas.bravo@protonmail.ch"; github = "tcbravo"; @@ -21789,11 +21791,6 @@ githubId = 7914437; name = "Thomas Cheronneau"; }; - tc-kaluza = { - github = "tc-kaluza"; - githubId = 101565936; - name = "Tautvydas Cerniauskas"; - }; tckmn = { email = "andy@tck.mn"; github = "tckmn"; @@ -21967,18 +21964,18 @@ github = "tfmoraes"; githubId = 351108; }; - tgunnoe = { - email = "t@gvno.net"; - github = "tgunnoe"; - githubId = 7254833; - name = "Taylor Gunnoe"; - }; tg-x = { email = "*@tg-x.net"; github = "tg-x"; githubId = 378734; name = "TG ⊗ Θ"; }; + tgunnoe = { + email = "t@gvno.net"; + github = "tgunnoe"; + githubId = 7254833; + name = "Taylor Gunnoe"; + }; th0rgal = { email = "thomas.marchand@tuta.io"; github = "Th0rgal"; @@ -22011,13 +22008,6 @@ githubId = 2453136; keys = [ { fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; } ]; }; - theaninova = { - name = "Thea Schöbl"; - email = "dev@theaninova.de"; - github = "Theaninova"; - githubId = 19289296; - keys = [ { fingerprint = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA"; } ]; - }; the-argus = { email = "i.mcfarlane2002@gmail.com"; github = "the-argus"; @@ -22025,6 +22015,13 @@ githubId = 70479099; matrix = "@eyes1238:matrix.org"; }; + theaninova = { + name = "Thea Schöbl"; + email = "dev@theaninova.de"; + github = "Theaninova"; + githubId = 19289296; + keys = [ { fingerprint = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA"; } ]; + }; TheBrainScrambler = { email = "esthromeris@riseup.net"; github = "TheBrainScrambler"; @@ -22416,6 +22413,12 @@ githubId = 48209000; name = "Anna Gillert"; }; + tm-drtina = { + email = "tm.drtina@gmail.com"; + github = "tm-drtina"; + githubId = 26902865; + name = "Tomas Drtina"; + }; tmarkovski = { email = "tmarkovski@gmail.com"; github = "tmarkovski"; @@ -22428,12 +22431,6 @@ githubId = 3159881; name = "Tobias Markus"; }; - tm-drtina = { - email = "tm.drtina@gmail.com"; - github = "tm-drtina"; - githubId = 26902865; - name = "Tomas Drtina"; - }; tmountain = { email = "tinymountain@gmail.com"; github = "tmountain"; @@ -22682,18 +22679,18 @@ githubId = 5715025; name = "Trey Fortmuller"; }; - tricktron = { - email = "tgagnaux@gmail.com"; - github = "tricktron"; - githubId = 16036882; - name = "Thibault Gagnaux"; - }; tri-ler = { github = "tri-ler"; githubId = 47867303; email = "tylerh689@gmail.com"; name = "Tyler Hong"; }; + tricktron = { + email = "tgagnaux@gmail.com"; + github = "tricktron"; + githubId = 16036882; + name = "Thibault Gagnaux"; + }; trino = { email = "muehlhans.hubert@ekodia.de"; github = "hmuehlhans"; @@ -22771,6 +22768,12 @@ githubId = 563054; name = "Thomas Tuegel"; }; + tu-maurice = { + email = "valentin.gehrke+nixpkgs@zom.bi"; + github = "tu-maurice"; + githubId = 16151097; + name = "Valentin Gehrke"; + }; tudbut = { name = "Daniella Hennig"; email = "nixpkgs@mail.tudbut.de"; @@ -22778,12 +22781,6 @@ github = "tudbut"; githubId = 48156391; }; - tu-maurice = { - email = "valentin.gehrke+nixpkgs@zom.bi"; - github = "tu-maurice"; - githubId = 16151097; - name = "Valentin Gehrke"; - }; Tungsten842 = { name = "Tungsten842"; email = "886724vf@anonaddy.me"; @@ -23597,6 +23594,12 @@ githubId = 3889405; name = "vyp"; }; + w-lfchen = { + email = "w-lfchen@posteo.net"; + github = "w-lfchen"; + githubId = 115360611; + name = "Wölfchen"; + }; wackbyte = { name = "wackbyte"; email = "wackbyte@pm.me"; @@ -23932,12 +23935,6 @@ githubId = 15619766; name = "wldhx"; }; - w-lfchen = { - email = "w-lfchen@posteo.net"; - github = "w-lfchen"; - githubId = 115360611; - name = "Wölfchen"; - }; wmertens = { email = "Wout.Mertens@gmail.com"; github = "wmertens"; From 4bab873b2804c006971a383cb3eb538b9a523be4 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Mon, 5 May 2025 20:44:50 +0200 Subject: [PATCH 9/9] bird2: 2.17 -> 2.17.1 (cherry picked from commit 608db10f31924a0ab59e21268bba5e48571433ac) --- pkgs/by-name/bi/bird2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bird2/package.nix b/pkgs/by-name/bi/bird2/package.nix index c7e50d9e75a5..4fd22de7de28 100644 --- a/pkgs/by-name/bi/bird2/package.nix +++ b/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 = [