mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-28 10:50:15 +00:00
lix: drop curl workaround
Fix landed in 8.22.0
This commit is contained in:
@@ -128,27 +128,6 @@ let
|
||||
printf "%s" "$input" > $out
|
||||
substituteInPlace $out --replace-fail @deps@ "$(cat ${deps})"
|
||||
'';
|
||||
|
||||
# curl 8.21.0 /somehow/ breaks Lix unit tests.
|
||||
# See https://github.com/NixOS/nixpkgs/issues/534713
|
||||
# FIXME remove once fixed
|
||||
curl-fixed = 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;
|
||||
})
|
||||
];
|
||||
}
|
||||
);
|
||||
in
|
||||
# gcc miscompiles coroutines at least until 13.2, possibly longer
|
||||
# do not remove this check unless you are sure you (or your users) will not report bugs to Lix upstream about GCC miscompilations.
|
||||
@@ -266,14 +245,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ]
|
||||
++ lib.optionals (lib.versionAtLeast version "2.94") [ zstd ]
|
||||
++ lib.optionals (withPlugins && finalAttrs.doInstallCheck) [
|
||||
curl-fixed
|
||||
curl
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
brotli
|
||||
bzip2
|
||||
curl-fixed
|
||||
curl
|
||||
capnproto
|
||||
editline
|
||||
openssl
|
||||
|
||||
Reference in New Issue
Block a user