diff options
| author | Sascha Grunert <sgrunert@suse.com> | 2020-09-15 09:04:44 +0200 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-09-17 17:50:57 +1000 |
| commit | 1e8324291e5cf93a63a9159855071a032725e0ce (patch) | |
| tree | bc8ab35e8e0754d1c32581b30fc8562422dc2e06 /pkgs/applications/virtualization | |
| parent | ec63faba640fd446a3111d89b3bc85d520478e01 (diff) | |
cri-o: 1.18.3 -> 1.19.0
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/cri-o/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/cri-o/wrapper.nix | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index d0c8938e6def2..54ffb036f3c38 100644 --- 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 index 298bec6550e5a..6d72623d86cbf 100644 --- 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 { |