Skip to content

[25.05] ci/pinned: update#428039

Merged
wolfgangwalther merged 6 commits intoNixOS:release-25.05from
wolfgangwalther:ci-backport-pinned
Jul 24, 2025
Merged

[25.05] ci/pinned: update#428039
wolfgangwalther merged 6 commits intoNixOS:release-25.05from
wolfgangwalther:ci-backport-pinned

Conversation

@wolfgangwalther
Copy link
Contributor

@wolfgangwalther wolfgangwalther commented Jul 24, 2025 •
edited
Loading

Backport of #427437

cherry-picked most commits, except the two treewide: run nixfmt ..., which I recreated.

Had to resolve conflicts in the "fix syntax errors in code blocks" commit. treefmt with markdown-code-runner ran successfully afterwards, so I was still successful in fixing these.

@wolfgangwalther
treewide: fix syntax errors in nix code blocks
ad1379b 
Fixes all code blocks with "nix" language in markdown files for syntax
errors to be able to run nixfmt in the next step.

(cherry picked from commit 6c47e7d)
@wolfgangwalther
treewide: run treefmt with mdcr/nixfmt
a46262a
@wolfgangwalther
nixos/doc/wireless: fix comments
9221850 
Those had been misplaced by nixfmt.

(cherry picked from commit 0f3f710)
@wolfgangwalther
ci/parse: raise minimum test to Nix 2.24
06fe78d 
Nix 2.3 is marked as insecure and thus not cached anymore.

We'll either need to patch it and cache it again or drop it.

(cherry picked from commit ea970ff)
@wolfgangwalther
ci/pinned: update
03907f2 
This gives us Nix 2.30 and nixfmt 1.0.0.

From the nixpkgs-unstable channel:
https://hydra.nixos.org/eval/1817034#tabs-inputs

Changes for treefmt-nix:
numtide/treefmt-nix@a05be41...421b563

(cherry picked from commit 6f56639)
@wolfgangwalther
treewide: run nixfmt 1.0.0
aefcb0d
@wolfgangwalther wolfgangwalther mentioned this pull request Jul 24, 2025
Merged
1 task
github-actions[bot]

This comment was marked as resolved.

Sign in to view

@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. 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: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: kernel The Linux kernel 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: printing Drivers, CUPS & Co. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 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 labels Jul 24, 2025
@nixpkgs-ci nixpkgs-ci bot added 6.topic: testing Tooling for automated testing of packages and modules 6.topic: cinnamon Desktop environment 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: agda A dependently typed programming language / interactive theorem prover 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: R R is a programming language for statistical computing and data visualization. 6.topic: nim Nim programing language 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 6.topic: lib The Nixpkgs function library 6.topic: zig Zig is an imperative, general-purpose, statically typed, compiled system programming language. 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: php PHP is a general-purpose scripting language geared towards web development. 6.topic: k3s Kubernates distribution (https://k3s.io/) 6.topic: dotnet Language: .NET 6.topic: nvidia Nvidia-specific issues and fixes 6.topic: xen-project Issues and PRs related to the Xen Project Hypervisor. 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: COSMIC COSMIC is a software platform for designing beautiful user experiences 4.workflow: backport This targets a stable branch 8.has: documentation This PR adds or changes documentation 6.topic: policy discussion Discuss policies to work in and around Nixpkgs labels Jul 24, 2025
@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 24, 2025
@wolfgangwalther wolfgangwalther dismissed github-actions[bot]’s stale review July 24, 2025 13:15

recreated two nixfmt commits and solved merge conflicts in the other one.

@wolfgangwalther wolfgangwalther merged commit aaa5d7a into NixOS:release-25.05 Jul 24, 2025
74 of 78 checks passed
@wolfgangwalther wolfgangwalther deleted the ci-backport-pinned branch July 24, 2025 13:15
@wolfgangwalther wolfgangwalther mentioned this pull request Jul 24, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MattSturgeon MattSturgeon MattSturgeon approved these changes

@github-actions github-actions[bot] github-actions[bot] left review comments

Assignees

No one assigned

Labels

4.workflow: backport This targets a stable branch 6.topic: agda A dependently typed programming language / interactive theorem prover 6.topic: cinnamon Desktop environment 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: COSMIC COSMIC is a software platform for designing beautiful user experiences 6.topic: docker tools Open-source software for deploying and running of containerized applications 6.topic: dotnet Language: .NET 6.topic: emacs Text editor 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: hardware Drivers, Firmware and Kernels 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: jitsi VoIP and instant messaging application with video conferencing capabilities 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: k3s Kubernates distribution (https://k3s.io/) 6.topic: kernel The Linux kernel 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: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: nvidia Nvidia-specific issues and fixes 6.topic: pantheon The Pantheon desktop environment 6.topic: php PHP is a general-purpose scripting language geared towards web development. 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: R R is a programming language for statistical computing and data visualization. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 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: TeX Issues regarding texlive and TeX in general 6.topic: vim Advanced text editor 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 6.topic: xen-project Issues and PRs related to the Xen Project Hypervisor. 6.topic: zig Zig is an imperative, general-purpose, statically typed, compiled system programming language. 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@wolfgangwalther @MattSturgeon