summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2021-09-24 08:30:49 +0800
committerBobby Rong <rjl931189261@126.com>2021-09-24 08:30:49 +0800
commit7dd555c5acff8266b7e2cf7b84dc4ede4aff70fe (patch)
tree85a9ff03432fd49be44b07acc0076479b829475a
parent220f1573eda50e5c872cb8b754c50bd09778f7b0 (diff)
downloadnixpkgs-7dd555c5acff8266b7e2cf7b84dc4ede4aff70fe.tar
nixpkgs-7dd555c5acff8266b7e2cf7b84dc4ede4aff70fe.tar.gz
nixpkgs-7dd555c5acff8266b7e2cf7b84dc4ede4aff70fe.tar.bz2
nixpkgs-7dd555c5acff8266b7e2cf7b84dc4ede4aff70fe.tar.lz
nixpkgs-7dd555c5acff8266b7e2cf7b84dc4ede4aff70fe.tar.xz
nixpkgs-7dd555c5acff8266b7e2cf7b84dc4ede4aff70fe.tar.zst
nixpkgs-7dd555c5acff8266b7e2cf7b84dc4ede4aff70fe.zip
pantheon.gala: 6.0.1 -> 6.2.0
-rw-r--r--pkgs/desktops/pantheon/desktop/gala/default.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 280a6a07576..3f674075133 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -1,7 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
 , nix-update-script
-, fetchpatch
 , pantheon
 , pkg-config
 , meson
@@ -30,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gala";
-  version = "6.0.1";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "0xp9vviamzdwlcnx4836sxaz2pyfkxswgvjm73ppn7fkdm0zjpzx";
+    sha256 = "1yxsfshahaxiqs5waj4v96rhjhdgyd1za4pwlg3vqq51p75k2b1g";
   };
 
   passthru = {
@@ -75,12 +74,6 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    # Upstream code not respecting our localedir
-    # https://github.com/elementary/gala/pull/1205
-    (fetchpatch {
-      url = "https://github.com/elementary/gala/commit/605aa10ea2a78650e001b2a247c5f7afce478b05.patch";
-      sha256 = "0bg67wzrnmx8nlw93i35vhyfx8al0bj0lacgci98vwlp2m1jgbd2";
-    })
     ./plugins-dir.patch
   ];