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: 40 → 41 #139144

Merged
merged 103 commits into from
Oct 11, 2021
Merged

GNOME: 40 → 41 #139144

merged 103 commits into from
Oct 11, 2021

Conversation

jtojnar
Copy link
Member

@jtojnar jtojnar commented Sep 23, 2021

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 25, 2021
@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Sep 26, 2021
@amaxine
Copy link
Contributor

amaxine commented Sep 27, 2021

libvirt-glib doesn't build with glib > 2.69 on the latest release. Reading through commits doesn't look like it's been addressed yet, and after a quick search through the mailing list I didn't see any patches either (not that I was super thorough).

@bobby285271

This comment has been minimized.

@@ -86,27 +83,25 @@ stdenv.mkDerivation rec {
python3
sassc
gi-docgen
libxml2 # for xmllint
Copy link
Member

Choose a reason for hiding this comment

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

Should we make an extra output for xmllint?

Copy link
Member Author

@jtojnar jtojnar Oct 1, 2021

Choose a reason for hiding this comment

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

Unfortunately, that currently is not really possible to do conveniently – build systems generally support only single bindir per project. (Eventually, I want to have Debian-level granularity packages but that would require massive redesign of Meson and porting the affected projects to Meson.) Though, I wonder if we should explicitly list the outputs used (e.g. libxml2.bin here) – it used to be that way in the past.

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/libsoup/3.x.nix Show resolved Hide resolved
Comment on lines +13 to +15
, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
, vala
, withVala ? stdenv.buildPlatform == stdenv.hostPlatform
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be one input called crossCompile or similar?

Copy link
Member Author

Choose a reason for hiding this comment

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

Previously, stdenv.isCross was used but the cross people switched to this.

@jtojnar
Copy link
Member Author

jtojnar commented Oct 2, 2021

All packages under gnome attribute have been bumped and possible problems noticed in changelogs were added to the board. Probably not ready to test on real systems yet. Feel free to lend a hand in triaging them or submitting fixes. Helping with red jobs on Hydra also appreciated.

};

meta = {
description = "C++ wrappers for ATK accessibility toolkit";
Copy link
Member

Choose a reason for hiding this comment

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

Missing maintainer

@t184256
Copy link
Contributor

t184256 commented Oct 5, 2021

I'd like to thank you for this work.

I've given it just 15 minutes so far, but what I see seems to work fine, good enough to write this comment and beyond.
I can log in, open dialogues in firefox and libreoffice look fine too.
WebRTC screen sharing works in firefox. Videos shows videos.
Smoke-tested (apps display a window, said window looks fine): calendar, weather, maps, videos, terminal, calculator, evince, file-roller, gucharmap).
New 'multitasking' section has appeared in the settings just fine, power profiles are now visible in the drop-down in the top right corner.
That's on wayland.

@t184256
Copy link
Contributor

t184256 commented Oct 6, 2021

Yeah, and probably makes sense to update gnome extensions in the same PR.

@fabianhjr
Copy link
Member

Rebased on top of current main branch and had an issue with GNOME Tracker during the checkPhase:

14/33 tracker:resource / resource                             FAIL             0.21s   killed by signal 6 SIGABRT
>>> MALLOC_PERTURB_=217 LANG=en_US.UTF8 TRACKER_LANGUAGE_STOP_WORDS_DIR=/build/tracker-3.2.0/src/libtracker-common/stop-words /build/tracker-3.2.0/build/tests/libtracker-sparql/tracker-resource-test
 ✀  
stdout:
# random seed: R02S1ae5783e1d6e364937c4ae2132ded0db
# Testing Tracker resource abstraction
1..6
# Start of libtracker-sparql tests
# Start of tracker-resource tests
ok 1 /libtracker-sparql/tracker-resource/get_empty
Bail out! Tracker:ERROR:../tests/libtracker-sparql/tracker-resource-test.c:61:test_resource_get_set_simple: 'tracker_resource_get_first_double (resource, "http://example.com/1") == 0.6' should be TRUE
stderr:
**
Tracker:ERROR:../tests/libtracker-sparql/tracker-resource-test.c:61:test_resource_get_set_simple: 'tracker_resource_get_first_double (resource, "http://example.com/1") == 0.6' should be TRUE

