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: 4e85c84cc7d6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a001d7cdde02
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 25, 2020

  1. gnome3.mutter: 3.34.4 -> 3.34.5, backports 

    Backports gnome-3-34 patches as well.
    @worldofpeace
    worldofpeace authored and Jon committed Apr 25, 2020
    Copy the full SHA
    3613d9d View commit details

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

    @worldofpeace
    worldofpeace authored and Jon committed Apr 25, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a001d7c View commit details
Showing with 10 additions and 4 deletions.
  1. +2 −2 pkgs/desktops/gnome-3/core/mutter/3.28.nix
  2. +8 −2 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 = [
10 changes: 8 additions & 2 deletions pkgs/desktops/gnome-3/core/mutter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -42,13 +42,13 @@

stdenv.mkDerivation rec {
pname = "mutter";
version = "3.34.4";
version = "3.34.5";

outputs = [ "out" "dev" "man" ];

src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01";
sha256 = "1i3r51ghfld1rf1rczzi3jhybz3mhywqcj2jyiqhfcyp1svlklfi";
};

mesonFlags = [
@@ -111,6 +111,12 @@ stdenv.mkDerivation rec {
sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd";
})

# gnome-3-34 2020-04-24
(fetchpatch {
url = "https://github.com/GNOME/mutter/compare/3.34.5..3bafd234248fdcd84bc62fef5e31c29fbb613909.patch";
sha256 = "1a7krbdfmvx204p6av44rbp4ckp6ddg1mms8wkixxh2p871zq1pi";
})

# Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
# from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
./drop-inheritable.patch