From 2d2f2738f10b8d066dc1280de8fa1dd7fb9f348d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 29 Nov 2022 19:41:33 +0800 Subject: [PATCH 1/6] cinnamon.mint-cursor-themes: init at unstable-2022-11-29 The cursors are moved from mint-artwork to this new package. --- pkgs/desktops/cinnamon/default.nix | 1 + .../cinnamon/mint-cursor-themes/default.nix | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/desktops/cinnamon/mint-cursor-themes/default.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 5a803c6d487c..fbff8c60fa3f 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -26,6 +26,7 @@ lib.makeScope pkgs.newScope (self: with self; { cjs = callPackage ./cjs { }; nemo = callPackage ./nemo { }; mint-artwork = callPackage ./mint-artwork { }; + mint-cursor-themes = callPackage ./mint-cursor-themes { }; mint-themes = callPackage ./mint-themes { }; mint-x-icons = callPackage ./mint-x-icons { }; mint-y-icons = callPackage ./mint-y-icons { }; diff --git a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix new file mode 100644 index 000000000000..c2190a65308d --- /dev/null +++ b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC +, fetchFromGitHub +, lib +}: + +stdenvNoCC.mkDerivation rec { + pname = "mint-cursor-themes"; + version = "unstable-2022-11-29"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = "aa6bb767831ac43d1768c2e639de713a4a1eba8d"; + hash = "sha256-UQnRrylUo9zuDiAwQ1COtXMtq4XTbxtMle41p+pzxJc="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv usr/share $out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/linuxmint/mint-cursor-themes/"; + description = "Linux Mint cursor themes"; + license = licenses.gpl3Plus; + maintainers = teams.cinnamon.members; + platforms = platforms.linux; + }; +} From 590ec12c5b3cb86b2b9749f8c78900c58f214f6d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 29 Nov 2022 19:55:19 +0800 Subject: [PATCH 2/6] cinnamon.mint-artwork: 1.6.8 -> 1.7.0 The cursors are moved from this package to mint-cursor-themes. usr/share/mint-artwork/sounds/* are updated under a license of cc-by-40. --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 3 ++- pkgs/desktops/cinnamon/mint-artwork/default.nix | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index d5325bc43940..25de29554b1e 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -171,7 +171,8 @@ in # theme sound-theme-freedesktop nixos-artwork.wallpapers.simple-dark-gray - mint-artwork # cursors + mint-artwork + mint-cursor-themes mint-themes mint-x-icons mint-y-icons diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index 68f627feecbd..9c59e381f819 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.6.8"; + version = "1.7.0"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20221129013553/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" ]; - hash = "sha256-HPnb5Mb6tvzREZbW9SyDNQ6ST6RPmOUVdA9MW8oyRAM="; + hash = "sha256-1dBLsN9nTzrqitlwoobYnjh1qKXR6UOaDsTkBMfnX1k="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/linuxmint/mint-artwork"; description = "Artwork for the cinnamon desktop"; - license = licenses.gpl3; # from debian/copyright + license = with licenses; [ gpl3Plus cc-by-40 ]; # from debian/copyright platforms = platforms.linux; maintainers = teams.cinnamon.members; }; From e29abc681d5e7b3bdc2040d86822127af35a80de Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 29 Nov 2022 23:03:12 +0800 Subject: [PATCH 3/6] cinnamon.warpinator: Prevent double wrapping --- pkgs/desktops/cinnamon/warpinator/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 2926760fce59..4130a456d27e 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -68,9 +68,13 @@ python3.pkgs.buildPythonApplication rec { {} + ''; + dontWrapGApps = true; # Prevent double wrapping + preFixup = '' # these get loaded via import from bin, so don't need wrapping chmod -x+X $out/libexec/warpinator/*.py + + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; passthru.updateScript = gitUpdater { From 85c42f95c10194404b410b9a9bdbea36320f3c7c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 29 Nov 2022 23:05:27 +0800 Subject: [PATCH 4/6] cinnamon.warpinator: 1.2.15 -> 1.4.1 https://github.com/linuxmint/warpinator/compare/1.2.15...1.4.1 --- 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 4130a456d27e..dff70527c082 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.2.15"; + version = "1.4.1"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-WLeJTSf8906CjvJvBWnmFRVV1ngOuIK0V/3qZ82Bx7s="; + hash = "sha256-gZ19WVolm8uoDZcX3OgLGkB8nFUPZIwCmKGQop9/xJ8="; }; nativeBuildInputs = [ From 510da3eac16f1443d0950ec59444e2344f6fc441 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 30 Nov 2022 09:29:39 +0800 Subject: [PATCH 5/6] cinnamon.cinnamon-common: 5.6.2 -> 5.6.4 https://github.com/linuxmint/cinnamon/compare/5.6.2...5.6.4 --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index f05fbd54485f..4e09ca3b3d06 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -54,13 +54,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.6.2"; + version = "5.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-JvdbapOJq2w0tObnGd8t+SLruWN0sblKhSf2dlHR9Go="; + hash = "sha256-IPu3J05y4xEFn82cI0y9eN+4kJRChKS/zEGZOWaJnZw="; }; patches = [ From 819d4c500f32fa7a20223244e3bdffbc133b5c60 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 30 Nov 2022 09:32:31 +0800 Subject: [PATCH 6/6] cinnamon.muffin: 5.6.0 -> 5.6.1 https://github.com/linuxmint/muffin/compare/5.6.0...5.6.1 --- 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 241136f6e72a..6a592ac7e42d 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.0"; + version = "5.6.1"; outputs = [ "out" "dev" "man" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-vUkxR3HfzubaOoXxo6xHDLLy+zVBYE9i5s+yp1rbJaw="; + hash = "sha256-FpVCIRz1qZhvBR9KARb/CKXYL9t43FF2VqWkHrLdpNc="; }; nativeBuildInputs = [