1 files changed, 80 insertions, 50 deletions

diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index 3e966057bb24..2d18e7110a7b 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -1,47 +1,62 @@
-{ lib
-, stdenv
-, buildPythonPackage
-, isPyPy
-, fetchPypi
-, pythonOlder
-, curl
-, openssl
-, bottle
-, pytestCheckHook
-, flaky
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  isPyPy,
+  fetchPypi,
+  fetchpatch,
+  pythonOlder,
+  curl,
+  openssl,
+  bottle,
+  pytestCheckHook,
+  flaky,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pycurl";
   version = "7.45.3";
-  format = "setuptools";
-  disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208
+  pyproject = true;
+
+  disabled = isPyPy || pythonOlder "3.8"; # https://github.com/pycurl/pycurl/issues/208
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-jCRxr5B5rXmOFkXsCw09QiPbaHN50X3TanBjdEn4HWs=";
   };
 
+  patches = [
+    # Don't use -flat_namespace on macOS
+    # https://github.com/pycurl/pycurl/pull/855 remove on next update
+    (fetchpatch {
+      name = "no_flat_namespace.patch";
+      url = "https://github.com/pycurl/pycurl/commit/7deb85e24981e23258ea411dcc79ca9b527a297d.patch";
+      hash = "sha256-tk0PQy3cHyXxFnoVYNQV+KD/07i7AUYHNJnrw6H8tHk=";
+    })
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
   preConfigure = ''
-    substituteInPlace setup.py --replace '--static-libs' '--libs'
+    substituteInPlace setup.py \
+      --replace-fail '--static-libs' '--libs'
     export PYCURL_SSL_LIBRARY=openssl
   '';
 
+  build-system = [ setuptools ];
+
   buildInputs = [
     curl
     openssl
   ];
 
-  nativeBuildInputs = [
-    curl
-  ];
-
-  __darwinAllowLocalNetworking = true;
+  nativeBuildInputs = [ curl ];
 
   nativeCheckInputs = [
     bottle
-    pytestCheckHook
     flaky
+    pytestCheckHook
   ];
 
   pytestFlagsArray = [
@@ -53,38 +68,53 @@ buildPythonPackage rec {
     export HOME=$TMPDIR
   '';
 
-  disabledTests = [
-    # tests that require network access
-    "test_keyfunction"
-    "test_keyfunction_bogus_return"
-    # OSError: tests/fake-curl/libcurl/with_openssl.so: cannot open shared object file: No such file or directory
-    "test_libcurl_ssl_openssl"
-    # OSError: tests/fake-curl/libcurl/with_nss.so: cannot open shared object file: No such file or directory
-    "test_libcurl_ssl_nss"
-    # OSError: tests/fake-curl/libcurl/with_gnutls.so: cannot open shared object file: No such file or directory
-    "test_libcurl_ssl_gnutls"
-    # AssertionError: assert 'crypto' in ['curl']
-    "test_ssl_in_static_libs"
-    # tests that require curl with http3Support
-    "test_http_version_3"
-    # https://github.com/pycurl/pycurl/issues/819
-    "test_multi_socket_select"
-    # https://github.com/pycurl/pycurl/issues/729
-    "test_easy_pause_unpause"
-    "test_multi_socket_action"
-    # https://github.com/pycurl/pycurl/issues/822
-    "test_request_with_verifypeer"
-    # https://github.com/pycurl/pycurl/issues/836
-    "test_proxy_tlsauth"
-  ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
-    # Fatal Python error: Segmentation fault
-    "cadata_test"
-  ];
+  pythonImportsCheck = [ "pycurl" ];
+
+  disabledTests =
+    [
+      # tests that require network access
+      "test_keyfunction"
+      "test_keyfunction_bogus_return"
+      # OSError: tests/fake-curl/libcurl/with_openssl.so: cannot open shared object file: No such file or directory
+      "test_libcurl_ssl_openssl"
+      # OSError: tests/fake-curl/libcurl/with_nss.so: cannot open shared object file: No such file or directory
+      "test_libcurl_ssl_nss"
+      # OSError: tests/fake-curl/libcurl/with_gnutls.so: cannot open shared object file: No such file or directory
+      "test_libcurl_ssl_gnutls"
+      # AssertionError: assert 'crypto' in ['curl']
+      "test_ssl_in_static_libs"
+      # tests that require curl with http3Support
+      "test_http_version_3"
+      # https://github.com/pycurl/pycurl/issues/819
+      "test_multi_socket_select"
+      # https://github.com/pycurl/pycurl/issues/729
+      "test_easy_pause_unpause"
+      "test_multi_socket_action"
+      # https://github.com/pycurl/pycurl/issues/822
+      "test_request_with_verifypeer"
+      # https://github.com/pycurl/pycurl/issues/836
+      "test_proxy_tlsauth"
+      # AssertionError: 'Москва' != '\n...
+      "test_encoded_unicode_header"
+      # https://github.com/pycurl/pycurl/issues/856
+      "test_multi_info_read"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      # Fatal Python error: Segmentation fault
+      "cadata_test"
+    ];
 
   meta = with lib; {
-    homepage = "http://pycurl.io/";
     description = "Python Interface To The cURL library";
-    license = with licenses; [ lgpl2Only mit ];
-    maintainers = with maintainers; [ ];
+    homepage = "http://pycurl.io/";
+    changelog =
+      "https://github.com/pycurl/pycurl/blob/REL_"
+      + replaceStrings [ "." ] [ "_" ] version
+      + "/ChangeLog";
+    license = with licenses; [
+      lgpl2Only
+      mit
+    ];
+    maintainers = [ ];
   };
 }