Skip to content

[release-24.05] Update pinned nixpkgs version#364004

Merged
infinisil merged 4 commits intoNixOS:release-24.05from
tweag:update-pinned-nixpkgs-release-24.05
Dec 10, 2024
Merged

[release-24.05] Update pinned nixpkgs version#364004
infinisil merged 4 commits intoNixOS:release-24.05from
tweag:update-pinned-nixpkgs-release-24.05

Conversation

@infinisil
Copy link
Member

This is necessary for #327796, the backport of #322537, to work, because:

  • The 24.05 branch enforces (some) Nix files to be formatted with the nixfmt-rfc-style version from the CI-pinned Nixpkgs version.
  • In order for automated backports to 24.05 to succeed after the reformat, we need to use the same formatter version on all the branches, otherwise you get conflicts due to different formattings.

So this backports all the commits that updated the CI version on master and 24.11: #336555 #361165 #363585

Ping @NixOS/nix-formatting


This work is funded by Tweag and Antithesis

Add a 👍 reaction to pull requests you find important.

infinisil and others added 3 commits December 10, 2024 19:16
From the nixpkgs-unstable channel: https://hydra.nixos.org/eval/1808410#tabs-inputs

(cherry picked from commit 7aa5bc8)
From the nixpkgs-unstable channel: https://hydra.nixos.org/eval/1810238#tabs-inputs

(cherry picked from commit c9bbb99)
From the nixpkgs-unstable channel: https://hydra.nixos.org/eval/1810299#tabs-inputs

(cherry picked from commit d979e89)
@github-actions github-actions bot added the 6.topic: vscode A free and versatile code editor that supports almost every major programming language. label Dec 10, 2024
@infinisil
Copy link
Member Author

Reviewed in a call with lots of others together, no complaints came up, so let's merge :)

@infinisil infinisil merged commit f84e54a into NixOS:release-24.05 Dec 10, 2024
@infinisil infinisil deleted the update-pinned-nixpkgs-release-24.05 branch December 10, 2024 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: vscode A free and versatile code editor that supports almost every major programming language.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant