Skip to content

buildenv: perl -> c++#1020

Merged
edolstra merged 1 commit intoNixOS:masterfrom
shlevy:buildenv-c++
Aug 11, 2016
Merged

buildenv: perl -> c++#1020
edolstra merged 1 commit intoNixOS:masterfrom
shlevy:buildenv-c++

Conversation

@shlevy
Copy link
Copy Markdown
Member

@shlevy shlevy commented Aug 10, 2016

No description provided.

@shlevy shlevy added this to the perl-to-c++ milestone Aug 10, 2016
@shlevy shlevy mentioned this pull request Aug 10, 2016
Closed
12 tasks
grahamc
grahamc reviewed Aug 10, 2016
View reviewed changes
src/buildenv/buildenv.cc
* because they would cauase pointless collisions (e.g., each
* Python package brings its own
* `$out/lib/pythonX.Y/site-packages/easy-install.pth'.)
*/
Copy link
Copy Markdown
Member

@grahamc grahamc Aug 10, 2016

Choose a reason for hiding this comment

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

Not to nit, but is this comment accurate? I don't see how $out/lib/pythonX.Y/site-packages/easy-install.pth is excluded by the below suffix list.

Copy link
Copy Markdown
Member Author

@shlevy shlevy Aug 10, 2016

Choose a reason for hiding this comment

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

Oops, I just copied the comment from the perl script but you're right. @edolstra any idea about this? Should that be on the list?

@edolstra
Copy link
Copy Markdown
Member

edolstra commented Aug 11, 2016

I get:

$ ./inst/bin/nix-env -u subversion
building path(s) ‘/nix/store/xzglpy4plm5cpfx2iparghg9mj1q3cay-user-environment’
error: creating symlink from ‘/nix/store/xzglpy4plm5cpfx2iparghg9mj1q3cay-user-environment/nix-support’ to ‘/nix/store/hhs78ipwx5rz1692xns71086viy0yf6i-unrar-5.3.9/nix-support’: File exists
builder for ‘/nix/store/59p1rpz6x8b84kn1zib8v00dff2aw8lh-user-environment.drv’ failed with exit code 1
error: build of ‘/nix/store/59p1rpz6x8b84kn1zib8v00dff2aw8lh-user-environment.drv’ failed

Looks like /nix-support is not filtered correctly.

@edolstra
Copy link
Copy Markdown
Member

edolstra commented Aug 11, 2016

BTW, it would be nice to change buildenv into a builtin derivation (see builtinFetchurl). That way, we wouldn't need any special hacks anymore for running in a chroot (the chrootDeps in corepkgs/config.nix.in).

@shlevy
Copy link
Copy Markdown
Member Author

shlevy commented Aug 11, 2016

Oops, broke the filtering in a pre-push cleanup, fixing.

@shlevy
Copy link
Copy Markdown
Member Author

shlevy commented Aug 11, 2016

@edolstra should be pretty straightforward to do the builtin derivation on top of this change, right? I'd rather focus my nix efforts on finishing up the perl rewrite.

@edolstra
Copy link
Copy Markdown
Member

edolstra commented Aug 11, 2016

@shlevy Sure.

@shlevy
Copy link
Copy Markdown
Member Author

shlevy commented Aug 11, 2016

@edolstra fixed

@edolstra edolstra merged commit 91978e3 into NixOS:master Aug 11, 2016
Ma27 pushed a commit to Ma27/nix that referenced this pull request Mar 8, 2026
lix/nix-shell: cleanup of shell directories happens in Lix itself
12b8753 
Instead of letting inner shell perform the cleanup, we will fork/execvp
and finish the work ourselves. Once an interruption arrives, we wait
again and return the exit status code of the inner shell.

This idea was suggested by eldritch horrors.

Fixes NixOS#1020.

Co-authored-by: eldritch horrors <pennae@lix.systems>
Change-Id: Id38af7ac33874aa1c4b7ca9c6123e3cbd8c3cd8c
Signed-off-by: Raito Bezarius <raito@lix.systems>
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

perl-to-c++

Development

Successfully merging this pull request may close these issues.

3 participants

@shlevy @edolstra @grahamc