diff options
| author | Dyego Aurélio <dyegoaurelio@gmail.com> | 2026-01-20 20:52:37 -0300 |
|---|---|---|
| committer | Dyego Aurélio <dyegoaurelio@gmail.com> | 2026-01-22 18:36:22 -0300 |
| commit | d4b8a5ba37f9cbfbe4a491ea71442ba75698664f (patch) | |
| tree | a4d7306f45e60b3b376b7b599ecf08585366ee57 /ci | |
| parent | python3Packages.llfuse: 1.5.1 -> 1.5.2 (#482494) (diff) | |
| download | nixpkgs-d4b8a5ba37f9cbfbe4a491ea71442ba75698664f.tar.gz | |
ci/pinned: update
This gives us nixfmt 1.2.0.
From the nixpkgs-unstable channel at revision bde09022887110deb780067364a0818e89258968.
Changes for nixfmt (1.1.0 → 1.2.0):
https://github.com/NixOS/nixfmt/compare/v1.1.0...v1.2.0
Changes for nixd (2.7.0 → 2.8.2):
https://github.com/nix-community/nixd/compare/2.7.0...2.8.2
Changes for treefmt-nix:
https://github.com/numtide/treefmt-nix/compare/5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4...e96d59dff5c0d7fddb9d113ba108f03c3ef99eca
Changes for zizmor (1.20.0 → 1.21.0):
https://github.com/zizmorcore/zizmor/compare/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.
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/default.nix | 23 | ||||
| -rw-r--r-- | ci/pinned.json | 12 |
2 files changed, 18 insertions, 17 deletions
diff --git a/ci/default.nix b/ci/default.nix index 5c4b5034b8f8..916b991b4ad0 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -87,22 +87,23 @@ let "pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml" ]; - programs.nixf-diagnose.enable = true; - settings.formatter.nixf-diagnose = { - # Ensure nixfmt cleans up after nixf-diagnose. - priority = -1; - options = [ - "--auto-fix" + programs.nixf-diagnose = { + enable = true; + ignore = [ # Rule names can currently be looked up here: # https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py # TODO: Remove the following and fix things. - "--ignore=sema-unused-def-lambda-noarg-formal" - "--ignore=sema-unused-def-lambda-witharg-arg" - "--ignore=sema-unused-def-lambda-witharg-formal" - "--ignore=sema-unused-def-let" + "sema-unused-def-lambda-noarg-formal" + "sema-unused-def-lambda-witharg-arg" + "sema-unused-def-lambda-witharg-formal" + "sema-unused-def-let" # Keep this rule, because we have `lib.or`. - "--ignore=or-identifier" + "or-identifier" ]; + }; + settings.formatter.nixf-diagnose = { + # Ensure nixfmt cleans up after nixf-diagnose. + priority = -1; excludes = [ # Auto-generated; violates sema-extra-with # Can only sensibly be removed when --auto-fix supports multiple fixes at once: diff --git a/ci/pinned.json b/ci/pinned.json index 6feb67129b34..9e039136a160 100644 --- a/ci/pinned.json +++ b/ci/pinned.json @@ -9,9 +9,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "ee09932cedcef15aaf476f9343d1dea2cb77e261", - "url": "https://github.com/NixOS/nixpkgs/archive/ee09932cedcef15aaf476f9343d1dea2cb77e261.tar.gz", - "hash": "1xz5pa6la2fyj5b1cfigmg3nmml11fyf9ah0rnr4zfgmnwimn2gn" + "revision": "bde09022887110deb780067364a0818e89258968", + "url": "https://github.com/NixOS/nixpkgs/archive/bde09022887110deb780067364a0818e89258968.tar.gz", + "hash": "13mi187zpa4rw680qbwp7pmykjia8cra3nwvjqmsjba3qhlzif5l" }, "treefmt-nix": { "type": "Git", @@ -22,9 +22,9 @@ }, "branch": "main", "submodules": false, - "revision": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", - "url": "https://github.com/numtide/treefmt-nix/archive/5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4.tar.gz", - "hash": "0cr6aj9bk7n3y09lwmfjr7xg1f069332xf4q99z3kj1c1mp0wl82" + "revision": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", + "url": "https://github.com/numtide/treefmt-nix/archive/e96d59dff5c0d7fddb9d113ba108f03c3ef99eca.tar.gz", + "hash": "02gqyxila3ghw8gifq3mns639x86jcq079kvfvjm42mibx7z5fzb" } }, "version": 5 |