diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 00d46591c136..66e3303890b0 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, protobuf, protobufc, asciidoc, iptables +{ stdenv, lib, fetchFromGitHub, protobuf, protobufc, asciidoc, iptables , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config, iproute2, gzip , which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd, gnutar , buildPackages @@ -6,33 +6,15 @@ stdenv.mkDerivation rec { pname = "criu"; - version = "3.17.1"; + version = "3.19"; src = fetchFromGitHub { owner = "checkpoint-restore"; repo = pname; rev = "v${version}"; - hash = "sha256-0B0cdX5bemy4glF9iWjrQIXIqilyYcCcAN9x4Jjrwzk="; + hash = "sha256-S0nxBHfm7tWmW5PhSDhSAgy1uDa0RD5GTNpMDUHKqwY="; }; - patches = [ - # Fixes redefinition of rseq headers - (fetchpatch { - url = "https://github.com/checkpoint-restore/criu/commit/1e6e826ffb7ac05f33fa123051c2fc2ddf0f68ea.patch"; - hash = "sha256-LJjk0jQ5v5wqeprvBMpxhjLXn7v+lSPldEGgazGUM44="; - }) - - # compat fixes for glibc-2.36 - (fetchpatch { - url = "https://github.com/checkpoint-restore/criu/commit/8cd5fccd6cf3d03afb5abe463134d31f54d42258.patch"; - sha256 = "sha256-b65DdLmyIuZik0dNRuWJKUPcDFA6CKq0bi4Vd26zgS4="; - }) - (fetchpatch { - url = "https://github.com/checkpoint-restore/criu/commit/517c0947050e63aac72f63a3bf373d76264723b9.patch"; - sha256 = "sha256-MPZ6oILVoZ7BQEZFjUlp3RuMC7iKTKXAtrUDFqbN4T8="; - }) - ]; - enableParallelBuilding = true; depsBuildBuild = [ protobufc buildPackages.stdenv.cc ]; nativeBuildInputs = [