mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-17 06:06:13 +03:00
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
This commit is contained in:
parent
a3e53d17b6
commit
33b10dce25
@ -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
|
, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config, iproute2, gzip
|
||||||
, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd, gnutar
|
, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd, gnutar
|
||||||
, buildPackages
|
, buildPackages
|
||||||
@ -6,33 +6,15 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "criu";
|
pname = "criu";
|
||||||
version = "3.17.1";
|
version = "3.19";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "checkpoint-restore";
|
owner = "checkpoint-restore";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
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;
|
enableParallelBuilding = true;
|
||||||
depsBuildBuild = [ protobufc buildPackages.stdenv.cc ];
|
depsBuildBuild = [ protobufc buildPackages.stdenv.cc ];
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
Loading…
Reference in New Issue
Block a user