mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 05:19:00 +02:00
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>
This commit is contained in:
parent
290b9fdf56
commit
1ae9631725
|
@ -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}
|
||||
|
|
|
@ -23306,9 +23306,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 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue