Skip to content

lib/tests: compatibility with more Nix versions#239188

Merged
Ericson2314 merged 4 commits intoNixOS:release-23.05from
vcunat:p/lib-tests-23.05
Jun 22, 2023
Merged

lib/tests: compatibility with more Nix versions#239188
Ericson2314 merged 4 commits intoNixOS:release-23.05from
vcunat:p/lib-tests-23.05

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Jun 22, 2023

Minimal pick from PR #234070

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

@vcunat
Copy link
Member Author

vcunat commented Jun 22, 2023

I checked nix flake check on nix master with nixpkgs updated to this commit.

@vcunat vcunat mentioned this pull request Jun 22, 2023
Merged
1 task
infinisil added 2 commits June 22, 2023 14:47
@infinisil @roberth
lib/tests/filesystem.sh: Check success and failure separately
f076dbe 
(cherry picked from commit de0c112)
@infinisil @roberth
lib/tests: Also run with nixVersions.minimum and nixVersions.unstable
d20ae93 
The previous commits ensure that the tests also succeed with those
versions

(cherry picked from commit 013acf2)
@roberth
Copy link
Member

roberth commented Jun 22, 2023

Of the remaining commits, one cherry-pick was already applied, and I think that confused the rebase action.
The other two applied without a problem too and are worth adding, to improve future rebases.

roberth
roberth approved these changes Jun 22, 2023
View reviewed changes
Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

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

Let's merge when CI has passed.

@vcunat
Copy link
Member Author

vcunat commented Jun 22, 2023

OK, why not. I even had these in this branch originally and was unsure.

@ofborg ofborg 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 Jun 22, 2023
@Ericson2314 Ericson2314 merged commit 0a49dd8 into NixOS:release-23.05 Jun 22, 2023
@vcunat vcunat deleted the p/lib-tests-23.05 branch June 22, 2023 13:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@roberth roberth roberth approved these changes

@edolstra edolstra Awaiting requested review from edolstra

@infinisil infinisil Awaiting requested review from infinisil infinisil is a code owner

Assignees

No one assigned

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@vcunat @roberth @Ericson2314 @infinisil