summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@gmail.com>2019-08-14 12:50:01 +0200
committerGitHub <noreply@github.com>2019-08-14 12:50:01 +0200
commit930659b10bc7c875fd49b1cdae21a631b429c25a (patch)
treee7af2c04cfbed79dfa2cad46ae073d4e04718deb
parentdd87e37a8e372dee93530ac881ca730e8566ee77 (diff)
parent3efc04c41d914b32c45ba108e0d5c4326e1bd082 (diff)
Merge pull request #66608 from saschagrunert/cri-tools
cri-tools: 1.14.0 -> 1.15.0
-rw-r--r--pkgs/tools/virtualization/cri-tools/default.nix21
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix
index 1435fd2bde0e..e8e6a76a7a26 100644
--- a/pkgs/tools/virtualization/cri-tools/default.nix
+++ b/pkgs/tools/virtualization/cri-tools/default.nix
@@ -1,23 +1,26 @@
{ buildGoPackage, fetchFromGitHub, lib }:
-buildGoPackage
-rec {
+buildGoPackage rec {
pname = "cri-tools";
- version = "1.14.0";
+ version = "1.15.0";
src = fetchFromGitHub {
- owner = "kubernetes-incubator";
+ owner = "kubernetes-sigs";
repo = pname;
rev = "v${version}";
- sha256 = "0v5i7shbn7b6av1d2z6r5czyjdll9i7xim9975lpnz1136xb6li7";
+ sha256 = "03fhddncwqrdyxz43m3bak9dlrsqzibqqja3p94nic4ydk2hry62";
};
- goPackagePath = "github.com/kubernetes-incubator/cri-tools";
- subPackages = [ "cmd/crictl" "cmd/critest" ];
+ goPackagePath = "github.com/kubernetes-sigs/cri-tools";
- meta = {
+ buildPhase = ''
+ pushd go/src/${goPackagePath}
+ make
+ '';
+
+ meta = with lib; {
description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)";
homepage = https://github.com/kubernetes-sigs/cri-tools;
license = lib.licenses.asl20;
+ maintainers = with maintainers; [ saschagrunert ];
};
}
-