dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #203589 from bobby285271/cinnamon

Browse Source 
Cinnamon updates 2022-11-29
This commit is contained in:
Bobby Rong 2022-11-30 20:21:12 +08:00 committed by GitHub
commit d54eca4cbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -171,7 +171,8 @@ in
# theme # theme
sound-theme-freedesktop sound-theme-freedesktop
nixos-artwork.wallpapers.simple-dark-gray nixos-artwork.wallpapers.simple-dark-gray
mint-artwork # cursors mint-artwork
mint-cursor-themes
mint-themes mint-themes
mint-x-icons mint-x-icons
mint-y-icons mint-y-icons

4
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View File

@ -54,13 +54,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cinnamon-common"; pname = "cinnamon-common";
version = "5.6.2"; version = "5.6.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = "cinnamon"; repo = "cinnamon";
rev = version; rev = version;
hash = "sha256-JvdbapOJq2w0tObnGd8t+SLruWN0sblKhSf2dlHR9Go="; hash = "sha256-IPu3J05y4xEFn82cI0y9eN+4kJRChKS/zEGZOWaJnZw=";
}; };
patches = [ patches = [

1
pkgs/desktops/cinnamon/default.nix
View File

@ -26,6 +26,7 @@ lib.makeScope pkgs.newScope (self: with self; {
cjs = callPackage ./cjs { }; cjs = callPackage ./cjs { };
nemo = callPackage ./nemo { }; nemo = callPackage ./nemo { };
mint-artwork = callPackage ./mint-artwork { }; mint-artwork = callPackage ./mint-artwork { };
mint-cursor-themes = callPackage ./mint-cursor-themes { };
mint-themes = callPackage ./mint-themes { }; mint-themes = callPackage ./mint-themes { };
mint-x-icons = callPackage ./mint-x-icons { }; mint-x-icons = callPackage ./mint-x-icons { };
mint-y-icons = callPackage ./mint-y-icons { }; mint-y-icons = callPackage ./mint-y-icons { };

8
pkgs/desktops/cinnamon/mint-artwork/default.nix
View File

@ -7,14 +7,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mint-artwork"; pname = "mint-artwork";
version = "1.6.8"; version = "1.7.0";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" "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 = [ nativeBuildInputs = [
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/linuxmint/mint-artwork"; homepage = "https://github.com/linuxmint/mint-artwork";
description = "Artwork for the cinnamon desktop"; 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; platforms = platforms.linux;
maintainers = teams.cinnamon.members; maintainers = teams.cinnamon.members;
}; };

33
pkgs/desktops/cinnamon/mint-cursor-themes/default.nix Normal file
View File

@ -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;
};
}

4
pkgs/desktops/cinnamon/muffin/default.nix
View File

@ -35,7 +35,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "muffin"; pname = "muffin";
version = "5.6.0"; version = "5.6.1";
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-vUkxR3HfzubaOoXxo6xHDLLy+zVBYE9i5s+yp1rbJaw="; hash = "sha256-FpVCIRz1qZhvBR9KARb/CKXYL9t43FF2VqWkHrLdpNc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

8
pkgs/desktops/cinnamon/warpinator/default.nix
View File

@ -15,7 +15,7 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "warpinator"; pname = "warpinator";
version = "1.2.15"; version = "1.4.1";
format = "other"; format = "other";
@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-WLeJTSf8906CjvJvBWnmFRVV1ngOuIK0V/3qZ82Bx7s="; hash = "sha256-gZ19WVolm8uoDZcX3OgLGkB8nFUPZIwCmKGQop9/xJ8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -68,9 +68,13 @@ python3.pkgs.buildPythonApplication rec {
{} + {} +
''; '';
dontWrapGApps = true; # Prevent double wrapping
preFixup = '' preFixup = ''
# these get loaded via import from bin, so don't need wrapping # these get loaded via import from bin, so don't need wrapping
chmod -x+X $out/libexec/warpinator/*.py chmod -x+X $out/libexec/warpinator/*.py
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {