Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests.overriding: format with nixfmt-rfc-style and categorize #366583

Merged
merged 2 commits into from
Jan 14, 2025

Conversation

ShamrockLee
Copy link
Contributor

@ShamrockLee ShamrockLee commented Dec 19, 2024

This PR formats the Nix expression of tests.overriding according to NixOS/rfcs#166 and categorises the test cases according to the build helpers they are testing against.

This chore PR should cause no rebuild (aside from nixos-install-tool, which depends on the whole Nixpkgs codebase). It would be easier to review each commit separately.

I want to backport this PR to make adding test cases for subsequent PRs that fix package overriding easier.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Split tests in the let-in block into
tests-stdenv, tests-go, and tests-python.

Place the dependent variables into the let-in block of each category.

This chore commit causes no rebuilds.
@ShamrockLee ShamrockLee requested a review from roberth December 19, 2024 15:49
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Dec 19, 2024
@ShamrockLee
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review


x86_64-linux

@infinisil infinisil merged commit 6ad7602 into NixOS:master Jan 14, 2025
67 of 68 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 14, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-366583-to-release-24.11 origin/release-24.11
cd .worktree/backport-366583-to-release-24.11
git switch --create backport-366583-to-release-24.11
git cherry-pick -x 662cf493f0bbb6ceaaf32b96fea3636064e8d850 9e66d6ce585636cd243c91a54e09cb7faae5c021

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants