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

singularity: 2.4 -> 2.4.2 #36845

Merged
merged 1 commit into from Mar 14, 2018
Merged

singularity: 2.4 -> 2.4.2 #36845

merged 1 commit into from Mar 14, 2018

Conversation

jbedo
Copy link
Contributor

@jbedo jbedo commented Mar 12, 2018

Motivation for this change

Upgrades singularity. Ensures local state directory is /var instead of within the nix store. To ensure the /var/singularity/* directories exist, a small module has been added. This fixes the issue identified in #36691.

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.

@nlewo
Copy link
Member

nlewo commented Mar 14, 2018

@GrahamcOfBorg build singularity

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: singularity

Partial log (click to expand)

/nix/store/jrcqiqxr9ballrcyn9xizx2ahxraypl1-singularity-2.4.2/libexec/singularity/handlers/archive-cpio.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/jrcqiqxr9ballrcyn9xizx2ahxraypl1-singularity-2.4.2/libexec/singularity/handlers/image-http.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/jrcqiqxr9ballrcyn9xizx2ahxraypl1-singularity-2.4.2/libexec/singularity/handlers/archive-tar.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/jrcqiqxr9ballrcyn9xizx2ahxraypl1-singularity-2.4.2/libexec/singularity/helpers/image.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/jrcqiqxr9ballrcyn9xizx2ahxraypl1-singularity-2.4.2/libexec/singularity/helpers/apps/list.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/jrcqiqxr9ballrcyn9xizx2ahxraypl1-singularity-2.4.2/libexec/singularity/helpers/help.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/jrcqiqxr9ballrcyn9xizx2ahxraypl1-singularity-2.4.2/libexec/singularity/helpers/check.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/jrcqiqxr9ballrcyn9xizx2ahxraypl1-singularity-2.4.2/libexec/singularity/helpers/inspect.sh: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"
/nix/store/jrcqiqxr9ballrcyn9xizx2ahxraypl1-singularity-2.4.2/bin/run-singularity: interpreter directive changed from "/bin/sh" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh"
/nix/store/jrcqiqxr9ballrcyn9xizx2ahxraypl1-singularity-2.4.2/bin/singularity: interpreter directive changed from "/bin/bash" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash"

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: singularity

Partial log (click to expand)

/nix/store/l4krx3m1rmlxzcggrahkqmm6dfqk2znc-singularity-2.4.2/libexec/singularity/bootstrap-scripts/deffile-driver-localimage.sh: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/l4krx3m1rmlxzcggrahkqmm6dfqk2znc-singularity-2.4.2/libexec/singularity/bootstrap-scripts/deffile-driver-docker.sh: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/l4krx3m1rmlxzcggrahkqmm6dfqk2znc-singularity-2.4.2/libexec/singularity/bootstrap-scripts/deffile-driver-debootstrap.sh: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/l4krx3m1rmlxzcggrahkqmm6dfqk2znc-singularity-2.4.2/libexec/singularity/bootstrap-scripts/deffile-driver-busybox.sh: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/l4krx3m1rmlxzcggrahkqmm6dfqk2znc-singularity-2.4.2/libexec/singularity/bootstrap-scripts/deffile-driver-arch.sh: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/l4krx3m1rmlxzcggrahkqmm6dfqk2znc-singularity-2.4.2/libexec/singularity/bootstrap-scripts/checks.sh: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/l4krx3m1rmlxzcggrahkqmm6dfqk2znc-singularity-2.4.2/libexec/singularity/bootstrap-scripts/functions: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/l4krx3m1rmlxzcggrahkqmm6dfqk2znc-singularity-2.4.2/bin/run-singularity: interpreter directive changed from "/bin/sh" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/sh"
/nix/store/l4krx3m1rmlxzcggrahkqmm6dfqk2znc-singularity-2.4.2/bin/singularity: interpreter directive changed from "/bin/bash" to "/nix/store/lnws52qanbi5vz8qg24v4ym57nznfndg-bash-4.4-p12/bin/bash"
/nix/store/l4krx3m1rmlxzcggrahkqmm6dfqk2znc-singularity-2.4.2

@nlewo
Copy link
Member

nlewo commented Mar 14, 2018

Thanks!

@nlewo nlewo merged commit 65e5bc7 into NixOS:master Mar 14, 2018
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
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jbedo @nlewo @GrahamcOfBorg @matthewbauer @bbarker