Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b256b2253c7e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e41a9d21c1c1
Choose a head ref
  • 16 commits
  • 25 files changed
  • 1 contributor

Commits on Apr 6, 2020

  1. gnome3.mutter334: init 

    Used for Pantheon
    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    344a5a7 View commit details

  2. pantheon.mutter: 328 -> 334

    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    20feca4 View commit details

  3. pantheon.elementary-gsettings-schemas: add gala override

    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    548d7ea View commit details

  4. pantheon.elementary-settings-daemon: 3.30.2 -> 3.34.1

    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    a1ced50 View commit details

  5. pantheon.elementary-notifications: init at 2020-04-04

    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    b0f0003 View commit details

  6. nixos/pantheon: use new notifications 

    We have this bug elementary/gala#636
when using notifications in gala. It's likely to not really be fixed
because all development is on the new notifications server.
    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    50fe769 View commit details

  7. pantheon.elementary-session-settings: 5.0.3 -> 2019-11-12 

    So we can drop the meson.patch intree.
    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    741313d View commit details

  8. pantheon.elementary-session-settings: add g-s-d version mappings 

    Needed to have a correct pantheon.session gnome-session file.
    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    53bea37 View commit details

  9. pantheon.gala: use-new-notifications default true

    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    7281bc7 View commit details

  10. pantheon.elementary-default-settings: fix media key syntax

    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    ec3ee84 View commit details

  11. pantheon.wingpanel: 2.3.0 -> 2020-04-04 

    support 3.36
    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    c15059e View commit details

  12. pantheon.elementary-settings-daemon: 3.34.1 -> 3.36.0

    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    acc66c8 View commit details

  13. Revert "pantheon.elementary-settings-daemon: 3.34.1 -> 3.36.0" 

    Mutter 3.36 in gala is almost ready.

This reverts commit 7160b7c31c8a44ffdd0cd0f375624c2c9c834917.
    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    bf0dd34 View commit details

  14. pantheon.wingpanel-indicator-notifications: fix do not disturb

    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    db29696 View commit details

  15. pantheon.switchboard-plug-notifications: fix do not disturb

    @worldofpeace
    worldofpeace committed Apr 6, 2020
    Copy the full SHA
    30fef60 View commit details

  16. Merge pull request #73906 from worldofpeace/pantheon-latest-mutter 

    Pantheon use mutter334
    @worldofpeace
    worldofpeace authored Apr 6, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e41a9d2 View commit details
Showing with 664 additions and 702 deletions.
  1. +1 −0 nixos/modules/services/x11/desktop-managers/pantheon.nix
  2. +0 −147 pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
  3. +0 −97 pkgs/desktops/gnome-3/core/mutter/3.28.nix
  4. +29 −0 pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch
  5. +159 −0 pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
  6. +132 −0 pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch
  7. +2 −2 pkgs/desktops/gnome-3/core/mutter/{fix-paths-328.patch → 3.34/fix-paths.patch}
  8. +25 −0 pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch
  9. +0 −63 pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch
  10. +5 −4 pkgs/desktops/gnome-3/default.nix
  11. +12 −0 pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
  12. +6 −2 pkgs/desktops/pantheon/default.nix
  13. +13 −0 pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
  14. +2 −1 pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
  15. +18 −7 pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
  16. +0 −272 pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch
  17. +1 −0 pkgs/desktops/pantheon/desktop/gala/default.nix
  18. +13 −0 pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch
  19. +12 −0 pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
  20. +3 −3 pkgs/desktops/pantheon/desktop/wingpanel/default.nix
  21. +60 −0 pkgs/desktops/pantheon/services/elementary-notifications/default.nix
  22. +72 −78 pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
  23. +84 −0 pkgs/desktops/pantheon/services/elementary-settings-daemon/elementary-dpms.patch
  24. +0 −11 pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch
  25. +15 −15 pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch
1 change: 1 addition & 0 deletions nixos/modules/services/x11/desktop-managers/pantheon.nix
View file
Original file line number Diff line number Diff line change
@@ -208,6 +208,7 @@ in
# Services
elementary-capnet-assist
elementary-dpms-helper
elementary-notifications
elementary-settings-daemon
pantheon-agent-geoclue2
pantheon-agent-polkit
147 changes: 0 additions & 147 deletions ...ktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
View file

This file was deleted.

97 changes: 0 additions & 97 deletions pkgs/desktops/gnome-3/core/mutter/3.28.nix
View file

This file was deleted.

29 changes: 29 additions & 0 deletions pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From e10186284103d3ad8e425980b096eac813cae631 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 5 Apr 2020 23:06:03 -0400
Subject: [PATCH] Fix glitches in gala

This fixes issues for users of mutter like in gala[0].

Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536
[0]: https://github.com/elementary/gala/issues/605
---
clutter/clutter/clutter-actor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index ecf9a597d..07b8b7155 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -17831,7 +17831,7 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume))
{
priv->paint_volume_valid = TRUE;
- priv->needs_paint_volume_update = FALSE;
+ //priv->needs_paint_volume_update = FALSE;
return &priv->paint_volume;
}
else
--
2.25.1

Loading