Skip to content

[gnome] updates and fixes for gnome 47 and gcc 14#343127

Closed
fabianhjr wants to merge 9 commits intoNixOS:gnomefrom
fabianhjr:upstream-gnome-fixes
Closed

[gnome] updates and fixes for gnome 47 and gcc 14#343127
fabianhjr wants to merge 9 commits intoNixOS:gnomefrom
fabianhjr:upstream-gnome-fixes

Conversation

@fabianhjr
Copy link
Member

@fabianhjr fabianhjr commented Sep 19, 2024

Description of changes

Targetting gnome update branch/merge request: #333911

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@fabianhjr fabianhjr mentioned this pull request Sep 19, 2024
@bobby285271 bobby285271 self-assigned this Sep 19, 2024
@bobby285271
Copy link
Member

bobby285271 commented Sep 19, 2024

Thanks, usually I generate the commits in this way so it can contain the diff url like https://gitlab.gnome.org/GNOME/libdex/-/compare/0.7.1...0.8.0.

# Update everything that uses gnome-update-script
nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: pkg.updateScript.name or null == "gnome-update-script")' --argstr keep-going true --argstr commit true --argstr max-workers 3

# Optional, for some reasons "→" is preferred in GNOME packages
export GIT_EDITOR="sed 's/->/→/' -i"
export GIT_SEQUENCE_EDITOR="sed 's/^pick /reword /' -i"
git rebase $base_commit -i
unset GIT_EDITOR
unset GIT_SEQUENCE_EDITOR

(I will take care of the merge)

@fabianhjr
Copy link
Member Author

Oh, was missing --argstr commit true when I ran the update script Dx

@ofborg ofborg bot added 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-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. labels Sep 20, 2024
@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Sep 20, 2024
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Sep 20, 2024
@honnip
Copy link
Contributor

honnip commented Sep 20, 2024

Can you revert f97b3fe? Then please add extensions for gnome47 to gnomeExtensions set:

gnomeExtensions = lib.trivial.pipe (gnome44Extensions // gnome45Extensions // gnome46Extensions) [

I will update and fetch gnome47 extensions on #335820 I will create a seperate pr targeting gnome branch

@fabianhjr
Copy link
Member Author

Sure, rolling back

@github-actions github-actions bot removed the 6.topic: GNOME GNOME desktop environment and its underlying platform label Sep 20, 2024
@fabianhjr
Copy link
Member Author

Can you revert f97b3fe? Then please add extensions for gnome47 to gnomeExtensions set:

Noticed this was edited, probably will be easier for you to add it to the mentioned merge request @honnip.

@fabianhjr fabianhjr marked this pull request as draft September 23, 2024 05:08
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. and removed 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. labels Sep 24, 2024
@bobby285271
Copy link
Member

Merged:

8448f69 for g-s-d,
e2265d1 for gdm,
56df4b8 for gnome-contacts,
36f62b2 for glib,
db65c15 for at-spi2-core (also fixed diff url),
a3f88b3 for g-d-s,
79f566d for localsearch,
07bc1d0 for tinysparql (also fixed cli test in bd00ee6),
35ce371 for webkitgtk,
2a24dc8 for gnome-session,
4909c37 for seahorse,
07b0166 for gnome-console (also fixed diff url),
734c2a7 for x-d-p-gnome,
d1171cb for orca (also fixed diff url and fixed rotten patch);

The gedit bump requires new tepl (with api breaks) and other libgedit-* bumps, handled as bbf75a3 eade58d e359074 f85803f ce8da79;
The GJS bump integrates gobject-introspection-tests and need some fixups, initially handled as c5ff6da;
The GCC bump was reverted in staging-next, thus I would not look into 004a642 and cf12629 for now.

Thanks again! ❤️

@fabianhjr fabianhjr deleted the upstream-gnome-fixes branch September 25, 2024 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants