Merge master into staging-next

pkgs/development/python-modules/coconut/default.nix

@@ -1,7 +1,6 @@
 { lib
 , buildPythonApplication
 , fetchFromGitHub
-, fetchpatch
 , cpyparsing
 , ipykernel
 , mypy
@@ -15,30 +14,22 @@
 
 buildPythonApplication rec {
   pname = "coconut";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "evhub";
     repo = "coconut";
     rev = "v${version}";
-    sha256 = "1gc0fwqwzn1j6mcg1f6fw832w66pbaaq9mmi0r4kw3xn5f877icz";
+    sha256 = "/397YGV6QWWmKfqr5hSvqRoPOu7Hx1Pak6rVPR3etzw=";
   };
 
   propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ];
 
-  postPatch = ''
-    substituteInPlace coconut/kernel_installer.py \
-      --replace "fixpath(os.path.join(sys.exec_prefix, icoconut_custom_kernel_install_loc))" \
-                "fixpath(icoconut_custom_kernel_install_loc)"
-  '';
-
   checkInputs = [ pexpect pytestCheckHook tkinter ];
 
-  # Currently most tests do not work on Hydra due to external fetches.
+  # Currently most tests have performance issues
   pytestFlagsArray = [
     "tests/constants_test.py"
-    "tests/main_test.py::TestShell::test_compile_to_file"
-    "tests/main_test.py::TestShell::test_convenience"
   ];
 
   pythonImportsCheck = [ "coconut" ];

pkgs/development/python-modules/cpyparsing/default.nix

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "cpyparsing";
-  version = "2.4.5.0.1.2";
+  version = "2.4.7.1.0.0";
 
   src = fetchFromGitHub {
     owner = "evhub";
     repo = pname;
-    rev = "38f2b323b99cee9a080106ae9951ffc5752599f0"; # No tags on repo
-    sha256 = "0wrm6vzwp968z7s0qhr23v39ivyxzvav3mv9i2n0iv9zl041kypv";
+    rev = "09073751d92cb40fb71c927c006baddc082df1db"; # No tags on repo
+    sha256 = "O9IdHipAxxbFcDFYNvmczue/wT4AF9Xb5uc3ZTAlTlo=";
   };
 
   nativeBuildInputs = [ cython ];

pkgs/development/python-modules/fastecdsa/default.nix

@@ -8,6 +8,7 @@
 buildPythonPackage rec {
   pname = "fastecdsa";
   version = "2.2.2";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
@@ -18,10 +19,10 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook ];
 
-  # skip tests which require being online to download test vectors
-  pytestFlags = [
-     "--ignore=fastecdsa/tests/test_wycheproof_vectors.py"
-     "--ignore=fastecdsa/tests/test_rfc6979_ecdsa.py"
+  disabledTestPaths = [
+    # skip tests which require being online to download test vectors
+    "fastecdsa/tests/test_wycheproof_vectors.py"
+    "fastecdsa/tests/test_rfc6979_ecdsa.py"
   ];
 
   # skip tests for now, they fail with

pkgs/development/python-modules/solo-python/default.nix

@@ -14,18 +14,18 @@
 
  buildPythonPackage rec {
   pname = "solo-python";
-  version = "0.0.30";
+  version = "0.0.31";
   format = "flit";
-  disabled = pythonOlder "3.6"; # only python>=3.6 is supported
+
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "solokeys";
     repo = pname;
     rev = version;
-    sha256 = "1i9kybp08qfcdx6m4wl7ij40y1v17mvvhcdg7zglwfakblf69w41";
+    sha256 = "sha256-OguAHeNpom+zthREzdhejy5HJUIumrtwB0WJAwUNiSA=";
   };
 
-  # replaced pinned fido, with unrestricted fido version
   patchPhase = ''
     sed -i '/fido2/c\"fido2",' pyproject.toml
   '';
@@ -41,12 +41,10 @@
     requests
   ];
 
-  # allow for writable directory for darwin
   preBuild = ''
     export HOME=$TMPDIR
   '';
 
-  # repo doesn't contain tests, ensure imports aren't broken
   pythonImportsCheck = [
     "solo"
     "solo.cli"