diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-05-11 11:05:56 +0200 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-05-11 11:05:56 +0200 |
| commit | 5338975e0d35560c811981fd41a0d34dd1897f17 (patch) | |
| tree | eca86f9bca14c8e4266e565920160e7604002f02 | |
| parent | d16e82bf21f0ea027d05252c97bb84716f4c638a (diff) | |
| download | nixpkgs-5338975e0d35560c811981fd41a0d34dd1897f17.tar nixpkgs-5338975e0d35560c811981fd41a0d34dd1897f17.tar.gz nixpkgs-5338975e0d35560c811981fd41a0d34dd1897f17.tar.bz2 nixpkgs-5338975e0d35560c811981fd41a0d34dd1897f17.tar.lz nixpkgs-5338975e0d35560c811981fd41a0d34dd1897f17.tar.xz nixpkgs-5338975e0d35560c811981fd41a0d34dd1897f17.tar.zst nixpkgs-5338975e0d35560c811981fd41a0d34dd1897f17.zip | |
python310Packages.twisted: remove half broken pyasn1 integration
| -rw-r--r-- | pkgs/development/python-modules/twisted/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index bcd2f6d5e06..f45acbe87a4 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -69,6 +69,13 @@ buildPythonPackage rec { url = "https://github.com/mweinelt/twisted/commit/e69e652de671aac0abf5c7e6c662fc5172758c5a.patch"; hash = "sha256-LmvKUTViZoY/TPBmSlx4S9FbJNZfB5cxzn/YcciDmoI="; }) + # remove half broken pyasn1 integration that blow up with pyasn 0.5.0 + # https://github.com/twisted/twisted/pull/11843 + (fetchpatch { + url = "https://github.com/twisted/twisted/commit/bdee0eb835a76b2982beaf10c85269ff25ea09fa.patch"; + excludes = [ "pyproject.toml" "tox.ini" ]; + hash = "sha256-oGAHmZMpMWfK+2zEDjHD115sW7exCYqfORVOLw+Wa6M="; + }) ] ++ lib.optionals (pythonAtLeast "3.11") [ (fetchpatch { url = "https://github.com/twisted/twisted/pull/11734.diff"; @@ -95,6 +102,9 @@ buildPythonPackage rec { ]; postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"pyasn1 >= 0.4",' "" + 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 |