diff options
author | Sascha Grunert <sgrunert@suse.com> | 2019-11-06 15:17:52 +0100 |
---|---|---|
committer | Emery Hemingway <ehmry@posteo.net> | 2019-11-06 19:22:36 +0100 |
commit | f46e8f9a12314aa55f2a426b551470c678673b68 (patch) | |
tree | b80b7a31ff1832e1ffc84f823605d108678cce6f /pkgs | |
parent | 9a5ef400fc8481ca4db9fbaafc22b2d5a4aa3e43 (diff) | |
download | nixpkgs-f46e8f9a12314aa55f2a426b551470c678673b68.tar nixpkgs-f46e8f9a12314aa55f2a426b551470c678673b68.tar.gz nixpkgs-f46e8f9a12314aa55f2a426b551470c678673b68.tar.bz2 nixpkgs-f46e8f9a12314aa55f2a426b551470c678673b68.tar.lz nixpkgs-f46e8f9a12314aa55f2a426b551470c678673b68.tar.xz nixpkgs-f46e8f9a12314aa55f2a426b551470c678673b68.tar.zst nixpkgs-f46e8f9a12314aa55f2a426b551470c678673b68.zip |
cri-o: 1.15.2 -> 1.16.0
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/virtualization/cri-o/default.nix | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 07b6d024990..fddf1741720 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { project = "cri-o"; - version = "1.15.2"; + version = "1.16.0"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -26,7 +26,7 @@ buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "0fiizxwxdq87h943421ivgw49jndk23yjz3saf1rzmn7g3xh2pn4"; + sha256 = "1kbg544v7c1apaxrpndgrap0pb5c67d8fazbkgykg6ynskx6n344"; }; outputs = [ "bin" "out" ]; @@ -42,17 +42,23 @@ buildGoPackage rec { pushd go/src/${goPackagePath} # Build pause - go build -tags ${makeFlags} -o bin/crio-config -buildmode=pie \ - -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio-config - make -C pause - # Build the crio binary - go build -tags ${makeFlags} -o bin/crio -buildmode=pie \ - -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio + # Build the crio binaries + function build() { + go build \ + -tags ${makeFlags} \ + -o bin/"$1" \ + -buildmode=pie \ + -ldflags '-s -w ${ldflags}' \ + ${goPackagePath}/cmd/"$1" + } + build crio + build crio-status ''; installPhase = '' install -Dm755 bin/crio $bin/bin/crio${flavor} + install -Dm755 bin/crio-status $bin/bin/crio-status${flavor} mkdir -p $bin/libexec/crio install -Dm755 bin/pause $bin/libexec/crio/pause${flavor} |