summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-01-08 10:46:54 +0800
committerBobby Rong <rjl931189261@126.com>2023-01-08 10:46:54 +0800
commitcbb0bd35bd7038e85fe894ba212ac1304353e300 (patch)
tree7f8d3bcb36a4351d89564737626d1f9a9b9e92d3 /pkgs/desktops
parent1ccf8fe34c0c9f69887f8f640f8db9f66194a12f (diff)
downloadnixpkgs-cbb0bd35bd7038e85fe894ba212ac1304353e300.tar
nixpkgs-cbb0bd35bd7038e85fe894ba212ac1304353e300.tar.gz
nixpkgs-cbb0bd35bd7038e85fe894ba212ac1304353e300.tar.bz2
nixpkgs-cbb0bd35bd7038e85fe894ba212ac1304353e300.tar.lz
nixpkgs-cbb0bd35bd7038e85fe894ba212ac1304353e300.tar.xz
nixpkgs-cbb0bd35bd7038e85fe894ba212ac1304353e300.tar.zst
nixpkgs-cbb0bd35bd7038e85fe894ba212ac1304353e300.zip
cinnamon.muffin: 5.6.2 -> 5.6.3
https://github.com/linuxmint/muffin/compare/5.6.2...5.6.3
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/cinnamon/muffin/default.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix
index 7b9957f2392..58a9008e338 100644
--- a/pkgs/desktops/cinnamon/muffin/default.nix
+++ b/pkgs/desktops/cinnamon/muffin/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , substituteAll
 , cairo
 , cinnamon-desktop
@@ -36,7 +35,7 @@
 
 stdenv.mkDerivation rec {
   pname = "muffin";
-  version = "5.6.2";
+  version = "5.6.3";
 
   outputs = [ "out" "dev" "man" ];
 
@@ -44,7 +43,7 @@ stdenv.mkDerivation rec {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-bHEBzl0aBXsHOhSWJUz428pG5M6L0s/Q6acKO+2oMXo=";
+    hash = "sha256-qcm1CRUMKFx4KDXBnaIVLHuZTzSMEWEBFTWMe85pJDE=";
   };
 
   patches = [
@@ -52,13 +51,6 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       zenity = gnome.zenity;
     })
-
-    # compositor: Fix crash when restarting Cinnamon
-    # https://github.com/linuxmint/muffin/pull/655
-    (fetchpatch {
-      url = "https://github.com/linuxmint/muffin/commit/1a941ec603a1565dbd2f943f7da6e877d1541bcb.patch";
-      sha256 = "sha256-6x64rWQ20ZjM9z79Pg6QMDPeFN5VNdDHBueRvy2kA6c=";
-    })
   ];
 
   nativeBuildInputs = [