parent
d691274a97
commit
89a6254acc
|
@ -23,17 +23,7 @@
|
||||||
, testers
|
, testers
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
stdenv.mkDerivation (finalAttrs: rec {
|
||||||
# Newer versions fail with minimal python, probably because
|
|
||||||
# https://gitlab.gnome.org/GNOME/libxml2/-/commit/b706824b612adb2c8255819c9a55e78b52774a3c
|
|
||||||
# This case is encountered "temporarily" during stdenv bootstrapping on darwin.
|
|
||||||
# Beware that the old version has known security issues, so the final set shouldn't use it.
|
|
||||||
oldVer = python.pname == "python3-minimal";
|
|
||||||
in
|
|
||||||
assert oldVer -> stdenv.isDarwin; # reduce likelihood of using old libxml2 unintentionally
|
|
||||||
|
|
||||||
let
|
|
||||||
libxml = stdenv.mkDerivation (finalAttrs: rec {
|
|
||||||
pname = "libxml2";
|
pname = "libxml2";
|
||||||
version = "2.12.5";
|
version = "2.12.5";
|
||||||
|
|
||||||
|
@ -139,15 +129,4 @@ libxml = stdenv.mkDerivation (finalAttrs: rec {
|
||||||
maintainers = with maintainers; [ eelco jtojnar ];
|
maintainers = with maintainers; [ eelco jtojnar ];
|
||||||
pkgConfigModules = [ "libxml-2.0" ];
|
pkgConfigModules = [ "libxml-2.0" ];
|
||||||
};
|
};
|
||||||
});
|
})
|
||||||
in
|
|
||||||
if oldVer then
|
|
||||||
libxml.overrideAttrs (attrs: rec {
|
|
||||||
version = "2.10.1";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
|
|
||||||
sha256 = "21a9e13cc7c4717a6c36268d0924f92c3f67a1ece6b7ff9d588958a6db9fb9d8";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
else
|
|
||||||
libxml
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user