diff options
| author | Sascha Grunert <sgrunert@suse.com> | 2020-04-30 09:09:40 +0200 |
|---|---|---|
| committer | Sascha Grunert <sgrunert@suse.com> | 2020-05-14 09:32:16 +0200 |
| commit | 006e6b052f04b36d79651397725bb3359ac61198 (patch) | |
| tree | 4983ee752d0158db453a2b3217abfbfbe10fa6ac /pkgs/applications/virtualization/cri-o | |
| parent | 1694c0b3f7ab9416f266e719001f74116878e1fa (diff) | |
cri-o: switch to buildGoModule
This is just a cleanup to switch from buildGoPackage to buildGoModule.
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Diffstat (limited to 'pkgs/applications/virtualization/cri-o')
| -rw-r--r-- | pkgs/applications/virtualization/cri-o/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 0851f1f716be..14cac1533990 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -1,6 +1,6 @@ { stdenv , btrfs-progs -, buildGoPackage +, buildGoModule , fetchFromGitHub , glibc , gpgme @@ -14,21 +14,18 @@ , pkg-config }: -buildGoPackage rec { +buildGoModule rec { pname = "cri-o"; version = "1.18.0"; - goPackagePath = "github.com/cri-o/cri-o"; - src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah"; }; - + vendorSha256 = null; outputs = [ "out" "man" ]; - nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ @@ -44,8 +41,6 @@ buildGoPackage rec { BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub"; buildPhase = '' - pushd go/src/${goPackagePath} - sed -i '/version.buildDate/d' Makefile make binaries docs BUILDTAGS="$BUILDTAGS" |