@jtojnar
Copy link
Member Author

jtojnar commented Oct 7, 2021

Weird, that does not look like something that should fail:

https://gitlab.gnome.org/GNOME/tracker/-/blob/255c935754ca6c0b6a0e05fd411c21c7364ea5cd/tests/libtracker-sparql/tracker-resource-test.c#L61

I was not able to reproduce it so probably something transient.

@fabianhjr
Copy link
Member

Disabled the checkPhase and currently compiling the rest of changes; couldn't really find a cause but will try to debug tomorrow if time permits.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: changelog 8.has: documentation This PR adds or changes documentation labels Oct 7, 2021
@jtojnar
Copy link
Member Author

jtojnar commented Oct 7, 2021

Completed all the tasks on the to do list, now only fixing hydra builds, updating extensions and testing remains. Any help appreciated.

@fabianhjr
Copy link
Member

fabianhjr commented Oct 7, 2021

GTK WebKit took forever but finally booted into GNOME 41.

Screenshot of gnome-settings showing version information (NixOS 21.11 (dev) and GNOME 41.0)

Only diff from this branch rebased on top of the main branch is:

--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib
     libxml2
+    python3.pkgs.pygobject3
     sqlite
     icu
     libsoup
@@ -76,7 +77,6 @@ stdenv.mkDerivation rec {
   ];
 
   checkInputs = with python3.pkgs; [
-    pygobject3
     tappy
   ];
 
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     "-Ddocs=true"
   ];
 
-  doCheck = true;
+  doCheck = false;
 
   postPatch = ''
     patchShebangs utils/g-ir-merge/g-ir-merge

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 7, 2021
amaxine and others added 18 commits October 9, 2021 21:35
GNOME Shell 41 made the Eval command we use for NixOS tests internal
so in order to be still able to use it, we need to run the shell
in an unsafe mode.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1970
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1983

Hopefully, the test driver will eventually get better so that
we will not need hacks like this forever.
@jtojnar jtojnar merged commit e859225 into master Oct 11, 2021
@jtojnar jtojnar deleted the gnome-41 branch October 11, 2021 20:59
@jtojnar
Copy link
Member Author

jtojnar commented Oct 11, 2021

Hydra jobset is sufficiently completed so I merged this. Extensions can be updated when new versions are released (feel free to open PRs for extensions you use).

Many thanks to everyone who helped with the upgrading or testing.

@bobby285271 bobby285271 mentioned this pull request Oct 12, 2021
12 tasks
@TredwellGit
Copy link
Member

pkgsi686Linux.tracker fails same as #139144 (comment).

@maxhille
Copy link
Contributor

nixos-unstable is now broken for me, too.

