summary refs log tree commit diff
path: root/pkgs/tools/virtualization/cri-tools
diff options
context:
space:
mode:
authorSascha Grunert <sgrunert@suse.com>2019-08-14 09:13:54 +0200
committerSascha Grunert <sgrunert@suse.com>2019-08-14 09:16:31 +0200
commit3efc04c41d914b32c45ba108e0d5c4326e1bd082 (patch)
tree90c2c5accd318032db759941890123d4137cb4b2 /pkgs/tools/virtualization/cri-tools
parent90f6578ef2050f31fbe070aef60c7a1f6bc06123 (diff)
downloadnixpkgs-3efc04c41d914b32c45ba108e0d5c4326e1bd082.tar
nixpkgs-3efc04c41d914b32c45ba108e0d5c4326e1bd082.tar.gz
nixpkgs-3efc04c41d914b32c45ba108e0d5c4326e1bd082.tar.bz2
nixpkgs-3efc04c41d914b32c45ba108e0d5c4326e1bd082.tar.lz
nixpkgs-3efc04c41d914b32c45ba108e0d5c4326e1bd082.tar.xz
nixpkgs-3efc04c41d914b32c45ba108e0d5c4326e1bd082.tar.zst
nixpkgs-3efc04c41d914b32c45ba108e0d5c4326e1bd082.zip
cri-tools: 1.14.0 -> 1.15.0
- Fix go build process to include critest as well.
- Fix GitHub repo location to be `kubernetes-sigs`
- Add me as maintainer

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Diffstat (limited to 'pkgs/tools/virtualization/cri-tools')
-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 1435fd2bde0..e8e6a76a7a2 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 ];
   };
 }
-