diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-04-28 07:27:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 07:27:06 -0500 |
| commit | ce7272b43c1d5cfe70293a01e03ff5fdbcaeab1a (patch) | |
| tree | 7bf059a945db93afde395fe3f2737f5b9f83fb99 /pkgs/applications/virtualization/cri-o | |
| parent | 75717901da4b40ebc2667a0dca79b10304358a87 (diff) | |
| parent | 1ae963172557035eb07fd27440ea0869770efdb7 (diff) | |
Merge pull request #85869 from saschagrunert/crio
cri-o: 1.17.3 -> 1.18.0
Diffstat (limited to 'pkgs/applications/virtualization/cri-o')
| -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 74a316ef52a1..7d866cd71bb3 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} |