summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxine Aubrey <maxeaubrey@gmail.com>2021-03-12 01:56:29 +0100
committerMaxine Aubrey <maxeaubrey@gmail.com>2021-03-14 00:58:33 +0100
commit50d6fae3da6200c5b2d9377a6ff005f413163bb4 (patch)
tree4bd7f9035c400fbe98c8075f90123d0eb6d0ee13
parent16845e9e237458b3fe05da872c91b977032ce40f (diff)
downloadnixpkgs-50d6fae3da6200c5b2d9377a6ff005f413163bb4.tar
nixpkgs-50d6fae3da6200c5b2d9377a6ff005f413163bb4.tar.gz
nixpkgs-50d6fae3da6200c5b2d9377a6ff005f413163bb4.tar.bz2
nixpkgs-50d6fae3da6200c5b2d9377a6ff005f413163bb4.tar.lz
nixpkgs-50d6fae3da6200c5b2d9377a6ff005f413163bb4.tar.xz
nixpkgs-50d6fae3da6200c5b2d9377a6ff005f413163bb4.tar.zst
nixpkgs-50d6fae3da6200c5b2d9377a6ff005f413163bb4.zip
gnome3.gnome-control-center: 3.38.1 -> 3.38.4
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-control-center/default.nix21
1 files changed, 2 insertions, 19 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 603aaf1744b..f8c458a3df1 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,6 +1,5 @@
 { fetchurl
 , fetchFromGitLab
-, fetchpatch
 , lib, stdenv
 , substituteAll
 , accountsservice
@@ -70,11 +69,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-control-center";
-  version = "3.38.1";
+  version = "3.38.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d";
+    sha256 = "sha256-SdxjeNTTXBxu1ZIk9WNpFsK2+km7+4tW6xmoTW6QzRk=";
   };
 
   # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
@@ -151,22 +150,6 @@ stdenv.mkDerivation rec {
       inherit glibc libgnomekbd tzdata;
       inherit cups networkmanagerapplet;
     })
-
-    # Fix double free when leaving user accounts panel.
-    # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/853
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/e80b4b5f58f448c5a3d38721f7bba32c413d46e7.patch";
-      sha256 = "GffsSU/uNS0Fg2lXbOuD/BrWBT4D2VKgWNGifG0FBUw=";
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/64686cfee330849945f6ff4dcc43393eb1a6e59c.patch";
-      sha256 = "4VJU0q6qOtGzd/hmDncckInfEjCkC8+lXmDgxwc4VJU=";
-    })
-    # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1173
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/27e1140c9d4ad852b4dc6a132a14cd5532d52997.patch";
-      sha256 = "nU3szjKfXpRek8hhsxiCJNgMeDeIRK3QVo82D9R+kL4=";
-    })
   ];
 
   postPatch = ''