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.

Sign up for GitHub

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

Jump to bottom

massrebuilder.rs: correct the shape of nixpkgs argument to release.nix #276

Merged
merged 1 commit into from Nov 23, 2018
Merged

massrebuilder.rs: correct the shape of nixpkgs argument to release.nix #276

merged 1 commit into from Nov 23, 2018

Conversation

7c6f434c
Copy link
Member

To allow restricted mode evaluation, the Nixpkgs path has to be passed on the command line; this PR fixes the shape of the argument (it needs to have the actual path as outPath and have a couple extra entries).

@7c6f434c 7c6f434c mentioned this pull request Nov 23, 2018
Closed
@grahamc
Copy link
Member

grahamc commented Nov 23, 2018

I think this test will need updating: https://github.com/NixOS/ofborg/pull/189/files#diff-c5ddc8807759886d253ec47844ada69fR9 -- you can run locally with cargo test

@7c6f434c
Copy link
Member Author

I think cargo test just succeeds for me with that test as-is

@grahamc grahamc merged commit 6e94d23 into NixOS:released Nov 23, 2018
@grahamc
Copy link
Member

grahamc commented Nov 23, 2018 

18:27 <MichaelRaskin> Hm. I think cargo test succeeds even without fixing things…
18:28 <gchristensen> hrm
18:28 <gchristensen> :)
18:28 <MichaelRaskin> I might be doing something wrong, but cargo test says
18:29 <MichaelRaskin> test nix::tests::instantiation_nixpkgs_restricted_mode ... ok
18:29 <gchristensen> hrm :/
18:29 <gchristensen> oh
18:29 <gchristensen> because the test doesn't care about the attrset, it just tostrings it
18:29 <gchristensen> which is fine
18:29 <MichaelRaskin> It tests a different simpler thing, indeed
18:29 <gchristensen> ok
18:29 <gchristensen> well
18:29 <gchristensen> let's get this out there

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@7c6f434c @grahamc