From 6aeea7045d4ffa527bf778ccd416eb2bfcabe320 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 22 Mar 2023 09:06:28 +0800
Subject: [PATCH 1/4] cinnamon.cinnamon-common: 5.6.7 -> 5.6.8
https://github.com/linuxmint/cinnamon/compare/5.6.7...5.6.8
One of the substitutions has been upstreamed.
---
pkgs/desktops/cinnamon/cinnamon-common/default.nix | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index ef3013f2e404..e50e14ea8d94 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -72,13 +72,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cinnamon-common";
- version = "5.6.7";
+ version = "5.6.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
- hash = "sha256-oBD9jpZSOB7R3bbMv1qOQkkQyFTKkNnNagJ1INeA0s4=";
+ hash = "sha256-qL8GaEH/0d4yEwwdaR55fTp0RitbyptoxKOBO3nmbic=";
};
patches = [
@@ -159,8 +159,6 @@ stdenv.mkDerivation rec {
sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py
- sed "s|/usr/share/%s|/run/current-system/sw/share/%s|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py
-
sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \
-i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js
From f0e5ad300fb2508fea47111991ab030e2b88cc34 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 22 Mar 2023 09:11:29 +0800
Subject: [PATCH 2/4] cinnamon.cinnamon-settings-daemon: 5.6.1 -> 5.6.2
https://github.com/linuxmint/cinnamon-settings-daemon/compare/5.6.1...5.6.2
---
pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
index 1fcc9fb6a29a..5f7ad87d83cb 100644
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
@@ -32,13 +32,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-settings-daemon";
- version = "5.6.1";
+ version = "5.6.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
- hash = "sha256-QR77O3rFfY0+6cKoS75xoFRplNo4nvTMtR2rNKZERYE=";
+ hash = "sha256-IqYfHMjKe7gVsM6HgihQMNkcXSYBOft1lamXOLa1Y8k=";
};
patches = [
From a8a542ebdf9a670c6968d81910709a31c67b1199 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 22 Mar 2023 09:14:04 +0800
Subject: [PATCH 3/4] cinnamon.muffin: 5.6.3 -> 5.6.4
https://github.com/linuxmint/muffin/compare/5.6.3...5.6.4
---
pkgs/desktops/cinnamon/muffin/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix
index 58a9008e3387..ba4eb95a5e95 100644
--- a/pkgs/desktops/cinnamon/muffin/default.nix
+++ b/pkgs/desktops/cinnamon/muffin/default.nix
@@ -35,7 +35,7 @@
stdenv.mkDerivation rec {
pname = "muffin";
- version = "5.6.3";
+ version = "5.6.4";
outputs = [ "out" "dev" "man" ];
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
- hash = "sha256-qcm1CRUMKFx4KDXBnaIVLHuZTzSMEWEBFTWMe85pJDE=";
+ hash = "sha256-NnQ7KF979HnsEc4X/Wf1YOfUvByHvVIdTAcJyUjhsp8=";
};
patches = [
From 4d120a8c5ca88b8aed0bf45a2295ac3ac649893a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 22 Mar 2023 09:16:04 +0800
Subject: [PATCH 4/4] cinnamon.nemo: 5.6.3 -> 5.6.4
https://github.com/linuxmint/nemo/compare/5.6.3...5.6.4
---
pkgs/desktops/cinnamon/nemo/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix
index e25db028fa86..3e9a3e81eb1f 100644
--- a/pkgs/desktops/cinnamon/nemo/default.nix
+++ b/pkgs/desktops/cinnamon/nemo/default.nix
@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "nemo";
- version = "5.6.3";
+ version = "5.6.4";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
- sha256 = "sha256-CuG0s2gtuYwuIvti5xGiGJa5C5IcruFtNhv6s1vcuUA=";
+ sha256 = "sha256-zvELN9ggfmfIEPeD0VEWM25kRi8RWA/aKlrdO5dKX1k=";
};
patches = [