dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #326637 from NixOS/libxml2

Browse Source 
libxml2: 2.12.7 → 2.13.2
This commit is contained in:
Jan Tojnar 2024-07-13 12:53:12 +02:00 committed by GitHub
commit 256178a180
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/libxml2/default.nix
View File

@ -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 = {

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

@ -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;