cri-o: 1.18.3 -> 1.19.0

saschagrunert · zowoq · commit 1e8324291e5c · 2020-09-17T17:50:57.000+10:00
Signed-off-by: Sascha Grunert &lt;sgrunert@suse.com&gt;
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
@@ -15,13 +15,13 @@
 
 buildGoModule rec {
   pname = "cri-o";
-  version = "1.18.3";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "cri-o";
     repo = "cri-o";
     rev = "v${version}";
-    sha256 = "1csdbyypqwxkfc061pdv7nj52a52b9xxzb6qgxcznd82w7wgfb3g";
+    sha256 = "1lrr8y0k6609z4gb8cg277rq58sh0bqd2b4mzjlynyjdgp3xskfq";
   };
   vendorSha256 = null;
 
@@ -41,10 +41,6 @@ buildGoModule rec {
 
   BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub";
   buildPhase = ''
-    patchShebangs .
-
-    sed -i '/version.buildDate/d' Makefile
-
     make binaries docs BUILDTAGS="$BUILDTAGS"
   '';
 
diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix
@@ -10,7 +10,6 @@
 , utillinux # nsenter
 , cni-plugins # not added to path
 , iptables
-, socat
 }:
 
 let
@@ -22,7 +21,6 @@ let
     conmon
     utillinux
     iptables
-    socat
   ] ++ extraPackages);
 
 in runCommand cri-o.name {
