From 470909d7353d30ef45c2cd2650797b79d1b1980b Mon Sep 17 00:00:00 2001 From: "florian on nixos (Florian Brandes)" Date: Thu, 24 Mar 2022 21:26:50 +0100 Subject: [PATCH 1/2] python3Packages.add-trailing-comma: init at 2.2.1 Signed-off-by: florian on nixos (Florian Brandes) --- .../add-trailing-comma/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/add-trailing-comma/default.nix diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix new file mode 100644 index 000000000000..17b26a91e3cd --- /dev/null +++ b/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, tokenize-rt +}: + +buildPythonPackage rec { + pname = "add-trailing-comma"; + version = "2.2.1"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "asottile"; + repo = pname; + rev = "v${version}"; + sha256 = "RBOL4mM9VciHHNmCTlRBIoXqeln19MKYxgv9p6GCNvU="; + }; + + propagatedBuildInputs = [ tokenize-rt ]; + + pythonImportsCheck = [ + "add_trailing_comma" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "A tool (and pre-commit hook) to automatically add trailing commas to calls and literals."; + homepage = "https://github.com/asottile/add-trailing-comma"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03f3147e9769..fdb0de93479c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -198,6 +198,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; + add-trailing-comma = callPackage ../development/python-modules/add-trailing-comma { }; + addict = callPackage ../development/python-modules/addict { }; addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; From 30cce69ffa46a727e14a54befd9df18995c8a014 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Mar 2022 15:23:25 +0200 Subject: [PATCH 2/2] python3Packages.add-trailing-comma: remove period --- .../python-modules/add-trailing-comma/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix index 17b26a91e3cd..c38a4f061435 100644 --- a/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "add-trailing-comma"; version = "2.2.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +20,9 @@ buildPythonPackage rec { sha256 = "RBOL4mM9VciHHNmCTlRBIoXqeln19MKYxgv9p6GCNvU="; }; - propagatedBuildInputs = [ tokenize-rt ]; + propagatedBuildInputs = [ + tokenize-rt + ]; pythonImportsCheck = [ "add_trailing_comma" @@ -30,7 +33,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A tool (and pre-commit hook) to automatically add trailing commas to calls and literals."; + description = "A tool (and pre-commit hook) to automatically add trailing commas to calls and literals"; homepage = "https://github.com/asottile/add-trailing-comma"; license = licenses.mit; maintainers = with maintainers; [ gador ];