ci/pinned:update

[dyegoaurelio]

Things done

• ci/pinned: update
• ci/nixf-diagnose: ignore builtins related rules
• treewide: apply nixfmt 1.2.0

---

This gives us nixfmt 1.2.0.

From the nixpkgs-unstable channel at revision bde0902.

Changes for nixfmt (1.1.0 → 1.2.0):
NixOS/nixfmt@v1.1.0...v1.2.0

Changes for nixd (2.7.0 → 2.8.2):
nix-community/nixd@2.7.0...2.8.2

Changes for treefmt-nix:
numtide/treefmt-nix@5b4ee75...e96d59d

Changes for zizmor (1.20.0 → 1.21.0):
zizmorcore/zizmor@v1.20.0...v1.21.0

ci/nixf-diagnose: update configuration

Update nixf-diagnose configuration as per numtide/treefmt-nix@0c445aa
The new config output should be semantically equivalent.

---

• Built on platform:
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• Tested, as applicable:
  • NixOS tests in nixos/tests.
  • Package tests at passthru.tests.
  • Tests in lib/tests or pkgs/test for functions and "core" functionality.
• Ran nixpkgs-review on this PR. See nixpkgs-review usage.
• Tested basic functionality of all binary files, usually in ./result/bin/.
• Nixpkgs Release Notes
  • Package update: when the change is major or breaking.
• NixOS Release Notes
  • Module addition: when adding a new NixOS module.
  • Module update: when the change is significant.
• Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

---

Add a 👍 reaction to pull requests you find important.

[MattSturgeon]

Eval report LGTM: https://github.com/NixOS/nixpkgs/actions/runs/21031311391?pr=480141#summary-60468411383

The last update (#464869) showed slightly faster numbers, implying Nixpkgs itself has grown slower in the last two months, although GHA's performance at the time is also a variable when comparing against the last bump.

The real purpose of the report is to compare how different versions of nix handle the current evaluation. In this regard, we can see nixVersions.git and nixVersions.nix_2_32 in the lead for linux, although nixVersions.nix_2_31 is slightly faster on darwin. Recent lix versions have comparable performance, except on x86_64-linux.

[MattSturgeon]

When CI tries to build the docs tests it failes with a weird fetcher error:

https://github.com/NixOS/nixpkgs/actions/runs/21031985076/job/60470081430?pr=480141#step:10:47

error: Cannot build '/nix/store/f4h6638q6m0ardx9y875jga2ab67qbaq-source-salted-bdkkpviaq89r.drv'.
       > aiohttp.client_exceptions.ConnectionTimeoutError: Connection timeout to host https://www.gnu.org/software/coreutils/manual/html_node/cat-invocation.html

nix-build-uncached: nix build failed: exit status 1

The URL it's fetching is accessible: https://www.gnu.org/software/coreutils/manual/html_node/cat-invocation.html

---

Testing locally I can reproduce the issue both on master and this PR.

To be extra conservative, I used nix-build-uncahced from the previous pinned nixpkgs:

$ git worktree add ../pinned --detach ee09932cedcef15aaf476f9343d1dea2cb77e261
$ fish_add_path -a (nix-build ../pinned -A nix-build-uncached --no-out-link)/bin

Then I tried to build ci's manual-nixpkgs-tests attr on master and this PR:

$ nix-build-uncached ci -A manual-nixpkgs-tests

I also tried building the test against the old pinned nixpkgs:

$ nix-build --dry-run ci --arg nixpkgs ../pinned -A manual-nixpkgs-tests

The workflow job runs when matrix.builds contains manual-nixpkgs-tests:

nixpkgs/.github/workflows/build.yml

Lines 95 to 97 in d33c326

	- name: Build Nixpkgs manual tests
	if: contains(matrix.builds, 'manual-nixpkgs-tests') && !cancelled()
	run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A manual-nixpkgs-tests

Which is true for the aarch64-linux run:

nixpkgs/.github/workflows/build.yml

Lines 41 to 45 in d33c326

	- runner: ubuntu-24.04-arm
	name: aarch64-linux
	systems: aarch64-linux
	builds: [shell, manual-nixos, manual-nixpkgs, manual-nixpkgs-tests]
	desc: shell, docs

So maybe me testing locally on an x86_64-linux system is throwing me off.

Regardless, the fact that this job fails in my local testing, fails in this PR, but is successful for other PRs currently open is very confusing.

[MattSturgeon]

(I've temporarily pushed #482470 here for testing purposes, will drop shortly)

---

EDIT:

Interestingly the "test" pull_request workflow didn't run (maybe because of the merge conflicts?), so I wasn't able to validate this PR against #482470.

However, the pull_request_target did run and this time it had enough base objects to fetch the ci-pin-bump commit. Therefore, CI passes(!)

This doesn't mean #482470 is irrelevant; it is still likely that future ci-bumps will run into the same issue with being unable to fetch the ci-pin-bump commit in a shallow clone. It may also be an issue again here, once rebased.

[MattSturgeon]

The 7 rebuilds seem reasonable; see my earlier comments w.r.t. the less obvious ones.

The version-eval-report also shows reasonable numbers for recent nix versions:

Version	aarch64-linux	aarch64-darwin	x86_64-linux	x86_64-darwin
lixPackageSets.git.lix	145	83	157	88
lixPackageSets.lix_2_93.lix	299	105	569	119
lixPackageSets.lix_2_94.lix	142	87	158	88
nixVersions.git	123	88	132	88
nixVersions.nix_2_28	176	136	192	149
nixVersions.nix_2_30	134	83	149	80
nixVersions.nix_2_31	132	86	162	81
nixVersions.nix_2_32	121	86	120	85
nixVersions.nix_2_33	121	85	125	89

Evaluation time in seconds without downloading dependencies.

[Mindavi]

In a brief review lgtm

[MattSturgeon]

I realize the rest of @NixOS/nixpkgs-ci wasn't initially pinged for review, because the treewide change touched too many files leading to too many reviewer requests.

Regardless, I'm going to merge this now, to avoid @dyegoaurelio needing to rebase for merge conflicts again.

I expect the backport will need to be done manually, as the treewide reformat will likely be different on 25.11.

[MattSturgeon]

The base branch has a hidden formatting conflict in pkgs/servers/x11/xorg/default.nix:

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0c1225237..803389ee8 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -219,7 +219,7 @@
   xwd,
   xwininfo,
   xwud,
-# keep-sorted end
+  # keep-sorted end
 }:
 _:
 {

keep-sorted has likely been added since this PR was last rebased, and its comments are now formatted differently with this PR.