Merge #296684: libxml2: Remove Darwin bootstrapping hack

...into staging

+2 -23
+2 -23
pkgs/development/libraries/libxml2/default.nix
··· 23 , testers 24 }: 25 26 - let 27 - # Newer versions fail with minimal python, probably because 28 - # https://gitlab.gnome.org/GNOME/libxml2/-/commit/b706824b612adb2c8255819c9a55e78b52774a3c 29 - # This case is encountered "temporarily" during stdenv bootstrapping on darwin. 30 - # Beware that the old version has known security issues, so the final set shouldn't use it. 31 - oldVer = python.pname == "python3-minimal"; 32 - in 33 - assert oldVer -> stdenv.isDarwin; # reduce likelihood of using old libxml2 unintentionally 34 - 35 - let 36 - libxml = stdenv.mkDerivation (finalAttrs: rec { 37 pname = "libxml2"; 38 version = "2.12.6"; 39 ··· 139 maintainers = with maintainers; [ eelco jtojnar ]; 140 pkgConfigModules = [ "libxml-2.0" ]; 141 }; 142 - }); 143 - in 144 - if oldVer then 145 - libxml.overrideAttrs (attrs: rec { 146 - version = "2.10.1"; 147 - src = fetchurl { 148 - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; 149 - sha256 = "21a9e13cc7c4717a6c36268d0924f92c3f67a1ece6b7ff9d588958a6db9fb9d8"; 150 - }; 151 - }) 152 - else 153 - libxml
··· 23 , testers 24 }: 25 26 + stdenv.mkDerivation (finalAttrs: rec { 27 pname = "libxml2"; 28 version = "2.12.6"; 29 ··· 129 maintainers = with maintainers; [ eelco jtojnar ]; 130 pkgConfigModules = [ "libxml-2.0" ]; 131 }; 132 + })