diff options
| author | Jaka Hudoklin <offlinehacker@users.noreply.github.com> | 2020-05-06 08:27:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-06 08:27:37 +0000 |
| commit | 85ee3e12ae2c58bd79ab9edeaf9e1d7fb6993ef5 (patch) | |
| tree | c9bb42a5a031fe40765e601c42ea8f482626da89 | |
| parent | dc9c88a451a32938ebd8264f523a145ded907791 (diff) | |
| parent | 6d3eaa0527fc02c486889364afe148809834f40f (diff) | |
| download | nixlib-85ee3e12ae2c58bd79ab9edeaf9e1d7fb6993ef5.tar nixlib-85ee3e12ae2c58bd79ab9edeaf9e1d7fb6993ef5.tar.gz nixlib-85ee3e12ae2c58bd79ab9edeaf9e1d7fb6993ef5.tar.bz2 nixlib-85ee3e12ae2c58bd79ab9edeaf9e1d7fb6993ef5.tar.lz nixlib-85ee3e12ae2c58bd79ab9edeaf9e1d7fb6993ef5.tar.xz nixlib-85ee3e12ae2c58bd79ab9edeaf9e1d7fb6993ef5.tar.zst nixlib-85ee3e12ae2c58bd79ab9edeaf9e1d7fb6993ef5.zip | |
Merge pull request #85269 from euank/containerd-versioning
containerd: fix --version output
| -rw-r--r-- | pkgs/applications/virtualization/containerd/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index fbeb2e3382fd..86f4a7f099f5 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,6 +5,8 @@ with lib; buildGoPackage rec { pname = "containerd"; version = "1.2.13"; + # git commit for the above version's tag + commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; src = fetchFromGitHub { owner = "containerd"; @@ -20,7 +22,7 @@ buildGoPackage rec { buildInputs = [ btrfs-progs ]; - buildFlags = [ "VERSION=v${version}" ]; + buildFlags = [ "VERSION=v${version}" "REVISION=${commit}" ]; BUILDTAGS = [] ++ optional (btrfs-progs == null) "no_btrfs"; @@ -28,7 +30,7 @@ buildGoPackage rec { buildPhase = '' cd go/src/${goPackagePath} patchShebangs . - make binaries + make binaries $buildFlags ''; installPhase = '' |