diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-09-09 08:09:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-09 08:09:36 +0200 |
commit | 731c82a447d916e78f31642ad757a3ce8911f1ea (patch) | |
tree | 8630c820679c3d3245267a4f701ae9a4a9cd3e3e /pkgs/development/python-modules | |
parent | 21f61dde0dcf436660224acdb7ee5bd6d72ee192 (diff) | |
parent | b5284a56d9b2c0bace0e7d9acdb2003b47fe581e (diff) | |
download | nixlib-731c82a447d916e78f31642ad757a3ce8911f1ea.tar nixlib-731c82a447d916e78f31642ad757a3ce8911f1ea.tar.gz nixlib-731c82a447d916e78f31642ad757a3ce8911f1ea.tar.bz2 nixlib-731c82a447d916e78f31642ad757a3ce8911f1ea.tar.lz nixlib-731c82a447d916e78f31642ad757a3ce8911f1ea.tar.xz nixlib-731c82a447d916e78f31642ad757a3ce8911f1ea.tar.zst nixlib-731c82a447d916e78f31642ad757a3ce8911f1ea.zip |
Merge pull request #68244 from NixOS/staging-next
Staging next that includes gcc8
Diffstat (limited to 'pkgs/development/python-modules')
25 files changed, 131 insertions, 128 deletions
diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix deleted file mode 100644 index cd8e83dbf630..000000000000 --- a/pkgs/development/python-modules/area53/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, boto }: - -buildPythonPackage rec { - pname = "Area53"; - version = "0.94"; - - src = fetchPypi { - inherit pname version; - sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42"; - }; - - # error: invalid command 'test' - doCheck = false; - - propagatedBuildInputs = [ boto ]; - - meta = with lib; { - description = "Python Interface to Route53"; - homepage = https://github.com/mariusv/Area53; - license = licenses.unfree; # unspecified - }; -} diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index e34f937b5090..eed9591d7bdf 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { pname = "atomicwrites"; @@ -9,6 +9,10 @@ buildPythonPackage rec { sha256 = "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6"; }; + # Tests depend on pytest but atomicwrites is a dependency of pytest + doCheck = false; + checkInputs = [ pytest ]; + meta = with stdenv.lib; { description = "Atomic file writes on POSIX"; homepage = https://pypi.python.org/pypi/atomicwrites; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 1455a783593f..d2f64a5e5a8b 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -1,30 +1,43 @@ -{ stdenv, python, fetchPypi, makeWrapper, unzip }: +{ stdenv, python, fetchPypi, makeWrapper, unzip, makeSetupHook +, pipInstallHook +, setuptoolsBuildHook + +}: let wheel_source = fetchPypi { pname = "wheel"; - version = "0.33.4"; + version = "0.33.6"; format = "wheel"; - sha256 = "5e79117472686ac0c4aef5bad5172ea73a1c2d1646b808c35926bd26bdfb0c08"; + sha256 = "f4da1763d3becf2e2cd92a14a7c920f0f00eca30fdde9ea992c836685b9faf28"; }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "41.0.1"; + version = "41.2.0"; format = "wheel"; - sha256 = "c7769ce668c7a333d84e17fe8b524b1c45e7ee9f7908ad0a73e1eda7e6a5aebf"; + sha256 = "4380abcf2a4ffd1a5ba22d687c6d690dce83b2b51c70e9c6d09f7e8c7e8040dc"; }; in stdenv.mkDerivation rec { pname = "pip"; - version = "19.1.1"; + version = "19.2.3"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "993134f0475471b91452ca029d4390dc8f298ac63a712814f101cd1b6db46676"; + sha256 = "340a0ba40fdeb16413914c0fcd8e0b4ebb0bf39a900ec80e11c05d836c05103f"; }; + dontUseSetuptoolsBuild = true; + + # Should be propagatedNativeBuildInputs + propagatedBuildInputs = [ + # Override to remove dependencies to prevent infinite recursion. + (pipInstallHook.override{pip=null;}) + (setuptoolsBuildHook.override{setuptools=null; wheel=null;}) + ]; + unpackPhase = '' mkdir -p $out/${python.sitePackages} unzip -d $out/${python.sitePackages} $src @@ -32,7 +45,7 @@ in stdenv.mkDerivation rec { unzip -d $out/${python.sitePackages} ${wheel_source} ''; - patchPhase = '' + postPatch = '' mkdir -p $out/bin ''; @@ -52,4 +65,5 @@ in stdenv.mkDerivation rec { wrapProgram $f --prefix PYTHONPATH ":" $out/${python.sitePackages}/ done ''; + } diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 3f276374d9ea..28eff473199c 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -5,17 +5,20 @@ }: buildPythonPackage rec { - pname = "EditorConfig"; - version = "0.12.1"; + pname = "editorconfig"; + version = "0.12.2"; # fetchgit used to ensure test submodule is available src = fetchgit { url = "https://github.com/editorconfig/editorconfig-core-py"; - rev = "refs/tags/v${version}"; - sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl"; + rev = "596da5e06ebee05bdbdc6224203c79c4d3c6486a"; # Not tagged + sha256 = "05cbp971b0zix7kfxkk7ndxb4ax1l21frwc00d4g78mk4sdz6dig"; }; nativeBuildInputs = [ cmake ]; + + dontUseCmakeConfigure = true; + checkPhase = '' cmake . # utf_8_char fails with python3 diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index 0622bd41d237..c837e46066fe 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -6,11 +6,12 @@ }: buildPythonPackage rec { - pname = "eggdeps"; + pname = "tl-eggdeps"; version = "0.4"; src = fetchPypi { - inherit pname version; + inherit version; + pname = "tl.eggdeps"; sha256 = "a99de5e4652865224daab09b2e2574a4f7c1d0d9a267048f9836aa914a2caf3a"; }; diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index cf78a6185365..3a76bd9f148b 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ "tests.functional.test_httplib2.test_callback_response" "tests.functional.test_requests.test_streaming_responses" + "tests.functional.test_httplib2.test_callback_response" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 15191858daa8..10d0004f74a5 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -1,10 +1,10 @@ -{ lib, fetchPypi, buildPythonApplication, EditorConfig, pytest, six }: +{ lib, fetchPypi, buildPythonApplication, editorconfig, pytest, six }: buildPythonApplication rec { pname = "jsbeautifier"; version = "1.10.0"; - propagatedBuildInputs = [ six EditorConfig ]; + propagatedBuildInputs = [ six editorconfig ]; checkInputs = [ pytest ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index 3669b8dddbf8..95ee5c5001ad 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -1,22 +1,24 @@ { stdenv , buildPythonPackage , fetchPypi +, python , mock }: buildPythonPackage rec { - pname = "mpd2"; - version = "0.5.5"; + pname = "python-mpd2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1gfrxf71xll1w6zb69znqg5c9j0g7036fsalkvqprh2id640cl3a"; + extension = "tar.bz2"; + sha256 = "772fa6861273bb9f363a97987c2c45ca3965eb770570f1f02566efec9c89fc5f"; }; buildInputs = [ mock ]; - patchPhase = '' - sed -i -e '/tests_require/d' \ - -e 's/cmdclass.*/test_suite="mpd_test",/' setup.py + + checkPhase = '' + ${python.interpreter} -m unittest mpd.tests ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index 388e0148d0a0..dd255d4d0049 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -3,11 +3,12 @@ }: buildPythonPackage rec { - pname = "mrbob"; + pname = "mr-bob"; version = "0.1.2"; src = fetchPypi { - inherit pname version; + inherit version; + pname = "mr.bob"; sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121"; }; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 76f3b0b7176b..9892d02b3922 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -1,25 +1,32 @@ { lib +, python , buildPythonPackage +, bootstrapped-pip , fetchPypi , mock , scripttest , virtualenv , pretend , pytest +, setuptools +, wheel }: buildPythonPackage rec { pname = "pip"; - version = "19.1.1"; + version = "19.2.3"; + format = "other"; src = fetchPypi { inherit pname version; - sha256 = "44d3d7d3d30a1eb65c7e5ff1173cdf8f7467850605ac7cc3707b6064bddd0958"; + sha256 = "e7a31f147974362e6c82d84b91c7f2bdf57e4d3163d3d454e6c3e71944d67135"; }; + nativeBuildInputs = [ bootstrapped-pip ]; + # pip detects that we already have bootstrapped_pip "installed", so we need # to force it a little. - installFlags = [ "--ignore-installed" ]; + pipInstallFlags = [ "--ignore-installed" ]; checkInputs = [ mock scripttest virtualenv pretend pytest ]; # Pip wants pytest, but tests are not distributed diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index e54fd1521b3e..9c5ada22b146 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -12,7 +12,11 @@ buildPythonPackage rec { # Circular dependency on pytest doCheck = false; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; + + pythonImportsCheck = [ + "py" + ]; meta = with stdenv.lib; { description = "Library with cross-python path, ini-parsing, io, code, log facilities"; diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix index 2f788966718c..62fec908a4d3 100644 --- a/pkgs/development/python-modules/pyaudio/default.nix +++ b/pkgs/development/python-modules/pyaudio/default.nix @@ -6,20 +6,20 @@ }: buildPythonPackage rec { - pname = "python-pyaudio"; - version = "0.2.9"; + pname = "PyAudio"; + version = "0.2.11"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "bfd694272b3d1efc51726d0c27650b3c3ba1345f7f8fdada7e86c9751ce0f2a1"; + sha256 = "93bfde30e0b64e63a46f2fd77e85c41fd51182a4a3413d9edfaf9ffaa26efb74"; }; buildInputs = [ pkgs.portaudio ]; meta = with stdenv.lib; { description = "Python bindings for PortAudio"; - homepage = "http://people.csail.mit.edu/hubert/pyaudio/"; + homepage = https://people.csail.mit.edu/hubert/pyaudio/; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 25ef662edef9..37e55617023c 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -33,6 +33,8 @@ buildPythonPackage rec { }) ]; + dontUseCmakeConfigure = true; + checkInputs = [ pytest cmake ] ++ (lib.optional (numpy != null) numpy) ++ (lib.optional (eigen != null) eigen) diff --git a/pkgs/development/python-modules/pymysqlsa/default.nix b/pkgs/development/python-modules/pymysqlsa/default.nix index 0167fe00ea7c..11813d3d1bcd 100644 --- a/pkgs/development/python-modules/pymysqlsa/default.nix +++ b/pkgs/development/python-modules/pymysqlsa/default.nix @@ -6,11 +6,12 @@ }: buildPythonPackage rec { - pname = "pymysqlsa"; + pname = "pymysql-sa"; version = "1.0"; src = fetchPypi { - inherit pname version; + inherit version; + pname = "pymysql_sa"; sha256 = "a2676bce514a29b2d6ab418812259b0c2f7564150ac53455420a20bd7935314a"; }; diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index ee57c4995481..8ae01e493970 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }: buildPythonPackage rec { - pname = "pystache-${version}"; + pname = "pystache"; version = "0.5.4"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 7866454a62fa..506b560e01ae 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools -, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy +, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy, python }: buildPythonPackage rec { version = "5.1.0"; @@ -17,12 +17,13 @@ buildPythonPackage rec { }; checkInputs = [ hypothesis mock ]; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 + # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 checkPhase = '' runHook preCheck @@ -35,15 +36,17 @@ buildPythonPackage rec { pytestcachePhase() { find $out -name .pytest_cache -type d -exec rm -rf {} + } - preDistPhases+=" pytestcachePhase" ''; + pythonImportsCheck = [ + "pytest" + ]; + meta = with stdenv.lib; { homepage = https://docs.pytest.org; description = "Framework for writing tests"; maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; license = licenses.mit; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/python3pika/default.nix b/pkgs/development/python-modules/python3pika/default.nix deleted file mode 100644 index 4f75acff02ec..000000000000 --- a/pkgs/development/python-modules/python3pika/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, isPy3k -, nose -, mock -, pyyaml -, unittest2 -}: - -buildPythonPackage rec { - pname = "python3-pika"; - version = "0.9.14"; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1c3hifwvn04kvlja88iawf0awyz726jynwnpcb6gn7376b4nfch7"; - }; - - # Unit tests adds dependencies on pyev, tornado and twisted (and twisted is disabled for Python 3) - doCheck = false; - - buildInputs = [ nose mock pyyaml ]; - propagatedBuildInputs = [ unittest2 ]; - - meta = with stdenv.lib; { - homepage = https://pika.readthedocs.org/; - description = "Pika Python AMQP Client Library"; - license = licenses.gpl2; - }; - -} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index a849dad54aa9..569ff017ea9b 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,24 +1,29 @@ { stdenv +, buildPythonPackage , fetchPypi , python , wrapPython , unzip +, callPackage +, bootstrapped-pip }: -# Should use buildPythonPackage here somehow -stdenv.mkDerivation rec { +buildPythonPackage rec { pname = "setuptools"; - version = "41.0.1"; - name = "${python.libPrefix}-${pname}-${version}"; + version = "41.2.0"; + format = "other"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a222d126f5471598053c9a77f4b5d4f26eaa1f150ad6e01dcf1a42e185d05613"; + sha256 = "66b86bbae7cc7ac2e867f52dc08a6bd064d938bac59dfec71b9b565dd36d6012"; }; - nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ]; - doCheck = false; # requires pytest + # There is nothing to build + dontBuild = true; + + nativeBuildInputs = [ bootstrapped-pip ]; + installPhase = '' dst=$out/${python.sitePackages} mkdir -p $dst @@ -27,13 +32,11 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - pythonPath = []; - - dontPatchShebangs = true; - - # Python packages built through cross-compilation are always for the host platform. - disallowedReferences = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ python.pythonForBuild ]; + # Adds setuptools to nativeBuildInputs causing infinite recursion. + catchConflicts = false; + # Requires pytest, causing infinite recursion. + doCheck = false; meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index a222fc9e49f8..9e176bc68749 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -1,15 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi, pip }: + buildPythonPackage rec { pname = "setuptools_scm"; - version = "3.2.0"; + version = "3.3.3"; src = fetchPypi { inherit pname version; - sha256 = "52ab47715fa0fc7d8e6cd15168d1a69ba995feb1505131c3e814eb7087b57358"; + sha256 = "19cyndx23xmpbhz4qrwmfwsmnnaczd0dw7qg977ksq2dbvxy29dx"; }; - buildInputs = [ pip ]; - # Seems to fail due to chroot and would cause circular dependency # with pytest doCheck = false; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 4bea277a95b3..1e69692eac1e 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -22,6 +22,7 @@ , requests , sphinxcontrib-websupport , typing +, setuptools }: buildPythonPackage rec { @@ -46,6 +47,7 @@ buildPythonPackage rec { pygments alabaster Babel + setuptools snowballstemmer six sqlalchemy diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index bebe8c3d1f8e..dbcc5935e5e2 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -16,6 +16,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ ptyprocess tornado ]; + # test_max_terminals fails + doCheck = false; + meta = with lib; { description = "Terminals served by Tornado websockets"; homepage = https://github.com/jupyter/terminado; diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 3a21ce57fe7a..b3d83deeac9e 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -10,20 +10,25 @@ python.pkgs.buildPythonPackage rec { }; propagatedBuildInputs = with python.pkgs; [ six ]; - checkInputs = with python.pkgs; [ factory_boy faker pytest pytestcov tox ]; + checkInputs = with python.pkgs; [ factory_boy faker pytestcov tox pytestCheckHook]; # https://github.com/barseghyanartur/tld/issues/54 - disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([ + disabledTests = [ "test_1_update_tld_names" "test_1_update_tld_names_command" "test_2_update_tld_names_module" - ]); + ]; - checkPhase = '' - export PATH="$PATH:$out/bin" - py.test -k '${disabledTests}' + preCheck = '' + export PATH="$PATH:$out/bin" ''; + dontUseSetuptoolsCheck = true; + + pythonImportsCheck = [ + "tld" + ]; + meta = with stdenv.lib; { homepage = https://github.com/barseghyanartur/tld; description = "Extracts the top level domain (TLD) from the URL given"; diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 27c4ac2468ff..2a74a00539f9 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -20,10 +20,7 @@ buildPythonPackage { # no test data doCheck = false; - preConfigure = '' - mkdir build - cd build - cmake .. + postConfigure = '' cd ../py_ext ''; diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index d7814984060e..0ba5b19597ee 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -1,30 +1,34 @@ { lib +, setuptools +, pip , buildPythonPackage , fetchPypi , pytest , pytestcov , coverage , jsonschema +, bootstrapped-pip }: buildPythonPackage rec { pname = "wheel"; - version = "0.33.4"; + version = "0.33.6"; + format = "other"; src = fetchPypi { inherit pname version; - sha256 = "62fcfa03d45b5b722539ccbc07b190e4bfff4bb9e3a4d470dd9f6a0981002565"; + sha256 = "10c9da68765315ed98850f8e048347c3eb06dd81822dc2ab1d4fde9dc9702646"; }; checkInputs = [ pytest pytestcov coverage ]; + nativeBuildInputs = [ bootstrapped-pip setuptools ]; - propagatedBuildInputs = [ jsonschema ]; - + catchConflicts = false; # No tests in archive doCheck = false; # We add this flag to ignore the copy installed by bootstrapped-pip - installFlags = [ "--ignore-installed" ]; + pipInstallFlags = [ "--ignore-installed" ]; meta = { description = "A built-package format for Python"; diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 8b30cc6be87f..98461dfb4044 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -30,6 +30,9 @@ buildPythonPackage rec { sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm"; }; + dontUseSetuptoolsBuild = true; + dontUsePipInstall = true; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkgconfig ] |