Skip to content

containerd: migrate to using buildGoPackage #52563

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

Merged
merged 1 commit into from
Jan 11, 2019

Conversation

vdemeester
Copy link
Member

@vdemeester vdemeester commented Dec 20, 2018

Motivation for this change

Part of #52469, make the runc derivation using buildGoPackage 👼

… and add man pages, which means containerd becomes a multi-output
derivation : containerd.bin and containerd.man.

cc @Mic92

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

manName="$(basename "$manFile")" # "docker-build.1"
number="$(echo $manName | rev | cut -d'.' -f1 | rev)"
mkdir -p "$manRoot/man$number"
gzip -c "$manFile" > "$manRoot/man$number/$manName.gz"
Copy link
Member

Choose a reason for hiding this comment

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

I think we automatically compress manpages.

Copy link
Member Author

Choose a reason for hiding this comment

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

oh 🤔 then there is some other packages that should change too

@vdemeester
Copy link
Member Author

oh this broke the docker derivation 😅 I'll fix 👼

@vdemeester vdemeester force-pushed the 52469-containerd-to-buildgopackage branch from 7e369b6 to 05e33dd Compare December 20, 2018 13:06
@GrahamcOfBorg GrahamcOfBorg added the 8.has: documentation This PR adds or changes documentation label Dec 20, 2018
… and add man pages, which means `containerd` becomes a multi-output
derivation : `containerd.bin` and `containerd.man`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
@vdemeester vdemeester force-pushed the 52469-containerd-to-buildgopackage branch from 05e33dd to 17ddccc Compare December 20, 2018 13:25
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 20, 2018
@Mic92
Copy link
Member

Mic92 commented Dec 21, 2018

@GrahamcOfBorg test docker

@Mic92
Copy link
Member

Mic92 commented Dec 21, 2018

@GrahamcOfBorg build nixosTests.docker

@Mic92 Mic92 merged commit 15ec5d0 into NixOS:master Jan 11, 2019
@vdemeester vdemeester deleted the 52469-containerd-to-buildgopackage branch January 11, 2019 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants