cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #195748 from jtojnar/libxml2

Browse source
This commit is contained in:
Martin Weinelt 2022-10-13 18:43:05 +02:00 committed by GitHub
commit ef6a273c70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/libraries/libxml2/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv { stdenv
, lib , lib
, fetchurl , fetchurl
, fetchpatch
, zlib , zlib
, pkg-config , pkg-config
, autoreconfHook , autoreconfHook
@ -22,7 +21,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libxml2"; pname = "libxml2";
version = "2.10.0"; version = "2.10.2";
outputs = [ "bin" "dev" "out" "doc" ] outputs = [ "bin" "dev" "out" "doc" ]
++ lib.optional pythonSupport "py" ++ lib.optional pythonSupport "py"
@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "LdMxEOp3hnbeFL6kmZ7hFzxMpV1f8UUryiJOBvAVJZU="; sha256 = "0kCr5tqcZcsZAN2b86NQHM+Is8Khy5gxfQPyct2lsmU=";
}; };
patches = [ patches = [
@ -47,17 +46,6 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/pull/63174 # https://github.com/NixOS/nixpkgs/pull/63174
# https://github.com/NixOS/nixpkgs/pull/72342 # https://github.com/NixOS/nixpkgs/pull/72342
./utf8-xmlErrorFuncHandler.patch ./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; strictDeps = true;

4
pkgs/development/libraries/libxslt/default.nix
View file

@ -17,14 +17,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libxslt"; pname = "libxslt";
version = "1.1.36"; version = "1.1.37";
outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py"; outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py";
outputMan = "bin"; outputMan = "bin";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "EoSPCkQI9ltTDTlizZ/2cLaueWGRz+/zdSK1dy3o3I4="; sha256 = "Oksn3IAnzNYUZyWVAzbx7FIJKPMg8UTrX6eZCuYSOrQ=";
}; };
strictDeps = true; strictDeps = true;