[24.11] Backport gnome updates/fixes #365374
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
6.topic: nixos
|
I don't think any of the GNOME packagers use stable so you are on your own testing the changes :-) For commits authored or fixed-up by me: Cinnamon |
bjornfor
force-pushed
the
gnome-backports
branch
from
4077502 to
b8685ae
Compare
Oh :-( (There are many regressions in NixOS 24.11; this is just a step towards fixing one issue: gnome remote desktop.)
Thanks! I dropped them all. The dependent commit had a conflict, so I backed out (dropped 162f433). |
|
Result of 8 packages marked as broken and skipped:
1 package blacklisted:
3 packages failed to build:
299 packages built:
|
They also fail on the base branch (release-24.11). So there should be no build regressions, at least. |
|
I applied this to one of my systems -- no obvious regressions found. |
jtojnar
reviewed
Dec 17, 2024
This matches how `environment.gnome.excludePackages` works elsewhere, and prevents evaluation from failing when an excluded package is not available (e.g. by having a blocklisted license). (cherry picked from commit 8e1ad9b)
Signed-off-by: Sefa Eyeoglu <[email protected]> (cherry picked from commit dc27833)
Signed-off-by: Sefa Eyeoglu <[email protected]> (cherry picked from commit 8816be7)
Signed-off-by: Sefa Eyeoglu <[email protected]> (cherry picked from commit d769a8d)
Signed-off-by: Sefa Eyeoglu <[email protected]> (cherry picked from commit ac1e883)
(cherry picked from commit 607be75)
(cherry picked from commit 240d44b)
upstream determines the gjs path with `find_program('gjs')`, however
this fails to find anything when cross compiling because meson doesn't
know which paths to check.
the interaction between meson's `find_program` and `cross-file` is
documented here:
<https://mesonbuild.com/Reference-manual_functions.html#find_program>
(cherry picked from commit 7a9a2d8)
Changes: https://gitlab.gnome.org/GNOME/vte/-/compare/0.78.1...0.78.2?from_project_id=1893&straight=false (cherry picked from commit a18fac9)
This reverts commit 8816be7. Well this is not a desktop entry... I think. This fixes opening Maps in GNOME (from the activity view) for me: "JS ERROR: Error: Requiring GLib, version 2.0: Typelib file for namespace 'GLib', version '2.0' not found". I learned from the KDE docs[1] that *unlike desktop files*, dbus files should contain full path to the application to start. I tried not using full path previously in a sticky PR[2] and it just fails to start with `org.freedesktop.DBus.Error.Spawn.ExecFailed`. [1]: https://develop.kde.org/docs/features/d-bus/dbus_autostart_services/#creating-a-service-file [2]: linuxmint/sticky#118 (cherry picked from commit d37e098)
(cherry picked from commit 6a56144)
(cherry picked from commit 596eb73)
(cherry picked from commit 60ea1e3)
https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/47.1.1...47.2 * gst-plugins-bad no longer needed: https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/625f1e7a4ef87ed02e14605b567f98217f01a3e1 https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/dd4e25ab6983230238e923e71c6695f158fb7113 (cherry picked from commit c7905a1)
https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/47.1...47.2 (cherry picked from commit 82ad008)
https://gitlab.gnome.org/GNOME/gnome-music/-/compare/47.0...47.1 (cherry picked from commit c913dfa)
https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/47.1...47.2 (cherry picked from commit e574b22)
https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/47.1...47.2 (cherry picked from commit e4e7c17)
https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/47.1...47.2 (cherry picked from commit c2b9cd8)
https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/compare/47.1...47.2 (cherry picked from commit 343e3df)
https://gitlab.gnome.org/GNOME/gnome-user-share/-/compare/47.0...47.2 (cherry picked from commit d211ba7)
https://gitlab.gnome.org/GNOME/gnome-user-docs/-/compare/47.0...47.2 (cherry picked from commit aee56a2)
https://gitlab.gnome.org/GNOME/gtranslator/-/compare/47.0...47.1 (cherry picked from commit 3424852)
https://gitlab.gnome.org/GNOME/localsearch/-/compare/3.8.0...3.8.1 (cherry picked from commit 45961f3)
https://gitlab.gnome.org/GNOME/loupe/-/compare/47.1...47.2 (cherry picked from commit 2ba447b)
https://gitlab.gnome.org/GNOME/mutter/-/compare/47.1...47.3 (cherry picked from commit 4d4cf60)
(cherry picked from commit 2aa1c47)
https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/-/compare/1.2.8...1.4.0 (cherry picked from commit e812c28)
This mostly reverts commit dc27833 (except the "--replace" -> "--replace-fail" part). Same as d37e098 ('Revert "gnome-maps: remove absolute path in desktop entry"'), this is not a desktop entry and dbus files should contain full path to the application to start. Closes NixOS#357955. (cherry picked from commit f765c4f)
bjornfor
force-pushed
the
gnome-backports
branch
from
b8685ae to
a9c7b47
Compare
|
Ok to merge? |
|
Thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Things done
This patch set is made by manually cherry-picking these commits, if
they applied cleanly:
git log --no-merges --oneline --grep=gnome $(git merge-base origin/master origin/release-24.11)..origin/master
Commit 785f561ddc30fdadf3fb2bccbecc348d5024602b
("gnome: replace alias with throw") was deliberately skipped, as I
think it is intended for the next NixOS release.
And then some were dropped as they had more dependencies (with conflicts), or would cause known regressions (as pointed out in code review).
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.