diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-12-14 17:46:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-14 17:46:13 +0100 |
| commit | e76e230f9922599553dae9d11522484ff13cce5f (patch) | |
| tree | 5d0a1f37134956f703d39464269df76296630869 /pkgs/desktops/gnome-3/core | |
| parent | e69c094227f15a16d91dc8f2e15b695cb6781a95 (diff) | |
| parent | 39634ac2b852764946532e7511c58d6b70d87960 (diff) | |
| download | nixpkgs-e76e230f9922599553dae9d11522484ff13cce5f.tar nixpkgs-e76e230f9922599553dae9d11522484ff13cce5f.tar.gz nixpkgs-e76e230f9922599553dae9d11522484ff13cce5f.tar.bz2 nixpkgs-e76e230f9922599553dae9d11522484ff13cce5f.tar.lz nixpkgs-e76e230f9922599553dae9d11522484ff13cce5f.tar.xz nixpkgs-e76e230f9922599553dae9d11522484ff13cce5f.tar.zst nixpkgs-e76e230f9922599553dae9d11522484ff13cce5f.zip | |
Merge pull request #75589 from hedning/gnome-3.34.2
gnome-shell 3.34.2
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/default.nix | 15 |
2 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index e8d5b7dbffd..e2d14ffcd26 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07kd7wdk12nba33jfr44xqdlryiy86wgvsyjs8cw55y8p5cnbn6c"; + sha256 = "0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh"; }; LANG = "en_US.UTF-8"; diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 63136d95f81..61024788f15 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.34.1"; + version = "3.34.2"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13kmmgg2zizr0522clwc2zn3bkwbir503b1wjiiixf5xi37jc65s"; + sha256 = "0b8bz5kvs7rlwvqsg87cf6jhrrj95vgd1l235mjx8rip35ipfvrd"; }; mesonFlags = [ @@ -105,17 +105,6 @@ stdenv.mkDerivation rec { ]; patches = [ - # Fixes from gnome-3-34 branch 2019-11-29. - (fetchpatch { - name = "gnome-3-34-2019-11-29.patch"; - url = "https://github.com/GNOME/mutter/compare/3.34.1...c0e76186da5b7baf7c8804c0ffa80232a5a6bf98.patch"; - excludes = [ - ".gitlab-ci.yml" - ".gitlab-ci/checkout-gnome-shell.sh" - ]; - sha256 = "1qmxic83bd3dvg6isipqy8jaaksd7p5s3cb7h44zinq738n8d0fb"; - }) - # Fix build with libglvnd provided headers (fetchpatch { url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch"; |