mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge pull request #290391 from TomaSajt/catppuccin-python
python311Packages.catppuccin: 1.3.2 -> 2.2.0, catppuccin-gtk: 0.7.1 -> 0.7.2
This commit is contained in:
commit
4d0ebc4159
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenvNoCC
|
, stdenvNoCC
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, gtk3
|
, gtk3
|
||||||
, colloid-gtk-theme
|
, colloid-gtk-theme
|
||||||
, gnome-themes-extra
|
, gnome-themes-extra
|
||||||
|
@ -29,19 +30,27 @@ lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
inherit pname;
|
inherit pname;
|
||||||
version = "0.7.1";
|
version = "0.7.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "gtk";
|
repo = "gtk";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-V3JasiHaATbVDQJeJPeFq5sjbkQnSMbDRWsaRzGccXU=";
|
hash = "sha256-7EvKcyh9gH/QbiXKlyAKMSBXMF3DmbHD+wJD3Sq39DE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ gtk3 sassc ];
|
nativeBuildInputs = [ gtk3 sassc ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./colloid-src-git-reset.patch
|
./colloid-src-git-reset.patch
|
||||||
|
|
||||||
|
# Can be removed next release
|
||||||
|
# Adds compatibility with the 2.x.x versions of the catppuccin python package
|
||||||
|
(fetchpatch {
|
||||||
|
name = "catppuccin-python-compatibility.patch";
|
||||||
|
url = "https://github.com/catppuccin/gtk/commit/355e12387f73b27cf4734a6a3eb431554fabb74f.patch";
|
||||||
|
hash = "sha256-4vgZbNeGMtsQEitIWDCVb5o4fAjhVu3iIUttUYqtHPc=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -10,10 +10,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "catppuccin";
|
pname = "catppuccin";
|
||||||
version = "1.3.2";
|
version = "2.2.0";
|
||||||
# Note: updating to later versions breaks catppuccin-gtk
|
|
||||||
# It would be ideal to only update this after catppuccin-gtk
|
|
||||||
# gets support for the newer version
|
|
||||||
|
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
|
@ -21,7 +18,7 @@ buildPythonPackage rec {
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "python";
|
repo = "python";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-spPZdQ+x3isyeBXZ/J2QE6zNhyHRfyRQGiHreuXzzik=";
|
hash = "sha256-+V1rln3FlFvs1FEIANIch7k/b2EsI9xBxhg3Bwg99+I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
|
@ -38,11 +35,6 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
] ++ lib.flatten (lib.attrValues optional-dependencies);
|
] ++ lib.flatten (lib.attrValues optional-dependencies);
|
||||||
|
|
||||||
# can be removed next version
|
|
||||||
disabledTestPaths = [
|
|
||||||
"tests/test_flavour.py" # would download a json to check correctness of flavours
|
|
||||||
];
|
|
||||||
|
|
||||||
pythonImportsCheck = [ "catppuccin" ];
|
pythonImportsCheck = [ "catppuccin" ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
Loading…
Reference in a new issue