Skip to content

[Backport release-25.11] ci/pinned: update#482830

Closed
dyegoaurelio wants to merge 4 commits into
NixOS:release-25.11from
dyegoaurelio:backport-ci-nixfmt-1.2.0
Closed

[Backport release-25.11] ci/pinned: update#482830
dyegoaurelio wants to merge 4 commits into
NixOS:release-25.11from
dyegoaurelio:backport-ci-nixfmt-1.2.0

Conversation

@dyegoaurelio

@dyegoaurelio dyegoaurelio commented Jan 22, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

backport for #480141

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:
  • 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.

@dyegoaurelio
ci/pinned: update
a973448 
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.
@dyegoaurelio
ci/nixf-diagnose: ignore prelude rules
820e836 
- avoid treewide cleanup due to these new rules
- invalid nix code was getting auto fixed
@dyegoaurelio
treewide: apply nixfmt 1.2.0
2066ff6
@dyegoaurelio
.git-blame-ignore-revs: add nixfmt 1.2.0 commit
cc2cee1
github-actions[bot]
github-actions Bot requested changes Jan 22, 2026
View reviewed changes

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Please follow the backporting guidelines and cherry-pick with the -x flag.
This requires changes to the unstable master and staging branches first, before backporting them.

Occasionally, commits are not cherry-picked at all, for example when updating minor versions of packages which have already advanced to the next major on unstable.
These commits can optionally be marked with a Not-cherry-picked-because: <reason> footer.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Couldn't locate the cherry-picked commit's hash in the commit message of a973448.

Warning

Couldn't locate the cherry-picked commit's hash in the commit message of 820e836.

Warning

Couldn't locate the cherry-picked commit's hash in the commit message of 2066ff6.

Warning

Couldn't locate the cherry-picked commit's hash in the commit message of cc2cee1.

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

@MattSturgeon

MattSturgeon commented Jan 22, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Oops, I opened #482833 at the same time as you. My bad!

This PR was cherry-picked without -x so the "(cherry-picked from)" line is missing. Do you want to resolve that or shall we close in favor of my backport?

@dyegoaurelio

dyegoaurelio commented Jan 22, 2026

Copy link
Copy Markdown
Contributor Author

we can go with yours.

superseded by #482833

@dyegoaurelio dyegoaurelio deleted the backport-ci-nixfmt-1.2.0 branch January 22, 2026 22:54
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 9.needs: reviewer This PR currently has no reviewers requested and needs attention. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: vim Advanced text editor 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: hardware Drivers, Firmware and Kernels 6.topic: coq A formal proof management system 6.topic: nixos-container Imperative and declarative systemd-nspawn containers 6.topic: testing Tooling for automated testing of packages and modules 6.topic: module system About "NixOS" module system internals 6.topic: jitsi VoIP and instant messaging application with video conferencing capabilities 6.topic: docker tools Open-source software for deploying and running of containerized applications 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: nim Nim programing language 6.topic: cuda Parallel computing platform and API 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 6.topic: lib The Nixpkgs function library labels Jan 22, 2026
@nixpkgs-ci nixpkgs-ci Bot added 6.topic: games Gaming on NixOS 6.topic: julia Julia is a high-level, high-performance dynamic language for technical computing. 6.topic: php PHP is a general-purpose scripting language geared towards web development. 6.topic: nvidia Nvidia-specific issues and fixes 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 4.workflow: backport This targets a stable branch 8.has: documentation This PR adds or changes documentation labels Jan 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] requested changes

Assignees

No one assigned

Labels

4.workflow: backport This targets a stable branch 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: coq A formal proof management system 6.topic: cuda Parallel computing platform and API 6.topic: docker tools Open-source software for deploying and running of containerized applications 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: games Gaming on NixOS 6.topic: hardware Drivers, Firmware and Kernels 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: jitsi VoIP and instant messaging application with video conferencing capabilities 6.topic: julia Julia is a high-level, high-performance dynamic language for technical computing. 6.topic: lib The Nixpkgs function library 6.topic: module system About "NixOS" module system internals 6.topic: nim Nim programing language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nixos-container Imperative and declarative systemd-nspawn containers 6.topic: nvidia Nvidia-specific issues and fixes 6.topic: php PHP is a general-purpose scripting language geared towards web development. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: testing Tooling for automated testing of packages and modules 6.topic: vim Advanced text editor 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 9.needs: reviewer This PR currently has no reviewers requested and needs attention. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@dyegoaurelio @MattSturgeon