Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libxml2: 2.12.7 → 2.13.2 #326637

Merged
merged 2 commits into from
Jul 13, 2024
Merged

libxml2: 2.12.7 → 2.13.2 #326637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25bc618
libxml2: 2.12.7 → 2.13.2
jtojnar Jul 4, 2024
9634d9c
libxslt: 1.1.41 → 1.1.42
jtojnar Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions pkgs/development/libraries/libxml2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchurl
, zlib
, pkg-config
, autoreconfHook
, libintl
Expand All @@ -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 = [
Expand All @@ -59,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: rec {
];

propagatedBuildInputs = [
zlib
findXMLCatalogs
] ++ lib.optionals stdenv.isDarwin [
libiconv
Expand Down Expand Up @@ -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 = ''
Expand All @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libxslt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down