b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #117186 from 06kellyjac/nerdctl

Browse source 
nerdctl: 0.7.1 -> 0.7.2
This commit is contained in:
Sandro 2021-03-22 12:23:42 +01:00 committed by GitHub
parent 6f9ac9eb8a b8e095cb10
commit 66955e1f41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/applications/networking/cluster/nerdctl/default.nix
View file

@ -10,20 +10,20 @@
buildGoModule rec {
pname = "nerdctl";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "AkihiroSuda";
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tMzob+ljGBKkfbxwMqy+8bqVp51Eqyx4kXhsj/LRfzQ=";
sha256 = "sha256-0q3UmlXzW0fGYPc1IptuIbCMnKW4pyDm1KxkRqU2voA=";
};
vendorSha256 = "sha256-zUX/kneVz8uXmxly8yqmcttK3Wj4EmBaT8gmg3hDms4=";
vendorSha256 = "sha256-QVvID9rrOFngL94LWN75HSnyTgh3F0KaScWxMIKUqDM=";
nativeBuildInputs = [ makeWrapper installShellFiles ];
preBuild = let t = "github.com/AkihiroSuda/nerdctl/pkg/version"; in
preBuild = let t = "github.com/containerd/nerdctl/pkg/version"; in
''
buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=<unknown>")
'';
@ -36,9 +36,6 @@ buildGoModule rec {
--prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \
--prefix CNI_PATH : "${cni-plugins}/bin"
# nerdctl panics without XDG_RUNTIME_DIR set
export XDG_RUNTIME_DIR=$TMPDIR
installShellCompletion --cmd nerdctl \
--bash <($out/bin/nerdctl completion bash)
'';
@ -52,8 +49,8 @@ buildGoModule rec {
'';
meta = with lib; {
homepage = "https://github.com/AkihiroSuda/nerdctl/";
changelog = "https://github.com/AkihiroSuda/nerdctl/releases/tag/v${version}";
homepage = "https://github.com/containerd/nerdctl/";
changelog = "https://github.com/containerd/nerdctl/releases/tag/v${version}";
description = "A Docker-compatible CLI for containerd";
license = licenses.asl20;
maintainers = with maintainers; [ jk ];