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

emscriptenfastcomp: move wrap magic to own file, use newScope #29322

Merged
merged 1 commit into from Sep 15, 2017
Merged

emscriptenfastcomp: move wrap magic to own file, use newScope #29322

merged 1 commit into from Sep 15, 2017

Conversation

mguentner
Copy link
Contributor

Motivation for this change

Having the wrap magic in the top-level broke the following script for me:

nix-instantiate --eval --json --strict maintainers/scripts/find-tarballs.nix --arg expr 'builtins.removeAttrs ((import pkgs/top-level/release.nix { scrubJobs = false; supportedSystems = [ "x86_64-linux" "x86_64-darwin" ]; })) ["unstable" "tarball" "darwin-unstable" ]'

I moved it to its own file, similiar to the llvm/clang packages. Please verify :)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@mguentner, thanks for your PR! By analyzing the history of the files in this pull request, we identified @matthewbauer, @gebner and @bosu to be potential reviewers.

@mguentner
Copy link
Contributor Author

cc @matthewbauer

mguentner added a commit to NixIPFS/nixipfs-scripts that referenced this pull request Sep 14, 2017
@mguentner
change EXPR until nixpkgs issue is fixed
604c2de 
Ref: NixOS/nixpkgs#29322
@fpletz fpletz added this to the 17.09 milestone Sep 15, 2017
fpletz
fpletz approved these changes Sep 15, 2017
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Looks fine and the hash of emscriptenfastcomp didn't change. Thanks! 👍

@fpletz fpletz merged commit 3a4add5 into NixOS:master Sep 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
17.09
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mguentner @mention-bot @fpletz