From 2aff11165bd2cbf7507a83054b80498921630cff Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 13 Oct 2022 00:00:24 +0000 Subject: [PATCH 1/2] =?UTF-8?q?libxml2:=202.10.0=20=E2=86=92=202.10.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.10.1 https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.10.2 https://gitlab.gnome.org/GNOME/libxml2/-/compare/v2.10.0...v2.10.2 --- pkgs/development/libraries/libxml2/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 474afc4ba6ca..6764904a5fc8 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , zlib , pkg-config , autoreconfHook @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libxml2"; - version = "2.10.0"; + version = "2.10.2"; outputs = [ "bin" "dev" "out" "doc" ] ++ lib.optional pythonSupport "py" @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "LdMxEOp3hnbeFL6kmZ7hFzxMpV1f8UUryiJOBvAVJZU="; + sha256 = "0kCr5tqcZcsZAN2b86NQHM+Is8Khy5gxfQPyct2lsmU="; }; patches = [ @@ -47,17 +46,6 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/63174 # https://github.com/NixOS/nixpkgs/pull/72342 ./utf8-xmlErrorFuncHandler.patch - - # Fix PostgreSQL tests - # https://gitlab.gnome.org/GNOME/libxml2/-/issues/397 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/4ad71c2d72beef0d10cf75aa417db10d77846f75.patch"; - sha256 = "gubGDhBhHNYdEty+sFQFd3pSWB9isN5AjD//ksujGQk="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/5b2d07a72670513e41b481a9d922c983a64027ca.patch"; - sha256 = "7jYvMW6bgImXubbaWpQhrIw3xBBnaNn+iJt3EQiW3yU="; - }) ]; nativeBuildInputs = [ From f32e46451c4d020662eebdb4f26d0ee5d57965a4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 13 Oct 2022 00:06:46 +0000 Subject: [PATCH 2/2] =?UTF-8?q?libxslt:=201.1.36=20=E2=86=92=201.1.37?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libxslt/-/tags/v1.1.37 https://gitlab.gnome.org/GNOME/libxslt/-/compare/v1.1.36...v1.1.37 --- 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 29c693891162..ed57ff7cae88 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.36"; + version = "1.1.37"; outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py"; outputMan = "bin"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EoSPCkQI9ltTDTlizZ/2cLaueWGRz+/zdSK1dy3o3I4="; + sha256 = "Oksn3IAnzNYUZyWVAzbx7FIJKPMg8UTrX6eZCuYSOrQ="; }; nativeBuildInputs = [