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.

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

staging-next 2024-04-22 #306080

Merged
merged 773 commits into from
May 3, 2024
Merged

staging-next 2024-04-22 #306080

merged 773 commits into from
May 3, 2024

Conversation

vcunat
Copy link
Member

@vcunat vcunat commented Apr 22, 2024

https://gitlab.gnome.org/GNOME/swell-foop/-/compare/41.1...46.0

Port to GTK4.

Changelog-Reviewed-By: Maxine Aubrey <max@ine.dev>
https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/45.3...46.0

We don't need appstream-util or appstreamcli if we don't run tests.

Changelog-Reviewed-By: Maxine Aubrey <max@ine.dev>
Astavie and others added 2 commits May 2, 2024 10:51
Co-authored-by: PowerUser64 <blake@blakenorth.net>
Co-authored-by: davidak <git@davidak.de>
@jtojnar
Copy link
Contributor

jtojnar commented May 2, 2024

Propagating just gobject-introspection.setupHook wouldn't fix python3Packages.pydbus build, so let me propagate it whole for now. (feel free to improve)

As mentioned above, you would need both the setup hook and glib. gobject-introspection itself is not needed.

To my knowledge you always needed the wrapper for applications for gobject stuff to work.

If you just needed GLib (or other bindings shipped with gobject-introspection), wrapper was not needed since ${gobject-introspection}/lib/girepository-1.0 is implicitly on typelib path. Now that GLib bindings were moved to glib package, ${glib}/lib/girepository-1.0 must be added to GI_TYPELIB_PATH by the wrapper (or gobject-introspection setup hook for build time).

@vcunat
Copy link
Member Author

vcunat commented May 2, 2024

I now tried gobject-introspection.setupHook glib but it didn't suffice for python3Packages.pydbus.

@jtojnar
Copy link
Contributor

jtojnar commented May 2, 2024

Just tried it and it works for me:

diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix
index fc8965fd3538..8e47b4489e17 100644
--- a/pkgs/development/python-modules/pydbus/default.nix
+++ b/pkgs/development/python-modules/pydbus/default.nix
@@ -3,6 +3,8 @@
 , fetchFromGitHub
 , setuptools
 , pygobject3
+, gobject-introspection
+, glib
 }:
 
 buildPythonPackage rec {
@@ -24,12 +26,17 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     setuptools
+    gobject-introspection.setupHook
   ];
 
   propagatedBuildInputs = [
     pygobject3
   ];
 
+  buildInputs = [
+    glib
+  ];
+
   pythonImportsCheck = [
     "pydbus"
     "pydbus.generic"

@vcunat
Copy link
Member Author

vcunat commented May 2, 2024

I was only modifying pygobject3. Maybe I didn't choose the right combination of native and propagated.

@jtojnar
Copy link
Contributor

jtojnar commented May 2, 2024

If I am reading the reference right, I believe, if pygobject3 goes to buildInputs ((0,1)), gobject-introspection.setupHook should go to depsBuildBuildPropagated ((-1,-1)) in pygobject3 to result in (-1,0) (nativeBuildInputs) in dependents, and glib should go to depsHostHostPropagated ((0,0)), if we want it in (0,1) (buildInputs).

@jtojnar
Copy link
Contributor

jtojnar commented May 2, 2024

I tried #308488 and it fixes pydbus but it only works with glib in depsBuildBuildPropagated, not in depsHostHostPropagated I would expect.

Got to run now.

@vcunat vcunat merged commit e96601e into master May 3, 2024
8 of 9 checks passed
@vcunat
Copy link
Member Author

vcunat commented May 3, 2024

Well, it's not great, bringing a few hundred build regressions (closest view probably here so far), mostly because of python packages – but:

  • I see nothing critical
  • just waiting wouldn't help much, most likely
  • ZHF will be soon, so hopefully the issues will attract more attention and get reduced.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet