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.
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
WIP: gnome3: Update all gnome3. packages #98216
Conversation
And trying this: diff --git i/pkgs/development/libraries/glib/default.nix w/pkgs/development/libraries/glib/default.nix
index 797547cadd2..045560437c4 100644
--- i/pkgs/development/libraries/glib/default.nix
+++ w/pkgs/development/libraries/glib/default.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
]);
nativeBuildInputs = [
- meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
+ meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 buildPackages.git
];
propagatedBuildInputs = [ zlib libffi gettext libiconv ]; I get:
Which seems related to #97008 . |
It's possible to fix this infinite recursion with this: diff --git i/pkgs/development/libraries/glib/default.nix w/pkgs/development/libraries/glib/default.nix
index 797547cadd2..1bb6edff63f 100644
--- i/pkgs/development/libraries/glib/default.nix
+++ w/pkgs/development/libraries/glib/default.nix
@@ -100,15 +100,14 @@ stdenv.mkDerivation rec {
]);
nativeBuildInputs = [
- meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
+ meson ninja pkgconfig perl python3 gettext docbook_xsl docbook_xml_dtd_45
];
propagatedBuildInputs = [ zlib libffi gettext libiconv ];
mesonFlags = [
- # Avoid the need for gobject introspection binaries in PATH in cross-compiling case.
- # Instead we just copy them over from the native output.
- "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}"
+ # Requiring this, requires git, which when evaluated, creates an infinite recursion
+ "-Dgtk_doc=false"
"-Dnls=enabled"
"-Ddevbindir=${placeholder ''dev''}/bin"
]; |
6149d68
to
b4cb712
Compare
Switched target to staging, and fix glib build by disabling dev docs totally. |
I think I need help with gobject introspection's shlib patches - i.e do something similar to this: |
Please see also master...pbogdan:gnome-3.38 and master...hedning:gnome-3.38 Maybe we should start working in the #59372 is also useful for creating updates. |
The issue with GLib docs is that they require gtk-doc >= 1.32.1. When that is not found, it will try to clone it with Git for some reason, instead of throwing a proper error. |
I see. I think that fix is still what's currently proper, since there is no 1.32.1 release according to: https://gitlab.gnome.org/GNOME/gtk-doc/-/tags . |
Also I wonder if it makes sense to include glib update along side GNOME update itself? When I tested with 3.38 pre-release GNOME tarballs nothing needed dev version of glib, it would be surprising to me if that changed. Locally I opted out of glib, librsvg, gobject-introspection and dconf updates - they weren't needed with pre-releases and I figured that considering the impact of each one of those it might be best to update those separately. Although jtojnar would probably know best. |
IIRC we've always hit something needing the newer glib, but if that's avoidable it would make local builds more pleasant and could be worth it tbh. (though I don't think we'll be able to avoid webkitgtk builds :p). |
Yeah, I personally think us as gnome maintainers should be solely responsible for creating the next gnome branch |
Indeed, after updating things I just ran into gvfs-1.46.0 needing newer glib :-/ Anyway, will leave it up to you folks. |
History can be rewritten but certainly having a
|
Re: glib, the update is annoyingly causing some regressions (caught gom, gexiv2 failing their test suites). Will back out gvfs update and see how things go. |
... we already do this |
... Please look at previous PRs #81626. GitHub makes it very easy to delete branches when a PR is merged. I've pushed a gnome-3.38 branch a few minutes ago (though there's no changes there yet). Will ping an infra person to update https://hydra.nixos.org/jobset/nixpkgs/gnome#tabs-configuration when it has something to do. |
OK so I'm closing. Maybe the gnome-3.38 branch should start with the glib update? Then with a hydra jobset it'll be easy to detect regressions? |
FWIW dropping the gvfs and glib updates is sufficient to at least build GNOME installer ISO. |
@doronbehar I don't think @jtojnar or @hedning is going to get this anytime soon (I'm also busy with RM stuff and nixcon). |
Motivation for this change
#95248
Things done
Ran
nix-shell maintainers/scripts/update.nix --argstr path gnome3
.sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)