public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #142356 from mayflower/backport-containerd

This commit is contained in:
maxine [they] 2021-10-20 15:30:27 +02:00 committed by GitHub
parent 8fe3b97ef4 d48b10a82d
commit b49f3cefb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/virtualization/containerd/default.nix
View File

@ -10,7 +10,7 @@
buildGoModule rec { buildGoModule rec {
pname = "containerd"; pname = "containerd";
version = "1.5.4"; version = "1.5.7";
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
@ -18,7 +18,7 @@ buildGoModule rec {
owner = "containerd"; owner = "containerd";
repo = "containerd"; repo = "containerd";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA="; sha256 = "sha256-BHVlGXyTkaiRkG8WG1LdtxrQs8nKS8djZFnO/AfKBUw=";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -32,15 +32,19 @@ buildGoModule rec {
BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ]; BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ];
buildPhase = '' buildPhase = ''
runHook preBuild
patchShebangs . patchShebangs .
make binaries man $buildFlags make binaries man $buildFlags
runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall
install -Dm555 bin/* -t $out/bin install -Dm555 bin/* -t $out/bin
installManPage man/*.[1-9] installManPage man/*.[1-9]
installShellCompletion --bash contrib/autocomplete/ctr installShellCompletion --bash contrib/autocomplete/ctr
installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete
runHook postInstall
''; '';
passthru.tests = { inherit (nixosTests) docker; }; passthru.tests = { inherit (nixosTests) docker; };