From 56cc12536839415373112e5425e3b0f1beed2263 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 1 Jun 2019 14:28:53 -0500
Subject: [PATCH] cri-tools: 1.0.0-alpha.0 -> 1.14.0

---
 .../virtualization/cri-tools/default.nix      | 20 ++++----
 pkgs/tools/virtualization/cri-tools/deps.nix  | 48 -------------------
 2 files changed, 12 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/tools/virtualization/cri-tools/deps.nix

diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix
index f57befce308..dc1dd6d2fee 100644
--- a/pkgs/tools/virtualization/cri-tools/default.nix
+++ b/pkgs/tools/virtualization/cri-tools/default.nix
@@ -1,19 +1,23 @@
-{ buildGoPackage, fetchurl, lib }:
+{ buildGoPackage, fetchFromGitHub, lib }:
 
 buildGoPackage
-  { name = "cri-tools-1.0.0-alpha.0";
-    src = fetchurl
-      { url = "https://github.com/kubernetes-incubator/cri-tools/archive/v1.0.0-alpha.0.tar.gz";
-        sha256 = "1la26f38xafb7g9hrppjq7gmajiyr8idcwbian7n412q9m0lb3ic";
-      };
+rec {
+  pname = "cri-tools";
+  version = "1.14.0";
+    src = fetchFromGitHub {
+      owner = "kubernetes-incubator";
+      repo = pname;
+      rev = "v${version}";
+      sha256 = "0v5i7shbn7b6av1d2z6r5czyjdll9i7xim9975lpnz1136xb6li7";
+    };
 
     goPackagePath = "github.com/kubernetes-incubator/cri-tools";
     subPackages = [ "cmd/crictl" "cmd/critest" ];
 
     meta = {
+      description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)";
+      homepage = https://github.com/kubernetes-sigs/cri-tools;
       license = lib.licenses.asl20;
     };
-
-    goDeps = ./deps.nix;
   }
 
diff --git a/pkgs/tools/virtualization/cri-tools/deps.nix b/pkgs/tools/virtualization/cri-tools/deps.nix
deleted file mode 100644
index 796e335c0f8..00000000000
--- a/pkgs/tools/virtualization/cri-tools/deps.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
-  {
-    goPackagePath = "github.com/docker/docker";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/docker";
-      rev = "94b8a116fbf1cd90e68d8f5361b520d326a66f9b";
-      sha256 = "0winmx2dx9chrv9ab4cl1i00z2vag2swy2lfwiy8jx73qhaf9g4d";
-    };
-  }
-  {
-    goPackagePath = "k8s.io/api";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/api";
-      rev = "57d7f151236665c12202a51c21bc939eb5d5ba91";
-      sha256 = "0sdpymjw6wqs1fc2q3h0v60slbd0p5qqr23ssff72wprn8520q37";
-    };
-  }
-  {
-    goPackagePath = "k8s.io/apimachinery";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/apimachinery";
-      rev = "91d8586aac31d9086939d077ba556d2c7fb157b4";
-      sha256 = "1672igw8c0hp8qkwns69n5k8qgr1rzjaah9gjh37am34v172vgl7";
-    };
-  }
-  {
-    goPackagePath = "k8s.io/client-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/client-go";
-      rev = "109fef42a850b1af9d332a4ba433f65436be66c7";
-      sha256 = "1yspxap56fgk0vh2n8jxl3j870yig7swpv8w4w7l92jawrfxv1zf";
-    };
-  }
-  {
-    goPackagePath = "k8s.io/kubernetes";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/kubernetes";
-      rev = "ea2fbd4de4b38aae93ec397cb5ea4d9eb6aefef8";
-      sha256 = "1108d2h7px0b4gqc9xrwb0w5dhs5kxxbbvbcr938ipgln250qrpz";
-    };
-  }
-]