Merge pull request #203589 from bobby285271/cinnamon
Cinnamon updates 2022-11-29
This commit is contained in:
commit
d54eca4cbb
|
@ -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
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -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 { };
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
33
pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
Normal file
33
pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
Normal 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;
|
||||
};
|
||||
}
|
|
@ -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 = [
|
||||
|
|
|
@ -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 = [
|
||||
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue