From 25bc618215a72f681678bf58300f72b1a6f920c4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 4 Jul 2024 19:06:20 +0200
Subject: [PATCH 1/2] =?UTF-8?q?libxml2:=202.12.7=20=E2=86=92=202.13.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- new API with per-context error handlers
- remove HTTP POST support
- zlib, lzma and HTTP disabled by default → removed `zlib`
- Meson support added → cycle, not switching right now
- docs no longer install examples and tutorial was removed → since only `xmllint` and `xmlcatalog` HTML docs remain, move them to `out`
- FTP and `xpointer()` XPath extensions deprecated

https://discourse.gnome.org/t/libxml2-2-12-8-released/21528
https://discourse.gnome.org/t/libxml2-2-13-0-released/21529
https://discourse.gnome.org/t/libxml2-2-13-1-released/21778
https://discourse.gnome.org/t/libxml2-2-13-2-released/22000

Also clean up the expression a bit and install DevHelp files to `devdoc` (previously deleted by multiple-outputs hook).
---
 .../development/libraries/libxml2/default.nix | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 79fe8c9f52dac..92f45907397b7 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchurl
-, zlib
 , pkg-config
 , autoreconfHook
 , libintl
@@ -22,25 +21,20 @@
 , testers
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libxml2";
-  version = "2.12.7";
+  version = "2.13.2";
 
-  outputs = [ "bin" "dev" "out" "doc" ]
+  outputs = [ "bin" "dev" "out" "devdoc" ]
     ++ lib.optional pythonSupport "py"
     ++ lib.optional (enableStatic && enableShared) "static";
   outputMan = "bin";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-    hash = "sha256-JK54/xNjqXPm2L66lBp5RdoqwFbhm1OVautpJ/1s+1Y=";
+    url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor finalAttrs.version}/libxml2-${finalAttrs.version}.tar.xz";
+    hash = "sha256-58j14LVUIVng3cQJwiyRZDBLWB6qmTBlOnb7hFsWkmM=";
   };
 
-  # https://gitlab.gnome.org/GNOME/libxml2/-/issues/725
-  postPatch = if stdenv.hostPlatform.isFreeBSD then ''
-    substituteInPlace ./configure.ac --replace-fail pthread_join pthread_create
-  '' else null;
-
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -59,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: rec {
   ];
 
   propagatedBuildInputs = [
-    zlib
     findXMLCatalogs
   ] ++ lib.optionals stdenv.isDarwin [
     libiconv
@@ -95,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   '';
 
   preInstall = lib.optionalString pythonSupport ''
-    substituteInPlace python/libxml2mod.la --replace "$dev/${python.sitePackages}" "$py/${python.sitePackages}"
+    substituteInPlace python/libxml2mod.la --replace-fail "$dev/${python.sitePackages}" "$py/${python.sitePackages}"
   '';
 
   postFixup = ''
@@ -106,11 +99,10 @@ stdenv.mkDerivation (finalAttrs: rec {
   '';
 
   passthru = {
-    inherit version;
-    pythonSupport = pythonSupport;
+    inherit pythonSupport;
 
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libxml2";
       versionPolicy = "none";
     };
     tests = {

From 9634d9c6399e3f21968cd00f105fbaffd8f85aed Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 4 Jul 2024 19:32:02 +0200
Subject: [PATCH 2/2] =?UTF-8?q?libxslt:=201.1.41=20=E2=86=92=201.1.42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://discourse.gnome.org/t/libxslt-1-1-42-released/22001
---
 pkgs/development/libraries/libxslt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index df04c749d07e8..10ee52a027a35 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -17,14 +17,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxslt";
-  version = "1.1.41";
+  version = "1.1.42";
 
   outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py";
   outputMan = "bin";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libxslt/${lib.versions.majorMinor finalAttrs.version}/libxslt-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OtOSr5ERW3dA97UNIozBxfwTr8HafxbLAhORejf3G9o=";
+    hash = "sha256-hcpiysDUH8d9P2Az2p32/XPSDqL8GLCjYJ/7QRDhuus=";
   };
 
   strictDeps = true;