diff options
author | Sascha Grunert <sgrunert@suse.com> | 2020-04-23 16:36:53 +0200 |
---|---|---|
committer | Sascha Grunert <sgrunert@suse.com> | 2020-04-24 10:07:06 +0200 |
commit | 1ae963172557035eb07fd27440ea0869770efdb7 (patch) | |
tree | 07067c4a13d1bd43e948d4149a6e7aaf28d2e871 /pkgs/applications/virtualization | |
parent | 290b9fdf564d50254846831fe587ed3757c5e579 (diff) | |
download | nixlib-1ae963172557035eb07fd27440ea0869770efdb7.tar nixlib-1ae963172557035eb07fd27440ea0869770efdb7.tar.gz nixlib-1ae963172557035eb07fd27440ea0869770efdb7.tar.bz2 nixlib-1ae963172557035eb07fd27440ea0869770efdb7.tar.lz nixlib-1ae963172557035eb07fd27440ea0869770efdb7.tar.xz nixlib-1ae963172557035eb07fd27440ea0869770efdb7.tar.zst nixlib-1ae963172557035eb07fd27440ea0869770efdb7.zip |
cri-o: 1.17.3 -> 1.18.0
- Make buildtags being able to set via the BUILDTAGS environment - Switch to go 1.14 Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/cri-o/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 3ee467cd290d..c78b04270a28 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -16,11 +16,9 @@ , which }: -let - buildTags = "apparmor seccomp selinux containers_image_ostree_stub"; -in buildGoPackage rec { +buildGoPackage rec { project = "cri-o"; - version = "1.17.3"; + version = "1.18.0"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -29,7 +27,7 @@ in buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1cy2lqasfn5n20vlm3ckb6myci8ya6qv08dw8fq7z4ycnm39r1a6"; + sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah"; }; outputs = [ "bin" "out" ]; @@ -38,13 +36,11 @@ in buildGoPackage rec { libseccomp libselinux lvm2 ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; + BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub"; buildPhase = '' pushd go/src/${goPackagePath} - make BUILDTAGS='${buildTags}' \ - bin/crio \ - bin/crio-status \ - bin/pinns + make binaries BUILDTAGS="$BUILDTAGS" ''; installPhase = '' install -Dm755 bin/crio $bin/bin/crio${flavor} |