diff options
| author | Euan Kemp <euank@euank.com> | 2020-04-14 22:31:57 -0700 |
|---|---|---|
| committer | Euan Kemp <euank@euank.com> | 2020-04-14 23:28:27 -0700 |
| commit | 6d3eaa0527fc02c486889364afe148809834f40f (patch) | |
| tree | 050f9905106a3187862b3af039234176b6b696ff /pkgs/applications/virtualization/containerd | |
| parent | c652b64a262184d5c7c0cdc003dc52635d4aa0d7 (diff) | |
| download | nixlib-6d3eaa0527fc02c486889364afe148809834f40f.tar nixlib-6d3eaa0527fc02c486889364afe148809834f40f.tar.gz nixlib-6d3eaa0527fc02c486889364afe148809834f40f.tar.bz2 nixlib-6d3eaa0527fc02c486889364afe148809834f40f.tar.lz nixlib-6d3eaa0527fc02c486889364afe148809834f40f.tar.xz nixlib-6d3eaa0527fc02c486889364afe148809834f40f.tar.zst nixlib-6d3eaa0527fc02c486889364afe148809834f40f.zip | |
containerd: fix --version output
Before this change, 'containerd --version' with the nix package wouldn't print useful version information. In addition, the build output a bunch of (harmless) errors about 'git: command not found'. This fixes both of those problems.
Diffstat (limited to 'pkgs/applications/virtualization/containerd')
| -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 7ce4390ba301..15e5c05c1ddd 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 = '' |