From 0ddb34290f4028d782b3f0c0258147fc50b619b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 May 2023 20:21:03 +0200 Subject: [PATCH 1/2] python311Packages.colout: 0.12.0 -> 1.1 Diff: https://github.com/nojhan/colout/compare/v0.12.0...v1.1 --- pkgs/development/python-modules/colout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colout/default.nix b/pkgs/development/python-modules/colout/default.nix index 459b3f1abf9d..66b8f69c57ed 100644 --- a/pkgs/development/python-modules/colout/default.nix +++ b/pkgs/development/python-modules/colout/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "colout"; - version = "0.12.0"; + version = "1.1"; src = fetchFromGitHub { owner = "nojhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5ETKNo3KfncnnLTClA6BnQA7SN5KwwsLdQoozI9li7I="; + sha256 = "sha256-7Dtf87erBElqVgqRx8BYHYOWv1uI84JJ0LHrcneczCI="; }; nativeBuildInputs = [ From c064985640cf4544dd4f7a9bce249d5c77e5003c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 May 2023 20:29:56 +0200 Subject: [PATCH 2/2] python311Packages.colout: specify license - disable on unsupported Python releases - clean-up inputs - add format --- .../python-modules/colout/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/colout/default.nix b/pkgs/development/python-modules/colout/default.nix index 66b8f69c57ed..0679270200d8 100644 --- a/pkgs/development/python-modules/colout/default.nix +++ b/pkgs/development/python-modules/colout/default.nix @@ -3,35 +3,38 @@ , buildPythonPackage , fetchFromGitHub , pygments -, python3Packages +, pythonOlder , setuptools-scm }: buildPythonPackage rec { pname = "colout"; version = "1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nojhan"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-7Dtf87erBElqVgqRx8BYHYOWv1uI84JJ0LHrcneczCI="; + rev = "refs/tags/v${version}"; + hash = "sha256-7Dtf87erBElqVgqRx8BYHYOWv1uI84JJ0LHrcneczCI="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ - babel - pygments setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ babel pygments ]; - pythonImportsCheck = [ "colout" ]; + pythonImportsCheck = [ + "colout" + ]; # This project does not have a unit test doCheck = false; @@ -39,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Color Up Arbitrary Command Output"; homepage = "https://github.com/nojhan/colout"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ badele ]; }; }