| 20 Sep 2025 |
 Grimmauld (any/all) | and we'll be losing devdoc too | 10:17:54 |
 Alyssa Ross | I mean it sounded like it didn't need to require doxygen in that case | 10:17:55 |
| Alyssa Ross | So make it not require doxygen in that case | 10:18:05 |
| Grimmauld (any/all) | diff --git a/pkgs/development/libraries/libxml2/common.nix b/pkgs/development/libraries/libxml2/common.nix
index eb16734eede4..b9ba6c1937cf 100644
--- a/pkgs/development/libraries/libxml2/common.nix
+++ b/pkgs/development/libraries/libxml2/common.nix
@@ -4,20 +4,12 @@
lib,
pkg-config,
autoreconfHook,
- python3,
+ python3Packages,
+ doxygen,
ncurses,
findXMLCatalogs,
libiconv,
- # Python limits cross-compilation to an allowlist of host OSes.
- # https://github.com/python/cpython/blob/dfad678d7024ab86d265d84ed45999e031a03691/configure.ac#L534-L562
- pythonSupport ?
- enableShared
- && (
- stdenv.hostPlatform == stdenv.buildPlatform
- || stdenv.hostPlatform.isCygwin
- || stdenv.hostPlatform.isLinux
- || stdenv.hostPlatform.isWasi
- ),
+ pythonSupport ? false,
icuSupport ? false,
icu,
zlibSupport ? false,
@@ -52,33 +44,28 @@ stdenv'.mkDerivation (finalAttrs: {
"bin"
"dev"
"out"
- "devdoc"
+ # "devdoc"
]
++ lib.optional pythonSupport "py"
++ lib.optional (enableStatic && enableShared) "static";
outputMan = "bin";
- patches = [
- # Unmerged ABI-breaking patch required to fix the following security issues:
- # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
- # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/140
- # See also https://gitlab.gnome.org/GNOME/libxml2/-/issues/906
- # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxml/chromium/xml-attr-extra.patch
- ./xml-attr-extra.patch
- ]
- ++ extraPatches;
+ patches = [ ] ++ extraPatches;
strictDeps = true;
nativeBuildInputs = [
pkg-config
autoreconfHook
+ ]
+ ++ lib.optionals pythonSupport [
+ doxygen
];
buildInputs =
lib.optionals pythonSupport [
ncurses
- python3
+ python3Packages.python
]
++ lib.optionals zlibSupport [
zlib
@@ -100,15 +87,15 @@ stdenv'.mkDerivation (finalAttrs: {
(lib.enableFeature enableShared "shared")
(lib.withFeature icuSupport "icu")
(lib.withFeature pythonSupport "python")
- (lib.optionalString pythonSupport "PYTHON=${python3.pythonOnBuildForHost.interpreter}")
- ]
- # avoid rebuilds, can be merged into list in version bumps
- ++ lib.optional enableHttp "--with-http"
- ++ lib.optional zlibSupport "--with-zlib";
+ (lib.optionalString pythonSupport "PYTHON=${python3Packages.python.pythonOnBuildForHost.interpreter}")
+ (lib.withFeature enableHttp "http")
+ (lib.withFeature zlibSupport "zlib")
+ (lib.withFeature false "docs") # docs are built with xsltproc, which would be a cyclic dependency
+ ];
installFlags = lib.optionals pythonSupport [
- "pythondir=\"${placeholder "py"}/${python3.sitePackages}\""
- "pyexecdir=\"${placeholder "py"}/${python3.sitePackages}\""
+ "pythondir=\"${placeholder "py"}/${python3Packages.python.sitePackages}\""
+ "pyexecdir=\"${placeholder "py"}/${python3Packages.python.sitePackages}\""
];
enableParallelBuilding = true;
@@ -123,7 +110,7 @@ stdenv'.mkDerivation (finalAttrs: {
'';
preInstall = lib.optionalString pythonSupport ''
- substituteInPlace python/libxml2mod.la --replace-fail "$dev/${python3.sitePackages}" "$py/${python3.sitePackages}"
+ substituteInPlace python/libxml2mod.la --replace-fail "$dev/${python3Packages.python.sitePackages}" "$py/${python3Packages.sitePackages}"
'';
postFixup = ''
@@ -159,6 +146,19 @@ stdenv'.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
platforms = lib.platforms.all;
pkgConfigModules = [ "libxml-2.0" ];
+ # Python limits cross-compilation to an allowlist of host OSes.
+ # https://github.com/python/cpython/blob/dfad678d7024ab86d265d84ed45999e031a03691/configure.ac#L534-L562
+ broken =
+ pythonSupport
+ && !(
+ enableShared
+ && (
+ stdenv.hostPlatform == stdenv.buildPlatform
+ || stdenv.hostPlatform.isCygwin
+ || stdenv.hostPlatform.isLinux
+ || stdenv.hostPlatform.isWasi
+ )
+ );
}
// extraMeta;
})
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 08c1cbe5fd03..bcd56ff6e54d 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -34,6 +34,13 @@ let
# same as upstream, fixed conflicts
# https://gitlab.gnome.org/GNOME/libxml2/-/commit/c340e419505cf4bf1d9ed7019a87cc00ec200434
./CVE-2025-6170.patch
+
+ # Unmerged ABI-breaking patch required to fix the following security issues:
+ # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
+ # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/140
+ # See also https://gitlab.gnome.org/GNOME/libxml2/-/issues/906
+ # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxml/chromium/xml-attr-extra.patch
+ ./xml-attr-extra.patch
];
freezeUpdateScript = true;
extraMeta = {
@@ -43,13 +50,13 @@ let
};
};
libxml2 = callPackage ./common.nix {
- version = "2.14.6";
+ version = "2.15.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "libxml2";
tag = "v${packages.libxml2.version}";
- hash = "sha256-EIcNL5B/o74hyc1N+ShrlKsPL5tHhiGgkCR1D7FcDjw=";
+ hash = "sha256-jumHSiIMDzqG2hvPUdcBP8LsszcU+loOY+vqEh/0Yqo=";
};
extraMeta = {
maintainers = with lib.maintainers; [
this builds, but i am worried...
| 10:20:25 |
| Grimmauld (any/all) | * diff --git a/pkgs/development/libraries/libxml2/common.nix b/pkgs/development/libraries/libxml2/common.nix
index eb16734eede4..4b2f04bbc8f0 100644
--- a/pkgs/development/libraries/libxml2/common.nix
+++ b/pkgs/development/libraries/libxml2/common.nix
@@ -5,19 +5,11 @@
pkg-config,
autoreconfHook,
python3,
+ doxygen,
ncurses,
findXMLCatalogs,
libiconv,
- # Python limits cross-compilation to an allowlist of host OSes.
- # https://github.com/python/cpython/blob/dfad678d7024ab86d265d84ed45999e031a03691/configure.ac#L534-L562
- pythonSupport ?
- enableShared
- && (
- stdenv.hostPlatform == stdenv.buildPlatform
- || stdenv.hostPlatform.isCygwin
- || stdenv.hostPlatform.isLinux
- || stdenv.hostPlatform.isWasi
- ),
+ pythonSupport ? false,
icuSupport ? false,
icu,
zlibSupport ? false,
@@ -52,27 +44,21 @@ stdenv'.mkDerivation (finalAttrs: {
"bin"
"dev"
"out"
- "devdoc"
]
++ lib.optional pythonSupport "py"
++ lib.optional (enableStatic && enableShared) "static";
outputMan = "bin";
- patches = [
- # Unmerged ABI-breaking patch required to fix the following security issues:
- # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
- # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/140
- # See also https://gitlab.gnome.org/GNOME/libxml2/-/issues/906
- # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxml/chromium/xml-attr-extra.patch
- ./xml-attr-extra.patch
- ]
- ++ extraPatches;
+ patches = [ ] ++ extraPatches;
strictDeps = true;
nativeBuildInputs = [
pkg-config
autoreconfHook
+ ]
+ ++ lib.optionals pythonSupport [
+ doxygen
];
buildInputs =
@@ -101,10 +87,10 @@ stdenv'.mkDerivation (finalAttrs: {
(lib.withFeature icuSupport "icu")
(lib.withFeature pythonSupport "python")
(lib.optionalString pythonSupport "PYTHON=${python3.pythonOnBuildForHost.interpreter}")
- ]
- # avoid rebuilds, can be merged into list in version bumps
- ++ lib.optional enableHttp "--with-http"
- ++ lib.optional zlibSupport "--with-zlib";
+ (lib.withFeature enableHttp "http")
+ (lib.withFeature zlibSupport "zlib")
+ (lib.withFeature false "docs") # docs are built with xsltproc, which would be a cyclic dependency
+ ];
installFlags = lib.optionals pythonSupport [
"pythondir=\"${placeholder "py"}/${python3.sitePackages}\""
@@ -159,6 +145,19 @@ stdenv'.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
platforms = lib.platforms.all;
pkgConfigModules = [ "libxml-2.0" ];
+ # Python limits cross-compilation to an allowlist of host OSes.
+ # https://github.com/python/cpython/blob/dfad678d7024ab86d265d84ed45999e031a03691/configure.ac#L534-L562
+ broken =
+ pythonSupport
+ && !(
+ enableShared
+ && (
+ stdenv.hostPlatform == stdenv.buildPlatform
+ || stdenv.hostPlatform.isCygwin
+ || stdenv.hostPlatform.isLinux
+ || stdenv.hostPlatform.isWasi
+ )
+ );
}
// extraMeta;
})
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 08c1cbe5fd03..bcd56ff6e54d 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -34,6 +34,13 @@ let
# same as upstream, fixed conflicts
# https://gitlab.gnome.org/GNOME/libxml2/-/commit/c340e419505cf4bf1d9ed7019a87cc00ec200434
./CVE-2025-6170.patch
+
+ # Unmerged ABI-breaking patch required to fix the following security issues:
+ # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
+ # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/140
+ # See also https://gitlab.gnome.org/GNOME/libxml2/-/issues/906
+ # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxml/chromium/xml-attr-extra.patch
+ ./xml-attr-extra.patch
];
freezeUpdateScript = true;
extraMeta = {
@@ -43,13 +50,13 @@ let
};
};
libxml2 = callPackage ./common.nix {
- version = "2.14.6";
+ version = "2.15.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "libxml2";
tag = "v${packages.libxml2.version}";
- hash = "sha256-EIcNL5B/o74hyc1N+ShrlKsPL5tHhiGgkCR1D7FcDjw=";
+ hash = "sha256-jumHSiIMDzqG2hvPUdcBP8LsszcU+loOY+vqEh/0Yqo=";
};
extraMeta = {
maintainers = with lib.maintainers; [
this builds, but i am worried...
| 10:21:54 |
| Grimmauld (any/all) | but i mean if i am the only person carrying along i can probably do whatever and anyone that complains has to do it better... | 10:23:06 |
| Grimmauld (any/all) | and yeah libxslt is failing right after, so we probably can't do that bump yet | 10:25:12 |
 Wolfgang Walther | Related: https://github.com/NixOS/nixpkgs/pull/437567
Might not be the worst pattern in general. | 10:39:06 |
 nim65s | rebuild number seems to be around 2.5k, I'll make individual PR, some on master, others on staging | 10:57:24 |
 K900 | You can just send them all to staging really | 10:59:27 |
| Grimmauld (any/all) | https://github.com/NixOS/nixpkgs/pull/444599
K900 if you ever have cycles to burn, feel free to build this towards libreoffice and tell me what all exploded on the way. I expec tthe explosions to be quite significant, but we should do the libxml upgrade before 25.11 or else we are stuck backporting fixes forever. | 11:08:43 |
| Grimmauld (any/all) | i'd truly be astonished if this worked... | 11:09:52 |
| K900 | Gonna let the Plasma rebuilds run first | 11:12:17 |
| K900 | Should be done soon-ish | 11:12:17 |
| Grimmauld (any/all) | no hurry, libxml 2.15 is something for next cycle | 11:13:31 |
| Grimmauld (any/all) | this libxml update is feeling "fun" and it truly becomes hell if this goes to staging too | 11:13:57 |
 Lun | The pattern is kinda displeasing but it's not more displeasing than the excessive rebuilds it's avoiding so it's impossible to say if it's bad :p | 11:54:31 |
 emily | the Python interface is deprecated and disabled by default now, yes? | 14:01:54 |
| emily | so why don't we just not enable it? | 14:02:14 |
| emily | python-packages.nix can override the flag | 14:02:29 |
| emily | checklist will have the billion PRs to fix packages nobody uses that should be dropped thing. I was thinking about putting up a pinned issue about "hey we expect fallout of major bumps here's the best way to handle it" | 14:04:27 |
 dish [Fox/It/She] | re: glog
ending up just reverting back to original glog for packages that take substantial effort to patch for ng-log. glog is now glog_0_7 in my tree so i'm just using that when things don't build well | 14:16:41 |
| dish [Fox/It/She] | however anything that is trivial to build I'm leaving alone | 14:16:58 |
| dish [Fox/It/She] | * however anything that is trivial to build with nglog is keeping nglog | 14:17:09 |
| emily | not sure we want two packages when we could have one | 14:26:45 |
| emily | even if one is deprecated | 14:26:50 |
| dish [Fox/It/She] | well its either keep glog for now and slowly kill remaining dependents or just never get this PR merged because I don't have the energy to fix every dependent that breaks with nglog
the other option is just abandoning this migration and leaving things as-is | 14:28:56 |
| dish [Fox/It/She] | * well its either keep glog for now and slowly kill remaining dependents or just never get this PR merged because I don't have the energy to fix every dependent that breaks with nglog
the other option is just abandoning this migration and leaving things as-is with glog | 14:29:03 |
| dish [Fox/It/She] | * well its either keep glog for now and slowly kill remaining dependents or just never get this PR merged because I don't have the energy to fix every dependent that breaks with nglog
the other option is just abandoning this migration and leaving things as-is with glog even though it's deprecated | 14:29:08 |
| dish [Fox/It/She] | oh good something fails for unrelated reasons even though I switched back to glog for it | 14:29:22 |
