guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package: revert the breaking curl change on 8.21+

Browse Source 
Change-Id: I374b37c5d428c6c7db71341d783b6a1cddf45b19
This commit is contained in:
K900
2026-06-28 17:19:51 +00:00
committed by Ilya K
parent d5044f0016
commit 12c1132f07
1 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.nix
+31 -7
View File
@@ -22,6 +22,7 @@
capnproto,
cmake,
curl-lix ? __forDefaults.curl-lix,
fetchpatch2,
curl,
doxygen,
git,
@@ -121,13 +122,36 @@
NIX_CFLAGS_COMPILE = (oldAttrs.NIX_CFLAGS_COMPILE or "") + " -DINITIAL_MARK_STACK_SIZE=1048576";
});
# Nixpkgs backported a Curl patch that breaks our unit tests, somehow.
# https://github.com/NixOS/nixpkgs/issues/534713#event-27130052199
curl-lix = curl.overrideAttrs (prev: {
patches = lib.filter (patch: !lib.strings.hasSuffix "fix-wakeup-consumption.patch" patch) (
prev.patches or [ ]
);
});
curl-lix =
# curl 8.21.0 /somehow/ breaks Lix unit tests.
# See https://github.com/NixOS/nixpkgs/issues/534713
# FIXME remove once fixed
if lib.versionAtLeast curl.version "8.21" then
curl.overrideAttrs (
{
patches ? [ ],
...
}:
{
patches = patches ++ [
# See https://github.com/curl/curl/commit/2a2104f3cff44bb28bb570a093be52bbeeed8f23
(fetchpatch2 {
name = "fix-wakeup-consumption-revert.patch";
url = "https://github.com/curl/curl/commit/2a2104f3cff44bb28bb570a093be52bbeeed8f23.patch";
hash = "sha256-dkwr1ZaR7XB408JxeIKhuHxJrlwf3J01jL6lnOLXo1I=";
revert = true;
})
];
}
)
else
# Filter out the version backported in Nixpkgs
# https://github.com/NixOS/nixpkgs/issues/534713#event-27130052199
curl.overrideAttrs (prev: {
patches = lib.filter (patch: !lib.strings.hasSuffix "fix-wakeup-consumption.patch" patch) (
prev.patches or [ ]
);
});
# Avoid a bunch of build closure of the tracer, we just need the dtrace
# generator.