From e6ce10a4789b0d6df879ef6771f75c8ee15e03d8 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 18 Dec 2022 19:48:28 +0100 Subject: [PATCH] joinmarket: fix Python packages --- pkgs/python-packages/default.nix | 21 ++- pkgs/python-packages/jmclient/default.nix | 4 +- .../specific-versions/twisted.nix | 173 ++++++++++++++++++ .../specific-versions/werkzeug.nix | 68 ------- 4 files changed, 186 insertions(+), 80 deletions(-) create mode 100644 pkgs/python-packages/specific-versions/twisted.nix delete mode 100644 pkgs/python-packages/specific-versions/werkzeug.nix diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix index 0032465..11eb059 100644 --- a/pkgs/python-packages/default.nix +++ b/pkgs/python-packages/default.nix @@ -16,7 +16,10 @@ rec { # Packages only used by joinmarket bencoderpyx = callPackage ./bencoderpyx {}; chromalog = callPackage ./chromalog {}; - python-bitcointx = callPackage ./python-bitcointx { inherit (nbPkgs) secp256k1; }; + python-bitcointx = callPackage ./python-bitcointx { + inherit (nbPkgs) secp256k1; + openssl = super.pkgs.openssl_1_1; + }; runes = callPackage ./runes {}; sha256 = callPackage ./sha256 {}; urldecode = callPackage ./urldecode {}; @@ -33,27 +36,25 @@ rec { joinmarketbitcoin = joinmarketPkg ./jmbitcoin; joinmarketdaemon = joinmarketPkg ./jmdaemon; - # Don't mark `klein` as broken. - # `klein` is fixed by using werkzeug 2.1.0 (see below) - klein = super.klein.overrideAttrs (old: { - meta = builtins.removeAttrs old.meta [ "broken" ]; - }); ## Specific versions of packages that already exist in nixpkgs # cryptography 3.3.2, required by joinmarketdaemon # Used in the private python package set for joinmarket (../joinmarket/default.nix) cryptography = callPackage ./specific-versions/cryptography { + openssl = super.pkgs.openssl_1_1; cryptography_vectors = callPackage ./specific-versions/cryptography/vectors.nix {}; }; # autobahn 20.12.3, required by joinmarketclient autobahn = callPackage ./specific-versions/autobahn.nix {}; - # werkzeug 2.1.0, required by jmclient (via pkg `klein`) - werkzeug = callPackage ./specific-versions/werkzeug.nix {}; - # pyopenssl 20.0.1, required by joinmarketdaemon - pyopenssl = callPackage ./specific-versions/pyopenssl.nix {}; + pyopenssl = callPackage ./specific-versions/pyopenssl.nix { + openssl = super.pkgs.openssl_1_1; + }; + + # twisted 22.4.0, compatible with pyopenssl 20.0.1 + twisted = callPackage ./specific-versions/twisted.nix {}; }; nbPython3Packages = (python3.override { diff --git a/pkgs/python-packages/jmclient/default.nix b/pkgs/python-packages/jmclient/default.nix index 80fe358..165d7c4 100644 --- a/pkgs/python-packages/jmclient/default.nix +++ b/pkgs/python-packages/jmclient/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { patchPhase = '' substituteInPlace setup.py \ - --replace "'klein==20.6.0'" "'klein==21.8.0'" + --replace "'klein==20.6.0'" "'klein>=20.6.0'" substituteInPlace setup.py \ - --replace "'pyjwt==2.1.0'" "'pyjwt==2.4.0'" + --replace "'pyjwt==2.4.0'" "'pyjwt==2.5.0'" ''; meta = with lib; { diff --git a/pkgs/python-packages/specific-versions/twisted.nix b/pkgs/python-packages/specific-versions/twisted.nix new file mode 100644 index 0000000..6689a2c --- /dev/null +++ b/pkgs/python-packages/specific-versions/twisted.nix @@ -0,0 +1,173 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchPypi +, python +, appdirs +, attrs +, automat +, bcrypt +, constantly +, contextvars +, cryptography +, git +, glibcLocales +, h2 +, hyperlink +, idna +, incremental +, priority +, pyasn1 +, pyhamcrest +, pynacl +, pyopenssl +, pyserial +, service-identity +, setuptools +, typing-extensions +, zope_interface + + # for passthru.tests +, cassandra-driver +, klein +, magic-wormhole +, scrapy +, treq +, txaio +, txamqp +, txrequests +, txtorcon +, thrift +, nixosTests +}: + +buildPythonPackage rec { + pname = "twisted"; + version = "22.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "Twisted"; + inherit version; + extension = "tar.gz"; + sha256 = "sha256-oEeZD1ffrh4L0rffJSbU8W3NyEN3TcEIt4xS8qXxNoA="; + }; + + __darwinAllowLocalNetworking = true; + + propagatedBuildInputs = [ + attrs + automat + constantly + hyperlink + incremental + setuptools + typing-extensions + zope_interface + ]; + + postPatch = '' + echo 'ListingTests.test_localeIndependent.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py + echo 'ListingTests.test_newFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py + echo 'ListingTests.test_newSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py + echo 'ListingTests.test_oldFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py + echo 'ListingTests.test_oldSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py + + echo 'PTYProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py + echo 'PTYProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py + + echo 'UNIXTestsBuilder_AsyncioSelectorReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py + echo 'UNIXTestsBuilder_SelectReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py + + echo 'FileObserverTests.test_getTimezoneOffsetEastOfUTC.skip = "mktime argument out of range"'>> src/twisted/test/test_log.py + echo 'FileObserverTests.test_getTimezoneOffsetWestOfUTC.skip = "mktime argument out of range"'>> src/twisted/test/test_log.py + echo 'FileObserverTests.test_getTimezoneOffsetWithoutDaylightSavingTime.skip = "tuple differs, values not"'>> src/twisted/test/test_log.py + + echo 'MulticastTests.test_joinLeave.skip = "No such device"'>> src/twisted/test/test_udp.py + echo 'MulticastTests.test_loopback.skip = "No such device"'>> src/twisted/test/test_udp.py + echo 'MulticastTests.test_multicast.skip = "Reactor was unclean"'>> src/twisted/test/test_udp.py + echo 'MulticastTests.test_multiListen.skip = "No such device"'>> src/twisted/test/test_udp.py + + echo 'DomishExpatStreamTests.test_namespaceWithWhitespace.skip = "syntax error: line 1, column 0"'>> src/twisted/words/test/test_domish.py + + # not packaged + substituteInPlace src/twisted/test/test_failure.py \ + --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None" + '' + lib.optionalString stdenv.isLinux '' + echo 'PTYProcessTestsBuilder_EPollReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py + echo 'PTYProcessTestsBuilder_PollReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py + echo 'UNIXTestsBuilder_EPollReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py + echo 'UNIXTestsBuilder_PollReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py + + # Patch t.p._inotify to point to libc. Without this, + # twisted.python.runtime.platform.supportsINotify() == False + substituteInPlace src/twisted/python/_inotify.py --replace \ + "ctypes.util.find_library(\"c\")" "'${stdenv.cc.libc}/lib/libc.so.6'" + '' + lib.optionalString (stdenv.isAarch64 && stdenv.isDarwin) '' + echo 'AbortConnectionTests_AsyncioSelectorReactorTests.test_fullWriteBufferAfterByteExchange.skip = "Timeout after 120 seconds"' >> src/twisted/internet/test/test_tcp.py + echo 'AbortConnectionTests_AsyncioSelectorReactorTests.test_resumeProducingAbort.skip = "Timeout after 120 seconds"' >> src/twisted/internet/test/test_tcp.py + ''; + + # Generate Twisted's plug-in cache. Twisted users must do it as well. See + # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 + # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for details. + postFixup = '' + $out/bin/twistd --help > /dev/null + ''; + + checkInputs = [ + git + glibcLocales + pyhamcrest + ] + ++ passthru.optional-dependencies.conch + # not supported on aarch64-darwin: https://github.com/pyca/pyopenssl/issues/873 + ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) passthru.optional-dependencies.tls; + + checkPhase = '' + export SOURCE_DATE_EPOCH=315532800 + export PATH=$out/bin:$PATH + # race conditions when running in paralell + ${python.interpreter} -m twisted.trial twisted + ''; + + passthru = { + optional-dependencies = rec { + conch = [ appdirs bcrypt cryptography pyasn1 ]; + conch_nacl = conch ++ [ pynacl ]; + contextvars = lib.optionals (pythonOlder "3.7") [ contextvars ]; + http2 = [ h2 priority ]; + serial = [ pyserial ]; + tls = [ idna pyopenssl service-identity ]; + }; + + tests = { + inherit + cassandra-driver + klein + magic-wormhole + scrapy + treq + txaio + txamqp + txrequests + txtorcon + thrift; + inherit (nixosTests) buildbot matrix-synapse; + }; + }; + + meta = with lib; { + homepage = "https://github.com/twisted/twisted"; + description = "Twisted, an event-driven networking engine written in Python"; + longDescription = '' + Twisted is an event-driven networking engine written in Python + and licensed under the MIT license. + ''; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/python-packages/specific-versions/werkzeug.nix b/pkgs/python-packages/specific-versions/werkzeug.nix deleted file mode 100644 index f961d03..0000000 --- a/pkgs/python-packages/specific-versions/werkzeug.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, pythonOlder -, fetchPypi -, watchdog -, dataclasses -, ephemeral-port-reserve -, pytest-timeout -, pytest-xprocess -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "werkzeug"; - version = "2.1.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "Werkzeug"; - inherit version; - sha256 = "sha256-m1VGaj6Z4TsfBoamYRfTm9qFqZIWbgp5rt/PNYYyj3o="; - }; - - propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [ - # watchdog requires macos-sdk 10.13+ - watchdog - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses - ]; - - checkInputs = [ - ephemeral-port-reserve - pytest-timeout - pytest-xprocess - pytestCheckHook - ]; - - disabledTests = lib.optionals stdenv.isDarwin [ - "test_get_machine_id" - ]; - - disabledTestPaths = [ - # ConnectionRefusedError: [Errno 111] Connection refused - "tests/test_serving.py" - ]; - - pytestFlagsArray = [ - # don't run tests that are marked with filterwarnings, they fail with - # warnings._OptionError: unknown warning category: 'pytest.PytestUnraisableExceptionWarning' - "-m 'not filterwarnings'" - ]; - - meta = with lib; { - homepage = "https://palletsprojects.com/p/werkzeug/"; - description = "The comprehensive WSGI web application library"; - longDescription = '' - Werkzeug is a comprehensive WSGI web application library. It - began as a simple collection of various utilities for WSGI - applications and has become one of the most advanced WSGI - utility libraries. - ''; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - }; -}