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

2 files changed, 37 insertions, 23 deletions

diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix
index 5ad433413ce..d3d32078529 100644
--- a/pkgs/development/python-modules/arpeggio/default.nix
+++ b/pkgs/development/python-modules/arpeggio/default.nix
@@ -1,34 +1,32 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, glibcLocales
-, pytest-runner
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
-  pname = "Arpeggio";
-  version = "1.10.2";
+  pname = "arpeggio";
+  version = "2.0.0";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "bfe349f252f82f82d84cb886f1d5081d1a31451e6045275e9f90b65d0daa06f1";
+    pname = "Arpeggio";
+    inherit version;
+    sha256 = "sha256-1rA4OQGbuKaHhfkpLuajaxlU64S5JbhKa4peHibT7T0=";
   };
 
-  # Shall not be needed for next release
-  LC_ALL = "en_US.UTF-8";
-  buildInputs = [ glibcLocales ];
-
-  nativeBuildInputs = [ pytest-runner ];
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "pytest-runner" ""
+  '';
 
   checkInputs = [ pytestCheckHook ];
 
-  disabledTests = [ "test_examples" "test_issue_22" ];
-
-  dontUseSetuptoolsCheck = true;
+  pythonImportsCheck = [ "arpeggio" ];
 
-  meta = {
-    description = "Packrat parser interpreter";
-    license = lib.licenses.mit;
+  meta = with lib; {
+    description = "Recursive descent parser with memoization based on PEG grammars (aka Packrat parser)";
+    homepage = "https://github.com/textX/Arpeggio";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix
index 268e9002010..878b2746758 100644
--- a/pkgs/development/python-modules/parver/default.nix
+++ b/pkgs/development/python-modules/parver/default.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , six
 , attrs
-, pytest
+, pytestCheckHook
 , hypothesis
 , pretend
 , arpeggio
@@ -18,11 +18,27 @@ buildPythonPackage rec {
     sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3";
   };
 
-  propagatedBuildInputs = [ six attrs arpeggio ];
-  checkInputs = [ pytest hypothesis pretend ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "arpeggio ~= 1.7" "arpeggio"
+  '';
 
-  meta = {
-    description = "parver allows parsing and manipulation of PEP 440 version numbers.";
-    license = lib.licenses.mit;
+  propagatedBuildInputs = [
+    six
+    attrs
+    arpeggio
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    hypothesis
+    pretend
+  ];
+
+  meta = with lib; {
+    description = "Allows parsing and manipulation of PEP 440 version numbers";
+    homepage = "https://github.com/RazerM/parver";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }