From a049660d2033f6c330221886b9b20eb6a666a50e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 15:36:07 +0200 Subject: [PATCH 1/2] python312Packages.gemfileparser: refactor --- .../python-modules/gemfileparser/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/gemfileparser/default.nix b/pkgs/development/python-modules/gemfileparser/default.nix index e6b91d24f804..ffacf59c3907 100644 --- a/pkgs/development/python-modules/gemfileparser/default.nix +++ b/pkgs/development/python-modules/gemfileparser/default.nix @@ -1,18 +1,27 @@ { lib -, fetchPypi , buildPythonPackage +, fetchPypi , pytestCheckHook +, pythonOlder +, setuptools }: + buildPythonPackage rec { pname = "gemfileparser"; version = "0.8.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "839592e49ea3fd985cec003ef58f8e77009a69ed7644a0c0acc94cf6dd9b8d6e"; + hash = "sha256-g5WS5J6j/Zhc7AA+9Y+OdwCaae12RKDArMlM9t2bjW4="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -23,9 +32,9 @@ buildPythonPackage rec { meta = with lib; { description = "A library to parse Ruby Gemfile, .gemspec and Cocoapod .podspec file using Python"; - mainProgram = "parsegemfile"; homepage = "https://github.com/gemfileparser/gemfileparser"; - license = with licenses; [ gpl3Plus /* or */ mit ]; - maintainers = [ ]; + license = with licenses; [ gpl3Plus mit ]; + maintainers = with maintainers; [ ]; + mainProgram = "parsegemfile"; }; } From e24bc0e085b32b449b55840c3ac5425171aba0a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 15:36:27 +0200 Subject: [PATCH 2/2] python312Packages.gemfileparser: format with nixfmt --- .../python-modules/gemfileparser/default.nix | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/gemfileparser/default.nix b/pkgs/development/python-modules/gemfileparser/default.nix index ffacf59c3907..73ef12c7496f 100644 --- a/pkgs/development/python-modules/gemfileparser/default.nix +++ b/pkgs/development/python-modules/gemfileparser/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -18,22 +19,19 @@ buildPythonPackage rec { hash = "sha256-g5WS5J6j/Zhc7AA+9Y+OdwCaae12RKDArMlM9t2bjW4="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "gemfileparser" - ]; + pythonImportsCheck = [ "gemfileparser" ]; meta = with lib; { description = "A library to parse Ruby Gemfile, .gemspec and Cocoapod .podspec file using Python"; homepage = "https://github.com/gemfileparser/gemfileparser"; - license = with licenses; [ gpl3Plus mit ]; + license = with licenses; [ + gpl3Plus + mit + ]; maintainers = with maintainers; [ ]; mainProgram = "parsegemfile"; };