From a1a83834a660fe50daaf60d86a535f4407e0e329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 7 Oct 2019 09:44:44 +0000 Subject: [PATCH] =?UTF-8?q?gnome3.gdm:=203.34.0=20=E2=86=92=203.34.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gdm/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 8b9c3732454..b8a5d70e9d2 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -19,11 +19,11 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "3.34.0"; + version = "3.34.1"; src = fetchurl { url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pnh0nj4kk8n48kgj77bb5r4z5jnb7kxnvpnddk6b9n96g0qwklv"; + sha256 = "1lyqvcwxhwxklbxn4xjswjzr6fhjix6h28mi9ypn34wdm9bzcpg8"; }; # Only needed to make it build @@ -51,18 +51,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = [ - # See: https://gitlab.gnome.org/GNOME/gdm/issues/515 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gdm/commit/0e05e2fd3c2a3b28ed4db0e51e4646aa6af67a5f.patch"; - sha256 = "10kbjn0kis0xf95dfzq4w6xazyfbcz8yj9lrixg5jb3srrnp0hhf"; - }) - - # https://gitlab.gnome.org/GNOME/gdm/merge_requests/84 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gdm/commit/2136c3baab81b6ec2115180f67ada91727e948f7.patch"; - sha256 = "1ispxh4p6hdh3bx9x86497gzlwpgj32x2ymmv60wafg76vmrlcc2"; - }) - # Change hardcoded paths to nix store paths. (substituteAll { src = ./fix-paths.patch;