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

GNOME updates 2024-07-03 #324341

Merged
merged 15 commits into from
Jul 5, 2024
Merged

GNOME updates 2024-07-03 #324341

merged 15 commits into from
Jul 5, 2024

Conversation

bobby285271
Copy link
Member

@bobby285271 bobby285271 commented Jul 3, 2024

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.

@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Jul 3, 2024
@bobby285271
Copy link
Member Author

bobby285271 commented Jul 3, 2024

@ofborg build gnome.gnome-shell gnome.gnome-control-center
@ofborg test gnome

@jtojnar
Copy link
Member

jtojnar commented Jul 4, 2024

Thanks. Changes look okay, here is a few things I noticed:

epiphany: 46.1 -> 46.2

No arrow.

gexiv2: 0.14.2 → 0.14.3

Deprecation of two functions is weard in a patch version but probably should not be an obstacle for backport.

gnome.gnome-control-center: 46.2 → 46.3

https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/51bf36ac68051aaf183c1aa0b45b8af7cc479c70 sounds like an easy way to skip some tests, maybe upstream should use auto features so that distros can turn it into hard dependency.

Also the Xvfb check sounds like maybe we no longer need to use xvfb-run.

gnome.gnome-initial-setup: 46.2 → 46.3
I don't know why we need to set PKG_CONFIG_SYSTEMD_SYSUSERSDIR so I just dropped it,
it looks like the prefix is properly replaced in upstream's meson.build via pkgconfig_define.

👍 Looks like it used prefix from the start. Maybe we had a systemd version that used a different variable at the time – I recall there were some issues regarding this in the past.

https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/46.2...46.3.1
I am mostly confused by b9b5f9a, actually I don't think we need jasmine-gjs in 46.x.

I think that is used by tests, which we do not run, so it is not relevant for now. Also, you are right, GNOME Shell only switched to Jasmine from jsUnit last month, so the commit message is probably unchanged from the cherry-picked commit.

Also looks like it removes gtk3 and libstartup_notification dependencies: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/27b9985da3f4e098e1bb9aa27a15d9151af7efc4

https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/46.2...46.3

Some tests are now disabled if Xvfb is missing, I imagine we don't need xvfb-run when
the X11SessionTestCase helper actually takes care of X and system/session bus.
https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/51bf36ac68051aaf183c1aa0b45b8af7cc479c70
https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/46.2...46.3

I don't know why we need to set PKG_CONFIG_SYSTEMD_SYSUSERSDIR so I just dropped it,
it looks like the prefix is properly replaced in upstream's meson.build via pkgconfig_define.
python3.pkgs.python-dbusmock
setxkbmap
xvfb-run
xorgserver
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add comment it is for Xvfb?

Interestingly, it has been used since 3.29 (PR for dbusmock inclusion pending).

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Jul 5, 2024
@ofborg ofborg bot requested a review from jtojnar July 5, 2024 15:01
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jul 5, 2024
@jtojnar jtojnar merged commit 35a90c3 into NixOS:master Jul 5, 2024
24 checks passed
@jtojnar
Copy link
Member

jtojnar commented Jul 5, 2024

Thanks.

@bobby285271 bobby285271 deleted the upd/gnome branch July 5, 2024 23:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants