Merge pull request #329736 from trofi/libxml2-update
libxml2: 2.13.2 -> 2.13.3
This commit is contained in:
commit
4180718d7b
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, libintl
|
||||
@ -25,7 +24,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libxml2";
|
||||
version = "2.13.2";
|
||||
version = "2.13.3";
|
||||
|
||||
outputs = [ "bin" "dev" "out" "devdoc" ]
|
||||
++ lib.optional pythonSupport "py"
|
||||
@ -34,28 +33,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor finalAttrs.version}/libxml2-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-58j14LVUIVng3cQJwiyRZDBLWB6qmTBlOnb7hFsWkmM=";
|
||||
hash = "sha256-CAXXwYDPCcqtcWZsekWKdPBBVhpTKQJFTaUEfYOUgTg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix XInclude failing too aggresively.
|
||||
# https://gitlab.gnome.org/GNOME/libxml2/-/issues/772
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/a0330b53c8034bb79220e403e8d4ad8c23ef088f.patch";
|
||||
hash = "sha256-iVAgX8qNF0fw8GYUKsWduudjEuRMEOTAENAIFTjyRjU=";
|
||||
})
|
||||
# Fix error handling
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/ed8b4264f65b1ced1e3b13967dd1cf90102cfa40.patch";
|
||||
hash = "sha256-EvxoUcr+VXBbYvK1PBV+KWcWTDk9rMWf+GXCYvXWDMI=";
|
||||
})
|
||||
# Fix more error handling
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/e30cb632e734394ddbd7bd62b57cee3586424352.patch";
|
||||
hash = "sha256-C0ef17wTRC9rH0dKua/LJwwqTRI5W8sKWmvL7JxzT4o=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
Loading…
Reference in New Issue
Block a user