Partially upgrade nix to 1.27.1#3141
Merged
stevenengler merged 3 commits intoshadow:mainfrom Sep 5, 2023
Merged
Conversation
c32ff7a to
36b51b2
Compare
sporksmith
approved these changes
Sep 5, 2023
Also upgraded the tests to nix 0.26.4 because Cargo did it automatically and I don't know how to make it not upgrade it.
Fixes a nix deprecation warning.
36b51b2 to
4d06c62
Compare
Merged
stevenengler
added a commit
that referenced
this pull request
Sep 28, 2023
- tor and tgen version in the CI - rust stable and nightly versions in the CI - cargo dependencies, excluding nix (see #3141) and clap (breaks our cli test; seems to use the terminal width even though stdout and stderr are not the terminal)
Contributor
Author
|
Made an issue for the nix upgrade in the tests: #3265 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The latest nix version makes three main changes:
AsFdtypes instead ofRawFd(an integer)This third point is particularly painful in tests where we use integer file handles everywhere. I've left the tests on nix 1.26 for now, but it seems worthwhile to get this upgrade out of the way for the actual shadow code. If we're going to need to update a lot of tests, it's probably worth changing them to rustix or linux-api instead.
Also I added nix cargo features to the
shadow-shim-helper,shadow-rs, andshadow-testscrates. Ideally we should add all of the nix features to every crate that requires them, but this would probably quickly become out of date anyways so I haven't bothered with that. Instead we take advantage of the fact that features enabled in one crate enable it in all other crates for the current build.