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.

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

singularity-tools: Only copy into /bin what is specified in contents #30479

Merged
merged 1 commit into from Jan 10, 2019

Conversation

Projects
None yet
4 participants
@danharaj
Copy link
Contributor

danharaj commented Oct 16, 2017

Motivation for this change

Currently singularity-tools will try to copy the bin contents of the entire transitive closure of packages requested for the singularity container. This can cause unimportant collisions between binaries that the user didn't intend to be installed in the PATH anyway. This patch makes it so that while the entire /nix/store is copied into the container, only the requested contents are exposed in /bin.

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
    • other Linux distributions
  • 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.

@danharaj

This comment has been minimized.

Copy link
Contributor Author

danharaj commented Oct 16, 2017

@jbedo I discussed this patch with you earlier. I removed the change you noticed was unnecessary.

@veprbl

This comment has been minimized.

Copy link
Member

veprbl commented Jan 9, 2019

@veprbl

This comment has been minimized.

Copy link
Member

veprbl commented Jan 9, 2019

ping @jbedo

@jbedo

This comment has been minimized.

Copy link
Contributor

jbedo commented Jan 10, 2019

Looks good.

@veprbl veprbl merged commit 6b81768 into NixOS:master Jan 10, 2019

9 of 10 checks passed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment