From 94379d6f90168185a15366b0bf31180b88178b08 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Dec 2022 09:58:57 +0800 Subject: [PATCH 1/9] cinnamon.bulky: 2.5 -> 2.6 https://github.com/linuxmint/bulky/compare/2.5...2.6 --- pkgs/desktops/cinnamon/bulky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 45008a0b7bd0..5aec87bb79e1 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - hash = "sha256-WgpB/oMA3w7KO7KmkGXsl92siFGQo3Y4mLvMLTi54k8="; + hash = "sha256-OI7sIPMZOTmVoWj4Y7kEH0mxay4DwO5kPjclgRDVMus="; }; nativeBuildInputs = [ From f1df989839c28c8b6a1b948fe875fbbf5b5bbf7a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Dec 2022 10:02:40 +0800 Subject: [PATCH 2/9] cinnamon.cinnamon-screensaver: 5.6.1 -> 5.6.2 https://github.com/linuxmint/cinnamon-screensaver/compare/5.6.1...5.6.2 --- pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index f0214f4a48b5..dca6169b0da5 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "5.6.1"; + version = "5.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-dnfUvRlmsdUXfjAxPv+i/uJ8kr0LQ/i7ClUMtjjIWMo="; + hash = "sha256-xsxNGDFiBzVtoCV94iUuia45FRJGyGO522u6p1AIR6g="; }; nativeBuildInputs = [ From 81b9fde6838a7102039af4360bb232cb36b6357a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Dec 2022 10:05:39 +0800 Subject: [PATCH 3/9] cinnamon.warpinator: 1.4.1 -> 1.4.2 https://github.com/linuxmint/warpinator/compare/1.4.1...1.4.2 --- pkgs/desktops/cinnamon/warpinator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index dff70527c082..1db7a858bc78 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "warpinator"; - version = "1.4.1"; + version = "1.4.2"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-gZ19WVolm8uoDZcX3OgLGkB8nFUPZIwCmKGQop9/xJ8="; + hash = "sha256-aiHlBeWGYqSaqvRtwL7smqt4iueIKzQoDawdFSCn6eg="; }; nativeBuildInputs = [ From 8a52c0a3b1853b90e3bab9110dd5032ff84abbee Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Dec 2022 10:07:02 +0800 Subject: [PATCH 4/9] cinnamon.xapp: 2.4.1 -> 2.4.2 https://github.com/linuxmint/xapp/compare/2.4.1...2.4.2 --- pkgs/desktops/cinnamon/xapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 3ed8a0c4f9e2..07b557d65c0d 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.4.1"; + version = "2.4.2"; outputs = [ "out" "dev" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-c86n3aYSS3Klm2HtN8dIN5UvL6Jxz9y1fMF1QAefCIg="; + hash = "sha256-etB+q7FIwbApTUk8RohAy3kHX8Vb4cSY/qkvhj94yTM="; }; nativeBuildInputs = [ From 28b106b5bcf849ffa3f7d91d3c4757985324d393 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Dec 2022 10:08:36 +0800 Subject: [PATCH 5/9] hypnotix: 3.0 -> 3.1 https://github.com/linuxmint/hypnotix/compare/3.0...3.1 --- pkgs/applications/video/hypnotix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index 8bba5c685a4a..c210743f6eae 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-ZSHChUkd1yXVGNUotzyZ9eB7s3apwvRmEJcO5J0vsZQ="; + hash = "sha256-hCVItxvYTE0G5inI/A4w4FYfSfrACINBSaKXhA1mh4A="; }; patches = [ From 0e1cf7fc3c2143335b0c26f855b88cf6952a3786 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Dec 2022 10:09:59 +0800 Subject: [PATCH 6/9] sticky: 1.12 -> 1.13 https://github.com/linuxmint/sticky/compare/1.12...1.13 --- 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 cab49db654e2..384e4f10940e 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -12,14 +12,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sticky"; - version = "1.12"; + version = "1.13"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-kAO8Qz4bTn3+YeIXAvPZ1SpKgn+g+rBgi9+TaqL1vOY="; + hash = "sha256-oirTDIbvG9/iAkYrquX+ciujAnLUmubkBVvTyaiz2g8="; }; postPatch = '' From 118b5e39711bc206dc16c7d2de92aba05db22e84 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Dec 2022 10:21:50 +0800 Subject: [PATCH 7/9] lightdm-slick-greeter: 1.5.9 -> 1.6.0 The greeter sets its own cursor theme and size internally via GtkSettings. https://github.com/linuxmint/slick-greeter/compare/1.5.9...1.6.0 --- .../display-managers/lightdm-slick-greeter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix index fe912d2cc30a..eedfaee00c59 100644 --- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "1.5.9"; + version = "1.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - sha256 = "sha256-UEzidH4ZWggcOWHHuAclHbbgATDBdogL99Ze0PlwRoc="; + sha256 = "sha256-XoGha0DyrtrGXW72Zvnk1FrvULPMYc0FvQj4JFSKxXo="; }; nativeBuildInputs = [ From 1b6468cfb48712cad1d14deaba959ceaf22a9bb3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Dec 2022 10:26:46 +0800 Subject: [PATCH 8/9] nixos/lightdm-greeters/slick: Add options for cursor themes These options are newly added in 1.6.0. --- .../lightdm-greeters/slick.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix index 00fa8af71dc5..4456374cc569 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix @@ -11,6 +11,7 @@ let theme = cfg.theme.package; icons = cfg.iconTheme.package; font = cfg.font.package; + cursors = cfg.cursorTheme.package; slickGreeterConf = writeText "slick-greeter.conf" '' [Greeter] @@ -18,6 +19,8 @@ let theme-name=${cfg.theme.name} icon-theme-name=${cfg.iconTheme.name} font-name=${cfg.font.name} + cursor-theme-name=${cfg.cursorTheme.name} + cursor-theme-size=${toString cfg.cursorTheme.size} draw-user-backgrounds=${boolToString cfg.draw-user-backgrounds} ${cfg.extraConfig} ''; @@ -84,6 +87,33 @@ in }; }; + cursorTheme = { + package = mkOption { + type = types.package; + default = pkgs.gnome.adwaita-icon-theme; + defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme"; + description = lib.mdDoc '' + The package path that contains the cursor theme given in the name option. + ''; + }; + + name = mkOption { + type = types.str; + default = "Adwaita"; + description = lib.mdDoc '' + Name of the cursor theme to use for the lightdm-slick-greeter. + ''; + }; + + size = mkOption { + type = types.int; + default = 24; + description = lib.mdDoc '' + Size of the cursor theme to use for the lightdm-slick-greeter. + ''; + }; + }; + draw-user-backgrounds = mkEnableOption (lib.mdDoc "draw user backgrounds"); extraConfig = mkOption { @@ -107,6 +137,7 @@ in }; environment.systemPackages = [ + cursors icons theme ]; From 35763bc43b61e81c6df3ec20a7380cb8278c294a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Dec 2022 10:38:55 +0800 Subject: [PATCH 9/9] cinnamon.mint-artwork: 1.7.0 -> 1.7.2 Now sets cursor theme and size. --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 4 ++++ pkgs/desktops/cinnamon/mint-artwork/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 25de29554b1e..8e6a44428fce 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -74,6 +74,10 @@ in name = mkDefault "Mint-X-Dark"; package = mkDefault pkgs.cinnamon.mint-x-icons; }; + cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) { + name = mkDefault "Bibata-Modern-Classic"; + package = mkDefault pkgs.cinnamon.mint-cursor-themes; + }; }; services.xserver.displayManager.sessionCommands = '' if test "$XDG_CURRENT_DESKTOP" = "Cinnamon"; then diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index 9c59e381f819..fab1c48578fb 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.7.0"; + version = "1.7.2"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20221130011545/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20221203023403/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" ]; - hash = "sha256-1dBLsN9nTzrqitlwoobYnjh1qKXR6UOaDsTkBMfnX1k="; + hash = "sha256-I8gLWwwuXZkgc5zZ9QVkSarugcNWLFIz2mU1d4QqJRU="; }; nativeBuildInputs = [