JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #85869 from saschagrunert/crio

Browse Source 
cri-o: 1.17.3 -> 1.18.0
This commit is contained in:
Mario Rodas 2020-04-28 07:27:06 -05:00 committed by GitHub
commit ce7272b43c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/virtualization/cri-o/default.nix
View File

@ -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}

4
pkgs/top-level/all-packages.nix
View File

@ -23299,9 +23299,7 @@ in
crispyDoom = callPackage ../games/crispy-doom { };
cri-o = callPackage ../applications/virtualization/cri-o {
buildGoPackage = buildGo112Package;
};
cri-o = callPackage ../applications/virtualization/cri-o { };
ckan = callPackage ../games/ckan { };