diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-10-13 18:43:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-13 18:43:05 +0200 |
| commit | ef6a273c70b58218884245a1039941f9cbdb3dcb (patch) | |
| tree | 7daed63468d4d5a65d69f1406b3998f82382dcff | |
| parent | 32aefe2e360739dcf3a6a34f40927097bafc066d (diff) | |
| parent | f32e46451c4d020662eebdb4f26d0ee5d57965a4 (diff) | |
| download | nixpkgs-ef6a273c70b58218884245a1039941f9cbdb3dcb.tar nixpkgs-ef6a273c70b58218884245a1039941f9cbdb3dcb.tar.gz nixpkgs-ef6a273c70b58218884245a1039941f9cbdb3dcb.tar.bz2 nixpkgs-ef6a273c70b58218884245a1039941f9cbdb3dcb.tar.lz nixpkgs-ef6a273c70b58218884245a1039941f9cbdb3dcb.tar.xz nixpkgs-ef6a273c70b58218884245a1039941f9cbdb3dcb.tar.zst nixpkgs-ef6a273c70b58218884245a1039941f9cbdb3dcb.zip | |
Merge pull request #195748 from jtojnar/libxml2
| -rw-r--r-- | pkgs/development/libraries/libxml2/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/libraries/libxslt/default.nix | 4 |
2 files changed, 4 insertions, 16 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 3fe272591e1..cf19ec65d08 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="; - }) ]; strictDeps = true; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 5e520c315f7..9d39c6bf8b3 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -17,14 +17,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="; }; strictDeps = true; |