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

dockerTools.tarsum: Fix upstream import #37877

Merged
merged 1 commit into from Mar 26, 2018
Merged

dockerTools.tarsum: Fix upstream import #37877

merged 1 commit into from Mar 26, 2018

Conversation

srhb
Copy link
Contributor

@srhb srhb commented Mar 26, 2018 •
edited

Motivation for this change

Recently, ...

building '/nix/store/72nalbxv6bwpah2w1v18brm8yfzv9lm0-tarsum.drv'...
tarsum.go:8:2: code in directory /build/tarsum/src/tarsum expects import "github.com/docker/docker/pkg/tarsum"
Things done

Add the import paths as specified in the upstream pkg.

A better solution would probably be to split out our "tarsum" entirely and have it properly depend on upstream as a gopkg.

  • 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.

@srhb
Copy link
Contributor Author

srhb commented Mar 26, 2018

@GrahamcOfBorg test docker-tools

@GrahamcOfBorg
Copy link

Success on aarch64-linux

Attempted: tests.docker-tools

No partial log is available.

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: tests.docker-tools

Partial log (click to expand)

building '/nix/store/wnkrhnja4s6jggarsc8lkg5dfp6d3mwz-etc.drv'...
Cooking the image...
building '/nix/store/qskpy67n0lzlfwvwdkyb8r0ibq5jrp2h-nixos-system-docker-18.09.git.4874ce1.drv'...
Finished.
building '/nix/store/bvjvnd1d915ym0v7g040mxz84ijr9bvi-closure-info.drv'...
building '/nix/store/nxga4n9226qhmzqv1x8miq4cs46rxs8h-run-nixos-vm.drv'...
building '/nix/store/xksv5injlf3ngssqspxcifnhwpgrnj2k-nixos-vm.drv'...
cannot build derivation '/nix/store/w3vn9jld1sfk6c648dx5j8kg19g0igll-nixos-test-driver-docker-tools.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/38svrbaiqvx7yr3vca26767zvi48wmpk-vm-test-run-docker-tools.drv': 1 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/38svrbaiqvx7yr3vca26767zvi48wmpk-vm-test-run-docker-tools.drv' failed

@srhb
Copy link
Contributor Author

srhb commented Mar 26, 2018

Oh, right, that won't work because:
Could not access KVM kernel module: Permission denied

Works locally.

@nlewo
Copy link
Member

nlewo commented Mar 26, 2018

This has to be backported to 18.03 which is also impacted (this is due to the latest docker-ce update).

@srhb
Copy link
Contributor Author

srhb commented Mar 26, 2018

@nlewo I'll get right on it. :)

@srhb srhb merged commit 63a8d8c into NixOS:master Mar 26, 2018
srhb added a commit to srhb/nixpkgs that referenced this pull request Mar 26, 2018
@srhb
dockerTools.tarsum: Fix upstream import
d610810 
(cherry picked from commit 4874ce1)
Backport of NixOS#37877
@srhb srhb mentioned this pull request Mar 26, 2018
Merged
srhb referenced this pull request Mar 26, 2018
@srhb
Merge pull request #37879 from srhb/backport-#37877
5d817cf 
Backport: dockerTools.tarsum: Fix upstream import
@srhb srhb deleted the tarsum-import branch March 26, 2018 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nlewo nlewo nlewo approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@srhb @GrahamcOfBorg @nlewo