From cbb0bd35bd7038e85fe894ba212ac1304353e300 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 8 Jan 2023 10:46:54 +0800 Subject: [PATCH] cinnamon.muffin: 5.6.2 -> 5.6.3 https://github.com/linuxmint/muffin/compare/5.6.2...5.6.3 --- pkgs/desktops/cinnamon/muffin/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 7b9957f2392c..58a9008e3387 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 = [