Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9642f121eb1a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c4799f080ba4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 25, 2020

  1. gnome3.mutter: fix desktop freezing after ~50 days idle 

    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/886
    @worldofpeace
    worldofpeace authored and Jon committed Apr 25, 2020
    Copy the full SHA
    bfee698 View commit details

  2. gnome3.mutter328: backports from gnome-3-28 

    (cherry picked from commit d0419f9c25625a6c8a8916351077146c764b0e6c)
    @worldofpeace
    worldofpeace authored and Jon committed Apr 25, 2020
    Copy the full SHA
    c4799f0 View commit details
Showing with 13 additions and 2 deletions.
  1. +2 −2 pkgs/desktops/gnome-3/core/mutter/3.28.nix
  2. +11 −0 pkgs/desktops/gnome-3/core/mutter/default.nix
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/mutter/3.28.nix
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = "74e3126b77eb5f27c0ae3f53b0aff2d2eebc15af"; # patches of tip from gnome-3-28 branch
sha256 = "0gw1n1w3i040w5mv30kkg7g8a59ymjlc5yaklip0ngg8xv76g0zi";
rev = "88e855bf0a5646fdd85a838bfb433451c42513d7"; # patches of tip from gnome-3-28 branch
sha256 = "19k99qkjhk3r8rwa1v6wl0frm1wd95iasqmrb9sadyri0mkwxvg4";
};

patches = [
11 changes: 11 additions & 0 deletions pkgs/desktops/gnome-3/core/mutter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -62,6 +62,17 @@ stdenv.mkDerivation rec {
url = "https://gitlab.gnome.org/GNOME/mutter/commit/8307c0f7ab60760de53f764e6636893733543be8.diff";
sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n";
})

# Fix backported for desktop freezing after ~50 days idle
# https://mail.gnome.org/archives/distributor-list/2020-April/msg00001.html
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/002299fbef2fd99fb36e5b881ed7b4095ff481f6.patch";
sha256 = "0x3kk75rqmcsyzhmhxjnh8n8ng4zyrbmh0yzvc79zcphzmdckavb";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/c2e12b3434967e520dcda76bf1d562676e8961ff.patch";
sha256 = "0l3ckmskxmisbjdhpr30yc2hclyc4l2f0jsgzisnq5aiszy9q0i0";
})
];

postPatch = ''