From 8a19bf497c05b009d6040d3d0231baa4c27d57d3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Aug 2022 10:49:36 +0800 Subject: [PATCH 1/6] cinnamon.cinnamon-common: 5.4.9 -> 5.4.10 --- .../cinnamon/cinnamon-common/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 3581355387e..d1db0f8a25e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -9,6 +9,7 @@ , cjs , clutter , fetchFromGitHub +, fetchpatch , gdk-pixbuf , libgnomekbd , glib @@ -53,18 +54,31 @@ stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.4.9"; + version = "5.4.10"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-nM87NO/dwOd+hN5/3zX7XUjyKvXh4uDhLcGFcKE9ccA="; + hash = "sha256-yNjFP32+0LXqHfJUxm1A+CTuwny5/IxxT08689f7VlE="; }; patches = [ ./use-sane-install-dir.patch ./libdir.patch + # Re-add libsoup 2.4 as dependency - needed by some applets. + # Can be removed on next update. + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon/commit/76224fe409d074f8a44c70e4fd5e1289f92800b9.patch"; + sha256 = "sha256-nDt4kkK1kVstxbij63XxTJ2L/TM9Q1P6feok3xlPQOM="; + }) + # keybindings.js: Use bindings.get(). + # Can be removed on next update. + # https://github.com/linuxmint/cinnamon/issues/11055 + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon/commit/7724e4146baf8431bc1fb55dce60984e77adef5a.patch"; + sha256 = "sha256-idGtkBa13nmoEprtmAr6OssO16wJwBd16r2ZbbhrYDQ="; + }) ]; buildInputs = [ @@ -95,7 +109,7 @@ stdenv.mkDerivation rec { gsound gtk3 json-glib - libsoup + libsoup # referenced in js/ui/environment.js libstartup_notification libXtst libXdamage From 620175f898f6d7c200ef21803a6d40e30784ec70 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Aug 2022 10:52:20 +0800 Subject: [PATCH 2/6] cinnamon.nemo: 5.4.2 -> 5.4.3 --- 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 4b013050ad8..0490b2b47c7 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.4.2"; + version = "5.4.3"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-Xn9CgGe7j2APaJRLvx58z2w+sN7ZeDScQz53ZBBnsQs="; + sha256 = "sha256-f3rO0lpOcwpSpIpKrslf6/6nqFbbGTwnKbHpWO+Uf+Q="; }; outputs = [ "out" "dev" ]; From 53abe2aa3e442414a93048e9bec79ff78204a6a4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Aug 2022 10:53:59 +0800 Subject: [PATCH 3/6] cinnamon.xreader: 3.4.3 -> 3.4.4 --- pkgs/desktops/cinnamon/xreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index 67983d50569..6073a57b5a4 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-GkJo/wc5StyeQv0pv5XK0Qy3o8EGpfPYY8gOMq0Afgs="; + sha256 = "sha256-uYnQE1GjkUxYlvXSJNmvr6q4OdvAWgv8HqTXk0KkRQM="; }; nativeBuildInputs = [ From ffd1c042421ec9e546cca5b314c1df65ac43930a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Aug 2022 10:59:24 +0800 Subject: [PATCH 4/6] sticky: 1.11 -> 1.12 --- pkgs/applications/misc/sticky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index a66fecd83b7..98c844c696c 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -11,14 +11,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sticky"; - version = "1.11"; + version = "1.12"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-PXJpNKzF9goQvfh3lUUfOaZFessFNrWtg8nMDxPxRMo="; + hash = "sha256-kAO8Qz4bTn3+YeIXAvPZ1SpKgn+g+rBgi9+TaqL1vOY="; }; postPatch = '' From 9c69f307ce6e869b5ff43c242b7cf6d5f5fd9013 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Aug 2022 19:35:43 +0800 Subject: [PATCH 5/6] nixos/cinnamon: install gnome-screenshot Closes #169178 --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 5a7d9e28b5c..26a5191761d 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -212,6 +212,7 @@ in # external apps shipped with linux-mint hexchat gnome-calculator + gnome-screenshot ] config.environment.cinnamon.excludePackages; }) ]; From a29ca0ec205210ff208c5f00d6a5b9d3413f4287 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Aug 2022 20:23:32 +0800 Subject: [PATCH 6/6] cinnamon.cinnamon-common: fix msgfmt path for Spices.py Closes #168924 --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index d1db0f8a25e..efe46904ff9 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -11,6 +11,7 @@ , fetchFromGitHub , fetchpatch , gdk-pixbuf +, gettext , libgnomekbd , glib , gobject-introspection @@ -178,6 +179,8 @@ stdenv.mkDerivation rec { sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon -i ./files/usr/bin/cinnamon-session-cinnamon2d sed "s|/usr/bin|$out/bin|g" -i ./files/usr/share/xsessions/cinnamon.desktop ./files/usr/share/xsessions/cinnamon2d.desktop + sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py + patchShebangs src/data-to-c.pl '';