summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR. RyanTM <ryantm-bot@ryantm.com>2021-07-30 06:52:49 +0000
committerLinus Heckemann <git@sphalerite.org>2021-10-20 15:08:35 +0200
commita34c5e29ec7556cd578790acf809fde37c81e6ef (patch)
tree96fd980ae11ab25b94a9f97c49b8de1c54a4f9e1
parentMerge pull request #141929 from risicle/ris-go-1.17-r21.05 (diff)
downloadnixpkgs-a34c5e29ec7556cd578790acf809fde37c81e6ef.tar.gz
containerd: 1.5.4 -> 1.5.5
(cherry picked from commit b58b4a85c418a6821f8557d6a2c19f7a2262fc0d)
-rw-r--r--pkgs/applications/virtualization/containerd/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 0c44805bedd3..c86f4280e821 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -10,7 +10,7 @@
buildGoModule rec {
pname = "containerd";
- version = "1.5.4";
+ version = "1.5.5";
outputs = [ "out" "man" ];
@@ -18,7 +18,7 @@ buildGoModule rec {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
- sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA=";
+ sha256 = "sha256-6mDTTXHpXBcKOcT+VrGgt6HJzvTeKgJ0ItJ+IjCTJxk=";
};
vendorSha256 = null;
@@ -32,15 +32,19 @@ buildGoModule rec {
BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ];
buildPhase = ''
+ runHook preBuild
patchShebangs .
make binaries man $buildFlags
+ runHook postBuild
'';
installPhase = ''
+ runHook preInstall
install -Dm555 bin/* -t $out/bin
installManPage man/*.[1-9]
installShellCompletion --bash contrib/autocomplete/ctr
installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete
+ runHook postInstall
'';
passthru.tests = { inherit (nixosTests) docker; };