diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2023-12-24 11:26:33 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2023-12-24 11:26:33 +0000 |
commit | 33b10dce256daf77c1ef6f143a68d334aeaf2cbe (patch) | |
tree | 0257ed6bf06dddec3ef26fb38441f7c2ee5cb863 /pkgs/os-specific/linux/criu | |
parent | a3e53d17b609a8fa1078c12cf0ce91a44c1e8293 (diff) |
criu: 3.17.1 -> 3.19
The main change is the build fix against `gcc-13`. Otherwise build fails as: include/common/list.h:35:19: error: storing the address of local variable 'postpone' in '((struct list_head *)((char *)start + 8))[24].prev' [-Werror=dangling-pointer=] 35 | new->prev = prev; | ~~~~~~~~~~^~~~~~ Changes: - https://github.com/checkpoint-restore/criu/releases/tag/v3.18 - https://github.com/checkpoint-restore/criu/releases/tag/v3.19
Diffstat (limited to 'pkgs/os-specific/linux/criu')
-rw-r--r-- | pkgs/os-specific/linux/criu/default.nix | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 00d46591c1361..66e3303890b03 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 = [ |