running tests
ninja: Entering directory `/build/tracker-3.2.0/build'
ninja: no work to do.
 1/33 tracker:functional / fts-functions                      OK               0.89s
 2/33 tracker:functional / sparql-bugs                        OK               0.92s
 3/33 tracker:functional / query                              OK               1.32s
 4/33 tracker:functional / group-concat                       OK               0.68s
 5/33 tracker:functional / coalesce                           OK               0.77s
 6/33 tracker:functional / insertion                          OK               1.84s
 7/33 tracker:functional / distance                           OK               0.73s
 8/33 tracker:functional / graph                              OK               0.92s
 9/33 tracker:functional / collation                          OK               0.70s
10/33 tracker:functional / notifier                           OK               1.02s
11/33 tracker:functional / concurrent-query                   OK               1.49s
12/33 tracker:functional / ontology-rollback                  OK               0.47s
13/33 tracker:functional+ipc / bus-query-cancellation         OK               0.40s
14/33 tracker:gvdb / gvdb                                     OK               0.01s
15/33 tracker:common / file-utils                             OK               0.01s
16/33 tracker:common / utils                                  OK               0.01s
17/33 tracker:data / crc32                                    OK               0.02s
18/33 tracker:data / ontology-change                          OK               0.58s
19/33 tracker:data / ontology-error                           OK               0.03s
20/33 tracker:data / sparql-blank                             OK               0.07s
21/33 tracker:functional / cli                                OK               1.74s
22/33 tracker:data / insert-or-replace                        OK               0.37s
23/33 tracker:functional / ontology-changes                   OK               2.60s
24/33 tracker:functional / portal                             OK               2.89s
25/33 tracker:fts / fts                                       OK               0.39s
26/33 tracker:resource / resource                             FAIL             0.12s   killed by signal 6 SIGABRT
>>> MALLOC_PERTURB_=186 LANG=en_US.UTF8 TRACKER_LANGUAGE_STOP_WORDS_DIR=/build/tracker-3.2.0/src/libtracker-common/stop-words /build/tracker-3.2.0/build/tests/libtracker-sparql/tracker-resource-test
 ✀
stdout:
# random seed: R02S9bb64c7f3a28fd1d4cbc9738781ee4e8
# Testing Tracker resource abstraction
1..6
# Start of libtracker-sparql tests
# Start of tracker-resource tests
ok 1 /libtracker-sparql/tracker-resource/get_empty
Bail out! Tracker:ERROR:../tests/libtracker-sparql/tracker-resource-test.c:61:test_resource_get_set_simple: 'tracker_resource_get_first_double (resource, "http://example.com/1") == 0.6' should be TRUE
stderr:
**
Tracker:ERROR:../tests/libtracker-sparql/tracker-resource-test.c:61:test_resource_get_set_simple: 'tracker_resource_get_first_double (resource, "http://example.com/1") == 0.6' should be TRUE


27/33 tracker:data+slow / ontology                            OK               3.64s
28/33 tracker:data / service                                  OK               5.40s
29/33 tracker:data+slow / sparql                              OK               6.75s
30/33 tracker:sparql / sparql                                 OK               0.44s
31/33 tracker:sparql / statement                              OK               0.57s
32/33 tracker:examples / endpoint                             OK               0.59s
33/33 tracker:sparql / fd                                     OK               0.91s

Summary of Failures:

26/33 tracker:resource / resource                     FAIL             0.12s   killed by signal 6 SIGABRT


Ok:                 32
Expected Fail:      0
Fail:               1
Unexpected Pass:    0
Skipped:            0
Timeout:            0

Full log written to /build/tracker-3.2.0/build/meson-logs/testlog.txt
builder for '/nix/store/d67j41d88js80c6rvk7d6fpap7ilmczd-tracker-3.2.0.drv' failed with exit code 1
cannot build derivation '/nix/store/yw942n07506d9gfkcxc2j0mz83i15j39-gtk+3-3.24.30.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/vh65pnvg2h1rv5gcm6kbrk0y4cwbvv77-steam-usr-multi.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/xv3xrn6fs6w2pyds8dh9hvwcp8vs2sg2-steam-fhs.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/1ivxvf5svrz2k27bgcrz0a5k1hfiwm3d-steam.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/2g1vib9a53hlx3vn5qkgnlpm8c9mpvp5-steam.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/5qyk5w68qbq5cl0adgp05pzwr0ynxgh7-system-path.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/r911pdavjdg67sfpi19cqkab2nkc34qp-nixos-system-venus-21.11.git.7366ad6608f.drv': 1 dependencies couldn't be built
error: build of '/nix/store/r911pdavjdg67sfpi19cqkab2nkc34qp-nixos-system-venus-21.11.git.7366ad6608f.drv' failed

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 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 8.has: changelog 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+ 10.rebuild-darwin: 2501-5000 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants