diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2022-08-05 07:00:31 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2022-08-05 07:48:40 +0200 |
| commit | a64f2a79bb11b22f7d54314c53e9a33b50619b1f (patch) | |
| tree | f5c50ed35801cb01971b7795cb08160594078c89 /pkgs/os-specific/linux/criu | |
| parent | 93b3eb81f4236cc0e2413946cf8024bcc4e383a8 (diff) | |
| download | nixpkgs-a64f2a79bb11b22f7d54314c53e9a33b50619b1f.tar nixpkgs-a64f2a79bb11b22f7d54314c53e9a33b50619b1f.tar.gz nixpkgs-a64f2a79bb11b22f7d54314c53e9a33b50619b1f.tar.bz2 nixpkgs-a64f2a79bb11b22f7d54314c53e9a33b50619b1f.tar.lz nixpkgs-a64f2a79bb11b22f7d54314c53e9a33b50619b1f.tar.xz nixpkgs-a64f2a79bb11b22f7d54314c53e9a33b50619b1f.tar.zst nixpkgs-a64f2a79bb11b22f7d54314c53e9a33b50619b1f.zip | |
criu: 3.15 -> 3.17.1
Diffstat (limited to 'pkgs/os-specific/linux/criu')
| -rw-r--r-- | pkgs/os-specific/linux/criu/default.nix | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index af772645824..5475a565b09 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,20 +1,30 @@ -{ stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables -, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config -, which, python3, makeWrapper, docbook_xml_dtd_45, perl }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, protobuf, protobufc, asciidoc, iptables +, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config, iproute2 +, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd }: stdenv.mkDerivation rec { pname = "criu"; - version = "3.15"; + version = "3.17.1"; - src = fetchurl { - url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2"; - sha256 = "09d0j24x0cyc7wkgi7cnxqgfjk7kbdlm79zxpj8d356sa3rw2z24"; + src = fetchFromGitHub { + owner = "checkpoint-restore"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0B0cdX5bemy4glF9iWjrQIXIqilyYcCcAN9x4Jjrwzk="; }; + patches = [ + # Fixes redefinition of rseq headers + (fetchpatch { + url = "https://github.com/checkpoint-restore/criu/commit/1e6e826ffb7ac05f33fa123051c2fc2ddf0f68ea.patch"; + hash = "sha256-LJjk0jQ5v5wqeprvBMpxhjLXn7v+lSPldEGgazGUM44="; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython perl ]; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ]; - propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; + buildInputs = [ protobuf asciidoc xmlto libpaper libnl libcap libnet nftables libbsd ]; + propagatedBuildInputs = [ protobufc ] ++ (with python3.pkgs; [ python python3.pkgs.protobuf ]); postPatch = '' substituteInPlace ./Documentation/Makefile \ @@ -39,7 +49,8 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/criu \ - --prefix PATH : ${lib.makeBinPath [ iptables ]} + --set-default CR_IPTABLES ${iptables}/bin/iptables \ + --set-default CR_IP_TOOL ${iproute2}/bin/ip wrapPythonPrograms ''; |