summary refs log tree commit diff
path: root/pkgs/desktops/pantheon
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-04-05 10:06:19 +0800
committerBobby Rong <rjl931189261@126.com>2023-04-05 10:06:28 +0800
commitfb85a157c63dad94f8d3b5702119498b99ededb8 (patch)
tree488c51f05273dc651e18e51ff2011c05d3eb8b94 /pkgs/desktops/pantheon
parente3652e0735fbec227f342712f180f4f21f0594f2 (diff)
downloadnixpkgs-fb85a157c63dad94f8d3b5702119498b99ededb8.tar
nixpkgs-fb85a157c63dad94f8d3b5702119498b99ededb8.tar.gz
nixpkgs-fb85a157c63dad94f8d3b5702119498b99ededb8.tar.bz2
nixpkgs-fb85a157c63dad94f8d3b5702119498b99ededb8.tar.lz
nixpkgs-fb85a157c63dad94f8d3b5702119498b99ededb8.tar.xz
nixpkgs-fb85a157c63dad94f8d3b5702119498b99ededb8.tar.zst
nixpkgs-fb85a157c63dad94f8d3b5702119498b99ededb8.zip
pantheon.gala: 7.0.1 -> 7.0.2
https://github.com/elementary/gala/releases/tag/7.0.2
Diffstat (limited to 'pkgs/desktops/pantheon')
-rw-r--r--pkgs/desktops/pantheon/desktop/gala/default.nix26
1 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 32f2a17be27..df430c99ce0 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , pkg-config
 , meson
@@ -26,40 +25,19 @@
 
 stdenv.mkDerivation rec {
   pname = "gala";
-  version = "7.0.1";
+  version = "7.0.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-YHmmF9tYDgMieLCs9My7NU16Ysq4n2sxWT/7MpaerkI=";
+    sha256 = "sha256-+StE63q6niRK7ypFNzSsAQfPmbrzlBKm1GGESBKSSl4=";
   };
 
   patches = [
     # We look for plugins in `/run/current-system/sw/lib/` because
     # there are multiple plugin providers (e.g. gala and wingpanel).
     ./plugins-dir.patch
-
-    # WindowClone: Don't calculate offset
-    # https://github.com/elementary/gala/pull/1567
-    (fetchpatch {
-      url = "https://github.com/elementary/gala/commit/b7139add2333e5419afd1c82c3790d85044c1f76.patch";
-      sha256 = "sha256-QhBARbA3YEXB/RIM/gmFiry1IzGvFFQVXGDs0kGjf20=";
-    })
-
-    # Map notification windows manually while switching workspace
-    # https://github.com/elementary/gala/pull/1577
-    (fetchpatch {
-      url = "https://github.com/elementary/gala/commit/97b33173e2ee8b4a4af3fe0513b6d264de9d9b2a.patch";
-      sha256 = "sha256-y2PicvHxtKlZTpr6a0Hua1ppXpRwDItsIoGG2r+DAjQ=";
-    })
-
-    # Use ClickAction for FramedBackground and close buttons
-    # https://github.com/elementary/gala/pull/1579
-    (fetchpatch {
-      url = "https://github.com/elementary/gala/commit/79453b324d2e737ba32124212632e1269c6c9af1.patch";
-      sha256 = "sha256-ipOoY3dn0Hs1U2d9OER+ZfgC5AL4yay4FD8ongID/xY=";
-    })
   ];
 
   nativeBuildInputs = [