Skip to content

staging-next 2024-04-22#306080

Merged
vcunat merged 773 commits intomasterfrom
staging-next
May 3, 2024
Merged

staging-next 2024-04-22#306080
vcunat merged 773 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Apr 22, 2024 •
edited
Loading

According to the 24.05 schedule, this is the last staging-next iteration that might contain breaking changes to release critical packages.

Helpful links
Mass breakages

nothing notable so far

@vcunat vcunat added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Apr 22, 2024
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: stdenv Standard environment 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. labels Apr 22, 2024
@jtojnar
Copy link
Member

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
Member

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
Member

jtojnar commented May 2, 2024 •
edited
Loading

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
Member

jtojnar commented May 2, 2024 •
edited
Loading

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.

wegank and others added 16 commits May 2, 2024 12:36
@wegank
Merge pull request #306959 from Astavie/zrythm
d45778e 
zrythm: 1.0.0-beta.4.9.1 -> 1.0.0-rc.1
@wegank
Merge pull request #307509 from alyssais/icon-library-0.0.19
c2b80ca 
icon-library: 0.0.18 -> 0.0.19
@wegank
Merge pull request #308288 from r-ryantm/auto-update/yaru-theme
101cdca 
yaru-theme: 23.10.0 -> 24.04.2
@wegank @Aleksanaa
blanket: avoid double wrapping
63c8837 
Co-authored-by: aleksana <[email protected]>
@wegank
Merge pull request #308444 from afh/update-blanket
1723765 
blanket: 0.6.0 -> 0.7.0
@github-actions
Merge master into staging-next
c4dfa19
@vcunat
python3Packages.panel,python3Packages.ipympl: fixup src
7e5eff5 
See 6efcc2d7148a#commitcomment-141586816
@github-actions
Merge master into staging-next
31135da
@wegank
ucblogo: wrapGAppsHook -> wrapGAppsHook3
a2e3bd8
@github-actions
Merge master into staging-next
3588aea
@github-actions
Merge master into staging-next
095591c
@jackwilsdon @wegank
cosmic-tasks: use renamed wrapGAppsHook3
e428ac5
@vcunat
ceph: fix build of overridden pyopenssl
0fd1859 
(but some other deps are still failing)
@vcunat
ceph: switch python from 3.10 to 3.11
54fd628 
Some of the dependencies wouldn't build anymore:
https://hydra.nixos.org/build/257585236/nixlog/5/tail

Tested on x86_64-linux:
ceph ceph-client ceph-csi ceph-dev ceph.tests
@github-actions
Merge master into staging-next
ae736c7
@vcunat
python3Packages.rpy2: drop already applied patch
2544167
@vcunat vcunat merged commit e96601e into master May 3, 2024
@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.

@jtojnar jtojnar mentioned this pull request May 4, 2024
Merged
@vcunat vcunat mentioned this pull request May 5, 2024
Merged
@jtojnar jtojnar mentioned this pull request May 10, 2024
Closed
@jtojnar jtojnar mentioned this pull request May 18, 2024
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@figsoda figsoda Awaiting requested review from figsoda

@jonringer jonringer Awaiting requested review from jonringer

@mweinelt mweinelt Awaiting requested review from mweinelt

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@marsam marsam Awaiting requested review from marsam

@emilylange emilylange Awaiting requested review from emilylange

@zowoq zowoq Awaiting requested review from zowoq

@winterqt winterqt Awaiting requested review from winterqt

@stigtsp stigtsp Awaiting requested review from stigtsp

@zakame zakame Awaiting requested review from zakame

@dasJ dasJ Awaiting requested review from dasJ

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@Ma27 Ma27 Awaiting requested review from Ma27

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@mkg20001 mkg20001 Awaiting requested review from mkg20001

@jtojnar jtojnar Awaiting requested review from jtojnar

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

@maralorn maralorn Awaiting requested review from maralorn

@ncfavier ncfavier Awaiting requested review from ncfavier

@adisbladis adisbladis Awaiting requested review from adisbladis

@K900 K900 Awaiting requested review from K900

@NickCao NickCao Awaiting requested review from NickCao

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@ttuegel ttuegel Awaiting requested review from ttuegel

@infinisil infinisil Awaiting requested review from infinisil

@teto teto Awaiting requested review from teto

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: cinnamon Desktop environment 6.topic: emacs Text editor 6.topic: Enlightenment DE The Enlightenment Desktop Environment 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: Lumina DE The Lumina Desktop Environment 6.topic: mate The MATE Desktop Environment 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: pantheon The Pantheon desktop environment 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 6.topic: vim Advanced text editor 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 6.topic: xfce The Xfce Desktop Environment 8.has: changelog This PR adds or changes release notes 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.