From 8e14f63b37be18a0e7b7a533235de31b933bc0c8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 24 Jul 2024 22:20:41 +0100 Subject: [PATCH] libxml2: 2.13.2 -> 2.13.3 Changes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.13.3 --- .../development/libraries/libxml2/default.nix | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 60ac5e2ccbe9..ebac536c4360 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , pkg-config , autoreconfHook , libintl @@ -24,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxml2"; - version = "2.13.2"; + version = "2.13.3"; outputs = [ "bin" "dev" "out" "devdoc" ] ++ lib.optional pythonSupport "py" @@ -33,28 +32,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 = [