From 6403bcb2abeaf76f4bb88423d19baf0f7fa79996 Mon Sep 17 00:00:00 2001 From: isabel Date: Sun, 20 Oct 2024 21:36:23 +0100 Subject: [PATCH 1/2] catppuccin-cursors: 0.4.0 -> 1.0.0 --- pkgs/by-name/ca/catppuccin-cursors/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin-cursors/package.nix b/pkgs/by-name/ca/catppuccin-cursors/package.nix index 95531507df76..7c4278822e73 100644 --- a/pkgs/by-name/ca/catppuccin-cursors/package.nix +++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix @@ -6,8 +6,10 @@ , xcursorgen , hyprcursor , xcur2png +, catppuccin-whiskers +, python3 +, python3Packages }: - let dimensions = { palette = [ "frappe" "latte" "macchiato" "mocha" ]; @@ -15,7 +17,7 @@ let }; variantName = { palette, color }: palette + color; variants = lib.mapCartesianProduct variantName dimensions; - version = "0.4.0"; + version = "1.0.0"; in stdenvNoCC.mkDerivation { pname = "catppuccin-cursors"; @@ -25,10 +27,10 @@ stdenvNoCC.mkDerivation { owner = "catppuccin"; repo = "cursors"; rev = "v${version}"; - hash = "sha256-VxLwZkZdV1xH4jeqtszqSnhNrgF3uamEXBLPKIc4lXE="; + hash = "sha256-LZ2k8i4w68VW4YFmC659iMQsQyduHJOfyL8cLlXhUHo="; }; - nativeBuildInputs = [ just inkscape xcursorgen hyprcursor xcur2png ]; + nativeBuildInputs = [ just inkscape xcursorgen hyprcursor xcur2png catppuccin-whiskers python3 python3Packages.pyside6 ]; outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage From 51c8f0c76601e3ed9db5eed117313e9fba50d5ff Mon Sep 17 00:00:00 2001 From: isabel Date: Sun, 20 Oct 2024 21:36:53 +0100 Subject: [PATCH 2/2] catppuccin-cursors: format with nixfmt-rfc-style --- .../by-name/ca/catppuccin-cursors/package.nix | 62 ++++++++++++++----- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin-cursors/package.nix b/pkgs/by-name/ca/catppuccin-cursors/package.nix index 7c4278822e73..57357ea47c2b 100644 --- a/pkgs/by-name/ca/catppuccin-cursors/package.nix +++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix @@ -1,19 +1,42 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, inkscape -, just -, xcursorgen -, hyprcursor -, xcur2png -, catppuccin-whiskers -, python3 -, python3Packages +{ + lib, + stdenvNoCC, + fetchFromGitHub, + inkscape, + just, + xcursorgen, + hyprcursor, + xcur2png, + catppuccin-whiskers, + python3, + python3Packages, }: let dimensions = { - palette = [ "frappe" "latte" "macchiato" "mocha" ]; - color = [ "Blue" "Dark" "Flamingo" "Green" "Lavender" "Light" "Maroon" "Mauve" "Peach" "Pink" "Red" "Rosewater" "Sapphire" "Sky" "Teal" "Yellow" ]; + palette = [ + "frappe" + "latte" + "macchiato" + "mocha" + ]; + color = [ + "Blue" + "Dark" + "Flamingo" + "Green" + "Lavender" + "Light" + "Maroon" + "Mauve" + "Peach" + "Pink" + "Red" + "Rosewater" + "Sapphire" + "Sky" + "Teal" + "Yellow" + ]; }; variantName = { palette, color }: palette + color; variants = lib.mapCartesianProduct variantName dimensions; @@ -30,11 +53,20 @@ stdenvNoCC.mkDerivation { hash = "sha256-LZ2k8i4w68VW4YFmC659iMQsQyduHJOfyL8cLlXhUHo="; }; - nativeBuildInputs = [ just inkscape xcursorgen hyprcursor xcur2png catppuccin-whiskers python3 python3Packages.pyside6 ]; + nativeBuildInputs = [ + just + inkscape + xcursorgen + hyprcursor + xcur2png + catppuccin-whiskers + python3 + python3Packages.pyside6 + ]; outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage - outputsToInstall = []; + outputsToInstall = [ ]; buildPhase = '' runHook preBuild