diff options
author | davidak <davidak@users.noreply.github.com> | 2021-02-22 15:47:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-22 15:47:24 +0100 |
commit | ed482686fc6b641a16fd319c57e730852e133645 (patch) | |
tree | c41735fa4c231123d01c2b4b5bfb76bb8848bd42 | |
parent | 23f1c43e17949f16256da136dbd3d8c2a52f4754 (diff) | |
parent | e544bbe6b3205386116986584f55a44ce8e6e517 (diff) |
Merge pull request #114001 from 06kellyjac/nerdctl
nerdctl: correct shas to match 0.6.0
-rw-r--r-- | pkgs/applications/networking/cluster/nerdctl/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index d11461366b619..23f4dfe14c3b4 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -15,10 +15,10 @@ buildGoModule rec { owner = "AkihiroSuda"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lSvYiTh67gK9kJls7VsayV8T3H6RzFEEKe49BOWnUBw="; + sha256 = "sha256-QhAN30ge0dbC9dGT1yP4o0VgrcS9+g+r6YJ07ZjPJtg="; }; - vendorSha256 = "sha256-qywiaNoO3pI7sfyPbwWR8BLd86RvJ2xSWwCJUsm3RkM="; + vendorSha256 = "sha256-bX1GfKbAbdEAnW3kPNsbF/cJWufxvuhm//G88qJ3u08="; nativeBuildInputs = [ makeWrapper ]; @@ -30,6 +30,9 @@ buildGoModule rec { "-X github.com/AkihiroSuda/nerdctl/pkg/version.Revision=<unknown>" ]; + # Many checks require a containerd socket and running nerdctl after it's built + doCheck = false; + postInstall = '' wrapProgram $out/bin/nerdctl \ --prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \ @@ -39,6 +42,9 @@ buildGoModule rec { doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck + # nerdctl expects XDG_RUNTIME_DIR to be set + export XDG_RUNTIME_DIR=$TMPDIR + $out/bin/nerdctl --help # --version will error without containerd.sock access $out/bin/nerdctl --help | grep "${version}" |