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

skopeo: remove the patch by setting a variable at build time #34446

Merged
merged 2 commits into from Feb 8, 2018
Merged

skopeo: remove the patch by setting a variable at build time #34446

merged 2 commits into from Feb 8, 2018

Conversation

nlewo
Copy link
Member

@nlewo nlewo commented Jan 31, 2018

Motivation for this change

Just an improvment

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 Author

nlewo commented Jan 31, 2018

cc @NeQuissimus @vdemeester

vdemeester
vdemeester approved these changes Jan 31, 2018
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@nlewo
Copy link
Member Author

nlewo commented Feb 8, 2018

@NeQuissimus Good to merge for us. Can you have a look?

@NeQuissimus
Copy link
Member

LGTM, could you bump the version, then I'll try it out and merge?

@nlewo
Copy link
Member Author

nlewo commented Feb 8, 2018 via email

@NeQuissimus
Copy link
Member

@GrahamcOfBorg build skopeo

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘lvm2-2.02.177’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/lvm2/default.nix:64 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

/nix/store/g4m60hplr14d45ilij8v21hlaay4b3y5-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/travis_osx.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/bash"
/nix/store/g4m60hplr14d45ilij8v21hlaay4b3y5-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/btrfs_tag.sh: interpreter directive changed from "/bin/bash" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/bash"
/nix/store/g4m60hplr14d45ilij8v21hlaay4b3y5-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/make/test-integration: interpreter directive changed from "/bin/bash" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/bash"
/nix/store/g4m60hplr14d45ilij8v21hlaay4b3y5-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-lint: interpreter directive changed from "/bin/bash" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/bash"
/nix/store/g4m60hplr14d45ilij8v21hlaay4b3y5-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-git-marks: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/bash"
/nix/store/g4m60hplr14d45ilij8v21hlaay4b3y5-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-vet: interpreter directive changed from "/bin/bash" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/bash"
/nix/store/g4m60hplr14d45ilij8v21hlaay4b3y5-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-gofmt: interpreter directive changed from "/bin/bash" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/bash"
/nix/store/g4m60hplr14d45ilij8v21hlaay4b3y5-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/libdm_tag.sh: interpreter directive changed from "/bin/bash" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/bash"
checking for references to /tmp/nix-build-skopeo-0.1.28.drv-0 in /nix/store/g4m60hplr14d45ilij8v21hlaay4b3y5-skopeo-0.1.28...
/nix/store/wydkjhgfz68fgykyxlxmk63fgmj0jlgb-skopeo-0.1.28-bin

@NeQuissimus NeQuissimus merged commit 86ab2e3 into NixOS:master Feb 8, 2018
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

/nix/store/9vwbc21lfnrvl0bmy9fazwz5ssyy3i5x-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/libdm_tag.sh: interpreter directive changed from "/bin/bash" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/bash"
/nix/store/9vwbc21lfnrvl0bmy9fazwz5ssyy3i5x-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/make.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/bash"
/nix/store/9vwbc21lfnrvl0bmy9fazwz5ssyy3i5x-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/make/test-integration: interpreter directive changed from "/bin/bash" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/bash"
/nix/store/9vwbc21lfnrvl0bmy9fazwz5ssyy3i5x-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-git-marks: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/bash"
/nix/store/9vwbc21lfnrvl0bmy9fazwz5ssyy3i5x-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-gofmt: interpreter directive changed from "/bin/bash" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/bash"
/nix/store/9vwbc21lfnrvl0bmy9fazwz5ssyy3i5x-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-lint: interpreter directive changed from "/bin/bash" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/bash"
/nix/store/9vwbc21lfnrvl0bmy9fazwz5ssyy3i5x-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-vet: interpreter directive changed from "/bin/bash" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/bash"
/nix/store/9vwbc21lfnrvl0bmy9fazwz5ssyy3i5x-skopeo-0.1.28/share/go/src/github.com/projectatomic/skopeo/hack/travis_osx.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/bash"
checking for references to /build in /nix/store/9vwbc21lfnrvl0bmy9fazwz5ssyy3i5x-skopeo-0.1.28...
/nix/store/p13y13gxip3hg3xg516lrg8i1wqappf0-skopeo-0.1.28-bin

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vdemeester vdemeester vdemeester approved these changes

Assignees
No one assigned
Labels
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
4 participants
@nlewo @NeQuissimus @GrahamcOfBorg @vdemeester