30d2d4a · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge pull request #165190 from r-ryantm/auto-update/python310Packages.arpeggio

commit30d2d4a499f904e8966eaeaf6a2867765efe1f6d authorSandro <sandro.jaeckel@gmail.com> dateWed 23 Mar 2022, 07:00 (5 years ago) parent252eef0 fab200c

2 files changed+37−23

compare with master

unifiedsplit

pkgs/development/python-modules/arpeggio/default.nix+15−17 pkgs/development/python-modules/parver/default.nix+22−6

pkgs/development/python-modules/arpeggio/default.nix+15−17

@@ -1,34 +1,32 @@

11{ lib

22, buildPythonPackage

33, fetchPypi

4−, glibcLocales

5−, pytest-runner

64, pytestCheckHook

75}:

97buildPythonPackage rec {

10− pname = "Arpeggio";

11− version = "1.10.2";

8+ pname = "arpeggio";

9+ version = "2.0.0";

1210

1311 src = fetchPypi {

14− inherit pname version;

15− sha256 = "bfe349f252f82f82d84cb886f1d5081d1a31451e6045275e9f90b65d0daa06f1";

12+ pname = "Arpeggio";

13+ inherit version;

14+ sha256 = "sha256-1rA4OQGbuKaHhfkpLuajaxlU64S5JbhKa4peHibT7T0=";

1615 };

1716

18− # Shall not be needed for next release

19− LC_ALL = "en_US.UTF-8";

20− buildInputs = [ glibcLocales ];

21−

22− nativeBuildInputs = [ pytest-runner ];

17+ postPatch = ''

18+ substituteInPlace setup.cfg \

19+ --replace "pytest-runner" ""

20+ '';

2321

2422 checkInputs = [ pytestCheckHook ];

2523

26− disabledTests = [ "test_examples" "test_issue_22" ];

27−

28− dontUseSetuptoolsCheck = true;

24+ pythonImportsCheck = [ "arpeggio" ];

2925

30− meta = {

31− description = "Packrat parser interpreter";

32− license = lib.licenses.mit;

26+ meta = with lib; {

27+ description = "Recursive descent parser with memoization based on PEG grammars (aka Packrat parser)";

28+ homepage = "https://github.com/textX/Arpeggio";

29+ license = licenses.mit;

30+ maintainers = with maintainers; [ SuperSandro2000 ];

3331 };

3432}

pkgs/development/python-modules/parver/default.nix+22−6

@@ -3,7 +3,7 @@

33, fetchPypi

44, six

55, attrs

6−, pytest

6+, pytestCheckHook

77, hypothesis

88, pretend

99, arpeggio

@@ -18,11 +18,27 @@ buildPythonPackage rec {

1818 sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3";

1919 };

2020

21− propagatedBuildInputs = [ six attrs arpeggio ];

22− checkInputs = [ pytest hypothesis pretend ];

21+ postPatch = ''

22+ substituteInPlace setup.py \

23+ --replace "arpeggio ~= 1.7" "arpeggio"

24+ '';

2325

24− meta = {

25− description = "parver allows parsing and manipulation of PEP 440 version numbers.";

26− license = lib.licenses.mit;

26+ propagatedBuildInputs = [

27+ six

28+ attrs

29+ arpeggio

30+ ];

31+

32+ checkInputs = [

33+ pytestCheckHook

34+ hypothesis

35+ pretend

36+ ];

37+

38+ meta = with lib; {

39+ description = "Allows parsing and manipulation of PEP 440 version numbers";

40+ homepage = "https://github.com/RazerM/parver";

41+ license = licenses.mit;

42+ maintainers = with maintainers; [ SuperSandro2000 ];

2743 };

2844}