diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-11-09 07:20:00 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-11-09 07:26:53 +0100 |
commit | 457e94d9008a55f0302100b00b77ea9ea478eaef (patch) | |
tree | fa6c4caad3cd47fcff78421a553086cd49dc9f54 /pkgs/applications/virtualization/cri-o/default.nix | |
parent | 4fc27edf074b63a46782832279f8ac1c27b43829 (diff) | |
parent | 5e70be026ee4eb05ed1c25d659848ab2f7102100 (diff) | |
download | nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.gz nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.bz2 nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.lz nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.xz nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.zst nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.zip |
Merge branch 'master' into staging-next
~4k rebuilds on each Linux.
Diffstat (limited to 'pkgs/applications/virtualization/cri-o/default.nix')
-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} |