Skip to content

Conversation

@dblsaiko
Copy link
Contributor

@dblsaiko dblsaiko commented Sep 22, 2025

Backport #391329, #432729. Built nixosTests.sysfs, nothing else. Should I squash the two commits?

Things done

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

Add a 👍 reaction to pull requests you find important.

@dblsaiko dblsaiko marked this pull request as ready for review September 22, 2025 05:18
@dblsaiko dblsaiko force-pushed the saiko/backport-sysfs branch from 865c234 to 557f20d Compare September 22, 2025 05:28
illdefined and others added 2 commits September 22, 2025 07:29
(cherry-picked from commit ba04f97)
(cherry-picked from commit f96d58f)
github-actions[bot]

This comment was marked as resolved.

@dblsaiko dblsaiko force-pushed the saiko/backport-sysfs branch from 557f20d to e571612 Compare September 22, 2025 05:29
@github-actions github-actions bot dismissed their stale review September 22, 2025 05:31

All good now, thank you!

@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: 0 This PR does not cause any packages to rebuild on Darwin. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 4.workflow: backport This targets a stable branch 9.needs: reviewer This PR currently has no reviewers requested and needs attention. labels Sep 22, 2025
@JohnRTitor JohnRTitor added this pull request to the merge queue Oct 24, 2025
@JohnRTitor
Copy link
Member

JohnRTitor commented Oct 24, 2025

Should I squash the two commits?

No we prefer to cherry-pick and merge them as is.

Merged via the queue into NixOS:release-25.05 with commit 7def831 Oct 24, 2025
37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 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: 0 This PR does not cause any 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

Development

Successfully merging this pull request may close these issues.

4 participants