diff options
| author | maxine [they] <35892750+maxeaubrey@users.noreply.github.com> | 2021-10-20 15:30:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-20 15:30:27 +0200 |
| commit | b49f3cefb1c48273570231a369a97e0b6a5105e4 (patch) | |
| tree | 9d01ad368b4b457e7016a59e4284743f93416864 | |
| parent | Merge pull request #141929 from risicle/ris-go-1.17-r21.05 (diff) | |
| parent | containerd: 1.5.5 -> 1.5.7 (diff) | |
| download | nixpkgs-b49f3cefb1c48273570231a369a97e0b6a5105e4.tar.gz | |
Merge pull request #142356 from mayflower/backport-containerd
| -rw-r--r-- | pkgs/applications/virtualization/containerd/default.nix | 8 |
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..3d91ffb334a9 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.7"; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA="; + sha256 = "sha256-BHVlGXyTkaiRkG8WG1LdtxrQs8nKS8djZFnO/AfKBUw="; }; 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; }; |