importCargoLock: introduce alternative parameter lockFileContents#137395
Merged
danieldk merged 1 commit intoNixOS:masterfrom Sep 20, 2021
dermetfan:cargo-lock-restricted
Merged
importCargoLock: introduce alternative parameter lockFileContents#137395danieldk merged 1 commit intoNixOS:masterfrom dermetfan:cargo-lock-restricted
lockFileContents#137395danieldk merged 1 commit intoNixOS:masterfrom
dermetfan:cargo-lock-restricted
Conversation
github-actions
bot
added
the
6.topic: rust
ofborg
bot
added
10.rebuild-darwin: 0
Contributor
danieldk
suggested changes
Sep 16, 2021
Contributor
danieldk
left a comment
danieldk
left a comment
There was a problem hiding this comment.
Looks good to me, but it would be nice if a test is added for this.
In restricted mode (and therefore with flakes) `builtins.readFile` may not be the result of `builtins.toFile`, making it impossible to use a generated lockFile (with or without IFD), and thereby causing evaluation to fail if `system != builtins.currentSystem` on Hydra so the jobs are not delegated to eligible build machines that support that system. This is done in a way that avoids rebuilds.
Member
Author
|
Test added 🙂 |
Contributor
|
@ofborg build tests.importCargoLock |
danieldk
approved these changes
Sep 20, 2021
Contributor
danieldk
left a comment
danieldk
left a comment
There was a problem hiding this comment.
Looks good to me! I don't want to hold up this PR any further, but could you make a follow-up PR that adds this option to the nixpkgs Rust docs?
5 tasks
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
3 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.
Motivation for this change
In restricted mode (and therefore with flakes)
builtins.readFilemay not be the result ofbuiltins.toFile,making it impossible to use a generated
lockFile(with or without IFD),and thereby causing evaluation to fail if
system != builtins.currentSystemon Hydraso the jobs are not delegated to eligible build machines that support that system.
This is done in a way that avoids rebuilds.
Things done
nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)