git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #75589 from hedning/gnome-3.34.2

gnome-shell 3.34.2

commite76e230f9922599553dae9d11522484ff13cce5f authorTor Hedin Brønner <torhedinbronner@gmail.com> dateSat 14 Dec 2019, 17:46 (7 years ago) parente69c09439634ac
2 files changed+4−15
pkgs/desktops/gnome-3/core/gnome-shell/default.nix+2−2 pkgs/desktops/gnome-3/core/mutter/default.nix+2−13
pkgs/desktops/gnome-3/core/gnome-shell/default.nix+2−2
@@ -15,11 +15,11 @@ let
1515
1616in stdenv.mkDerivation rec {
1717 pname = "gnome-shell";
18− version = "3.34.1";
18+ version = "3.34.2";
1919
2020 src = fetchurl {
2121 url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
22− sha256 = "07kd7wdk12nba33jfr44xqdlryiy86wgvsyjs8cw55y8p5cnbn6c";
22+ sha256 = "0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh";
2323 };
2424
2525 LANG = "en_US.UTF-8";
pkgs/desktops/gnome-3/core/mutter/default.nix+2−13
@@ -42,13 +42,13 @@
4242
4343stdenv.mkDerivation rec {
4444 pname = "mutter";
45− version = "3.34.1";
45+ version = "3.34.2";
4646
4747 outputs = [ "out" "dev" "man" ];
4848
4949 src = fetchurl {
5050 url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
51− sha256 = "13kmmgg2zizr0522clwc2zn3bkwbir503b1wjiiixf5xi37jc65s";
51+ sha256 = "0b8bz5kvs7rlwvqsg87cf6jhrrj95vgd1l235mjx8rip35ipfvrd";
5252 };
5353
5454 mesonFlags = [
@@ -105,17 +105,6 @@ stdenv.mkDerivation rec {
105105 ];
106106
107107 patches = [
108− # Fixes from gnome-3-34 branch 2019-11-29.
109− (fetchpatch {
110− name = "gnome-3-34-2019-11-29.patch";
111− url = "https://github.com/GNOME/mutter/compare/3.34.1...c0e76186da5b7baf7c8804c0ffa80232a5a6bf98.patch";
112− excludes = [
113− ".gitlab-ci.yml"
114− ".gitlab-ci/checkout-gnome-shell.sh"
115− ];
116− sha256 = "1qmxic83bd3dvg6isipqy8jaaksd7p5s3cb7h44zinq738n8d0fb";
117− })
118−
119108 # Fix build with libglvnd provided headers
120109 (fetchpatch {
121110 url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch";