public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cri-o: 1.18.3 -> 1.19.0

Browse Source 
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
This commit is contained in:
Sascha Grunert
2020-09-17 17:50:57 +10:00
committed by zowoq
parent ec63faba64
commit 1e8324291e
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/virtualization/cri-o/default.nix
+2 -6
View File
@@ -15,13 +15,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cri-o"; pname = "cri-o";
version = "1.18.3"; version = "1.19.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cri-o"; owner = "cri-o";
repo = "cri-o"; repo = "cri-o";
rev = "v${version}"; rev = "v${version}";
sha256 = "1csdbyypqwxkfc061pdv7nj52a52b9xxzb6qgxcznd82w7wgfb3g"; sha256 = "1lrr8y0k6609z4gb8cg277rq58sh0bqd2b4mzjlynyjdgp3xskfq";
}; };
vendorSha256 = null; vendorSha256 = null;
@@ -41,10 +41,6 @@ buildGoModule rec {
BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub"; BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub";
buildPhase = '' buildPhase = ''
patchShebangs .
sed -i '/version.buildDate/d' Makefile
make binaries docs BUILDTAGS="$BUILDTAGS" make binaries docs BUILDTAGS="$BUILDTAGS"
''; '';
pkgs/applications/virtualization/cri-o/wrapper.nix
-2
View File
@@ -10,7 +10,6 @@
, utillinux # nsenter , utillinux # nsenter
, cni-plugins # not added to path , cni-plugins # not added to path
, iptables , iptables
, socat
}: }:
let let
@@ -22,7 +21,6 @@ let
conmon conmon
utillinux utillinux
iptables iptables
socat
] ++ extraPackages); ] ++ extraPackages);
in runCommand cri-o.name { in runCommand cri-o.name {