Unverified Commit 4d0ebc41 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #290391 from TomaSajt/catppuccin-python 

python311Packages.catppuccin: 1.3.2 -> 2.2.0, catppuccin-gtk: 0.7.1 -> 0.7.2
parents 3d387e21 31cef167

pkgs/data/themes/catppuccin-gtk/default.nix

+11 −2
Original line number Diff line number Diff line 
{ lib

, stdenvNoCC

, fetchFromGitHub

, fetchpatch

, gtk3

, colloid-gtk-theme

, gnome-themes-extra
@@ -29,19 +30,27 @@ lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks 


stdenvNoCC.mkDerivation rec {

  inherit pname;

  version = "0.7.1";

  version = "0.7.2";



  src = fetchFromGitHub {

    owner = "catppuccin";

    repo = "gtk";

    rev = "v${version}";

    hash = "sha256-V3JasiHaATbVDQJeJPeFq5sjbkQnSMbDRWsaRzGccXU=";

    hash = "sha256-7EvKcyh9gH/QbiXKlyAKMSBXMF3DmbHD+wJD3Sq39DE=";

  };



  nativeBuildInputs = [ gtk3 sassc ];



  patches = [

    ./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 = [

pkgs/development/python-modules/catppuccin/default.nix

+2 −10
Original line number Diff line number Diff line
@@ -10,10 +10,7 @@ 


buildPythonPackage rec {

  pname = "catppuccin";

  version = "1.3.2";

  # 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

  version = "2.2.0";



  pyproject = true;
@@ -21,7 +18,7 @@ buildPythonPackage rec { 
    owner = "catppuccin";

    repo = "python";

    rev = "refs/tags/v${version}";

    hash = "sha256-spPZdQ+x3isyeBXZ/J2QE6zNhyHRfyRQGiHreuXzzik=";

    hash = "sha256-+V1rln3FlFvs1FEIANIch7k/b2EsI9xBxhg3Bwg99+I=";

  };



  build-system = [
@@ -38,11 +35,6 @@ buildPythonPackage rec { 
    pytestCheckHook

  ] ++ 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" ];



  meta = {