From 71a28ca2c15ce6f1f8e782f0c6034e67a9ae26d4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 3 Mar 2021 18:06:10 +1000 Subject: [PATCH] crun: 0.17 -> 0.18 https://github.com/containers/crun/releases/tag/0.18 --- pkgs/applications/virtualization/crun/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 59e07530fbc..15ca7c9667f 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -12,6 +12,7 @@ , nixosTests , criu , system +, fetchpatch }: let @@ -37,16 +38,24 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-OdB7UXLG99ErbfSCvq87LxBy5EYkUvTfyQNG70RFbl4="; + sha256 = "sha256-VjMpfj2qUQdhqdnLpZsYigfo2sM7gNl0GrE4nitp13g="; fetchSubmodules = true; }; + patches = [ + # For 0.18 some tests switched to static builds, this was reverted after 0.18 was released + (fetchpatch { + url = "https://github.com/containers/crun/commit/d26579bfe56aa36dd522745d47a661ce8c70d4e7.patch"; + sha256 = "1xmc0wj0j2xcg0915vxn0pplc4s94rpmw0s5g8cyf8dshfl283f9"; + }) + ]; + nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; buildInputs = [ libcap libseccomp systemd yajl ]