diff --git a/packages/coloryou/coloryou.py b/packages/coloryou/coloryou.py index 66c8efbb..e796fde7 100755 --- a/packages/coloryou/coloryou.py +++ b/packages/coloryou/coloryou.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - """ The original script: https://github.com/dharmx/vile/blob/7d486c128c7e553912673755f97b118aaab0193d/src/shell/playerctl.py#L2 diff --git a/packages/coloryou/default.nix b/packages/coloryou/default.nix index 36fdbd7c..72f4faa0 100644 --- a/packages/coloryou/default.nix +++ b/packages/coloryou/default.nix @@ -1,20 +1,24 @@ -{ python3Packages }: +{python3Packages, ...}: let + inherit (builtins.fromTOML (builtins.readFile ./pyproject.toml)) project; +in + python3Packages.buildPythonPackage { + pname = project.name; + inherit (project) version; + pyproject = true; -python3Packages.buildPythonPackage rec { - pname = "coloryou"; - version = "0.0.1"; + src = ./.; - src = ./.; + nativeBuildInputs = with python3Packages; [ + setuptools + ]; - propagatedBuildInputs = with python3Packages; [ utils material-color-utilities ]; + propagatedBuildInputs = with python3Packages; [material-color-utilities]; - postInstall = '' - mv -v $out/bin/coloryou.py $out/bin/coloryou - ''; - - meta = { - description = '' - Get Material You colors from an image. + postInstall = '' + mv -v $out/bin/coloryou.py $out/bin/coloryou ''; - }; -} + + meta = { + inherit (project) description; + }; + } diff --git a/packages/coloryou/pyproject.toml b/packages/coloryou/pyproject.toml new file mode 100644 index 00000000..20797f44 --- /dev/null +++ b/packages/coloryou/pyproject.toml @@ -0,0 +1,12 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "coloryou" +description="Get Material You colors from an image." +version = "0.1.0" + +dependencies = [ + "material_color_utilities_python", +] diff --git a/packages/coloryou/setup.py b/packages/coloryou/setup.py index 24704abc..219405df 100644 --- a/packages/coloryou/setup.py +++ b/packages/coloryou/setup.py @@ -1,7 +1,5 @@ from distutils.core import setup setup( - name='coloryou', - version='0.0.1', scripts=['coloryou.py',], ) diff --git a/packages/coloryou/shell.nix b/packages/coloryou/shell.nix deleted file mode 100644 index 9cb68ec6..00000000 --- a/packages/coloryou/shell.nix +++ /dev/null @@ -1,8 +0,0 @@ -with import {}; -with pkgs.python311Packages; - -buildPythonPackage rec { - name = "coloryou"; - src = ./.; - propagatedBuildInputs = [ material-color-utilities utils ]; -}