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

Merge pull request #85269 from euank/containerd-versioning

Browse Source 
containerd: fix --version output
This commit is contained in:
Jaka Hudoklin 2020-05-06 08:27:37 +00:00 committed by GitHub
commit 85ee3e12ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,8 @@ with lib;
buildGoPackage rec { buildGoPackage rec {
pname = "containerd"; pname = "containerd";
version = "1.2.13"; version = "1.2.13";
# git commit for the above version's tag
commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containerd"; owner = "containerd";
@ -20,7 +22,7 @@ buildGoPackage rec {
buildInputs = [ btrfs-progs ]; buildInputs = [ btrfs-progs ];
buildFlags = [ "VERSION=v${version}" ]; buildFlags = [ "VERSION=v${version}" "REVISION=${commit}" ];
BUILDTAGS = [] BUILDTAGS = []
++ optional (btrfs-progs == null) "no_btrfs"; ++ optional (btrfs-progs == null) "no_btrfs";
@ -28,7 +30,7 @@ buildGoPackage rec {
buildPhase = '' buildPhase = ''
cd go/src/${goPackagePath} cd go/src/${goPackagePath}
patchShebangs . patchShebangs .
make binaries make binaries $buildFlags
''; '';
installPhase = '' installPhase = ''