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

Pantheon use mutter334 #73906

Merged
merged 15 commits into from Apr 6, 2020
Merged

Conversation

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Nov 22, 2019

Motivation for this change

Just opened for my testing and tracking.

Pantheon with latest mutter is almost stable, with only one real issue reported left

and maybe two crashes that I need to debug.

There still needs to be a change for g-s-d 3.32 elementary/gala#518 elementary/greeter#382, but I believe almost everything should be working.

Lastly tracking a weird graphical glitch elementary/os-patches#80, believe that's an issue in mutter which I've kept a patch for in 3.28

If we can't get the fixed timely I might move the patch into gnome3.mutter proper.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

Copy link
Contributor

@jonringer jonringer left a comment

nix-review passes on NixOS
diff LGTM
commits LGTM
can't test, don't run compatible DE

[30 built, 120 copied (350.3 MiB), 61.3 MiB DL]
https://github.com/NixOS/nixpkgs/pull/73906
18 package were built:
pantheon.elementary-greeter pantheon.elementary-gsettings-schemas pantheon.elementary-session-settings pantheon.gala pantheon.switchboard-plug-pantheon-shell pantheon.switchboard-with-plugs pantheon.wingpanel pantheon.wingpanel-applications-menu pantheon.wingpanel-indicator-bluetooth pantheon.wingpanel-indicator-datetime pantheon.wingpanel-indicator-keyboard pantheon.wingpanel-indicator-network pantheon.wingpanel-indicator-nightlight pantheon.wingpanel-indicator-notifications pantheon.wingpanel-indicator-power pantheon.wingpanel-indicator-session pantheon.wingpanel-indicator-sound pantheon.wingpanel-with-indicators
@worldofpeace worldofpeace force-pushed the worldofpeace:pantheon-latest-mutter branch 2 times, most recently from 8085a72 to 7c6660d Dec 8, 2019
@jonringer
Copy link
Contributor

@jonringer jonringer commented Dec 13, 2019

@worldofpeace status?

@worldofpeace
Copy link
Member Author

@worldofpeace worldofpeace commented Dec 13, 2019

These issues need to be fixed before I commit it to NixOS

then it's "sorta" stable and can be improved upon hopefully before our release.

@worldofpeace
Copy link
Member Author

@worldofpeace worldofpeace commented Mar 24, 2020

Yay, everything seems to be fixed upstream and we just need to port over elementary/gala#754 for elementary/greeter#382. I probably can keep it a 3.34 because in 3.36 there's likely missing components.

@worldofpeace
Copy link
Member Author

@worldofpeace worldofpeace commented Mar 28, 2020

Hmm, they've ported everything to 3.36 too. This is looking good.

@worldofpeace worldofpeace force-pushed the worldofpeace:pantheon-latest-mutter branch from 7c6660d to f84a20e Mar 28, 2020
@worldofpeace worldofpeace marked this pull request as ready for review Mar 28, 2020
@worldofpeace worldofpeace added this to the 20.09 milestone Mar 28, 2020
@worldofpeace worldofpeace added this to In progress in Pantheon via automation Mar 28, 2020
@ofborg ofborg bot requested a review from davidak Mar 29, 2020
@worldofpeace worldofpeace force-pushed the worldofpeace:pantheon-latest-mutter branch 4 times, most recently from 99c8c93 to e9ce10c Mar 29, 2020
@worldofpeace
Copy link
Member Author

@worldofpeace worldofpeace commented Apr 1, 2020

The greeter has had the new gala code ported over for media keys:

And I discovered one last major bug, and opened PRs with fixes:

@worldofpeace worldofpeace force-pushed the worldofpeace:pantheon-latest-mutter branch from e9ce10c to 7724612 Apr 3, 2020
@worldofpeace worldofpeace mentioned this pull request Apr 3, 2020
6 of 10 tasks complete
@worldofpeace worldofpeace force-pushed the worldofpeace:pantheon-latest-mutter branch from 7724612 to 7160b7c Apr 6, 2020
@@ -110,7 +110,9 @@ lib.makeScope pkgs.newScope (self: with self; {
# We're using ubuntu and elementary's patchset due to reasons
# explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614
# Take note of "I am holding off on "fixing" this bug for as long as possible."
elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { };
elementary-settings-daemon = callPackage ./services/elementary-settings-daemon {
inherit (gnome3) gnome-desktop;

This comment has been minimized.

@jtojnar

jtojnar Apr 6, 2020
Contributor

Ugh, we should move this to top-level as well.

@worldofpeace worldofpeace force-pushed the worldofpeace:pantheon-latest-mutter branch 2 times, most recently from d309535 to 4b94305 Apr 6, 2020
@worldofpeace worldofpeace force-pushed the worldofpeace:pantheon-latest-mutter branch from 4b94305 to 74e2836 Apr 6, 2020
@worldofpeace worldofpeace force-pushed the worldofpeace:pantheon-latest-mutter branch from 74e2836 to 30fef60 Apr 6, 2020
@worldofpeace
Copy link
Member Author

@worldofpeace worldofpeace commented Apr 6, 2020

Found some bugs with do not disturb not working with the new notification server:
elementary/switchboard-plug-notifications#66
elementary/wingpanel-indicator-notifications#110 (merged)

They were using lookup from SettingsSchemaSource get_default, but without recursive being true.
Reading the docs that is going to always be a problem on NixOS:

The returned source may actually consist of multiple schema sources from different directories, depending on which directories were given in XDG_DATA_DIRS and GSETTINGS_SCHEMA_DIR. For this reason, all lookups performed against the default source should probably be done recursively.

@worldofpeace
Copy link
Member Author

@worldofpeace worldofpeace commented Apr 6, 2020

Woah, thank you @tintou for merging all of those PRs so quickly

@worldofpeace
Copy link
Member Author

@worldofpeace worldofpeace commented Apr 6, 2020

I'm running this just fine. I think I can merge this.
(I wish I could make an exception for 20.03, but I don't know how stable it will be just yet)

@worldofpeace worldofpeace merged commit e41a9d2 into NixOS:master Apr 6, 2020
14 checks passed
14 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="30fef60"; rev="30fef603fbe9c5675ba47de1e8eae89c93c573ed"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="30fef60"; rev="30fef603fbe9c5675ba47de1e8eae89c93c573ed"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="30fef60"; rev="30fef603fbe9c5675ba47de1e8eae89c93c573ed"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="30fef60"; rev="30fef603fbe9c5675ba47de1e8eae89c93c573ed"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="30fef60"; rev="30fef603fbe9c5675ba47de1e8eae89c93c573ed"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="30fef60"; rev="30fef603fbe9c5675ba47de1e8eae89c93c573ed"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="30fef60"; rev="30fef603fbe9c5675ba47de1e8eae89c93c573ed"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Pantheon automation moved this from In progress to Done Apr 6, 2020
@worldofpeace worldofpeace deleted the worldofpeace:pantheon-latest-mutter branch Apr 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Pantheon
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.