diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 59f7389b9ad3c..0b624e52821cc 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -428,10 +428,10 @@ that we introduced with the `let` expression. Our example, `toolz`, does not have any dependencies on other Python packages or system libraries. According to the manual, `buildPythonPackage` uses the -arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If +arguments `buildInputs` and `requiredPythonModules` to specify dependencies. If something is exclusively a build-time dependency, then the dependency should be included in `buildInputs`, but if it is (also) a runtime dependency, then it -should be added to `propagatedBuildInputs`. Test dependencies are considered +should be added to `requiredPythonModules`. Test dependencies are considered build-time dependencies and passed to `checkInputs`. The following example shows which arguments are given to `buildPythonPackage` in @@ -450,7 +450,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + requiredPythonModules = [ numpy multipledispatch dateutil ]; meta = with lib; { homepage = "https://github.com/ContinuumIO/datashape"; @@ -464,7 +464,7 @@ buildPythonPackage rec { We can see several runtime dependencies, `numpy`, `multipledispatch`, and `dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a test runner and is only used during the `checkPhase` and is therefore not added -to `propagatedBuildInputs`. +to `requiredPythonModules`. In the previous case we had only dependencies on other Python packages to consider. Occasionally you have also system libraries to consider. E.g., `lxml` provides @@ -518,7 +518,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; - propagatedBuildInputs = [ numpy scipy ]; + requiredPythonModules = [ numpy scipy ]; # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; @@ -671,9 +671,9 @@ mode is activated. In the following example we create a simple environment that has a Python 3.8 version of our package in it, as well as its dependencies and other packages we -like to have in the environment, all specified with `propagatedBuildInputs`. +like to have in the environment, all specified with `requiredPythonModules`. Indeed, we can just add any package we like to have in our environment to -`propagatedBuildInputs`. +`requiredPythonModules`. ```nix with import {}; @@ -682,7 +682,7 @@ with python38Packages; buildPythonPackage rec { name = "mypackage"; src = ./path/to/package/source; - propagatedBuildInputs = [ pytest numpy pkgs.libsndfile ]; + requiredPythonModules = [ pytest numpy pkgs.libsndfile ]; } ``` @@ -843,7 +843,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis ]; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy ]; + requiredPythonModules = [ attrs py setuptools six pluggy ]; meta = with lib; { maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; @@ -898,8 +898,6 @@ following are specific to `buildPythonPackage`: * `pipInstallFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `pipInstallFlags=["--install-option='--cpp_implementation'"]`. -* `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages - in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). * `preShellHook`: Hook to execute commands before `shellHook`. * `postShellHook`: Hook to execute commands after `shellHook`. * `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only @@ -920,7 +918,7 @@ because their behaviour is different: * `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `nativeBuildInputs` when `doCheck = true`. Items listed in `tests_require` go here. -* `propagatedBuildInputs ? []`: Aside from propagating dependencies, +* `requiredPythonModules ? []`: Aside from propagating dependencies, `buildPythonPackage` also injects code into and wraps executables with the paths included in this list. Items listed in `install_requires` go here. @@ -980,7 +978,7 @@ python3Packages.buildPythonApplication rec { sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x"; }; - propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ]; + requiredPythonModules = with python3Packages; [ tornado_4 python-daemon ]; meta = with lib; { ... @@ -1539,7 +1537,7 @@ configure alternatives](#sec-overlays-alternatives-blas-lapack)". In a `setup.py` or `setup.cfg` it is common to declare dependencies: * `setup_requires` corresponds to `nativeBuildInputs` -* `install_requires` corresponds to `propagatedBuildInputs` +* `install_requires` corresponds to `requiredPythonModules` * `tests_require` corresponds to `checkInputs` ## Contributing diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index a894caed1a34a..0be191f875258 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -129,7 +129,7 @@ let EOF ''; - propagatedBuildInputs = [ pkgs.pythonPackages.click ]; + requiredPythonModules = [ pkgs.pythonPackages.click ]; }; in { diff --git a/nixos/modules/services/x11/display-managers/account-service-util.nix b/nixos/modules/services/x11/display-managers/account-service-util.nix index 2b08c62d0ad13..a94a0b6b2b3ad 100644 --- a/nixos/modules/services/x11/display-managers/account-service-util.nix +++ b/nixos/modules/services/x11/display-managers/account-service-util.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication { glib ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pygobject3 ordered-set ]; diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index e85482af8392e..04d842bb47867 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -25,7 +25,7 @@ let utillinux # for (u)mount, fdisk, sfdisk, mkswap parted ]; - pythonPath = [ pythonPackages.pyasn1 ]; + requiredPythonModules = [ pythonPackages.pyasn1 ]; configurePhase = false; buildPhase = false; diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 8a566c2499178..7d66099b20d94 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { python3Packages.wrapPython pkgconfig which wrapQtAppsHook ]; - pythonPath = with python3Packages; [ + requiredPythonModules = with python3Packages; [ rdflib pyliblo ] ++ optional withFrontend pyqt5; buildInputs = [ file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile - ] ++ pythonPath + ] ++ requiredPythonModules ++ optional withQt qtbase ++ optional withGtk2 gtk2 ++ optional withGtk3 gtk3; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { postFixup = '' # Also sets program_PYTHONPATH and program_PATH variables wrapPythonPrograms - wrapPythonProgramsIn "$out/share/carla/resources" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/carla/resources" "$out $requiredPythonModules" find "$out/share/carla" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do patchPythonScript "$f" diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index 1a78b783f53a0..069480a08ef53 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { gst-plugins-base ]); - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ apsw cairo dbus-python diff --git a/pkgs/applications/audio/curseradio/default.nix b/pkgs/applications/audio/curseradio/default.nix index 1dd5f9ee5eb24..3603cf068e995 100644 --- a/pkgs/applications/audio/curseradio/default.nix +++ b/pkgs/applications/audio/curseradio/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "11bf0jnj8h2fxhpdp498189r4s6b47vy4wripv0z4nx7lxajl88i"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ requests lxml pyxdg diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix index 272701b36804f..482f220b031ee 100644 --- a/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/pkgs/applications/audio/dr14_tmeter/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1nfsasi7kx0myxkahbd7rz8796mcf5nsadrsjjpx2kgaaw5nkv1m"; }; - propagatedBuildInputs = with pkgs; [ + requiredPythonModules = with pkgs; [ python3Packages.numpy flac vorbis-tools ffmpeg_3 faad2 lame ]; diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index e4bd79a08e318..e2da5cd262ff3 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -16,7 +16,7 @@ in py.buildPythonApplication rec { nativeBuildInputs = (with py; [ numpy cython scipy ]) ++ [ wrapQtAppsHook ]; - propagatedBuildInputs = with py; [ + requiredPythonModules = with py; [ sounddevice pyopengl pyopengl-accelerate diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 4a21868f09727..688dfb7089e46 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { doCheck = true; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ feedparser dbus-python mygpoclient diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix index e027680f5fe64..04a150875ed03 100644 --- a/pkgs/applications/audio/greg/default.nix +++ b/pkgs/applications/audio/greg/default.nix @@ -14,7 +14,7 @@ with pythonPackages; buildPythonApplication rec { }; buildInputs = with pythonPackages; [ feedparser ]; - propagatedBuildInputs = buildInputs; + requiredPythonModules = buildInputs; meta = with stdenv.lib; { homepage = "https://github.com/manolomartinez/greg"; diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/applications/audio/gspeech/default.nix index 21a4d6748beda..7ccbfe99d6257 100644 --- a/pkgs/applications/audio/gspeech/default.nix +++ b/pkgs/applications/audio/gspeech/default.nix @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { python3 ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pygobject3 librsvg ]; diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index a81834c1fff79..3aa7da8a3d9dd 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -9,14 +9,16 @@ pythonPackages.buildPythonApplication rec { sha256 = "7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137"; }; - pythonPath = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ pyliblo pyGtkGlade ]; nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = [ klick ]; + makeWrapperArgs = [ + "--prefix PATH ${stdenv.lib.makeBinPath [ klick ]}" + ]; # wrapPythonPrograms breaks gtklick in the postFixup phase. # To fix it, apply wrapPythonPrograms and then clean up the wrapped file. diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index f325185920d70..c27dff5650692 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { totem-pl-parser ] ++ lib.optional lastFMSupport libsecret; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ beautifulsoup4 pillow pycairo @@ -78,7 +78,7 @@ python3.pkgs.buildPythonApplication rec { ''; postFixup = '' - wrapPythonProgramsIn $out/libexec "$out $propagatedBuildInputs" + wrapPythonProgramsIn $out/libexec "$out $requiredPythonModules" ''; strictDeps = false; diff --git a/pkgs/applications/audio/lyrebird/default.nix b/pkgs/applications/audio/lyrebird/default.nix index b40dbfe65bf81..a93f4492f23cc 100644 --- a/pkgs/applications/audio/lyrebird/default.nix +++ b/pkgs/applications/audio/lyrebird/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0wmnww2wi8bb9m8jgc18n04gjia8pf9klmvij0w98xz11l6kxb13"; }; - propagatedBuildInputs = with python3Packages; [ toml pygobject3 ]; + requiredPythonModules = with python3Packages; [ toml pygobject3 ]; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index 1e5e42ac2f346..ebc5bbe1029d3 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { sha256 = "14yswmlfs659rs3k595606m77lw9c6pjykb5pikqw21sb97haxl3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ mopidy python3Packages.requests python3Packages.gmusicapi diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 48f955fd7137d..5dfde093d1132 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "04miwf0dqb8jir9g7xkfnn3l62bdn74ap03kqzz2v3byg64f1p0g"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ mopidy ] ++ (with python3Packages; [ configobj diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix index 43554280565e2..9624ba2dbd838 100644 --- a/pkgs/applications/audio/mopidy/local.nix +++ b/pkgs/applications/audio/mopidy/local.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { sha256 = "13m0iz14lyplnpm96gfpisqvv4n89ls30kmkg21z7v238lm0h19j"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ mopidy python3Packages.uritools ]; diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix index ffd9af76d173b..a6e71ce30723d 100644 --- a/pkgs/applications/audio/mopidy/moped.nix +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ mopidy ]; + requiredPythonModules = [ mopidy ]; # no tests implemented doCheck = false; diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index eb5672fe135b4..675d4f3c2e555 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec { gst-plugins-ugly ]; - propagatedBuildInputs = [ + requiredPythonModules = [ gobject-introspection ] ++ (with pythonPackages; [ gst-python diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index a9902ca417212..bd9944668491f 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "93ad2b3d38b1450c8f2698bb908b0b077a96b3f64cdd6486519e518132e23a5c"; }; - propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; + requiredPythonModules = with pythonPackages; [ mopidy configobj ]; # no tests implemented doCheck = false; diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index 4dd32ea3aa356..52657a55f1bb4 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0prjli4352521igcsfcgmk97jmzgbfy4ik8hnli37wgvv252wiac"; }; - propagatedBuildInputs = [mopidy]; + requiredPythonModules = [mopidy]; # no tests implemented doCheck = false; diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix index 1c6d841a34e40..74706986da02c 100644 --- a/pkgs/applications/audio/mopidy/mpris.nix +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0mmdaikw00f43gzjdbvlcvzff6yppm7v8mv012r79adzd992q9y0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ mopidy python3Packages.pydbus ]; diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index d628e5894a28b..2a229a38fd0f5 100644 --- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0784s32pap9rbki3f0f7swaf6946sdv4xzidns13jmw9ilifk5z4"; }; - propagatedBuildInputs = [ mopidy ]; + requiredPythonModules = [ mopidy ]; doCheck = false; diff --git a/pkgs/applications/audio/mopidy/somafm.nix b/pkgs/applications/audio/mopidy/somafm.nix index 2e3380fa20f87..d252b2115fec4 100644 --- a/pkgs/applications/audio/mopidy/somafm.nix +++ b/pkgs/applications/audio/mopidy/somafm.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1j88rrliys8hqvnb35k1xqw88bvrllcb4rb53lgh82byhscsxlf3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ mopidy ]; diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix index 8002feb0f9016..517c0e4160e48 100644 --- a/pkgs/applications/audio/mopidy/soundcloud.nix +++ b/pkgs/applications/audio/mopidy/soundcloud.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "131qdm9i0j3ayff0js11qcmbjv50ws5s6iiqr6x5b66ymjl4scfv"; }; - propagatedBuildInputs = [ mopidy ]; + requiredPythonModules = [ mopidy ]; doCheck = false; diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix index 4b75af5ed5798..58f9ea4057f6b 100644 --- a/pkgs/applications/audio/mopidy/spotify-tunigo.nix +++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1jwk0b2iz4z09qynnhcr07w15lx6i1ra09s9lp48vslqcf2fp36x"; }; - propagatedBuildInputs = [ mopidy mopidy-spotify pythonPackages.tunigo ]; + requiredPythonModules = [ mopidy mopidy-spotify pythonPackages.tunigo ]; doCheck = false; diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 32019c74f86d7..ed1ab2f7c2184 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1ac8r8050i5r3ag1hlblbcyskqjqz7wgamndbzsmw52qi6hxk44f"; }; - propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; + requiredPythonModules = [ mopidy pythonPackages.pyspotify ]; doCheck = false; diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix index 9ab0323205283..d65a823c5f994 100644 --- a/pkgs/applications/audio/mopidy/tunein.nix +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0insasf4w8ajsqjh5zmax7pkzmrk1p245vh4y8ddicldj45p6qfj"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ mopidy ]; diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index a115812b86a6a..3e0b0e2656a38 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { patchPhase = "sed s/bs4/beautifulsoup4/ -i setup.cfg"; - propagatedBuildInputs = [ + requiredPythonModules = [ mopidy python3Packages.beautifulsoup4 python3Packages.cachetools diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 2cb4ff09803c3..9610c7768b711 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -32,7 +32,7 @@ in pythonPackages.buildPythonApplication rec { ] ; - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ pyqt5 mutagen chromaprint diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 6c3ffebc8c955..2fec139ae1d6c 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ meson ninja pkgconfig appstream-glib wrapGAppsHook ]; - propagatedBuildInputs = + requiredPythonModules = [ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with pythonPackages; [ pygobject3 pylast ]); diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 55cde08fe871d..f4a1b26fe0115 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [ + requiredPythonModules = [ chromaprint ] ++ (with python3Packages; [ configobj mutagen pyparsing diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index c0986880c0942..e5cb7038af136 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication { sha256 = "1dfn7036vrq49kxv4an7rayypnm5dlawsf02pfsldw877hzdamqk"; }; - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ dbus-python docopt requests setproctitle protobuf psutil futures chardet notify2 netifaces pyroute2 pygobject2 lxml setuptools ] ++ [ zeroconf ] diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix index efe39aa1600ee..9de44b5a1a91b 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3"; }; - propagatedBuildInputs = [ netifaces six enum-compat ifaddr ] + requiredPythonModules = [ netifaces six enum-compat ifaddr ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 704e20cc8c563..70fc4f68054fe 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { ++ (if xineBackend then [ xineLib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); - propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo mutagen gst-python feedparser ] + requiredPythonModules = with python3.pkgs; [ pygobject3 pycairo mutagen gst-python feedparser ] ++ optionals withDbusPython [ dbus-python ] ++ optionals withPyInotify [ pyinotify ] ++ optionals withMusicBrainzNgs [ musicbrainzngs ] diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix index 3044acb326490..ced9431456f6b 100644 --- a/pkgs/applications/audio/r128gain/default.nix +++ b/pkgs/applications/audio/r128gain/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { ) ]; - propagatedBuildInputs = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ]; + requiredPythonModules = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ]; checkInputs = with python3Packages; [ requests sox ]; # Testing downloads media files for testing, which requires the diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/applications/audio/rofi-mpd/default.nix index 8f9819bd913b8..090b6dcbf7a24 100644 --- a/pkgs/applications/audio/rofi-mpd/default.nix +++ b/pkgs/applications/audio/rofi-mpd/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0jabyn6gqh8ychn2a06xws3avz0lqdnx3qvqkavfd2xr6sp2q7lg"; }; - propagatedBuildInputs = with python3Packages; [ mutagen mpd2 toml appdirs ]; + requiredPythonModules = with python3Packages; [ mutagen mpd2 toml appdirs ]; # upstream doesn't contain a test suite doCheck = false; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index cf3f173a096e9..59080799c2d50 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -32,7 +32,7 @@ in buildPythonApplication rec { # The optional tagpy dependency (for editing metadata) is not yet # included because it's difficult to build. - pythonPath = [ + requiredPythonModules = [ dbus-python mpd2 pygobject3 diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 7e3c1b9164f1b..83bab6a0e6602 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { ++ lib.optional networkSupport networkmanager ; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ dataclasses-json deepdiff fuzzywuzzy diff --git a/pkgs/applications/audio/tuijam/default.nix b/pkgs/applications/audio/tuijam/default.nix index 8a08b64508d78..1cc0f0a01c22c 100644 --- a/pkgs/applications/audio/tuijam/default.nix +++ b/pkgs/applications/audio/tuijam/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { # the package has no tests doCheck = false; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ gmusicapi google_api_python_client mpv diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 5cbc9a07b6c77..c1e47ab600784 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1c2qldw9vxpvdfh5wl6mfcd7zzz3v8r86ffqll311lcp2zin33dg"; }; - pythonPath = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ musicbrainzngs mutagen pycdio diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index fc7e6c0fc3593..a48582748892a 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - propagatedBuildInputs = [ + requiredPythonModules = [ paramiko peewee pyqt5 python-dateutil APScheduler psutil qdarkstyle secretstorage appdirs setuptools ]; diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix index f0bcda5793013..115221af301be 100644 --- a/pkgs/applications/blockchains/cryptop/default.nix +++ b/pkgs/applications/blockchains/cryptop/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb"; }; - propagatedBuildInputs = [ requests requests-cache ]; + requiredPythonModules = [ requests requests-cache ]; # No tests in archive doCheck = false; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 6704702837a6b..30e84948d81c5 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -122,10 +122,10 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; - pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ]; + requiredPythonModules = with python3.pkgs; computeRequiredPythonModules [ pygobject3 ]; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $requiredPythonModules" gappsWrapperArgs+=( --prefix PYTHONPATH : "$program_PYTHONPATH" ) diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index deeb9b36c7194..69448d16f2b6e 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ + requiredPythonModules = [ python3Packages.pyqt5 python3Packages.lxml zlib diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 06beff03f9041..6fc4c84080065 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0jlw0qksak4bdzddpsj74pm2f2bgpj3cwrlspdjjy0j9qzg0mpl9"; }; - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ pynvim psutil setuptools diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index dcf42b55c5c59..f1afb75f5ed27 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -11,7 +11,7 @@ in pythonPackages.buildPythonApplication rec { sha256 = "1rd3vlaqkg16iz6qcw6rkbq0jmyvc0843wa3brnvn1nz0kla243f"; }; - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ markdown tkinter docutils diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 0cfa2b62dce3e..04a929e781796 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection ]; - propagatedBuildInputs = [ + requiredPythonModules = [ gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk pygobject3 pyyaml ]; diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index c32e831575615..db88bb61f4060 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -43,7 +43,7 @@ in python.pkgs.buildPythonApplication { doCheck = false; nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ pythonEnv ]; + requiredPythonModules = [ pythonEnv ]; postInstall = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 46dc413971d99..d656c0c48a53c 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { librsvg ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pygobject3 pyxdg ]; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 869c20c1d6c4b..77301c6481b08 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -15,7 +15,7 @@ mkDerivation rec { sha256 = "02bkyi9xpaxdcivm075y3praxgvfay9z0189gvr6g8yc3ml1miyr"; }; - pythonPath = with python3Packages; [ lxml ]; + requiredPythonModules = with python3Packages; [ lxml ]; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index 706d3fd717630..084da08aaaaff 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "0gzvdgg5l4j0wgkh7lp4wjabrpxvvs5m7mnpszqixxijdffjd4cj"; }; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ jedi pyserial tkinter diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index cf94f4fa32d14..b4c51209599cb 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -16,7 +16,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { sha256 = "1970izjaa60r5cg9i35rzz9lk5c5d8q1vw1rh2skvfbf63z1hnzv"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ cadquery Logbook pyqt5 diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 5b324a5974d7c..25334863904ac 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -24,7 +24,7 @@ in buildPythonApplication rec { sha256 = "1sivi4q7sqsrc95qg5gh37bsm2761md4mpl89hflzwk6kyyxyd3w"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ libXext libXxf86vm libX11 diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index b491c3e3ead09..96fd67fa5289b 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; }; checkInputs = with python3Packages; [ pytest responses ]; - propagatedBuildInputs = with python3Packages; [ colorama lxml requests pbr setuptools ]; + requiredPythonModules = with python3Packages; [ colorama lxml requests pbr setuptools ]; disabled = python3Packages.pythonOlder "3.3"; diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index fb68276b168c6..cbc86381b9124 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { pango ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pycairo pygobject3 ]; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 556e5e30f3a4e..bca51c979d2c9 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonPackage { wrapQtAppsHook ]; - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ beautifulsoup4 html5lib lxml diff --git a/pkgs/applications/graphics/imgp/default.nix b/pkgs/applications/graphics/imgp/default.nix index 80420202c0532..a988c79861e73 100644 --- a/pkgs/applications/graphics/imgp/default.nix +++ b/pkgs/applications/graphics/imgp/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "13r4fn3dd0nyidfhrr7zzpls5ifbyqdwxhyvpkqr8ahchws7wfc6"; }; - propagatedBuildInputs = [ pillow ]; + requiredPythonModules = [ pillow ]; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix index da35891897252..1b2eca936a4aa 100644 --- a/pkgs/applications/graphics/kcc/default.nix +++ b/pkgs/applications/graphics/kcc/default.nix @@ -15,7 +15,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; }; - propagatedBuildInputs = with python3Packages ; [ + requiredPythonModules = with python3Packages ; [ pillow pyqt5 psutil diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index ee49067697709..4bff2db11083d 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1ygzc7vlwszqmsd3v1dsqp1dpsn6inx7g8gck63alvf88dbn8m3s"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pyqt5 pypdf2 poppler-qt5 diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 7267e8401600b..514e0bdb133e4 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -56,7 +56,7 @@ in buildPythonApplication rec { hicolor-icon-theme ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy pycairo pygobject3 diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index e34d5a87a4785..ccab2a76647e0 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { wrapGAppsHook ]; - pythonPath = [ + requiredPythonModules = [ pygobject3 pycairo ]; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index aa6db0accdba8..e7ab22fcb9819 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -46,7 +46,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { udisks ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pyqt5 pygobject3 gphoto2 diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index b5e9d0b8cf2dd..7eb9aca797497 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; buildInputs = [ gnome3.adwaita-icon-theme librsvg ]; - propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; + requiredPythonModules = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ "--prefix GI_TYPELIB_PATH : \"$GI_TYPELIB_PATH\"" diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index 49da252b6c0d1..a38f167ce51e2 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -18,5 +18,5 @@ python3Packages.buildPythonApplication { sha256 = "0v8y64kldfbs809j1g9d75dd1vxq7mfxnp4b45pz8anpxhjf64fy"; }; - propagatedBuildInputs = [ python3Packages.openant ]; + requiredPythonModules = [ python3Packages.openant ]; } diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 3c11c7bfaf576..f28e25bc32af7 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { libnotify ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ chardet pygobject3 requests diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 9b8f531e800e0..cdc59e062529b 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -21,7 +21,7 @@ with python3.pkgs; buildPythonApplication rec { mypy-extensions ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cryptography beautifulsoup4 requests diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index c74ac5ffb3067..6f3fef7fcaa98 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = with pythonPackages; [ pygtk dbus-python pygtksourceview ]; + requiredPythonModules = with pythonPackages; [ pygtk dbus-python pygtksourceview ]; patches = [ ./subprocess.patch ]; diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index bbb7c53b61f65..5a4eaf3bb0a2d 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -18,7 +18,7 @@ in pythonPackages.buildPythonApplication rec { buildInputs = with pythonPackages; [ glibcLocales ]; - propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 ConfigArgParse keyring pyasn1 requests six urllib3 ]; + requiredPythonModules = with pythonPackages; [ attrs beautifulsoup4 ConfigArgParse keyring pyasn1 requests six urllib3 ]; checkInputs = with pythonPackages; [ pytest mock ]; diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/applications/misc/cum/default.nix index 2675a5f4fc5d2..cd1f1f141e590 100644 --- a/pkgs/applications/misc/cum/default.nix +++ b/pkgs/applications/misc/cum/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "15qc6agka2g3kcnpnz0hbjic1s3260cr9bda0rlcyninxs1vndq0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ alembic beautifulsoup4 click natsort requests sqlalchemy ]; diff --git a/pkgs/applications/misc/cura/lulzbot/default.nix b/pkgs/applications/misc/cura/lulzbot/default.nix index 229966561c6d5..1f52b97cc3306 100644 --- a/pkgs/applications/misc/cura/lulzbot/default.nix +++ b/pkgs/applications/misc/cura/lulzbot/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { buildInputs = [ qtbase qtquickcontrols2 ]; # numpy-stl temporarily disabled due to https://code.alephobjects.com/T8415 - propagatedBuildInputs = with python3.pkgs; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl + requiredPythonModules = with python3.pkgs; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix index 5edaabbacb0f7..41ea78c55a21d 100644 --- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -13,7 +13,7 @@ buildPythonPackage { disabled = pythonOlder "3.4.0"; - propagatedBuildInputs = [ sip ]; + requiredPythonModules = [ sip ]; nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ]; diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix index e32117a103ee0..4dd40adfbf047 100644 --- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -19,7 +19,7 @@ buildPythonPackage { nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ sip ]; + requiredPythonModules = [ sip ]; disabled = pythonOlder "3.4.0"; diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix index 2ce0fab170ea0..394698fe52573 100644 --- a/pkgs/applications/misc/cura/lulzbot/uranium.nix +++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix @@ -16,7 +16,7 @@ buildPythonPackage { disabled = pythonOlder "3.5.0"; buildInputs = [ python gettext ]; - propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcusLulzbot ]; + requiredPythonModules = [ pyqt5 numpy scipy shapely libarcusLulzbot ]; nativeBuildInputs = [ cmake doxygen ]; postPatch = '' diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix index 87d2aba891b63..df6239a1470c5 100644 --- a/pkgs/applications/misc/cura/stable.nix +++ b/pkgs/applications/misc/cura/stable.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ]; - pythonPath = python_deps; + requiredPythonModules = python_deps; propagatedBuildInputs = python_deps; diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix index cf02efdcece50..66c237bc6ff05 100644 --- a/pkgs/applications/misc/dmensamenu/default.nix +++ b/pkgs/applications/misc/dmensamenu/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ requests ]; diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 463f7db6b0c33..4240ea86961ef 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { substituteInPlace dockx_applets/volume-control.py --replace /usr/share/ $out/share/ ''; - propagatedBuildInputs = (with pythonPackages; [ pygtk pyxdg dbus-python pillow xlib ]) + requiredPythonModules = (with pythonPackages; [ pygtk pyxdg dbus-python pillow xlib ]) ++ (with gnome2; [ gnome_python gnome_python_desktop ]) ++ [ keybinder ]; diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index b515074fd4750..c73c0487c70b8 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; checkInputs = with pythonPackages; [ pytest ]; - propagatedBuildInputs = with pythonPackages; [ click ]; + requiredPythonModules = with pythonPackages; [ click ]; meta = with stdenv.lib; { description = "Easily manage your dotfiles"; diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 51e1b77096d23..7492defa01d83 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { qt5.wrapQtAppsHook ]; - pythonPath = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pyqt5 send2trash sphinx @@ -58,7 +58,7 @@ python3Packages.buildPythonApplication rec { # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py # so wrapPythonPrograms hook does not handle it automatically. postFixup = '' - wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/dupeguru" "$out $requiredPythonModules" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index fe263dd6692bc..30dc3df01207d 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0ixsx4224jilc5zis6wbsbxqxv10mm5sksrzq15xp30zz0bzb6md"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ dnspython ecdsa jsonrpclib-pelix diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix index 33a8284744e50..3c2cb7059c333 100644 --- a/pkgs/applications/misc/electrum/dash.nix +++ b/pkgs/applications/misc/electrum/dash.nix @@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec { sha256 = "9b7ac205f63fd4bfb15d77a34a4451ef82caecf096f31048a7603bd276dfc33e"; }; - propagatedBuildInputs = with python2Packages; [ + requiredPythonModules = with python2Packages; [ dnspython ecdsa pbkdf2 diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index ad26a912e7814..cdf20a71941ef 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -68,7 +68,7 @@ py.pkgs.buildPythonApplication { nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with py.pkgs; [ + requiredPythonModules = with py.pkgs; [ aiohttp aiohttp-socks aiorpcx diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 7d6480b4696c9..43eea3619f50b 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pyaes ecdsa pbkdf2 diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 5e3a85c3b93fc..e8a153a0a4c33 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace setup.py --replace "Radicale==" "Radicale>=" ''; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ etesync flask flask_wtf diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/applications/misc/fluxboxlauncher/default.nix index 4794e14b4698e..1058844a4d8f0 100755 --- a/pkgs/applications/misc/fluxboxlauncher/default.nix +++ b/pkgs/applications/misc/fluxboxlauncher/default.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" "--set CHARSET en_us.UTF-8" ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pygobject3 ]; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 8135dce4d7a3e..f278c51726438 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0f2d1ixg0ir7ispxxggv378dc0m55k9y19075swf893maxf07f35"; }; - propagatedBuildInputs = with python3Packages; [ requests ]; + requiredPythonModules = with python3Packages; [ requests ]; checkInputs = with python3Packages; [ pytestCheckHook ]; pytestFlagsArray = [ diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 20aefe2ab1d6a..4ae43e8c0fd61 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { --replace "'notify-send" "'${libnotify}/bin/notify-send" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ dateutil gflags httplib2 parsedatetime six vobject google_api_python_client oauth2client uritemplate libnotify diff --git a/pkgs/applications/misc/genxword/default.nix b/pkgs/applications/misc/genxword/default.nix index 215542003adf2..1f2ab2054bb7f 100644 --- a/pkgs/applications/misc/genxword/default.nix +++ b/pkgs/applications/misc/genxword/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { gtksourceview3 ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pycairo pygobject3 ]; diff --git a/pkgs/applications/misc/gnome-passwordsafe/default.nix b/pkgs/applications/misc/gnome-passwordsafe/default.nix index 7b0553f7f9e3c..e7b017b10e6e5 100644 --- a/pkgs/applications/misc/gnome-passwordsafe/default.nix +++ b/pkgs/applications/misc/gnome-passwordsafe/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { libhandy ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pygobject3 construct @@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { inherit version; sha256 = "1ysjn92bixq8wkwhlbhrjj9z0h80qnlnj7ks5478ndkzdw5gxvm1"; }; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pycryptodome ]; + requiredPythonModules = old.requiredPythonModules ++ [ pycryptodome ]; })) ] ++ [ diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 4315af94f6b61..43cf55aa40539 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -29,7 +29,7 @@ in buildPythonApplication rec { sha256 = "1jz1fbjj6byndvir7qxzhd2ryirrd5h2kwndxpp53xdc05z1i8g7"; }; - pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; + requiredPythonModules = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix index 57b36e00436ec..873040e5917d5 100644 --- a/pkgs/applications/misc/hamster/default.nix +++ b/pkgs/applications/misc/hamster/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { atk ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pygobject3 pycairo pyxdg @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { ''; postFixup = '' - wrapPythonProgramsIn $out/libexec "$out $pythonPath" + wrapPythonProgramsIn $out/libexec "$out $requiredPythonModules" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 41aa71cb82e20..07491a42e9c94 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { sha256 = "1g3dfsyk4727d9jh9w6j5r51ag07851cls7v7a7hmdvdixpvbzp6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click colorama requests diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix index 5a03cfe23bacc..5b287324911fa 100644 --- a/pkgs/applications/misc/hovercraft/default.nix +++ b/pkgs/applications/misc/hovercraft/default.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { }; checkInputs = [ manuel ]; - propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ]; + requiredPythonModules = [ setuptools docutils lxml svg-path pygments watchdog ]; meta = with lib; { description = "Makes impress.js presentations from reStructuredText"; diff --git a/pkgs/applications/misc/html5validator/default.nix b/pkgs/applications/misc/html5validator/default.nix index 657996d1da9f5..84f207390489e 100644 --- a/pkgs/applications/misc/html5validator/default.nix +++ b/pkgs/applications/misc/html5validator/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "130acqi0dsy3midg7hwslykzry6crr4ln6ia0f0avyywkz4bplsv"; }; - propagatedBuildInputs = [ openjdk ]; + requiredPythonModules = [ openjdk ]; checkInputs = [ nose ]; checkPhase = "PATH=$PATH:$out/bin nosetests"; diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix index 6be6e842bde72..90be84b40f7a4 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/applications/misc/inkcut/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ + requiredPythonModules = [ enamlx twisted lxml diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 992b981c00376..0062aa92ce07a 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "d254c9c8f24dcf985b98a1d5311337c7f416e6305107eec34c567f58c95b06f4"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pytz six tzlocal keyring dateutil parsedatetime pycrypto ]; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 257cacf69a0cb..c8622712d4c6f 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -13,7 +13,7 @@ with python3.pkgs; buildPythonApplication rec { ./skip-broken-test.patch ]; - propagatedBuildInputs = [ + requiredPythonModules = [ atomicwrites click click-log diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index a3e4c1309ffcd..1bc1c16807592 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "062nv4xkfsjc11k9m52dh6xjn9z68a4a6x1s8z05wwv4jbp1lkhn"; }; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ atomicwrites configobj vobject diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index c7f54990107f9..6987396fe0848 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -16,6 +16,8 @@ buildPythonApplication rec { pname = "kupfer"; version = "319"; + format = "other"; + src = fetchurl { url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz"; sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92"; @@ -27,19 +29,15 @@ buildPythonApplication rec { gobject-introspection wafHook ]; buildInputs = [ docutils libwnck3 keybinder3 ]; - propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; + requiredPythonModules = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; # without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk' # see https://github.com/NixOS/nixpkgs/issues/56943 for details strictDeps = false; - postInstall = let - pythonPath = (stdenv.lib.concatMapStringsSep ":" - (m: "${m}/lib/${python.libPrefix}/site-packages") - propagatedBuildInputs); - in '' + postInstall = '' gappsWrapperArgs+=( - "--prefix" "PYTHONPATH" : "${pythonPath}" + "--prefix" "PYTHONPATH" : "${makePythonPath requiredPythonModules}" "--set" "PYTHONNOUSERSITE" "1" ) ''; diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 4b201c66fe5ef..7d09804a713a0 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -12,7 +12,7 @@ py.buildPythonApplication { sha256 = "1cg0dfcv57ps54f1a0ksib7hgkrbdi9q699w302xyyfyvjcb5dd2"; }; - propagatedBuildInputs = with py; [ wxPython ]; + requiredPythonModules = with py; [ wxPython ]; postInstall = '' mv $out/bin/loxodo.py $out/bin/loxodo diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index b3a68cffeff18..234f46bf71c51 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -93,7 +93,7 @@ in buildPythonApplication rec { webkitgtk ] ++ gstDeps; - propagatedBuildInputs = [ + requiredPythonModules = [ evdev distro pyyaml pygobject3 requests pillow dbus-python keyring ]; diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index 41ae683548d08..a8a71682dec11 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -37,7 +37,7 @@ buildPythonApplication rec { prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ boto3 # needed for caches service pillow pyyaml diff --git a/pkgs/applications/misc/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix index b1118cfc59770..4034f30cbd6be 100644 --- a/pkgs/applications/misc/mps-youtube/default.nix +++ b/pkgs/applications/misc/mps-youtube/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "0lqprlpc0v092xqkjc0cc395ag45lijwgd34dpg2jy6i0f2szywv"; }; - propagatedBuildInputs = [ pafy ]; + requiredPythonModules = [ pafy ]; # disabled due to error in loading unittest # don't know how to make test from: diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 8f90c7a581d0a..14166243837f5 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -58,7 +58,7 @@ python36Packages.buildPythonApplication rec { # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory" doCheck = false; - pythonPath = [ + requiredPythonModules = [ python36Packages.dbus-python python36Packages.pyqt5 python36Packages.pytest-shutil diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 3be02e7c41c2a..8a833daab08f2 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pythonPackages.wrapPython ]; - propagatedBuildInputs = with pythonPackages; [ pyenchant regex ]; + requiredPythonModules = with pythonPackages; [ pyenchant regex ]; postFixup = '' buildPythonPath "$out" diff --git a/pkgs/applications/misc/neap/default.nix b/pkgs/applications/misc/neap/default.nix index 992a3c0248a0c..6d7579d33a50f 100644 --- a/pkgs/applications/misc/neap/default.nix +++ b/pkgs/applications/misc/neap/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { python2Packages.python ]; - pythonPath = [ + requiredPythonModules = [ python2Packages.xlib python2Packages.pygtk ]; diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index ef371dc59fff9..22dc4a0a9d1a1 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { owner = "tmbdev"; }; - propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow + requiredPythonModules = with pythonPackages; [ curl numpy scipy pillow matplotlib beautifulsoup4 pygtk lxml ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 82cdf18b48462..8064f89dd4b90 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -81,7 +81,7 @@ let sha256 = "1bblrjwkccy1ifw7lf55g3k9lq1sqzwd49vj8bfzj2w07a7qda62"; }; - propagatedBuildInputs = with super; [ + requiredPythonModules = with super; [ octoprint-firmwarecheck octoprint-filecheck markupsafe diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 366b3866dfd50..ac4c8617c56b5 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -6,7 +6,7 @@ self: super: let buildPlugin = args: self.buildPythonPackage (args // { pname = "OctoPrintPlugin-${args.pname}"; inherit (args) version; - propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ super.octoprint ]; + requiredPythonModules = (args.requiredPythonModules or []) ++ [ super.octoprint ]; # none of the following have tests doCheck = false; }); @@ -42,7 +42,7 @@ in { sha256 = "1bq39fnarnpk8phxfbpx6l4n9anf358z1cgid5r89nadmn2a0cny"; }; - propagatedBuildInputs = with super; [ numpy ]; + requiredPythonModules = with super; [ numpy ]; meta = with stdenv.lib; { description = "Displays 3D mesh of bed topography report"; @@ -120,7 +120,7 @@ in { sha256 = "0k82h7wafbcqdvk5wjw4dp9lydwszfj1lf8vvymwbqdn7pf5h0dy"; }; - propagatedBuildInputs = with super; [ paho-mqtt ]; + requiredPythonModules = with super; [ paho-mqtt ]; meta = with stdenv.lib; { description = "Publish printer status MQTT"; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index e427519d4d6e2..a9e1be8061943 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -79,7 +79,7 @@ python3.pkgs.buildPythonApplication rec { xorg.libxkbfile ] ++ stdenv.lib.optional atspiSupport at-spi2-core; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ dbus-python distutils_extra pyatspi diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 29ee6213a650a..4107deed4acd5 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -65,7 +65,7 @@ buildPythonApplication rec { gobject-introspection ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pygobject3 pyatspi dbus-python diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index c84c09e59a7eb..7e4003348e35c 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { goocanvas2 poppler_gi ]; - propagatedBuildInputs = with python3.pkgs; [ pygobject3 pypdf2 ]; + requiredPythonModules = with python3.pkgs; [ pygobject3 pypdf2 ]; format = "other"; doCheck = false; diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index b8f7c4641d201..369e1427ca5a6 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { gtk3 poppler_gi ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pygobject3 pikepdf img2pdf diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index 017383a79a2d2..a5605476acffe 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ pythonPackages.pygtk pythonPackages.psutil ]; - pythonPath = [ pythonPackages.pygtk pythonPackages.psutil ]; + requiredPythonModules = [ pythonPackages.pygtk pythonPackages.psutil ]; patchPhase = '' substituteInPlace install.sh --replace "/usr/local" "$out" diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 8ecc4f974b455..2f12642bcda52 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -19,7 +19,7 @@ nativeBuildInputs = [ setuptools_scm ]; buildInputs = [ pytest mock ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six setuptools pyserial appdirs hidapi wxPython xlib wmctrl dbus-python ]; }; @@ -44,7 +44,7 @@ postPatch = "sed -i /PyQt5/d setup.cfg"; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth setuptools ]; + requiredPythonModules = [ Babel pyqt5 xlib pyserial appdirs wcwidth setuptools ]; dontWrapQtApps = true; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index cadd98c742602..2813e953f00fb 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -10,7 +10,7 @@ python27Packages.buildPythonApplication rec { sha256 = "09ijv8h4k5h15swg64s7igamvynawz7gdi7hiymzrzywdvr0zwsa"; }; - propagatedBuildInputs = with python27Packages; [ + requiredPythonModules = with python27Packages; [ wxPython30 pyserial dbus-python psutil numpy pyopengl pyglet cython ]; diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index 05338b38dfefe..58368b9bcc621 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -13,7 +13,7 @@ in buildPythonApplication rec { sha256 = "0hxxz7kxv9gsrr86ccsc31g7bc2agw1ihbxhd659c2m6nrqq5qaf"; }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ]; + requiredPythonModules = [ pyyaml six jinja2 cerberus_1_1 ]; checkPhase = '' ${python.interpreter} -m unittest discover diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 00c4511417922..09845aaf3c31f 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { --replace "'mysqlclient'," "" ''; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ dateutil lxml matplotlibGtk diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix index 6bbbc671bf866..e7a52464f6b50 100644 --- a/pkgs/applications/misc/raiseorlaunch/default.nix +++ b/pkgs/applications/misc/raiseorlaunch/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.setuptools_scm ]; checkInputs = [ python3Packages.pytest ]; - pythonPath = with python3Packages; [ i3ipc ]; + requiredPythonModules = with python3Packages; [ i3ipc ]; meta = with lib; { maintainers = with maintainers; [ winpat ]; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 68ddef6569724..05b77189ba7bf 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; checkInputs = with python3Packages; [ pytest ]; - propagatedBuildInputs = [ file ] + requiredPythonModules = [ file ] ++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ]; checkPhase = '' diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 86c787df62aa0..1d2d84d9e8544 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -55,7 +55,7 @@ let ++ stdenv.lib.optional withAppIndicator libappindicator ; - pythonPath = [ pygobject3 pyxdg ]; + requiredPythonModules = [ pygobject3 pyxdg ]; preConfigure = "./bootstrap"; diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index 8d668f7a38d19..6ee5a4dfe92ec 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { sha256 = "0k2wjfcgnvb8yqn4c4ddfyyhrvl6hj61kn1ddnyp6ay9vklnw160"; }; - propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; + requiredPythonModules = with python3Packages; [ screeninfo paramiko pynput libevdev ]; meta = with stdenv.lib; { description = "A program to use a reMarkable as a graphics tablet"; diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index b76b1d6d21ee1..929d3ad728c45 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -27,7 +27,7 @@ buildPythonApplication rec { # `rofi` and the `waylandSupport` and `x11Support` dependencies # contain binaries needed at runtime. - propagatedBuildInputs = with lib; [ ConfigArgParse pyxdg rofi ] + requiredPythonModules = with lib; [ ConfigArgParse pyxdg rofi ] ++ optionals waylandSupport [ wl-clipboard wtype ] ++ optionals x11Support [ xdotool xsel ]; diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index c4547e8751307..b513863d7170f 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { vcrpy ]; - propagatedBuildInputs = [ + requiredPythonModules = [ beautifulsoup4 decorator kitchen diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index f6bb7133d9996..7fb175f7e35d5 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -24,7 +24,7 @@ in buildPythonApplication rec { wrapGAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ Babel psutil xlib diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index f2333aa99420d..a9068a66dc80e 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { disabled = !(python3Packages.pythonAtLeast "3.6"); checkInputs = with python3Packages; [ pytest ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ jinja2 markdown pillow diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix index a8a0bfb1e10aa..e4427a09c8ad0 100644 --- a/pkgs/applications/misc/sl1-to-photon/default.nix +++ b/pkgs/applications/misc/sl1-to-photon/default.nix @@ -22,7 +22,7 @@ in sha256 = "1hmb74rcky3nax4lxn7pw6lcd5a66fdbwrm11c84zb31xb51bakw"; }; - propagatedBuildInputs = [ pyphotonfile pillow numpy pyside2 shiboken2 ]; + requiredPythonModules = [ pyphotonfile pillow numpy pyside2 shiboken2 ]; format = "other"; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index f92fe87b94815..a164723762597 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0k5z9dap6rawiafkg1x7zjx51ala7wra6j6lvc2nn0y8r79yp7a9"; }; - propagatedBuildInputs = with python3Packages; [ gobject-introspection gtk3 pygobject3 pyudev ]; + requiredPythonModules = with python3Packages; [ gobject-introspection gtk3 pygobject3 pyudev ]; postInstall = '' wrapProgram "$out/bin/solaar" \ diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index ad6f9e9382b77..75f35c13ee8e7 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { owner = "trehn"; }; - propagatedBuildInputs = [ dateutil click pyfiglet setuptools ]; + requiredPythonModules = [ dateutil click pyfiglet setuptools ]; meta = with stdenv.lib; { description = "Starts a countdown to or from TIMESPEC"; diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix index 5988f569109b0..3320172767d4d 100644 --- a/pkgs/applications/misc/termpdf.py/default.nix +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -24,7 +24,7 @@ buildPythonApplication { sha256 = "05gbj2fqzqndq1mx6g9asa7i6z8a9jdjrvilfwx8lg23cs356m6m"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ bibtool pybtex pymupdf diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index f46af56ed45ff..429db009a4bc4 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ pytest ]; - propagatedBuildInputs = with python3Packages; + requiredPythonModules = with python3Packages; [ requests beautifulsoup4 future wcwidth urwid ]; checkPhase = '' diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 6db651ff39297..f22c704a6f5a4 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "0b3dz137lpbvpjvfy42ibqvj3yk526x4bpn819fd11lagn77w69r"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ arrow icalendar glibcLocales diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix index 11bf70cb56b3b..63f057efa92a1 100644 --- a/pkgs/applications/misc/tuir/default.nix +++ b/pkgs/applications/misc/tuir/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { checkInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ]; - propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests ]; + requiredPythonModules = [ beautifulsoup4 decorator kitchen requests ]; meta = with lib; { description = "Browse Reddit from your Terminal (fork of rtv)"; diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index 8a18948da2446..96f7d2c8427d4 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { sha256 = "5b55795c390e4ccc90e649c8cc387447daaf30a21d68f7196b49824cbcba8adc"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; meta = with stdenv.lib; { description = "Update timezone information based on geoip"; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index a6efc492d8a3a..689a079989224 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { libappindicator-gtk3 ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ docopt pygobject3 pyyaml diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 81e273dd39d8f..46306b5359514 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { wmctrl ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ mock mypy mypy-extensions diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index c5edd9133b7d5..e5316ddb65584 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "16g7dzvjcfhaz52wbmcapamy55l7vfhgizqy3m8dv9gkmy8vap89"; }; - propagatedBuildInputs = [ python3Packages.urwid ]; + requiredPythonModules = [ python3Packages.urwid ]; doCheck = false; # No tests available diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 4241f9153293a..be51bebf97a15 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -43,7 +43,7 @@ buildPythonApplication rec { --replace /bin/bash ${stdenv.shell} ''; - propagatedBuildInputs = + requiredPythonModules = [ gtk3 gexiv2 libnotify diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index e23df96efed24..de9c92b51e265 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { sha256 = "sha256-AkGU9p00y+psBS/fL2YLyQYRSMOp1aPs21E9bpN9z0M="; }; - propagatedBuildInputs = [ + requiredPythonModules = [ dateutil pyyaml openpyxl diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 3ae4aacb872b0..0bcd3116456c3 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { sha256 = "5282d8076d9814d9248071aec8784cffbd968601542533ccb28ca61d1d08205e"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pytz tasklib tzlocal diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index e528dab0c9fd5..a20eee5abe723 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { outputs = [ "out" "man" ]; - propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ]; + requiredPythonModules = with pythonPackages; [ urwid beautifulsoup4 lxml ]; postInstall = '' mkdir -p $man/share/man/man{1,5} diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index b4d821e1deb11..c5f73a6edf0fb 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { glib ]; - pythonPath = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pyxdg pygobject3 ]; diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index 00507d2ee8881..f952872387aa5 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { sha256 = "681c8aa52b2e4b5255e1311e76b4b81dcb63ee7f6ca3a47178e684c06baf330f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ dateutil sqlalchemy setproctitle diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index c6a1022288f78..6c16f119d3875 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -24,13 +24,13 @@ mkDerivation rec { --replace '/usr/bin' "$out/bin" ''; - pythonPath = [ yubikey-manager ]; + requiredPythonModules = [ yubikey-manager ]; # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary # support that the yubicommon library uses to load libykpers postInstall = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $requiredPythonModules" wrapProgram $out/bin/yubioath-desktop \ --prefix PYTHONPATH : "$program_PYTHONPATH" \ --prefix QML2_IMPORT_PATH : "${pyotherside}/${qtbase.qtQmlPrefix}" \ diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix index df6e011e4d585..463f73cae82c9 100644 --- a/pkgs/applications/misc/zk-shell/default.nix +++ b/pkgs/applications/misc/zk-shell/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0zisvvlclsf4sdh7dpqcl1149xbxw6pi1aqcwjbqblgf8m4nm0c7"; }; - propagatedBuildInputs = (with pythonPackages; [ + requiredPythonModules = (with pythonPackages; [ ansi kazoo nose six tabulate twitter ]); diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 402032b5cec3f..f4d85c29d9ce6 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication { doCheck = false; - propagatedBuildInputs = [ python3 ]; + requiredPythonModules = [ python3 ]; meta = with stdenv.lib; { description = "A text scroller for use with panels and shells"; diff --git a/pkgs/applications/networking/browsers/av-98/default.nix b/pkgs/applications/networking/browsers/av-98/default.nix index 2184c8d699a4c..a74828441102b 100644 --- a/pkgs/applications/networking/browsers/av-98/default.nix +++ b/pkgs/applications/networking/browsers/av-98/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { sha256 = "09iskh33hl5aaif763j1fmbz7yvf0yqsxycfd41scj7vbwdsbxl0"; }; - propagatedBuildInputs = with python3Packages; [ ansiwrap cryptography ]; + requiredPythonModules = with python3Packages; [ ansiwrap cryptography ]; meta = with lib; { homepage = "https://tildegit.org/solderpunk/AV-98"; diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index a16beb6520898..aa8e928fed497 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { glib ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pyfxa beautifulsoup4 cryptography @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { dontWrapGApps = true; preFixup = '' - buildPythonPath "$out $propagatedBuildInputs" + buildPythonPath "$out $requiredPythonModules" patchPythonScript "$out/libexec/eolie-sp" makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 84a6f7b92fa56..666e52a550d5d 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -55,7 +55,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pyyaml backendPackage jinja2 pygments pypeg2 cssutils pyopengl attrs setuptools # scripts and userscripts libs @@ -99,7 +99,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* # Patch python scripts - buildPythonPath "$out $propagatedBuildInputs" + buildPythonPath "$out $requiredPythonModules" scripts=$(grep -rl python "$out"/share/qutebrowser/{user,}scripts/) for i in $scripts; do patchPythonScript "$i" diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix index 7dbb6a3c53887..8eaf6ba56579d 100644 --- a/pkgs/applications/networking/browsers/webmacs/default.nix +++ b/pkgs/applications/networking/browsers/webmacs/default.nix @@ -19,7 +19,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { sha256 = "1hzb9341hybgrqcy1w20hshm6xaiby4wbjpjkigf4zq389407368"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pyqtwebengine setuptools dateparser diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index e0a6cd48d6eae..fa1f423511fd5 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -16,7 +16,7 @@ in with python.pkgs; buildPythonApplication rec { sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; }; - propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ]; + requiredPythonModules = [ dateutil tornado_5 python-daemon boto3 ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix index 6205b3bf5fe52..c5a381a2872b3 100644 --- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -39,7 +39,7 @@ buildPythonApplication rec { "test_readable_plan_file_is_not_json" ]; - propagatedBuildInputs = [ + requiredPythonModules = [ GitPython emoji filetype diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index 642677a9addc8..631d95bac779e 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -26,7 +26,7 @@ let sha256 = "073fwf6fm2sqdp5ms3vm1v3ljh0pldi69k048404rp6iy3cfwkp0"; }; - propagatedBuildInputs = with self; [ websocket_client requests six ]; + requiredPythonModules = with self; [ websocket_client requests six ]; checkInputs = with self; [ pytest codecov coverage mock pytestcov pytest-mock responses flake8 ]; # test_server.py fails because it needs connection (I think); @@ -52,7 +52,7 @@ py.pkgs.buildPythonApplication rec { LC_ALL = "en_US.utf8"; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = with py.pkgs; [ + requiredPythonModules = with py.pkgs; [ webtest requests jinja2 flask dulwich pyopenssl colorlog markdown ansi pygments daemonize pygments-markdown-lexer telegram irc slackclient diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix index 80106085e1b6b..e3c973e89f79e 100644 --- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; buildInputs = [ readline ncurses canto-daemon ]; - propagatedBuildInputs = [ canto-daemon ]; + requiredPythonModules = [ canto-daemon ]; meta = { description = "An ncurses-based console Atom/RSS feed reader"; diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index b8279f22de4d0..30b9acd822045 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1si53r8cd4avfc56r315zyrghkppnjd6n125z1agfv59i7hdmk3n"; }; - propagatedBuildInputs = with python3Packages; [ feedparser ]; + requiredPythonModules = with python3Packages; [ feedparser ]; meta = { description = "Daemon for the canto Atom/RSS feed reader"; diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 9fdee56b99b4a..fbc020053a35c 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -9,7 +9,7 @@ python2Packages.buildPythonApplication rec { sha256 = "18nyg19mwxyqdnykplkqmzb4n27vvrhvp639zai8f81gg9vdbsjp"; }; - propagatedBuildInputs = with python2Packages; [ feedparser ]; + requiredPythonModules = with python2Packages; [ feedparser ]; namePrefix = ""; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 0a28f9e074c62..a9e1b203c7d96 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { pname = "rss2email"; version = "3.12.2"; - propagatedBuildInputs = [ feedparser html2text ]; + requiredPythonModules = [ feedparser html2text ]; checkInputs = [ beautifulsoup4 ]; src = fetchurl { diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 319630ceff35e..b95fc43207e6a 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { buildInputs = [ sphinx ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - propagatedBuildInputs = [ matplotlib procps pyqt5 ]; + requiredPythonModules = [ matplotlib procps pyqt5 ]; checkInputs = [ procps pythonPackages.mock pyqt5 xvfb_run ]; checkPhase = '' diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index d6a253efdaac5..373efdc265ade 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { # ~400 failures doCheck = false; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.in APScheduler beautifulsoup4 diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 8eb688bcd56d3..f352897d61125 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -21,7 +21,7 @@ in python.pkgs.buildPythonPackage rec { }; nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = with python.pkgs; [ + requiredPythonModules = with python.pkgs; [ sentry-sdk psutil jsonschema # tox for check # Runtime dependencies sip (pyqt5.override { withWebSockets = true; }) distro setuptools diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index bbf3f0514c45f..b3738a1a31efd 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -38,7 +38,7 @@ in python.pkgs.buildPythonPackage { sed -iE "s/yarl==1.3.0//" requirements.txt ''; - propagatedBuildInputs = with python.pkgs; [ + requiredPythonModules = with python.pkgs; [ aiohttp-cors yarl aiohttp multidict setuptools jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles prompt_toolkit py-cpuinfo diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 28cc383605769..3b1acc9c6dc1b 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -17,7 +17,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { sed -i 's|@out@|'"''${out}"'|g' blink/resources.py ''; - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ pyqt5_with_qtwebkit cjson sipsimple diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index eef24f75f1553..c4e881cefcfd6 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] ++ lib.optional enableRST docutils diff --git a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix index 97f7752202297..b4d7d934c92b5 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "036xfdd21pcfjlilknc67z5jqpk0vz07853wwcsiac32iypc6f2q"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ matrix-client ]; diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix index 54b7ef2bd9915..9b28d3cf8cabe 100644 --- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -18,7 +18,7 @@ let src = "${mainsrc}/matrix-python-sdk/"; - propagatedBuildInputs = [ + requiredPythonModules = [ requests responses olm python-olm canonicaljson pytestrunner pytest ]; @@ -41,7 +41,7 @@ buildPythonApplication rec { src = mainsrc; - propagatedBuildInputs = [pygobject3 sdk]; + requiredPythonModules = [pygobject3 sdk]; meta = { description = "CLI client for Matrix"; diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index 0aa2dbf889bb5..27076f91f51b2 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -32,15 +32,13 @@ mkDerivation rec { olm pyotherside ]; - propagatedBuildInputs = pypkgs; - - pythonPath = pypkgs; + requiredPythonModules = pypkgs; qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; dontWrapQtApps = true; postInstall = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $requiredPythonModules" wrapProgram $out/bin/mirage \ --prefix PYTHONPATH : "$PYTHONPATH" \ "''${qtWrapperArgs[@]}" diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 3b1fb255b6ee2..f005e650957dd 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { sha256 = "0cx8sqajf5lh8w61yy1l6ry67rv1b45xp264zkw3s7ip80i4ylb2"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp appdirs attrs diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix index 8dc70d6d79212..995d5ca06c1a8 100644 --- a/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -7,7 +7,7 @@ buildPythonApplication rec { disabled = pythonOlder "3.4"; checkInputs = [ pytest ]; - propagatedBuildInputs = [ aiodns slixmpp pyinotify potr mpd2 cffi setuptools ]; + requiredPythonModules = [ aiodns slixmpp pyinotify potr mpd2 cffi setuptools ]; nativeBuildInputs = [ pkgconfig ]; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index d76b8dd206e46..7e69c5be5c5dd 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec { sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35"; }; - propagatedBuildInputs = with python2Packages; [ msgpack pyqt4 numpy pyopencl setuptools ] ++ [ openssl ]; + requiredPythonModules = with python2Packages; [ msgpack pyqt4 numpy pyopencl setuptools ] ++ [ openssl ]; preConfigure = '' # Remove interaction and misleading output diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix index 1a68111824533..329d015b0e068 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix @@ -35,7 +35,7 @@ in { sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1"; }; - propagatedBuildInputs = [ xe ]; + requiredPythonModules = [ xe ]; # error: invalid command 'test' doCheck = false; @@ -55,7 +55,7 @@ in { sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; }; - propagatedBuildInputs = with pythonPackages; [twisted dateutil]; + requiredPythonModules = with pythonPackages; [twisted dateutil]; meta = with stdenv.lib; { description = "Some (mainly XMPP-related) additions to twisted"; diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index b16659ba44cd9..e083dbca226e6 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -9,7 +9,7 @@ in python3Packages.buildPythonPackage { sha256 = "e0d1cb72115d0fda17db92d28be51558ad8fe250972683fac3086dbe8d350d22"; }; - propagatedBuildInputs = with python3Packages; [ pyqt5_with_qtwebkit dbus-python jsmin ]; + requiredPythonModules = with python3Packages; [ pyqt5_with_qtwebkit dbus-python jsmin ]; meta = with stdenv.lib; { description = "Non-official desktop client for Slack"; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 8231f481ee0d9..1787180df1226 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ python unzip wxPython wrapPython ]; - pythonPath = [ wxPython ]; + requiredPythonModules = [ wxPython ]; preConfigure = "cd torchat/src; rm portable.txt"; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index b6017277b0a50..0a2810ec6cfd2 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; checkInputs = [ mock pytest coverage tox ]; - propagatedBuildInputs = [ urwid tweepy future ]; + requiredPythonModules = [ urwid tweepy future ]; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index 8f4b2200cc550..9ee3e6ffb1668 100644 --- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { ./pytest-executable-name.patch ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ urwid zulip urwid-readline diff --git a/pkgs/applications/networking/irc/qweechat/default.nix b/pkgs/applications/networking/irc/qweechat/default.nix index 27adb2cefc5fc..800c7e01850e1 100644 --- a/pkgs/applications/networking/irc/qweechat/default.nix +++ b/pkgs/applications/networking/irc/qweechat/default.nix @@ -17,7 +17,7 @@ python27Packages.buildPythonApplication rec { --replace 'qweechat = qweechat.qweechat' 'qweechat = qweechat.qweechat:main' ''; - propagatedBuildInputs = with python27Packages; [ + requiredPythonModules = with python27Packages; [ pyside setuptools ]; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index aca9a9a111d6c..256d51cb2e015 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -31,7 +31,7 @@ in buildPythonPackage { sha256 = "0m3k5vrv5ab1aw1mjd0r8d71anwqzvncvv9v5zx9xp1i188sdm8x"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyopenssl webcolors future diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix index c7f2958cf5536..0f4401c96ad5d 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix @@ -31,7 +31,7 @@ let }; potr = python3Packages.potr.overridePythonAttrs (oldAttrs: { - propagatedBuildInputs = [ pycrypto ]; + requiredPythonModules = [ pycrypto ]; }); in stdenv.mkDerivation rec { pname = "weechat-otr"; diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index 700ad011dff33..3ca6499ad5e5e 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0qp8sycclzagkiszqk1pw2fr8s8s195bzy8r27dj7f5zx350nxk5"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ notmuch oauth2client google_api_python_client diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index d4cfd38c50dcb..8c9d356c5255f 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-7qpVyQUbT+GChJl1TnKOONSyRDvzQ0M2z9RdN7PNl9U="; }; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ bugsnag click markdown2 @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { "\${qtWrapperArgs[@]}" # Add the installed directories to the python path so the daemon can find them - "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python3.libPrefix}/site-packages") (python3.pkgs.requiredPythonModules python3.pkgs.maestral.propagatedBuildInputs))}" + "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python3.libPrefix}/site-packages") (python3.pkgs.computeRequiredPythonModules python3.pkgs.maestral.requiredPythonModules))}" "--prefix" "PYTHONPATH" ":" "${python3.pkgs.maestral}/lib/${python3.libPrefix}/site-packages" ]; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 45d41839a1ca0..4a4b153f2812f 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { ./runtime-sharedir.patch ]; - pythonPath = [ + requiredPythonModules = [ python3.pkgs.colorama ]; @@ -42,7 +42,7 @@ buildGoModule rec { installPhase = '' runHook preInstall make PREFIX=$out GOFLAGS="$GOFLAGS -tags=notmuch" install - wrapPythonProgramsIn $out/share/aerc/filters "$out $pythonPath" + wrapPythonProgramsIn $out/share/aerc/filters "$out $requiredPythonModules" runHook postInstall ''; diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index 129120609ca55..fe3cc7c83cc88 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ sphinx setuptools_scm ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ python3Packages.setuptools python3Packages.notmuch chardet dkimpy ]; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index a2a26010e4df2..d68738621b4ea 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook python.pkgs.wrapPython ]; - propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; + requiredPythonModules = with python.pkgs; computeRequiredPythonModules ([ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]); buildInputs = [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas @@ -95,10 +95,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - pythonPath = with python.pkgs; [ pygobject2 pygtk ]; - preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $requiredPythonModules" gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share" --prefix PYTHONPATH : "$program_PYTHONPATH") ''; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix index 1e1909e7109a5..578a674fe078a 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook bison flex pkgconfig wrapGAppsHook python.pkgs.wrapPython ]; - propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; + requiredPythonModules = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; buildInputs = [ curl dbus dbus-glib gtk3 gnutls gsettings-desktop-schemas @@ -97,10 +97,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - pythonPath = with python.pkgs; [ pygobject2 pygtk ]; - preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $requiredPythonModules" gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share" --prefix PYTHONPATH : "$program_PYTHONPATH") ''; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index d74797dbc50b0..d44f4bbffb628 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -53,7 +53,7 @@ python3Packages.buildPythonApplication rec { xorg.lndir ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ gsettings-desktop-schemas pygobject3 dbus-python diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 6bd0995623db2..30a1d53bbe285 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -18,7 +18,7 @@ python2Packages.buildPythonApplication rec { nativeBuildInputs = with python2Packages; [ pbr git ]; PBR_VERSION=version; - propagatedBuildInputs = with python2Packages; [ + requiredPythonModules = with python2Packages; [ appdirs cryptography fasteners diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index c7554fc84b085..0f39c5cd11daa 100644 --- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools_scm ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ beautifulsoup4 click click-log diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix index 34f5be71ef358..076bb0ad9dd76 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/applications/networking/mkchromecast/default.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1l565n3rmyghc4vzh80gazvdks1i97j1h94x33pkmxxlf9a9rncj"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ PyChromecast psutil mutagen diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 8ec4608023750..3ee433fc6fd82 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -59,13 +59,13 @@ stdenv.mkDerivation rec { gst-plugins-bad ]); - pythonPath = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pygobject3 pycairo ]; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $requiredPythonModules" gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 77d08692f625a..af5716f461548 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -56,7 +56,7 @@ let inherit version meta src; disable = !isPy3k; - propagatedBuildInputs = [ + requiredPythonModules = [ flask flask-httpauth stem diff --git a/pkgs/applications/networking/p2p/deluge/1/default.nix b/pkgs/applications/networking/p2p/deluge/1/default.nix index cafba65c788b9..4d24b1effd8c7 100644 --- a/pkgs/applications/networking/p2p/deluge/1/default.nix +++ b/pkgs/applications/networking/p2p/deluge/1/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonPackage rec { }) ]; - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity libtorrentRasterbar.dev libtorrentRasterbar.python setuptools ]; diff --git a/pkgs/applications/networking/p2p/deluge/2/default.nix b/pkgs/applications/networking/p2p/deluge/2/default.nix index 2e9f08ce98a87..339ce6baa9d55 100644 --- a/pkgs/applications/networking/p2p/deluge/2/default.nix +++ b/pkgs/applications/networking/p2p/deluge/2/default.nix @@ -10,7 +10,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "14d8kn2pvr1qv8mwqrxmj85jycr73vwfqz12hzag0ararbkfhyky"; }; - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ twisted Mako chardet pyxdg pyopenssl service-identity libtorrentRasterbar.dev libtorrentRasterbar.python setuptools setproctitle pillow rencode six zope_interface diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 276cabfa2aa97..35e59c5a728e1 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { --replace "urwidtrees>=1.0.3dev0" "urwidtrees" ''; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ urwid urwidtrees aiohttp diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 485366afe939a..b0e0512d22ff2 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { wrapPython ]; - pythonPath = with python3Packages; [ + requiredPythonModules = with python3Packages; [ ipy pyperclip ] ++ diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 5cab23ecd710c..bb8b0e11d9145 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { python3Packages.python ]; - pythonPath = [ + requiredPythonModules = [ python3Packages.libtorrentRasterbar python3Packages.twisted python3Packages.netifaces diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index ce5a99b1e5fc5..9893b5f913b37 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { sha256 = "04prgicm0yjh2klcxdgwx1mvlsxxi2bdkzfcvysvixbgq20wjvdk"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client gevent-websocket rencode bitcoinlib maxminddb pyopenssl ]; diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index 1c72d4ef88c09..c9e1a36d9d0fc 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "08yca0a0prrnrc7ir7ajd56yxvxpcs4m1k8f5kf273f5whgr7wzw"; }; - propagatedBuildInputs = (with python3Packages; [ + requiredPythonModules = (with python3Packages; [ requests docopt setuptools diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index c2d7fbd10b15e..0071aebe2224c 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -39,7 +39,7 @@ in python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook makeWrapper imagemagick ]; - propagatedBuildInputs = (with python3Packages; [ + requiredPythonModules = (with python3Packages; [ pygobject3 pycairo requests diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index e81b8dc37ca50..7e534b6beee3d 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -33,7 +33,7 @@ in pythonPackages.buildPythonApplication rec { unrar rhino spidermonkey_38 gocr pythonPackages.paver ]; - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ pycurl jinja2 beaker thrift simplejson pycrypto feedparser tkinter beautifulsoup send2trash ]; diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index d673917af3161..47f010ba90c24 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -13,7 +13,7 @@ python27Packages.buildPythonApplication { sha256 = "11j2qm67sszfqq730czsr2zmpgkghsb50556ax1vlpm7rw3gm33c"; }; - propagatedBuildInputs = with python27Packages; [ + requiredPythonModules = with python27Packages; [ pygtk miniupnpc mutagen diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index c95647c784057..f039b3c68dd8f 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp"; }; - propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests + requiredPythonModules = [ appdirs colorama dateutil fusepy requests requests_toolbelt sqlalchemy ]; makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index ac242eb9dc9fc..a75600b74aa78 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "107dgsrjv95ww6gj77q89dirl604b2ljlpjg79gffm9c4gkmjj2m"; }; - propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; + requiredPythonModules = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index e432b37951725..68ad11fed0fa9 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { gsettings-desktop-schemas ]; - propagatedBuildInputs = [ + requiredPythonModules = [ dateutil pyinotify pygobject3 bcrypt ]; diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index 441a9a98e9722..a694ecfde25e4 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ wrapGAppsHook gobject-introspection gtksourceview3 libappindicator-gtk3 libnotify ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ dbus-python pyinotify xlib pygobject3 ]; meta = { diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index d6b404f9db780..c4088b5b1cbcb 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { }; checkInputs = [ python3.pkgs.pytest ]; - propagatedBuildInputs = with python3.pkgs; + requiredPythonModules = with python3.pkgs; [ Babel cheroot diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 2cc3e8eb92218..7430ac4ab9a33 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { gdk-pixbuf ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pycairo pygobject3 lxml diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index cf1b5125adf99..2ea99e9cb451f 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -9,7 +9,7 @@ python2Packages.buildPythonApplication { sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; }; - propagatedBuildInputs = with python2Packages; [ pyGtkGlade ]; + requiredPythonModules = with python2Packages; [ pyGtkGlade ]; # Testing fails. doCheck = false; diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 3a0f362dcf724..dbd5a1661d4d9 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0sh32jcf8iznnbg1kqlrswbzfmn4h3gkw32q20xwxzz4935pz1qk"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ asn1crypto beautifulsoup4 cffi diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix index af0d4c4305903..847f8dbec372d 100644 --- a/pkgs/applications/office/paperwork/backend.nix +++ b/pkgs/applications/office/paperwork/backend.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend"; - propagatedBuildInputs = [ + requiredPythonModules = [ pyenchant simplebayes pillow pycountry whoosh termcolor python-Levenshtein libinsane pygobject3 pyocr natsort pkgs.poppler_gi pkgs.gtk3 distro diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index 102c3cd2564c5..4f29ef654787b 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -82,7 +82,7 @@ python3Packages.buildPythonApplication rec { paperwork-shell chkdeps paperwork ''; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ paperwork-backend pypillowfight gtk3 diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index b4307eb286e58..ded8803fe2aa3 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { poppler_gi ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pycairo pygobject3 python-vlc diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index 7821b041064a0..cda25f5c3f9a1 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { sha256 = "16ckcjxa3dgmz1y8gd57q2h84akra3j4bgl4fwv4m05bam3ml1xs"; }; - propagatedBuildInputs = [ python3Packages.pyqt5 wrapQtAppsHook ]; + requiredPythonModules = [ python3Packages.pyqt5 wrapQtAppsHook ]; patchPhase = '' substituteInPlace ./setup.py \ diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 092a776ae6062..0f15b89e00b4c 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = with python3.pkgs; + requiredPythonModules = with python3.pkgs; [ atomicwrites click click-log click-repl configobj humanize icalendar parsedatetime python-dateutil pyxdg tabulate urwid ]; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index d0c5eb4e7b2ed..16806d7079241 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ dateutil pygobject3 goocalendar diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 00fa9416e1725..ffedd6ce38323 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { ''; checkInputs = [ py pytest pytest-datafiles pytest-mock pytestrunner ]; - propagatedBuildInputs = [ arrow click click-didyoumean requests ]; + requiredPythonModules = [ arrow click click-didyoumean requests ]; nativeBuildInputs = [ installShellFiles ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 05a3c2de9b47f..f254ec605e33a 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { }; buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome3.adwaita-icon-theme ]; - propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; + requiredPythonModules = with python3Packages; [ pyxdg pygobject3 ]; preFixup = '' diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 8fb719567d55a..f4377cc7ac918 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -11,7 +11,7 @@ python2.pkgs.buildPythonApplication rec { sha256 = "60b682793698e6427ad485546eae3a044b8290a220f190633158a2fb0e942fa0"; }; - propagatedBuildInputs = with python2.pkgs; [ + requiredPythonModules = with python2.pkgs; [ pygtk pyserial libxml2 future ]; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 008697211f754..7678439ecfcf1 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ hackrf rtl-sdr airspy limesuite libiio ] ++ lib.optional USRPSupport uhd; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pyqt5 numpy psutil cython pyzmq pyaudio setuptools ]; diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/pkgs/applications/science/biology/deeptools/default.nix index efa246a277fe3..3ff168304224c 100644 --- a/pkgs/applications/science/biology/deeptools/default.nix +++ b/pkgs/applications/science/biology/deeptools/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "1a14a29e60be13eac11bd204dab9aef73cd72fe56a94c587333f21087584c0d8"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy numpydoc scipy diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index 3ef52e543933b..67e74254e9339 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -17,7 +17,7 @@ python27Packages.buildPythonApplication rec { }); buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ python27Packages.biopython wget diamond hmmer ]; + requiredPythonModules = [ python27Packages.biopython wget diamond hmmer ]; # make emapper find diamond & hmmer makeWrapperArgs = [ diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix index a9f3fdb246726..bc976aa8c1871 100755 --- a/pkgs/applications/science/biology/poretools/default.nix +++ b/pkgs/applications/science/biology/poretools/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am"; }; - propagatedBuildInputs = [pythonPackages.h5py pythonPackages.matplotlib pythonPackages.seaborn pythonPackages.pandas]; + requiredPythonModules = [pythonPackages.h5py pythonPackages.matplotlib pythonPackages.seaborn pythonPackages.pandas]; meta = { description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore"; diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index e3c3ea23c2c0e..fbd5d03394a71 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -14,11 +14,11 @@ pythonPackages.buildPythonApplication rec { sha256 = "13ml8qywbb4cc7wf2x7z5mz1rjqg51ab8wkizwcg4f6c40zgif6d"; }; - pythonPath = with pythonPackages; [ simplejson joblib setuptools matplotlib ]; + requiredPythonModules = with pythonPackages; [ simplejson joblib setuptools matplotlib ]; nativeBuildInputs = [ coreutils ]; - buildInputs = [ zlib ] ++ pythonPath; + buildInputs = [ zlib ] ++ requiredPythonModules; dontConfigure = true; diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/applications/science/biology/tebreak/default.nix index 07669d097a44d..f6d42d3ec20c2 100644 --- a/pkgs/applications/science/biology/tebreak/default.nix +++ b/pkgs/applications/science/biology/tebreak/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ findutils python3Packages.cython ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pysam scipy bx-python diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix index fffeca2c740ca..632a571b88894 100644 --- a/pkgs/applications/science/biology/truvari/default.nix +++ b/pkgs/applications/science/biology/truvari/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0lp1wnldjv92k4ncga1h0icb0dpjsrx427vggg40x04a7kp9lwx0"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pyvcf python-Levenshtein progressbar2 diff --git a/pkgs/applications/science/biology/xenomapper/default.nix b/pkgs/applications/science/biology/xenomapper/default.nix index f5e538c70961e..30a1be005a729 100644 --- a/pkgs/applications/science/biology/xenomapper/default.nix +++ b/pkgs/applications/science/biology/xenomapper/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0mnmfzlq5mhih6z8dq5bkx95vb8whjycz9mdlqwbmlqjb3gb3zhr"; }; - propagatedBuildInputs = [ statistics ]; + requiredPythonModules = [ statistics ]; meta = with lib; { homepage = "https://github.com/genomematt/xenomapper"; diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index b8a80c5e9c117..e1269d3f98ba6 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ matplotlib numpy pyqt4 diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 7290503311d31..de7d85229330a 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -178,7 +178,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontFixup = true; - pythonPath = optionals (withScripting) + requiredPythonModules = optionals (withScripting) [ wxPython python.pkgs.six ]; nativeBuildInputs = [ makeWrapper ] @@ -220,7 +220,7 @@ stdenv.mkDerivation rec { in (concatStringsSep "\n" (flatten [ - (optionalString (withScripting) "buildPythonPath \"${base} $pythonPath\" \n") + (optionalString (withScripting) "buildPythonPath \"${base} $requiredPythonModules\" \n") # wrap each of the directly usable tools (map diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 62bda91e50082..1facbe4256470 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -17,7 +17,7 @@ in mkDerivationWith python3Packages.buildPythonApplication { nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ cython scipy_1_4 pyqt5 diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index a465420953737..cf6688fffe9ca 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation { mkdir -p $out/${python3.sitePackages} cp -r driver $out/${python3.sitePackages} - wrapPythonProgramsIn $out/bin "$out $pythonPath" - wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out $pythonPath" + wrapPythonProgramsIn $out/bin "$out $requiredPythonModules" + wrapPythonProgramsIn $out/libexec/fast-downward/translate "$out $requiredPythonModules" # Because fast-downward calls `python translate.py` we need to return wrapped scripts back. for i in $out/libexec/fast-downward/translate/.*-wrapped; do name="$(basename "$i")" diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 63440213920ce..5acfff6c4eb88 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -58,7 +58,7 @@ let python = { buildPythonPackage, cython }: buildPythonPackage { inherit pname version src patches; - propagatedBuildInputs = [ core cython ]; + requiredPythonModules = [ core cython ]; # This tells setup.py to use cython, which should produce faster bindings MONOSAT_CYTHON = true; diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 18c304e831653..166183b690442 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -12,7 +12,7 @@ pyqt5 qt5.wrapQtAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pyqt5 lxml sip diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index 26b241ff0ada9..254303a8c324a 100644 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { sha256 = "1wymv7qckafs0p2jdjlxjaf1xrhm3iyd185jkldanbb0na5n3ndz"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ altair astor base58 blinker boto3 botocore click enum-compat future pillow protobuf requests toml tornado_5 tzlocal validators watchdog jinja2 setuptools diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index 9edb0747b31e4..60dae60934816 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -13,7 +13,7 @@ with python3.pkgs; buildPythonApplication rec { nativeBuildInputs = [ pytest ]; buildInputs = [ ncurses ]; - propagatedBuildInputs = [ pillow ]; + requiredPythonModules = [ pillow ]; checkPhase = "py.test"; diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/pkgs/applications/science/math/sage/flask-oldsessions.nix index 403dc8708fabb..0b5af32307bba 100644 --- a/pkgs/applications/science/math/sage/flask-oldsessions.nix +++ b/pkgs/applications/science/math/sage/flask-oldsessions.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "04b5m8njjiwld9a0zw55iqwvyjgwcpdbhz1cic8nyhgcmypbicqn"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ flask ]; diff --git a/pkgs/applications/science/math/sage/flask-openid.nix b/pkgs/applications/science/math/sage/flask-openid.nix index 527173dec80a0..cc2e2ed4e9d08 100644 --- a/pkgs/applications/science/math/sage/flask-openid.nix +++ b/pkgs/applications/science/math/sage/flask-openid.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1aycwmwi7ilcaa5ab8hm0bp6323zl8z25q9ha0gwrl8aihfgx3ss"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ flask python-openid ]; diff --git a/pkgs/applications/science/math/sage/python-openid.nix b/pkgs/applications/science/math/sage/python-openid.nix index 4c7fdadadaf04..30fe6205b6a00 100644 --- a/pkgs/applications/science/math/sage/python-openid.nix +++ b/pkgs/applications/science/math/sage/python-openid.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pycrypto ]; diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 830d806a8bcd3..134eb6c94b9f5 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { iml ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cypari2 jinja2 numpy diff --git a/pkgs/applications/science/math/sage/sagenb.nix b/pkgs/applications/science/math/sage/sagenb.nix index 77b2168ad9747..4236294db6b62 100644 --- a/pkgs/applications/science/math/sage/sagenb.nix +++ b/pkgs/applications/science/math/sage/sagenb.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ./patches/sagenb-cmp-deprecation.patch ]; - propagatedBuildInputs = [ + requiredPythonModules = [ twisted flask flask-oldsessions diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index bbbe80eb65686..5aa76af96660b 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec { HOME=$(mktemp -d) py.test ''; - propagatedBuildInputs = with python.pkgs; [ + requiredPythonModules = with python.pkgs; [ bumps gcc h5py diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix index 41d15e2f1babc..85de73cdf6b0d 100644 --- a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix +++ b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "0.2.1"; buildInputs = [html5]; - propagatedBuildInputs = [httplib2 nose pillow pypdf2 reportlab html5]; + requiredPythonModules = [httplib2 nose pillow pypdf2 reportlab html5]; src = fetchPypi { inherit pname version; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 2b7532a93454c..96b4890c3b78d 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -4,7 +4,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; version = "5.19.3"; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ appdirs ConfigArgParse datrie diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix index ca6b57de611d2..969eb6673ce5f 100644 --- a/pkgs/applications/science/programming/scyther/default.nix +++ b/pkgs/applications/science/programming/scyther/default.nix @@ -56,7 +56,7 @@ let ''; postFixup = '' - wrapPythonProgramsIn "$out/gui" "$out $pythonPath" + wrapPythonProgramsIn "$out/gui" "$out $requiredPythonModules" ''; doInstallCheck = true; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 9c7166afc2a97..fda25144ecd72 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { sha256 = "87d7f9c0b8f4f1db3ce3521f67cd244fe3b89ffead797e92f35a7f71bbe8b958"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ matplotlib numpy pymavlink diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix index 68b91dafb736a..f973f41903a0e 100644 --- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix +++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ python3 ]; - pythonPath = [ + requiredPythonModules = [ pyqt5 pyserial ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preFixup = '' patchShebangs $out/opt/sumorobot-manager/main.py - wrapPythonProgramsIn "$out/opt" "$pythonPath" + wrapPythonProgramsIn "$out/opt" "$requiredPythonModules" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index b0bd5cc8b1508..01cd0d004f91f 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks ''; - propagatedBuildInputs = [ + requiredPythonModules = [ bottle future netifaces diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index d403ddc8b26ca..bf2119507991c 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { vte ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ dbus-python pbr pycairo diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index e2eda846d60f4..f3a74861d4176 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -59,7 +59,7 @@ buildPythonApplication rec { installShellFiles ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL; + requiredPythonModules = stdenv.lib.optional stdenv.isLinux libGL; outputs = [ "out" "terminfo" ]; diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 5de8109e3a4d2..4c2aa060ba551 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { vte ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ configobj dbus-python pygobject3 @@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' patchShebangs run_tests tests po - # dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains. + # dbus-python is correctly passed in requiredPythonModules, but for some reason setup.py complains. # The wrapped terminator has the correct path added, so ignore this. substituteInPlace setup.py --replace "'dbus-python'," "" ''; diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index b9ac8b139cbb6..b724996424180 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { sha256 = "1wqq4i23hppilp20fx5a5nj93xwf3wwwr2f8aasvn6jkv2l22vpl"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ ply configparser zc_lockfile diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 8debc642b4573..32ab25b54357a 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit ]; - pythonPath = [ pygments markdown ]; + requiredPythonModules = [ pygments markdown ]; postPatch = '' sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/man/man5" cp cgitrc.5 "$out/share/man/man5" - wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" + wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $requiredPythonModules" for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do wrapProgram $script --prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gnused ]}' diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix index cb0103df227a1..c993b54f2de9d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - propagatedBuildInputs = [ pyqt5 git-annex-adapter ]; + requiredPythonModules = [ pyqt5 git-annex-adapter ]; meta = with stdenv.lib; { homepage = "https://github.com/alpernebbi/git-annex-metadata-gui"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix index addfd1f5041b1..f4627e3604763 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { sha256 = "5b6f8025ed1e9877f06882ddbd81f701a8e094647ab97595e2afc09016835a7c"; }; - propagatedBuildInputs = [ dropbox annexremote humanfriendly ]; + requiredPythonModules = [ dropbox annexremote humanfriendly ]; meta = with lib; { description = "A git-annex special remote for Dropbox"; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 858383f966413..8c02016223256 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -15,7 +15,7 @@ in buildPythonApplication rec { }; buildInputs = [ git gettext ]; - propagatedBuildInputs = [ pyqt5 sip pyinotify ]; + requiredPythonModules = [ pyqt5 sip pyinotify ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix index e5e41ac7232af..fe8b505d7a109 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "1vvp7i8ghmq72v57f6smh441h35xnr5ar628q2mr40bzvcifwymw"; }; - propagatedBuildInputs = [ botocore ]; + requiredPythonModules = [ botocore ]; checkInputs = [ pytest mock flake8 tox awscli ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index dd4e6e011a6e7..b9e3473eee65f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt libxml2 ]; - propagatedBuildInputs = with python3Packages; [ mercurial ]; + requiredPythonModules = with python3Packages; [ mercurial ]; postInstall = '' make install-doc prefix=$out diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index 3e07a93458b7a..dcd36db9143c7 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "nosarthur"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyyaml setuptools ]; diff --git a/pkgs/applications/version-management/git-and-tools/legit/default.nix b/pkgs/applications/version-management/git-and-tools/legit/default.nix index 7dbdd6071a57e..06ab253255cde 100644 --- a/pkgs/applications/version-management/git-and-tools/legit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/legit/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ click clint crayons diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index 5c4ece7c9e51b..fd02532f63b74 100644 --- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap"; }; - propagatedBuildInputs = [ pyxdg ]; + requiredPythonModules = [ pyxdg ]; meta = with stdenv.lib; { homepage = "https://github.com/languitar/pass-git-helper"; diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix index 9481f3ebd9283..e99f62ff46411 100644 --- a/pkgs/applications/version-management/git-crecord/default.nix +++ b/pkgs/applications/version-management/git-crecord/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0v3y90zi43myyi4k7q3892dcrbyi9dn2q6xgk12nw9db9zil269i"; }; - propagatedBuildInputs = with pythonPackages; [ docutils ]; + requiredPythonModules = with pythonPackages; [ docutils ]; meta = { homepage = "https://github.com/andrewshadura/git-crecord"; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index d0bbca15ea179..f628f419bacaf 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "1y1jzb0hlprynwwr4q5y4x06641qrhj0k69mclabnmhfam9g8ygm"; }; - propagatedBuildInputs = [ pbr requests setuptools ]; + requiredPythonModules = [ pbr requests setuptools ]; # Don't do tests because they require gerrit which is not packaged doCheck = false; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 2a0a97771cbfe..cb40c5c7d8ec7 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { }; # git should be on path for tool to work correctly - propagatedBuildInputs = [ git ] ++ (with pythonPackages; [ click colorama docopt GitPython six termcolor ]); + requiredPythonModules = [ git ] ++ (with pythonPackages; [ click colorama docopt GitPython six termcolor ]); checkInputs = [ git pythonPackages.nose ]; # git needs to be on path # 1. git fails to run as it cannot detect the email address, so we set it diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index 0cead50f03266..2a7e0e55eb724 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { sha256 = "1q6y38f8ap6q1livvfy0pfnjr0l8b68hyhc9r5v87fmdyl7y7y8g"; }; - propagatedBuildInputs = with pythonPackages; [ sh pygit2 clint ]; + requiredPythonModules = with pythonPackages; [ sh pygit2 clint ]; doCheck = false; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 5068dc15f48ab..0e37af3d8b977 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pygobject3 pycairo ]; diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index f0918ab69a62d..6d91c5c032960 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -24,7 +24,7 @@ in python2Packages.buildPythonApplication { buildInputs = [ makeWrapper docutils unzip ] ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; - propagatedBuildInputs = [ hg-git dulwich ]; + requiredPythonModules = [ hg-git dulwich ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index c7a1c41498700..fbc54e823c398 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -22,7 +22,7 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ makeWrapper docutils unzip ] ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; - propagatedBuildInputs = [ dulwich ]; + requiredPythonModules = [ dulwich ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 3bea6d8933415..1f3a5ff37533b 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { # here, instead add it to PATH when running unit tests checkInputs = [ pytest pytest-flake8 git ]; nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ ipython nbformat ]; + requiredPythonModules = [ ipython nbformat ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index 4cf2a2e864ca9..3da8bb90af2c9 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0p4j51m89glx12cd65lcnbwpvin0v49wkhrx06755skr7v37pm2a"; }; - propagatedBuildInputs = with python3Packages; [ pyyaml docopt ]; + requiredPythonModules = with python3Packages; [ pyyaml docopt ]; # No tests in archive doCheck = false; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 2c58e15c443dd..949d860add5c3 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -11,7 +11,7 @@ python2Packages.buildPythonApplication rec { sha256 = "01cr16zf3gzsci1hhfli79m34fcx5m1pvswl16rkxxn212yc9fhy"; }; - pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; + requiredPythonModules = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; prePatch = '' sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py @@ -27,7 +27,7 @@ python2Packages.buildPythonApplication rec { postInstall = '' mkdir -p $cli/bin cp clients/cli/rabbitvcs $cli/bin - wrapPythonProgramsIn $cli "$out $pythonPath" + wrapPythonProgramsIn $cli "$out $requiredPythonModules" ''; doCheck = false; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index e5fc7c3386047..09bbf9ed27fdc 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -24,7 +24,7 @@ in buildPythonPackage rec { nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ + requiredPythonModules = [ srht redis celery diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 4252fac1165c5..9c7f1199e5a68 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nodejs ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pgpy flask bleach diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index fa557ce78aa2f..fdc40e3efd15a 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ + requiredPythonModules = [ srht pyyaml PyGithub diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 3611ad93e17e1..e3505237a5311 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -47,7 +47,7 @@ in buildPythonPackage rec { nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ + requiredPythonModules = [ srht minio pygit2 diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 73c9dfeb71e20..0e279eaf9b741 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ + requiredPythonModules = [ srht hglib scmsrht diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 5c9736564c39c..d46bf03abc7cf 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ + requiredPythonModules = [ srht ]; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 880dc60f0b3a2..10846f0ddb5bf 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ + requiredPythonModules = [ srht pygit2 asyncpg diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 8072c74d2d0f4..67950a65e5965 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ + requiredPythonModules = [ srht pygit2 ]; diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 6cbae67151728..2fc454c4a148f 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -25,7 +25,7 @@ in buildPythonPackage rec { nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ + requiredPythonModules = [ pgpy srht redis diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index a2fdaa05efcae..bc714e63ca785 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ + requiredPythonModules = [ srht pyyaml ]; diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 08739f6d8ab95..dbae53d1ac02f 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ + requiredPythonModules = [ srht redis pyyaml diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 7528ae534fae9..af663ce8f4a00 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { nativeBuildInputs = srht.nativeBuildInputs; - propagatedBuildInputs = [ + requiredPythonModules = [ srht redis alembic diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 2743d4f827fb9..48ddbee8e29c5 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -21,7 +21,7 @@ in python3Packages.buildPythonApplication { inherit (tortoisehgSrc.meta) name version; src = tortoisehgSrc; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ tortoiseMercurial qscintilla-qt5 iniparse ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index d22657d651cbc..52c097e5fb088 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -22,7 +22,7 @@ in with py.pkgs; buildPythonApplication rec { sha256 = "1vq1wg79b7855za6v6bsfgypm0v3b4wakap4rash45mhzbgjj0kq"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ youtube-dl PyChromecast click ifaddr requests ]; diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 9bb5518e80f7d..dfd7e64870652 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -33,7 +33,7 @@ in buildPythonApplication { ffmpeg_3 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg_3 mplayer dvdauthor vcdimager cdrkit urllib3 setuptools ]; diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 411ab9e6bc288..d9be65b181999 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { sha256 = "18dpck9grnr3wgbjvdh4mjlx0zfwcxpy4rnpmc39in0yk3w7li2x"; }; - propagatedBuildInputs = [ ffmpeg_3 tqdm ]; + requiredPythonModules = [ ffmpeg_3 tqdm ]; checkPhase = '' $out/bin/ffmpeg-normalize --help > /dev/null diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index 3a3ca044bb880..d438eb0282ae0 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { }; nativeBuildInputs = [ wrapGAppsHook ]; - propagatedBuildInputs = [ + requiredPythonModules = [ PyChromecast bottle pycaption paste html5lib pygobject3 dbus-python gtk3 gobject-introspection ]; diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 825aac4dad290..f9b1e14db4247 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -38,7 +38,7 @@ buildPythonApplication rec { ln -s ${shaderPack} jellyfin_mpv_shim/default_shader_pack ''; - propagatedBuildInputs = [ + requiredPythonModules = [ jellyfin-apiclient-python mpv pillow diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 0cdd3db852571..998d896980ffc 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { keybinder3 libappindicator-gtk3 ]; - propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ]; + requiredPythonModules = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ]; # workaround https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 667b2bb2b885e..c1bdfb53977b7 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ + requiredPythonModules = [ colour numpy pillow diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index cd3176249f8a1..87a4694875205 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -17,7 +17,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 ]; - propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip httplib2 pyzmq ]; + requiredPythonModules = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip httplib2 pyzmq ]; dontWrapGApps = true; dontWrapQtApps = true; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 535913c6f2b23..bc026b43ea47f 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec { gst-devtools ]); - pythonPath = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pygobject3 gst-python pyxdg diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index e25c101b5dfb3..1055829c43001 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "06i6pp4jg0f9h6ash60fj1l5mbsdw3zyx7c6anbsrn86802i7paa"; }; - propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; + requiredPythonModules = [ mpv requests python-mpv-jsonipc ]; meta = with stdenv.lib; { homepage = "https://github.com/iwalton3/plex-mpv-shim"; diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index 0fed17bb99997..fc57b9012e8d7 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "0cvkmdlcax9da9iw4ls73vw0pxvm8wvchab5gwdy9w9ibqdpcmwh"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pycurl dateutil configobj diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 00ead0f89a39a..66fe9d843838d 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pycairo pygobject3 ]; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 4c8800c918e2e..466b7fe3d9b13 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; - propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg_3 ]; + requiredPythonModules = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg_3 ]; meta = with stdenv.lib; { homepage = "https://github.com/streamlink/streamlink"; diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 23ee76eb4693c..da0dcba94007a 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { strictDeps = false; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ moviepy pygobject3 pyxdg diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 766c81d6befee..6220e5f79be04 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { doCheck = false; nativeBuildInputs = [ installShellFiles ]; checkInputs = [ mock pytest nose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pyyaml backports_ssl_match_hostname colorama dockerpty docker ipaddress jsonschema requests six texttable websocket_client docopt cached-property paramiko distro python-dotenv diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index de3d944bacb18..47ffb4065f209 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { sha256 = "1sgbc889zq127qhxa9frhswa1mid19fs5qnyzfihx648y5i968pv"; }; - propagatedBuildInputs = [ pyyaml ]; + requiredPythonModules = [ pyyaml ]; meta = { description = "An implementation of docker-compose with podman backend"; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 9673e93d0cc86..be7da7851a95a 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; - propagatedBuildInputs = with python3Packages; + requiredPythonModules = with python3Packages; [ pygobject3 ipaddress libvirt libxml2 requests ]; diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 4d8987d6ed78b..176b26f29ad70 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "175laiy49dni8hzi0cn14bbsdsigvgr9h6d9z2bcvbpa29spldvf"; }; - pythonPath = with python2Packages; + requiredPythonModules = with python2Packages; [ setuptools eventlet greenlet gflags netaddr carrot routes PasteDeploy m2crypto ipy twisted distutils_extra simplejson cheetah lockfile httplib2 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { python2Packages.wrapPython python2Packages.mox intltool - ] ++ pythonPath; + ] ++ requiredPythonModules; buildPhase = "python setup.py build"; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 854debc458a36..5fcb85dcce196 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation (rec { wrapPythonPrograms # We also need to wrap pygrub, which lies in lib - wrapPythonProgramsIn "$out/lib" "$out $pythonPath" + wrapPythonProgramsIn "$out/lib" "$out $requiredPythonModules" shopt -s extglob for i in $out/etc/xen/scripts/!(*.sh); do diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index beefdaf891c6a..1b7dd14c2ab57 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ libpulseaudio libnotify gobject-introspection ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ keyring colour netifaces psutil basiciw pygobject3 ] ++ extraLibs; diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index 51881975266d0..7fda2450bd52c 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0ci0w5igjk5xa8x4rx17cpgmdkamwjmavxhp0vp6213cl93ybjhz"; }; - propagatedBuildInputs = with python3Packages; [ i3ipc ]; + requiredPythonModules = with python3Packages; [ i3ipc ]; dontBuild = true; doCheck = false; diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 39329e8004c5b..dd2e3155fef4a 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pango imlib2 ]; - pythonPath = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pyxdg ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share" wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share" wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share" - wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" + wrapPythonProgramsIn "$out/libexec" "$out $requiredPythonModules" ''; meta = { diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 280ec067658ad..f17038a57d75f 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -34,7 +34,7 @@ python37Packages.buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ]; - pythonPath = with python37Packages; [ + requiredPythonModules = with python37Packages; [ xcffib cairocffi-xcffib setuptools diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index fd44f4a5be50c..40dba087a23f7 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -80,7 +80,7 @@ inactive-windows-transparency = python3Packages.buildPythonApplication rec { dontBuild = true; dontConfigure = true; - propagatedBuildInputs = [ python3Packages.i3ipc ]; + requiredPythonModules = [ python3Packages.i3ipc ]; installPhase = '' install -Dm 0755 $src/contrib/${lname}.py $out/bin/${lname}.py diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix index bc6482f0a88e6..18f7f39f79787 100644 --- a/pkgs/build-support/build-setupcfg/default.nix +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -20,6 +20,6 @@ in build { (info.setup_requires or []) ++ (if doCheck then (info.tests_require or []) else [])); - propagatedBuildInputs = map (p: pythonPackages.${p}) + requiredPythonModules = map (p: pythonPackages.${p}) (info.install_requires or []); } diff --git a/pkgs/build-support/rust/fetchCargoTarball.nix b/pkgs/build-support/rust/fetchCargoTarball.nix index dff5d99da9eb3..2f860700ab53b 100644 --- a/pkgs/build-support/rust/fetchCargoTarball.nix +++ b/pkgs/build-support/rust/fetchCargoTarball.nix @@ -5,7 +5,7 @@ let cargo-vendor-normalise = stdenv.mkDerivation { nativeBuildInputs = [ python3.pkgs.wrapPython ]; dontUnpack = true; installPhase = "install -D $src $out/bin/cargo-vendor-normalise"; - pythonPath = [ python3.pkgs.toml ]; + requiredPythonModules = [ python3.pkgs.toml ]; postFixup = "wrapPythonPrograms"; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index f5bd6335dfbb6..8264276b1691f 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ afdko appdirs attrs diff --git a/pkgs/data/themes/cdetheme/default.nix b/pkgs/data/themes/cdetheme/default.nix index ae7386047517d..14a31f6e356dc 100644 --- a/pkgs/data/themes/cdetheme/default.nix +++ b/pkgs/data/themes/cdetheme/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { dontBuild = true; - pythonPath = with python2Packages; [ pyqt4 pillow pyxdg pyyaml ]; + requiredPythonModules = with python2Packages; [ pyqt4 pillow pyxdg pyyaml ]; nativeBuildInputs = with python2Packages; [ python wrapPython ]; installPhase = '' mkdir -p $out/share/themes cp -r cdetheme $out/share/themes patchShebangs $out/share/themes/cdetheme/scripts/switchtheme - wrapPythonProgramsIn "$out/share/themes/cdetheme/scripts" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/themes/cdetheme/scripts" "$out $requiredPythonModules" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 5e37cff3d0a87..36e858d6ad3b2 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { gdk-pixbuf ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ grpcio-tools protobuf pygobject3 diff --git a/pkgs/desktops/enlightenment/econnman/default.nix b/pkgs/desktops/enlightenment/econnman/default.nix index 1979b4518a708..61c0cc5535521 100644 --- a/pkgs/desktops/enlightenment/econnman/default.nix +++ b/pkgs/desktops/enlightenment/econnman/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ efl python3Packages.python dbus ]; - pythonPath = [ python3Packages.pythonefl python3Packages.dbus-python ]; + requiredPythonModules = [ python3Packages.pythonefl python3Packages.dbus-python ]; postInstall = '' wrapPythonPrograms diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index f05eb41d35e28..231ae8c20ffcf 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { libwnck3 ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ ipython pyatspi pycairo diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index ca59c5556fe17..46b84afc43c90 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-ugly ]); - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pycairo dbus-python pygobject3 diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 9609d832f6b11..ccfc2213eb96a 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { mate.mate-session-manager ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ distro pygobject3 psutil diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 7bad399623a79..61cc19def0ded 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ pkgconfig gettext gobject-introspection wrapGAppsHook ]; - propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ]; + requiredPythonModules = [ mate.mate-menus python3.pkgs.pygobject3 ]; buildInputs = [ gtk3 glib ]; diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 7b9587b988b9e..2cea628d1c077 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ python3Packages.dbus-python python3Packages.pygobject3 python3Packages.pexpect diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix index 673b0a24fb61f..9cfeb76d9151d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { sha256 = "1f75iwlshnif60x0qqdqw5ffng2m4f4zp0ijkrbjz83wm73nsxfx"; }; - pythonPath = [ dockbarx ]; + requiredPythonModules = [ dockbarx ]; nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ python2 vala_0_46 gtk2 pythonPackages.wrapPython ] ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ]) - ++ pythonPath; + ++ requiredPythonModules; postPatch = '' substituteInPlace wscript --replace /usr/share/ "\''${PREFIX}/share/" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $requiredPythonModules" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index c51d3f89d0708..ea24d58467bc1 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -11,7 +11,7 @@ python2Packages.buildPythonApplication rec { }; # TODO: add avrgcclibc, it must be rebuild with C++ support - propagatedBuildInputs = with python2Packages; [ + requiredPythonModules = with python2Packages; [ arduino-core avrdude picocom diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 42e1e49b41fbf..04f23497f0302 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -85,7 +85,7 @@ in buildPythonApplication rec { sha256 = "1hbw8nbllyj0xyx1rz2chx9vyqf9949dcdx4v9hnfbsjwwpcfi0a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ bottle click colorama git lockfile pyserial requests semantic-version tabulate pyelftools marshmallow diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index a8890b048fbe4..0e718647552d7 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ flake8 pytest ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ appdirs astor clint diff --git a/pkgs/development/interpreters/jelly/default.nix b/pkgs/development/interpreters/jelly/default.nix index a317f35d2a787..0c893b4900521 100644 --- a/pkgs/development/interpreters/jelly/default.nix +++ b/pkgs/development/interpreters/jelly/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication { sha256 = "1rpclqagvigp5qhvgnjavvy463f1drshnc1mfxm6z7ygzs0l0yz6"; }; - propagatedBuildInputs = [ python3Packages.sympy ]; + requiredPythonModules = [ python3Packages.sympy ]; # checks are disabled because jelly has no tests, and the default is to run # the output binary with no arguments, which exits with status 1 and causes diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a8db9bc92576d..c27a89d549c2a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -34,7 +34,7 @@ with pkgs; isPy3k = isPy3; isPyPy = lib.hasInfix "pypy" interpreter; - buildEnv = callPackage ./wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; + buildEnv = callPackage ./wrapper.nix { python = self; inherit (pythonPackages) computeRequiredPythonModules; }; withPackages = import ./with-packages.nix { inherit buildEnv pythonPackages;}; pkgs = pythonPackages; interpreter = "${self}/bin/${executable}"; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index d14eb9cbb09dd..7be65307262d0 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -121,6 +121,11 @@ in rec { }; } ./python-remove-tests-dir-hook.sh) {}; + pythonWriteRequiredPythonModulesHook = callPackage ({ }: + makeSetupHook { + name = "python-write-required-python-modules-hook"; + } ./python-write-required-python-modules-hook.sh) {}; + setuptoolsBuildHook = callPackage ({ setuptools, wheel }: makeSetupHook { name = "setuptools-setup-hook"; diff --git a/pkgs/development/interpreters/python/hooks/python-write-required-python-modules-hook.sh b/pkgs/development/interpreters/python/hooks/python-write-required-python-modules-hook.sh new file mode 100644 index 0000000000000..91b92fe1f5f4c --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/python-write-required-python-modules-hook.sh @@ -0,0 +1,15 @@ +# Setup hook for writing the Python run-time dependencies to a nix-support file +echo "Sourcing python-write-required-python-modules-hook.sh" + +pythonWriteRequiredPythonModulesPhase () { + echo "Executing pythonWriteRequiredPythonModulesPhase" + + mkdir -p $out/nix-support + echo ${requiredPythonModules-} > $out/nix-support/required-python-modules +} + +# Yes its a bit long... +if [ -z "${dontUsePythonWriteRequiredPythonModulesPhase-}" ]; then + echo "Using pythonWriteRequiredPythonModulesPhase" + preDistPhases+=" pythonWriteRequiredPythonModulesPhase" +fi diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index c3be76790ebdd..4e8d5416b1531 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -8,6 +8,7 @@ , ensureNewerSourcesForZipFilesHook # Whether the derivation provides a Python module or not. , toPythonModule +, computeRequiredPythonModules , namePrefix , update-python-libraries , setuptools @@ -20,6 +21,7 @@ , pythonRecompileBytecodeHook , pythonRemoveBinBytecodeHook , pythonRemoveTestsDirHook +, pythonWriteRequiredPythonModulesHook , setuptoolsBuildHook , setuptoolsCheckHook , wheelUnpackHook @@ -44,8 +46,8 @@ # C can import package A propagated by B , propagatedBuildInputs ? [] -# DEPRECATED: use propagatedBuildInputs -, pythonPath ? [] +# Required Python modules +, requiredPythonModules ? [] # Enabled to detect some (native)BuildInputs mistakes , strictDeps ? true @@ -103,11 +105,57 @@ else let inherit (python) stdenv; + name_ = namePrefix + name; + + # We've converted from `propagatedBuildInputs` to `requiredPythonModules`. + # This will cause packages that did not convert to fail at run-time. + # Here we warn in case Python modules are being propagated. + # Propagating Python modules is in principle fine, it is however unlikely one + # would actually want to do that. + # This is to be released in nixos-21.03 and should thus be removed in nixos-21.09. + drvName = drv: drv.pname or (builtins.parseDrvName drv.name).name; + + partitionedPropagatedInputs = lib.lists.partition (x: lib.hasAttr "pythonModule" x) (lib.filter (x: x != null) propagatedBuildInputs); + propagatedPythonInputs = if lib.length partitionedPropagatedInputs.right > 0 + then + lib.warn '' + ${name}: Using `propagatedBuildInputs` for Python modules has been deprecated, please use `requiredPythonModules` instead. + + Your code may need to look like: + + requiredPythonModules = [ ${lib.concatMapStringsSep " " drvName partitionedPropagatedInputs.right} ]; + + propagatedBuildInputs = [ ${lib.concatMapStringsSep " " drvName partitionedPropagatedInputs.wrong} ]; + + Note the exact attribute names may be incorrect. Not resolving this issue may result in incorrect wrappers. + + For more information, see https://github.com/NixOS/nixpkgs/pull/102613. + '' partitionedPropagatedInputs.right + else + [ ]; + propagatedDerivationInputs = partitionedPropagatedInputs.wrong; + + # Warn in case a non-Python dependency is in `requiredPythonModules`. + # Such warning could be moved into the function `computeRequiredPythonModules`, however, there is no way then to indicate + # where the trace is generated. + partitionedRequiredPythonModules = lib.lists.partition (x: lib.hasAttr "pythonModule" x) (lib.filter (x: x != null) requiredPythonModules); + requiredPythonModulesChecked = if lib.length partitionedRequiredPythonModules.wrong > 0 + then let + list = ''[ ${lib.concatMapStringsSep " " drvName partitionedRequiredPythonModules.wrong} ]''; + in lib.warn '' + ${name}: Non-Python packages are in `requiredPythonModules`: ${list} + If these are libraries, then they should be in `buildInputs`. If their executables need to be included in wrappers, set `makeWrapperArgs=["--prefix PATH : ''${lib.makeBinPath ${list} }";`. + '' partitionedRequiredPythonModules.right + else + partitionedRequiredPythonModules.right; + + requiredPythonModules_ = computeRequiredPythonModules (requiredPythonModulesChecked ++ propagatedPythonInputs); + self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ - "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" + "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" "requiredPythonModules" ]) // { - name = namePrefix + name; + name = name_; nativeBuildInputs = [ python @@ -115,6 +163,7 @@ let ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? pythonRecompileBytecodeHook # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441 pythonRemoveTestsDirHook + pythonWriteRequiredPythonModulesHook ] ++ lib.optionals catchConflicts [ setuptools pythonCatchConflictsHook ] ++ lib.optionals removeBinBytecode [ @@ -141,9 +190,21 @@ let pythonNamespacesHook ] ++ nativeBuildInputs; - buildInputs = buildInputs ++ pythonPath; - - propagatedBuildInputs = propagatedBuildInputs ++ [ python ]; + buildInputs = buildInputs ++ requiredPythonModules_; + + # TODO: stop propagating Python and its packages? + # Python applications should not propagate Python with its dependencies. + # In principle, buildPythonApplication could stop using `propagatedBuildInputs`, + # however, it won't help in case `buildPythonPackage` is used with `toPythonApplication`. + # Note also, propagation is needed for e.g. `checkInputs` to find its dependencies. + # + # Probably the solution is to keep using propagation in case packages, + # and convert `buildPythonApplication` to first build the package, and then an environment + # using `python.buildEnv` https://github.com/NixOS/nixpkgs/pull/16672. + propagatedBuildInputs = propagatedDerivationInputs; + + # requiredPythonModules is also set + requiredPythonModules = requiredPythonModules_; inherit strictDeps; diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/setup-hook.sh index 523df5762fadb..d5b790e7647f8 100644 --- a/pkgs/development/interpreters/python/setup-hook.sh +++ b/pkgs/development/interpreters/python/setup-hook.sh @@ -1,5 +1,13 @@ addPythonPath() { addToSearchPathWithCustomDelimiter : PYTHONPATH $1/@sitePackages@ + # Include the dependencies in `required-python-modules` as well + local prop="$1/nix-support/required-python-modules" + if [ -e $prop ]; then + local new_path + for new_path in $(cat $prop); do + addToSearchPathWithCustomDelimiter : PYTHONPATH $new_path/@sitePackages@ + done + fi } toPythonPath() { diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index f10ba003432be..70ccb1c7cb5f3 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -1,24 +1,24 @@ -# Wrapper around wrapPythonProgramsIn, below. The $pythonPath +# Wrapper around wrapPythonProgramsIn, below. The $requiredPythonModules # variable is passed in from the buildPythonPackage function. wrapPythonPrograms() { - wrapPythonProgramsIn "$out/bin" "$out $pythonPath" + wrapPythonProgramsIn "$out/bin" "$out $requiredPythonModules" } # Builds environment variables like PYTHONPATH and PATH walking through closure # of dependencies. buildPythonPath() { - local pythonPath="$1" + local requiredPythonModules="$1" local path # Create an empty table of python paths (see doc on _addToPythonPath # for how this is used). Build up the program_PATH and program_PYTHONPATH # variables. - declare -A pythonPathsSeen=() + declare -A requiredPythonModulessSeen=() program_PYTHONPATH= program_PATH= - pythonPathsSeen["@pythonHost@"]=1 + requiredPythonModulessSeen["@pythonHost@"]=1 addToSearchPath program_PATH @pythonHost@/bin - for path in $pythonPath; do + for path in $requiredPythonModules; do _addToPythonPath $path done } @@ -41,10 +41,10 @@ patchPythonScript() { # suffix). wrapPythonProgramsIn() { local dir="$1" - local pythonPath="$2" + local requiredPythonModules="$2" local f - buildPythonPath "$pythonPath" + buildPythonPath "$requiredPythonModules" # Find all regular files in the output directory that are executable. if [ -d "$dir" ]; then @@ -101,19 +101,19 @@ wrapPythonProgramsIn() { # Adds the lib and bin directories to the PYTHONPATH and PATH variables, # respectively. Recurses on any paths declared in # `propagated-build-inputs`, while avoiding duplicating paths by -# flagging the directories it has visited in `pythonPathsSeen`. +# flagging the directories it has visited in `requiredPythonModulessSeen`. _addToPythonPath() { local dir="$1" # Stop if we've already visited here. - if [ -n "${pythonPathsSeen[$dir]}" ]; then return; fi - pythonPathsSeen[$dir]=1 + if [ -n "${requiredPythonModulessSeen[$dir]}" ]; then return; fi + requiredPythonModulessSeen[$dir]=1 # addToSearchPath is defined in stdenv/generic/setup.sh. It will have # the effect of calling `export program_X=$dir/...:$program_X`. addToSearchPath program_PYTHONPATH $dir/@sitePackages@ addToSearchPath program_PATH $dir/bin - # Inspect the propagated inputs (if they exist) and recur on them. - local prop="$dir/nix-support/propagated-build-inputs" + # Traverse the `required-python-modules and recurse on them + local prop="$dir/nix-support/required-python-modules" if [ -e $prop ]; then local new_path for new_path in $(cat $prop); do diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index dffad6b98f5e5..206c2ee031051 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -4,7 +4,7 @@ , postBuild ? "" , ignoreCollisions ? false , permitUserSite ? false -, requiredPythonModules +, computeRequiredPythonModules # Wrap executables with the given argument. , makeWrapperArgs ? [] , }: @@ -12,8 +12,8 @@ # Create a python executable that knows about additional packages. let env = let - paths = requiredPythonModules (extraLibs ++ [ python ] ) ; - pythonPath = "${placeholder "out"}/${python.sitePackages}"; + paths = computeRequiredPythonModules (extraLibs ++ [ python ] ) ; + requiredPythonModules = "${placeholder "out"}/${python.sitePackages}"; pythonExecutable = "${placeholder "out"}/bin/${python.executable}"; in buildEnv { name = "${python.name}-env"; @@ -37,7 +37,7 @@ let if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${requiredPythonModules} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 41cf4c221c6a1..8403fb5744be6 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { SDL2 libpng ffmpeg_3 freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib ]; - pythonPath = [ pygame_sdl2 tkinter ]; + requiredPythonModules = [ pygame_sdl2 tkinter ]; RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [ SDL2 SDL2.dev libpng ffmpeg_3 ffmpeg_3.out freetype glew.dev glew.out libGLU libGL fribidi zlib diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index fd3924fec3ea0..4b7d75ccea2c4 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - pythonPath = with python3Packages; + requiredPythonModules = with python3Packages; [ pygobject3 ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $requiredPythonModules" gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH") ''; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 642baba43767b..195cec28e52e0 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit , pkgconfig, makeWrapper, autoreconfHook, fetchpatch -, coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils +, coreutils, libxml2, gnutls, perl, python3, attr, glib, docutils , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - makeWrapper pkgconfig docutils + makeWrapper pkgconfig docutils python3 ] ++ optionals (!buildFromTarball) [ autoreconfHook ] ++ optional (!stdenv.isDarwin) [ @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl + libxml2 gnutls perl readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus ] ++ optionals stdenv.isLinux [ libpciaccess lvm2 utillinux systemd libnl numad zfs diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 2ad2d016c9fd1..26016fe54d135 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -269,7 +269,7 @@ stdenv.mkDerivation { hardeningDisable = [ "bindnow" "relro" ]; - passthru = lib.optionalAttrs enablePython { pythonPath = []; }; + passthru = lib.optionalAttrs enablePython { requiredPythonModules = []; }; meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index adeab6b44948d..52c754a74b9c0 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -284,7 +284,7 @@ stdenv.mkDerivation { hardeningDisable = [ "bindnow" "relro" ]; - passthru = lib.optionalAttrs enablePython { pythonPath = []; }; + passthru = lib.optionalAttrs enablePython { requiredPythonModules = []; }; meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 0749ec9e7f30a..c0c746d3be461 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_new=.*|includedir_new=$dev/include|" ''; - passthru = lib.optionalAttrs enablePython { pythonPath = []; }; + passthru = lib.optionalAttrs enablePython { requiredPythonModules = []; }; meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index 4e89aeebe2b7e..c503d3ae14be8 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -37,7 +37,7 @@ let url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz"; sha256 = "1ncgbr0bn5cvv16f13g722a0ipw6p9y6p4iasxjziwsp8kn5x97a"; }; - propagatedBuildInputs = [ numpy six ]; + requiredPythonModules = [ numpy six ]; checkInputs = [ pytest ]; preCheck = '' export HOME=$PWD @@ -62,7 +62,7 @@ let url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz"; sha256 = "1sbi0fbr7w9g9ajr565g3njxrc3qydqjy3334vmz5xg0rd3106il"; }; - propagatedBuildInputs = [ numpy six sympy ]; + requiredPythonModules = [ numpy six sympy ]; checkInputs = [ pytest ]; preCheck = '' @@ -92,7 +92,7 @@ let url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz"; sha256 = "04daxwg4y9c51sdgvwgmlc82nn0fjw7i2vzs15ckdc7dlazmcfi1"; }; - propagatedBuildInputs = [ numpy six ]; + requiredPythonModules = [ numpy six ]; checkInputs = [ pytest ]; checkPhase = '' runHook preCheck @@ -117,7 +117,7 @@ let nativeBuildInputs = [ pybind11 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ dijitso fiat numpy @@ -157,7 +157,7 @@ let sha256 = "1zj7k3y7vsx0hz3gwwlxhq6gdqamqpcw90d4ishwx5ps5ckcsb9r"; }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ dijitso fiat numpy @@ -241,7 +241,7 @@ let boost ]; - propagatedBuildInputs = [ + requiredPythonModules = [ dijitso ffc mpi4py diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index fbf399cb246e1..2ecc2a1b9eb0c 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { # ++ optional withIvona libdumbtts ; - pythonPath = [ pyxdg ]; + requiredPythonModules = [ pyxdg ]; configureFlags = [ # Audio method falls back from left to right. diff --git a/pkgs/development/libraries/thrift/0.10.nix b/pkgs/development/libraries/thrift/0.10.nix index d626673a227a9..ce373204fbe6c 100644 --- a/pkgs/development/libraries/thrift/0.10.nix +++ b/pkgs/development/libraries/thrift/0.10.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # Workaround to make the python wrapper not drop this package: # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } - pythonPath = []; + requiredPythonModules = []; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 1879cac96c188..c30bc44f51632 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Workaround to make the python wrapper not drop this package: # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } - pythonPath = []; + requiredPythonModules = []; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost zlib libevent openssl python bison flex ] diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 21b8d509646da..7ed9428dc8f1f 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { gevent ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six pytz tzlocal diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix index 1074d2eef48c8..f4a6169492c8e 100644 --- a/pkgs/development/python-modules/Babel/default.nix +++ b/pkgs/development/python-modules/Babel/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ pytz ]; + requiredPythonModules = [ pytz ]; checkInputs = [ pytest freezegun ]; diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index 1025ed6a05ee0..4cdedebb9b064 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "19nzdibjfndzcwvby20p59igqwyzw7skrb45v2mxqsjma5yjv114"; }; - propagatedBuildInputs = [ invoke paramiko cryptography ]; + requiredPythonModules = [ invoke paramiko cryptography ]; checkInputs = [ pytest mock pytest-relaxed ]; # requires pytest_relaxed, which doesnt have official support for pytest>=5 diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix index 3a01c9ba98317..afd6b9d9e78a0 100644 --- a/pkgs/development/python-modules/Flask-PyMongo/default.nix +++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { # Tests seem to hang doCheck = false; - propagatedBuildInputs = [ flask pymongo vcversioner ]; + requiredPythonModules = [ flask pymongo vcversioner ]; meta = { homepage = "https://flask-pymongo.readthedocs.org/"; diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix index 0e4b66fe962f9..d4c3e5a04b629 100644 --- a/pkgs/development/python-modules/GeoIP/default.nix +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { version = "1.3.2"; checkInputs = [ nose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ geoip ]; diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 2edb8c51e3a0b..56584f0883c57 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ]; checkInputs = [ nose ] ++ lib.optional isPy27 mock; - propagatedBuildInputs = [ gitdb ddt ]; + requiredPythonModules = [ gitdb ddt ]; # Tests require a git repo doCheck = false; diff --git a/pkgs/development/python-modules/HAP-python/default.nix b/pkgs/development/python-modules/HAP-python/default.nix index 7d273345b58a6..8a233f07f9bc3 100644 --- a/pkgs/development/python-modules/HAP-python/default.nix +++ b/pkgs/development/python-modules/HAP-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ + requiredPythonModules = [ curve25519-donna ed25519 cryptography diff --git a/pkgs/development/python-modules/HTSeq/default.nix b/pkgs/development/python-modules/HTSeq/default.nix index abb0c8520dd02..b20a9d39e4895 100644 --- a/pkgs/development/python-modules/HTSeq/default.nix +++ b/pkgs/development/python-modules/HTSeq/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ cython numpy pysam ]; - propagatedBuildInputs = [ numpy pysam matplotlib ]; + requiredPythonModules = [ numpy pysam matplotlib ]; meta = with stdenv.lib; { description = "A framework to work with high-throughput sequencing data"; diff --git a/pkgs/development/python-modules/JayDeBeApi/default.nix b/pkgs/development/python-modules/JayDeBeApi/default.nix index 0263b4b752d4b..8bce7f8d71264 100644 --- a/pkgs/development/python-modules/JayDeBeApi/default.nix +++ b/pkgs/development/python-modules/JayDeBeApi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "f25e9307fbb5960cb035394c26e37731b64cc465b197c4344cee85ec450ab92f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ JPype1 ]; diff --git a/pkgs/development/python-modules/Logbook/default.nix b/pkgs/development/python-modules/Logbook/default.nix index fa05a7a6dffac..8aed591984aef 100644 --- a/pkgs/development/python-modules/Logbook/default.nix +++ b/pkgs/development/python-modules/Logbook/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ]; - propagatedBuildInputs = [ brotli ]; + requiredPythonModules = [ brotli ]; checkPhase = '' find tests -name \*.pyc -delete diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index c129e411a4739..19570f2649914 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27"; }; - propagatedBuildInputs = [ markupsafe ]; + requiredPythonModules = [ markupsafe ]; checkInputs = [ pytestCheckHook markupsafe mock ]; disabledTests = lib.optionals isPyPy [ diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix index eb802989a5c23..7fa9d68213505 100644 --- a/pkgs/development/python-modules/Markups/default.nix +++ b/pkgs/development/python-modules/Markups/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ markdown docutils pygments ]; - propagatedBuildInputs = [ python-markdown-math ]; + requiredPythonModules = [ python-markdown-math ]; meta = { description = "A wrapper around various text markup languages."; diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix index 07330ebbca9d4..69a7ff6990b88 100644 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner requests-mock pytestcov ]; - propagatedBuildInputs = [ lxml requests beautifulsoup4 six ]; + requiredPythonModules = [ lxml requests beautifulsoup4 six ]; # Requires network doCheck = false; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 06a85a22033d0..27071637703e5 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov mock glibcLocales freezegun ]; - propagatedBuildInputs = [ + requiredPythonModules = [ # requirements.txt doit pygments pillow dateutil docutils Mako markdown unidecode lxml Yapsy PyRSS2Gen Logbook blinker natsort requests piexif Babel diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix index 9dfb8de3b2c67..e9f42273b00b4 100644 --- a/pkgs/development/python-modules/Pmw/default.nix +++ b/pkgs/development/python-modules/Pmw/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "080iml3868nxniyn56kcwnbghm10j7fw74a5nj0s19sm4zsji78b"; }; - propagatedBuildInputs = [ tkinter ]; + requiredPythonModules = [ tkinter ]; # Disable tests due to their xserver requirement doCheck = false; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index 1c7bc2ff93fb6..c8c4f7c855e16 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sha256 = "0z2vkllw8bvzxripwb6l757r7av5qwhzsiy4061gmlhq8z8gq961"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # Unfortunately PyLD does not pass all testcases in the JSON-LD corpus. We # check for at least a minimum amount of successful tests so we know it's not diff --git a/pkgs/development/python-modules/PyRMVtransport/default.nix b/pkgs/development/python-modules/PyRMVtransport/default.nix index 1624a5fda2a61..f655d3442a3ac 100644 --- a/pkgs/development/python-modules/PyRMVtransport/default.nix +++ b/pkgs/development/python-modules/PyRMVtransport/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { flit ]; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp lxml ]; diff --git a/pkgs/development/python-modules/Pygments/2_5.nix b/pkgs/development/python-modules/Pygments/2_5.nix index a0c40550c9a90..489368f309622 100644 --- a/pkgs/development/python-modules/Pygments/2_5.nix +++ b/pkgs/development/python-modules/Pygments/2_5.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"; }; - propagatedBuildInputs = [ docutils ]; + requiredPythonModules = [ docutils ]; # Circular dependency with sphinx doCheck = false; diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index e0c5539299dd3..c4cbf571adb67 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44"; }; - propagatedBuildInputs = [ docutils ]; + requiredPythonModules = [ docutils ]; # Circular dependency with sphinx doCheck = false; diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index c3c67194ebb74..5a3909d47e453 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0v34w88if3p4vn46aby24msfnxj6znmkf4848n4d24jnykxcsqk9"; }; - propagatedBuildInputs = [ capstone ]; + requiredPythonModules = [ capstone ]; meta = with stdenv.lib; { description = "Tool to search for gadgets in binaries to facilitate ROP exploitation"; diff --git a/pkgs/development/python-modules/Rtree/default.nix b/pkgs/development/python-modules/Rtree/default.nix index 9adfbb67e62dc..431824b05bb69 100644 --- a/pkgs/development/python-modules/Rtree/default.nix +++ b/pkgs/development/python-modules/Rtree/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0i1zlyz6vczy3cgg7fan5hq9zzjm7s7zdzfh83ma8g9vq3i2gqya"; }; - propagatedBuildInputs = [ libspatialindex ]; + requiredPythonModules = [ libspatialindex ]; patchPhase = '' substituteInPlace rtree/core.py --replace \ diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index ce32e42e4716f..ce6a01e18354c 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -81,7 +81,7 @@ in buildPythonPackage rec { # keep Nose around since running the tests by hand is possible from Python or bash checkInputs = [ nose ]; - propagatedBuildInputs = [ numpy numpy.blas scipy six libgpuarray_ ]; + requiredPythonModules = [ numpy numpy.blas scipy six libgpuarray_ ]; pythonImportsCheck = [ "theano" ]; diff --git a/pkgs/development/python-modules/TurboCheetah/default.nix b/pkgs/development/python-modules/TurboCheetah/default.nix index 717b2b5f27801..301cc0bbfbc1d 100644 --- a/pkgs/development/python-modules/TurboCheetah/default.nix +++ b/pkgs/development/python-modules/TurboCheetah/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "9e4c7ecb0d061bfb58281363ee1b09337083f013a8b4d0355326a5d8668f450c"; }; - propagatedBuildInputs = [ cheetah ]; + requiredPythonModules = [ cheetah ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index c1c6395ab25ba..5d735d1b42981 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ + requiredPythonModules = [ netaddr pytz simplegeneric diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix index 02519e9dc66b4..f2fd29b6bf444 100644 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "889fe753a530b258bd23def65616666d32c48d93ad8ed211dadf2ed9afcec65b"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # there are no tests doCheck = false; diff --git a/pkgs/development/python-modules/aadict/default.nix b/pkgs/development/python-modules/aadict/default.nix index 2587260748f0e..c01bcd78bb746 100644 --- a/pkgs/development/python-modules/aadict/default.nix +++ b/pkgs/development/python-modules/aadict/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "013pn9ii6mkql6khgdvsd1gi7zmya418fhclm5fp7dfvann2hwx7"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ nose coverage ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix index ed07a60e0a892..c42341d427797 100644 --- a/pkgs/development/python-modules/aafigure/default.nix +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "49f2c1fd2b579c1fffbac1386a2670b3f6f475cc7ff6cc04d8b984888c2d9e1e"; }; - propagatedBuildInputs = [ pillow ]; + requiredPythonModules = [ pillow ]; # error: invalid command 'test' doCheck = false; diff --git a/pkgs/development/python-modules/abodepy/default.nix b/pkgs/development/python-modules/abodepy/default.nix index eb0de74e79114..f77a80a88dec7 100644 --- a/pkgs/development/python-modules/abodepy/default.nix +++ b/pkgs/development/python-modules/abodepy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0m2cm90yy7fq7yrjyd999m48gqri65ifi7f6hc0s3pv2hfj89yj0"; }; - propagatedBuildInputs = [ colorlog lomond requests ]; + requiredPythonModules = [ colorlog lomond requests ]; checkInputs = [ pytestCheckHook requests-mock ]; meta = with lib; { diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index e7a2f120c1b3e..d3dadf991f583 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "75e737d6ce7723d9ff9b7aa1ba3233c34be62ef18d5859e706b8fdc828989830"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six ] ++ lib.optionals (pythonOlder "3.4") [ enum34 diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index 0d2cd2239b503..a46a0a10f97d7 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pybind11 eigen ]; - propagatedBuildInputs = [ + requiredPythonModules = [ mpmath numpy pipdate diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index ed6dcb54377e6..35f69fe6d01fd 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ aiohttp ]; + requiredPythonModules = [ aiohttp ]; checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ]; meta = with lib; { diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index e9156b5c6af1e..79de00bd5c65c 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "acme"; - propagatedBuildInputs = [ + requiredPythonModules = [ cryptography pyasn1 pyopenssl pyRFC3339 pytz requests requests-toolbelt six werkzeug mock ndg-httpsclient josepy ]; diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index 7b62c6791cb13..58a62e1709c32 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { version = "0.2.4.post0"; checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; + requiredPythonModules = [ numpy scipy matplotlib pandas tabulate ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 00a08b3e7a82f..032f0fc0f1afd 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pep8 nose unittest2 docutils ]; - propagatedBuildInputs = [ blockdiag ]; + requiredPythonModules = [ blockdiag ]; checkInputs = [ reportlab ]; diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 0df7247986d01..0a3319d86e783 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "8003ba03ef04170195b3eddda8a5ab43649ef2c5f0287023d515affb1ccfcfc3"; }; - propagatedBuildInputs = [ requests pyjwt dateutil ]; + requiredPythonModules = [ requests pyjwt dateutil ]; meta = with stdenv.lib; { description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; diff --git a/pkgs/development/python-modules/adb-homeassistant/default.nix b/pkgs/development/python-modules/adb-homeassistant/default.nix index ff49aec1fbbc3..b923fd64e8192 100644 --- a/pkgs/development/python-modules/adb-homeassistant/default.nix +++ b/pkgs/development/python-modules/adb-homeassistant/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { }; - propagatedBuildInputs = [ + requiredPythonModules = [ libusb1 rsa pycryptodome diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index 9b2de53201bac..f7b4cd95d2125 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1ay598avmg656cxnc9phdx43z1plsrfjf9png9jwjwyhyjjiqxil"; }; - propagatedBuildInputs = [ aiofiles cryptography libusb1 pyasn1 rsa ]; + requiredPythonModules = [ aiofiles cryptography libusb1 pyasn1 rsa ]; checkInputs = [ mock pycryptodome ]; checkPhase = '' diff --git a/pkgs/development/python-modules/addic7ed-cli/default.nix b/pkgs/development/python-modules/addic7ed-cli/default.nix index bdf6aab3dbfc5..41320fca30067 100644 --- a/pkgs/development/python-modules/addic7ed-cli/default.nix +++ b/pkgs/development/python-modules/addic7ed-cli/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "182cpwxpdybsgl1nps850ysvvjbqlnx149kri4hxhgm58nqq0qf5"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ requests pyquery ]; diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix index b3cbfd212ba64..9b92488a6137c 100644 --- a/pkgs/development/python-modules/adguardhome/default.nix +++ b/pkgs/development/python-modules/adguardhome/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0lcf3yg27amrnqvgn5nw4jn2j0vj4yfmyl5p5yncmn7dh6bdbsp8"; }; - propagatedBuildInputs = [ aiohttp yarl ]; + requiredPythonModules = [ aiohttp yarl ]; checkInputs = [ aresponses pytest-asyncio pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index f1e3bf0cd56c1..f39b77d6e593b 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ booleanoperations fonttools lxml # fonttools[lxml], defcon[lxml] extra diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index 09556ea891b32..62540d9a7da28 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "agate-dbf"; version = "0.2.2"; - propagatedBuildInputs = [ agate dbf dbfread ]; + requiredPythonModules = [ agate dbf dbfread ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index af98bbded8c4d..38166e5329640 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "8f255ef2c87c436b7132049e1dd86c8e08bf82d8c773aea86f3069b461a17d52"; }; - propagatedBuildInputs = [ agate openpyxl xlrd ]; + requiredPythonModules = [ agate openpyxl xlrd ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 08516d05f002d..2b53dcfbf4f30 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; }; - propagatedBuildInputs = [ agate sqlalchemy crate ]; + requiredPythonModules = [ agate sqlalchemy crate ]; meta = with stdenv.lib; { description = "Adds SQL read/write support to agate."; diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index a2b622dd21166..851504721b29a 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "077zj8xad8hsa3nqywvf7ircirmx3krxdipl8wr3dynv3l3khcpl"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six pytimeparse parsedatetime Babel isodate python-slugify leather ]; diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index 5be5b6a1dd08b..fd353d979c4c8 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "1gpfsrc2vi6w33c9zsycd2qn589pr7a222rb41r85m915283zy48"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pamqp ]; diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index 728f2b5fa61ad..71ff986668e40 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pytest-asyncio ]; - propagatedBuildInputs = [ + requiredPythonModules = [ sqlalchemy ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 694f92577cbb4..b75a2f667b257 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d"; }; - propagatedBuildInputs = with stdenv.lib; [ pycares ] + requiredPythonModules = with stdenv.lib; [ pycares ] ++ optional (pythonOlder "3.7") typing ++ optional (isPy27 || isPyPy) trollius; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 6a128eb5239b1..6f52750b8beaa 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1lbjxqdx63fc7qxx7xwq4b9dafmdafj7p1ggs48hyhbqfwkrv9p7"; }; - propagatedBuildInputs = [ attrs protobuf zeroconf ]; + requiredPythonModules = [ attrs protobuf zeroconf ]; # no tests implemented doCheck = false; diff --git a/pkgs/development/python-modules/aioeventlet/default.nix b/pkgs/development/python-modules/aioeventlet/default.nix index 0582a59eae877..0b1305451bfa0 100644 --- a/pkgs/development/python-modules/aioeventlet/default.nix +++ b/pkgs/development/python-modules/aioeventlet/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "cecb51ea220209e33b53cfb95124d90e4fcbee3ff8ba8a179a57120b8624b16a"; }; - propagatedBuildInputs = [ eventlet trollius ]; + requiredPythonModules = [ eventlet trollius ]; buildInputs = [ mock ]; # 2 tests error out diff --git a/pkgs/development/python-modules/aioh2/default.nix b/pkgs/development/python-modules/aioh2/default.nix index 6af4c4230b0e2..e6092a47fab80 100644 --- a/pkgs/development/python-modules/aioh2/default.nix +++ b/pkgs/development/python-modules/aioh2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "03i24wzpw0mrnrpck3w6qy83iigwl7n99sdrndqzxfyrc69b99wd"; }; - propagatedBuildInputs = [ h2 priority ]; + requiredPythonModules = [ h2 priority ]; doCheck = false; # https://github.com/decentfox/aioh2/issues/17 diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix index 0b6c68de8b4ca..2460e328ffbfa 100644 --- a/pkgs/development/python-modules/aioharmony/default.nix +++ b/pkgs/development/python-modules/aioharmony/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aioharmony.harmonyapi" "aioharmony.harmonyclient" ]; - propagatedBuildInputs = [ slixmpp async-timeout aiohttp ]; + requiredPythonModules = [ slixmpp async-timeout aiohttp ]; meta = with lib; { homepage = "https://github.com/ehendrix23/aioharmony"; diff --git a/pkgs/development/python-modules/aiohttp-cors/default.nix b/pkgs/development/python-modules/aiohttp-cors/default.nix index 00198cd27cffa..fd8acf487a291 100644 --- a/pkgs/development/python-modules/aiohttp-cors/default.nix +++ b/pkgs/development/python-modules/aiohttp-cors/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; - propagatedBuildInputs = [ aiohttp ] + requiredPythonModules = [ aiohttp ] ++ lib.optional (pythonOlder "3.5") typing; # Requires network access diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 84195d5545e0d..d3e28d896695e 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "2dfe29cfd278d07cd0a851afb98471bc8ce2a830968443e40d67636f3c035d79"; }; - propagatedBuildInputs = [ aiohttp jinja2 ]; + requiredPythonModules = [ aiohttp jinja2 ]; checkInputs = [ pytest pytest-aiohttp ]; diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 861dbb9bf0712..8d8866d6591fb 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ aiohttp ]; + requiredPythonModules = [ aiohttp ]; checkInputs = [ pytest pytestcov pytest-aiohttp ]; checkPhase = '' diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 7b0bfe80684a1..cb8b3ca3e1886 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1mn2ng66951mri49f99zh3660j83kvqhr6dpx90s9fkjwk83hmjy"; }; - propagatedBuildInputs = [ aiohttp attrs ]; + requiredPythonModules = [ aiohttp attrs ]; # Checks needs internet access doCheck = false; diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/pkgs/development/python-modules/aiohttp-swagger/default.nix index 36b1c23534595..1fd85d51d5c82 100644 --- a/pkgs/development/python-modules/aiohttp-swagger/default.nix +++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "1vpfk5b3f7s9qzr2q48g776f39xzqppjwm57scfzqqmbldkk5nv7"; }; - propagatedBuildInputs = [ aiohttp jinja2 pyyaml ]; + requiredPythonModules = [ aiohttp jinja2 pyyaml ]; checkInputs = [ flake8 pytestCheckHook pytest-aiohttp ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 90a7b41f7c10f..214da24c65827 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pytest-mock pytestcov trustme brotlipy freezegun ]; - propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] + requiredPythonModules = [ attrs chardet multidict async-timeout yarl ] ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ]; disabledTests = [ diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index b495bf4df4637..33d91d7510d40 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "35696d04d6eb0328b7031ea3c0a3cfe5d83dfcf62f920522e4767d165c6bc529"; }; - propagatedBuildInputs = [ aiohttp ]; + requiredPythonModules = [ aiohttp ]; meta = with lib; { description = "asyncio package to talk to Philips Hue"; diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 68c34df1afba8..47471bf52e4e6 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pygments ]; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index c6cfe99297b0f..cc1bf2b71f880 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { zlib ]; - propagatedBuildInputs = [ + requiredPythonModules = [ kafka-python ]; diff --git a/pkgs/development/python-modules/aiolifx-effects/default.nix b/pkgs/development/python-modules/aiolifx-effects/default.nix index 0a06144c65c3c..ec70f9033c054 100644 --- a/pkgs/development/python-modules/aiolifx-effects/default.nix +++ b/pkgs/development/python-modules/aiolifx-effects/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ aiolifx ]; + requiredPythonModules = [ aiolifx ]; meta = with lib; { homepage = "https://github.com/amelchio/aiolifx_effects"; diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 7b33b1c508f8d..770f9b8e685f4 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ bitstring ifaddr ]; + requiredPythonModules = [ bitstring ifaddr ]; meta = with lib; { homepage = "https://github.com/frawau/aiolifx"; diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix index acaeb0ba783e8..35039b848848c 100644 --- a/pkgs/development/python-modules/aiomysql/default.nix +++ b/pkgs/development/python-modules/aiomysql/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1mxih81zc2k64briirpp5wz4f72l8v05avfyfibaq9fr6lcbih9b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pymysql ]; diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index a199878fc216c..ac12048a7aa1b 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ async-timeout ] ++ stdenv.lib.optional (!isPyPy) hiredis; diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 7b12cefc8c78a..2ee250a6eba6e 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pbr ]; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index 5b270319661a2..c775f1cdb27b2 100644 --- a/pkgs/development/python-modules/aiorpcx/default.nix +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0jpvrkan6w8bpq017m8si7r9hb1pyw3ip4vr1fl2pmi8ngzc1jdy"; }; - propagatedBuildInputs = [ attrs ]; + requiredPythonModules = [ attrs ]; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index a0a3d74e5780e..56c8d7b5011c7 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "00mq5ylhhdfdqrh7zdqabf3wy85jrkqvgfb1421ll46fsjim2d14"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pygments ]; diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index 7bdddb42d4e3c..4c9f17825d5cc 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "14c30dm6jzxiblnsah53fdv68vqhxwvb9x0aq9bc4vcdas747vr7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ atpublic ]; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 3b05d2c3811ee..321e7dd97007b 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0628058b644776132f2f893f1a2201a0142a38b6acf089c6b11a63ad5a752ba7"; }; - propagatedBuildInputs = [ aiohttp ]; + requiredPythonModules = [ aiohttp ]; # upstream has no tests doCheck = false; diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/pkgs/development/python-modules/aiozeroconf/default.nix index b89ba73b0d645..91b4d290c3f4c 100644 --- a/pkgs/development/python-modules/aiozeroconf/default.nix +++ b/pkgs/development/python-modules/aiozeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "074plydm7sd113p3k0siihwwz62d3r42q3g83vqaffp569msknqh"; }; - propagatedBuildInputs = [ netifaces ]; + requiredPythonModules = [ netifaces ]; meta = with stdenv.lib; { description = "A pure python implementation of multicast DNS service discovery"; diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index d54741b63ea2c..7642044d540c7 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"; }; - propagatedBuildInputs = [ pygments ]; + requiredPythonModules = [ pygments ]; # No tests included doCheck = false; diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix index ef8b74bb9d71a..17a1e9108d9da 100644 --- a/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0plr2h1qn4ryawbaxf29cfna4wailghhaqy1jcm9kxq6q7b9xqqy"; }; - propagatedBuildInputs = [ pyserial pyftdi pyusb pyopenssl ]; + requiredPythonModules = [ pyserial pyftdi pyusb pyopenssl ]; doCheck = !isPy3k; checkInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 4061dca8aa28a..43b74f2528946 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest pytestcov mock coverage ]; - propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil setuptools ]; + requiredPythonModules = [ Mako sqlalchemy python-editor dateutil setuptools ]; # no traditional test suite doCheck = false; diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index dd3e4ab1b1164..911267ea129db 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "894d240c51428225264867a80094b9743d71272635a18ddfefa5832b61fed2c6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ bcrypt blinker flask diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index 579f0178729b3..2488192a43a69 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "49e0862c756d644e9349f5040dd59d135cd871ffeaea5fc288eb3a2e818cf61a"; }; - propagatedBuildInputs = [ six click requests requests-hawk pytz tabulate ]; + requiredPythonModules = [ six click requests requests-hawk pytz tabulate ]; doCheck = false; diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix index 9e1aac84f307b..30acb5409e261 100644 --- a/pkgs/development/python-modules/allpairspy/default.nix +++ b/pkgs/development/python-modules/allpairspy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "9358484c91abe74ba18daf9d6d6904c5be7cc8818397d05248c9d336023c28b1"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index c3b624a7bceda..5362e78558dc2 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = lib.optional withManpage sphinx; - propagatedBuildInputs = [ + requiredPythonModules = [ notmuch urwid urwidtrees diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index f5076953bf200..e28498b7cfbb8 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "0c99q5dy6f275yg1f137ird08wmwc1z8wmvjickkf2mvyka31p9y"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ entrypoints jsonschema numpy diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix index 47a62cd2afce1..8827c1b783be8 100644 --- a/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "'argparse'," "" ''; - propagatedBuildInputs = [ mock boto ]; + requiredPythonModules = [ mock boto ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix index 1962d004f41bd..bda1db0b8a728 100644 --- a/pkgs/development/python-modules/amply/default.nix +++ b/pkgs/development/python-modules/amply/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ docutils pyparsing ]; diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index 5fa41412a7ca4..60438ff08e14f 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21"; }; - propagatedBuildInputs = [ vine ]; + requiredPythonModules = [ vine ]; checkInputs = [ pytestCheckHook case ]; disabledTests = [ diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index ec19f4730a55b..2f1acd8310c53 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { sha256 = "0zc8m1xnkmhz2v12ddn47q0c01p3sbna2v5npfxhcp88szswlr9y"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ future networkx pygments diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 91140dc0bf1a8..071b63cd6e7de 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1iqw40szwgzvhv3fbnx2wwfnw0d3clcwk9vsq1xsn30fjil2vl7b"; }; - propagatedBuildInputs = [ adb-shell pure-python-adb ] + requiredPythonModules = [ adb-shell pure-python-adb ] ++ lib.optionals (isPy3k) [ aiofiles ]; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index e5222b64e9bc1..380c45f9b080e 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { license = licenses.bsd3; }; - propagatedBuildInputs = [ dateutil ]; + requiredPythonModules = [ dateutil ]; checkInputs = stdenv.lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index bddae5155d7b8..13162af7787a1 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "13ny7h41430pi9393dw3qgwxvzcxacapjsw0d3vjm7lc4h566alq"; }; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; checkInputs = [ nose ] ++ lib.optional (!isPy3k) mock; checkPhase = "nosetests -v"; diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix index de9048bde343f..e4d0b0a407192 100644 --- a/pkgs/development/python-modules/anonip/default.nix +++ b/pkgs/development/python-modules/anonip/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0y5xqivcinp6pwx4whc8ca1n2wxrvff7a2lpbz2dhivilfanmljs"; }; - propagatedBuildInputs = lib.optionals isPy27 [ ipaddress ]; + requiredPythonModules = lib.optionals isPy27 [ ipaddress ]; checkPhase = "python tests.py"; diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index eda67e260454a..ced4fc3bd664a 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1a9vihsvd03hb0a4dbiklyy686adp9q2ipl79mkxmdr6gfp8bbln"; }; - propagatedBuildInputs = [ six setuptools ]; + requiredPythonModules = [ six setuptools ]; checkInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/ansible-kernel/default.nix b/pkgs/development/python-modules/ansible-kernel/default.nix index 670b6330eaa5f..f036a69970091 100644 --- a/pkgs/development/python-modules/ansible-kernel/default.nix +++ b/pkgs/development/python-modules/ansible-kernel/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { sha256 = "a59039a1724c0f4f4435316e2ad3383f2328ae61f190e74414a66cc8c4637636"; }; - propagatedBuildInputs = [ ipywidgets six docopt tqdm jupyter psutil pyyaml ansible-runner ansible ]; + requiredPythonModules = [ ipywidgets six docopt tqdm jupyter psutil pyyaml ansible-runner ansible ]; postPatch = '' # remove when merged diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 2c324bc42710e..1ba3ca3c922dc 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { format = "pyproject"; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pyyaml ansible ruamel_yaml rich ]; + requiredPythonModules = [ pyyaml ansible ruamel_yaml rich ]; checkInputs = [ pytestCheckHook pytestcov pytest_xdist git ]; postPatch = '' diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 7f29bb5695c68..1ed391c961b1b 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ + requiredPythonModules = [ ansible psutil pexpect diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 245375c26be05..726bce5fdc771 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { done ''; - propagatedBuildInputs = [ + requiredPythonModules = [ pycrypto paramiko jinja2 pyyaml httplib2 six netaddr dnspython jmespath dopy ncclient ] ++ lib.optional windowsSupport pywinrm; diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix index 1af39e970bcd6..b2fe076521354 100644 --- a/pkgs/development/python-modules/ansiwrap/default.nix +++ b/pkgs/development/python-modules/ansiwrap/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pytestcov ]; - propagatedBuildInputs = [ + requiredPythonModules = [ textwrap3 ]; diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 516b8520f00e2..4b60640ec66e0 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "06nazfrm2sclp3lpgsn9wl8vmqxvx36s3gr2gnqz3zhjpf3glkxv"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ idna sniffio ] ++ lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index c11833ba57932..33e0ce14f45c8 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six ]; diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index ca2cb03f96729..0f4576a0a4ad1 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ alembic cached-property colorlog diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index a6eedb3b7a4ba..a6127e222a8be 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "239f3d83635ca4251536aeb577df7c60df77fc4d658097b92094719739aec3f3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy astropy matplotlib diff --git a/pkgs/development/python-modules/applicationinsights/default.nix b/pkgs/development/python-modules/applicationinsights/default.nix index 9f77d4352647d..7e00419a73473 100644 --- a/pkgs/development/python-modules/applicationinsights/default.nix +++ b/pkgs/development/python-modules/applicationinsights/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1hyjdv6xnswgqvip8y164piwfach9hjkbp7vc2qzhd7amjpim89h"; }; - propagatedBuildInputs = [ portalocker ]; + requiredPythonModules = [ portalocker ]; meta = with lib; { description = "This project extends the Application Insights API surface to support Python"; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 5c260692887ad..8ab3f2317fe9f 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = [ Babel ]; - propagatedBuildInputs = [ + requiredPythonModules = [ requests requests_oauthlib six click markdown pyyaml ]; diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index a7b0b51d8f1ce..42df05073c71e 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1k1bj8q1qm89a8xm4az6qk4qswwmgxw5jpdjcxmf93zh5hrcy9h9"; }; - propagatedBuildInputs = [ pyperclip ]; + requiredPythonModules = [ pyperclip ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index 47144fc07aa06..f229305d857ac 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ configobj six traitsui ]; + requiredPythonModules = [ configobj six traitsui ]; checkInputs = [ nose diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index a5a78c332ab22..f9ead8a62431a 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sphinx py3to2 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ lxml isodate numpy diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix index 56093192d6c74..26543f161f803 100644 --- a/pkgs/development/python-modules/aresponses/default.nix +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -# propagatedBuildInputs +# requiredPythonModules , aiohttp # buildInputs , pytest @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "58693a6b715edfa830a20903ee1d1b2a791251923f311b3bebf113e8ff07bb35"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp ]; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 3ab390d822b51..7b101b944f858 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # re-enable if we are able to make testing work # checkInputs = [ bashInteractive coverage flake8 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ dicttoxml importlib-metadata pexpect diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index 85c6c4b638a58..dd71605db204b 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "ffaa623eea77b497ffbdd1a51e941b33d3bf552c60f14dbee274c4070677bda3"; }; - propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34; + requiredPythonModules = [ cffi six ] ++ lib.optional (!isPy3k) enum34; checkInputs = [ hypothesis pytest wheel ]; checkPhase = '' pytest tests diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index a7d8221d78ef6..eaf85afa018b6 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pytest -nauto -k "not test_api and not test_cli and not test_interface" ''; - propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket_client ]; + requiredPythonModules = [ asciimatics loguru requests setuptools websocket_client ]; meta = with stdenv.lib; { homepage = "https://github.com/pawamoy/aria2p"; diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix index 82c8fc93267f6..217f6bee52c97 100644 --- a/pkgs/development/python-modules/arrayqueues/default.nix +++ b/pkgs/development/python-modules/arrayqueues/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1gvrxb2rw0dk469wq5azylar7hhanfp07gl5mc6ajdbgz9gsd6ln"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy ]; diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 7dbe3b98fca3b..e457be5aab1f9 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4"; }; - propagatedBuildInputs = [ python-dateutil ] + requiredPythonModules = [ python-dateutil ] ++ lib.optionals isPy27 [ backports_functools_lru_cache ]; checkInputs = [ diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 4005c8668117a..b120ec69994ac 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { sha256 = "1cnj972knkvi084cfcpc12lv0wxm8xm9clfd55r3hvv42g1ms5d9"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ # needed to install matplotlib netcdf4 diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 7c08cf1acbbc5..be441c39a638d 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest responses ]; - propagatedBuildInputs = [ requests requests_oauthlib six ]; + requiredPythonModules = [ requests requests_oauthlib six ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index 09bf4e6a3da2a..4cd551690e6ec 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pyfiglet pillow wcwidth diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 474329ed0b7d2..c35080f7d123a 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { astropy ]; - propagatedBuildInputs = [ + requiredPythonModules = [ semantic-version pyyaml jsonschema diff --git a/pkgs/development/python-modules/ase/3.17.nix b/pkgs/development/python-modules/ase/3.17.nix index 40b9b405aab13..a094a7d614f69 100644 --- a/pkgs/development/python-modules/ase/3.17.nix +++ b/pkgs/development/python-modules/ase/3.17.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g"; }; - propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; + requiredPythonModules = [ numpy scipy matplotlib flask pillow psycopg2 ]; checkPhase = '' $out/bin/ase test diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index fcbeb1f1f4d98..28f858029d6e2 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "72c81f21b6adb907595fce8d883c0231301cbd8e9f6e5ce8e98bab927054daca"; }; - propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; + requiredPythonModules = [ numpy scipy matplotlib flask pillow psycopg2 ]; checkPhase = '' $out/bin/ase test diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index e838ec787c319..8160be762925e 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1hhqrb9r46y6i3d3w6hc9zm6yyikdyd2k5pcbyw0r9fl959yi4hf"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ itsdangerous python-multipart ]; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 3537736f77f6c..62fb9a3ff9265 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1sj4yy2injaskwfi5pkb542jl8s6ljijnyra81gpw0pgd3d0bgxv"; }; - propagatedBuildInputs = [ async-timeout ]; + requiredPythonModules = [ async-timeout ]; checkInputs = [ pytest pytest-asyncio ]; diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix index 6af5b3da88089..be0e0dc30274e 100644 --- a/pkgs/development/python-modules/asn1ate/default.nix +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { repo = pname; }; - propagatedBuildInputs = [ pyparsing ]; + requiredPythonModules = [ pyparsing ]; meta = with stdenv.lib; { description = "Python library for translating ASN.1 into other forms"; diff --git a/pkgs/development/python-modules/aspy.yaml/default.nix b/pkgs/development/python-modules/aspy.yaml/default.nix index 5abe60742747b..e051108ce2e51 100644 --- a/pkgs/development/python-modules/aspy.yaml/default.nix +++ b/pkgs/development/python-modules/aspy.yaml/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0i9z2jm2hjwdxdv4vw4kbs70h2ciz49rv8w73zbawb7z5qw45iz7"; }; - propagatedBuildInputs = [ pyyaml ]; + requiredPythonModules = [ pyyaml ]; # Tests not included in PyPI tarball doCheck = false; diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 6c4afec6352ec..c1e58410695fd 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "e41d9967d5c48be421346552f0f4dedad43ff39a83574f5ff2ad32b6627b6fbe"; }; - propagatedBuildInputs = [ pytz requests freezegun ]; + requiredPythonModules = [ pytz requests freezegun ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/astroid/1.6.nix b/pkgs/development/python-modules/astroid/1.6.nix index 2c763e214e87c..ff737cc998fe8 100644 --- a/pkgs/development/python-modules/astroid/1.6.nix +++ b/pkgs/development/python-modules/astroid/1.6.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; # From astroid/__pkginfo__.py - propagatedBuildInputs = [ + requiredPythonModules = [ lazy-object-proxy six wrapt diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 927e6a6d5a649..82aab41863a3e 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; # From astroid/__pkginfo__.py - propagatedBuildInputs = [ lazy-object-proxy six wrapt ] + requiredPythonModules = [ lazy-object-proxy six wrapt ] ++ lib.optional (pythonOlder "3.5") typing ++ lib.optional (!isPyPy) typed-ast; diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index 61f49322d3bb4..d785c75ca77da 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1bfdq33mj6mwk5fkc6n23f9bc9z8j7kmvql3zchz4h58jskmvqas"; }; - propagatedBuildInputs = [ numpy astropy astropy-helpers ]; + requiredPythonModules = [ numpy astropy astropy-helpers ]; # Disable automatic update of the astropy-helper module postPatch = '' diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 1affa4b50538c..3aa9b02d5f37e 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ astropy-helpers ]; - propagatedBuildInputs = [ numpy pytest ]; # yes it really has pytest in install_requires + requiredPythonModules = [ numpy pytest ]; # yes it really has pytest in install_requires checkInputs = [ pytest pytest-astropy ]; diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index e82dca3e95537..90370c1596ff8 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ]; + requiredPythonModules = [ astropy requests keyring beautifulsoup4 html5lib ]; nativeBuildInputs = [ astropy-helpers ]; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 0f090d14abada..9ef04b76799ee 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4"; }; - propagatedBuildInputs = [ setuptools_scm toml six astroid ]; + requiredPythonModules = [ setuptools_scm toml six astroid ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix index 0947b3877b5ed..e65f20b8bfb29 100644 --- a/pkgs/development/python-modules/astunparse/default.nix +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "5ad93a8456f0d084c3456d059fd9a92cce667963232cbf763eac3bc5b7940872"; }; - propagatedBuildInputs = [ six wheel ]; + requiredPythonModules = [ six wheel ]; # tests not included with pypi release doCheck = false; diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index b1ed1c45f85a4..fa87b21a54cfc 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1ysj72l4z78h427ar95x7af0jw0xq1cbca0k8b34vqyyhgs8wc6y"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp async-timeout defusedxml diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index bc540b45de47f..98563c9280be3 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ./fix-sftp-chmod-test-nixos.patch ]; - propagatedBuildInputs = [ + requiredPythonModules = [ bcrypt cryptography gssapi diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index a91c3ee8a52bb..cc3deb7dd7d5d 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { checkInputs = [ pytestrunner pytest ]; - propagatedBuildInputs = [ oauthlib requests requests_oauthlib six ]; + requiredPythonModules = [ oauthlib requests requests_oauthlib six ]; meta = with lib; { description = "Python Atlassian REST API Wrapper"; diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 60fa12d4a6612..311dabe363a97 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ cppy ]; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; # Tests not released to pypi doCheck = true; diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix index 670361b9a9efb..275dae1fa102d 100644 --- a/pkgs/development/python-modules/atomiclong/default.nix +++ b/pkgs/development/python-modules/atomiclong/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ cffi ]; + requiredPythonModules = [ cffi ]; meta = with stdenv.lib; { description = "Long data type with atomic operations using CFFI"; diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index 9e5eb34da3b1f..30240fce60ba7 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ xmltodict datamodeldict numpy matplotlib scipy pandas cython numericalunits toolz ]; + requiredPythonModules = [ xmltodict datamodeldict numpy matplotlib scipy pandas cython numericalunits toolz ]; checkPhase = '' py.test tests -k 'not test_atomic' diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 021d8e8b3077f..7aa651fb2d1af 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "ebeb62b71a5c683a84c1b16bbf415708af5a46841b142b85ac3a22ec2d7613b0"; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + requiredPythonModules = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix index 3bc221d7adc93..2b0a4dd9b7987 100644 --- a/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/pkgs/development/python-modules/atsim_potentials/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; # tests are not included with release doCheck = false; diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index 1dfbf32c995b2..43652957b8771 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "35c90698b55c683946091177177a9e9c0713a0860f0e049febd72649ccd77b70"; }; - propagatedBuildInputs = [ coverage nose six ]; + requiredPythonModules = [ coverage nose six ]; meta = with stdenv.lib; { description = "A dict with attribute-style access"; diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix index 4616e1b6ed3fe..30450b121474b 100644 --- a/pkgs/development/python-modules/aubio/default.nix +++ b/pkgs/development/python-modules/aubio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0fhxikvlr010nbh02g455d5y8bq6j5yw180cdh4gsd0hb43y3z26"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy ]; diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index 1adee4403b9bf..c585466f6413c 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ attrs bidict bitstruct diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index cf1d4544e4adc..6e13b5c46a40b 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { 'ffi.dlopen("${lib.makeLibraryPath [augeas]}/${libname}")' ''; - propagatedBuildInputs = [ cffi augeas ]; + requiredPythonModules = [ cffi augeas ]; doCheck = false; diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 2af445b48c530..25da491ed75d5 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "2e968d01364c8c94fbe85154ab77ebe9e51a3f8282405bb33748071452063004"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests ]; diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index a1d049ebb1513..3db98462d58fa 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "935726b784cc636cbcfed2c977f1a6887dc60056806da4eff60db932c5896692"; }; - propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ] + requiredPythonModules = [ authres dnspython dkimpy publicsuffix2 ] ++ lib.optional isPy27 ipaddress; meta = { diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index e3d8c99e0ea19..e96b7bb5d197f 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0jsqh2nirx3xifsakqdpd3wpdig6czavv3yj4lyqz3wh9xjpvswg"; }; - propagatedBuildInputs = [ cryptography requests ]; + requiredPythonModules = [ cryptography requests ]; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 909fb65996ba5..a6e231e572f40 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "86bbce30cdd407137c57670993a8f9bfdfe3f8e994b889181d85e844d5aa8dfb"; }; - propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ + requiredPythonModules = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ (lib.optionals (!isPy3k) [ trollius futures ]); checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index 6d56775d90c39..379cee6fec914 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1i1ylf03b7220n8znk63zg6sgdd3py9wlh1pvqvy03g1fxsi8pd1"; }; - propagatedBuildInputs = [ numpy future ]; + requiredPythonModules = [ numpy future ]; # Currently, the PyPI tarball doesn't contain the tests. When that has been # fixed, enable testing. See: https://github.com/HIPS/autograd/issues/404 diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 78a3259a28784..66166ceb583dc 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ m2r setuptools_scm ]; - propagatedBuildInputs = [ six attrs ]; + requiredPythonModules = [ six attrs ]; # Some tests require twisetd, but twisted requires Automat to build. # this creates a circular dependency. diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 1b40aa9c1408b..daf433776c6e1 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "d21d3901cb0da6ebd1e83fc9b0dfbde8b46afc2ede4fe32fbda0c7c6118ca094"; }; - propagatedBuildInputs = [ pycodestyle toml ]; + requiredPythonModules = [ pycodestyle toml ]; # One test fails: # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index d9f57686845d7..30e5d1cd7fac3 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ''); nativeBuildInputs = [ pycodestyle ]; - propagatedBuildInputs = [ isort ]; + requiredPythonModules = [ isort ]; meta = with stdenv.lib; { description = "A serialization and RPC framework"; diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix index 945c941dec4ea..b18f8c0347f5c 100644 --- a/pkgs/development/python-modules/awesome-slugify/default.nix +++ b/pkgs/development/python-modules/awesome-slugify/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ./slugify_filename_test.patch # fixes broken test by new unidecode ]; - propagatedBuildInputs = [ unidecode regex ]; + requiredPythonModules = [ unidecode regex ]; checkPhase = '' ${python.interpreter} -m unittest discover diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 65dfd46285719..157c3cb4d54c6 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; checkInputs = [ pandas pytest h5py ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix index 591035461857a..d1b0b634e04c6 100644 --- a/pkgs/development/python-modules/awkward1/default.nix +++ b/pkgs/development/python-modules/awkward1/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; buildInputs = [ rapidjson ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index ce4c6f7892633..c10ef70a642e3 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; - propagatedBuildInputs = [ botocore lxml requests requests-kerberos click configparser fido2 ]; + requiredPythonModules = [ botocore lxml requests requests-kerberos click configparser fido2 ]; meta = with lib; { description = "Command line tool to ease aws cli authentication against ADFS"; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 804ad078acb74..4e4ce865d997f 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # Package is not compatible with Python 3.5 disabled = isPy35; - propagatedBuildInputs = [ + requiredPythonModules = [ six ] ++ lib.optionals isPy27 [ pathlib ]; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 9073df2600dd4..d5c26712fdc61 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # Tests are not included in the PyPI package doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ boto3 jsonschema six diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 313dd4241d5c7..6187981120417 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "abf5b90f740e1f402e23414c9670e59cb9772e235e271fef2bce62b9100cbc77"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ jsonpickle wrapt requests future botocore ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index 5626b33462b5e..ddf09fa39d622 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "b83cd2cb63d93225de84e27abbfc059212f8de27766f4c58dd3abb839dff0be4"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-core msrest ]; diff --git a/pkgs/development/python-modules/azure-applicationinsights/default.nix b/pkgs/development/python-modules/azure-applicationinsights/default.nix index f0e70b8d86c0f..31e1ba46c7208 100644 --- a/pkgs/development/python-modules/azure-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-applicationinsights/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "6e1839169bb6ffd2d2c21ee3f4afbdd068ea428ad47cf884ea3167ecf7fd0859"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common msrest ]; diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix index 05021c73edb01..de1eadda9c623 100644 --- a/pkgs/development/python-modules/azure-batch/default.nix +++ b/pkgs/development/python-modules/azure-batch/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "112d73gxjqng348mcvi36ska6pxyg8qc3qswvhf5x4a0lr86zjj7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index abf27b5d7ef23..39e31011ccf1a 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "ce0f1013e6d0e9faebaf3188cc069f4892fc60a6ec552e3f817c1a2f92835054"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-nspkg ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 16fc468d044e1..17ded83ef95c8 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "621b53271f7988b766f8a7d7f7a2c44241e3d2c1d8db13e68089d6da6241748e"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests six ]; diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index 4fa05ada85041..961ca1f3d58a4 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "7f8ac99e4e40c398089fc383bfadcdc83376f72b88532b0cac0b420357cd08c7"; }; - propagatedBuildInputs = [ six requests ]; + requiredPythonModules = [ six requests ]; pythonNamespaces = [ "azure" ]; diff --git a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix index 7a7c0e7215d56..23558d69ab90e 100644 --- a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "acf691e692818d9a65c653c7a3485eb8e35c0bdc496bba652e5ea3905ba09cd8"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-nspkg ]; diff --git a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix index c11ffae1e3dde..6471d8c7283b2 100644 --- a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix +++ b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "5f061d2ab8dcf2f0b4e965d5976e7b7aeb1247ea896911f0e1d29092aaaa29c7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cryptography azure-common azure-storage-common diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix index d7164affd9b88..ef3fb7b0498e5 100644 --- a/pkgs/development/python-modules/azure-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "b871ebb3bcfd292e8a062dbbaacbc132793d98f1b60f549a8c3b672619603fc1"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests adal azure-common diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 19a0210cc5eb0..a13bca707d4ce 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "c82c4bf6ea59aeec69ce8f95f1b6a4edc6d733874aeb056669c9d2806168c86e"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-functions-devops-build/default.nix b/pkgs/development/python-modules/azure-functions-devops-build/default.nix index 03007ae3c2364..32a4540c74e7b 100644 --- a/pkgs/development/python-modules/azure-functions-devops-build/default.nix +++ b/pkgs/development/python-modules/azure-functions-devops-build/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1slc7jd92v9q1qg1yacnrpi2a7hi7iw61wzbzfd6wx9q63pw9yqi"; }; - propagatedBuildInputs = [ jinja2 msrest vsts ]; + requiredPythonModules = [ jinja2 msrest vsts ]; # circular dependency with azure-cli-core doCheck = false; diff --git a/pkgs/development/python-modules/azure-graphrbac/default.nix b/pkgs/development/python-modules/azure-graphrbac/default.nix index 57fec6ff5251f..d7674c8622118 100644 --- a/pkgs/development/python-modules/azure-graphrbac/default.nix +++ b/pkgs/development/python-modules/azure-graphrbac/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1qmjhpqw0sgy406ij5xyzkffisjah9m1pfz9x54v66bwrbi8msak"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index 4cea19742b9c9..58dd7b94a68b5 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "7b071089faf0789059ac24052e311e2b096a002c173d42b96896db09c6e2ba5d"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-core azure-nspkg diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix index e72dc036989b8..8fb3237a73b01 100644 --- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1kmf2x3jdmfm9c7ldvajzckkm79gxxvl1l2968lizjwiyjbbsih5"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-core msrest diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 56ccb8b5fb0d6..51317c4a57a84 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "ea651883ad00d0a9a25b38e51feff7111f6c7099c6fb2597598da5bb21d3451c"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-core msrest diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 46bd196a3d85b..50078ea1c6fb4 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "064a98791fe447a0e57850bb5ec1ec43e7d5fd39266319b5acc44a9704a3b966"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-core msrest diff --git a/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix b/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix index fd3f3c0284f97..e4edfcc9af047 100644 --- a/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0hdnd6124hx7s16z1pssmq5m5mqqqz8s38ixl9aayv4wmf5bhs5c"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-nspkg ]; diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index 704d2951cc973..13e2aef6cd1b0 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1083ab900da5ec63c518ffef49d9fdca02c81ddffdf80c52c03cd9da479e021f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-core msrest diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index f5b83df266403..08290c93abb77 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "69002a546921a8290eb54d9a3805cfc515c321bc1d4c0bfcfb463620245eca40"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-keyvault-certificates azure-keyvault-keys azure-keyvault-secrets diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/pkgs/development/python-modules/azure-loganalytics/default.nix index beca4018baba2..731227c588ab6 100644 --- a/pkgs/development/python-modules/azure-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-loganalytics/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "3ceb350def677a351f34b0a0d1637df6be0c6fe87ff32a5270b17f540f6da06e"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest azure-common ]; diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix index f801d2a059322..aa03765c2765b 100644 --- a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1ecea7a9dc48c099c06aab68aace7fdbded91a5522932882b1707c29fa055054"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 759467aa90244..3fcf59fd6267c 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 9fea2cf87d063..bf43d146d0d3c 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-mgmt-core msrest diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 0208d082284df..9bb4cdf034a6c 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "3c788a54db4fbca1a8850151462ec1471ff59c86b3a10d6082952bbdaa7e6651"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index 3a9d2e5de2e84..ce2a24edb49af 100644 --- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "f5cceea3add04e9445ea88492f15eecf6c126f0406d967c95f6e48b79be8db75"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 5a1b7600ecfc6..90d779d462c8a 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "03417eecfa1fac906e674cb1cb43ed7da27a96277277b091d7c389ba39f6c3fe"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix index 8186f87fd727f..ff6c1e61780c7 100644 --- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "f1870b0f97d5001cdb66208e5a236c9717a0ed18b34dbfdb238a828f3ca2a683"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrestazure azure-common azure-mgmt-nspkg diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix index 9aeaf50ce4ede..107d61c93c55e 100644 --- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrestazure azure-common azure-mgmt-nspkg diff --git a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix index d9375942b4d35..ca9efa3936376 100644 --- a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index d6aa79c6915dd..688c163b40d50 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "5af79f80e6c5f4766bcb5b8c62273445fb2beaeae85c5b9d2ab9aa369d60ede3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index f6ee7fce52166..5edd6ec4cc7c8 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1d029d5140152a36cc32f340e09f2b185ede2f54e577a44f3821878efb823415"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrestazure azure-common azure-mgmt-nspkg diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix index 43829dcb59e36..8d37a8b1d6a31 100644 --- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1hw4crkgb72ps85m2kz9kf8p2wg9qmaagk3z5nydva9g6bnq93n4"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrestazure azure-common azure-mgmt-nspkg diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix index da8dc95dad00c..3b79185ed2bf0 100644 --- a/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "c63812c13d9f36615c07f874bc602b733bb516f1ed62ab73189b8f71c6bfbfe6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-mgmt-nspkg requests diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 9acf4ddadc404..1325b002f7678 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "c7350b404e5d10a548ceddb034394c8fad6c852ce33a3d3b211065813c1da404"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-mgmt-common azure-mgmt-core ]; diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index 7e5771645115f..743ed4cefd1b3 100644 --- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0nqgywknpj2a69an5yrn0c32fk01v5gi05za7dlf4ivwr9s4np83"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrestazure azure-common azure-mgmt-nspkg diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 2dfff00dfa615..6888bf6bc9568 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "5ad247d186c3c040da7a1d40ad39c9881e99afc58271f673abb602abb0b6b85b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index 821c7db0d324d..27c6d62947d55 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 9bc7207e1e2a3..54a6ffffbb4bd 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "9b44b2d0b281fc1999324a715fb5cf4f47d392a35bc0a01f24bb8dbc4c123acd"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index e7e8c91accab4..3c77423b00b0b 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "a3906fa77edfedfcc3229dc3b69489d5ed63b107c7eacbc50092e6cbfbfd83f0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-core ]; diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 38b580df25229..c8077bc9707e5 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "e08b37aea8e6b62596f55f9beb924e1759b2dc424c180ab2e752153a2b01b723"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 2601f829d9086..e802493e320f8 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "47bb23fa6cc28f3f15dd7a404b7f9d7af469adf78f79a11eb01ff75ca10a75ba"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix index 1e4cdd88c9578..ebd3b0232bdf4 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0d64c4689a67d6138eb9ffbaff2eda2bace7d30b846401673183dcb42714de8f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrestazure azure-common azure-mgmt-datalake-nspkg diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix index ce4f623657eb8..14966211fc87a 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "deb192ba422f8b3ec272ce4e88736796f216f28ea5b03f28331d784b7a3f4880"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix index 4f985e37e6fa2..b1445d95ef60f 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "9376d35495661d19f8acc5604f67b0bc59493b1835bbc480f9a1952f90017a4c"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrestazure azure-common azure-mgmt-datalake-nspkg diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index 1162b0405a710..1013e766cded7 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix index f6be961060e6b..613fa321aba60 100644 --- a/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix index 08cdcd721827c..d9bcb76bb9607 100644 --- a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0dvjsr9i87j1ggbj3dcmgifpk64xr5f5ziwf7z1fwkcx0szcid7k"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrestazure azure-common azure-mgmt-nspkg diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix index 78f149e2f7da1..6af425d0bacdf 100644 --- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index ce467dba31dac..368f0b0c004fd 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0zxkcczf01b64qfwj98jqdvnwqahygcyccf37rcxpdcfgpkg9kbf"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix index f5ddbf0fcc7ce..d950003850641 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1hqwcl33r98lriz3fp6h8ir36bv9danx27290idv63fj7s95h866"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index 3aa02dd8831eb..3e72495ecca0f 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "ae02b1e3ccbb9ec45849de544dea4d8ef36ea767707207d055ae2b4f756c0d79"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index fd0c527344c03..d98b97d04f251 100644 --- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "7f8b912ca62431c1697b4914c12cc5f8123e60ee6c65d123591f937744d204e0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 08b9e73e66d24..78aae22ff45f3 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index 404caf4ebf5b7..dcf270fc3bb7a 100644 --- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix index 963d794d55056..869d1c4517e43 100644 --- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "c175f6642be514ad0efd3dc03d09e50d923596fd9e634381793dcc46bb8a57c7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index 1e13919f340a2..0c3a45ad4c0a2 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "da20ee2b9b9a2c2f89be9037c3ee5421152e7f6d718eafbf50a91dbf0a07ffa0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index c668e5ed4d66c..bccebec0a255f 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "8c37acfd1c33aba845f2e0302ef7266cad31cba503cc990a48684659acb7b91d"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 6ad96d60bc9c8..c0f2b41bd5a8c 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix index 9f5c04adb265a..4dc68aeb3e98d 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index 93c78c401f0c9..6e11b35fcb016 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 95c1831f720e6..9c89a778d85d5 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "7eb052a1c4bb037c06a0aff740378bd54a6ae256bf5cb71faa14b4eb61281488"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/pkgs/development/python-modules/azure-mgmt-logic/default.nix index 345f11f86269f..83460fe7a0bab 100644 --- a/pkgs/development/python-modules/azure-mgmt-logic/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-logic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "d163dfc32e3cfa84f3f8131a75d9e94f5c4595907332cc001e45bf7e4efd5add"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix index 47e91ecf49f35..d333188276704 100644 --- a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "7a52f85591114ef33a599dabbef840d872b7f599b7823e596af9490ec51b873f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix index 4d059480c442d..0a41ef3083922 100644 --- a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix index 080647bae96b7..e260d456d2370 100644 --- a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "3d5237947458dc94b4a392141174b1c1258d26611241ee104e9006d1d798f682"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix index c546a7eeba388..1128cc221cbe0 100644 --- a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1bvcmx7dkf2adi26z7c2ga63ggpzdfqj8q1gzcic1yn03v6nb8i7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrestazure azure-common azure-mgmt-nspkg diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix index db87b81c83807..21807e4104a30 100644 --- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "c120e210bb61768da29de24d28b82f8d42ae24e52396eb6569b499709e22f006"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix index db30d30d75545..b43c4efec2f2a 100644 --- a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "dc765cde7ec03efe456438c85c6207c2f77775a8ce8a7adb19b0df5c5dc513c2"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index 75d1159857e59..a0d51fe2b6302 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "8944775725c5253614d257576d841ee68afa34f570b05c0924a7f73f1db28a24"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 3b85c9e9e8344..4ccef832d76c4 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "04bd89d74fe47f966b09e3256ffefcfa5c1a51057a6b33c092afe5ae17a1a7b7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 2b1b65d60aec0..026f255f25f8a 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0n4gbwk843z66hhpcp1kcrnwqkzygbbc2ma01r9asgfv4nmklvyl"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index ad74d2cf77c57..fed39d1b0e1ea 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index b08a729d5f467..db6414f9a1902 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "6159a8c44590cc58841690c27c7d4acb0cd9ad0a1e5178c1d35e0f48e3c3c0e9"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-mgmt-core msrest diff --git a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix index a8ebba5764853..af3912305e3fd 100644 --- a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "10w53ida2nlx73vd1pczh4mkpg0lag1h19yyklx3yvgsyvahj25h"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix index fd2664b0ec0e4..994b229f121da 100644 --- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "8b2287f671529505b296005e6de9150b074344c2c7d1c805b3f053d081d58c52"; }; - propagatedBuildInputs = [ azure-nspkg ]; + requiredPythonModules = [ azure-nspkg ]; doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix index ad8a2a0fbe238..eb5d0733ac62f 100644 --- a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "ed229e3845c477e88dde413825d4fba0d38b3a5ffab4e694c7d0da995f3db0f3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix index 537e576b2b5a4..3fdf179449a2c 100644 --- a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "2f05be73f2a086c579a78fc900e3b2ae14ccde5bcec54e29dfc73e626b377476"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix index 98855730ba34a..3eeb9a59ee877 100644 --- a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 7bee1f5856a78..b2e8ad74ae312 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1iz1pf28ajrzbq8nab1jbjbgfbv0g6ni036xayy6xylvga4l8czr"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 224f7971b3529..abd122907d62d 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "3c90e6b2e358dbe6d5c6d7204955bdf52c3e977c6f8b727cbbb8811427d7fd52"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 75781dab8ed3b..8bd352b0ca956 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "a0ee89691b21945cc4b892a9194320f50c1cd242d98f00a82d7e3848c28517a5"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix index 323aa26472ca5..cff1c60d759de 100644 --- a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix index 9274bd53cf690..2b36a5ce5a34b 100644 --- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "db999e104edeee3a13a8ceb1881e15196fe03a02635e0e20855eb52c1e2ecca1"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index d3bf3f31fc202..a9da747ab017d 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0s5z4cil750wn770m0hdzcrpshj4bj1bglkkvxdx9l9054dk9s57"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrestazure azure-common azure-mgmt-nspkg diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index d5e4226b5cccf..52c93805e767a 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "b12318392e6f5100246c60de88879e24b15db104d00f9704a4ff51e7344594f1"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 5467537f08b8f..398a199aa5a24 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "80ecb69aa21152b924edf481e4b26c641f11aa264120bc322a14284811df9c14"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-mgmt-common azure-mgmt-core ]; diff --git a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix index 366e8df9a7510..b68d993abafe9 100644 --- a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "c6e6edd386ddc4c21d54b1497c3397b970bc127b71809b51bd2391cb1f3d1a14"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix index 6f0fd6f3b3681..408de718db632 100644 --- a/pkgs/development/python-modules/azure-mgmt-search/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "d4c78b14b48edd2e27e2068c9a448acfc84a18595be77fe483afe7bb447e1eb6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index 5c437e472dd85..352dc0ccd2993 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix index e192a8f9d3e34..cfe3a9b78f270 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "bb37d97eb3798740a0bc1bfa37b04946a193a6d1a3b0849fdc5e1dc2a9f25d81"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix index 60ffeae2b518b..41ac774793688 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "5771f24516c8d4a27f5569f23f3a606f6f106e4ad502eec7f38aedfcd3eadc74"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix index 8192064626ea6..7c4a88f2c705e 100644 --- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "6503ddda9d6f4b634dfeb8eb4bcd14ede5e0900585f6c83bf9010cf82215c126"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 36432ccbc84f3..5c7d72e857d26 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "acf7d4c83fb43152a809e3894528e561e601be543250c2824cc615cc88a70855"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix b/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix index a34ebae2b812f..113860765d279 100644 --- a/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + requiredPythonModules = [ azure-common msrest msrestazure ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 71302be53d799..211600157b52d 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "2f9d714d9722b1ef4bac6563676612e6e795c4e90f6f3cd323616fdadb0a99e5"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-mgmt-common azure-mgmt-core ]; diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix index ee66162722255..8523267818906 100644 --- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "37f570b8872ae65dce312da116588ab8407a5c8a10d959597e61d19b21799f77"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index 13369eb014b15..f173065699307 100644 --- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common msrest msrestazure diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix index 946be6f34cade..3765b37d0ea37 100644 --- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "fc8ae77022cfe52fda4379a2f31e0b857574d536e41291a7b569b5c0f4104186"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index a99dd764c1a64..7089ac7f05499 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "da0f9e3b57528c72a7bc92e3515413a4a4fdbc9626c26ac04b7551a7739a81ec"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msrest msrestazure azure-common diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 18e4a12d3b365..b317b4cf2137c 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-core msrest diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix index f34d3d62ba3bf..c45d201596d42 100644 --- a/pkgs/development/python-modules/azure-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "c15fd5e8fe33a12295435f16e007edcfd8f660547795742f9b74ef8fb3a431ba"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common msrest ]; diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix index 13d577362a366..ca2c182615356 100644 --- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix +++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1kcibw17qm8c02y28xabm3k1zrawi6g4q8kzc751l5l3vagqnf2x"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common requests ]; diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 20d0248cc4168..f66d4cf31963c 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1469a5a0410296fb5ff96c326618d939c9cb0c0ea45eb931c89c98fa742d8daa"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-core azure-storage-common diff --git a/pkgs/development/python-modules/azure-storage-common/default.nix b/pkgs/development/python-modules/azure-storage-common/default.nix index 50fb3450d84f4..95b7a95fb5d1f 100644 --- a/pkgs/development/python-modules/azure-storage-common/default.nix +++ b/pkgs/development/python-modules/azure-storage-common/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "ccedef5c67227bc4d6670ffd37cec18fb529a1b7c3a5e53e4096eb0cf23dc73f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common cryptography python-dateutil diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index b8a642f665cd3..8a76455b3410c 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "b649ed8afd67c10c9833f349a7c579d771a6425ad6b88027130a6b8cfa433ffb"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-core cryptography msrest diff --git a/pkgs/development/python-modules/azure-storage-file/default.nix b/pkgs/development/python-modules/azure-storage-file/default.nix index 088b5260e65b5..2e368dd6cbf68 100644 --- a/pkgs/development/python-modules/azure-storage-file/default.nix +++ b/pkgs/development/python-modules/azure-storage-file/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "3559b9c7ab13450c66ea833eb82c28233bee24f1bd8ca19aa7d27f8c23d5bc53"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-storage-common ] ++ lib.optional (!isPy3k) futures; diff --git a/pkgs/development/python-modules/azure-storage-nspkg/default.nix b/pkgs/development/python-modules/azure-storage-nspkg/default.nix index b8e243c9b6aa2..a1a58bd6a23a7 100644 --- a/pkgs/development/python-modules/azure-storage-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-storage-nspkg/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "6f3bbe8652d5f542767d8433e7f96b8df7f518774055ac7c92ed7ca85f653811"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-nspkg ]; diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 515b3f398dfd0..9abe3b5184478 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "14e82d3691f1bbd23f2aff143a6c17af3c297164f6e597d223b65a67051ba278"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-storage-common ]; diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix index e2037bb7d21fc..77abaddfd4f22 100644 --- a/pkgs/development/python-modules/azure-storage/default.nix +++ b/pkgs/development/python-modules/azure-storage/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; }; - propagatedBuildInputs = [ azure-common dateutil requests ] + requiredPythonModules = [ azure-common dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; postPatch = '' diff --git a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix index a46202b6f1803..d19168d8d211b 100644 --- a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix +++ b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-core msrest diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 85ec70f704c7f..10dd0250c0d08 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-core msrest diff --git a/pkgs/development/python-modules/azure-synapse-spark/default.nix b/pkgs/development/python-modules/azure-synapse-spark/default.nix index fb724e6dbfbcb..494f94348647b 100644 --- a/pkgs/development/python-modules/azure-synapse-spark/default.nix +++ b/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-common azure-core msrest diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 7dfce0d75c523..8611fd28bc204 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "b2sdk" ]; nativebuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ requests arrow logfury tqdm ]; + requiredPythonModules = [ requests arrow logfury tqdm ]; # requires unpackaged dependencies like liccheck doCheck = false; diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix index 87769aa3ea913..37d1bf60ca66b 100644 --- a/pkgs/development/python-modules/babelfish/default.nix +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104"; }; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; meta = with stdenv.lib; { homepage = "https://pypi.python.org/pypi/babelfish"; diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix index 0df03754127bc..a5c5108dde5e4 100644 --- a/pkgs/development/python-modules/babelgladeextractor/default.nix +++ b/pkgs/development/python-modules/babelgladeextractor/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "160p4wi2ss69g141c2z59azvrhn7ymy5m9h9d65qrcabigi0by5w"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ Babel ]; diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/pkgs/development/python-modules/backports_csv/default.nix index e2fae4897f62d..52d5e08f2124e 100644 --- a/pkgs/development/python-modules/backports_csv/default.nix +++ b/pkgs/development/python-modules/backports_csv/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0vdx5jlhs91iizc8j8l8811nqprwvdx39pgkdc82w2qkfgzxyxqj"; }; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; meta = with stdenv.lib; { description = "Backport of Python 3 csv module"; diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix index dc969cbb4b943..4ed767b8ea503 100644 --- a/pkgs/development/python-modules/backports_os/default.nix +++ b/pkgs/development/python-modules/backports_os/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; checkInputs = [ hypothesis ]; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; checkPhase = '' ${python.interpreter} -m unittest discover tests diff --git a/pkgs/development/python-modules/backports_tempfile/default.nix b/pkgs/development/python-modules/backports_tempfile/default.nix index cc51e23260b83..500f8a29b216d 100644 --- a/pkgs/development/python-modules/backports_tempfile/default.nix +++ b/pkgs/development/python-modules/backports_tempfile/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ backports_weakref ]; + requiredPythonModules = [ backports_weakref ]; checkPhase = '' ${python.interpreter} -m unittest discover -s tests diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index a55eeff511fe9..b151ed7208bb3 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "eff58e53de8fdeb27a1c87a9d57e7b91d15d1bc3854e85344b1a2e69f31ecda7"; }; - propagatedBuildInputs = [ mock ]; + requiredPythonModules = [ mock ]; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index 3999efd12b676..a5100fd3526d5 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1fxrh57z3fjl95db8jh71grkv5id8qk65g6k5jqcs9v3dgkg8jkl"; }; - propagatedBuildInputs = [ wheel ]; + requiredPythonModules = [ wheel ]; # Using pytes instead of setuptools check hook allows disabling specific tests checkInputs = [ pytestCheckHook pytestrunner ]; diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index 64ef8ec53fa5f..d99aaa4eee93c 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "0rb034c99pyhb4a60z7f2kz40cjydhm8m9v2blaal1rmhlam7rs1"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ GitPython pbr pyyaml diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index fd63294302c3c..e1dac176418a2 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp"; }; - propagatedBuildInputs = [bap requests]; + requiredPythonModules = [bap requests]; doCheck = false; diff --git a/pkgs/development/python-modules/baron/default.nix b/pkgs/development/python-modules/baron/default.nix index 8a04befc6d16f..809fc5385dbff 100644 --- a/pkgs/development/python-modules/baron/default.nix +++ b/pkgs/development/python-modules/baron/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0fib74nkqnl1i2zzlhbbfpw3whwc4951p9x61r2xrxhwp4r9yn5h"; }; - propagatedBuildInputs = [ rply ]; + requiredPythonModules = [ rply ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix index 66972dc8b2392..b3a69c1465d64 100644 --- a/pkgs/development/python-modules/baselines/default.nix +++ b/pkgs/development/python-modules/baselines/default.nix @@ -27,7 +27,7 @@ buildPythonPackage { sha256 = "0j2ck7rsrcyny9qbmrw9aqvzfhv70nbign8iva2dsisa2x24gbcl"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ gym scipy tqdm diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index a06bcebc8e6c8..b34c541eec274 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "13lw1iwa8hadpvqdgb06nh881l8c17awzvvwbfwblvb9q9s0lnzp"; }; - propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ]; + requiredPythonModules = [ numpy matplotlib pillow pyproj pyshp six ]; buildInputs = [ setuptools pkgs.geos ]; # Standard configurePhase from `buildPythonPackage` seems to break the setup.py script diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index 9ac72a21fa7d5..02718a58fb452 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { --replace "\"bash\"" "'${bash}/bin/bash'" ''; - propagatedBuildInputs = [ ipykernel pexpect ]; + requiredPythonModules = [ ipykernel pexpect ]; # no tests doCheck = false; diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix index 8e29eed2acfd0..bae047cbbe037 100644 --- a/pkgs/development/python-modules/bashlex/default.nix +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ enum-compat ]; + requiredPythonModules = [ enum-compat ]; # workaround https://github.com/idank/bashlex/issues/51 preBuild = '' diff --git a/pkgs/development/python-modules/basiciw/default.nix b/pkgs/development/python-modules/basiciw/default.nix index 8ae4a59cfb471..cb2d6c92fa512 100644 --- a/pkgs/development/python-modules/basiciw/default.nix +++ b/pkgs/development/python-modules/basiciw/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; buildInputs = [ gcc ]; - propagatedBuildInputs = [ wirelesstools ]; + requiredPythonModules = [ wirelesstools ]; meta = { description = "Get info about wireless interfaces using libiw"; diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index 16b8f317a2236..84eb1394696aa 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ future numpy pillow scipy scikitlearn scikitimage threadpoolctl ]; diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix index 29109a2e09143..f85348288c9c3 100644 --- a/pkgs/development/python-modules/batchspawner/default.nix +++ b/pkgs/development/python-modules/batchspawner/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0yn312sjfjpjjfciagbczfmqprk2fj4lbb3vsbzj17p948acq5w2"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ jupyterhub ]; diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index a1739bf4773eb..8ae20fee4bf3f 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "01mg9npiqh1qmq5ldnbpjmr8qkiw827msiv3crpkhbj4bdzasbfm"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ scikitlearn scipy ]; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index ef3dfa095184f..a194e0b29b018 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest nose glibcLocales ]; - propagatedBuildInputs = [ numpy scipy matplotlib h5py ]; + requiredPythonModules = [ numpy scipy matplotlib h5py ]; checkPhase = '' LC_ALL=en_US.utf-8 pytest -k 'not test_message_to_parents' diff --git a/pkgs/development/python-modules/bcrypt/3_1.nix b/pkgs/development/python-modules/bcrypt/3_1.nix index c70161cf28b06..fe6e188aa5d4a 100644 --- a/pkgs/development/python-modules/bcrypt/3_1.nix +++ b/pkgs/development/python-modules/bcrypt/3_1.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi; + requiredPythonModules = [ six ] ++ lib.optional (!isPyPy) cffi; meta = with lib; { description = "Modern password hashing for your software and your servers"; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index dc50c56018e0f..bf6329df3173b 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"; }; buildInputs = [ pycparser mock pytest py ]; - propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi; + requiredPythonModules = [ six ] ++ optional (!isPyPy) cffi; meta = { maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index 09e0b8b3f3e54..8e1a2683eccff 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sha256 = "0xrvg503xmi28w0hllr4s7fkap0p09fgw2wax3p1s2r6b3xjvbz7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ sqlalchemy pycrypto cryptography diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index f1dc7a5349d92..497b46180bb16 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # Tests require files not included in the PyPI archive. doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ beautifulsoup4 bottle chardet diff --git a/pkgs/development/python-modules/beancount_docverif/default.nix b/pkgs/development/python-modules/beancount_docverif/default.nix index 0067716b62654..da115b7460186 100644 --- a/pkgs/development/python-modules/beancount_docverif/default.nix +++ b/pkgs/development/python-modules/beancount_docverif/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1kjc0axrxpvm828lqq5m2ikq0ls8xksbmm7312zw867gdx56x5aj"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ beancount ]; diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index a0afd0c4f4c41..b5955d03a0d36 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { py.test $out/${python.sitePackages}/bs4/tests ''; - propagatedBuildInputs = [ soupsieve ]; + requiredPythonModules = [ soupsieve ]; meta = with stdenv.lib; { homepage = "http://crummy.com/software/BeautifulSoup/bs4/"; diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix index 6c0c3c44d2d4e..a6e330598a708 100644 --- a/pkgs/development/python-modules/bedup/default.nix +++ b/pkgs/development/python-modules/bedup/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }; buildInputs = [ btrfs-progs ]; - propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ] + requiredPythonModules = [ contextlib2 pyxdg pycparser alembic ] ++ stdenv.lib.optionals (!isPyPy) [ cffi ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 26cd6441ba5a0..580f5dd2d2a83 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook mock pathpy pyhamcrest pytest-html ]; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ colorama cucumber-tag-expressions parse parse-type six ]; + requiredPythonModules = [ colorama cucumber-tag-expressions parse parse-type six ]; postPatch = '' patchShebangs bin diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index b0c899cdd3b8b..ff9e5ce1d6160 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -15,7 +15,7 @@ in buildPythonPackage rec { sha256 = "9342b6b9423c818f99f7c6d9086fbb5e27d5c2efbb1f2a08f6f5a917c4991f86"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy ]; diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix index 51e29e55d07f1..2d7802f9dd747 100644 --- a/pkgs/development/python-modules/bespon/default.nix +++ b/pkgs/development/python-modules/bespon/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "a75cd7e62746fb0fef9b98aa157a44f9ed2ef63e952f7ae4ec5b3c2892669187"; }; - propagatedBuildInputs = [ ]; + requiredPythonModules = [ ]; # upstream doesn't contain tests doCheck = false; diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index 7339fcbf6485b..9f8ae3e51a7c6 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1hki1c2vs7adq7zr56wi6i5bhrkia4s2ywpv2c98ibnczz709w2v"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; doCheck = false; diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index d69b2d6ce4ca0..bd71f8bbb5cc0 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1yj3hqnmkjh0sjjhmlm4097mmz98kna8rn0dd9g8zaw9g1a35h8c"; }; - propagatedBuildInputs = [ future pyparsing ]; + requiredPythonModules = [ future pyparsing ]; checkInputs = [ nose unittest2 glibcLocales ]; diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index 34b9f4cf5ff0a..9ed43c8f49344 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ sphinx ]; + requiredPythonModules = [ sphinx ]; # this can be removed >0.19.0 postPatch = '' diff --git a/pkgs/development/python-modules/binaryornot/default.nix b/pkgs/development/python-modules/binaryornot/default.nix index 103bd79294e65..9e846256cf119 100644 --- a/pkgs/development/python-modules/binaryornot/default.nix +++ b/pkgs/development/python-modules/binaryornot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { --replace "average_size=512" "" ''; - propagatedBuildInputs = [ chardet ]; + requiredPythonModules = [ chardet ]; checkInputs = [ hypothesis ]; diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index c6fbbc13c43d3..f34a614450013 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -22,6 +22,10 @@ let visualizationSupport = (pyqtgraph != null) && (matplotlib != null); version = "2.2.0"; + + runtimeDeps = [ + zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs sasquatch squashfsTools lzma + ]; in buildPythonPackage { pname = "binwalk"; @@ -34,8 +38,7 @@ buildPythonPackage { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs sasquatch squashfsTools lzma pycrypto ] - ++ stdenv.lib.optionals visualizationSupport [ matplotlib pyqtgraph ]; + requiredPythonModules = [ pycrypto ] ++ stdenv.lib.optionals visualizationSupport [ matplotlib pyqtgraph ]; # setup.py only installs version.py during install, not test postPatch = '' @@ -47,6 +50,10 @@ buildPythonPackage { HOME=$(mktemp -d) ''; + makeWrapperArgs = [ + "--prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}" + ]; + checkInputs = [ nose ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 43b48aa03a491..f6f1f280a228e 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; # Checks try to write to $HOME, which does not work with nix doCheck = false; meta = { diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index 2b9e16b6a6394..3787ac0472130 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "06ls1lara7sklqw6wrw5d3wpxwgyv6paxwjp37x7b3kfskm14cmd"; }; - propagatedBuildInputs = [ ecdsa pysha3 ]; + requiredPythonModules = [ ecdsa pysha3 ]; pythonImportsCheck = [ "bip_utils" diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/pkgs/development/python-modules/bitbucket-api/default.nix index 82b49a2675740..2b09b92e5e31a 100644 --- a/pkgs/development/python-modules/bitbucket-api/default.nix +++ b/pkgs/development/python-modules/bitbucket-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "b541d9d7f234074a74214505aff1846eb21e5dd6d3915139e817d4675d34f4e3"; }; - propagatedBuildInputs = [ requests_oauthlib nose sh ]; + requiredPythonModules = [ requests_oauthlib nose sh ]; doCheck = false; diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix index 5e5d5662ba320..54964e7230856 100644 --- a/pkgs/development/python-modules/bitbucket-cli/default.nix +++ b/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1xmn73x6jirnwfwcdy380ncmkai9f9dhmld6zin01ypbqwgf50fq"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # No tests doCheck = false; diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix index 3e74c17f3be86..301594ccb9069 100644 --- a/pkgs/development/python-modules/bitcoin-price-api/default.nix +++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "bc68076f9632aaa9a8009d916d67a709c1e045dd904cfc7a3e8be33960d32029"; }; - propagatedBuildInputs = [ dateutil requests ]; + requiredPythonModules = [ dateutil requests ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/pkgs/development/python-modules/bkcharts/default.nix index 9e105c09d57bc..5840ec447af68 100644 --- a/pkgs/development/python-modules/bkcharts/default.nix +++ b/pkgs/development/python-modules/bkcharts/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "a5eaa8e78853dcecaa46345812e4fabe9cd3b96330ebf0809f640a4a0556d72e"; }; - propagatedBuildInputs = [ numpy pandas ]; + requiredPythonModules = [ numpy pandas ]; # Circular test dependency on bokeh doCheck = false; diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix index 130d07d61ff46..1fa4d4f5bb74c 100644 --- a/pkgs/development/python-modules/black-macchiato/default.nix +++ b/pkgs/development/python-modules/black-macchiato/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0lc9w50nlbmlzj44krk7kxcia202fhybbnwfh77xixlc7vb4rayl"; }; - propagatedBuildInputs = [ black ]; + requiredPythonModules = [ black ]; checkInputs = [ pytestCheckHook black ]; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 997f20e137db0..fb3989e85dd00 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { --deselect tests/test_black.py::BlackTestCase::test_failed_formatting_does_not_get_cached ''; - propagatedBuildInputs = [ attrs appdirs click toml aiohttp aiohttp-cors pathspec regex typed-ast ]; + requiredPythonModules = [ attrs appdirs click toml aiohttp aiohttp-cors pathspec regex typed-ast ]; meta = with stdenv.lib; { description = "The uncompromising Python code formatter"; diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 9b27ae2549032..1f37155d3ca68 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ packaging six html5lib setuptools ]; + requiredPythonModules = [ packaging six html5lib setuptools ]; # Disable network tests checkPhase = '' diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 63371fc6eecf2..bf52b131f335c 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" ''; - propagatedBuildInputs = [ txdbus ]; + requiredPythonModules = [ txdbus ]; checkInputs = [ pytest pytestcov ]; checkPhase = "AGENT_OS=linux py.test"; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index b55e29399828d..bf015bb26444c 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pytest ''; - propagatedBuildInputs = [ wcwidth six ]; + requiredPythonModules = [ wcwidth six ]; meta = with stdenv.lib; { homepage = "https://github.com/jquast/blessed"; diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix index c285b3a7d0038..9197ff3885cee 100644 --- a/pkgs/development/python-modules/blessings/default.nix +++ b/pkgs/development/python-modules/blessings/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # 4 failing tests, 2to3 doCheck = false; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ nose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/blinkstick/default.nix b/pkgs/development/python-modules/blinkstick/default.nix index 5e7cd42362dc7..cf17c91f919a7 100644 --- a/pkgs/development/python-modules/blinkstick/default.nix +++ b/pkgs/development/python-modules/blinkstick/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ pyusb ]; + requiredPythonModules = [ pyusb ]; meta = with lib; { description = "Python package to control BlinkStick USB devices"; diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 1d6d7806b979a..56788223888df 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy ]; diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index b8d1b4670aeae..e921858b241c4 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py ''; - propagatedBuildInputs = [ + requiredPythonModules = [ pykickstart pyparted pyblock pyudev libselinux six ]; diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 07d6cffe56c40..ae02e044c0678 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "97ea037a67af72037cb08cec7e0a9f7866ecdfaa1a8c8ebcc0f4b9359a1516d7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ base58 ecdsa pycryptodome diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index ceaa31874ecbc..f1e312dcf427e 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ pep8 nose unittest2 docutils ]; - propagatedBuildInputs = [ pillow webcolors funcparserlib ]; + requiredPythonModules = [ pillow webcolors funcparserlib ]; # One test fails: # ... diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 091b020efc253..db8a24a1b0e05 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -73,7 +73,7 @@ buildPythonPackage rec { pandas ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pillow jinja2 python-dateutil diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 48fc3bf69983a..8129bbd53c288 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake cython ]; checkInputs = [ pytest ]; - propagatedBuildInputs = [ spglib numpy scipy matplotlib ase netcdf4 ]; + requiredPythonModules = [ spglib numpy scipy matplotlib ase netcdf4 ]; # pypi release does no include files for tests doCheck = false; diff --git a/pkgs/development/python-modules/booleanoperations/default.nix b/pkgs/development/python-modules/booleanoperations/default.nix index c747df90f5a55..ae9fce2a4460b 100644 --- a/pkgs/development/python-modules/booleanoperations/default.nix +++ b/pkgs/development/python-modules/booleanoperations/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ fonttools fs pyclipper diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index 85ebae5b612fa..0607593696093 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = (!isPy38); # hmac functionality has changed checkInputs = [ nose mock ]; - propagatedBuildInputs = [ requests httpretty ]; + requiredPythonModules = [ requests httpretty ]; meta = with pkgs.lib; { homepage = "https://github.com/boto/boto"; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 713b50c682911..b2eb149c77bd6 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "f56148e2c6b9a2d704218da42f07d72f00270bfddb13bc1bdea20d3327daa51e"; }; - propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; + requiredPythonModules = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; checkInputs = [ docutils nose mock ]; checkPhase = '' diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index d896367c7c6b4..1aad8f8030faf 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "e224754230e7e015836ba20037cac6321e8e2ce9b8627c14d579fcb37249decd"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ dateutil jmespath docutils diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 5fda85dc972b7..02e87ddc5c6cb 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0819b74b145a7def225c0e83b16a4d5711fde751cd92bae467a69efce720f69e"; }; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; meta = with stdenv.lib; { homepage = "http://bottlepy.org"; diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index f7e7dc7c390c1..489a4cb1200f3 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "20179f0b66359792ea283b69aa16366419132f3b6cf3adadc0c48e2e8118e573"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; postPatch = '' substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" "" diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index bbdca0a00974f..3ecbc16ebcfbd 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { which = "${which}/bin/which"; })]; - propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; + requiredPythonModules = [ curtsies greenlet pygments requests urwid ]; postInstall = '' substituteInPlace "$out/share/applications/org.bpython-interpreter.bpython.desktop" \ diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 2c05d646827c1..6198c44c36e1f 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "79ddadaa9db60b81762a10af0c0d994fd60d21616c7d9229d6f7ce1930f8d343"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # pypi release does not include tests doCheck = false; diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 7884ff65f2885..63a853e4770df 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest selenium ]; - propagatedBuildInputs = [ jinja2 six setuptools ]; + requiredPythonModules = [ jinja2 six setuptools ]; # Seems to require a browser doCheck = false; diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix index 55a12009a15ce..8eb49e560f726 100644 --- a/pkgs/development/python-modules/bravado-core/default.nix +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { checkPhase = ''pytest --benchmark-skip''; - propagatedBuildInputs = [ + requiredPythonModules = [ python-dateutil jsonref jsonschema diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix index cfb30a926d583..a0668fac0b35f 100644 --- a/pkgs/development/python-modules/bravia-tv/default.nix +++ b/pkgs/development/python-modules/bravia-tv/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0bg33nilybh46s6yz3x7a7x8biwbvy5scqdrl4didhn7vjd4w5fn"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # package does not include tests doCheck = false; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 9c8440b9f7f1d..d03a4cd458056 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "c28e251ad8a42e4d3dd6c0861a66128b400131614b36f19df505ea34c934f801"; }; - propagatedBuildInputs = [ docutils six sphinx ]; + requiredPythonModules = [ docutils six sphinx ]; doCheck = !isPy3k; diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index 79a80451d0284..eada2aca05b93 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "50f16bc7faf299f98fe58573da55b0664078f94b1a0e7f0ce9e1e6a0d47e68e0"; }; - propagatedBuildInputs = [ configobj six fastimport dulwich launchpadlib ]; + requiredPythonModules = [ configobj six fastimport dulwich launchpadlib ]; checkInputs = [ testtools ]; diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index 685ca57b7efdb..909672b007c0e 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { --replace pyaes==1.6.0 pyaes ''; - propagatedBuildInputs = [ cryptography pyaes pycrc ]; + requiredPythonModules = [ cryptography pyaes pycrc ]; # no tests available doCheck = false; diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index e79ee03241dc5..23c28c00300d0 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "03gjcpbq8rwnjzplgwhwr8wb7a1zh940dr6iwnq9srklqzzj691m"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pysnmp ]; diff --git a/pkgs/development/python-modules/brotlipy/default.nix b/pkgs/development/python-modules/brotlipy/default.nix index f914d2d6c97c6..a823dfec3a25b 100644 --- a/pkgs/development/python-modules/brotlipy/default.nix +++ b/pkgs/development/python-modules/brotlipy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "36def0b859beaf21910157b4c33eb3b06d8ce459c942102f16988cca6ea164df"; }; - propagatedBuildInputs = [ cffi enum34 construct ]; + requiredPythonModules = [ cffi enum34 construct ]; checkInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index ad8fe1c8a0775..a61793571b9c0 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ lz4 keyring pbkdf2 pyaes pycryptodome ]; + requiredPythonModules = [ lz4 keyring pbkdf2 pyaes pycryptodome ]; # No tests implemented doCheck = false; diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix index 68668fce0794e..0d7ef8388a205 100644 --- a/pkgs/development/python-modules/browsermob-proxy/default.nix +++ b/pkgs/development/python-modules/browsermob-proxy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1bxvmghm834gsfz3pm69772wzhh15p8ci526b25dpk3z4315nd7v"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; meta = { description = "A library for interacting with Browsermob Proxy"; diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index 17f384062482e..2bd8e134f7fec 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { sha256 = "0anfh90cj3c2g7zqrjvq0d6dzpb4hjl6gk8zw0r349j2zw9i4h7y"; }; - propagatedBuildInputs = [ pybluez ]; + requiredPythonModules = [ pybluez ]; # there are no tests doCheck = false; diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix index c84ee0f0be7f9..5ab8420db24dd 100644 --- a/pkgs/development/python-modules/btchip/default.nix +++ b/pkgs/development/python-modules/btchip/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "4167f3c6ea832dd189d447d0d7a8c2a968027671ae6f43c680192f2b72c39b2c"; }; - propagatedBuildInputs = [ hidapi pyscard ecdsa ]; + requiredPythonModules = [ hidapi pyscard ecdsa ]; # tests requires hardware doCheck = false; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 08f2c1eeb2ffe..379954e687470 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "4.7.2"; buildInputs = [ transaction ]; - propagatedBuildInputs = [ persistent zope_interface ]; + requiredPythonModules = [ persistent zope_interface ]; checkInputs = [ zope_testrunner ]; # disable a failing test that looks broken diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index a2c41599b3600..9fb4912498aa2 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "01c2186f6c2a6f801b66d8fc73b8986bd2d4931a6ab40b720e5fd0b66757facc"; }; - propagatedBuildInputs = [ six webob ]; + requiredPythonModules = [ six webob ]; # no tests doCheck = false; diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 37c91127a2c8a..f9994417385de 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1pmznka5dxcdjfak0p1yh7lhfbfazmx8g9ysv57lsrkqy4n61qks"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools twiggy requests offtrac bugzilla taskw dateutil pytz keyring six jinja2 pycurl dogpile_cache lockfile click pyxdg future jira diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index f40488511093d..18393d99dadce 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; buildInputs = [ pep8 coverage logilab_common ]; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; preCheck = '' mkdir -p check-phase diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 97a7f9a201bf1..5cabab58d7fc0 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { flit-core ]; - propagatedBuildInputs = [ + requiredPythonModules = [ toml pep517 packaging diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 55ff34b252084..38cd223a37758 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -10,7 +10,7 @@ let name = "${package.name}-with-plugins"; phases = [ "installPhase" "fixupPhase" ]; buildInputs = [ makeWrapper ]; - propagatedBuildInputs = plugins ++ package.propagatedBuildInputs; + requiredPythonModules = plugins ++ package.requiredPythonModules; installPhase = '' makeWrapper ${package}/bin/buildbot $out/bin/buildbot \ @@ -32,7 +32,7 @@ let sha256 = "0i2sbxhsqyk2yr234il0zsyp1rf2v1l5hmzvw0yrgds6jpr19cqv"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ # core twisted jinja2 diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index f0eaa7e81ae8e..f51b9389b1c26 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -10,7 +10,7 @@ buildPythonPackage (rec { sha256 = "1v1bcc2m4pz90rsh5pjb9m9agkvhqdk1viyf64gi1h85h191vkib"; }; - propagatedBuildInputs = [ twisted future ]; + requiredPythonModules = [ twisted future ]; checkInputs = [ setuptoolsTrial mock ]; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 2551aebcea222..2c570a3577af8 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bumps"; version = "0.7.16"; - propagatedBuildInputs = [six]; + requiredPythonModules = [six]; # Bumps does not provide its own tests.py, so the test # always fails diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix index 31884074defd8..08be9c80d5685 100644 --- a/pkgs/development/python-modules/bwapy/default.nix +++ b/pkgs/development/python-modules/bwapy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { buildInputs = [ zlib bwa ]; - propagatedBuildInputs = [ cffi ]; + requiredPythonModules = [ cffi ]; # no tests doCheck = false; diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 57a3609bad0ae..740f7b9e10f71 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; buildInputs = [ zlib ]; - propagatedBuildInputs = [ numpy six python-lzo ]; + requiredPythonModules = [ numpy six python-lzo ]; checkInputs = [ nose ]; postInstall = '' diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix index 24ff14f625528..134edd28291ee 100644 --- a/pkgs/development/python-modules/bytecode/default.nix +++ b/pkgs/development/python-modules/bytecode/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; - propagatedBuildInputs = lib.optionals (pythonOlder "3.6") [ aenum ]; + requiredPythonModules = lib.optionals (pythonOlder "3.6") [ aenum ]; meta = with lib; { homepage = "https://github.com/vstinner/bytecode"; diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index e5a7584234caa..69fac6fbcd9ac 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ requests msgpack ]; + requiredPythonModules = [ requests msgpack ]; # tests not included with pypi release doCheck = false; diff --git a/pkgs/development/python-modules/cachy/default.nix b/pkgs/development/python-modules/cachy/default.nix index 278dd5a8ae60e..11d342717c0bc 100644 --- a/pkgs/development/python-modules/cachy/default.nix +++ b/pkgs/development/python-modules/cachy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ redis memcached msgpack diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index 886224d16918d..26f9c17b186a0 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -51,7 +51,7 @@ let libX11 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six ]; @@ -80,7 +80,7 @@ in opencascade ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pyparsing pythonocc-core-cadquery ]; diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix index ee795d80dcef9..3d8f40f5e54b5 100644 --- a/pkgs/development/python-modules/cairocffi/generic.nix +++ b/pkgs/development/python-modules/cairocffi/generic.nix @@ -23,8 +23,12 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; + buildInputs = [ + cairo + ]; + checkInputs = [ pytest pytestrunner glibcLocales ]; - propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; + requiredPythonModules = [ cffi ] ++ lib.optional withXcffib xcffib; checkPhase = '' py.test $out/${python.sitePackages} diff --git a/pkgs/development/python-modules/cairosvg/1_x.nix b/pkgs/development/python-modules/cairosvg/1_x.nix index b98fbbf91e860..f670b429d1f8a 100644 --- a/pkgs/development/python-modules/cairosvg/1_x.nix +++ b/pkgs/development/python-modules/cairosvg/1_x.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "15z0cag5s79ghhrlgs5xc9ayvzzdr3v8151vf6k819f1drsfjfxl"; }; - propagatedBuildInputs = [ cairocffi ]; + requiredPythonModules = [ cairocffi ]; checkInputs = [ nose fontconfig cssselect2 defusedxml pillow tinycss2 ]; diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index 31f7d7bc5d67c..bd881eb056bed 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1bb7irxbaxxb9ahm3z5wsx1q96mm5gzskc7b6q07h9ikcnb8yrjf"; }; - propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; + requiredPythonModules = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 3888bb7ec65a5..0b03275867cdb 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { }; nativeBuildInputs = lib.optionals (pythonOlder "3.5") [ mock ]; - propagatedBuildInputs = [ six requests vobject lxml ] + requiredPythonModules = [ six requests vobject lxml ] ++ lib.optionals (pythonOlder "3.6") [ pytz tzlocal ]; checkInputs = [ diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index ea49c9b4a7774..fda1d5653bbb6 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449"; }; - propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; + requiredPythonModules = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; checkInputs = [ nose mock pytest hypothesis future ]; # Add the scripts to PATH diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 6e487b58cff7d..edd0e3a846257 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { sha256 = "129lcchq45h8wqjvvn0rwpbmih4m0igass2cx7a21z94li97hcia"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ # required attrs bitstruct diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 31daad18bdc8e..039252f224e90 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "899b7604f5a6a8a92109115d9250142cdf0b1dfdcb62cdb21d8fb5bf37780631"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ frozendict simplejson six ]; diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index c064fd62fd93d..67a516a48ab9a 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0fqa4p3qg7800fykib1x264gizhhmb6dz2hajgwr0hxf5xa19wdl"; }; - propagatedBuildInputs = + requiredPythonModules = [ can canmatrix ]; diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 7fc0b16522ed5..a9ede43d48bfb 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ln -s ${capstone}/lib/libcapstone.a prebuilt/ ''; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; checkPhase = '' mv capstone capstone.hidden diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 821561c05554f..8d3fb72cffb58 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0fwrxa049gzin5dck7fvwhdp1856jrn0d7mcjcjsd7ndqvhgvjj1"; }; - propagatedBuildInputs = [ humanfriendly ]; + requiredPythonModules = [ humanfriendly ]; checkPhase = '' PATH=$PATH:$out/bin pytest . diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index 71a7174fb23f6..e6d8f124efad0 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # carbon is installed as a regular python module. GRAPHITE_NO_PREFIX="True"; - propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ]; + requiredPythonModules = [ twisted whisper txamqp cachetools urllib3 ]; meta = with stdenv.lib; { homepage = "http://graphiteapp.org/"; diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix index 9a5ffe578565f..3df594d893e0c 100644 --- a/pkgs/development/python-modules/carrot/default.nix +++ b/pkgs/development/python-modules/carrot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ amqplib anyjson ]; + requiredPythonModules = [ amqplib anyjson ]; doCheck = false; # depends on the network diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index f41aa6985da96..cb0bd2d6edd52 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { geos proj_5 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ # required six pyshp shapely numpy diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 117b6374f9184..89fb67017059c 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "16bqa2f5l2cns2izc4siy8jw23q9vrqm9wnyp696fj83y77nkp75"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ simpleeval ]; diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix index 771a349be1f77..2db0647f7f64e 100644 --- a/pkgs/development/python-modules/case/default.nix +++ b/pkgs/development/python-modules/case/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "48432b01d91913451c3512c5b90e31b0f348f1074b166a3431085eb70d784fb1"; }; - propagatedBuildInputs = [ six nose unittest2 mock ]; + requiredPythonModules = [ six nose unittest2 mock ]; meta = with stdenv.lib; { homepage = "https://github.com/celery/case"; diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index ecb1edf5958a2..22806d9e557b8 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; buildInputs = [ libev ]; - propagatedBuildInputs = [ six ] + requiredPythonModules = [ six ] ++ lib.optionals (pythonOlder "3.4") [ futures ]; checkInputs = [ eventlet mock nose pytest pytz pyyaml sure ]; diff --git a/pkgs/development/python-modules/casttube/default.nix b/pkgs/development/python-modules/casttube/default.nix index ff8e5614ceb66..1aebda50c2138 100644 --- a/pkgs/development/python-modules/casttube/default.nix +++ b/pkgs/development/python-modules/casttube/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "10pw2sjy648pvp42lbbdmkkx79bqlkq1xcbzp1frraj9g66azljl"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # no tests doCheck = false; diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index 1624cbcf36ce2..eb805f8d22aed 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0d01077dbfca7aa53f3ef4adecccce636bce4f82e5b52237703ab2f56478e56e"; }; - propagatedBuildInputs = [ importlib-metadata ]; + requiredPythonModules = [ importlib-metadata ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index 5f5e396a02e2b..b859d46ae6d31 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ krb5Full ]; - propagatedBuildInputs = [ nose GitPython mock git ]; + requiredPythonModules = [ nose GitPython mock git ]; doCheck = isPy3k; # needs unpackaged module to run tests on python2 diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 3fd1b51a46602..004f472afc220 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; checkInputs = [ case pytest boto3 moto ]; - propagatedBuildInputs = [ kombu billiard pytz future vine ]; + requiredPythonModules = [ kombu billiard pytz future vine ]; meta = with lib; { homepage = "https://github.com/celery/celery/"; diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index 6c14f6c472f7b..bfb925dacb0d4 100644 --- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "certbot-dns-cloudflare"; - propagatedBuildInputs = [ + requiredPythonModules = [ acme certbot cloudflare diff --git a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix index 19e53aa20cc9b..13dd21ac7df27 100644 --- a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix +++ b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "certbot-dns-rfc2136"; - propagatedBuildInputs = [ + requiredPythonModules = [ acme certbot dnspython diff --git a/pkgs/development/python-modules/certbot-dns-route53/default.nix b/pkgs/development/python-modules/certbot-dns-route53/default.nix index 6fba51ce92a14..9ffa4db9143c7 100644 --- a/pkgs/development/python-modules/certbot-dns-route53/default.nix +++ b/pkgs/development/python-modules/certbot-dns-route53/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "certbot-dns-route53"; - propagatedBuildInputs = [ + requiredPythonModules = [ acme boto3 certbot diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index fc1fcfad4002e..919fb0683393a 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sourceRoot = "source/${pname}"; - propagatedBuildInputs = [ + requiredPythonModules = [ ConfigArgParse acme configobj diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix index 5d34eede3110d..9188e31c00f76 100644 --- a/pkgs/development/python-modules/certipy/default.nix +++ b/pkgs/development/python-modules/certipy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0n980gqpzh0fm58h3i4mi2i10wgj606lscm1r5sk60vbf6vh8mv9"; }; - propagatedBuildInputs = [ pyopenssl ]; + requiredPythonModules = [ pyopenssl ]; doCheck = false; #no tests were included diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index cee7a7fe8a184..b6c819ec09172 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -11,7 +11,8 @@ if isPyPy then null else buildPythonPackage rec { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ libffi pycparser ]; + propagatedBuildInputs = [ libffi ]; + requiredPythonModules = [ pycparser ]; checkInputs = [ pytest ]; # On Darwin, the cffi tests want to hit libm a lot, and look for it in a global diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index ab9a97729a1dc..2eafde7475e6d 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "cf22deb93d4bcf92f345a5c3cd39d3d41d6340adc60c78bbbd6588c384fda6a1"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # Tests not included in PyPI tarball doCheck = false; diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index da04ecf68897c..a0135d23dda74 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "05fk725a1i3zl3idik2hxl3w6k1ln0j33j3jdq1gvy1sfyc79ifm"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click pyyaml six diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index b79bf76131778..82206014b55a3 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"' ''; - propagatedBuildInputs = [ + requiredPythonModules = [ aws-sam-translator jsonpatch jsonschema diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 1a29e51b35f5d..4299ff0584c0e 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ pytest coveralls pytestcov ]; buildInputs = [ cython ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix index 06beebc2f3260..ebe68605d7c7e 100644 --- a/pkgs/development/python-modules/cgen/default.nix +++ b/pkgs/development/python-modules/cgen/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pytools numpy ]; diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 0c3b7a946fcd0..b8219196485b5 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { mock ]; - propagatedBuildInputs = [ + requiredPythonModules = [ filelock protobuf numpy diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 7eb06e26450cd..9bb2f707643c8 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { }; checkInputs = [ watchdog pytest hypothesis mock ]; - propagatedBuildInputs = [ + requiredPythonModules = [ attrs botocore click diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index fb0774478a00d..b35bd6eabc7f9 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ redis hiredis ]; - propagatedBuildInputs = [ channels msgpack aioredis asgiref ]; + requiredPythonModules = [ channels msgpack aioredis asgiref ]; # Fetch from github (no tests files on pypi) # src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 94d1705637d2b..1fccb50a466a1 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # Files are missing in the distribution doCheck = false; - propagatedBuildInputs = [ asgiref django daphne ]; + requiredPythonModules = [ asgiref django daphne ]; meta = with stdenv.lib; { description = "Brings event-driven capabilities to Django with a channel system"; diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 6679f13b1196c..91739b27804ce 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sourceRoot = "source/packages/python/chart-studio"; - propagatedBuildInputs = [ + requiredPythonModules = [ plotly requests retrying diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 5a3296d71c835..b6e98183e6e1d 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist" ''; - propagatedBuildInputs = [ pep517 toml ]; + requiredPythonModules = [ pep517 toml ]; checkInputs = [ mock breezy git ]; diff --git a/pkgs/development/python-modules/cheetah/default.nix b/pkgs/development/python-modules/cheetah/default.nix index 1cee46fa7252c..f1d3434843045 100644 --- a/pkgs/development/python-modules/cheetah/default.nix +++ b/pkgs/development/python-modules/cheetah/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550"; }; - propagatedBuildInputs = [ markdown ]; + requiredPythonModules = [ markdown ]; doCheck = false; # Circular dependency diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 5795b55d91b77..2e830d5169301 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; - propagatedBuildInputs = [ more-itertools six ]; + requiredPythonModules = [ more-itertools six ]; checkInputs = [ jaraco_text diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index 5e5541b26e277..1e2effc119fb5 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "ef1619ad161f526745d4f0e4e517753d9d985814f1280e330661333d2ba05cdf"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cheroot contextlib2 portend routes six zc_lockfile ]; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index f23d06001922a..4146ae0049611 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "16f410izp2c4qhn4n3l5l3qirmkf43h2amjqms8hkl0shgfqwq2n"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ # required cheroot portend more-itertools zc_lockfile jaraco_collections diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 537ffdbaf9585..ef56e3b5537c5 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { --replace "'float_value': float(str(np.float32(sympy.pi)))" "'float_value': pytest.approx(float(str(np.float32(sympy.pi))))" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ freezegun google_api_core numpy diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix index bd1ae0c563a4f..896d7eab0b400 100644 --- a/pkgs/development/python-modules/citeproc-py/default.nix +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ rnc2rng ]; - propagatedBuildInputs = [ lxml ]; + requiredPythonModules = [ lxml ]; checkInputs = [ nose git ]; checkPhase = "nosetests tests"; diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index 7f5311f45b005..2cbf0d0e67d5a 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytest ]; - propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; + requiredPythonModules = [ click ecdsa hidapi pyaes ]; meta = with stdenv.lib; { description = "Communicate with your Coldcard using Python"; diff --git a/pkgs/development/python-modules/class-registry/default.nix b/pkgs/development/python-modules/class-registry/default.nix index 9a3650bceb8bc..5b1499267c2ec 100644 --- a/pkgs/development/python-modules/class-registry/default.nix +++ b/pkgs/development/python-modules/class-registry/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0zjf9nczl1ifzj07bgs6mwxsfd5xck9l0lchv2j0fv2n481xp2v7"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ nose ]; # Tests currently failing. diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix index 7775fee5ba0d9..0268a376d3618 100644 --- a/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0rvcdx4fdh5yk4d2nlddq1q1r2r0xqp86hpmbdn447pdcj1r8a9s"; }; - propagatedBuildInputs = [ six cffi ]; + requiredPythonModules = [ six cffi ]; checkInputs = [ nose ]; # gcc doesn't approve of this code, so disable -Werror diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index 3e46b900dc7c0..8c0aa8e328fbc 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ clikit ]; diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix index d3741ef38a936..1452ccbba8c62 100644 --- a/pkgs/development/python-modules/clf/default.nix +++ b/pkgs/development/python-modules/clf/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sed -i 's/==/>=/' requirements.txt ''; - propagatedBuildInputs = [ docopt requests pygments ]; + requiredPythonModules = [ docopt requests pygments ]; # Error when running tests: # No local packages or download links found for requests diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 1dc04d707882c..bcc6c891664a5 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "dd6f164310f7d86fa3da1f82043a9c784e44a02ad49be932a80624261e56979b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ configobj terminaltables tabulate diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 3fd41f54f66ce..d7d8cf96ceaca 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "5bf816b81367e638a190b6e91b50779007d14301b3f9f3145d68e3cade7bce86"; }; - propagatedBuildInputs = [ click jinja2 shellingham six ]; + requiredPythonModules = [ click jinja2 shellingham six ]; meta = with stdenv.lib; { description = "Add or enhance bash, fish, zsh and powershell completion in Click"; diff --git a/pkgs/development/python-modules/click-datetime/default.nix b/pkgs/development/python-modules/click-datetime/default.nix index ba710d74355d8..6d5adbf51016e 100644 --- a/pkgs/development/python-modules/click-datetime/default.nix +++ b/pkgs/development/python-modules/click-datetime/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1yxagk4wd2h77nxml19bn2y26fv2xw2n9g981ls8mjy0g51ms3gh"; }; - propagatedBuildInputs = [ click ]; + requiredPythonModules = [ click ]; # no tests doCheck = false; diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index 58da038faae37..f25e5e2526b3f 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0nk39lmkn208w8kvq6f4h3a6qzxrrvxixahpips6ik3zflbkss86"; }; - propagatedBuildInputs = [ click ]; + requiredPythonModules = [ click ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix index 58d7da4fd391d..19fc6a9c6cf88 100644 --- a/pkgs/development/python-modules/click-didyoumean/default.nix +++ b/pkgs/development/python-modules/click-didyoumean/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1svaza5lpvdbmyrx5xi0riqzq4hb9wnlpqrg6r8zy14pbi42j8hi"; }; - propagatedBuildInputs = [ click ]; + requiredPythonModules = [ click ]; meta = with stdenv.lib; { description = "Enable git-like did-you-mean feature in click"; diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index dd2b4b158ed5f..ded4ac67502ff 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124"; }; - propagatedBuildInputs = [ click ]; + requiredPythonModules = [ click ]; meta = with stdenv.lib; { homepage = "https://github.com/click-contrib/click-log/"; diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix index a8c1d7a489ff0..b0ead62e88638 100644 --- a/pkgs/development/python-modules/click-plugins/default.nix +++ b/pkgs/development/python-modules/click-plugins/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "46ab999744a9d831159c3411bb0c79346d94a444df9a3a3742e9ed63645f264b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click ]; diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index 03c9520014c41..44cd8c57787a1 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1mcmz95595nrp4r58spy1ac993db26hk4q97isghbmn4md99vwmr"; }; - propagatedBuildInputs = [ click prompt_toolkit ]; + requiredPythonModules = [ click prompt_toolkit ]; meta = with stdenv.lib; { homepage = "https://github.com/click-contrib/click-repl"; diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix index 6943a3dcfd156..d400ab04a3e0e 100644 --- a/pkgs/development/python-modules/click-threading/default.nix +++ b/pkgs/development/python-modules/click-threading/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ click ] ++ lib.optional (!isPy3k) futures; + requiredPythonModules = [ click ] ++ lib.optional (!isPy3k) futures; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index b2e23dc55bdb4..a550d2d5cd4fb 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkInputs = [ pytestCheckHook pytestcov ]; - propagatedBuildInputs = [ flake8 click pyyaml six ]; + requiredPythonModules = [ flake8 click pyyaml six ]; # test_cli asserts on exact quoting style of output disabledTests = [ diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 220ff790e7cc6..383cbe6e9d068 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "49be854582ec4a74240cb72f287846f823cd8cbd2e25f924541d12f27104bda3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pbr prettytable pyparsing diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 9fe60ba55da8e..321353744220a 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ future h5py numba diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index 91124cd21f4b9..992cd8569d2b4 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "13vlibbn86dhh6iy8k831vsa249746jnk419wcr9vvr3pqxml6g2"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click ]; diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 7b07b09459198..52ef0669ab7f7 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0ngdkmb73gkp5y00q7r9k1cdlfn0wyzws2wrqlshc4hlkbdyabj4"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pylev pastel ] ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ] diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix index 329cf4f07ccf6..32a9447a1d628 100644 --- a/pkgs/development/python-modules/clint/default.nix +++ b/pkgs/development/python-modules/clint/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; buildInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; - propagatedBuildInputs = [ pillow blessings args ]; + requiredPythonModules = [ pillow blessings args ]; meta = with stdenv.lib; { homepage = "https://github.com/kennethreitz/clint"; diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 72b6a2fa30ae5..ffe9b59ee9a3d 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ attrs docutils od diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 69813e6a2eb70..04a63a8fa57bc 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "--cov" "" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ dateutil tabulate colorlog diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/pkgs/development/python-modules/closure-linter/default.nix index b814455da3ff6..08ea718d50ea1 100644 --- a/pkgs/development/python-modules/closure-linter/default.nix +++ b/pkgs/development/python-modules/closure-linter/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { sha256 = "076c7q7pr7akfvq5y8lxr1ab81wwps07gw00igdkcxnc5k9dzxwc"; }; - propagatedBuildInputs = [ gflags ]; + requiredPythonModules = [ gflags ]; meta = with stdenv.lib; { description = "Checks JavaScript files against Google's style guide."; diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 7692bd1c9d6c6..97ec30fdf1414 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "a662990737d86984156a48f769e6528d947e90fd1561bb5e19d0036b59b9fd6f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ beautifulsoup4 requests future diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 86d44aed532cb..2a2a3fdc39ea2 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0ebc1925c1aed94f99d74cbc0230215127ade80a25240133204094faa74bc41b"; }; - propagatedBuildInputs = [ pyyaml ]; + requiredPythonModules = [ pyyaml ]; postPatch = '' substituteInPlace lib/ClusterShell/Worker/Ssh.py \ diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 8937f78a7a663..ebea56934e046 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "00vv7imdkv0bqcs4b8dg9nggxcl2fkcnhdd46n22bcmnwy8rjxv6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy ]; diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index 2337964017a2a..22d02d4c46533 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "f20900f16377f2109783ae9348d34bc80530808439591c3d3df73d5c7ef1a00c"; }; - propagatedBuildInputs = [ cffi ]; + requiredPythonModules = [ cffi ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 335649c6be92a..5dc52ad7a31ce 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ colorama pyperclip six diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix index 39f1f9de0c675..e0a5a0379c3c3 100644 --- a/pkgs/development/python-modules/cmdline/default.nix +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { # No tests, https://github.com/rca/cmdline/issues/1 doCheck = false; - propagatedBuildInputs = [ pyyaml ]; + requiredPythonModules = [ pyyaml ]; meta = with stdenv.lib; { description = "Utilities for consistent command line tools"; diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix index ca2402cff6cd3..a6489effafea8 100644 --- a/pkgs/development/python-modules/cmdtest/default.nix +++ b/pkgs/development/python-modules/cmdtest/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0scc47h1nkmbm5zlvk9bsnsg64kb9r4xadchdinf4f1mph9qpgn6"; }; - propagatedBuildInputs = [ cliapp ttystatus markdown ]; + requiredPythonModules = [ cliapp ttystatus markdown ]; # TODO: cmdtest tests must be run before the buildPhase doCheck = false; diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix index ce388bb1d5d29..424ea0c87bf15 100644 --- a/pkgs/development/python-modules/cntk/default.nix +++ b/pkgs/development/python-modules/cntk/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { nativeBuildInputs = [ swig openmpi ]; buildInputs = [ cntk openmpi ]; - propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ]; + requiredPythonModules = [ numpy scipy enum34 protobuf pip ]; CNTK_LIB_PATH = "${cntk}/lib"; CNTK_COMPONENT_VERSION = cntk.version; diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 6677ab06334ff..78fa4551329ef 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "d68adc0121e17c61a3aa28c0a9ba6526510a5a0df0f0a6eb1818bab71b7e927a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ biopython numpy scipy diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 300376b8a6425..f2a14fabd3cd3 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0akkxcj11543c0jn4zdw4a668lk0xg7pghs8mch3xjk8nn8wfblc"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools ]; diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 455888c447dab..0c179a73bca93 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ unittest2 ]; # Tests only - propagatedBuildInputs = [ requests coverage ]; + requiredPythonModules = [ requests coverage ]; postPatch = '' sed -i 's/, "argparse"//' setup.py diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix index 8b103b55171d4..4bdfdde3dad42 100644 --- a/pkgs/development/python-modules/coilmq/default.nix +++ b/pkgs/development/python-modules/coilmq/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "4cbfeb5ed2459df14902c1380157be6267702b1271682924cd316ccad8a29d1d"; }; - propagatedBuildInputs = [ stompclient python-daemon redis pid ]; + requiredPythonModules = [ stompclient python-daemon redis pid ]; buildInputs = [ pytest six click coverage sqlalchemy ]; # The teste data is not included in the distribution diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix index 168f75b7f49b2..1eb5edabae2b6 100644 --- a/pkgs/development/python-modules/coinmarketcap/default.nix +++ b/pkgs/development/python-modules/coinmarketcap/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1cfee31bf330a17cedf188e4e99588e6a4c6c969c93da71f55a9f4ec6a6c216f"; }; - propagatedBuildInputs = [ requests-cache ]; + requiredPythonModules = [ requests-cache ]; meta = with lib; { description = "A python wrapper around the https://coinmarketcap.com API."; diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index 0492e27174657..c5584f3ec7c15 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "54878d2ffd1afb020daca6cd5c6cfe6c0e44d0069fc825d57fe59aa6e4f6a499"; }; - propagatedBuildInputs = [ translationstring iso8601 enum34 ]; + requiredPythonModules = [ translationstring iso8601 enum34 ]; meta = with lib; { description = "A simple schema-based serialization and deserialization library"; diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix index 34e58e0927cd2..c82ebfbe11230 100644 --- a/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/pkgs/development/python-modules/colanderalchemy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; buildInputs = [ unittest2 ]; - propagatedBuildInputs = [ colander sqlalchemy ]; + requiredPythonModules = [ colander sqlalchemy ]; meta = with stdenv.lib; { description = "Autogenerate Colander schemas based on SQLAlchemy models"; diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index a80895de3d154..d23298c98ede2 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1vkx00im4s6zhr2m1j9r0a5vmhkl488b4xpzxb1pidbl19wi6j2i"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ param pyct ]; diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index c2a329e08f343..e916c11038ae4 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; checkInputs = [ pytest mock utillinux ]; - propagatedBuildInputs = [ humanfriendly verboselogs capturer ]; + requiredPythonModules = [ humanfriendly verboselogs capturer ]; meta = with lib; { description = "Colored stream handler for Python's logging module"; diff --git a/pkgs/development/python-modules/colormath/default.nix b/pkgs/development/python-modules/colormath/default.nix index 80f58250be4d5..ba48187c99a03 100644 --- a/pkgs/development/python-modules/colormath/default.nix +++ b/pkgs/development/python-modules/colormath/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1nqf5wy8ikx2g684khzvjc4iagkslmbsxxwilbv4jpaznr9lahdl"; }; - propagatedBuildInputs = [ networkx numpy ]; + requiredPythonModules = [ networkx numpy ]; checkInputs = [ nose ]; checkPhase = "nosetests"; diff --git a/pkgs/development/python-modules/colorspacious/default.nix b/pkgs/development/python-modules/colorspacious/default.nix index 3ce0bddf1def2..3d909006e7d6f 100644 --- a/pkgs/development/python-modules/colorspacious/default.nix +++ b/pkgs/development/python-modules/colorspacious/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "065n24zbm9ymy2gvf03vx5cggk1258vcjdaw8jn9v26arpl7542y"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy ]; diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix index 56ddf76630782..81f3c888572b5 100644 --- a/pkgs/development/python-modules/commonmark/default.nix +++ b/pkgs/development/python-modules/commonmark/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = isPy3k; checkInputs = [ glibcLocales ]; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; meta = with lib; { description = "Python parser for the CommonMark Markdown spec"; diff --git a/pkgs/development/python-modules/compiledb/default.nix b/pkgs/development/python-modules/compiledb/default.nix index 1892337dc2d94..10d3d9c86def6 100644 --- a/pkgs/development/python-modules/compiledb/default.nix +++ b/pkgs/development/python-modules/compiledb/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; checkInputs = [ pytest gcc coreutils ]; - propagatedBuildInputs = [ click bashlex shutilwhich ]; + requiredPythonModules = [ click bashlex shutilwhich ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index b097805292e9f..f664631c9ec69 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "a91ef821343dea3ba9670f3d10b36c1ace4f4c36d70c175d8fc8886e94285953"; }; - propagatedBuildInputs = [ pycosat requests ruamel_yaml ] ++ lib.optional (!isPy3k) enum34; + requiredPythonModules = [ pycosat requests ruamel_yaml ] ++ lib.optional (!isPy3k) enum34; # No tests doCheck = false; diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix index 82ca70c46795e..c3ab45dd67d7b 100644 --- a/pkgs/development/python-modules/configobj/default.nix +++ b/pkgs/development/python-modules/configobj/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkPhase = '' pytest --deselect=tests/test_configobj.py::test_options_deprecation diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index 6a21c1074ea7f..de26359139237 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1ym2hkvmmacgy21wnjwzyrcxyl3sx4bcx4hc51vf4lzcnj589l68"; }; - propagatedBuildInputs = [ pyparsing six urwid ]; + requiredPythonModules = [ pyparsing six urwid ]; meta = with stdenv.lib; { description = "A Python library for building configuration shells"; diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 6b212be3bb7bf..bde0b215cb88c 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson pytest-aiohttp ] ++ lib.optional (pythonOlder "3.7") glibcLocales ; - propagatedBuildInputs = [ + requiredPythonModules = [ clickclick jsonschema pyyaml diff --git a/pkgs/development/python-modules/consonance/default.nix b/pkgs/development/python-modules/consonance/default.nix index 3940686f18c7a..d37caa63db005 100644 --- a/pkgs/development/python-modules/consonance/default.nix +++ b/pkgs/development/python-modules/consonance/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nosetests tests/test_handshakes_offline.py ''; - propagatedBuildInputs = [ dissononce python-axolotl-curve25519 transitions protobuf ]; + requiredPythonModules = [ dissononce python-axolotl-curve25519 transitions protobuf ]; meta = with lib; { homepage = "https://pypi.org/project/consonance/"; diff --git a/pkgs/development/python-modules/contextvars/default.nix b/pkgs/development/python-modules/contextvars/default.nix index 1eda85a6ffe28..37c4c1c8c603b 100644 --- a/pkgs/development/python-modules/contextvars/default.nix +++ b/pkgs/development/python-modules/contextvars/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "f38c908aaa59c14335eeea12abea5f443646216c4e29380d7bf34d2018e2c39e"; }; - propagatedBuildInputs = [ immutables ]; + requiredPythonModules = [ immutables ]; meta = { description = "A backport of the Python 3.7 contextvars module for Python 3.6"; diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index c60d4778012cb..05a20329b5ba7 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1xgi7x9b9kxm0q51bqnmwdm5lp8vwhx5yk4d1b23r37spz9dbhw5"; }; - propagatedBuildInputs = [ pymeeus pytz ]; + requiredPythonModules = [ pymeeus pytz ]; meta = with stdenv.lib; { homepage = "https://github.com/fitnr/convertdate"; diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index 23bc8bcec524e..28802503e8453 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestcov pytest-mock freezegun ]; - propagatedBuildInputs = [ + requiredPythonModules = [ jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify ]; diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix index 521b06755cec8..34b124e616ddf 100644 --- a/pkgs/development/python-modules/coreapi/default.nix +++ b/pkgs/development/python-modules/coreapi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1c6chm3q3hyn8fmjv23qgc79ai1kr3xvrrkp4clbqkssn10k7mcw"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ django coreschema itypes diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix index 5b5ca3f5044eb..24f9adf6846f2 100644 --- a/pkgs/development/python-modules/coreschema/default.nix +++ b/pkgs/development/python-modules/coreschema/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "027pc753mkgbb3r1v1x7dsdaarq93drx0f79ppvw9pfkcjcq6wb1"; }; - propagatedBuildInputs = [ jinja2 ]; + requiredPythonModules = [ jinja2 ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index d09cffb31d64a..60ce7bce43d9a 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "f971831e90343374b21c0c97d523e23eb09cec41a2a8fc2e85bb5c2585348576"; }; - propagatedBuildInputs = [ pyramid simplejson six venusian ]; + requiredPythonModules = [ pyramid simplejson six venusian ]; # tests not packaged with pypi release doCheck = false; diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index 8952d79634d7a..08cad4fc27008 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "f4b3553415f90daac656f89d3e82e79b3d751793239bb173a683b4cc0ceb2635"; }; - propagatedBuildInputs = [ colorlog pyvmomi requests verboselogs pyopenssl setuptools ] + requiredPythonModules = [ colorlog pyvmomi requests verboselogs pyopenssl setuptools ] ++ stdenv.lib.optional (pythonOlder "3.3") psutil; checkInputs = [ mock pytestCheckHook pytest-mock qemu ]; diff --git a/pkgs/development/python-modules/cov-core/default.nix b/pkgs/development/python-modules/cov-core/default.nix index ad85218709e86..dc77848aac72f 100644 --- a/pkgs/development/python-modules/cov-core/default.nix +++ b/pkgs/development/python-modules/cov-core/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a"; }; - propagatedBuildInputs = [ coverage ]; + requiredPythonModules = [ coverage ]; meta = with stdenv.lib; { description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov"; diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 64078693ac199..9c3554392aa38 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { python setup.py test ''; - propagatedBuildInputs = [ + requiredPythonModules = [ coverage docopt requests diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix index 39f2d1227e7ca..83c8ded36c528 100644 --- a/pkgs/development/python-modules/cozy/default.nix +++ b/pkgs/development/python-modules/cozy/default.nix @@ -6,7 +6,7 @@ buildPythonPackage { version = "2.0a1"; disabled = !isPy3k; - propagatedBuildInputs = [ + requiredPythonModules = [ z3 ply python-igraph oset ordered-set dictionaries ]; diff --git a/pkgs/development/python-modules/cppheaderparser/default.nix b/pkgs/development/python-modules/cppheaderparser/default.nix index 688d394198f4a..fcb55b7d739fb 100644 --- a/pkgs/development/python-modules/cppheaderparser/default.nix +++ b/pkgs/development/python-modules/cppheaderparser/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-OCswQW2VsKXoUCshSBDcrCpWQykX4mUUR9Or4lPjzEI="; }; - propagatedBuildInputs = [ ply ]; + requiredPythonModules = [ ply ]; pythonImportsCheck = [ "CppHeaderParser" ]; diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 42236b4d7c225..1529f68d9aedc 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "028q9r1qyqkq185awkazhplfy7y1081963fnjzi3kf3lxvz6yhay"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ urllib3 ]; diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix index 4cd9e90606b62..b8c8df2e3057a 100644 --- a/pkgs/development/python-modules/crayons/default.nix +++ b/pkgs/development/python-modules/crayons/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "dcb85b87aa03bb65bd3a073d012796b024cabeb086033e616759e2abb769440b"; }; - propagatedBuildInputs = [ colorama ]; + requiredPythonModules = [ colorama ]; meta = with stdenv.lib; { description = "TextUI colors for Python"; diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 1f9b4b28f2949..16a81c1de7c43 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytest ]; - propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ]; + requiredPythonModules = [ cryptography boto3 pyyaml docutils ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index a8ae757468806..3d751124366b8 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "9d3098e50f7edc7480470455d42f09c501fa1bb7e2fc113526ec6e90b068f32c"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ python-dateutil natsort ]; diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix index 5ec1ccacae99b..c88e3e8db8477 100644 --- a/pkgs/development/python-modules/cryptacular/default.nix +++ b/pkgs/development/python-modules/cryptacular/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ coverage nose ]; - propagatedBuildInputs = [ pbkdf2 ]; + requiredPythonModules = [ pbkdf2 ]; # TODO: tests fail: TypeError: object of type 'NoneType' has no len() doCheck = false; diff --git a/pkgs/development/python-modules/cryptography/2.9.nix b/pkgs/development/python-modules/cryptography/2.9.nix index 6a6187e5693d2..e4178bd17a53f 100644 --- a/pkgs/development/python-modules/cryptography/2.9.nix +++ b/pkgs/development/python-modules/cryptography/2.9.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - propagatedBuildInputs = [ + requiredPythonModules = [ packaging six ] ++ stdenv.lib.optional (!isPyPy) cffi diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 8774b181fcfc3..aa1b64881d650 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - propagatedBuildInputs = [ + requiredPythonModules = [ packaging six ] ++ stdenv.lib.optional (!isPyPy) cffi diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index eadc3eb32b1f9..659f3ff56db69 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8"; }; - propagatedBuildInputs = [ tinycss2 ]; + requiredPythonModules = [ tinycss2 ]; checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/pkgs/development/python-modules/csvs-to-sqlite/default.nix index 19d0fa4f7bbc8..96ff8e0abb8fd 100644 --- a/pkgs/development/python-modules/csvs-to-sqlite/default.nix +++ b/pkgs/development/python-modules/csvs-to-sqlite/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { --replace pandas~=0.25.0 pandas ''; - propagatedBuildInputs = [ + requiredPythonModules = [ click dateparser pandas diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 76f7cb73b4c4b..77abd0712498a 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "--cov" "" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ attrs isodate dateutil diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index 4c2db1f52146c..549033c08ec2e 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "0i56062k54dlg5iz3qyl1ykww62mpkp8jr4n450h0c60dm0b7ha8"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ chart-studio colorlover ipython diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 5c9a5b76d1017..6abcae0bf4b26 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { export CUDA_PATH=${cudatoolkit} ''; - propagatedBuildInputs = [ + requiredPythonModules = [ cudatoolkit cudnn linuxPackages.nvidia_x11 diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index 9f45c2fd2ba61..84005cca117c7 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ blessings wcwidth ] + requiredPythonModules = [ blessings wcwidth ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ mock pyte nose ]; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 58d06e60d39c4..ac4abf291fafc 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "330eb76e8369c360b68d9231c6eb350848e373b5952134f9bfebaed1a4c4211f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cvxopt ecos multiprocess diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index dd8b1dccc1c3d..7fb37b857c479 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; - propagatedBuildInputs = [ ncurses ]; + requiredPythonModules = [ ncurses ]; # timestamp need to come after 1980 for zipfiles and nix store is set to epoch prePatch = '' diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix index 643a57e259ff5..109b807467df6 100644 --- a/pkgs/development/python-modules/cycler/default.nix +++ b/pkgs/development/python-modules/cycler/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ coverage nose ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkPhase = '' ${python.interpreter} run_tests.py diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index e563e6615fe81..bc7e9a9575747 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0cqz6whq4zginxjnh4cfqlsh535p4qz295ymvjchp71fv8mz11f6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cython ]; diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 9308a13fb5031..1b12c856f3fed 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { gmp ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cysignals cython ]; diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index 137451b6b5cfe..30c28fbb6b97b 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { export PATH="$out/bin:$PATH" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ cython ] ++ lib.optionals pariSupport [ # When cysignals is built with pari, including cysignals into the diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 0e72ecaa82526..438775dbbd296 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ toolz ]; + requiredPythonModules = [ toolz ]; # Failing test https://github.com/pytoolz/cytoolz/issues/122 checkPhase = '' diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 80fa1c35d6324..04fb4f1f6f3a5 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ asgiref autobahn twisted service-identity pyopenssl ]; + requiredPythonModules = [ asgiref autobahn twisted service-identity pyopenssl ]; checkInputs = [ hypothesis pytest pytest-asyncio ]; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index f6f00553d930f..7efc691d2b796 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "1fbnhpmkxavv6yirmhx7659q1y9bqynwjd1g6cscv1mfv9m59l60"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ plotly flask flask-compress diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix index 9d28d26719173..5fd1732cb21a0 100644 --- a/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { go ]; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp colorlog cryptography diff --git a/pkgs/development/python-modules/dask-gateway/default.nix b/pkgs/development/python-modules/dask-gateway/default.nix index 8a4fe9e263a5b..9871ddbb1ceb5 100644 --- a/pkgs/development/python-modules/dask-gateway/default.nix +++ b/pkgs/development/python-modules/dask-gateway/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "519818f3598ddd726882c5a6bf7053941613d8517b80e8a2c28467e30d57da9b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp dask distributed diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 0a88323fafd8c..230dde245bae3 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ]; + requiredPythonModules = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ]; checkPhase = '' py.test dask_glm diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index f119cf2b0b8be..285dc1b6a978c 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytest-flake8 ]; - propagatedBuildInputs = [ dask numpy toolz scipy pims ]; + requiredPythonModules = [ dask numpy toolz scipy pims ]; checkInputs = [ pytest scikitimage diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index 52e22a093311b..4e5a1bee03887 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ dask distributed docrep ]; + requiredPythonModules = [ dask distributed docrep ]; # do not run entire tests suite (requires slurm, sge, etc.) checkPhase = '' diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index d4a6663e7a502..44a8af3368e91 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sha256 = "ce686b7fd49b3f876d651c87e8468ad71bcd2707399140d6baf198184c45d970"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ dask dask-glm distributed diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index 2794bcba7aed5..9b51c9a9be8ef 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest requests ]; - propagatedBuildInputs = [ dask distributed mpi4py ]; + requiredPythonModules = [ dask distributed mpi4py ]; checkPhase = '' py.test dask_mpi diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index 9730ca8a2feb2..181e77ec94561 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest scikitlearn ]; - propagatedBuildInputs = [ xgboost dask distributed ]; + requiredPythonModules = [ xgboost dask distributed ]; checkPhase = '' py.test dask_xgboost/tests/test_core.py diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 59ea588851ecd..6f983291b4d46 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; - propagatedBuildInputs = [ + requiredPythonModules = [ bokeh cloudpickle dill diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index f5a7c52ef8e50..f8e061e249203 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "0cdb4vln4zdmqbbcj7711b81b2l64jg1miihqcg8gpi35v404h2q"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ sqlalchemy aiocontextvars ]; diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 952f0723c7c2d..d3f9bf83c002a 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # tests folder is missing in PyPI doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ click requests tabulate diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index df3d08c3fab44..37ee4ef461499 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sourceRoot = "."; - propagatedBuildInputs = [ py4j six jdk ]; + requiredPythonModules = [ py4j six jdk ]; # requires network access doCheck = false; diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 36430a29ef0f0..d0f9c4abbdcf1 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "56ec931959ede74b5dedf65cf20772e6a79764d20c404794cce0111c88c085ff"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ stringcase typing-inspect marshmallow-enum diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index a8917c3965f8a..ccfa2250f0c20 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { find . -name '*.pyc' -exec rm {} \; ''; - propagatedBuildInputs = [ decorator requests simplejson pillow ] + requiredPythonModules = [ decorator requests simplejson pillow ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ nose mock pytest freezegun ]; diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix index e4c10d8c22c76..ca5fe3457fca8 100644 --- a/pkgs/development/python-modules/datamodeldict/default.nix +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "b1be7573cb4401aa250fd00f2e6392543f6f2498f8e02f6313595aa220e5c99e"; }; - propagatedBuildInputs = [ xmltodict ]; + requiredPythonModules = [ xmltodict ]; # no tests doCheck = false; diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index b953ed1dd1af6..2832b04744e4e 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "14f7847b8md5kf631zl8x2f53wy8zbzxypq4wdgzvwsjz4k7v4jn"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ dill filelock numpy diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 3ae2142181641..f51b879f7689d 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ + requiredPythonModules = [ aiofiles asgi-csrf click diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 233aac688abd2..b9f72762173af 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ dask distributed bokeh diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 6f11ae62c3e9a..8369f0742fd64 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -29,7 +29,7 @@ in buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + requiredPythonModules = [ numpy multipledispatch dateutil ]; # Disable several tests # https://github.com/blaze/datashape/issues/232 diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index c5271e473e3ed..3870bf2154f04 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { python ci/ext.py wheel ''; - propagatedBuildInputs = [ typesentry blessed ]; + requiredPythonModules = [ typesentry blessed ]; buildInputs = [ llvm pipInstallHook ]; checkInputs = [ docutils pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 729827317c189..a20d388bf0836 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { # AttributeError: 'module' object has no attribute 'config' doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ # install_requires dateutil pytz regex tzlocal # extra_requires diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index 88024265d9482..7513c79168284 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ six setuptools_scm ]; + requiredPythonModules = [ six setuptools_scm ]; checkPhase = '' py.test dateutil/test diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 9eb6e4f89a269..bb19404a491bd 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "a4a7a8cdc113d840142d21a796c16c7d329ad35c48f17156446732c83ebc571a"; }; - propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + requiredPythonModules = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; doCheck = !isPy3k; # tests are not yet ported. diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix index f06e361dc7169..6580f6cfa3562 100644 --- a/pkgs/development/python-modules/dcmstack/default.nix +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1n24pp3rqz7ss1z6276fxynnppraxadbl3b9p8ijrcqnpzbzih7p"; }; - propagatedBuildInputs = [ nibabel pydicom ]; + requiredPythonModules = [ nibabel pydicom ]; checkInputs = [ nose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index f993c3844b850..922c408065db9 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ six pyyaml mock pytestCheckHook ]; - propagatedBuildInputs = lib.optionals (!isPy3k) [ + requiredPythonModules = lib.optionals (!isPy3k) [ enum34 ]; diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index 5a09c42a9bbf7..3ac1b0702bb3c 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0bvshly83c4h5jhxaa97z192viczymz5fxp6vl8awjmmrs9l9x8i"; }; - propagatedBuildInputs = [ numpy matplotlib ]; + requiredPythonModules = [ numpy matplotlib ]; checkInputs = [ nose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index 9f5cb744e55f2..a10ae1c0975aa 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "a352bb5f9ef19b0272078f516ee0ec42b05e90ac85651d87c10e7041550dcc1d"; }; - propagatedBuildInputs = [ chardet six ]; + requiredPythonModules = [ chardet six ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/debts/default.nix b/pkgs/development/python-modules/debts/default.nix index cc571f056314e..a7ce4ab6d4481 100644 --- a/pkgs/development/python-modules/debts/default.nix +++ b/pkgs/development/python-modules/debts/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { disabled = isPy27; - propagatedBuildInputs = [ jinja2 ]; + requiredPythonModules = [ jinja2 ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index e8d2731eb559c..58260136130a6 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pytestCheckHook ]; - propagatedBuildInputs = [ + requiredPythonModules = [ jsonpickle mmh3 ordered-set diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix index 0d81110dee825..320173aa5b4a5 100644 --- a/pkgs/development/python-modules/deepmerge/default.nix +++ b/pkgs/development/python-modules/deepmerge/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "fa1d44269786bcc12d30a7471b0b39478aa37a43703b134d7f12649792f92c1f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ vcver ]; diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 25c5902999224..71cb8abdfaf60 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ fonttools ]; diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix index 5b3a6e7281ec1..40e4efe5d48bb 100644 --- a/pkgs/development/python-modules/deform/default.nix +++ b/pkgs/development/python-modules/deform/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { --replace "iso8601<=0.1.11" iso8601 ''; - propagatedBuildInputs = [ + requiredPythonModules = [ chameleon colander iso8601 diff --git a/pkgs/development/python-modules/delegator-py/default.nix b/pkgs/development/python-modules/delegator-py/default.nix index 3521e8ce12987..eb9f58ffcd786 100644 --- a/pkgs/development/python-modules/delegator-py/default.nix +++ b/pkgs/development/python-modules/delegator-py/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "17n9h3xzjsfxmwclh33vc4yg3c9yzh9hfhaj12kv5ah3fy8rklwb"; }; - propagatedBuildInputs = [ pexpect ]; + requiredPythonModules = [ pexpect ]; # no tests in github or pypi doCheck = false; diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 58099a98bdcb1..3ab09e6025972 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0s8v918n6xn44r2mrq5hqbf0znpz64clq7a1jakkgz9py8bi6vnn"; }; - propagatedBuildInputs = [ requests netifaces ]; + requiredPythonModules = [ requests netifaces ]; doCheck = !isPy27; checkInputs = [ pytest testtools requests-mock ]; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 1a90462a245f8..aa0eb38c9bf68 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "717388a9346883eb5def3e96def7275763f2a607cac48c272f352e3834e0bd0d"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ unittest2 pyyaml flask ]; checkPhase = '' diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index d6e5acdeaf8cb..395006a9c4d18 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0x3zkmykcyjn8k57g8lcf89fxw8q7hvvcj6xkwb0f2zrnmpscnsj"; }; - propagatedBuildInputs = [ wrapt ]; + requiredPythonModules = [ wrapt ]; checkInputs = [ pytest ]; meta = with stdenv.lib; { homepage = "https://github.com/tantale/deprecated"; diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index fb5698062f77b..e2740a46695a2 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj"; }; - propagatedBuildInputs = [ packaging ]; + requiredPythonModules = [ packaging ]; checkInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix index 9138ef28530a7..2f02998a499b6 100644 --- a/pkgs/development/python-modules/derpconf/default.nix +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1bb152d8a1cf5c2a6d629bf29acd4af0c00811339642fc0a56172b0a83b31a15"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { description = "derpconf abstracts loading configuration files for your app"; diff --git a/pkgs/development/python-modules/descartes/default.nix b/pkgs/development/python-modules/descartes/default.nix index c726492f69d4d..b32d1032f460a 100644 --- a/pkgs/development/python-modules/descartes/default.nix +++ b/pkgs/development/python-modules/descartes/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0nq36w9ylvfwmwn5qd9c8fsp2jzsqpmy4xcr6pzxcpmg8qhm0nhk"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ matplotlib shapely ]; diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix index 7beaa838a8254..8ae02a4fcda1b 100644 --- a/pkgs/development/python-modules/deskcon/default.nix +++ b/pkgs/development/python-modules/deskcon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { phases = [ "unpackPhase" "installPhase" ]; - pythonPath = [ pyopenssl pkgs.gtk3 ]; + requiredPythonModules = [ pyopenssl pkgs.gtk3 ]; installPhase = '' substituteInPlace server/deskcon-server --replace "python2" "python" @@ -30,7 +30,7 @@ buildPythonPackage { cp -r "server/"* $out/lib/${python.libPrefix}/site-packages mv $out/lib/${python.libPrefix}/site-packages/deskcon-server $out/bin/deskcon-server - wrapPythonProgramsIn $out/bin "$out $pythonPath" + wrapPythonProgramsIn $out/bin "$out $requiredPythonModules" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index ac83c0dd938db..8f951d901c7b3 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "4f1eb1bf85a5dabd4f4ecc11ad99588e01cc204989a9f424c2dbe5809c6c3745"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests py lazy diff --git a/pkgs/development/python-modules/dftfit/default.nix b/pkgs/development/python-modules/dftfit/default.nix index 0f0563e3baf54..65c593321c93b 100644 --- a/pkgs/development/python-modules/dftfit/default.nix +++ b/pkgs/development/python-modules/dftfit/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { buildInputs = [ pytestrunner ]; checkInputs = [ pytest pytestcov pytest-benchmark openssh ]; - propagatedBuildInputs = [ pymatgen marshmallow pyyaml pygmo + requiredPythonModules = [ pymatgen marshmallow pyyaml pygmo pandas scipy numpy scikitlearn lammps-cython pymatgen-lammps ]; diff --git a/pkgs/development/python-modules/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix index 8e35eabfb0d7f..6944972727727 100644 --- a/pkgs/development/python-modules/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; checkInputs = [ coverage pytest ]; diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index abc07346efd32..60281b4c70479 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "1qi2map6f4pa1l8wsif7ff7rhja6ynrjlm7w306dzvi9l25mia34"; }; - propagatedBuildInputs = [ gdcm nibabel numpy pydicom scipy ]; + requiredPythonModules = [ gdcm nibabel numpy pydicom scipy ]; checkInputs = [ nose gdcm ]; checkPhase = "nosetests tests"; diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index 457e9d3e530bd..19708f4b4767d 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0bfn8n8sb3slwx7ra8m8fbfy65k20h2qxcqfq99hwqrrkgcffihl"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with lib; { description = "Super simple library to convert a Python dictionary into an xml string"; diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index ab9d9493fd604..669ee1c212fbe 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { sha256 = "61a98ec126552d985c0e3e3c33cc72e79d7577f91f6edba99f635411a173d3b9"; }; - propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; + requiredPythonModules = [ jinja2 jinja2_pluralize pygments six inflect ]; checkInputs = [ mock coverage pytest nose pylint pyflakes pycodestyle ]; diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix index 32d8c47a98011..d9b0c6624a065 100644 --- a/pkgs/development/python-modules/digi-xbee/default.nix +++ b/pkgs/development/python-modules/digi-xbee/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "2ed798faee0853bf7ae9ca5aa4bdcbab496e3c2d56c9f0719a8e3e0d13270891"; }; - propagatedBuildInputs = [ pyserial srp ]; + requiredPythonModules = [ pyserial srp ]; # Upstream doesn't contain unit tests, only functional tests which require specific hardware doCheck = false; diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index 404331a495773..43a347e50d99d 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "1pz15mh72i992p63grwzqn2bbp6sm37zcp4f0fy1z7rsargwsbcz"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ jsonpickle requests ]; diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix index c473f2fb4200f..c9286a4f7a43d 100644 --- a/pkgs/development/python-modules/diofant/default.nix +++ b/pkgs/development/python-modules/diofant/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ mpmath strategies ]; diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix index a1360ada2257a..0e72f530e9b02 100644 --- a/pkgs/development/python-modules/dipy/default.nix +++ b/pkgs/development/python-modules/dipy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ cython packaging ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy h5py diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix index 8d8fb12d4d9be..5a83f5bf2a7e9 100644 --- a/pkgs/development/python-modules/discogs_client/default.nix +++ b/pkgs/development/python-modules/discogs_client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "cc979fcbb5283f74d388c7111c8ed6bef920b01614a014d6b1c5d6fbb554bfc3"; }; - propagatedBuildInputs = [ requests oauthlib ]; + requiredPythonModules = [ requests oauthlib ]; meta = with stdenv.lib; { description = "Official Python API client for Discogs"; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index fd31bb40a92c7..0b85d8b5c3790 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1i4h6vq681x8s05wi0n3ykavsxjh9hxdxn6banwjcqzhxzkyhsxi"; }; - propagatedBuildInputs = [ aiohttp websockets ]; + requiredPythonModules = [ aiohttp websockets ]; patchPhase = '' substituteInPlace "requirements.txt" \ --replace "aiohttp>=3.6.0,<3.7.0" "aiohttp~=3.6.0" \ diff --git a/pkgs/development/python-modules/dissononce/default.nix b/pkgs/development/python-modules/dissononce/default.nix index 80655e6aa0843..91860c2c775b9 100644 --- a/pkgs/development/python-modules/dissononce/default.nix +++ b/pkgs/development/python-modules/dissononce/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { HOME=$(mktemp -d) py.test tests/ ''; - propagatedBuildInputs = [ cryptography transitions ]; + requiredPythonModules = [ cryptography transitions ]; meta = with lib; { homepage = "https://pypi.org/project/dissononce/"; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index f4be407fade2a..5e21fe5261c70 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ]; - propagatedBuildInputs = [ + requiredPythonModules = [ click cloudpickle dask msgpack psutil six sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh ]; diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index a91bd6cadc3e5..1e0303b7d0c6a 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "10id4k01p1hg5agb8cmllg8mv4kc7ryl75br10idwxabqqp4vla1"; }; - propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ]; + requiredPythonModules = [ requests requests_oauthlib django python3-openid ]; checkInputs = [ coverage mock ]; diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 32fb403419414..0ae948bdc659f 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1v8ayd3nh7pna9lg0pzwgwmvmzzh2g1kxsy7i6mka0hi52g1xvz5"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six requests django diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 84b9df28bce62..79cbd80878c6a 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "11af1773b08613339d2c3a0cec1308a4d563518f17b1719c3759994d0b4d04bf"; }; - propagatedBuildInputs = [ ldap django ]; + requiredPythonModules = [ ldap django ]; checkInputs = [ mock ]; # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index 57426181b7358..df2a277f32739 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { runHook postCheck ''; - propagatedBuildInputs = [ django six ]; + requiredPythonModules = [ django six ]; meta = with stdenv.lib; { description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9, 1.10 and 1.11"; diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index 5b813977493e2..d37b6837ee70f 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url ]; checkPhase = '' diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 3614114a3d4b8..a23f25462c1d2 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "f5218f2f0bb1210563ff87687afbf10786e080d8494a248e705507ebd92d7153"; }; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; # pypi release does not include tests doCheck = false; diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix index 1eed9578a8a2c..0ed26c29278e5 100644 --- a/pkgs/development/python-modules/django-csp/default.nix +++ b/pkgs/development/python-modules/django-csp/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # too complicated to setup - needs a running django instance doCheck = false; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; meta = with stdenv.lib; { description = "Adds Content-Security-Policy headers to Django"; diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix index 43ae9a7c83a5b..4438d604f5f8a 100644 --- a/pkgs/development/python-modules/django-discover-runner/default.nix +++ b/pkgs/development/python-modules/django-discover-runner/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0ba91fe722c256bcbfdeb36fac7eac0f27e5bfda55d98c4c1cf9ab62b5b084fe"; }; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; # tests not included with release doCheck = false; diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index de3424c9fec58..1de4ede88842e 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "e4b2bb7b2563c5064ba56dd76441c77e06b850ff1466a386a1cd308909a6c7de"; }; - propagatedBuildInputs = [ six django persisting-theory ]; + requiredPythonModules = [ six django persisting-theory ]; # django.core.exceptions.ImproperlyConfigured: Requested setting DYNAMIC_PREFERENCES, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index ecf400b21d862..f02622a2a819e 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; __darwinAllowLocalNetworking = true; - propagatedBuildInputs = [ six ] + requiredPythonModules = [ six ] ++ lib.optional (pythonOlder "3.5") typing; checkInputs = [ diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index 93f3f20f3051b..5741019650d28 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "84e9d5bb93f237e451db814ed422a3a625751cbc9968b484ecc74964a8696b06"; }; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; # Tests fail (needs the 'crispy_forms' module not packaged on nixos) doCheck = false; diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 381624e5719e5..9736b67a74341 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ]; - propagatedBuildInputs = [ django setuptools ]; + requiredPythonModules = [ django setuptools ]; nativeBuildInputs = [ setuptools_scm ]; postPatch = '' diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index e30fc88079caa..a1f0edf7a4157 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; checkInputs = [ django_nose ]; - propagatedBuildInputs = [ django_hijack ]; + requiredPythonModules = [ django_hijack ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index d736e69ae6ef2..67ac1fe3cf5a6 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; checkInputs = [ django_nose ]; - propagatedBuildInputs = [ django django_compat ]; + requiredPythonModules = [ django django_compat ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 940bd1f1cb839..f2e12be77c5ce 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "73a640a5bff00aa7503a35e92e462001cfabb07d73d649c262f117423beee953"; }; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; # django.core.exceptions.ImproperlyConfigured: Requested setting IPWARE_TRUSTED_PROXY_LIST, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. doCheck = false; diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index 97a9608cff734..2a4be03073c94 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ django pytz tox ]; - propagatedBuildInputs = [ django jinja2 ]; + requiredPythonModules = [ django jinja2 ]; # python installed: The directory '/homeless-shelter/.cache/pip/http' or its parent directory is not owned by the current user and the cache has been disabled. Please check the permissions and owner of that directory. If executing pip with sudo, you may want sudo's -H flag.,appdirs==1.4.3,Django==1.11.1,django-jinja==2.2.2,Jinja2==2.9.6,MarkupSafe==1.0,packaging==16.8,pyparsing==2.2.0,pytz==2017.2,six==1.10.0 doCheck = false; diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix index d9734ff4a220f..e41fac25ec51a 100644 --- a/pkgs/development/python-modules/django-logentry-admin/default.nix +++ b/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pytest ''; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; meta = with stdenv.lib; { description = "Show all LogEntry objects in the Django admin site"; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index afa504f1bc71e..53cf67505c588 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "7e37b68bb47e9ae196ca19018f576e2c8c90189c5bd82d4e549d0c2f2f3f35fb"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ django-gravatar2 django_compressor django-allauth mailmanclient ]; checkInputs = [ django mock ]; diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix index 2e433aa5d4590..a4c0c406a4b33 100644 --- a/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; meta = with stdenv.lib; { description = "Shows a 503 error page when maintenance-mode is on"; diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix index 046c60989a74d..e5f423c71942a 100644 --- a/pkgs/development/python-modules/django-multiselectfield/default.nix +++ b/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1ygra8s394d1szgj7yawlca17q08hygsrzvq2k3k48zvd0awg96h"; }; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; # No tests doCheck = false; diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 83f1049a2e568..87cc54be05fc2 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1zbksxrcxlqnapmlvx4rgvpqc4plgnq0xnf45cjwzwi1626zs8g6"; }; - propagatedBuildInputs = [ django requests oauthlib ]; + requiredPythonModules = [ django requests oauthlib ]; # django.core.exceptions.ImproperlyConfigured: Requested setting OAUTH2_PROVIDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; diff --git a/pkgs/development/python-modules/django-pglocks/default.nix b/pkgs/development/python-modules/django-pglocks/default.nix index a84850a1fda97..66d2ce03bcfc8 100644 --- a/pkgs/development/python-modules/django-pglocks/default.nix +++ b/pkgs/development/python-modules/django-pglocks/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ django ]; - propagatedBuildInputs = [ django six ]; + requiredPythonModules = [ django six ]; # tests need a postgres database doCheck = false; diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 4710de2c7ecb5..5593ee18e4c3b 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0ni7bc86k0ra4pc8zv451pzlpkhs1nyil1sq9jdb4m2mib87b5fk"; }; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; checkInputs = [ pytest pytest-django ]; diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix index 3276f7a065c76..a6c1458f49982 100644 --- a/pkgs/development/python-modules/django-pipeline/default.nix +++ b/pkgs/development/python-modules/django-pipeline/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { --replace "/usr/bin/env" "" ''; - propagatedBuildInputs = [ django ] ++ lib.optional (!isPy3k) futures; + requiredPythonModules = [ django ] ++ lib.optional (!isPy3k) futures; checkInputs = [ jinja2 jsmin slimit ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index c08facd3650eb..1041ffd5185c3 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; checkInputs = [ dj-database-url ]; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; checkPhase = '' ${python.interpreter} runtests.py diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index 73c15850d33c8..33f231e1c9422 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # unittest2 # ]; - propagatedBuildInputs = [ + requiredPythonModules = [ django netaddr six diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index 0755c5055a1e9..a3e2090003f62 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "523d54dcf1b66152c1b658f914f00ed3b518a3432a9decd4898738ca8dbbe10f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ django-picklefield arrow blessed django future ]; diff --git a/pkgs/development/python-modules/django-ranged-response/default.nix b/pkgs/development/python-modules/django-ranged-response/default.nix index 29b2baf89cdce..99da15f98227b 100644 --- a/pkgs/development/python-modules/django-ranged-response/default.nix +++ b/pkgs/development/python-modules/django-ranged-response/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # tests not included in PyPi package, github source is not up to date with 0.2.0 doCheck = false; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; meta = with stdenv.lib; { description = "A modified FileResponse that returns `Content-Range` headers with the HTTP response, so browsers (read Safari 9+) that request the file, can stream the response properly"; diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 056f8dffdcfca..185056e40d91f 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # Tests require a postgresql + postgis server doCheck = false; - propagatedBuildInputs = [ numpy django_colorful pillow psycopg2 + requiredPythonModules = [ numpy django_colorful pillow psycopg2 pyparsing django celery boto3 importlib-metadata ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix index 9e11c2b6a03e0..68c7c941cb1b5 100644 --- a/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/pkgs/development/python-modules/django-rest-auth/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "f11e12175dafeed772f50d740d22caeab27e99a3caca24ec65e66a8d6de16571"; }; - propagatedBuildInputs = [ django djangorestframework six ]; + requiredPythonModules = [ django djangorestframework six ]; # pypi release does not include tests doCheck = false; diff --git a/pkgs/development/python-modules/django-sampledatahelper/default.nix b/pkgs/development/python-modules/django-sampledatahelper/default.nix index faad550d43912..93b67f836245a 100644 --- a/pkgs/development/python-modules/django-sampledatahelper/default.nix +++ b/pkgs/development/python-modules/django-sampledatahelper/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ django nose pillow sampledata six versiontools ]; - propagatedBuildInputs = [ django sampledata ]; + requiredPythonModules = [ django sampledata ]; # HACK To prevent collision with pythonPackages.sampledata preBuild = '' diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix index 0724bf27b317d..65acd5edb6915 100644 --- a/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ${python.interpreter} manage.py test captcha ''; - propagatedBuildInputs = [ django django-ranged-response six pillow ] + requiredPythonModules = [ django django-ranged-response six pillow ] ++ lib.optional withTTS flite; meta = with lib; { diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix index 468f7e738038b..11e6320861cdb 100644 --- a/pkgs/development/python-modules/django-sites/default.nix +++ b/pkgs/development/python-modules/django-sites/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { touch LICENSE ''; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; # required files for test don't seem to be included in pypi package, full source for 0.10 # version doesn't appear to be present on github diff --git a/pkgs/development/python-modules/django-sr/default.nix b/pkgs/development/python-modules/django-sr/default.nix index 39b3832185d3f..2e85247f90f4b 100644 --- a/pkgs/development/python-modules/django-sr/default.nix +++ b/pkgs/development/python-modules/django-sr/default.nix @@ -16,5 +16,5 @@ buildPythonPackage rec { }; buildInputs = [ django nose ]; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; } diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index cae83135a6fa0..9c867ba7c6653 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "148y2hyx1l4pfbqpq8hgq95fw8bhfbblwd3m5xwnhw6frcirk7m5"; }; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; # django.core.exceptions.ImproperlyConfigured: Requested setting DEFAULT_INDEX_TABLESPACE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. doCheck = false; diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index de5854192d202..e2c54825cc8c3 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "b197e7066f23bb73b001a61525f2b1cae3dd654bf208a944a7ff5a3fe6107b51"; }; - propagatedBuildInputs = [ pillow python_magic ]; + requiredPythonModules = [ pillow python_magic ]; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix index 99e3abda890a6..c553bdb9ed0c1 100644 --- a/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkPhase = "${python.interpreter} runtests.py"; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; meta = with stdenv.lib; { description = "Tweak the form field rendering in templates, not in python-level form definitions."; diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index 64897890759ec..a9da9b416ccf9 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }) ; - propagatedBuildInputs = [ pytz sqlparse ]; + requiredPythonModules = [ pytz sqlparse ]; # too complicated to setup doCheck = false; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 84a7e8b1e3c61..c0229d1e00016 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { extension = stdenv.hostPlatform.extensions.sharedLibrary; }); - propagatedBuildInputs = [ + requiredPythonModules = [ asgiref pytz sqlparse diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix index 45116ddd55486..bbd6940f7a2c0 100644 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "06hwbz7362y0la9np3df25mms235fcqgpd2vn0mnf8dri9spzy1h"; }; - propagatedBuildInputs = [ six django ]; + requiredPythonModules = [ six django ]; patches = [ (fetchpatch { diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix index 102e2e7cf9353..53b252c5dbd5e 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django_classytags/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "d59d98bdf96a764dcf7a2929a86439d023b283a9152492811c7e44fc47555bc9"; }; - propagatedBuildInputs = [ django six ]; + requiredPythonModules = [ django six ]; # pypi version doesn't include runtest.py, needed to run tests doCheck = false; diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index 1408032d0c275..d380c3e56cc42 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # requires django-sekizai, which we don't have packaged yet doCheck = false; - propagatedBuildInputs = [ rcssmin rjsmin django_appconf ]; + requiredPythonModules = [ rcssmin rjsmin django_appconf ]; meta = with stdenv.lib; { description = "Compresses linked and inline JavaScript or CSS into single cached files"; diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index 303d6d95a460e..45a2de0c5abc8 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "d1232bade3094de07dcc205fc833204384e71ba9d30caadcb5bb2882ce8e8d31"; }; - propagatedBuildInputs = [ django six ]; + requiredPythonModules = [ django six ]; meta = with stdenv.lib; { homepage = "https://github.com/django/django-contrib-comments"; diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index e4ec7505c831a..858b9e29eb9eb 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # The testsuite fails to modify the base environment doCheck = false; - propagatedBuildInputs = [ django six ]; + requiredPythonModules = [ django six ]; meta = with stdenv.lib; { description = "Utilize environment variables to configure your Django application"; diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/pkgs/development/python-modules/django_evolution/default.nix index eac119ef01ea0..e22e9f1f81902 100644 --- a/pkgs/development/python-modules/django_evolution/default.nix +++ b/pkgs/development/python-modules/django_evolution/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "a0bc983657de1b0bc5c8d29ddcbf7b6fb113685bf306ccc266cf22b8a77bd862"; }; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; meta = with stdenv.lib; { description = "A database schema evolution tool for the Django web framework"; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 364a5e12f52fb..5f70f192b6e4b 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; meta = with stdenv.lib; { description = "Per object permissions for Django"; diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index e41b455cd4b5e..1eb63596ec73a 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; - propagatedBuildInputs = [ pytz six ]; + requiredPythonModules = [ pytz six ]; meta = with stdenv.lib; { description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database"; diff --git a/pkgs/development/python-modules/django_nose/default.nix b/pkgs/development/python-modules/django_nose/default.nix index 66a4ad7857b98..80ea661fe19cf 100644 --- a/pkgs/development/python-modules/django_nose/default.nix +++ b/pkgs/development/python-modules/django_nose/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # vast dependency list doCheck = false; - propagatedBuildInputs = [ django nose ]; + requiredPythonModules = [ django nose ]; meta = with stdenv.lib; { description = "Provides all the goodness of nose in your Django tests"; diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 114962477fd6b..d2db711f6597b 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ mock ]; - propagatedBuildInputs = [ + requiredPythonModules = [ django redis msgpack diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 9d307734367c0..93959b0c3aa3c 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # tests assume the availability of a mysql/postgresql database doCheck = false; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; meta = with stdenv.lib; { description = "An extension to the Django web framework that provides comprehensive version control facilities"; diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 8efd62d7d1812..acc5dadce5ad9 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ''; buildInputs = [ mock ]; - propagatedBuildInputs = [ + requiredPythonModules = [ django pygments simplejson dateutil requests sqlparse jinja2 autopep8 pytz pillow gprof2dot ]; diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix index 4bcaa549a12f8..87cc0f5f30056 100644 --- a/pkgs/development/python-modules/django_tagging/default.nix +++ b/pkgs/development/python-modules/django_tagging/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; meta = { description = "A generic tagging application for Django projects"; diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index 80ee899b18322..0274f10517ce2 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "4a833bf71f4c2deddd9745924eee53be1c075d7f0020a06f12e29fa3d752732d"; }; - propagatedBuildInputs = [ isort django ]; + requiredPythonModules = [ isort django ]; checkInputs = [ mock ]; checkPhase = '' diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index 060867d837f92..549e1350da09e 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; # tests fail "AppRegistryNotReady("Apps aren't loaded yet.")" doCheck = false; diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index ec39f0739aeb0..124c9de03754f 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "91fd65d9ee4b09092602ff05aca8a21c5a18062faf56f269a011b8e8e41483c6"; }; - propagatedBuildInputs = [ ply ]; + requiredPythonModules = [ ply ]; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/djangorestframework-jwt/default.nix b/pkgs/development/python-modules/djangorestframework-jwt/default.nix index 643218242d798..ba8d168ab8572 100644 --- a/pkgs/development/python-modules/djangorestframework-jwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-jwt/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "19rng6v1sw14mbjp5cplnrgxjnhlj8faalfw02iihi9s5w1k7zjy"; }; - propagatedBuildInputs = [ pyjwt django djangorestframework ]; + requiredPythonModules = [ pyjwt django djangorestframework ]; # ./runtests.py fails because the project must be tested against a django # installation, there are missing database tables for User, that don't exist. diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index f4c50a7114947..7d59216f00829 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "c315be70aa12a5f5790c0ab9acd426c3a58eebea65a77d0893248c5144a5080c"; }; - propagatedBuildInputs = [ django djangorestframework pyjwt ]; + requiredPythonModules = [ django djangorestframework pyjwt ]; # Test raises django.core.exceptions.ImproperlyConfigured doCheck = false; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 8d1055029b7a9..8b87da57f6f35 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # Test settings are missing doCheck = false; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; meta = with stdenv.lib; { description = "Web APIs for Django, made easy"; diff --git a/pkgs/development/python-modules/djmail/default.nix b/pkgs/development/python-modules/djmail/default.nix index 8efb9788e1274..277595a5179f0 100644 --- a/pkgs/development/python-modules/djmail/default.nix +++ b/pkgs/development/python-modules/djmail/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ celery django psycopg2 ]; + requiredPythonModules = [ celery django psycopg2 ]; # django.core.exceptions.ImproperlyConfigured: Requested setting DEFAULT_INDEX_TABLESPACE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. doCheck = false; diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index aaecda77780c1..a2c74f4d4d63b 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ openssl dnspython pynacl authres ]; + requiredPythonModules = [ openssl dnspython pynacl authres ]; patchPhase = '' substituteInPlace dkim/dknewkey.py --replace \ diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 627f8eedaeb12..9217c3ed0df77 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -66,7 +66,7 @@ in buildPythonPackage { src = bazel-build; - propagatedBuildInputs = [ + requiredPythonModules = [ six absl-py semantic-version diff --git a/pkgs/development/python-modules/dmenu/default.nix b/pkgs/development/python-modules/dmenu/default.nix index 130110173eedc..258500b7da040 100644 --- a/pkgs/development/python-modules/dmenu/default.nix +++ b/pkgs/development/python-modules/dmenu/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "06v2fq0ciallbib7sbk4kncj0n3gdqp1kz8n5k2669x49wyh34wm"; }; - propagatedBuildInputs = [ dmenu ]; + requiredPythonModules = [ dmenu ]; # No tests existing doCheck = false; diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index c2a7df098f4b0..4ec6d82378fb2 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; buildInputs = [ pbr ]; - propagatedBuildInputs = [ + requiredPythonModules = [ docutils six chardet diff --git a/pkgs/development/python-modules/docker-py/default.nix b/pkgs/development/python-modules/docker-py/default.nix index f7982c4a11912..f2bb2f9d13928 100644 --- a/pkgs/development/python-modules/docker-py/default.nix +++ b/pkgs/development/python-modules/docker-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # The tests access the network. doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ six requests websocket_client diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index a75278d45d433..bcb3f7b2b6144 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # require docker-credential-helpers binaries doCheck = false; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { description = "Python bindings for the docker credentials store API."; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index d46fbe991aea2..57a29fb87e30c 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = lib.optional isPy27 mock; - propagatedBuildInputs = [ + requiredPythonModules = [ paramiko requests six diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index c0b14bf88ca5c..2a7add026eb8d 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { echo " " > tests/requirements.txt \ ''; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytestcov pytest ]; diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/pkgs/development/python-modules/dockerpty/default.nix index fd9d7b4b88da4..36754d3c0d4e1 100644 --- a/pkgs/development/python-modules/dockerpty/default.nix +++ b/pkgs/development/python-modules/dockerpty/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container"; diff --git a/pkgs/development/python-modules/dockerspawner/default.nix b/pkgs/development/python-modules/dockerspawner/default.nix index 192fb94bd45a6..0eb7e783e2a57 100644 --- a/pkgs/development/python-modules/dockerspawner/default.nix +++ b/pkgs/development/python-modules/dockerspawner/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "83fd8ee012bb32432cb57bd408ff65534749aed8696648e6ac029a87fc474928"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ jupyterhub escapism docker diff --git a/pkgs/development/python-modules/docloud/default.nix b/pkgs/development/python-modules/docloud/default.nix index f1ec269f7cbbb..d2ef1e7320e82 100644 --- a/pkgs/development/python-modules/docloud/default.nix +++ b/pkgs/development/python-modules/docloud/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "996d55407498fd01e6c6c480f367048f92255e9ca9db0e9ea19aaef91328a441"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests ]; diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 74ac3bbfdf397..69a2ec73bedbf 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "976e9b4e18bccbabae04149c33247a795edb1f00110f1b511c5517ac6ac353bb"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ docloud requests ] ++ lib.optional isPy27 futures; diff --git a/pkgs/development/python-modules/docrep/default.nix b/pkgs/development/python-modules/docrep/default.nix index b467802b62f77..20bea7cd491f3 100644 --- a/pkgs/development/python-modules/docrep/default.nix +++ b/pkgs/development/python-modules/docrep/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix index 0241fd15ad48f..277c808365dff 100644 --- a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix +++ b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1m9aa4qnyj21lbq4sbvmv1vcz7zksss4rz37ddf2hxv4hk8b547w"; }; - propagatedBuildInputs = [ nose ]; + requiredPythonModules = [ nose ]; meta = with stdenv.lib; { description = "Add flag to ignore unicode literal prefixes in doctests"; diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 32cb213af4f3f..1d8faca049516 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov mock Mako ]; - propagatedBuildInputs = [ decorator stevedore ]; + requiredPythonModules = [ decorator stevedore ]; meta = with stdenv.lib; { description = "A caching front-end based on the Dogpile lock"; diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index 4981440c7ccd5..c0138818f82d8 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -34,7 +34,7 @@ buildPythonPackage { ]; nativeBuildInputs = [ gobject-introspection dbus xvfb_run wrapGAppsHook ]; # for setup hooks - propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ]; + requiredPythonModules = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ]; strictDeps = false; # issue 56943 checkPhase = '' diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix index 538a861c9f4cd..51ef515158baf 100644 --- a/pkgs/development/python-modules/dopy/default.nix +++ b/pkgs/development/python-modules/dopy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage { sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56"; }; - propagatedBuildInputs = [ requests six ]; + requiredPythonModules = [ requests six ]; meta = with pkgs.lib; { description = "Digital Ocean API python wrapper"; diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index 03445f79117f7..93972497a7422 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ./test.patch # https://github.com/kjellmf/dot2tex/issues/5 ]; - propagatedBuildInputs = [ pyparsing ]; + requiredPythonModules = [ pyparsing ]; checkInputs = [ (texlive.combine { diff --git a/pkgs/development/python-modules/dotnetcore2/default.nix b/pkgs/development/python-modules/dotnetcore2/default.nix index d5bab1526e2c6..f458f158e053e 100644 --- a/pkgs/development/python-modules/dotnetcore2/default.nix +++ b/pkgs/development/python-modules/dotnetcore2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ unzip ]; - propagatedBuildInputs = [ distro ]; + requiredPythonModules = [ distro ]; # needed to apply patches prePatch = '' diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix index 6433e0d17a727..d20b377371130 100644 --- a/pkgs/development/python-modules/dparse/default.nix +++ b/pkgs/development/python-modules/dparse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "a1b5f169102e1c894f9a7d5ccf6f9402a836a5d24be80a986c7ce9eaed78f367"; }; - propagatedBuildInputs = [ toml pyyaml ]; + requiredPythonModules = [ toml pyyaml ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index 1488d93822892..36d07d9aad8a3 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six inflection ruamel_yaml diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index bc01b46eadaf7..088ab8dd37429 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "ab3ec6d072b1980f77dadf3b2cb0fe56c648eaf927ea381f606b4db66d4cbff2"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy pandas six diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 07d13c74c8db1..4449f4d69bcd7 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ requests urllib3 mock setuptools ]; + requiredPythonModules = [ requests urllib3 mock setuptools ]; meta = with stdenv.lib; { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; diff --git a/pkgs/development/python-modules/ds4drv/default.nix b/pkgs/development/python-modules/ds4drv/default.nix index 05f54c2f90641..ffde8b4161fbc 100644 --- a/pkgs/development/python-modules/ds4drv/default.nix +++ b/pkgs/development/python-modules/ds4drv/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0vinpla0apizzykcyfis79mrm1i6fhns83nkzw85svypdhkx2g8v"; }; - propagatedBuildInputs = [ evdev pyudev ]; + requiredPythonModules = [ evdev pyudev ]; buildInputs = [ bluez ]; diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index ea6dfe32fda91..3cc1051adcaf6 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy pandas ]; diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix index 28aaf8ee47c90..e5637422494fc 100644 --- a/pkgs/development/python-modules/duecredit/default.nix +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }; # bin/duecredit requires setuptools at runtime - propagatedBuildInputs = [ citeproc-py requests setuptools six ]; + requiredPythonModules = [ citeproc-py requests setuptools six ]; checkInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; disabledTests = [ "test_io" ]; diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index 8fe2025923599..219319c7ec33c 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; format = "pyproject"; - propagatedBuildInputs = [ + requiredPythonModules = [ matplotlib numpy ] ++ stdenv.lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/dulwich/0_19.nix b/pkgs/development/python-modules/dulwich/0_19.nix index 82b9bed492cca..df92e52b3d522 100644 --- a/pkgs/development/python-modules/dulwich/0_19.nix +++ b/pkgs/development/python-modules/dulwich/0_19.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ urllib3 certifi ]; + requiredPythonModules = [ urllib3 certifi ]; # Only test dependencies checkInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ]; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 2225cccd6a435..4fe4814170b24 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ urllib3 certifi ]; + requiredPythonModules = [ urllib3 certifi ]; # Only test dependencies checkInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ]; diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index 9150a6746a2bf..dbde8fda6aae4 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { doCheck = !isPy3k; nativeBuildInputs = [ pkgs.cmake ]; buildInputs = [ pkgs.libdynd.dev cython ]; - propagatedBuildInputs = [ numpy pkgs.libdynd ]; + requiredPythonModules = [ numpy pkgs.libdynd ]; meta = with stdenv.lib; { homepage = "http://libdynd.org"; diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index cd20014932067..b065eaf0ef8f8 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -17,5 +17,5 @@ buildPythonPackage rec { sha256 = "e4e7a0dd4001f56bfd4058428f2c91eafe27d33ef3b8b33ac4e013b159b9ff91"; }; - propagatedBuildInputs = [ django pillow ]; + requiredPythonModules = [ django pillow ]; } diff --git a/pkgs/development/python-modules/easywatch/default.nix b/pkgs/development/python-modules/easywatch/default.nix index a56ffb9528195..54ef94489292f 100644 --- a/pkgs/development/python-modules/easywatch/default.nix +++ b/pkgs/development/python-modules/easywatch/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1b40cjigv7s9qj8hxxy6yhwv0320z7qywrigwgkasgh80q0xgphc"; }; - propagatedBuildInputs = [ watchdog ]; + requiredPythonModules = [ watchdog ]; # There are no tests doCheck = false; diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index 0f224bd8ab0b8..0fdd225bd9890 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # Only needed for tests checkInputs = [ pkgs.openssl ]; diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix index 6c07a5d485a6c..731e5f438ec10 100644 --- a/pkgs/development/python-modules/ecos/default.nix +++ b/pkgs/development/python-modules/ecos/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { echo '__version__ = "${version}"' >> ./src/ecos/version.py ''; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy ]; diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index bb54fc6e73fab..7c2e7af125746 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "9635cffb9b6ecf7fd7f72aea1665829ac74a1d272006d0057d45a621aae20228"; }; - propagatedBuildInputs = lib.optional (!isPy3k) future; + requiredPythonModules = lib.optional (!isPy3k) future; # No tests implemented doCheck = false; diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index 0f42ddcc799bb..241e3b4ee6132 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # disabled for now due to Tensorflow trying to create files in $HOME: doCheck = false; - propagatedBuildInputs = [ Keras numpy scipy six tensorflow ]; + requiredPythonModules = [ Keras numpy scipy six tensorflow ]; meta = with stdenv.lib; { description = "Probabilistic programming language using Tensorflow"; diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix index 67537dd1f48bb..429ec6bc243ba 100644 --- a/pkgs/development/python-modules/effect/default.nix +++ b/pkgs/development/python-modules/effect/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { testtools ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six attrs ]; diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index 8c7d7679005e9..b07a8ef91d6b6 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "a99de5e4652865224daab09b2e2574a4f7c1d0d9a267048f9836aa914a2caf3a"; }; - propagatedBuildInputs = [ zope_interface zope_testing ]; + requiredPythonModules = [ zope_interface zope_testing ]; # tests fail, see https://hydra.nixos.org/build/4316603/log/raw doCheck = false; diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 68d658f4989ee..c424e4b1baf54 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1e345535164cb684de4b825e1d0daf81b75554b30d3905446584a9e4af0cc3e7"; }; - propagatedBuildInputs = [ elasticsearch python-dateutil six ] + requiredPythonModules = [ elasticsearch python-dateutil six ] ++ stdenv.lib.optional (!isPy3k) ipaddress; # ImportError: No module named test_elasticsearch_dsl diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 38522b233d4c0..1083b702453fc 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -17,7 +17,7 @@ buildPythonPackage (rec { # Check is disabled because running them destroy the content of the local cluster! # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch doCheck = false; - propagatedBuildInputs = [ urllib3 requests ]; + requiredPythonModules = [ urllib3 requests ]; buildInputs = [ nosexcover mock ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 557be014f86cd..3964f6f734f33 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ aiocontextvars boltons pyrsistent diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 215584aa8cdbf..e33d3ebd61f53 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ dnspython idna ] ++ (if isPy3k then [ ] else [ ipaddress ]); diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index ed513579457f9..2c4d820afb824 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "035a44d7594fdd03efd10a522558cdfaa080e046ad75594d0bf2aec80ec35388"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; meta = with stdenv.lib; { description = "Kick ass affine-invariant ensemble MCMC sampling"; diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index 1102443884f71..09493fab42975 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { "enaml.workbench" ]; - propagatedBuildInputs = [ + requiredPythonModules = [ atom ply kiwisolver diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix index a9cfafa020e29..16649ba15a8f1 100644 --- a/pkgs/development/python-modules/enamlx/default.nix +++ b/pkgs/development/python-modules/enamlx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1rlrx3cw6h1zl9svnqbzwdfy8469qa1y7w6576lbhdwpfhpipscy"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ enaml # Until https://github.com/inkcut/inkcut/issues/105 perhaps pyqtgraph diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index 2f0f80bcf7a52..2d3d7aee5e210 100644 --- a/pkgs/development/python-modules/entrance/default.nix +++ b/pkgs/development/python-modules/entrance/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { # No useful tests doCheck = false; - propagatedBuildInputs = [ pyyaml sanic ] ++ opts.extraBuildInputs; + requiredPythonModules = [ pyyaml sanic ] ++ opts.extraBuildInputs; prePatch = opts.prePatch; diff --git a/pkgs/development/python-modules/entrypoint2/default.nix b/pkgs/development/python-modules/entrypoint2/default.nix index d62361e7be088..a950934032c7e 100644 --- a/pkgs/development/python-modules/entrypoint2/default.nix +++ b/pkgs/development/python-modules/entrypoint2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "4ac1a8f08477d93282c422faa90875ce5edaa941e1f3fd410b95cb31d9f473a7"; }; - propagatedBuildInputs = [ ]; + requiredPythonModules = [ ]; pythonImportsCheck = [ "entrypoint2" ]; diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index a26d6ede8904f..d378d15a921b6 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = lib.optional (!isPy3k) configparser; + requiredPythonModules = lib.optional (!isPy3k) configparser; checkPhase = '' py.test tests diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/pkgs/development/python-modules/enum-compat/default.nix index 42a4b63479ca6..195845c4c6a9f 100644 --- a/pkgs/development/python-modules/enum-compat/default.nix +++ b/pkgs/development/python-modules/enum-compat/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "3677daabed56a6f724451d585662253d8fb4e5569845aafa8bb0da36b1a8751e"; }; - propagatedBuildInputs = [ enum34 ]; + requiredPythonModules = [ enum34 ]; meta = with lib; { homepage = "https://github.com/jstasiak/enum-compat"; diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index 397e573a252f5..527b781540656 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1srjmkhnz84nz5jd72vdsnc4fn7dd9jr8nyf3hzk6yx1dsn815gd"; }; - propagatedBuildInputs = [ traits apptools ]; + requiredPythonModules = [ traits apptools ]; preCheck = '' export HOME=$PWD/HOME diff --git a/pkgs/development/python-modules/epc/default.nix b/pkgs/development/python-modules/epc/default.nix index fe3cc4420c481..36d654d4ab847 100644 --- a/pkgs/development/python-modules/epc/default.nix +++ b/pkgs/development/python-modules/epc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "a14d2ea74817955a20eb00812e3a4630a132897eb4d976420240f1152c0d7d25"; }; - propagatedBuildInputs = [ sexpdata ]; + requiredPythonModules = [ sexpdata ]; doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix index 7a122f1b616e7..fbffec2bb942f 100644 --- a/pkgs/development/python-modules/etcd/default.nix +++ b/pkgs/development/python-modules/etcd/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sed -i -e '13,14d;37d' setup.py ''; - propagatedBuildInputs = [ simplejson pytz requests ]; + requiredPythonModules = [ simplejson pytz requests ]; # No proper tests are available doCheck = false; diff --git a/pkgs/development/python-modules/etelemetry/default.nix b/pkgs/development/python-modules/etelemetry/default.nix index 869c6ccba92c1..5d7ca44c1c70b 100644 --- a/pkgs/development/python-modules/etelemetry/default.nix +++ b/pkgs/development/python-modules/etelemetry/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1rw8im09ppnb7z7p7rx658rp5ib8zca8byxg1kiflqwgx5c8zddz"; }; - propagatedBuildInputs = [ ci-info ci-py requests ]; + requiredPythonModules = [ ci-info ci-py requests ]; # all 2 of the tests both try to pull down from a url doCheck = false; diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix index ee81ead97c3a3..32909b25b9edc 100644 --- a/pkgs/development/python-modules/etesync/default.nix +++ b/pkgs/development/python-modules/etesync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "f20f7e9922ee789c4b71379676ebfe656b675913fe524f2ee722e1b9ef4e5197"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ appdirs asn1crypto cffi diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index ad58ee3ae2fe0..6ad9d50a08516 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ pysha3 pycrypto pycryptodome ]; + requiredPythonModules = [ pysha3 pycrypto pycryptodome ]; # setuptools-markdown uses pypandoc which is broken at the moment preConfigure = '' diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 25f2ebd554124..f74978b5f3407 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest hypothesis ]; - propagatedBuildInputs = [ eth-hash eth-typing cytoolz ]; + requiredPythonModules = [ eth-hash eth-typing cytoolz ]; # setuptools-markdown uses pypandoc which is broken at the moment preConfigure = '' diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index c50cc2aeb8279..620e895e76a96 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "3a057277bba7144a0c15ab8c737dc8a1002e87e7284847aa011ce122e353418e"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cerberus events flask diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index a712b14913800..9b871367ecaa1 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "55eef68e39473d6a58d28c4cf388cb8b7d29bab76568e7124d7df98d9365ab35"; }; - propagatedBuildInputs = [ dnspython greenlet monotonic six ] + requiredPythonModules = [ dnspython greenlet monotonic six ] ++ lib.optional (pythonOlder "3.4") enum34; prePatch = '' diff --git a/pkgs/development/python-modules/eventlib/default.nix b/pkgs/development/python-modules/eventlib/default.nix index 4f684612f1844..9e16db2f1103b 100644 --- a/pkgs/development/python-modules/eventlib/default.nix +++ b/pkgs/development/python-modules/eventlib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1w1axsm6w9bl2smzxmyk4in1lsm8gk8ma6y183m83cpj66aqxg4z"; }; - propagatedBuildInputs = [ greenlet ]; + requiredPythonModules = [ greenlet ]; doCheck = false; diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix index b245ff117474b..10ed517de3958 100644 --- a/pkgs/development/python-modules/evernote/default.nix +++ b/pkgs/development/python-modules/evernote/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "796847e0b7517e729041c5187fa1665c3f6fc0491cb4d71fb95a62c4f22e64eb"; }; - propagatedBuildInputs = [ oauth2 ]; + requiredPythonModules = [ oauth2 ]; meta = with stdenv.lib; { description = "Evernote SDK for Python"; diff --git a/pkgs/development/python-modules/ewmh/default.nix b/pkgs/development/python-modules/ewmh/default.nix index c9ac68ae74d81..848b0a839d70f 100644 --- a/pkgs/development/python-modules/ewmh/default.nix +++ b/pkgs/development/python-modules/ewmh/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0g9l14my3v8zlgq1yd8wh5gpara0qcapsfmvg7lq2lapglzhjsy5"; }; - propagatedBuildInputs = [ xlib ]; + requiredPythonModules = [ xlib ]; # No tests included doCheck = false; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 0635f8f027cca..a1dde2b237093 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { checkInputs = [ psutil requests-mock pyyaml flake8 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ lxml tzlocal python-dateutil pygments requests-kerberos defusedxml cached-property isodate requests_ntlm dnspython oauthlib requests_oauthlib diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index bc7b67f52d42e..9e3bf30da7bcb 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ apipkg ]; + requiredPythonModules = [ apipkg ]; # remove vbox tests postPatch = '' diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix index 3e14074f186c7..d62403ede3214 100644 --- a/pkgs/development/python-modules/executor/default.nix +++ b/pkgs/development/python-modules/executor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1jfmagw126di0qd82bydwvryqcxc54pqja3rbx3ny3fv1ahi5s7k"; }; - propagatedBuildInputs = [ coloredlogs property-manager fasteners ]; + requiredPythonModules = [ coloredlogs property-manager fasteners ]; checkInputs = [ pytestCheckHook mock virtualenv ]; diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix index 0c23a69a89cd7..568321c03d4c2 100644 --- a/pkgs/development/python-modules/extension-helpers/default.nix +++ b/pkgs/development/python-modules/extension-helpers/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 321c26542d112..6bc31c2b40a74 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # https://github.com/nicfit/eyeD3/blob/103198e265e3279384f35304e8218be6717c2976/Makefile#L97 doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ six filetype deprecation ] ++ lib.optional (pythonOlder "3.7") dataclasses; diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index a745566a64518..98b1b219cc54d 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = "pytest tests integration_tests"; - propagatedBuildInputs = [ pyparsing ]; + requiredPythonModules = [ pyparsing ]; meta = with stdenv.lib; { description = "Python package to read and write DXF drawings (interface to the DXF file format)"; diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix index 71fbca916104a..bc121b5cdde83 100644 --- a/pkgs/development/python-modules/face/default.nix +++ b/pkgs/development/python-modules/face/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "7d59ca5ba341316e58cf72c6aff85cca2541cf5056c4af45cb63af9a814bed3e"; }; - propagatedBuildInputs = [ boltons ]; + requiredPythonModules = [ boltons ]; checkInputs = [ pytest ]; checkPhase = "pytest face/test"; diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix index 2b26fa735e6d1..dc4cc59546d2e 100644 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "flake8==2.6.0" "flake8" ''; - propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ]; + requiredPythonModules = [ pillow click dlib numpy face_recognition_models ]; # Our dlib is compiled with AVX instructions by default which breaks # with "Illegal instruction" on some builders due to missing hardware features. diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix index 427ad364dde6a..1d71a16d6c3c6 100644 --- a/pkgs/development/python-modules/face_recognition_models/default.nix +++ b/pkgs/development/python-modules/face_recognition_models/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # no module named `tests` as no tests are available doCheck = false; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; meta = with stdenv.lib; { homepage = "https://github.com/ageitgey/face_recognition_models"; diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix index e9300edab09d2..6c24db5977564 100644 --- a/pkgs/development/python-modules/facebook-sdk/default.nix +++ b/pkgs/development/python-modules/facebook-sdk/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "138grz0n6plzdqgi4h6hhszf58bsvx9v76cwj51g1nd3kvkd5g6a"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # checks require network doCheck = false; diff --git a/pkgs/development/python-modules/facedancer/default.nix b/pkgs/development/python-modules/facedancer/default.nix index 0aabe704f040f..8bc92ab5b470e 100644 --- a/pkgs/development/python-modules/facedancer/default.nix +++ b/pkgs/development/python-modules/facedancer/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ pyusb pyserial ]; + requiredPythonModules = [ pyusb pyserial ]; preBuild = '' echo "$version" > VERSION diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 052551a4727c0..5960278ca3230 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "2ce2f665045d9f15145a6310565fcb8255d52fc6fd867f3b783b3ac3de6cf10e"; }; - propagatedBuildInputs = [ faker ] ++ lib.optionals isPy27 [ ipaddress ]; + requiredPythonModules = [ faker ] ++ lib.optionals isPy27 [ ipaddress ]; # tests not included with pypi release doCheck = false; diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index fb85408dd3d2d..01e962a17dc71 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0dfz3bpmjmaxlhda6hfgsac7afb65pljibi8zkp9gc0ffn5rj161"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix index ab947756fa98a..9f238fcd585f6 100644 --- a/pkgs/development/python-modules/fake_factory/default.nix +++ b/pkgs/development/python-modules/fake_factory/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "f5bd18deb22ad8cb4402513c025877bc6b50de58902d686b6b21ba8981dce260"; }; - propagatedBuildInputs = [ six dateutil ipaddress mock ]; + requiredPythonModules = [ six dateutil ipaddress mock ]; # fake-factory is depreciated and single test will always fail doCheck = false; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 4cc3c86aab68e..54ad195ebacfb 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ++ lib.optionals (pythonOlder "3.3") [ mock ] ++ lib.optionals (pythonOlder "3.0") [ more-itertools ]; - propagatedBuildInputs = [ + requiredPythonModules = [ dateutil six text-unidecode diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 32ebd6a0307d5..06789c3cb1b36 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { --replace "starlette ==0.13.2" "starlette" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ uvicorn starlette pydantic diff --git a/pkgs/development/python-modules/fastdtw/default.nix b/pkgs/development/python-modules/fastdtw/default.nix index cb75a599d03a9..773a4212fd19a 100644 --- a/pkgs/development/python-modules/fastdtw/default.nix +++ b/pkgs/development/python-modules/fastdtw/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy ]; diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 75719a78fb21b..7bec0b699c93d 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef"; }; - propagatedBuildInputs = [ six monotonic ]; + requiredPythonModules = [ six monotonic ]; checkInputs = [ testtools nose ] ++ stdenv.lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index edb45eb068770..48283285d90c8 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -15,7 +15,7 @@ buildPythonPackage { checkInputs = [ pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ scipy ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 47c7d5063090e..a4818ef667056 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ numba numpy pandas thrift ]; + requiredPythonModules = [ numba numpy pandas thrift ]; checkInputs = [ pytest python-snappy lz4 zstd ]; meta = with lib; { diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix index 568d894805fda..a6afac5263e0d 100644 --- a/pkgs/development/python-modules/fastpbkdf2/default.nix +++ b/pkgs/development/python-modules/fastpbkdf2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ openssl ]; checkInputs = [ pytest ]; - propagatedBuildInputs = [ cffi six ]; + requiredPythonModules = [ cffi six ]; meta = with stdenv.lib; { homepage = "https://github.com/Ayrx/python-fastpbkdf2"; diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix index a542b58056536..c7c123ab72dde 100644 --- a/pkgs/development/python-modules/fastprogress/default.nix +++ b/pkgs/development/python-modules/fastprogress/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1zhv37q6jkqd1pfhlkd4yzrc3dg83vyksgzf32mjlhd5sb0qmql9"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; # no real tests doCheck = false; diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index 42e6446e86435..de753a3cfa848 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "fasttext" ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; preBuild = '' HOME=$TMPDIR diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 5af3be420b024..fe937a4a51558 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ pytestrunner ]; checkInputs = [ pytest requests-mock ]; - propagatedBuildInputs = [ requests beautifulsoup4 ]; + requiredPythonModules = [ requests beautifulsoup4 ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/fdint/default.nix b/pkgs/development/python-modules/fdint/default.nix index 68c3b039a47fd..4729c2609f3ca 100644 --- a/pkgs/development/python-modules/fdint/default.nix +++ b/pkgs/development/python-modules/fdint/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ cython ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; # tests not included with pypi release doCheck = false; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index dbc303f430262..8eb3459e82278 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0jl0b87l7v6c0f1nx6k81skjhdj5i11kmchdjls00mynpvdip0cf"; }; - propagatedBuildInputs = [ dateutil lxml ]; + requiredPythonModules = [ dateutil lxml ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index c0ccb7d345a97..bc9e41b84a401 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; - propagatedBuildInputs = [ six pytz ]; + requiredPythonModules = [ six pytz ]; meta = with stdenv.lib; { description = "Standalone version of django.utils.feedgenerator, compatible with Py3k"; diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index 51b0060cb2d60..2c1138f7006aa 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; checkInputs = [ pytest pytest-mock ]; meta = with lib; { diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 96019f61cac0c..bff2cd44babb7 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1hzprnd407g2xh9kyv8j8pq949hwr1snmg3fp65pqfbghzv6i424"; }; - propagatedBuildInputs = [ six cryptography ]; + requiredPythonModules = [ six cryptography ]; checkInputs = [ mock pyfakefs ]; diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix index bae362d3a4a44..39b8e00a43ade 100644 --- a/pkgs/development/python-modules/filterpy/default.nix +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy scipy matplotlib ]; + requiredPythonModules = [ numpy scipy matplotlib ]; # single test fails (even on master branch of repository) # project does not use CI diff --git a/pkgs/development/python-modules/finalfusion/default.nix b/pkgs/development/python-modules/finalfusion/default.nix index 62287487e3b78..4c748f87b6b28 100644 --- a/pkgs/development/python-modules/finalfusion/default.nix +++ b/pkgs/development/python-modules/finalfusion/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy toml ]; diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 10915e766ac25..b84ae6eb2d099 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "00fqgnmv7z6d792ga4cyzn9lrfjf79jplkssm2jbyb0akfggfj7h"; }; - propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; + requiredPythonModules = [ requests mt-940 sepaxml bleach ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index a88db7b80f561..58848847549cc 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { gdal_2 ] ++ lib.optionals stdenv.cc.isClang [ giflib ]; - propagatedBuildInputs = [ + requiredPythonModules = [ attrs click cligj diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index d54379d0683ec..1108c83a37211 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -30,7 +30,7 @@ in sha256 = "0078yg96fknqhywn1v26ryc5z47c0j0c1qwz6p8wsjn0wmzggaqk"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy pyamg diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 6c81a708d57d6..f2730702f8475 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0s5r6l39ck2scks54hmwwdf4lcihqqnqzjfx9lz2b67vxkajpwmc"; }; - propagatedBuildInputs = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34; + requiredPythonModules = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34; checkInputs = [ hypothesis mock python-Levenshtein pytest ]; diff --git a/pkgs/development/python-modules/firetv/default.nix b/pkgs/development/python-modules/firetv/default.nix index 8cbcc354c8347..c62f26a0dc0ba 100644 --- a/pkgs/development/python-modules/firetv/default.nix +++ b/pkgs/development/python-modules/firetv/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "602de77411c2caffb322e4ff63fa6cc4eeb9a50c5f4b14e13930ed7cd87cf513"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ adb-homeassistant flask pure-python-adb-homeassistant diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix index 46c6ac78a6c44..cbf583d127ace 100644 --- a/pkgs/development/python-modules/fitbit/default.nix +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "0.3.1"; checkInputs = [ coverage freezegun mock requests-mock sphinx ]; - propagatedBuildInputs = [ dateutil requests_oauthlib ]; + requiredPythonModules = [ dateutil requests_oauthlib ]; # The source package on PyPi is missing files required for unit testing. # https://github.com/orcasgit/python-fitbit/issues/148 diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index 3042acbbe8485..7d75da1eba81e 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef"; }; - propagatedBuildInputs = [ pbr testtools mock ]; + requiredPythonModules = [ pbr testtools mock ]; checkPhase = '' ${python.interpreter} -m testtools.run fixtures.test_suite diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index 81b903621b524..b73ffdca5db33 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ flake8 pycodestyle ] + requiredPythonModules = [ flake8 pycodestyle ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 661b7c71c33d7..61f042ccb933d 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z"; }; - propagatedBuildInputs = [ flake8 six ] + requiredPythonModules = [ flake8 six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 25aa995f91222..134a81195c219 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "14kfvsagqc6lrplvf3x58ia6x744bk8fj91wmk0hcipa8naw73d2"; }; - propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; + requiredPythonModules = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; checkInputs = [ pytest flake8 pycodestyle pylama ]; diff --git a/pkgs/development/python-modules/flake8-polyfill/default.nix b/pkgs/development/python-modules/flake8-polyfill/default.nix index 050a6d4f9c8a5..96512f2ed4f4f 100644 --- a/pkgs/development/python-modules/flake8-polyfill/default.nix +++ b/pkgs/development/python-modules/flake8-polyfill/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace pytest 'tool:pytest' ''; - propagatedBuildInputs = [ + requiredPythonModules = [ flake8 ]; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index a369919b98fbc..1c6c6146fccd8 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock pytestrunner ]; - propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] + requiredPythonModules = [ pyflakes pycodestyle mccabe ] ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ] ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ] diff --git a/pkgs/development/python-modules/flammkuchen/default.nix b/pkgs/development/python-modules/flammkuchen/default.nix index a5525d97f6040..8b7303ab10051 100644 --- a/pkgs/development/python-modules/flammkuchen/default.nix +++ b/pkgs/development/python-modules/flammkuchen/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { nose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy tables diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index dc1e795054fec..f27cac9f01f5b 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { email_validator ]; - propagatedBuildInputs = [ + requiredPythonModules = [ flask wtforms ] ++ lib.optionals isPy27 [ enum34 ]; diff --git a/pkgs/development/python-modules/flask-api/default.nix b/pkgs/development/python-modules/flask-api/default.nix index 3bc3061b3b5fd..24e049f78aa4a 100644 --- a/pkgs/development/python-modules/flask-api/default.nix +++ b/pkgs/development/python-modules/flask-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "6986642e5b25b7def710ca9489ed2b88c94006bfc06eca01c78da7cf447e66e5"; }; - propagatedBuildInputs = [ flask markdown ]; + requiredPythonModules = [ flask markdown ]; meta = with lib; { homepage = "https://github.com/miracle2k/flask-assets"; diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 5119d3c39ac14..d9afaf142d367 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { nose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ apispec colorama click diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index 390657e9c8237..83d79da308a7e 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { substituteInPlace tests/test_integration.py --replace "'/foo'" "'/x/foo'" ''; - propagatedBuildInputs = [ flask webassets flask_script nose ]; + requiredPythonModules = [ flask webassets flask_script nose ]; meta = with lib; { homepage = "https://github.com/miracle2k/flask-assets"; diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index 26b6977116fd3..552a840e198d9 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "ea319f7ccadf68ddf98d940002066278c779323644f9944b300066d50e2effc7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ flask flask-silk future diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 2d542411fa23c..b9c75763e0431 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ flask Babel jinja2 diff --git a/pkgs/development/python-modules/flask-babelex/default.nix b/pkgs/development/python-modules/flask-babelex/default.nix index cdcb400983b13..3e6a2196d49c3 100644 --- a/pkgs/development/python-modules/flask-babelex/default.nix +++ b/pkgs/development/python-modules/flask-babelex/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "09yfr8hlwvpgvq8kp1y7qbnnl0q28hi0348bv199ssiqx779r99r"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ flask Babel speaklater diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/pkgs/development/python-modules/flask-bcrypt/default.nix index fd0e63d26f301..7f0520f867a63 100644 --- a/pkgs/development/python-modules/flask-bcrypt/default.nix +++ b/pkgs/development/python-modules/flask-bcrypt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0036gag3nj7fzib23lbbpwhlrn1s0kkrfwk5pd90y4cjcfqh8z9x"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ flask bcrypt ]; diff --git a/pkgs/development/python-modules/flask-bootstrap/default.nix b/pkgs/development/python-modules/flask-bootstrap/default.nix index 797be78bc5635..f2662adc4f67f 100644 --- a/pkgs/development/python-modules/flask-bootstrap/default.nix +++ b/pkgs/development/python-modules/flask-bootstrap/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1j1s2bplaifsnmr8vfxa3czca4rz78xyhrg4chx39xl306afs26b"; }; - propagatedBuildInputs = [ flask visitor dominate ]; + requiredPythonModules = [ flask visitor dominate ]; meta = with lib; { homepage = "https://github.com/mbr/flask-bootstrap"; diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 57c95cf8800a1..7acd229f0c728 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "a0356ad868b1d8ec2d0e675a6fe891c41303128f8904d5d79e180d8b3f952aff"; }; - propagatedBuildInputs = [ flask ]; + requiredPythonModules = [ flask ]; checkInputs = [ pytest pytestcov pytest-xprocess pytestcache ]; diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix index 40c7903aee3d5..17e0114a9ecc8 100644 --- a/pkgs/development/python-modules/flask-common/default.nix +++ b/pkgs/development/python-modules/flask-common/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "13d99f2dbc0a332b8bc4b2cc394d3e48f89672c266868e372cd9d7b433d921a9"; }; - propagatedBuildInputs = [ crayons flask flask-caching gunicorn maya meinheld whitenoise ]; + requiredPythonModules = [ crayons flask flask-caching gunicorn maya meinheld whitenoise ]; meta = with stdenv.lib; { description = "Flask extension with lots of common time-savers"; diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index cf9abdc596ab0..5afcfe7f27601 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "f367b2b46003dd62be34f7fb1379938032656dca56377a9bc90e7188e4289a7c"; }; - propagatedBuildInputs = [ flask brotli ]; + requiredPythonModules = [ flask brotli ]; meta = with stdenv.lib; { description = "Compress responses in your Flask app with gzip"; diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index da61365e3ae8e..0e225f18ba576 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; checkInputs = [ nose packaging ]; - propagatedBuildInputs = [ flask six ]; + requiredPythonModules = [ flask six ]; # Exclude test_acl_uncaught_exception_500 test case because is not compatible # with Flask>=1.1.0. See: https://github.com/corydolphin/flask-cors/issues/253 diff --git a/pkgs/development/python-modules/flask-elastic/default.nix b/pkgs/development/python-modules/flask-elastic/default.nix index 9f8e27ea20f98..2725bf1f3aa39 100644 --- a/pkgs/development/python-modules/flask-elastic/default.nix +++ b/pkgs/development/python-modules/flask-elastic/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0hqkwff6z78aspkf1cf815qwp02g3ch1y9dhm5v2ap8vakyac0az"; }; - propagatedBuildInputs = [ flask elasticsearch ]; + requiredPythonModules = [ flask elasticsearch ]; doCheck = false; # no tests meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/pkgs/development/python-modules/flask-httpauth/default.nix index ad3e42876d0ff..56ebc5df7ea94 100644 --- a/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/pkgs/development/python-modules/flask-httpauth/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "9e028e4375039a49031eb9ecc40be4761f0540476040f6eff329a31dabd4d000"; }; - propagatedBuildInputs = [ flask ]; + requiredPythonModules = [ flask ]; meta = with lib; { description = "Extension that provides HTTP authentication for Flask routes"; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index bc1e2778e1933..1926176729bb4 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1p8rwcsscyjw2m7dbybiaflqk4z1r2d1kp9r9qqyjfzblxpyxa0a"; }; - propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ]; + requiredPythonModules = [ dateutil flask pyjwt werkzeug ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix index 2573f54974085..0a63bb9994023 100644 --- a/pkgs/development/python-modules/flask-ldap-login/default.nix +++ b/pkgs/development/python-modules/flask-ldap-login/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; checkInputs = [ nose mock flask_testing ]; - propagatedBuildInputs = [ flask flask_wtf ldap ]; + requiredPythonModules = [ flask flask_wtf ldap ]; checkPhase = "nosetests -d"; diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index c3db5094aef99..82dda8a2b3dc0 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "08d6d7534a847c532fd36d0df978f93908d8616813085941c862bbcfcf6811aa"; }; - propagatedBuildInputs = [ flask limits ]; + requiredPythonModules = [ flask limits ]; meta = with stdenv.lib; { description = "Rate limiting for flask applications"; diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index a4cd86ee69d41..8e8d460b2cca1 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; checkInputs = [ nose mock semantic-version ]; - propagatedBuildInputs = [ flask blinker ]; + requiredPythonModules = [ flask blinker ]; checkPhase = "nosetests -d"; diff --git a/pkgs/development/python-modules/flask-mail/default.nix b/pkgs/development/python-modules/flask-mail/default.nix index a1732d3ccbfec..2fca571aaea04 100644 --- a/pkgs/development/python-modules/flask-mail/default.nix +++ b/pkgs/development/python-modules/flask-mail/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0hazjc351s3gfbhk975j8k65cg4gf31yq404yfy0gx0bjjdfpr92"; }; - propagatedBuildInputs = [ blinker flask ]; + requiredPythonModules = [ blinker flask ]; buildInputs = [ blinker mock nose speaklater ]; doCheck = false; diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index 5d783f6c7c45a..79ce1a1549945 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "aefc1f1d96256c430a409f08241bab75ffe97e5d14ac5d1f000764e39bf4873a"; }; - propagatedBuildInputs = [ flask marshmallow ]; + requiredPythonModules = [ flask marshmallow ]; buildInputs = [ six ]; doCheck = false; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 24ed04437a038..150e7f3a389fc 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkInputs = [ flask_script ] ++ optional isPy3k glibcLocales; - propagatedBuildInputs = [ flask flask_sqlalchemy alembic ]; + requiredPythonModules = [ flask flask_sqlalchemy alembic ]; # tests invoke the flask cli which uses click and therefore has py3k encoding troubles preCheck = optionalString isPy3k '' diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index ad43533123690..7f878529aa06f 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "05hfddf1dm594wnjyqhj0zmjfsf1kpmx1frjwhypgzx4hf62qcmr"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ flask flask_wtf mongoengine diff --git a/pkgs/development/python-modules/flask-openid/default.nix b/pkgs/development/python-modules/flask-openid/default.nix index a9a5ec9acc8b7..dacdbaf5136c2 100644 --- a/pkgs/development/python-modules/flask-openid/default.nix +++ b/pkgs/development/python-modules/flask-openid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "5a8ffe1c8c0ad1cc1f5030e1223ea27f8861ee0215a2a58a528cc61379e5ccab"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ flask python3-openid ]; diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index f0cf96d13679c..cd2fed3593c21 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "60079a1c4c600cb4d4a9f7c386ea357b5ee02355ae6d6e8b41f769ae3f7af3ad"; }; - propagatedBuildInputs = [ flask ]; + requiredPythonModules = [ flask ]; meta = with lib; { homepage = "https://github.com/lixxu/flask-paginate"; diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix index f3164aa1f08ee..5dce515fba37e 100644 --- a/pkgs/development/python-modules/flask-principal/default.nix +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0lwlr5smz8vfm5h9a9i7da3q1c24xqc6vm9jdywdpgxfbi5i7mpm"; }; - propagatedBuildInputs = [ flask blinker ]; + requiredPythonModules = [ flask blinker ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index d5b48fd0428af..6a6e802105b3e 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "05b9lzx5yc3wgml2bcq50lq35h66m8zpj6dc9advcb5z3acsbaay"; }; - propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ]; + requiredPythonModules = [ flask six pytz aniso8601 pycrypto ]; checkInputs = [ pytest nose mock blinker ]; diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix index 3de74531c2886..971f60acf551a 100644 --- a/pkgs/development/python-modules/flask-restplus/default.nix +++ b/pkgs/development/python-modules/flask-restplus/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { }; checkInputs = [ nose blinker tzlocal mock rednose ]; - propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ] + requiredPythonModules = [ flask six jsonschema pytz aniso8601 flask-restful ] ++ lib.optional isPy27 enum34; # RuntimeError: Working outside of application context. diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 9a13ebac647b8..f10a450727076 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { sha256 = "0xf2vkmdngp9cv9klznizai4byxjcf0iqh1pr4b83nann0jxqwy7"; }; - propagatedBuildInputs = [ aniso8601 jsonschema flask werkzeug pytz six ] + requiredPythonModules = [ aniso8601 jsonschema flask werkzeug pytz six ] ++ lib.optionals isPy27 [ enum34 ]; checkInputs = [ pytestCheckHook faker mock pytest-flask pytest-mock pytest-benchmark blinker ]; diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix index f8001bc2aff5d..53afa35661f1c 100644 --- a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix +++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sed -i 's@werkzeug.contrib.fixers@werkzeug.middleware.proxy_fix@g' flask_reverse_proxy_fix/middleware/__init__.py ''; - propagatedBuildInputs = [ + requiredPythonModules = [ flask werkzeug ]; diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix index 9acc55166a868..a326e91fd350d 100644 --- a/pkgs/development/python-modules/flask-script/default.nix +++ b/pkgs/development/python-modules/flask-script/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0r8w2v89nj6b9p91p495cga5m72a673l2wc0hp0zqk05j4yrc9b4"; }; - propagatedBuildInputs = [ flask ]; + requiredPythonModules = [ flask ]; checkInputs = [ pytest ]; # No tests in archive diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix index 831eb03a09b0d..1a908b50d6ba0 100644 --- a/pkgs/development/python-modules/flask-silk/default.nix +++ b/pkgs/development/python-modules/flask-silk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { sha256 = "0mplziqw52jfspas6vsm210lmxqqzgj0dxm8y0i3gpbyyykwcmh0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ flask ]; diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index b7bd0fe7f3afb..f8a5d019e1f65 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "36c1d5765010d1f4e4f05b4cc9c20c289d9dc70698c88d1addd0afcfedc5b062"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ flask python-socketio ]; diff --git a/pkgs/development/python-modules/flask-sockets/default.nix b/pkgs/development/python-modules/flask-sockets/default.nix index aa29fd4fbc943..3b19e8596286d 100644 --- a/pkgs/development/python-modules/flask-sockets/default.nix +++ b/pkgs/development/python-modules/flask-sockets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "072927da8edca0e81e024f5787e643c87d80b351b714de95d723becb30e0643b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ flask gevent gevent-websocket diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index c811ce24157ed..c2140a05a2003 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1rgsj49gnx361hnb3vn6c1h17497qh22yc3r70l1r6w0mw71bixz"; }; - propagatedBuildInputs = [ flask sqlalchemy ]; + requiredPythonModules = [ flask sqlalchemy ]; checkInputs = [ mock pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/flask-swagger-ui/default.nix b/pkgs/development/python-modules/flask-swagger-ui/default.nix index f2908f43b00a8..3e63dbeb0e89d 100644 --- a/pkgs/development/python-modules/flask-swagger-ui/default.nix +++ b/pkgs/development/python-modules/flask-swagger-ui/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; # there are no tests - propagatedBuildInputs = [ + requiredPythonModules = [ flask ]; diff --git a/pkgs/development/python-modules/flask-swagger/default.nix b/pkgs/development/python-modules/flask-swagger/default.nix index c690e4e64ae56..1479704dd9ffe 100644 --- a/pkgs/development/python-modules/flask-swagger/default.nix +++ b/pkgs/development/python-modules/flask-swagger/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # No Tests doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ flask pyyaml ]; diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index feb3766067bf9..1e9877e9de6b2 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "twill==0.9.1" "twill" ''; - propagatedBuildInputs = [ flask ]; + requiredPythonModules = [ flask ]; checkInputs = [ blinker ] ++ stdenv.lib.optionals (!isPy3k) [ twill ]; diff --git a/pkgs/development/python-modules/flask-versioned/default.nix b/pkgs/development/python-modules/flask-versioned/default.nix index 3bd5ef98b322e..7277d33863e75 100644 --- a/pkgs/development/python-modules/flask-versioned/default.nix +++ b/pkgs/development/python-modules/flask-versioned/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1wim9hvx7lxzfg35c0nc7p34j4vw9mzisgijlz4ibgykah4g1y37"; }; - propagatedBuildInputs = [ flask ]; + requiredPythonModules = [ flask ]; meta = with stdenv.lib; { description = "Flask plugin to rewrite file paths to add version info"; diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 060f592b2cff6..1e1dda3589db4 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "086pvg2x69n0nczcq7frknfjd8am1zdy8qqpva1sanwb02hf65yl"; }; - propagatedBuildInputs = [ flask wtforms nose ]; + requiredPythonModules = [ flask wtforms nose ]; doCheck = false; # requires external service diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index bbac89406fc3c..d3437ad702d19 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ itsdangerous click werkzeug jinja2 ]; + requiredPythonModules = [ itsdangerous click werkzeug jinja2 ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix index db0a4377947e9..e550a72be6571 100644 --- a/pkgs/development/python-modules/flaskbabel/default.nix +++ b/pkgs/development/python-modules/flaskbabel/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn"; }; - propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ]; + requiredPythonModules = [ flask jinja2 speaklater Babel pytz ]; meta = with stdenv.lib; { description = "Adds i18n/l10n support to Flask applications"; diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index cfcc4d362997c..155e7d026483c 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "03g2z21k6nhxgwysjrgnxj9m1yg25mnnkr10gpyfhfkd9w77pcpz"; }; - propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ]; + requiredPythonModules = [ requests requests_toolbelt requests_oauthlib ]; checkInputs = [ pytest pytestrunner pytestcov responses ]; doCheck = false; # Otherwise: diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index 441084da97fab..c1281e9de7a20 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "a50bcd8bf5785e3a7d95434244f30ba693e794c5204ac1ee908fc07c4acdbf80"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pytoml ]; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index c0944f4ff17b1..2440f66840002 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sha256 = "017012b809ec489918afd68af7a70bd7c8c770c87b60159d875c126866e97a4b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ docutils requests requests_download diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix index b31cbc7424d99..7ff7246810d8a 100644 --- a/pkgs/development/python-modules/flower/default.nix +++ b/pkgs/development/python-modules/flower/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { rm tests/load.py ''; - propagatedBuildInputs = [ + requiredPythonModules = [ celery pytz tornado diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index 717e3a3291b6f..60b34cd216caa 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "19118ff77925c66a6782152066d86bc8d5c6ed60189b642263fb0c6eb7cb22ef"; }; - propagatedBuildInputs = [ botocore boto3 docutils ]; + requiredPythonModules = [ botocore boto3 docutils ]; buildInputs = [ unittest2 mock ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix index 70c9173f4d50b..d887c712e76c9 100644 --- a/pkgs/development/python-modules/fluent-logger/default.nix +++ b/pkgs/development/python-modules/fluent-logger/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { --replace "msgpack<1.0.0" "msgpack" ''; - propagatedBuildInputs = [ msgpack ]; + requiredPythonModules = [ msgpack ]; # Tests fail because absent in package doCheck = false; diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix index deb92ea9ce850..3d1e8e23c1e9e 100644 --- a/pkgs/development/python-modules/flufl/bounce.nix +++ b/pkgs/development/python-modules/flufl/bounce.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { version = "3.0.1"; buildInputs = [ nose2 ]; - propagatedBuildInputs = [ atpublic zope_interface ]; + requiredPythonModules = [ atpublic zope_interface ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index 6e8d77bf4f814..94b85f1ea7401 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "flufl.i18n"; version = "2.0.2"; - propagatedBuildInputs = [ atpublic ]; + requiredPythonModules = [ atpublic ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 1be5d9a7c4c28..e972ce0956239 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "flufl.lock"; version = "3.2"; - propagatedBuildInputs = [ atpublic ]; + requiredPythonModules = [ atpublic ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 800ece5261da3..5bf3ee7dff409 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; checkInputs = [ pytest nbconvert pandas mock ]; - propagatedBuildInputs = [ jinja2 branca requests numpy ]; + requiredPythonModules = [ jinja2 branca requests numpy ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix index 7a23abdd03745..860bc0b5d5eb3 100644 --- a/pkgs/development/python-modules/fontmath/default.nix +++ b/pkgs/development/python-modules/fontmath/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ fonttools ]; + requiredPythonModules = [ fonttools ]; checkInputs = [ pytest pytestrunner ]; meta = with lib; { diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 43fdae8ccafcc..c59cb4f2f2e56 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ booleanoperations fonttools unicodedata2 # fonttools[unicode] extra diff --git a/pkgs/development/python-modules/fontpens/default.nix b/pkgs/development/python-modules/fontpens/default.nix index 02adb3b064265..3144d21d061ed 100644 --- a/pkgs/development/python-modules/fontpens/default.nix +++ b/pkgs/development/python-modules/fontpens/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ fonttools ]; + requiredPythonModules = [ fonttools ]; # can't run normal tests due to circular dependency with fontParts doCheck = false; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 0c5a0fff79d2c..ed5213ad7ac12 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0rbw9makjmawkcxnkkngybj3n14s0dnzn9gkqqq2krcm514kmlb9"; }; - propagatedBuildInputs = [ mock twisted pyopenssl service-identity ]; + requiredPythonModules = [ mock twisted pyopenssl service-identity ]; checkPhase = '' # Either uncomment this, or remove this custom check phase entirely, if diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index cc9ad87052b02..0992b2b4a1885 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "00yqpkv7cxwk301cyiwjzr9yfq8hpnhqyspw3z874ydrl3cmssdb"; }; - propagatedBuildInputs = [ tkinter supercollider ]; + requiredPythonModules = [ tkinter supercollider ]; # Requires a running SuperCollider instance doCheck = false; diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 5587657972370..dce1bbbe0079e 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { fplll ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cython cysignals numpy diff --git a/pkgs/development/python-modules/freetype-py/default.nix b/pkgs/development/python-modules/freetype-py/default.nix index a1259b85673a2..03a55af98688f 100644 --- a/pkgs/development/python-modules/freetype-py/default.nix +++ b/pkgs/development/python-modules/freetype-py/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ freetype ]; + requiredPythonModules = [ freetype ]; pythonImportsCheck = [ "freetype" ]; diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 92254b94dee9c..ac54dae0052da 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; }; - propagatedBuildInputs = [ dateutil six ]; + requiredPythonModules = [ dateutil six ]; checkInputs = [ mock nose pytest ]; # contains python3 specific code doCheck = !isPy27; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index d55941bd5b47e..80ee4ffd2bb00 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { --replace 'find_packages()' 'find_packages(exclude=["*.tests"])' ''; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix index 18434f530cbf6..321a0289f8e44 100644 --- a/pkgs/development/python-modules/fs-s3fs/default.nix +++ b/pkgs/development/python-modules/fs-s3fs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "b57f8c7664460ff7b451b4b44ca2ea9623a374d74e1284c2d5e6df499dc7976c"; }; - propagatedBuildInputs = [ fs six boto3 ]; + requiredPythonModules = [ fs six boto3 ]; # tests try to integrate an s3 bucket which can't be tested properly in an isolated environment. doCheck = false; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 77aee7a3bdfe5..d26408ae1973e 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { buildInputs = [ glibcLocales ]; checkInputs = [ pyftpdlib mock psutil pytestCheckHook ]; - propagatedBuildInputs = [ six appdirs pytz ] + requiredPythonModules = [ six appdirs pytz ] ++ lib.optionals (!isPy3k) [ backports_os ] ++ lib.optionals (!pythonAtLeast "3.6") [ typing ] ++ lib.optionals (!pythonAtLeast "3.5") [ scandir ] diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index a781230a9193b..0ec3e1cfa3e4e 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "081p5z20dirrf1i3nshylc31qd5mbxibjc7gzj8x4isbiizpdisi"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ html5lib wcwidth setuptools diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index 5893e5a6b9415..a9f559ac05fb0 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ flake8 pytest ]; - propagatedBuildInputs = [ six orderedmultidict ]; + requiredPythonModules = [ six orderedmultidict ]; # see https://github.com/gruns/furl/issues/121 checkPhase = '' diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 57355126dde21..a3170d983ce4c 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1gg69qfi9pjcic3g98l8ya64rw2vc1bp8gsf76my6gglq8z7izvj"; }; - propagatedBuildInputs = [ pkgs.fuse ]; + requiredPythonModules = [ pkgs.fuse ]; # No tests included doCheck = false; diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 8baec8c1089a2..38b354892278a 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5"; }; - propagatedBuildInputs = [ python-Levenshtein ]; + requiredPythonModules = [ python-Levenshtein ]; checkInputs = [ pycodestyle hypothesis pytest ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index bcc7a4b5c9885..074de1d68ef0e 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sdcc ]; - propagatedBuildInputs = [ libusb1 crcmod ]; + requiredPythonModules = [ libusb1 crcmod ]; preBuild = '' cd software diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix index 372cdae8c233c..9d132f5f5a216 100644 --- a/pkgs/development/python-modules/gateone/default.nix +++ b/pkgs/development/python-modules/gateone/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { sha256 = "1ghrawlqwv7wnck6alqpbwy9mpv0y21cw2jirrvsxaracmvgk6vv"; }; - propagatedBuildInputs = [tornado futures html5lib pkgs.openssl pkgs.cacert pkgs.openssh]; + requiredPythonModules = [tornado futures html5lib pkgs.openssl pkgs.cacert pkgs.openssh]; postInstall='' cp -R "$out/gateone/"* $out/lib/python2.7/site-packages/gateone diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 774b2087d8fdf..0e3b25bda34ce 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0gyady7x3v3l9fm1zan0idaggqqcm31y7g5vxk7h05p5h7f39bjs"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ jinja2 lxml ]; diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 9af1072728548..f4d56970fa7b8 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { sha256 = "4b3a1301e57bfd8dce939bf25ef8fbb4b23967fd0f878eede328bdcc41386bac"; }; - propagatedBuildInputs = [ filelock requests tqdm setuptools ]; + requiredPythonModules = [ filelock requests tqdm setuptools ]; checkPhase = '' $out/bin/gdown --help > /dev/null diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix index 24b788f2c6d77..3bf60e5b17d62 100644 --- a/pkgs/development/python-modules/gdrivefs/default.nix +++ b/pkgs/development/python-modules/gdrivefs/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; buildInputs = [ gipc greenlet httplib2 six ]; - propagatedBuildInputs = [ dateutil fusepy google_api_python_client ]; + requiredPythonModules = [ dateutil fusepy google_api_python_client ]; patchPhase = '' substituteInPlace gdrivefs/resources/requirements.txt \ diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix index cacc832486e26..be2c61cd6bbd9 100644 --- a/pkgs/development/python-modules/geeknote/default.nix +++ b/pkgs/development/python-modules/geeknote/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { /homeless-shelter/.geeknotebuilder". */ doCheck = false; - propagatedBuildInputs = [ thrift beautifulsoup4 markdown2 sqlalchemy html2text evernote ]; + requiredPythonModules = [ thrift beautifulsoup4 markdown2 sqlalchemy html2text evernote ]; meta = with stdenv.lib; { description = "Work with Evernote from command line"; diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index 658ea3baee737..27baa8d351934 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "08eddb4a203e36e4fc3b66f85e00252070379867dbbc04fd8902ddc14fb352c6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pytestrunner cached-property frozendict diff --git a/pkgs/development/python-modules/genpy/default.nix b/pkgs/development/python-modules/genpy/default.nix index 64e253b32019f..8fe2a88e85651 100644 --- a/pkgs/development/python-modules/genpy/default.nix +++ b/pkgs/development/python-modules/genpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1c11726f1e8ace8bbdfc87816403c9a59f53a8c3d45c99187ae17c9725d87a91"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pytools numpy ]; diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix index a0033eb658b17..62c838990f1e6 100644 --- a/pkgs/development/python-modules/genshi/default.nix +++ b/pkgs/development/python-modules/genshi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase) doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools six ]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index be6321f86ca71..43d9eff6bc4be 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0rx37vnjspjl45v7bj123xwsjfgbwv91v8zpqpli8lgpf42xnskq"; }; - propagatedBuildInputs = [ smart_open numpy six scipy ]; + requiredPythonModules = [ smart_open numpy six scipy ]; checkInputs = [ scikitlearn testfixtures unittest2 ]; diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index 129eaae340a14..8a707f33613fe 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1sm6cqi7fv2k3pc68r7wvvjjz8y6cjmz8bvxgqfa4v4wxibwnwrl"; }; - propagatedBuildInputs = + requiredPythonModules = lib.optionals (pythonOlder "3.5") [ typing ] ++ lib.optionals (pythonOlder "3.4") [ funcsigs ]; diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index e96c67b044db1..f25c1d0fe9db0 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ sqlalchemy shapely ]; + requiredPythonModules = [ sqlalchemy shapely ]; # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst doCheck = false; diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 69b5d2f97fbec..e1e568554a955 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { substituteInPlace requirements.txt --replace "requests>=2.24.0,<3.0.0" "requests" ''; - propagatedBuildInputs = [ aiohttp requests maxminddb ]; + requiredPythonModules = [ aiohttp requests maxminddb ]; checkInputs = [ mocket requests-mock ]; diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 200dfffa562b3..126ec2a9c3e08 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { py.test geopandas -m "not web" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ pandas shapely fiona diff --git a/pkgs/development/python-modules/geopy/2.nix b/pkgs/development/python-modules/geopy/2.nix index 2863d30f4684d..dcc4c245783b2 100644 --- a/pkgs/development/python-modules/geopy/2.nix +++ b/pkgs/development/python-modules/geopy/2.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { disabled = !isPy27; # only Python 2.7 doCheck = false; # Needs network access - propagatedBuildInputs = [ geographiclib ]; + requiredPythonModules = [ geographiclib ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 817c1e38418e4..91db4ae8b20d9 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { disabled = !isPy3k; # only Python 3 doCheck = false; # Needs network access - propagatedBuildInputs = [ geographiclib ]; + requiredPythonModules = [ geographiclib ]; src = fetchFromGitHub { owner = "geopy"; diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix index 2b847275bed00..e2058c330731a 100644 --- a/pkgs/development/python-modules/gevent-socketio/default.nix +++ b/pkgs/development/python-modules/gevent-socketio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ versiontools gevent-websocket mock pytest ]; - propagatedBuildInputs = [ gevent ]; + requiredPythonModules = [ gevent ]; meta = with stdenv.lib; { homepage = "https://github.com/abourget/gevent-socketio"; diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index adc13738d5ea6..3b54a67fdc006 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1c2zv2rahp1gil3cj66hfsqgy0n35hz9fny3ywhr2319d0lz7bky"; }; - propagatedBuildInputs = [ gevent gunicorn ]; + requiredPythonModules = [ gevent gunicorn ]; meta = with stdenv.lib; { homepage = "https://www.gitlab.com/noppo/gevent-websocket"; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 4eb5c7cdbb9f3..74887518b8fc3 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ libev ]; - propagatedBuildInputs = [ + requiredPythonModules = [ zope_interface ] ++ stdenv.lib.optionals (!isPyPy) [ greenlet ]; diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 55ef8c39981a1..c8c4a11f2f195 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ gevent certifi six backports_ssl_match_hostname ]; + requiredPythonModules = [ gevent certifi six backports_ssl_match_hostname ]; # Several tests fail that require network doCheck = false; diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix index 9b3b92784d791..6fd1f9aed5a5d 100644 --- a/pkgs/development/python-modules/gflags/default.nix +++ b/pkgs/development/python-modules/gflags/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkPhase = '' # clashes with our pythhon wrapper (which is in argv0) diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix index c58d63a083752..5602c66d53563 100644 --- a/pkgs/development/python-modules/ghdiff/default.nix +++ b/pkgs/development/python-modules/ghdiff/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; checkInputs = [ zope_testrunner ]; - propagatedBuildInputs = [ six chardet ]; + requiredPythonModules = [ six chardet ]; meta = with stdenv.lib; { homepage = "https://github.com/kilink/ghdiff"; diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index f3b3c8d5df3d9..150aee1b1c394 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools pytestrunner ]; checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; - propagatedBuildInputs = [ + requiredPythonModules = [ uritemplate pyjwt ]; diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix index 412b0c159498a..de7e662a46170 100644 --- a/pkgs/development/python-modules/gin-config/default.nix +++ b/pkgs/development/python-modules/gin-config/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; - propagatedBuildInputs = [ six enum34 ]; + requiredPythonModules = [ six enum34 ]; # PyPI archive does not ship with tests doCheck= false; diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 3fe26f4a934b4..eb5c9b4413424 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "06116628e9cb7b2c34c8f248d0e4859fa5943e1e07381ad2b234ae9c7ed6f4cc"; }; - propagatedBuildInputs = [ gevent ]; + requiredPythonModules = [ gevent ]; meta = with stdenv.lib; { description = "gevent-cooperative child processes and IPC"; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 318bafb98efa3..68dfc2aac011b 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { utillinux # `rev` is needed in tests/test_process.py ]; - propagatedBuildInputs = [ pygit2 cacert ]; + requiredPythonModules = [ pygit2 cacert ]; checkPhase = '' ${python.interpreter} -m unittest diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix index aa2a223c77745..c3feb070677e8 100644 --- a/pkgs/development/python-modules/git-sweep/default.nix +++ b/pkgs/development/python-modules/git-sweep/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1csp0zd049d643d409rfivbswwzrayb4i6gkypp5mc27fb1z2afd"; }; - propagatedBuildInputs = [ GitPython ]; + requiredPythonModules = [ GitPython ]; meta = with stdenv.lib; { description = "A command-line tool that helps you clean up Git branches"; diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index 5c3bd4ac43fc5..b4941f584626a 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "c9e1f2d0db7ddb9a704c2a0217be31214e91a4fe1dea1efad19ae42ba0c285c9"; }; - propagatedBuildInputs = [ smmap ]; + requiredPythonModules = [ smmap ]; # Bunch of tests fail because they need an actual git repo doCheck = false; diff --git a/pkgs/development/python-modules/github-webhook/default.nix b/pkgs/development/python-modules/github-webhook/default.nix index 32b86896fdd11..3edcaff37afd4 100644 --- a/pkgs/development/python-modules/github-webhook/default.nix +++ b/pkgs/development/python-modules/github-webhook/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "b2444dbfd03deda35792bd00ebd1692597c2605c61445da79da6322afaca7a8d"; }; - propagatedBuildInputs = [ flask six ]; + requiredPythonModules = [ flask six ]; # touches network doCheck = false; diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index 6b1ea305d4a60..f5924e023e5ab 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ betamax pytest betamax-matchers ] ++ lib.optional (pythonOlder "3") unittest2 ++ lib.optional (pythonOlder "3.3") mock; - propagatedBuildInputs = [ requests uritemplate dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; + requiredPythonModules = [ requests uritemplate dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; postPatch = '' sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix index 8a63f78728e26..f70b6b8692e6a 100644 --- a/pkgs/development/python-modules/glasgow/default.nix +++ b/pkgs/development/python-modules/glasgow/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm sdcc ]; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools nmigen fx2 diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 7956a31492c0d..f060bebe72594 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ flake8 nose2 mock ]; - propagatedBuildInputs = [ requests pyjwt ]; + requiredPythonModules = [ requests pyjwt ]; meta = with lib; { description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API."; diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 916812f153547..43a30118fcf6f 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "5fa3a9d99c7f3e5410a810fa8a158c0f71e39036c47b77745c7f2e4630372f82"; }; - propagatedBuildInputs = [ boltons attrs face ]; + requiredPythonModules = [ boltons attrs face ]; checkInputs = [ pytest pyyaml ]; # test_cli.py checks the output of running "glom" diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index d2721951ad788..24a4555dbe434 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "1zbghzw1q4fljb019lsrhka9xrnn4425qnxrjbmbv7dssgkkywd7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy ] ++ stdenv.lib.optional isPy27 [ contextlib2 mock importlib-resources ]; diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix index deae0037bb2de..e147f05fe9641 100644 --- a/pkgs/development/python-modules/gmusicapi/default.nix +++ b/pkgs/development/python-modules/gmusicapi/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sha256 = "14dqs64nhy84dykyyrdjmsirc7m169zsvwa8abh4v0xcm658lm5k"; }; - propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ]; + requiredPythonModules = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ]; meta = with stdenv.lib; { description = "An unofficial API for Google Play Music"; diff --git a/pkgs/development/python-modules/gnutls/default.nix b/pkgs/development/python-modules/gnutls/default.nix index f26791fdbe968..411eebc8080b3 100644 --- a/pkgs/development/python-modules/gnutls/default.nix +++ b/pkgs/development/python-modules/gnutls/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "79f94017e6472ac665c85bc16d68aa2e6681f53b6a9e74516557b49b6fc6a651"; }; - propagatedBuildInputs = [ pkgs.gnutls ]; + requiredPythonModules = [ pkgs.gnutls ]; patchPhase = '' substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls.out}/lib" ''; diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index e183e79f57030..c58ff71f1184b 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ docutils installShellFiles ]; - propagatedBuildInputs = [ + requiredPythonModules = [ google_api_python_client simplejson oauth2client setuptools xdg ]; diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 441fdc85bac20..df1b00f71c897 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { gobject-introspection ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pygobject3 ]; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index b074774f62533..7f3eac610c601 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # No tests included in archive doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ google_auth google-auth-httplib2 google_api_core httplib2 six uritemplate oauth2client ]; diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index ff5aa3b2bac79..ac26c637d9ce3 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { flask mock six pytest pytest-localserver ]; - propagatedBuildInputs = [ + requiredPythonModules = [ google_auth httplib2 ]; diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index bdea58de89999..358c532cc17b4 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { click mock pytest ] ++ lib.optionals (!isPy3k) [ futures ]; - propagatedBuildInputs = [ + requiredPythonModules = [ google_auth requests_oauthlib ]; diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 01f7bc9ce33e5..918a7a3bd5a14 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; - propagatedBuildInputs = [ google_api_core ]; + requiredPythonModules = [ google_api_core ]; # No tests in repo doCheck = false; diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 39cc0dc9c24b8..f25c2cece024d 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; - propagatedBuildInputs = [ google_api_core ]; + requiredPythonModules = [ google_api_core ]; # No tests in repo doCheck = false; diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix index fbed406cebcea..9213db3d13a0a 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; buildInputs = [ crc32c ]; - propagatedBuildInputs = [ cffi ]; + requiredPythonModules = [ cffi ]; LDFLAGS = "-L${crc32c}/lib"; CFLAGS = "-I${crc32c}/include"; diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index 56a77258c8aa1..c1b7951c78495 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "8454a58f254a29988b8d1ca9ab663fd28a1f392a3d29b844d8824807db6333d7"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ pytest pytestcov mock ]; diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix index 16363192c81bd..89eba91e1dc12 100644 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ attrs audio-metadata marshmallow diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix index b7fd2738e0488..f66e95a00c93d 100644 --- a/pkgs/development/python-modules/google-music-utils/default.nix +++ b/pkgs/development/python-modules/google-music-utils/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0fn4zp0gf1wx2x06dbc840qcq21j4p3ajghxp7646w2n6n9gxhh7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ audio-metadata multidict wrapt ]; diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index 9d2f0def99b28..cd75ca2ac24c1 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { --replace "audio-metadata>=0.8,<0.9" "audio-metadata" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ appdirs audio-metadata google-music-proto diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix index 608ab9ccd1bc6..e9ad1ca4f6e2c 100644 --- a/pkgs/development/python-modules/google-pasta/default.nix +++ b/pkgs/development/python-modules/google-pasta/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0vm1r1jlaiagj0l9yf7j6zn9w3733dr2169911c0svgrr3gwiwn9"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six ]; diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 85371f06ca516..02d54abc8fe84 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "4a9d7ac2527a9e298eebb580a5e24e7e41d6afd97010848dd0f306cae198ec1a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ googleapis_common_protos protobuf google_auth requests setuptools grpcio ]; diff --git a/pkgs/development/python-modules/google_apputils/default.nix b/pkgs/development/python-modules/google_apputils/default.nix index c7b386623ef8a..c84b3a02f1426 100644 --- a/pkgs/development/python-modules/google_apputils/default.nix +++ b/pkgs/development/python-modules/google_apputils/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sed -i '/ez_setup/d' setup.py ''; - propagatedBuildInputs = [ pytz gflags dateutil mox ]; + requiredPythonModules = [ pytz gflags dateutil mox ]; checkPhase = '' ${python.executable} setup.py google_test diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index 758d415d399e9..eda0117089c0d 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "0h6lpbz8inxj2kpdjwrk5v7lqh1w5kkyv76d8sk3gs77y62xnxji"; }; - propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; + requiredPythonModules = [ six pyasn1-modules cachetools rsa setuptools ]; checkInputs = [ flask diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix index b1366c0d35cf1..9c7ffdec7ada8 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest-asyncio pytestCheckHook ]; disabledTests = [ "asset_service_transport_auth_adc" ]; - propagatedBuildInputs = [ + requiredPythonModules = [ grpc_google_iam_v1 google_api_core google-cloud-access-context-manager diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix index 43ffdc7a70dbb..9f3d46ee9a0b5 100644 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ pandas pytest mock google_cloud_storage ]; - propagatedBuildInputs = [ enum34 google_api_core ]; + requiredPythonModules = [ enum34 google_api_core ]; # ignore tests which need credentials checkPhase = '' diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index b8120285917fa..1327c72c5d9be 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ipython freezegun ]; - propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core pandas pyarrow ]; + requiredPythonModules = [ google_resumable_media google_api_core google_cloud_core pandas pyarrow ]; # prevent local directory from shadowing google imports # call_api_applying_custom_retry_on_timeout requires credentials diff --git a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix index 0647c1f917306..24b680296c7c8 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; + requiredPythonModules = [ google_api_core ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google_cloud_bigtable/default.nix index 310663df35051..abaeed677bbc0 100644 --- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigtable/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core google_cloud_core ]; + requiredPythonModules = [ grpc_google_iam_v1 google_api_core google_cloud_core ]; checkPhase = '' rm -r google diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/pkgs/development/python-modules/google_cloud_container/default.nix index ec41592b48b68..532f579f6362c 100644 --- a/pkgs/development/python-modules/google_cloud_container/default.nix +++ b/pkgs/development/python-modules/google_cloud_container/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 ]; + requiredPythonModules = [ google_api_core grpc_google_iam_v1 ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix index 01ec24a238101..41378dbdaa2f1 100644 --- a/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/pkgs/development/python-modules/google_cloud_core/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "21afb70c1b0bce8eeb8abb5dca63c5fd37fc8aea18f4b6d60e803bd3d27e6b80"; }; - propagatedBuildInputs = [ google_api_core grpcio setuptools ]; + requiredPythonModules = [ google_api_core grpcio setuptools ]; checkInputs = [ pytest mock ]; checkPhase = '' diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index 68b04508e6052..3c307c39a1da8 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + requiredPythonModules = [ google_api_core libcst proto-plus ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/pkgs/development/python-modules/google_cloud_datastore/default.nix index 652eca773a36d..04b0b7eb5af72 100644 --- a/pkgs/development/python-modules/google_cloud_datastore/default.nix +++ b/pkgs/development/python-modules/google_cloud_datastore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + requiredPythonModules = [ google_api_core google_cloud_core ]; checkPhase = '' rm -r google diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google_cloud_dlp/default.nix index 8273f40565fee..9808c7ca8ac0e 100644 --- a/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ b/pkgs/development/python-modules/google_cloud_dlp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 google_api_core ]; + requiredPythonModules = [ enum34 google_api_core ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_dns/default.nix b/pkgs/development/python-modules/google_cloud_dns/default.nix index d488b7ad56327..d2da5808cd0bb 100644 --- a/pkgs/development/python-modules/google_cloud_dns/default.nix +++ b/pkgs/development/python-modules/google_cloud_dns/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + requiredPythonModules = [ google_api_core google_cloud_core ]; checkPhase = '' rm -r google diff --git a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix index 72502a4f4ad1e..c280094f12dc2 100644 --- a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix +++ b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_cloud_logging ]; + requiredPythonModules = [ google_cloud_logging ]; checkPhase = '' rm -r google diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index a5d349456fd6c..ba63502122903 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + requiredPythonModules = [ google_api_core google_cloud_core ]; # tests were not included with release # See issue https://github.com/googleapis/google-cloud-python/issues/6380 diff --git a/pkgs/development/python-modules/google_cloud_iot/default.nix b/pkgs/development/python-modules/google_cloud_iot/default.nix index 8f14f7eeb87f4..f028e2ddd58e8 100644 --- a/pkgs/development/python-modules/google_cloud_iot/default.nix +++ b/pkgs/development/python-modules/google_cloud_iot/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + requiredPythonModules = [ enum34 grpc_google_iam_v1 google_api_core ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index 79fe4bcc80f29..7ec0a83bc3519 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + requiredPythonModules = [ enum34 grpc_google_iam_v1 google_api_core ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_language/default.nix b/pkgs/development/python-modules/google_cloud_language/default.nix index 4479231aba4d2..a230eeb775620 100644 --- a/pkgs/development/python-modules/google_cloud_language/default.nix +++ b/pkgs/development/python-modules/google_cloud_language/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 google_api_core ]; + requiredPythonModules = [ enum34 google_api_core ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google_cloud_logging/default.nix index 6aeef14b69217..8ded265160d4d 100644 --- a/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/pkgs/development/python-modules/google_cloud_logging/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock webapp2 django flask ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + requiredPythonModules = [ google_api_core google_cloud_core ]; checkPhase = '' rm -r google diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/pkgs/development/python-modules/google_cloud_monitoring/default.nix index 8815d8246d16a..3e13dede77425 100644 --- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix +++ b/pkgs/development/python-modules/google_cloud_monitoring/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core pandas ]; + requiredPythonModules = [ google_api_core pandas ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix index 56a9569284692..b95806b389e7b 100644 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + requiredPythonModules = [ enum34 grpc_google_iam_v1 google_api_core ]; # tests don't clean up file descriptors correctly doCheck = false; diff --git a/pkgs/development/python-modules/google_cloud_redis/default.nix b/pkgs/development/python-modules/google_cloud_redis/default.nix index 92f2027bf4e9c..fd4936746a072 100644 --- a/pkgs/development/python-modules/google_cloud_redis/default.nix +++ b/pkgs/development/python-modules/google_cloud_redis/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 google_api_core ]; + requiredPythonModules = [ enum34 google_api_core ]; # requires old version of google-api-core (override) preBuild = '' diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index 84fac88bcfa9a..5c02664b8b09d 100644 --- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_cloud_core google_api_core ]; + requiredPythonModules = [ google_cloud_core google_api_core ]; checkPhase = '' rm -r google diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix index 08e2c38ea1b1f..f89b15b92cec2 100644 --- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + requiredPythonModules = [ google_api_core google_cloud_core ]; # ignore tests which require credentials or network checkPhase = '' diff --git a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix b/pkgs/development/python-modules/google_cloud_secret_manager/default.nix index 513b76bafa4a4..7882d448ff1de 100644 --- a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_secret_manager/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1cm3xqacxnbpv2706bd2jl86mvcsphpjlvhzngz2k2p48a0jjx8r"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ google_api_core grpc_google_iam_v1 ]; diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix index a3992825d2e9d..31227da9908af 100644 --- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix +++ b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + requiredPythonModules = [ enum34 grpc_google_iam_v1 google_api_core ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix index ce03add44e4fc..90bc00e95555c 100644 --- a/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_spanner/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ]; + requiredPythonModules = [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ]; # avoid importing local package checkPhase = '' diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 5ffaafdbd6f78..3efc52dcb6a2b 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "2e5adbc0e88f296b1bc8667f1dcf26ca4ea2db6596f07cb0a39e7b1b8ef14656"; }; - propagatedBuildInputs = [ google_api_core ]; + requiredPythonModules = [ google_api_core ]; checkInputs = [ pytest mock ]; checkPhase = '' diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index 7a92e731042de..bcd6e28393bac 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "da12b7bd79bbe978a7945a44b600604fbc10ece2935d31f243e751f99135e34f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ google_api_core google_cloud_core google_resumable_media diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/pkgs/development/python-modules/google_cloud_tasks/default.nix index b7f827dd48020..11f611c9ffb6d 100644 --- a/pkgs/development/python-modules/google_cloud_tasks/default.nix +++ b/pkgs/development/python-modules/google_cloud_tasks/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + requiredPythonModules = [ enum34 grpc_google_iam_v1 google_api_core ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google_cloud_testutils/default.nix index 90e4683f7b062..b5292231f0039 100644 --- a/pkgs/development/python-modules/google_cloud_testutils/default.nix +++ b/pkgs/development/python-modules/google_cloud_testutils/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { sha256 = "1fvcnssmpgf4lfr7l9h7cz984rbc5mfr1j1br12japcib5biwzjy"; }; - propagatedBuildInputs = [ six google_auth ]; + requiredPythonModules = [ six google_auth ]; postPatch = '' cd test_utils diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index 3a052c73cdae9..c1437833818fa 100644 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; + requiredPythonModules = [ google_api_core ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_trace/default.nix b/pkgs/development/python-modules/google_cloud_trace/default.nix index 5b19243709f0c..27f6ab10b6ea2 100644 --- a/pkgs/development/python-modules/google_cloud_trace/default.nix +++ b/pkgs/development/python-modules/google_cloud_trace/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + requiredPythonModules = [ google_api_core google_cloud_core ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/pkgs/development/python-modules/google_cloud_translate/default.nix index f25f4badc8159..024659fd7c4da 100644 --- a/pkgs/development/python-modules/google_cloud_translate/default.nix +++ b/pkgs/development/python-modules/google_cloud_translate/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; # google_cloud_core[grpc] -> grpcio - propagatedBuildInputs = [ google_api_core google_cloud_core grpcio ]; + requiredPythonModules = [ google_api_core google_cloud_core grpcio ]; checkInputs = [ pytest mock ]; checkPhase = '' diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix index d097132a347a1..a3c819cb801de 100644 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; + requiredPythonModules = [ google_api_core ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix index 585abc8cc48ee..4a5f9b292a3bf 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google_cloud_vision/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ mock ]; - propagatedBuildInputs = [ enum34 google_api_core ]; + requiredPythonModules = [ enum34 google_api_core ]; # pytest seems to pick up some file which overrides PYTHONPATH checkPhase = '' diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix index a43f7fd5f9c25..0b25f15263646 100644 --- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; + requiredPythonModules = [ google_api_core ]; checkPhase = '' pytest tests/unit diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index 37bfbfc481bac..6c312c366b17c 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ requests setuptools six ] + requiredPythonModules = [ requests setuptools six ] ++ lib.optional isPy3k google-crc32c ++ lib.optional (!isPy3k) crcmod; diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 507c3ba229a6f..08b46ab35b589 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "560716c807117394da12cecb0a54da5a451b5cf9866f1d37e9a5e2329a665351"; }; - propagatedBuildInputs = [ protobuf setuptools ]; + requiredPythonModules = [ protobuf setuptools ]; checkInputs = [ pytest ]; doCheck = false; # there are no tests diff --git a/pkgs/development/python-modules/googletrans/default.nix b/pkgs/development/python-modules/googletrans/default.nix index 06d0082000596..35e3820d61c51 100644 --- a/pkgs/development/python-modules/googletrans/default.nix +++ b/pkgs/development/python-modules/googletrans/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0wzzinn0k9rfv9z1gmfk9l4kljyd4n6kizsjw4wjxv91kfhj92hz"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests ]; diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index 1181c59c1fc44..24c6c5c09da85 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0ampvsv97r3hy1cakif4kmyk1ynf3scbvh4fbk02x7xrxn4kl38w"; }; - propagatedBuildInputs = [ requests protobuf pycryptodome ]; + requiredPythonModules = [ requests protobuf pycryptodome ]; meta = with stdenv.lib; { homepage = "https://github.com/NoMore201/googleplay-api"; diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix index 7e74032390108..982933974e0c1 100644 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ]; + requiredPythonModules = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ]; meta = with stdenv.lib; { homepage = "https://github.com/matlink/gplaycli"; diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix index 57130a7aa5294..8cfe711cc69b8 100644 --- a/pkgs/development/python-modules/gpsoauth/default.nix +++ b/pkgs/development/python-modules/gpsoauth/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "1c3f45824d45ac3d06b9d9a0c0eccafe1052505d31ac9a698aef8b00fb0dfc37"; }; - propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ]; + requiredPythonModules = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ]; meta = with stdenv.lib; { description = "A python client library for Google Play Services OAuth"; diff --git a/pkgs/development/python-modules/gpxpy/default.nix b/pkgs/development/python-modules/gpxpy/default.nix index 4cd03103d8507..ca08e0454c627 100644 --- a/pkgs/development/python-modules/gpxpy/default.nix +++ b/pkgs/development/python-modules/gpxpy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1r5gb660nrkrdbw5m5h1n5k10npcfv9bxqv92z55ds8r7rw2saz6"; }; - propagatedBuildInputs = [ lxml ]; + requiredPythonModules = [ lxml ]; checkPhase = '' ${python.interpreter} -m unittest test diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index dbc5791ac335c..c4a5ec9f3ba7d 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ cython ]; - propagatedBuildInputs = [ numpy scipy six paramz matplotlib ]; + requiredPythonModules = [ numpy scipy six paramz matplotlib ]; meta = with stdenv.lib; { description = "Gaussian process framework in Python"; diff --git a/pkgs/development/python-modules/gpyopt/default.nix b/pkgs/development/python-modules/gpyopt/default.nix index 67f934ccf053f..ec1ea8b48d468 100644 --- a/pkgs/development/python-modules/gpyopt/default.nix +++ b/pkgs/development/python-modules/gpyopt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { checkPhase = "nosetests -v GPyOpt/testing"; - propagatedBuildInputs = [ setuptools numpy scipy gpy emcee ]; + requiredPythonModules = [ setuptools numpy scipy gpy emcee ]; meta = with stdenv.lib; { description = "Bayesian optimization toolbox in Python"; diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix index c6fcca9434d2b..c4935accb853f 100644 --- a/pkgs/development/python-modules/grammalecte/default.nix +++ b/pkgs/development/python-modules/grammalecte/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "11byjs3ggdhia5f4vyfqfvbbczsfqimll98h98g7hlsrm7vrifb0"; }; - propagatedBuildInputs = [ bottle ]; + requiredPythonModules = [ bottle ]; preBuild = "cd .."; diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix index 2d2658e00f848..5cae2bbbc9d18 100644 --- a/pkgs/development/python-modules/grandalf/default.nix +++ b/pkgs/development/python-modules/grandalf/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1f1l288sqna0bca7dwwvyw7wzg9b2613g6vc0g0vfngm7k75b2jg"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyparsing future ]; diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 50d5f0f966b62..cbf085cb5b934 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses ]; - propagatedBuildInputs = [ + requiredPythonModules = [ boost cgal expat diff --git a/pkgs/development/python-modules/graph_nets/default.nix b/pkgs/development/python-modules/graph_nets/default.nix index 4f7b8c52e9ee1..51e19141faff9 100644 --- a/pkgs/development/python-modules/graph_nets/default.nix +++ b/pkgs/development/python-modules/graph_nets/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sed -i 's/dm-sonnet==1.23/dm-sonnet/' setup.py ''; - propagatedBuildInputs = [ + requiredPythonModules = [ tensorflow absl-py dm-sonnet diff --git a/pkgs/development/python-modules/graphite-api/default.nix b/pkgs/development/python-modules/graphite-api/default.nix index 51300847bbbce..99e552b3190e4 100644 --- a/pkgs/development/python-modules/graphite-api/default.nix +++ b/pkgs/development/python-modules/graphite-api/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkPhase = "nosetests"; - propagatedBuildInputs = [ + requiredPythonModules = [ flask flask-caching cairocffi diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 16341e7180846..1c3dbc2a73f1d 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { ./update-django-tagging.patch ]; - propagatedBuildInputs = [ + requiredPythonModules = [ django django_tagging whisper pycairo cairocffi ldap memcached pytz urllib3 scandir ]; diff --git a/pkgs/development/python-modules/graphite_beacon/default.nix b/pkgs/development/python-modules/graphite_beacon/default.nix index cc070f55323c2..1a312bb941e15 100644 --- a/pkgs/development/python-modules/graphite_beacon/default.nix +++ b/pkgs/development/python-modules/graphite_beacon/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks"; }; - propagatedBuildInputs = [ tornado_5 pyyaml funcparserlib ]; + requiredPythonModules = [ tornado_5 pyyaml funcparserlib ]; postPatch = '' substituteInPlace requirements.txt --replace "==" ">=" diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 9e48f66c13d1d..f50da62bceff1 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "0kvbj9dwpx8mjfj86kqx54dbz9k72ki147ssyj0ca2syvb8jm3wb"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ promise rx six diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix index e26e936f48fdc..6647bd89c6f23 100644 --- a/pkgs/development/python-modules/graphql-server-core/default.nix +++ b/pkgs/development/python-modules/graphql-server-core/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ graphql-core promise ]; diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 4fd6ccf19c579..6698ec6a73435 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "0lab76qiryxvwl6zrcikhnxil1xywl0wkkm2vzi4v9mdzpa7w29r"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ hyppo matplotlib networkx diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index b4048c922daee..5caed35b22314 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { disabled = !isPy3k; - propagatedBuildInputs = [ future pyusb ipython pygreat ]; + requiredPythonModules = [ future pyusb ipython pygreat ]; doCheck = false; diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 280f4de1aca90..e3ae01a9bd1d3 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "3473abb4629c8c1af9f6b59a4f9c757315736580053a64bbfd91ff21ccad57a8"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ colorama coverage termstyle unidecode lxml ]; diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 5b7581ada8f0f..6c266f998ed4b 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "41d8835c69a78de718e466dd0e6bfd4b46125f21a67c3ff6d76d8d8059868d6b"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # see https://github.com/python-greenlet/greenlet/issues/85 preCheck = '' diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index 34e8c7ff16ff5..c9f3dfe217adb 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - propagatedBuildInputs = [ requests gevent ]; + requiredPythonModules = [ requests gevent ]; meta = with stdenv.lib; { description = "Asynchronous HTTP requests"; diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index cf29b11b268ee..0d824ea415ef3 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytest responses ]; - propagatedBuildInputs = [ docopt flask markdown path-and-address pygments requests tabulate ]; + requiredPythonModules = [ docopt flask markdown path-and-address pygments requests tabulate ]; checkPhase = '' export PATH="$PATH:$out/bin" diff --git a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix index caa3b8cafb4cc..fe2ae072dd92e 100644 --- a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix +++ b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0bfb5b56f648f457021a91c0df0db4934b6e0c300bd0f2de2333383fe958aa72"; }; - propagatedBuildInputs = [ grpcio googleapis_common_protos ]; + requiredPythonModules = [ grpcio googleapis_common_protos ]; # non-standard test format, and python3 will load local google folder first # but tests cannot be ran if google folder is removed or moved diff --git a/pkgs/development/python-modules/grpcio-gcp/default.nix b/pkgs/development/python-modules/grpcio-gcp/default.nix index 6af70be2f6cb7..513a67713c6d3 100644 --- a/pkgs/development/python-modules/grpcio-gcp/default.nix +++ b/pkgs/development/python-modules/grpcio-gcp/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "e292605effc7da39b7a8734c719afb12ec4b5362add3528d8afad3aa3aa9057c"; }; - propagatedBuildInputs = [ grpcio ]; + requiredPythonModules = [ grpcio ]; meta = with stdenv.lib; { description = "gRPC extensions for Google Cloud Platform"; diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index fe0fc9d3f8ead..17dfa8a34d58c 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - propagatedBuildInputs = [ protobuf grpcio setuptools ]; + requiredPythonModules = [ protobuf grpcio setuptools ]; # no tests in the package doCheck = false; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 9311838627a19..bd2c04ac64081 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; buildInputs = [ c-ares openssl zlib ]; - propagatedBuildInputs = [ six protobuf ] + requiredPythonModules = [ six protobuf ] ++ stdenv.lib.optionals (isPy27) [ enum34 futures ]; preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR"; diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/pkgs/development/python-modules/gsd/1.7.nix index 6e6f0504aa722..f59bea39d3d9c 100644 --- a/pkgs/development/python-modules/gsd/1.7.nix +++ b/pkgs/development/python-modules/gsd/1.7.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; # tests not packaged with gsd doCheck = false; diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 8eefb1f4318b5..327fb6fa8847b 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "07hw29r2inyp493dia4fx3ysfr1wxi2jb3n9cmwdi0l54s2ahqvf"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 5fd73541dd42c..ee5c9e1a938f3 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c"; }; - propagatedBuildInputs = [ requests google_auth google-auth-oauthlib ]; + requiredPythonModules = [ requests google_auth google-auth-oauthlib ]; meta = with stdenv.lib; { description = "Google Spreadsheets client library"; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 9013c7d978fd2..9132037d33510 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { krb5Full ]; - propagatedBuildInputs = [ + requiredPythonModules = [ decorator six ]; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index c66ceedc3ceef..5bed169b50533 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -36,8 +36,11 @@ buildPythonPackage rec { gst-plugins-base ]; - propagatedBuildInputs = [ + buildInputs = [ gst-plugins-base + ]; + + requiredPythonModules = [ pygobject3 ]; diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index d19d05276e225..d29f22bc34b59 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { glibcLocales gobject-introspection gtk3 libsoup libsecret ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pygobject3 freezegun mock ]; diff --git a/pkgs/development/python-modules/gtts-token/default.nix b/pkgs/development/python-modules/gtts-token/default.nix index d3443ef0c97e1..33a839599e0f0 100644 --- a/pkgs/development/python-modules/gtts-token/default.nix +++ b/pkgs/development/python-modules/gtts-token/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "9d6819a85b813f235397ef931ad4b680f03d843c9b2a9e74dd95175a4bc012c5"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests ]; diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index 934f3bd58202a..f0f025f8e48a3 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "1d0r6dnb8xvgyvxz7nfj4q4xqmpmvcwcsjghxrh76m6p364lh1hj"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ beautifulsoup4 click gtts-token diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index d0c1e74ee290d..adf8644dbca40 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # Tests require more packages. doCheck = false; buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ + requiredPythonModules = [ dateutil babelfish rebulk ]; diff --git a/pkgs/development/python-modules/guestfs/default.nix b/pkgs/development/python-modules/guestfs/default.nix index a446166c29176..f37476c6f1bc8 100644 --- a/pkgs/development/python-modules/guestfs/default.nix +++ b/pkgs/development/python-modules/guestfs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "06a4b5xf1rkhnzfvck91n0z9mlkrgy90s9na5a8da2g4p776lhkf"; }; - propagatedBuildInputs = [ libguestfs qemu ]; + requiredPythonModules = [ libguestfs qemu ]; meta = with stdenv.lib; { homepage = "https://libguestfs.org/guestfs-python.3.html"; diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index ccf1627d7f32f..656249e1aa4ed 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { inherit (libgumath) src version meta; checkInputs = [ numba ]; - propagatedBuildInputs = [ ndtypes xnd ]; + requiredPythonModules = [ ndtypes xnd ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix index f9681eef97e36..cb63a9be783c5 100644 --- a/pkgs/development/python-modules/gunicorn/19.nix +++ b/pkgs/development/python-modules/gunicorn/19.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1080jk1ly8j0rc6lv8i33sj94rxjaskd1732cdq5chdqb3ij9ppr"; }; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; checkInputs = [ pytest mock pytestcov coverage ]; diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 8bdc429690322..c6c1f25b1498e 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626"; }; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; checkInputs = [ pytest mock pytestcov coverage ]; diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix index 7b4498afb2c50..cf3ec045e1054 100644 --- a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix +++ b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { doCheck = false; # no tests - propagatedBuildInputs = [ sphinx ]; + requiredPythonModules = [ sphinx ]; meta = with stdenv.lib; { description = "Sphinx theme used by Guzzle: http://guzzlephp.org"; diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index d826fc33324f6..c5eea2eaff2ef 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; # cloudpickle range has been expanded in package but not yet released - propagatedBuildInputs = [ + requiredPythonModules = [ numpy requests six pyglet scipy cloudpickle ]; diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 6d432fed0e4ee..0cd4dc0ea0c2e 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "051gg30aca26rdxsmr9svwqm06pdz9bv21ch4n0lgi7jsvml2pw7"; }; - propagatedBuildInputs = [ enum34 hpack hyperframe ]; + requiredPythonModules = [ enum34 hpack hyperframe ]; meta = with stdenv.lib; { description = "HTTP/2 State-Machine based protocol implementation"; diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 316c5bc4d4835..975379a3131f8 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "09bbnpsvwksb07wijn7flyyza56h5b2g2cw0hb3slmwxz6cgcjmr"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ h5py ]; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 8cb6b8c22f53f..f792aadb82016 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -35,7 +35,7 @@ in buildPythonPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ hdf5 cython ] ++ optional mpiSupport mpi; - propagatedBuildInputs = [ numpy six] + requiredPythonModules = [ numpy six] ++ optionals mpiSupport [ mpi4py openssh ]; meta = { diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index cf119c1dec56b..4733c4690aa2e 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ ffmpeg_3 ]; - propagatedBuildInputs = [ async-timeout ]; + requiredPythonModules = [ async-timeout ]; # only manual tests doCheck = false; diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index a7ec358ffd7b5..4e85a1157fdfb 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1l2cgl6iiq8jff2w2pib6w8dwaj8344crhwsni2zzq0p44dwi13d"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ nose vcrpy ]; checkPhase = "make test"; diff --git a/pkgs/development/python-modules/handout/default.nix b/pkgs/development/python-modules/handout/default.nix index c5c111845d15f..af3b17db3ce99 100644 --- a/pkgs/development/python-modules/handout/default.nix +++ b/pkgs/development/python-modules/handout/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "52daaf1f9a4cb2ceb88c1dedf85d22ef449b9422b424a2534d21f941e57bc915"; }; - propagatedBuildInputs = [ imageio imageio-ffmpeg ]; + requiredPythonModules = [ imageio imageio-ffmpeg ]; meta = with stdenv.lib; { description = "Turn Python scripts into handouts with Markdown and figures"; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 6ecd915809311..e873bf856a54c 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sed -i 's/"cryptography.*"/"cryptography"/' setup.py ''; - propagatedBuildInputs = [ + requiredPythonModules = [ acme aiohttp atomicwrites snitun attrs warrant pycognito ]; diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix index 1a8ddacdd6906..a1fa575afb50c 100644 --- a/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/pkgs/development/python-modules/hawkauthlib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi"; }; - propagatedBuildInputs = [ requests webob ]; + requiredPythonModules = [ requests webob ]; meta = with stdenv.lib; { homepage = "https://github.com/mozilla-services/hawkauthlib"; diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index b00e3a88d3e9a..75cb5f459e4b0 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1n9c8yj11npiq9qxivwmfhib1qkjpcyw42a7q0w641bdrz3x6r37"; }; - propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ]; + requiredPythonModules = [ transitions websockets passlib docopt pyyaml ]; postPatch = '' # test tries to bind same port multiple times and fails diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 9a99fb0953a2e..29b4c34c797fc 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "069bf78a3c6cd642aae0b1a562b443d2670e6d73d507ce77cbf8a2c16974ca29"; }; - propagatedBuildInputs = [ future requests python-dateutil ]; + requiredPythonModules = [ future requests python-dateutil ]; checkInputs = [ flake8 isort mock pytest ]; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 6ee76e5271a7d..235b8f460f570 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy scipy scikitlearn joblib six ]; + requiredPythonModules = [ numpy scipy scikitlearn joblib six ]; meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix index 80e287d376f4b..b67e0c6102dc0 100644 --- a/pkgs/development/python-modules/hdmedians/default.nix +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # nose was specified in setup.py as a build dependency... buildInputs = [ cython nose ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; # cannot resolve path for packages in tests doCheck = false; diff --git a/pkgs/development/python-modules/helpdev/default.nix b/pkgs/development/python-modules/helpdev/default.nix index 34b4d6974478c..a488d8112f186 100644 --- a/pkgs/development/python-modules/helpdev/default.nix +++ b/pkgs/development/python-modules/helpdev/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0gfvj28i82va7c264jl2p4cdsl3lpf9fpb9cyjnis55crfdafqmv"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ importlib-metadata psutil ]; diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix index 00e4ddce8b4bd..662f5e4a84dcb 100644 --- a/pkgs/development/python-modules/helper/default.nix +++ b/pkgs/development/python-modules/helper/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; checkInputs = [ mock ]; - propagatedBuildInputs = [ pyyaml ]; + requiredPythonModules = [ pyyaml ]; # No tests in the pypi tarball doCheck = false; diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index 29a29a3b65228..fac99ade73574 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { substituteInPlace heudiconv/info.py --replace "'pathlib'," "" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ dcm2niix nibabel pydicom nipype dcmstack etelemetry filelock ]; diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index c82352f9bfef4..fa8077cd65914 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "13hbm0ki6s88r6p65ibvrbxnskinzdz0m9gsshb8s571p91ymfjn"; }; - propagatedBuildInputs = [ dulwich ]; + requiredPythonModules = [ dulwich ]; # Needs patch to work with Mercurial 4.8 # https://bitbucket.org/durin42/hg-git/issues/264/unexpected-keyword-argument-createopts-hg diff --git a/pkgs/development/python-modules/hgsvn/default.nix b/pkgs/development/python-modules/hgsvn/default.nix index ccf8635b8b111..26622c0f7a3a4 100644 --- a/pkgs/development/python-modules/hgsvn/default.nix +++ b/pkgs/development/python-modules/hgsvn/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ hglib ]; + requiredPythonModules = [ hglib ]; doCheck = false; # too many assumptions diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 0806573d7bec6..98cca1e5be078 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { --replace 'astropy<3.1;' 'astropy;' --replace 'astropy<3.0;' 'astropy;' ''; - propagatedBuildInputs = [ h5py numpy dill ]; + requiredPythonModules = [ h5py numpy dill ]; doCheck = false; # incompatible with latest astropy checkInputs = [ diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 070ad57c4f113..0aee3058206b7 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -9,10 +9,19 @@ buildPythonPackage rec { sha256 = "27c04d42a7187becf7a8309d4846aa4f235ac8b7dafd758335b109f5cbd3b962"; }; - propagatedBuildInputs = - stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ] ++ - stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit darwin.apple_sdk.frameworks.CoreFoundation ] ++ - [ cython ]; + buildInputs = [ + libusb1 + udev + ]; + + nativeBuildInputs = [ + cython + ]; + + requiredPythonModules = [ + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + darwin.IOKit darwin.apple_sdk.frameworks.CoreFoundation + ]; # Fix the USB backend library lookup postPatch = stdenv.lib.optionalString stdenv.isLinux '' diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index 0959d117de34f..6884362e56b14 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "b4b5db13a9d387438e610c2ca1d81386ccd206944d9a9dd273f21874486cddaf"; }; - propagatedBuildInputs = [ sphinx ]; + requiredPythonModules = [ sphinx ]; # all tests fail; don't know why: # test_absolute_paths_made_relative (hieroglyph.tests.test_path_fixing.PostProcessImageTests) ... ERROR diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix index 891c79f1b7b8a..fa557fe71338c 100644 --- a/pkgs/development/python-modules/hiredis/default.nix +++ b/pkgs/development/python-modules/hiredis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132"; }; - propagatedBuildInputs = [ redis ]; + requiredPythonModules = [ redis ]; checkPhase = '' mv hiredis _hiredis diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix index f8ef8ba028d05..e520ee7c1d1ad 100644 --- a/pkgs/development/python-modules/hiro/default.nix +++ b/pkgs/development/python-modules/hiro/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "d10e3b7f27b36673b4fa1283cd38d610326ba1ff1291260d0275152f15ae4bc7"; }; - propagatedBuildInputs = [ six mock ]; + requiredPythonModules = [ six mock ]; meta = with stdenv.lib; { description = "Time manipulation utilities for Python"; diff --git a/pkgs/development/python-modules/hiyapyco/default.nix b/pkgs/development/python-modules/hiyapyco/default.nix index f443c58723e8e..29cedffe4f2fa 100644 --- a/pkgs/development/python-modules/hiyapyco/default.nix +++ b/pkgs/development/python-modules/hiyapyco/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1ams9dp05yhgbg6255wrjgchl2mqg0s34d8b8prvql9lsh59s1fj"; }; - propagatedBuildInputs = [ pyyaml jinja2 ]; + requiredPythonModules = [ pyyaml jinja2 ]; checkPhase = '' set -e diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 909606c25ebf8..f59a495135ca1 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools_scm cython ]; - propagatedBuildInputs = [ numpy scikitlearn ]; + requiredPythonModules = [ numpy scikitlearn ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix index fdc578c76dffc..3f700beba3002 100644 --- a/pkgs/development/python-modules/hocr-tools/default.nix +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # hocr-tools uses a test framework that requires internet access doCheck = false; - propagatedBuildInputs = [ pillow lxml reportlab ]; + requiredPythonModules = [ pillow lxml reportlab ]; meta = with stdenv.lib; { description = " diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 10ee1bbf2e760..94fbfe055899f 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "839281f2b1ae7ac576da7951472482f6e714818296853107ea861fa60f5013cc"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ convertdate dateutil korean-lunar-calendar diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 4d9da17bd3a97..d677d454ee38e 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "3f8a00ce1cc67a388a3a949441accd7e7e9ca9960ba16b49ee96a50305105a01"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ param numpy pyviz-comms diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 5b8cb6cecb9f6..ccd6a9637d514 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace 'cachelib==0.1' 'cachelib' ''; - propagatedBuildInputs = [ six pygments pyquery cachelib appdirs keep ]; + requiredPythonModules = [ six pygments pyquery cachelib appdirs keep ]; # author hasn't included page_cache directory (which allows tests to run without # external requests) in pypi tarball. github repo doesn't have release revisions diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index 17783f38d1f1f..95fd7386dd367 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0nnv34924r0yn01rwlk749j5ijy7yxyj302s1i57yjrkqr3zlvas"; }; - propagatedBuildInputs = [ lxml beautifulsoup4 ]; + requiredPythonModules = [ lxml beautifulsoup4 ]; meta = with lib; { description = "An allowlist-based and very opinionated HTML sanitizer that can be used both for untrusted and trusted sources."; diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 4962e89526d82..53c7c570eaf06 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ]; + requiredPythonModules = [ chardet lxml pkgs.libxml2 ]; doCheck = false; # No such file or directory: 'run_tests.py' diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index f0abbcfbeccea..335b94c2af4a7 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ flake8 pytest_4 pytest-expect mock ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six webencodings ]; diff --git a/pkgs/development/python-modules/htmllaundry/default.nix b/pkgs/development/python-modules/htmllaundry/default.nix index 33d3691e85ad7..44cca56038a62 100644 --- a/pkgs/development/python-modules/htmllaundry/default.nix +++ b/pkgs/development/python-modules/htmllaundry/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ six lxml ]; + requiredPythonModules = [ six lxml ]; # some tests fail, probably because of changes in lxml # not relevant for me, if releavnt for you, fix it... diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/pkgs/development/python-modules/htmltreediff/default.nix index cd742606f8b96..7098f53a10010 100644 --- a/pkgs/development/python-modules/htmltreediff/default.nix +++ b/pkgs/development/python-modules/htmltreediff/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1"; }; - propagatedBuildInputs = [ lxml html5lib ]; + requiredPythonModules = [ lxml html5lib ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix index 638191ee7fc46..b73daaa77f55c 100644 --- a/pkgs/development/python-modules/http-ece/default.nix +++ b/pkgs/development/python-modules/http-ece/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1y5ln09ji4dwpzhxr77cggk02kghq7lql60a6969a5n2lwpvqblk"; }; - propagatedBuildInputs = [ cryptography ] + requiredPythonModules = [ cryptography ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; checkInputs = [ coverage flake8 mock nose ]; diff --git a/pkgs/development/python-modules/http_signature/default.nix b/pkgs/development/python-modules/http_signature/default.nix index d86861a92517b..b00572ba27102 100644 --- a/pkgs/development/python-modules/http_signature/default.nix +++ b/pkgs/development/python-modules/http_signature/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "14acc192ef20459d5e11b4e800dd3a4542f6bd2ab191bf5717c696bf30936c62"; }; - propagatedBuildInputs = [ pycrypto ]; + requiredPythonModules = [ pycrypto ]; meta = with stdenv.lib; { homepage = "https://github.com/atl/py-http-signature"; diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index cf937b6bae3f6..2ce283f7541d0 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ brotlipy flask flask-common flask-limiter markupsafe decorator itsdangerous raven six ]; + requiredPythonModules = [ brotlipy flask flask-common flask-limiter markupsafe decorator itsdangerous raven six ]; # No tests doCheck = false; diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index aa15c2555e679..89af71cec6f84 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "0bwxn7m7r7h6k41swxj0jqj3nzi76wqxwbnry6y7d4qfh4m26g2j"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ h11 h2 sniffio diff --git a/pkgs/development/python-modules/httpretty/0.nix b/pkgs/development/python-modules/httpretty/0.nix index ee0e598a9ac2f..45fbdf3a5c1c6 100644 --- a/pkgs/development/python-modules/httpretty/0.nix +++ b/pkgs/development/python-modules/httpretty/0.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sha256 = "66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ nose sure coverage mock rednose # Following not declared in setup.py diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 895a28356ee5a..84df4035ae623 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { sha256 = "24a6fd2fe1c76e94801b74db8f52c0fb42718dc4a199a861b305b1a492b9d868"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ nose sure coverage mock rednose pytest # Following not declared in setup.py diff --git a/pkgs/development/python-modules/httpsig/default.nix b/pkgs/development/python-modules/httpsig/default.nix index 30c918d86feb6..b3d1687cfd7f9 100644 --- a/pkgs/development/python-modules/httpsig/default.nix +++ b/pkgs/development/python-modules/httpsig/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pycryptodome requests ]; + requiredPythonModules = [ pycryptodome requests ]; # Jailbreak pycryptodome preBuild = '' diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 1f527b47ec087..bd1d426d32790 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { sha256 = "00gmq45fckcqkj910bvd7pyqz1mvgsdvz4s0k7dzbnc5czzq1f4a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ brotli certifi h2 diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index 28a801de71a66..0f7f08336d0f4 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1hgic7qrmb1kxvfgf2qqiw39nqyknf17pjvli8jfzvd9mv7cb7hh"; }; - propagatedBuildInputs = [ redis ]; + requiredPythonModules = [ redis ]; # connects to redis doCheck = false; diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix index 6769b5371b887..92e0b804e97bd 100644 --- a/pkgs/development/python-modules/hug/default.nix +++ b/pkgs/development/python-modules/hug/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ falcon requests ]; + requiredPythonModules = [ falcon requests ]; checkInputs = [ mock marshmallow pytest numpy ]; checkPhase = '' diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index 49cb31b7d0309..5d3f12c62fa2b 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "bf52ec91244819c780341a3438d5d7b09f431d3f113a475147ac9b7b167a3d12"; }; - propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic; + requiredPythonModules = lib.optional (pythonOlder "3.3") monotonic; # humanfriendly tests depends on coloredlogs which itself depends on # humanfriendly. This lead to infinite recursion when trying to diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index a3cd4d5ec4d86..d7a175ed8bc09 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "87dc2a3183c1d4595990203e752b430155d7582a60850dfe0756189a233d4b57"; }; - propagatedBuildInputs = [ requests six ]; + requiredPythonModules = [ requests six ]; # Requires running a Vault server doCheck = false; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index d787b61133559..619f7ff273ee9 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ]; - propagatedBuildInputs = [ + requiredPythonModules = [ bokeh colorcet holoviews diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index de9c7995bde97..9d3fb67ce3a99 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "eec460a51eb556500c1eca92015be246d5714cd53171407a76da71e4346048ae"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ mnemonic ecdsa typing-extensions diff --git a/pkgs/development/python-modules/hydra-check/default.nix b/pkgs/development/python-modules/hydra-check/default.nix index 7316a6fc971d9..63d648dd60e41 100644 --- a/pkgs/development/python-modules/hydra-check/default.nix +++ b/pkgs/development/python-modules/hydra-check/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "1dmsscsib8ckp496gsfqxmq8d35zs71n99xmziq9iprvy7n5clq2"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ docopt requests beautifulsoup4 diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra/default.nix index 42f2812a6e1df..e36b793cee724 100644 --- a/pkgs/development/python-modules/hydra/default.nix +++ b/pkgs/development/python-modules/hydra/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ omegaconf ] ++ lib.optional isPy27 pathlib2; + requiredPythonModules = [ omegaconf ] ++ lib.optional isPy27 pathlib2; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix index 8337fd2230ba5..2a924db59046c 100644 --- a/pkgs/development/python-modules/hypchat/default.nix +++ b/pkgs/development/python-modules/hypchat/default.nix @@ -10,5 +10,5 @@ buildPythonPackage rec { sha256 = "1sd8f3gihagaqd848dqy6xw457fa4f9bla1bfyni7fq3h76sjdzg"; }; - propagatedBuildInputs = [ requests six dateutil ]; + requiredPythonModules = [ requests six dateutil ]; } diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index bab7986eda223..3b0774726645e 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af"; }; - propagatedBuildInputs = [ idna ] + requiredPythonModules = [ idna ] ++ lib.optionals isPy27 [ typing ]; meta = with lib; { diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix index 692db49adce66..d89b66b44931f 100644 --- a/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { poetry ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pydantic hypothesis pytest diff --git a/pkgs/development/python-modules/hypothesis/2.nix b/pkgs/development/python-modules/hypothesis/2.nix index 5b086d5f1a7f0..70fbc486cb1ab 100644 --- a/pkgs/development/python-modules/hypothesis/2.nix +++ b/pkgs/development/python-modules/hypothesis/2.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; - propagatedBuildInputs = [ + requiredPythonModules = [ attrs coverage sortedcontainers diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index dac4ca43fc91b..ab937d9a1b64d 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; - propagatedBuildInputs = [ + requiredPythonModules = [ attrs coverage sortedcontainers diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 5b2869e10d192..56612b0c726b1 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "0qdnb1l4hz4dgwhapz1fp9sb2vxxvr8h2ngsbvyf50h3kapcn19r"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numba numpy scikitlearn diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 231cb4f1d4133..8436e99ae4b34 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { rev = "v${version}"; sha256 = "13bzs9dcv27czpnnbgz7a037lm8h991c8gk0qzzk5mq5yak24715"; }; - propagatedBuildInputs = [ xlib ]; + requiredPythonModules = [ xlib ]; fontsConf = makeFontsConf { fontDirectories = [ ]; diff --git a/pkgs/development/python-modules/iapws/default.nix b/pkgs/development/python-modules/iapws/default.nix index 76330af43eeb4..70732e8489896 100644 --- a/pkgs/development/python-modules/iapws/default.nix +++ b/pkgs/development/python-modules/iapws/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "781285acaedff49d72c074aa308aabf7ca17f486cca490e5ed3f35526bbe4153"; }; - propagatedBuildInputs = [ scipy ]; + requiredPythonModules = [ scipy ]; meta = with lib; { description = "Python implementation of standard from IAPWS"; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 1627159e6fbdb..8bceea9ea5e10 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ multipledispatch numpy pandas diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index c8a3a09fd5508..6e6160016091f 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools ]; - propagatedBuildInputs = [ dateutil pytz ]; + requiredPythonModules = [ dateutil pytz ]; meta = with stdenv.lib; { description = "A parser/generator of iCalendar files"; diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix index eba5a70577f7d..bdb6bf3018650 100644 --- a/pkgs/development/python-modules/icecream/default.nix +++ b/pkgs/development/python-modules/icecream/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "16kpixl43nrn093cvkmxiq2dzd9xc73zwzkmwp0rs7x01nji8kj3"; }; - propagatedBuildInputs = [ asttokens colorama executing pygments ]; + requiredPythonModules = [ asttokens colorama executing pygments ]; meta = with lib; { description = "A little library for sweet and creamy print debugging"; diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index 08799a9fb4b2b..0c000dadba2b4 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0rrdc9rcxc3ys6rml81b8m8qdlisk78a34bdib0wy65hlkmyyykn"; }; - propagatedBuildInputs = [ tatsu arrow ]; + requiredPythonModules = [ tatsu arrow ]; postPatch = '' substituteInPlace requirements.txt \ diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix index ba11a39f5d9c3..9d8e1713e0937 100644 --- a/pkgs/development/python-modules/idna-ssl/default.nix +++ b/pkgs/development/python-modules/idna-ssl/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c"; }; - propagatedBuildInputs = [ idna ]; + requiredPythonModules = [ idna ]; # Infinite recursion: tests require aiohttp, aiohttp requires idna-ssl doCheck = false; diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index b4a9b20f08d17..565d1176896b5 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94"; }; - propagatedBuildInputs = [ ipaddress ]; + requiredPythonModules = [ ipaddress ]; checkPhase = '' ${python.interpreter} -m unittest discover diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 785ec5814918c..f5fb80452c5c5 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest matplotlib mock ]; - propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ]; + requiredPythonModules = [ pytorch scikitlearn tqdm pynvml ]; # Some packages are not in NixPkgs; other tests try to build distributed # models, which doesn't work in the sandbox. diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 3e36b4dd8e2d2..ac27fd904ff6e 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { sed -i 's/==.*$//' setup.cfg ''; - propagatedBuildInputs = [ + requiredPythonModules = [ alembic aniso8601 Babel diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index 6bb45f83790fa..c80ffc19d7e61 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ + requiredPythonModules = [ scikitimage ]; diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/pkgs/development/python-modules/imagecodecs-lite/default.nix index 861a0ed0db3d4..d5cafe6c514ae 100644 --- a/pkgs/development/python-modules/imagecodecs-lite/default.nix +++ b/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy ]; diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index 3ebd22ffeb25c..a892ee3576421 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { --replace "'opencv-python >= 3.4.5'," "" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scikitimage opencv3 diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index ce24dfb5896a2..db1f57f7cd000 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ imageio-ffmpeg ffmpeg_3 ]; - propagatedBuildInputs = [ numpy pillow ]; + requiredPythonModules = [ numpy pillow ]; checkPhase = '' export IMAGEIO_USERDIR="$TMP" diff --git a/pkgs/development/python-modules/imapclient/default.nix b/pkgs/development/python-modules/imapclient/default.nix index ea9bc4844fad6..a1a8f6bb81d89 100644 --- a/pkgs/development/python-modules/imapclient/default.nix +++ b/pkgs/development/python-modules/imapclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { --replace "if sys.version_info >= (3, 7):" "if sys.version_info >= (3, 6, 4):" ''; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/pkgs/development/python-modules/imbalanced-learn/0.4.nix index 1ec139d5b3ad3..cd8f0634022e1 100644 --- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix +++ b/pkgs/development/python-modules/imbalanced-learn/0.4.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "5bd9e86e40ce4001a57426541d7c79b18143cbd181e3330c1a3e5c5c43287083"; }; - propagatedBuildInputs = [ scikitlearn ]; + requiredPythonModules = [ scikitlearn ]; checkInputs = [ nose pytest pandas ]; checkPhase = '' export HOME=$PWD diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 1cb3dc2a7b9e6..5cb70281fca8c 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "da59de0d1c0fa66f62054dd9a0a295a182563aa1abbb3bf9224a3678fcfe8fa4"; }; - propagatedBuildInputs = [ scikitlearn ]; + requiredPythonModules = [ scikitlearn ]; checkInputs = [ nose pytest pandas ]; checkPhase = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/imdbpy/default.nix b/pkgs/development/python-modules/imdbpy/default.nix index dea62f0800938..2c07a1ce8d51c 100644 --- a/pkgs/development/python-modules/imdbpy/default.nix +++ b/pkgs/development/python-modules/imdbpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { patches = [ ./sql_error.patch ]; # Already fixed in master, but not yet in the current release. This can be removed upon the next version update - propagatedBuildInputs = [ lxml sqlalchemy ]; + requiredPythonModules = [ lxml sqlalchemy ]; doCheck = false; # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240 pythonImportsCheck = [ "imdb" ]; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 7e9a6b5daa885..669582a15e70a 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "eaee690ab8403dd1a9cb4db10afee41dd3e6c7ed63bdace02a0121f9feadb0c9"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pikepdf pillow ]; diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 82f10c1bb74c6..1204500a4d5b0 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { --replace "--xdoctest --xdoctest-global-exec=\"import imgaug as ia\nfrom imgaug import augmenters as iaa\"" "" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ imageio imagecorruptions numpy diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index edab68aa18a33..8666e42b4a2ae 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ zipp ] + requiredPythonModules = [ zipp ] ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 configparser ]; doCheck = false; # Cyclic dependencies. diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 0e1d4654c590b..8e2195a78e07c 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm toml ]; - propagatedBuildInputs = [ + requiredPythonModules = [ importlib-metadata ] ++ lib.optional (pythonOlder "3.4") singledispatch ++ lib.optional (pythonOlder "3.5") typing diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix index 5217474ac2325..0d011e9837ce8 100644 --- a/pkgs/development/python-modules/importmagic/default.nix +++ b/pkgs/development/python-modules/importmagic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "3f7757a5b74c9a291e20e12023bb3bf71bc2fa3adfb15a08570648ab83eaf8d8"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; doCheck = false; # missing json file from tarball diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 1e4ccde4b3106..dd8adcd0e3dba 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ nose libjpeg libpng libtiff libwebp ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; meta = with stdenv.lib; { description = "Python package to load images as numpy arrays"; diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix index 9a0797f095f64..0aff5ada9d32d 100644 --- a/pkgs/development/python-modules/imutils/default.nix +++ b/pkgs/development/python-modules/imutils/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "857af6169d90e4a0a814130b9b107f5d611150ce440107e1c1233521c6fb1e2b"; }; - propagatedBuildInputs = [ opencv3 ]; + requiredPythonModules = [ opencv3 ]; # no tests doCheck = false; diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index b7fbe41f691fa..7eb3f28a88d5c 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -11,6 +11,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm toml ]; - propagatedBuildInputs = [ six importlib-metadata ]; + requiredPythonModules = [ six importlib-metadata ]; checkInputs = [ nose ]; } diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 007ab25eb69b6..01d3249ab16d5 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { sed -i -e '/randomize/d' test-requirements.txt ''; - propagatedBuildInputs = [ + requiredPythonModules = [ rx certifi six diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 650235b294019..c650628e86fb3 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { # ImportError: No module named tests doCheck = false; - propagatedBuildInputs = [ requests dateutil pytz six msgpack ]; + requiredPythonModules = [ requests dateutil pytz six msgpack ]; meta = with stdenv.lib; { description = "Python client for InfluxDB"; diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix index c4597650fe718..e27d56fc92ed4 100644 --- a/pkgs/development/python-modules/influxgraph/default.nix +++ b/pkgs/development/python-modules/influxgraph/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { -i ./setup.py ''; - propagatedBuildInputs = [ influxdb graphite_api memcached ]; + requiredPythonModules = [ influxdb graphite_api memcached ]; passthru.moduleName = "influxgraph.InfluxDBFinder"; diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/pkgs/development/python-modules/infoqscraper/default.nix index 4a15430834327..a20dee9afabbd 100644 --- a/pkgs/development/python-modules/infoqscraper/default.nix +++ b/pkgs/development/python-modules/infoqscraper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ html5lib ]; - propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ]; + requiredPythonModules = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ]; meta = with stdenv.lib; { description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url"; diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix index e240b0863c233..315dcf5609f4e 100644 --- a/pkgs/development/python-modules/iniparse/default.nix +++ b/pkgs/development/python-modules/iniparse/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ${python.interpreter} runtests.py ''; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # Does not install tests doCheck = false; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index c17c3eb4af882..5c2994237edd0 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "152l5qjgkag8zkr69ax2i5s8xcac1qvyngisrplbnbzwbpf77d0d"; }; - propagatedBuildInputs = [ blessed python-editor readchar ]; + requiredPythonModules = [ blessed python-editor readchar ]; postPatch = '' substituteInPlace requirements.txt \ diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 922d543fd1de8..af842f51a4c92 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { sha256 = "0c284abeb74927a7366dcab6cefc010c4d050365b8af61c37326a2473a490a4e"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ appdirs dask holoviews diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 2683f0f1afcfa..a2e86bcc07c80 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "759053685c75e6e969d690043b82643c4016500abcbbc44e4daf52ec097a9a15"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six tqdm pyyaml diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index 8b0bbf2dd3957..314775bdf26b4 100644 --- a/pkgs/development/python-modules/intervaltree/default.nix +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ sortedcontainers ]; + requiredPythonModules = [ sortedcontainers ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/intreehooks/default.nix b/pkgs/development/python-modules/intreehooks/default.nix index e76a6997cb67e..b45d8d5e33aaa 100644 --- a/pkgs/development/python-modules/intreehooks/default.nix +++ b/pkgs/development/python-modules/intreehooks/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "87e600d3b16b97ed219c078681260639e77ef5a17c0e0dbdd5a302f99b4e34e1"; }; - propagatedBuildInputs = [ pytoml ]; + requiredPythonModules = [ pytoml ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index df2ae6b466167..bf72b65fe4b40 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "c85398b5fb82f82399fc38c44fe3532c0dde1754abee727d8f5cfcc74547b334"; }; - propagatedBuildInputs = [ ipython ]; + requiredPythonModules = [ ipython ]; checkInputs = [ mock ]; preCheck = '' diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/pkgs/development/python-modules/ipdbplugin/default.nix index 7c9ee263b2b46..99753c8e17fc9 100644 --- a/pkgs/development/python-modules/ipdbplugin/default.nix +++ b/pkgs/development/python-modules/ipdbplugin/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "cdcd6bc1e995c3c2c4971ed95f207e680aa44980b716fa43fb675ff2dcc7894f"; }; - propagatedBuildInputs = [ nose ipython ]; + requiredPythonModules = [ nose ipython ]; meta = with stdenv.lib; { homepage = "https://github.com/flavioamieiro/nose-ipdb/tree/master"; diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix index 1778e5a81af67..faccb00cbb93c 100644 --- a/pkgs/development/python-modules/ipfsapi/default.nix +++ b/pkgs/development/python-modules/ipfsapi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { sha256 = "1v7f77cv95yv0v80gisdh71mj7jcq41xcfip6bqm57zfdbsa0xpn"; }; - propagatedBuildInputs = [ six requests ]; + requiredPythonModules = [ six requests ]; meta = with stdenv.lib; { description = "A python client library for the IPFS API"; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index e6e1e605cca57..149ba7a14fc7d 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "d9f94828c11e3b40350fb14a02e027f42670a7c372bcb30db18d552dcfab7c01"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ ipywidgets numpy six diff --git a/pkgs/development/python-modules/ipykernel/4.nix b/pkgs/development/python-modules/ipykernel/4.nix index d408c1185dc70..103dad0b3b2bb 100644 --- a/pkgs/development/python-modules/ipykernel/4.nix +++ b/pkgs/development/python-modules/ipykernel/4.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ] ++ lib.optional isPy27 mock; - propagatedBuildInputs = [ + requiredPythonModules = [ ipython jupyter_client pexpect @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; # Tests require backends. - # I don't want to add all supported backends as propagatedBuildInputs + # I don't want to add all supported backends as requiredPythonModules doCheck = false; meta = { diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index c8539598fe6f9..27983b7a7f892 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "1a3hr7wx3ywwskr99hgp120dw9ab1vmcaxdixlsbd9bg6ly3fdr9"; }; - propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; + requiredPythonModules = [ ipython jupyter_client traitlets tornado ]; # https://github.com/ipython/ipykernel/pull/377 patches = [ diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 4efe8b176c524..7cb4193193a06 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0e2f2e540a2dfea61524b7993fc8552c9236b1aaa3826e1f382c75cb2fa5c382"; }; - propagatedBuildInputs = [ ipywidgets matplotlib ]; + requiredPythonModules = [ ipywidgets matplotlib ]; # There are no unit tests in repository doCheck = false; diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 297b87d5745b6..7f5c564bbaf42 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - propagatedBuildInputs = [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado + requiredPythonModules = [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado ] ++ lib.optionals (!isPy3k) [ futures ]; # Requires access to cluster diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index 598e890bb1c50..5f042a4004864 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock; - propagatedBuildInputs = [ + requiredPythonModules = [ backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit simplegeneric traitlets requests pathlib2 pexpect ] ++ lib.optionals stdenv.isDarwin [ appnope ]; diff --git a/pkgs/development/python-modules/ipython/7.16.nix b/pkgs/development/python-modules/ipython/7.16.nix index 9700737f485eb..7500cf7ff8090 100644 --- a/pkgs/development/python-modules/ipython/7.16.nix +++ b/pkgs/development/python-modules/ipython/7.16.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { checkInputs = [ nose pygments ]; - propagatedBuildInputs = [ + requiredPythonModules = [ jedi decorator pickleshare diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 1f1a50363f9db..2449bdf46eeb4 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { checkInputs = [ nose pygments ]; - propagatedBuildInputs = [ + requiredPythonModules = [ jedi decorator pickleshare diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 3941f08348a51..994914821b8e2 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "5b59cf92a1eb7fbef4f2d02be49ac562a721a6cf34f991ac963222cf4c8885a1"; }; - propagatedBuildInputs = [ ipywidgets ]; + requiredPythonModules = [ ipywidgets ]; doCheck = false; # No tests in package or GitHub pythonImportsCheck = [ "ipyvue" ]; diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index c63cee7912324..e7efcdd3f7c25 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "593f5d6761e304cbb78bca967030485d8835e8d310ef7d83ac1b0e6a13e4911c"; }; - propagatedBuildInputs = [ ipyvue ]; + requiredPythonModules = [ ipyvue ]; doCheck = false; # no tests on PyPi/GitHub pythonImportsCheck = [ "ipyvuetify" ]; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 5f2b3299a0241..bdcd4d2dd6696 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # doCheck = false; buildInputs = [ nose pytest mock ]; - propagatedBuildInputs = [ + requiredPythonModules = [ ipython ipykernel traitlets diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index ed113dc6da649..201d363c0f806 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "irc" ]; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six importlib-metadata jaraco_logging diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix index 359cf3e6934fc..08b177600067b 100644 --- a/pkgs/development/python-modules/ircrobots/default.nix +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ./relax-dependencies.patch ]; - propagatedBuildInputs = [ + requiredPythonModules = [ anyio asyncio-throttle ircstates diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix index 857b0358aff2f..cf63665730b1e 100644 --- a/pkgs/development/python-modules/ircstates/default.nix +++ b/pkgs/development/python-modules/ircstates/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ irctokens pendulum ]; diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 736588aa45041..374f081a0aa22 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; buildInputs = [ isl pybind11 ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; preCheck = "mv islpy islpy.hidden"; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix index 7a510598dca31..61ec1920fbef9 100644 --- a/pkgs/development/python-modules/iso-639/default.nix +++ b/pkgs/development/python-modules/iso-639/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49"; }; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; meta = with lib; { homepage = "https://github.com/noumar/iso639"; diff --git a/pkgs/development/python-modules/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix index d46fb7ed74ca0..5c0dd573f1e99 100644 --- a/pkgs/development/python-modules/isodate/default.nix +++ b/pkgs/development/python-modules/isodate/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "2e364a3d5759479cdb2d37cce6b9376ea504db2ff90252a2e5b7cc89cc9ff2d8"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkPhase = '' ${python.interpreter} -m unittest discover -s src/isodate/tests diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index b2ef4e66f3611..d70762d47786e 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -14,7 +14,7 @@ in buildPythonPackage rec { sha256 = "54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools ] ++ lib.optionals isPy27 [ futures backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix index 08c7e50e95e97..b6c55200fec96 100644 --- a/pkgs/development/python-modules/itemloaders/default.nix +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "1s8c2il7jyfixpb7h5zq0lf4s07pqwia4ycpf3slb8whcp0h8bfm"; }; - propagatedBuildInputs = [ w3lib parsel jmespath itemadapter ]; + requiredPythonModules = [ w3lib parsel jmespath itemadapter ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 12a1fd92cbe9f..80bc1edb52d0f 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "8dead057b09ed4ac03c6caae7890489da1d823215ec5166789739ece941bdcbc"; }; - propagatedBuildInputs = [ protobuf websockets ]; + requiredPythonModules = [ protobuf websockets ]; # The tests require pyobjc. We can't use pyobjc because at # time of writing the pyobjc derivation is disabled on python 3. diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index b2b80e2766c7b..f3cf3459404e2 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; doCheck = false; # tests aren't installed thus aren't found, so skip - propagatedBuildInputs = [ jinja2 pyyaml setuptools ]; + requiredPythonModules = [ jinja2 pyyaml setuptools ]; meta = with stdenv.lib; { homepage = "https://github.com/kolypto/j2cli"; diff --git a/pkgs/development/python-modules/jabberbot/default.nix b/pkgs/development/python-modules/jabberbot/default.nix index 4e550bcca20c2..bc137f128f6a8 100644 --- a/pkgs/development/python-modules/jabberbot/default.nix +++ b/pkgs/development/python-modules/jabberbot/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1qr7c5p9a0nzsvri1djnd5r3d7ilh2mdxvviqn1s2hcc70rha65d"; }; - propagatedBuildInputs = [ xmpppy ]; + requiredPythonModules = [ xmpppy ]; doCheck = false; # lol, it does not even specify dependencies properly diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index c9ce6915d2ec4..b404021a150e9 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six more-itertools ]; + requiredPythonModules = [ six more-itertools ]; doCheck = false; } diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 9f6e6e2aa7e90..6164cc97fc8c1 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six jaraco_classes jaraco_text ]; + requiredPythonModules = [ six jaraco_classes jaraco_text ]; # break dependency cycle patchPhase = '' diff --git a/pkgs/development/python-modules/jaraco_functools/2.nix b/pkgs/development/python-modules/jaraco_functools/2.nix index e0bbde47d2501..f6f84e19a1ca8 100644 --- a/pkgs/development/python-modules/jaraco_functools/2.nix +++ b/pkgs/development/python-modules/jaraco_functools/2.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0ickpwvvdrlbm477gdzfjfcbgmfia9ksm9a3i3pbx9xia97r9fim"; }; - propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; + requiredPythonModules = [ more-itertools backports_functools_lru_cache ]; doCheck = false; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 6ee4c24171098..e0f632a7ad9aa 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm toml ]; - propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; + requiredPythonModules = [ more-itertools backports_functools_lru_cache ]; doCheck = false; diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 5df70b6da97b4..0e6f849db7d07 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; - propagatedBuildInputs = [ inflect more-itertools six ]; + requiredPythonModules = [ inflect more-itertools six ]; checkInputs = [ pytest ]; # tests no longer available through pypi diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index 3f9fa4d67caf2..9763a9fc885eb 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ tempora six ]; + requiredPythonModules = [ tempora six ]; # test no longer packaged with pypi doCheck = false; diff --git a/pkgs/development/python-modules/jaraco_stream/2.nix b/pkgs/development/python-modules/jaraco_stream/2.nix index e1737083c86cb..cad95b48eb2a2 100644 --- a/pkgs/development/python-modules/jaraco_stream/2.nix +++ b/pkgs/development/python-modules/jaraco_stream/2.nix @@ -9,5 +9,5 @@ buildPythonPackage rec { }; doCheck = false; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; } diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix index 324eb625014aa..cd7ee564a8434 100644 --- a/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/pkgs/development/python-modules/jaraco_stream/default.nix @@ -9,5 +9,5 @@ buildPythonPackage rec { }; doCheck = false; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; } diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 9b3821edd7a0d..dadfefa8fc0b5 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; nativeBuildInputs =[ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ jaraco_functools ] ++ lib.optional (pythonOlder "3.7") [ importlib-resources ]; diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index a9acf380da102..caaec49785c3d 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "14dlzwr4gxlbgjy012i4pqs2rn2rmp21w8n1k1wwjkf26mcvrq5s"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ dateutil pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index cc74076b6c72a..5aa16e0d7a297 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0rwvyyrdnw43pixp8h51rncq2inc9pbbj1j2191y5si00pjw34zr"; }; - propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; + requiredPythonModules = [ ruamel_yaml xmltodict pygments ]; meta = with stdenv.lib; { description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output"; diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index d51d54287e76e..15ea6e6b612f7 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "a589e35f0dab89283c1a3de9d70ed6cf657932aaed8e8ce1b0e5801aaab1da67"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { description = "Jalali datetime binding for python"; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index ab8f72ea9f188..5f80d7268e1ae 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest glibcLocales tox pytestcov ]; - propagatedBuildInputs = [ parso ]; + requiredPythonModules = [ parso ]; checkPhase = '' LC_ALL="en_US.UTF-8" py.test test diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 1813ce8cac172..22196ba723c51 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ tornado ]; diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index 33c14dbaeb2d2..467ef79d83390 100644 --- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0f7czq83ic22fz1vnf0cavb7l3grcxxd5yyw9wcjz3g1j2d76735"; }; - propagatedBuildInputs = [ requests websocket_client ]; + requiredPythonModules = [ requests websocket_client ]; pythonImportsCheck = [ "jellyfin_apiclient_python" ]; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index e185cf8b6bdd8..16ab28cd26d13 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - propagatedBuildInputs = [ pbr python-jenkins pyyaml six stevedore fasteners jinja2 ]; + requiredPythonModules = [ pbr python-jenkins pyyaml six stevedore fasteners jinja2 ]; # Need to fix test deps, relies on stestr and a few other packages that aren't available on nixpkgs checkPhase = ''$out/bin/jenkins-jobs --help''; diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index 40bf7752a90b7..161bd5908f62e 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "a212a244b0a6022a61657746c8120ac9b6db83432371b345154075eb8faceb61"; }; - propagatedBuildInputs = [ pytz requests ]; + requiredPythonModules = [ pytz requests ]; checkInputs = [ mock pytest pytest-mock requests-kerberos toml ]; # TODO requests-kerberos is broken on darwin, weeding out the broken tests without # access to macOS is not an adventure I am ready to embark on - @rski diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 45178377026df..45749dd9919e0 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ markupsafe setuptools ]; + requiredPythonModules = [ markupsafe setuptools ]; # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 diff --git a/pkgs/development/python-modules/jinja2_pluralize/default.nix b/pkgs/development/python-modules/jinja2_pluralize/default.nix index 4a62fa4c25b7a..af1c92dd9bd47 100644 --- a/pkgs/development/python-modules/jinja2_pluralize/default.nix +++ b/pkgs/development/python-modules/jinja2_pluralize/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "071wnzzz20wjb0iw7grxgj1lb2f0kz50qyfbcq54rddr2x82sp6z"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ jinja2 inflect ]; diff --git a/pkgs/development/python-modules/jinja2_time/default.nix b/pkgs/development/python-modules/jinja2_time/default.nix index d84c16f1abae1..c141c7caad8f2 100644 --- a/pkgs/development/python-modules/jinja2_time/default.nix +++ b/pkgs/development/python-modules/jinja2_time/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0h0dr7cfpjnjj8bgl2vk9063a53649pn37wnlkd8hxjy656slkni"; }; - propagatedBuildInputs = [ arrow jinja2 ]; + requiredPythonModules = [ arrow jinja2 ]; meta = with stdenv.lib; { homepage = "https://github.com/hackebrot/jinja2-time"; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 78aaadf690e22..014763b4a79bc 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ glibcLocales pytest pytestcov pytestrunner pbr ]; - propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; + requiredPythonModules = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; # impure tests because of connectivity attempts to jira servers doCheck = false; diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index 993955f2a032e..0cf72a437da17 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ ply ]; + requiredPythonModules = [ ply ]; meta = with stdenv.lib; { homepage = "https://github.com/boto/jmespath"; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index fa4fc450f1a84..697cc18be6452 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; checkInputs = [ sphinx numpydoc pytest ]; - propagatedBuildInputs = [ python-lz4 setuptools ]; + requiredPythonModules = [ python-lz4 setuptools ]; # test_disk_used is broken: https://github.com/joblib/joblib/issues/57 # test_dispatch_multiprocessing is broken only on Darwin. diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 73bdb31da9d84..114c050b10a7a 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "c37ff4b93606e6a452b72cdb992da5e0544be12912fac01b31ddbdd61f6d5bd0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyopenssl cryptography six diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix index 0d6398a768a1f..14513698a4851 100644 --- a/pkgs/development/python-modules/jpylyzer/default.nix +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0vhrq15l6jd5fm6vj7mczjzjpl2ph1dk8jp89dw4vlccky8660ll"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # there don't appear to be any in-tree tests as such, but the builder's automatic # runner seems to be upset by the project layout diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index a5468fa273b57..e59b265b8ec24 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, buildPythonPackage, editorconfig, pytest, six }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "jsbeautifier"; version = "1.13.0"; - propagatedBuildInputs = [ six editorconfig ]; + requiredPythonModules = [ six editorconfig ]; checkInputs = [ pytest ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/jsondate/default.nix b/pkgs/development/python-modules/jsondate/default.nix index 7888a6df23cc9..df0f151d787d1 100644 --- a/pkgs/development/python-modules/jsondate/default.nix +++ b/pkgs/development/python-modules/jsondate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { fetchSubmodules = true; # Fetching by tag does not work otherwise }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = { homepage = "https://github.com/ilya-kolpakov/jsondate"; diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index cde440380b48d..174646472e53b 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1f8zsqy8p9a41gqg2a5x7sppc5qhhq7gw58id2aigb270yxzs7jw"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ flake8 pep8-naming pytest pytestcov pytestpep8 ]; checkPhase = '' diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 4fc558fd394e3..2396a6d044a49 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "2004a421890311176136fb911c339c4bab45984808814feaed6a328c6e211ba2"; }; - propagatedBuildInputs = [ jsonschema ]; + requiredPythonModules = [ jsonschema ]; meta = with lib; { description = "Merge a series of JSON documents"; diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index a4a66aab44cee..f23f8f2dd73d3 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # test files are missing doCheck = false; - propagatedBuildInputs = [ jsonpointer ]; + requiredPythonModules = [ jsonpointer ]; meta = { description = "Library to apply JSON Patches according to RFC 6902"; diff --git a/pkgs/development/python-modules/jsonpath_rw/default.nix b/pkgs/development/python-modules/jsonpath_rw/default.nix index 4b842a02af83b..49cc4383a5f22 100644 --- a/pkgs/development/python-modules/jsonpath_rw/default.nix +++ b/pkgs/development/python-modules/jsonpath_rw/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "05c471281c45ae113f6103d1268ec7a4831a2e96aa80de45edc89b11fac4fbec"; }; - propagatedBuildInputs = [ ply six decorator ]; + requiredPythonModules = [ ply six decorator ]; # ImportError: No module named tests doCheck = false; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 66e7d62aa8393..14dce2192d971 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { toml ]; - propagatedBuildInputs = [ + requiredPythonModules = [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index c410b9407ea6e..93e54d93e697a 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "383f331e28cd8f6e3fa86f3e7052efa541b7ae8bf328a4e692aa045cfc0ecf25"; }; - propagatedBuildInputs = [ aiohttp jsonrpc-base ]; + requiredPythonModules = [ aiohttp jsonrpc-base ]; meta = with stdenv.lib; { description = "A JSON-RPC client library for asyncio"; diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index 3505a13bbd1f4..fc0dcb710a17c 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "7bda99589b4566f5027c2aeae122f409d8ccf4c811b278b8cfb616903871efb2"; }; - propagatedBuildInputs = [ ]; + requiredPythonModules = [ ]; meta = with stdenv.lib; { description = "A JSON-RPC client library base interface"; diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index df5216bdd1a63..015ed718fa68d 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pep8 ]; - propagatedBuildInputs = [ aiohttp jsonrpc-base ]; + requiredPythonModules = [ aiohttp jsonrpc-base ]; meta = with stdenv.lib; { description = "A JSON-RPC websocket client library for asyncio"; diff --git a/pkgs/development/python-modules/jsonrpclib/default.nix b/pkgs/development/python-modules/jsonrpclib/default.nix index d37b4ce3ccb20..1e7cb5174c690 100644 --- a/pkgs/development/python-modules/jsonrpclib/default.nix +++ b/pkgs/development/python-modules/jsonrpclib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z"; }; - propagatedBuildInputs = [ cjson ]; + requiredPythonModules = [ cjson ]; meta = with lib; { description = "JSON RPC client library"; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index d90040c4269f5..c6720828f3432 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ]; + requiredPythonModules = [ attrs importlib-metadata functools32 pyrsistent ]; checkInputs = [ nose mock pyperf twisted vcversioner ]; # zope namespace collides on py27 diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/pkgs/development/python-modules/jsonwatch/default.nix index 1b859e21e9042..0c3d6928268f6 100644 --- a/pkgs/development/python-modules/jsonwatch/default.nix +++ b/pkgs/development/python-modules/jsonwatch/default.nix @@ -15,7 +15,7 @@ buildPythonPackage { sha256 = "04b616ef97b9d8c3887004995420e52b72a4e0480a92dbf60aa6c50317261e06"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { description = "Like watch -d but for JSON"; diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index edfc7573d4e4b..ee8c5f1915aad 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "Jug"; version = "2.0.3"; buildInputs = [ nose numpy ]; - propagatedBuildInputs = [ + requiredPythonModules = [ bottle pyyaml redis diff --git a/pkgs/development/python-modules/junit-xml/default.nix b/pkgs/development/python-modules/junit-xml/default.nix index c7133c206d842..b2efe059ece26 100644 --- a/pkgs/development/python-modules/junit-xml/default.nix +++ b/pkgs/development/python-modules/junit-xml/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1sg03mv7dk3x4mjxjg127vqjmx0ms7v3a5aibxrclxlhmdqcgvb2"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix index 3a712251fc5d2..e7bf8159307c5 100644 --- a/pkgs/development/python-modules/junitparser/default.nix +++ b/pkgs/development/python-modules/junitparser/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "16xwayr0rbp7xdg7bzmyf8s7al0dhkbmkcnil66ax7r8bznp5lmp"; }; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; checkPhase = '' ${python.interpreter} test.py diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index d47130c5f3fb9..0603bff45e141 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ scp six pyserial paramiko netaddr ncclient ntc-templates lxml jinja2 pyyaml transitions yamlordereddictloader ]; diff --git a/pkgs/development/python-modules/jupyter-c-kernel/default.nix b/pkgs/development/python-modules/jupyter-c-kernel/default.nix index 0cc232bd7064f..8109f751f998b 100644 --- a/pkgs/development/python-modules/jupyter-c-kernel/default.nix +++ b/pkgs/development/python-modules/jupyter-c-kernel/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { --replace "'gcc'" "'${gcc}/bin/gcc'" ''; - propagatedBuildInputs = [ ipykernel ]; + requiredPythonModules = [ ipykernel ]; # no tests in repository doCheck = false; diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 4dc878e26701d..68185d06eb37e 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "7fc2edf0cda1e46f2e7553bfb84a47e6d141b8dac393268ef01ee3504ca6ad94"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ docker escapism jinja2 diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index 4d2efcf00b7ae..0f74b6e22f55f 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "b5ba1efdd1488b385de0068036a665932ed93998e40ce3a342c60f0926781fd9"; }; - propagatedBuildInputs = [ nbformat sphinx ipywidgets ]; + requiredPythonModules = [ nbformat sphinx ipywidgets ]; doCheck = false; diff --git a/pkgs/development/python-modules/jupyter-telemetry/default.nix b/pkgs/development/python-modules/jupyter-telemetry/default.nix index 4b3093cf6ce16..d6a57ab3dfe2c 100644 --- a/pkgs/development/python-modules/jupyter-telemetry/default.nix +++ b/pkgs/development/python-modules/jupyter-telemetry/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "052khyn6h97jxl3k5i2m81xvga5v6vwh5qixzrax4w6zwcx62p24"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ python-json-logger jsonschema ruamel_yaml traitlets ]; diff --git a/pkgs/development/python-modules/jupyter/default.nix b/pkgs/development/python-modules/jupyter/default.nix index b6d2a5e5a9013..a2f1d9913088f 100644 --- a/pkgs/development/python-modules/jupyter/default.nix +++ b/pkgs/development/python-modules/jupyter/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f"; }; - propagatedBuildInputs = [ notebook qtconsole jupyter_console nbconvert ipykernel ipywidgets ]; + requiredPythonModules = [ notebook qtconsole jupyter_console nbconvert ipykernel ipywidgets ]; # Meta-package, no tests doCheck = false; diff --git a/pkgs/development/python-modules/jupyter_client/5.nix b/pkgs/development/python-modules/jupyter_client/5.nix index 201fbec02ca54..b8dcf15e7f529 100644 --- a/pkgs/development/python-modules/jupyter_client/5.nix +++ b/pkgs/development/python-modules/jupyter_client/5.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "5efdf4131124d4a0d5789101e74827022585f172d2f4b60cf6fa98e0a7511b25"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ traitlets jupyter_core pyzmq diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 47d3bb6af0c00..55bb6c408d86c 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "49e390b36fe4b4226724704ea28d9fb903f1a3601b6882ce3105221cd09377a1"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ traitlets jupyter_core pyzmq diff --git a/pkgs/development/python-modules/jupyter_console/5.nix b/pkgs/development/python-modules/jupyter_console/5.nix index 440f22b133215..c46aac833b8a5 100644 --- a/pkgs/development/python-modules/jupyter_console/5.nix +++ b/pkgs/development/python-modules/jupyter_console/5.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ jupyter_client ipython ipykernel diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index 372698744cf71..1e24b8f3f746e 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "7f6194f4f4692d292da3f501c7f343ccd5e36c6a1becf7b7515e23e66d6bf1e9"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ jupyter_client ipython ipykernel diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index fe40a3f09c482..1b6451b606210 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock glibcLocales nose ]; - propagatedBuildInputs = [ ipython traitlets ]; + requiredPythonModules = [ ipython traitlets ]; patches = [ ./tests_respect_pythonpath.patch ]; diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 4d0831ff97958..64b2019457617 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # No tests implemented doCheck = false; - propagatedBuildInputs = [ jupyterhub ldap3 ]; + requiredPythonModules = [ jupyterhub ldap3 ]; meta = with lib; { description = "Simple LDAP Authenticator Plugin for JupyterHub"; diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index dc38acc66f7ca..8ec278d23ea3b 100644 --- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "080dd9cd9292266dad35d1efc7aa1af0ed6993d15eadc79bd959d1ee273d1923"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ jupyterhub tornado ]; diff --git a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix index 2aef23fe4a4ab..69c051a03a455 100644 --- a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "064x1ypxwx1l270ic97p8czbzb7swl9758v40k3w2gaqf9762f0l"; }; - propagatedBuildInputs = [ jupyterhub ]; + requiredPythonModules = [ jupyterhub ]; # No tests available in the package doCheck = false; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 704d9174ebd7b..f80501b0d0d10 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -108,7 +108,7 @@ buildPythonPackage rec { done ''; - propagatedBuildInputs = [ + requiredPythonModules = [ alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado traitlets prometheus_client async_generator notebook certipy oauthlib jupyter-telemetry diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index b69572df74584..9a677f3b2f0f9 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "434ff9edd1190809e02e0cbf50090c28de48a51e151a1f904ac66e902244398d"; }; - propagatedBuildInputs = [ notebook nbdime git ]; + requiredPythonModules = [ notebook nbdime git ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index ff725ce18297f..e6a4c7ab23a79 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "3be8f8edea173753dd838c1b6d3bbcb6f5c801121f824a477025c1b6a1d33dc6"; }; - propagatedBuildInputs = [ jupyterlab_server notebook ]; + requiredPythonModules = [ jupyterlab_server notebook ]; makeWrapperArgs = [ "--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab" diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix index 15b53f523b573..34d97e4d2034a 100644 --- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix +++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "f880eada0b8b1f524d5951dc6fcae0d13b169897fc8a247d75fb5beadd69c5f0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ jsonschema notebook ]; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 0344a66cf6634..cf3ae32bfc29b 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ requests pytest ]; - propagatedBuildInputs = [ notebook jsonschema pyjson5 ]; + requiredPythonModules = [ notebook jsonschema pyjson5 ]; # test_listing test fails # this is a new package and not all tests pass diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 542e177e47fd4..0e4d9235151d7 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1cebc9f5975b4c08db3de6d7d61b35f8c33a24cf2c8c04eee7b8a7aab8ddc39b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyyaml nbformat toml diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 42ed4cf8794bd..ced9bddf17d26 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "b7fee2635bbefdf145399392f5be26ad54161c8271c66b5fe107b4b452f06c24"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cryptography ]; diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 80b62f1e44831..ad0da78d6dfb2 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six ]; diff --git a/pkgs/development/python-modules/kaa-metadata/default.nix b/pkgs/development/python-modules/kaa-metadata/default.nix index 31f87965a0382..469fdd03ddad8 100644 --- a/pkgs/development/python-modules/kaa-metadata/default.nix +++ b/pkgs/development/python-modules/kaa-metadata/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.libdvdread ]; - propagatedBuildInputs = [ kaa-base ]; + requiredPythonModules = [ kaa-base ]; # Same as in buildPythonPackage except that it does not pass --old-and-unmanageable installPhase = '' diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 12b46be69b940..7d224a74d3015 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { --replace 'urllib3 >= 1.21.1, < 1.25' 'urllib3' ''; - propagatedBuildInputs = [ + requiredPythonModules = [ certifi python-dateutil python-slugify diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index 8643e562fa07f..9b30ddc702cb6 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "bbec46b19285d42769d7c4f5a8a0195b72a62b54cd360a26a8875319d58efef6"; }; - propagatedBuildInputs = [ Babel pytz nine ]; + requiredPythonModules = [ Babel pytz nine ]; checkInputs = [ nose ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index 78a33a8e3022c..2e574ed07f007 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sed -i "s/==.*//g" requirements/test.txt ''; - propagatedBuildInputs = [ pyyaml ]; + requiredPythonModules = [ pyyaml ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index 3c040abc7247d..29eff0fdc6e33 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1zpj5cc8624w6i0pxgcxqkjwbkm4pkrv19d7wh5df3jais32g3jq"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; buildInputs = [ eventlet gevent nose mock coverage pkgs.openjdk8 ]; # not really needed diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix index 6108ea5068929..be73a8d3cd4cc 100644 --- a/pkgs/development/python-modules/keep/default.nix +++ b/pkgs/development/python-modules/keep/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0902kcvhbmy5q5n0ai1df29ybf87qaljz306c5ssl8j9xdjipcq2"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click requests terminaltables diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index f43c7618b13c3..3a2d5dbdece1b 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0jnkh1nin1lwnx32ak6sv8gzmpnkvcy6vm23wzm1ymzfndxk6rnm"; }; - propagatedBuildInputs = [ protobuf hidapi trezor ]; + requiredPythonModules = [ protobuf hidapi trezor ]; buildInputs = [ ecdsa mnemonic ]; diff --git a/pkgs/development/python-modules/keepkey_agent/default.nix b/pkgs/development/python-modules/keepkey_agent/default.nix index fec2d198fdd94..24559a2044e20 100644 --- a/pkgs/development/python-modules/keepkey_agent/default.nix +++ b/pkgs/development/python-modules/keepkey_agent/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "03779gvlx70i0nnry98i4pl1d92604ix5x6jgdfkrdgzqbh5vj27"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ keepkey libagent setuptools wheel ]; diff --git a/pkgs/development/python-modules/keras-applications/default.nix b/pkgs/development/python-modules/keras-applications/default.nix index 82ee6803d4bf3..ffa5674b6065c 100644 --- a/pkgs/development/python-modules/keras-applications/default.nix +++ b/pkgs/development/python-modules/keras-applications/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # No tests in PyPI tarball doCheck = false; - propagatedBuildInputs = [ numpy h5py ]; + requiredPythonModules = [ numpy h5py ]; meta = with lib; { description = "Reference implementations of popular deep learning models"; diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index d62a179136f4a..49bf0851a8675 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "add82567c50c8bc648c14195bf544a5ce7c1f76761536956c3d2978970179ef3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ # required numpy six # optional diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 8b6301ab59b7e..cfbb28eb4563b 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pytest_xdist ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six pyyaml numpy scipy h5py keras-applications keras-preprocessing ]; diff --git a/pkgs/development/python-modules/keyring/2.nix b/pkgs/development/python-modules/keyring/2.nix index ce4aa145e8eec..d7dc4f977925d 100644 --- a/pkgs/development/python-modules/keyring/2.nix +++ b/pkgs/development/python-modules/keyring/2.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-flake8 ]; - propagatedBuildInputs = [ dbus-python entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; + requiredPythonModules = [ dbus-python entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 560986f9c3d28..ff7aee610a8d7 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-flake8 ]; - propagatedBuildInputs = [ dbus-python entrypoints ] + requiredPythonModules = [ dbus-python entrypoints ] ++ lib.optional stdenv.isLinux secretstorage ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index dcc16ded122d4..0365fafda5826 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytest keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock; diff --git a/pkgs/development/python-modules/kinparse/default.nix b/pkgs/development/python-modules/kinparse/default.nix index 7d6437f41a866..0c54e73159f4f 100644 --- a/pkgs/development/python-modules/kinparse/default.nix +++ b/pkgs/development/python-modules/kinparse/default.nix @@ -24,7 +24,7 @@ buildPythonPackage { pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ future pyparsing ]; diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index dd57c83573867..8f35aa420112b 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { --replace "mkdir -p \$builddir" "mkdir -p \$builddir && pwd" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ six flask pygments dulwich httpauth humanize ]; diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix index f4c26edd0e4a0..788344a1d7a06 100644 --- a/pkgs/development/python-modules/klein/default.nix +++ b/pkgs/development/python-modules/klein/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ six twisted werkzeug incremental ]; + requiredPythonModules = [ six twisted werkzeug incremental ]; checkInputs = [ mock twisted ]; diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index f985a7e696523..93f465acdb606 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "0879294680c5d01a928847b818a3c4e07eded3f602f96e510858e68e74fa3783"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ scikitlearn numpy scipy diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index dd45e96723135..c8706e99ae691 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "dfc6aef6760ea9a9620577e01540617678d78cab3111a0f03e8b9f987d0f08ca"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ argcomplete colorama jmespath diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index eac2ab5964337..ffbd4b06a828f 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0a3kn3qvspvx15imgzzzjsbvw6bqmbk29apbliqwifa9cj7pvb40"; }; - propagatedBuildInputs = [ pycurl six rpm dateutil ]; + requiredPythonModules = [ pycurl six rpm dateutil ]; # Judging from SyntaxError disabled = isPy3k; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 560cd4383b1e3..dc7fbefa982bc 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { --replace "amqp==2.5.1" "amqp~=2.5" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ amqp ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata diff --git a/pkgs/development/python-modules/konfig/default.nix b/pkgs/development/python-modules/konfig/default.nix index e7062bad5ee77..00c171f6f4824 100644 --- a/pkgs/development/python-modules/konfig/default.nix +++ b/pkgs/development/python-modules/konfig/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c"; }; - propagatedBuildInputs = [ configparser six ]; + requiredPythonModules = [ configparser six ]; patches = [ (writeText "konfig.patch" '' diff --git a/setup.py b/setup.py diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index d5ed1b4cc7c84..d136b6eb9b420 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; - propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth adal ]; + requiredPythonModules = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth adal ]; meta = with stdenv.lib; { description = "Kubernetes python client"; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index b761b71685331..21b58e375191d 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "2be6c03dafce0a786cfab5d120196efccaf300cab5aee4d2fdad644b7bee1aef"; }; - propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ]; + requiredPythonModules = [ jinja2 requests pillow rasterio shapely ]; # Test cases are not running on pypi or GitHub doCheck = false; diff --git a/pkgs/development/python-modules/lammps-cython/default.nix b/pkgs/development/python-modules/lammps-cython/default.nix index 4c16010f4af8b..30d3846db273b 100644 --- a/pkgs/development/python-modules/lammps-cython/default.nix +++ b/pkgs/development/python-modules/lammps-cython/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { buildInputs = [ cython pytestrunner ]; checkInputs = [ pytest_4 pytestcov openssh ]; - propagatedBuildInputs = [ mpi4py pymatgen ase numpy ]; + requiredPythonModules = [ mpi4py pymatgen ase numpy ]; preBuild = '' echo "Creating lammps.cfg file..." diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index f9d90e42686b0..1993974b7cda2 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "75bcaca8825e1a321965b136815dee53083c63314975e024ad0ccff8545e681f"; }; - propagatedBuildInputs = [ marisa-trie ]; + requiredPythonModules = [ marisa-trie ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/langdetect/default.nix b/pkgs/development/python-modules/langdetect/default.nix index 57fee2664cdfb..fddc81a260b30 100644 --- a/pkgs/development/python-modules/langdetect/default.nix +++ b/pkgs/development/python-modules/langdetect/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0c5zm6c7xzsigbb9c7v4r33fcpz911zscfwvh3dq1qxdy3ap18ci"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with lib; { description = "Python port of Google's language-detection library"; diff --git a/pkgs/development/python-modules/larch/default.nix b/pkgs/development/python-modules/larch/default.nix index a94b076ded3d5..0c1f4fac298aa 100644 --- a/pkgs/development/python-modules/larch/default.nix +++ b/pkgs/development/python-modules/larch/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; buildInputs = [ sphinx ]; - propagatedBuildInputs = [ tracing ttystatus cliapp ]; + requiredPythonModules = [ tracing ttystatus cliapp ]; # error: invalid command 'test' doCheck = false; diff --git a/pkgs/development/python-modules/lasagne/default.nix b/pkgs/development/python-modules/lasagne/default.nix index febd38acc63f7..6155e2be3e375 100644 --- a/pkgs/development/python-modules/lasagne/default.nix +++ b/pkgs/development/python-modules/lasagne/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0cqj86rdm6c7y5vq3i13qy76fg5xi3yjp4r0hpqy8hvynv54wqrw"; }; - propagatedBuildInputs = [ numpy Theano ]; + requiredPythonModules = [ numpy Theano ]; # there are no tests doCheck = false; diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 77b75193ca400..8154fca98654e 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "16pynfnn8y8xp55yp06i721fccv5dlx9ba6k5bzcwq9j6wf5b8ia"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/launchpadlib/default.nix b/pkgs/development/python-modules/launchpadlib/default.nix index 6c5112312bb3a..a0c6c9b8bf058 100644 --- a/pkgs/development/python-modules/launchpadlib/default.nix +++ b/pkgs/development/python-modules/launchpadlib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "5804d68ec93247194449d17d187e949086da0a4d044f12155fad269ef8515435"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ httplib2 keyring lazr-restfulclient diff --git a/pkgs/development/python-modules/lazr-restfulclient/default.nix b/pkgs/development/python-modules/lazr-restfulclient/default.nix index 93956c51b2569..7668d3e9f8846 100644 --- a/pkgs/development/python-modules/lazr-restfulclient/default.nix +++ b/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "9f28bbb7c00374159376bd4ce36b4dacde7c6b86a0af625aa5e3ae214651a690"; }; - propagatedBuildInputs = [ distro httplib2 oauthlib setuptools six wadllib ]; + requiredPythonModules = [ distro httplib2 oauthlib setuptools six wadllib ]; doCheck = false; # requires to package lazr.restful, lazr.authentication, and wsgi_intercept diff --git a/pkgs/development/python-modules/lazr-uri/default.nix b/pkgs/development/python-modules/lazr-uri/default.nix index 080eb4cdb0edd..14368d302828a 100644 --- a/pkgs/development/python-modules/lazr-uri/default.nix +++ b/pkgs/development/python-modules/lazr-uri/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "f36e7e40d5f8f2cf20ff2c81784a14a546e6c19c216d40a6617ebe0c96c92c49"; }; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; meta = with lib; { description = "A self-contained, easily reusable library for parsing, manipulating"; diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index d8a895c8357b8..58e57c0edab40 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "lazr.config"; version = "2.2.2"; - propagatedBuildInputs = [ lazr_delegates ]; + requiredPythonModules = [ lazr_delegates ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix index 40e2e47d517dc..9b3da85417378 100644 --- a/pkgs/development/python-modules/lazr/delegates.nix +++ b/pkgs/development/python-modules/lazr/delegates.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "lazr.delegates"; version = "2.0.4"; - propagatedBuildInputs = [ nose zope_interface ]; + requiredPythonModules = [ nose zope_interface ]; doCheck = false; # cannot import name 'ClassType' from 'types' diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix index 743604d539ba7..ef5b7350a3e34 100644 --- a/pkgs/development/python-modules/lazy_import/default.nix +++ b/pkgs/development/python-modules/lazy_import/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pytest_xdist ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six ]; diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 0e4f5597ce645..65def2147da10 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "198as30xy6p760niqps2zdvq2xcmr765h06pmda8fa9y077wl4a7"; }; - propagatedBuildInputs = [ pyasn1 pyasn1-modules ]; + requiredPythonModules = [ pyasn1 pyasn1-modules ]; buildInputs = [ openldap cyrus_sasl ]; diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 178477dcc6b00..99867b0c4dd41 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "37d633e20fa360c302b1263c96fe932d40622d0119f1bddcb829b03462eeeeb7"; }; - propagatedBuildInputs = [ pyasn1 ]; + requiredPythonModules = [ pyasn1 ]; doCheck = false; # requires network diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index d1b9da15cc5f2..7841b96cc63e9 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ ldap prettytable ]; + requiredPythonModules = [ ldap prettytable ]; checkInputs = [ fixtures testresources testtools ]; diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index 817fe79c3c97c..1ba3871014144 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "64c7b870c77e34e4f5f9cfdf330b9702e89b4dd0f64275704f86c1468312c755"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ twisted passlib pycrypto pyopenssl pyparsing service-identity zope_interface ]; diff --git a/pkgs/development/python-modules/le/default.nix b/pkgs/development/python-modules/le/default.nix index 927b3f44bcf34..ac8563e3c5b67 100644 --- a/pkgs/development/python-modules/le/default.nix +++ b/pkgs/development/python-modules/le/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; - propagatedBuildInputs = [ simplejson psutil ]; + requiredPythonModules = [ simplejson psutil ]; meta = with stdenv.lib; { homepage = "https://github.com/rapid7/le"; diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index 30a76747723aa..c3b84eba8d5c9 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "125r372q7bwcajfdysp7w5zh5wccwxf1mkhqawl8h518nl1icv87"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { homepage = "http://leather.rtfd.io"; diff --git a/pkgs/development/python-modules/ledger_agent/default.nix b/pkgs/development/python-modules/ledger_agent/default.nix index 605fbed98a19f..0d8a370ea20e1 100644 --- a/pkgs/development/python-modules/ledger_agent/default.nix +++ b/pkgs/development/python-modules/ledger_agent/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "03zj602m2rln9yvr08dswy56vzkbldp8b074ixwzz525dafblr92"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ ledgerblue libagent setuptools wheel ]; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index c84d5fa471bd9..7539c7099517b 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "f9553d496fbc6b612d98cc9db2f1648c1bcb63939c988ee1520e8fcb9bd77b24"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket_client ]; diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index 844e28aa07884..6f449a52e715a 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sha256 = "16qw68rz5q77w84lwyhjpfd3bm4mfrhcjrnxwwnz3vmi610h68hx"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click watchdog exifread requests mistune inifile Babel jinja2 flask pyopenssl ndg-httpsclient setuptools ] ++ lib.optionals isPy27 [ functools32 ]; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 4bc07e969330e..00c25ab62c797 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "16y1y9ahcv3wj7f0v4mfiwzkmn2hz1iv7y13cgr57sxa3ymyqx6c"; }; - propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse + requiredPythonModules = [ unidecode backports-shutil-which ConfigArgParse python-daemon pymsgbox ecdsa ed25519 mnemonic semver ]; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 3d7408e87126f..f155e17f8fdae 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; checkInputs = [ pytest pytestrunner pytestcov coverage ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { homepage = "https://github.com/schwehr/libais"; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 5b68695f832e9..a0e2d09db362b 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.4.0"; - propagatedBuildInputs = [ sip ]; + requiredPythonModules = [ sip ]; nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/libcloud/2.nix b/pkgs/development/python-modules/libcloud/2.nix index 52c1cf9a9d7f9..808212ad872df 100644 --- a/pkgs/development/python-modules/libcloud/2.nix +++ b/pkgs/development/python-modules/libcloud/2.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; checkInputs = [ mock pytest pytestrunner requests-mock ]; - propagatedBuildInputs = [ pycrypto requests ] + requiredPythonModules = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing backports_ssl_match_hostname ]; preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 671de812f272a..bf2a4b18292aa 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ mock pytest pytestrunner requests-mock ]; - propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing ]; + requiredPythonModules = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing ]; preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index e0ea0e332af67..d6c3c9f7af287 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ pyyaml typing-inspect ]; + requiredPythonModules = [ pyyaml typing-inspect ]; checkInputs = [ black isort pytestCheckHook ]; diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 40a4f6f7429f8..5af999ae47018 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { fixRunPath $out/lib/libgpuarray.so ''; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy six Mako diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix index 0969e62c79e82..3aa96de5a1a8b 100644 --- a/pkgs/development/python-modules/libkeepass/default.nix +++ b/pkgs/development/python-modules/libkeepass/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0pwg7n9xqcjia1qmz6g48h5s31slh3mxmcqag73gq4zhl4xb6bai"; }; - propagatedBuildInputs = [ lxml pycryptodome colorama ]; + requiredPythonModules = [ lxml pycryptodome colorama ]; # No tests on PyPI doCheck = false; diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix index 30b52be0b850b..c4077bcef5306 100644 --- a/pkgs/development/python-modules/liblarch/default.nix +++ b/pkgs/development/python-modules/liblarch/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { gtk3 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pygobject3 ]; diff --git a/pkgs/development/python-modules/libmr/default.nix b/pkgs/development/python-modules/libmr/default.nix index 7b1bbf6020d24..7fb1048c27c81 100644 --- a/pkgs/development/python-modules/libmr/default.nix +++ b/pkgs/development/python-modules/libmr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "43ccd86693b725fa3abe648c8cdcef17ba5fa46b5528168829e5f9b968dfeb70"; }; - propagatedBuildInputs = [ numpy cython ]; + requiredPythonModules = [ numpy cython ]; # No tests in the pypi tarball doCheck = false; diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index 9e19fe5e8e17d..5d64a5a2fe0c1 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ libsodium ]; + requiredPythonModules = [ libsodium ]; postPatch = let soext = stdenv.hostPlatform.extensions.sharedLibrary; in '' diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 0fc5d857fb84f..c935c14781cfd 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "af0b9f2ed4bbf6aecbc448a4cd27c16453c397cb6bef0f0cfba0e63afea2b839"; }; - propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile pooch ]; + requiredPythonModules = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile pooch ]; # No tests # 1. Internet connection is required diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 27144ccf1ad3c..20ec4377b13ed 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ sip ]; + requiredPythonModules = [ sip ]; disabled = pythonOlder "3.4.0"; diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index 119cb6cbefa74..f21b71cdaf0b3 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { substituteInPlace setup.py --replace "'enum34>=1.1.6'" "" ''; - propagatedBuildInputs = [ requests enum34 ]; + requiredPythonModules = [ requests enum34 ]; doCheck = false; diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix index e8b7c45417a10..72b77a754612a 100644 --- a/pkgs/development/python-modules/libthumbor/default.nix +++ b/pkgs/development/python-modules/libthumbor/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ django ]; - propagatedBuildInputs = [ six pycrypto ]; + requiredPythonModules = [ six pycrypto ]; doCheck = false; diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index e934c51942852..241ef442496d1 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; postPatch = "patchShebangs ./configure"; - propagatedBuildInputs = [ boolean-py ]; + requiredPythonModules = [ boolean-py ]; meta = with lib; { homepage = "https://github.com/nexB/license-expression"; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 27b2e94877649..b063db8e9eaf0 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { EOF ''; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy scikitlearn diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix index 8b128e7cb8926..855367d7acb62 100644 --- a/pkgs/development/python-modules/lightning/default.nix +++ b/pkgs/development/python-modules/lightning/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ jinja2 matplotlib numpy requests six ]; + requiredPythonModules = [ jinja2 matplotlib numpy requests six ]; meta = with stdenv.lib; { description = "A Python client library for the Lightning data visualization server"; diff --git a/pkgs/development/python-modules/lightparam/default.nix b/pkgs/development/python-modules/lightparam/default.nix index 0c3eb5292a88d..19e5695258046 100644 --- a/pkgs/development/python-modules/lightparam/default.nix +++ b/pkgs/development/python-modules/lightparam/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "13hlkvjcyz2lhvlfqyavja64jccbidshhs39sl4fibrn9iq34s3i"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ ipython ipywidgets numpy diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 22bd6607fb6b0..9a01ea73c4548 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "f0c3319f032c4bfad68438ed1325c0fac86dac64582c7c25cddc87a0b658fa20"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; doCheck = false; # ifilter diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index 4275732881cde..2a16709a21e3b 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - propagatedBuildInputs = [ + requiredPythonModules = [ ipython ]; diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 4689050ba6c70..1ddb3efc057c8 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { disabled = (pythonOlder "2.7"); - propagatedBuildInputs = [ requests future ] + requiredPythonModules = [ requests future ] ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; postPatch = (stdenv.lib.optionalString (!pythonOlder "3.4") '' diff --git a/pkgs/development/python-modules/linode/default.nix b/pkgs/development/python-modules/linode/default.nix index d0c8b0ff79438..92f7db244b420 100644 --- a/pkgs/development/python-modules/linode/default.nix +++ b/pkgs/development/python-modules/linode/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "db3c2a7fab8966d903a63f16c515bff241533e4ef2d746aa7aae4a49bba5e573"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; meta = with stdenv.lib; { homepage = "https://github.com/ghickman/linode"; diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix index c58a18dffe8e7..088b132a7dc5b 100644 --- a/pkgs/development/python-modules/livelossplot/default.nix +++ b/pkgs/development/python-modules/livelossplot/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "164v65qglgyg38q9ajnas99rp14mvrk5hn8x76b8iy81vszmx1c0"; }; - propagatedBuildInputs = [ bokeh ipython matplotlib numpy ]; + requiredPythonModules = [ bokeh ipython matplotlib numpy ]; checkInputs = [ pytest nbconvert nbformat ]; checkPhase = '' diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix index e329f36a71693..50f72b7b13d47 100644 --- a/pkgs/development/python-modules/livereload/default.nix +++ b/pkgs/development/python-modules/livereload/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ django ]; - propagatedBuildInputs = [ tornado six ]; + requiredPythonModules = [ tornado six ]; checkInputs = [ nose ]; # TODO: retry running all tests after v2.6.1 diff --git a/pkgs/development/python-modules/livestreamer-curses/default.nix b/pkgs/development/python-modules/livestreamer-curses/default.nix index 846f7633924b6..daddee1ad1975 100644 --- a/pkgs/development/python-modules/livestreamer-curses/default.nix +++ b/pkgs/development/python-modules/livestreamer-curses/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1v49sym6mrci9dxy0a7cpbp4bv6fg2ijj6rwk4wzg18c2x4qzkhn"; }; - propagatedBuildInputs = [ livestreamer ]; + requiredPythonModules = [ livestreamer ]; meta = with stdenv.lib; { homepage = "https://github.com/gapato/livestreamer-curses"; diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index 83bd4bcfb72c3..12c0a751c3b39 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.makeWrapper ]; - propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ] + requiredPythonModules = [ pkgs.rtmpdump pycrypto requests ] ++ stdenv.lib.optionals isPy27 [ singledispatch futures ]; postInstall = '' diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 1fa97d2949c94..1c64772dc871b 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { checkInputs = [ pytest which ] ++ optionals stdenv.isLinux [ attr ]; - propagatedBuildInputs = [ contextlib2 ]; + requiredPythonModules = [ contextlib2 ]; checkPhase = '' py.test -k "not test_listdir" ${optionalString stdenv.isDarwin ''-m "not uses_fuse"''} diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 7a7106a5eaa6c..539b9909285f0 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ llvm ]; - propagatedBuildInputs = [ ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + requiredPythonModules = [ ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; # Disable static linking # https://github.com/numba/llvmlite/issues/93 diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix index f4ed4b98ef592..764f8f5768413 100644 --- a/pkgs/development/python-modules/localzone/default.nix +++ b/pkgs/development/python-modules/localzone/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1vzn1vm3zf86l7qncbmghjrwyvla9dc2v8abn8jajbl47gm7r5f7"; }; - propagatedBuildInputs = [ dnspython sphinx ]; + requiredPythonModules = [ dnspython sphinx ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix index 0b64fc39feb77..68faa5e1f8ca4 100644 --- a/pkgs/development/python-modules/locustio/default.nix +++ b/pkgs/development/python-modules/locustio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1645d63ig4ymw716b6h53bhmjqqc13p9r95k1xfx66ck6vdqnisd"; }; - propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ]; + requiredPythonModules = [ msgpack requests flask gevent pyzmq ]; checkInputs = [ mock unittest2 ]; # remove file which attempts to do GET request preCheck = '' diff --git a/pkgs/development/python-modules/logfury/default.nix b/pkgs/development/python-modules/logfury/default.nix index 5f83c8633dc18..a96f6e00adcfd 100644 --- a/pkgs/development/python-modules/logfury/default.nix +++ b/pkgs/development/python-modules/logfury/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1lywirv3d1lw691mc4mfpz7ak6r49klri43bbfgdnvsfppxminj2"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ funcsigs six ]; diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 9c4b6dbd7919c..0821d41bfc372 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1n20znamai7jksimbdshy03rgw235qwa9vbx3lyajzwysblq4s4d"; }; - propagatedBuildInputs = [ unittest2 six ]; + requiredPythonModules = [ unittest2 six ]; # package supports 3.x but tests require egenix-mx-base which is python 2.x only # and is not currently in nixos diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix index aa26f21820b75..49aa5b5c27107 100644 --- a/pkgs/development/python-modules/logilab/constraint.nix +++ b/pkgs/development/python-modules/logilab/constraint.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1n0xim4ij1n4yvyqqvyc0wllhjs22szglsd5av0j8k2qmck4njcg"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ logilab_common six ]; diff --git a/pkgs/development/python-modules/logilab_astng/default.nix b/pkgs/development/python-modules/logilab_astng/default.nix index 81879b2218de3..425824246a39e 100644 --- a/pkgs/development/python-modules/logilab_astng/default.nix +++ b/pkgs/development/python-modules/logilab_astng/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0np4wpxyha7013vkkrdy54dvnil67gzi871lg60z8lap0l5h67wn"; }; - propagatedBuildInputs = [ logilab_common ]; + requiredPythonModules = [ logilab_common ]; meta = with stdenv.lib; { homepage = "https://www.logilab.org/project/logilab-astng"; diff --git a/pkgs/development/python-modules/logster/default.nix b/pkgs/development/python-modules/logster/default.nix index 7f3a4eeb83b84..b444a532d6920 100644 --- a/pkgs/development/python-modules/logster/default.nix +++ b/pkgs/development/python-modules/logster/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "06ac5hydas24h2cn8l5i69v1z0min5hwh6a1lcm1b08xnvpsi85q"; }; - propagatedBuildInputs = [ pygtail ]; + requiredPythonModules = [ pygtail ]; meta = with lib; { description = "Parses log files, generates metrics for Graphite and Ganglia"; diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix index 669f16e5f928f..cee540ba80700 100644 --- a/pkgs/development/python-modules/lomond/default.nix +++ b/pkgs/development/python-modules/lomond/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytestCheckHook freezegun pytest-mock tornado_4 ]; # Makes HTTP requests disabledTests = [ "test_proxy" "test_live" ]; diff --git a/pkgs/development/python-modules/loo-py/default.nix b/pkgs/development/python-modules/loo-py/default.nix index 16060c1c030e8..9862191d073da 100644 --- a/pkgs/development/python-modules/loo-py/default.nix +++ b/pkgs/development/python-modules/loo-py/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pytools pymbolic genpy diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix index effdc3f432a67..fb2989dddf468 100644 --- a/pkgs/development/python-modules/lpod/default.nix +++ b/pkgs/development/python-modules/lpod/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { # lpod library currently does not support Python 3.x disabled = isPy3k; - propagatedBuildInputs = [ lxml docutils pillow ]; + requiredPythonModules = [ lxml docutils pillow ]; src = fetchFromGitHub { owner = "lpod"; diff --git a/pkgs/development/python-modules/lsi/default.nix b/pkgs/development/python-modules/lsi/default.nix index 5f193f52e9a57..8980624cb4690 100644 --- a/pkgs/development/python-modules/lsi/default.nix +++ b/pkgs/development/python-modules/lsi/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "b2c4a9a276a32f914a6193509503c28b3cc84bf42d58e191214811cfe78f4736"; }; - propagatedBuildInputs = [ colored boto pkgs.openssh pkgs.which ]; + requiredPythonModules = [ colored boto pkgs.openssh pkgs.which ]; meta = with stdenv.lib; { description = "CLI for querying and SSHing onto AWS EC2 instances"; diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix index e87146f6fbc3c..2d140bf8cf408 100644 --- a/pkgs/development/python-modules/ludios_wpull/default.nix +++ b/pkgs/development/python-modules/ludios_wpull/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf"; }; - propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ]; + requiredPythonModules = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ]; # Test suite has tests that fail on all platforms doCheck = false; diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix index dbbe3d2521258..5f7e34d9d50c9 100644 --- a/pkgs/development/python-modules/luftdaten/default.nix +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1w1f0kmiwslg1dxn7gq0ak8f5wajlwl03r5zklshjc11j34b4d5i"; }; - propagatedBuildInputs = [ aiohttp async-timeout ]; + requiredPythonModules = [ aiohttp async-timeout ]; # No tests implemented doCheck = false; diff --git a/pkgs/development/python-modules/lzstring/default.nix b/pkgs/development/python-modules/lzstring/default.nix index 499c720d53fb6..b70375c5ffaa3 100644 --- a/pkgs/development/python-modules/lzstring/default.nix +++ b/pkgs/development/python-modules/lzstring/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "18ly9pppy2yspxzw7k1b23wk77k7m44rz2g0271bqgqrk3jn3yhs"; }; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; meta = { description = "lz-string for python"; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index f3ca43f5e9a5d..fdb8732d3286c 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ swig2 ]; buildInputs = [ swig2 openssl ]; - propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing; + requiredPythonModules = lib.optional (pythonOlder "3.5") typing; preConfigure = '' substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${openssl.dev}'" diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 3de9ec079d49f..305e0f0d925fa 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99"; }; - propagatedBuildInputs = [ mistune docutils ]; + requiredPythonModules = [ mistune docutils ]; # Some tests interfeere with each other (test.md and test.rst are # deleted by some tests and not properly regenerated) diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index 01ff1458c0faa..b1623ef217de5 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pytest tests/test_{parser,model,variant_m3u8}.py ''; - propagatedBuildInputs = [ requests iso8601 ]; + requiredPythonModules = [ requests iso8601 ]; meta = with lib; { homepage = "https://github.com/globocom/m3u8"; diff --git a/pkgs/development/python-modules/macropy/default.nix b/pkgs/development/python-modules/macropy/default.nix index 9048166773ec3..8cca74acfe476 100644 --- a/pkgs/development/python-modules/macropy/default.nix +++ b/pkgs/development/python-modules/macropy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; # js_snippets extra only works with python2 - propagatedBuildInputs = [ ] + requiredPythonModules = [ ] ++ lib.optional pinqSupport sqlalchemy ++ lib.optional pyxlSupport pyxl3; diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 125270ef12307..b12b24789d5df 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-kh3FYBSVOU4ywrYl6ONEIbLbkSuZmexNJC9dB+JtUjM="; }; - propagatedBuildInputs = [ + requiredPythonModules = [ alembic bugsnag click @@ -41,7 +41,7 @@ buildPythonPackage rec { makeWrapperArgs = [ # Add the installed directories to the python path so the daemon can find them - "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python.libPrefix}/site-packages") (python.pkgs.requiredPythonModules propagatedBuildInputs))}" + "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python.libPrefix}/site-packages") (python.pkgs.computeRequiredPythonModules requiredPythonModules))}" "--prefix" "PYTHONPATH" ":" "$out/lib/${python.libPrefix}/site-packages" ]; diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 571a92900c905..794148ab13c48 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb"; }; - propagatedBuildInputs = [ six attrs twisted pyopenssl service-identity autobahn ]; + requiredPythonModules = [ six attrs twisted pyopenssl service-identity autobahn ]; # zope.interface import issue doCheck = !isPy27; diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index 2d6a8d969d8b4..a20988085eec7 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0ppsx2s1ysikns1h053x67z2zmficbn3y3kf52bzzslhd2s02j6b"; }; - propagatedBuildInputs = [ twisted ]; + requiredPythonModules = [ twisted ]; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 9e73001a14990..e9659c866888e 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { }; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ]; + requiredPythonModules = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ]; checkInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server ]; postPatch = stdenv.lib.optionalString stdenv.isLinux '' diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index b7d17d943f7b1..ef20bfa549f90 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed patches = [ ./disable-impure-tests.patch ]; - propagatedBuildInputs = [ numpy imread pillow scipy ]; + requiredPythonModules = [ numpy imread pillow scipy ]; checkInputs = [ nose ]; checkPhase= '' diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 94b575f3f4681..7abbd3337c9b1 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ simplejson six ] ++ lib.optional (pythonOlder "3.3") ipaddress; + requiredPythonModules = [ simplejson six ] ++ lib.optional (pythonOlder "3.3") ipaddress; # Taken from .travis.yml checkPhase = '' diff --git a/pkgs/development/python-modules/mailchimp/default.nix b/pkgs/development/python-modules/mailchimp/default.nix index b9640a4ab5d50..a38ab84bf3540 100644 --- a/pkgs/development/python-modules/mailchimp/default.nix +++ b/pkgs/development/python-modules/mailchimp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ docopt ]; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; patchPhase = '' sed -i 's/==/>=/' setup.py ''; diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index 6abe5f5c6bc4b..266580252fa68 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx"; }; - propagatedBuildInputs = [ mailman ]; + requiredPythonModules = [ mailman ]; checkInputs = [ mock ]; checkPhase = '' diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/pkgs/development/python-modules/mailman-rss/default.nix index d0d103bfbec56..50a9e42da6e76 100644 --- a/pkgs/development/python-modules/mailman-rss/default.nix +++ b/pkgs/development/python-modules/mailman-rss/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1brrik70jyagxa9l0cfmlxvqpilwj1q655bphxnvjxyganxf4c00"; }; - propagatedBuildInputs = with python3Packages; [ dateutil future requests beautifulsoup4 ] + requiredPythonModules = with python3Packages; [ dateutil future requests beautifulsoup4 ] ++ stdenv.lib.optional withTwitter python3Packages.twitter ; diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index 45dfc55ae9a80..03372fbaa10a0 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0pjgzpvhdb6ql8asb20xr8d01m646zpghmcp9fmscks0n1k4di4g"; }; - propagatedBuildInputs = [ six httplib2 requests ]; + requiredPythonModules = [ six httplib2 requests ]; meta = with stdenv.lib; { homepage = "https://www.gnu.org/software/mailman/"; diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index 1f2c09d43709d..540b293787778 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1bdzay7j70fly5fy6wbdi8fbrxjrrlxnxnw226rwry1c8a351rpy"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ zope_testing ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/mapbox/default.nix b/pkgs/development/python-modules/mapbox/default.nix index f721228ddca4c..658727a41371f 100644 --- a/pkgs/development/python-modules/mapbox/default.nix +++ b/pkgs/development/python-modules/mapbox/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "123wsa4j11ps5pkjgylbmw4gnzh2vi22swgmvy50w26glkszh075"; }; - propagatedBuildInputs = [ boto3 cachecontrol iso3166 python-dateutil requests polyline uritemplate ]; + requiredPythonModules = [ boto3 cachecontrol iso3166 python-dateutil requests polyline uritemplate ]; checkInputs = [ pytestCheckHook responses ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix index d21d09571ad15..d36bb8d17dbe1 100644 --- a/pkgs/development/python-modules/mapsplotlib/default.nix +++ b/pkgs/development/python-modules/mapsplotlib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "7650754e3175f13a1cb4406a62e4cfeb424036377992b9c3c2e3f6c2404d06b3"; }; - propagatedBuildInputs = [ matplotlib scipy pandas requests pillow ]; + requiredPythonModules = [ matplotlib scipy pandas requests pillow ]; meta = with stdenv.lib; { description = "Custom Python plots on a Google Maps background"; diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index 187e3a646a029..43a07e2116c88 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "041cd779ae383fb5c56f2bb44824f4e80ba895febd9a3f21570ac274221c82e0"; }; - propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest + requiredPythonModules = [ mozprofile mozversion browsermob-proxy moztest wptserve manifestparser marionette_driver ]; meta = { diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix index 45e24ec2e1a9e..9e2d23423ed41 100644 --- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix +++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "06cnj682ynacwpi63k1427vbf7ydnwh3dchc4b11yw8ii25wbc5d"; }; - propagatedBuildInputs = [ ]; + requiredPythonModules = [ ]; meta = { description = "Mozilla test manifest handling"; diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index 28193528ed289..5c18a8528c51e 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "99ca2513d4e2ca29a08e550346f23947a50627a2b02f6ad36a4550e779fa0ce8"; }; - propagatedBuildInputs = [ mozversion mozrunner ]; + requiredPythonModules = [ mozversion mozrunner ]; meta = { description = "Mozilla Marionette driver"; diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix index 18b39307a17ed..30011cf460ba2 100644 --- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix +++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "8c2d2f32bd6e0ba3644f5d16e427444d8cb51ec1e9baa340a33e10687307f8c4"; }; - propagatedBuildInputs = [ mozfile mozlog ]; + requiredPythonModules = [ mozfile mozlog ]; meta = { description = "Minidump stack trace extractor"; diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 03187c00bef9f..e313067b86ffa 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { format = "wheel"; }; - propagatedBuildInputs = [ mozlog moznetwork mozprocess ]; + requiredPythonModules = [ mozlog moznetwork mozprocess ]; meta = { description = "Mozilla-authored device management"; diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix index 2cce0a221244e..84923f3acdc24 100644 --- a/pkgs/development/python-modules/marionette-harness/mozfile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "e5dc835582ea150e35ecd57e9d86cb707d3aa3b2505679db7332326dd49fd6b8"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # mozhttpd -> moznetwork -> mozinfo -> mozfile doCheck = false; diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix index a7cbb7ece08cc..88eca2b42488c 100644 --- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix +++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "3e2a9b4d6c007a1a9fb729d6e95b5404d138914727747e10155426492dced975"; }; - propagatedBuildInputs = [ moznetwork ]; + requiredPythonModules = [ moznetwork ]; meta = { description = "Webserver for Mozilla testing"; diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix index 1aca4cb58468e..72eff90a2e18d 100644 --- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = isPy3k; - propagatedBuildInputs = [ mozfile ]; + requiredPythonModules = [ mozfile ]; meta = with stdenv.lib; { description = "System information utilities for Mozilla testing"; diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index ee1aed055e742..385e0f6cae702 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0h1hgs13c1w0wvz60400i37m00077li1ky28j7kgx4bl75pkd3sw"; }; - propagatedBuildInputs = [ blessings mozterm six ]; + requiredPythonModules = [ blessings mozterm six ]; checkInputs = [ mozfile ]; diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix index 6bdc93f680a75..1eb74db24c14a 100644 --- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix +++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0ws20l4ggb6mj7ycwrk5h7hj1jmj3mj0ca48k5jzsa4n042ahwrd"; }; - propagatedBuildInputs = [ mozlog mozinfo ]; + requiredPythonModules = [ mozlog mozinfo ]; meta = { description = "Network utilities for Mozilla testing"; diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix index 91ed225ecb80c..cc43fbdd881df 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "a0fd8367e663d3cac74ee46bffa789667bc8d52f242d81a14522205fa6650cb2"; }; - propagatedBuildInputs = [ mozinfo ]; + requiredPythonModules = [ mozinfo ]; meta = { description = "Mozilla-authored process handling"; diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index 7075a37263b32..4869de8fea0d9 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "09l18x72vahq7il9nj6qj7la2d21vvbcn9szlm3vsvsbkz68w0yk"; }; - propagatedBuildInputs = [ mozlog mozfile mozhttpd ]; + requiredPythonModules = [ mozlog mozfile mozhttpd ]; checkInputs = [ wptserve ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index fc1d8a7bc7c83..a6fda0e735b2c 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "04s6w0sp83bn3c6ym75rnlpmcy3yr7d35jxkxhgzmy75gbcps7bi"; }; - propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess + requiredPythonModules = [ mozdevice mozfile mozinfo mozlog mozprocess mozprofile mozcrash ]; meta = { diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix index 1c9f9259d995f..d5f348a971d3c 100644 --- a/pkgs/development/python-modules/marionette-harness/moztest.nix +++ b/pkgs/development/python-modules/marionette-harness/moztest.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1pg9pqq4xnn14k1jqbyqg81zag2v66y725537v6hixi41yiqkdas"; }; - propagatedBuildInputs = [ mozinfo ]; + requiredPythonModules = [ mozinfo ]; meta = { description = "Mozilla test result storage and output"; diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix index 9717a847d3596..d26312c2834cc 100644 --- a/pkgs/development/python-modules/marionette-harness/mozversion.nix +++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0jczc1yr2yi3mf1qdgpvg9sidp5hf3jplzs4917j65ymvk2zw9na"; }; - propagatedBuildInputs = [ mozlog mozdevice ]; + requiredPythonModules = [ mozlog mozdevice ]; meta = { description = "Application version information library"; diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix index 41a634f4b9a50..9dc68f39bb41a 100644 --- a/pkgs/development/python-modules/markdown-macros/default.nix +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "distribute" "setuptools" ''; - propagatedBuildInputs = [ markdown ]; + requiredPythonModules = [ markdown ]; doCheck = false; diff --git a/pkgs/development/python-modules/markdown/3_1.nix b/pkgs/development/python-modules/markdown/3_1.nix index eb9b2e59ec81b..0379d8e15f055 100644 --- a/pkgs/development/python-modules/markdown/3_1.nix +++ b/pkgs/development/python-modules/markdown/3_1.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index c97f74a2f2aef..bcfae110bf668 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 5bbf47278ce73..bd9bdb131fa50 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "2c255b5959c1f5dd364ae80762bd0a568a0fcc9fd4e4a3d7e7b192e88adf8900"; }; - propagatedBuildInputs = [ markdown ]; + requiredPythonModules = [ markdown ]; postPatch = '' # remove version bounds for Markdown dependency diff --git a/pkgs/development/python-modules/marshmallow-enum/default.nix b/pkgs/development/python-modules/marshmallow-enum/default.nix index 16af840b036bf..6aa0d901a4781 100644 --- a/pkgs/development/python-modules/marshmallow-enum/default.nix +++ b/pkgs/development/python-modules/marshmallow-enum/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1ihrcmyfjabivg6hc44i59hnw5ijlg1byv3zs1rqxfynp8xr7398"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ marshmallow ] ++ lib.optionals isPy27 [ enum34 ]; diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index e3b629b3034e6..8c682cae73fc7 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "15yx8ib5yx1xx6kq8wnfdmv9zm43k7y33c6zpq5rba6a30v4lcnd"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ marshmallow ]; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 60a2704894b99..7183a11c2324f 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0ef59c8da8da2e18e808e3880158049e9d72f3031c84cc804b6c533a0eb668a9"; }; - propagatedBuildInputs = [ marshmallow sqlalchemy ]; + requiredPythonModules = [ marshmallow sqlalchemy ]; doCheck = false; } diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index cf54e38385df9..a8bc2118ae2b4 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "a2a5eefb4b75a3b43f05be1cca0b6686adf56af7465c3ca629e5ad8d1e1fe13d"; }; - propagatedBuildInputs = [ dateutil simplejson ]; + requiredPythonModules = [ dateutil simplejson ]; doCheck = false; } diff --git a/pkgs/development/python-modules/mask-rcnn/default.nix b/pkgs/development/python-modules/mask-rcnn/default.nix index 4c500a18515a1..62c529b293389 100644 --- a/pkgs/development/python-modules/mask-rcnn/default.nix +++ b/pkgs/development/python-modules/mask-rcnn/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ h5py imgaug ipython diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 132be56f19b30..f4ffeb2045f95 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm pytestrunner ]; checkInputs = [ pytest hypothesis ]; - propagatedBuildInputs = [ hopcroftkarp multiset ]; + requiredPythonModules = [ hopcroftkarp multiset ]; meta = with lib; { description = "A library for pattern matching on symbolic expressions"; diff --git a/pkgs/development/python-modules/mathlibtools/default.nix b/pkgs/development/python-modules/mathlibtools/default.nix index f9c1cf6839f01..dced277b922e8 100644 --- a/pkgs/development/python-modules/mathlibtools/default.nix +++ b/pkgs/development/python-modules/mathlibtools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0d708bgsxjhhchqc56afi1h7k87vbfn7v40f4y1zlv7hsjc69s36"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ PyGithub GitPython toml click tqdm paramiko networkx pydot pyyaml ]; diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index dd25860795baf..22465223ec4e3 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -39,18 +39,26 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + which + sphinx + ]; - buildInputs = [ which sphinx ] - ++ stdenv.lib.optional enableGhostscript ghostscript - ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; + buildInputs = [ + freetype + libpng + ] + ++ stdenv.lib.optionals enableGhostscript [ ghostscript ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ] + ++ stdenv.lib.optionals enableTk [ tcl tk libX11 ]; - propagatedBuildInputs = - [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver - libpng mock pytz ] + requiredPythonModules = + [ cycler dateutil nose numpy pyparsing tornado kiwisolver + mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] - ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] + ++ stdenv.lib.optionals enableTk [ tkinter ] ++ stdenv.lib.optionals enableQt [ pyqt4 ] ++ stdenv.lib.optionals python.isPy2 [ functools32 subprocess32 ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index f8adc0d0986b7..0837472ae7fb2 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -32,17 +32,25 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + which + sphinx + ]; - buildInputs = [ which sphinx ] - ++ stdenv.lib.optional enableGhostscript ghostscript - ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; + buildInputs = [ + freetype + libpng + ] + ++ stdenv.lib.optionals enableGhostscript [ ghostscript ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ] + ++ stdenv.lib.optionals enableTk [ tcl tk libX11 ]; - propagatedBuildInputs = - [ cycler dateutil numpy pyparsing tornado freetype kiwisolver - certifi libpng mock pytz pillow ] + requiredPythonModules = + [ cycler dateutil numpy pyparsing tornado kiwisolver + certifi mock pytz pillow ] ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] - ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] + ++ stdenv.lib.optionals enableTk [ tkinter ] ++ stdenv.lib.optionals enableQt [ pyqt5 ]; setup_cfg = if stdenv.isDarwin then ./setup-darwin.cfg else ./setup.cfg; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 71092583d7fd4..bd3e620616140 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner responses ]; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; meta = with stdenv.lib; { description = "Matrix Client-Server SDK"; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 59c3f47d2ca7a..20d50452a3f6e 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { git ]; - propagatedBuildInputs = [ + requiredPythonModules = [ attrs future aiohttp diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 50b81cef945db..c86ce0d620268 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1hqg32n7pmjhap0ybfcf05zgfcyyirb4fm1m7gf44dwh40da6qz0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp future-fstrings diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index d101cdfd0c2e7..519cd58a3b2e3 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ libmaxminddb ]; - propagatedBuildInputs = [ ipaddress ]; + requiredPythonModules = [ ipaddress ]; checkInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix index 6df4091664b3e..cb4cf18a98cfe 100644 --- a/pkgs/development/python-modules/maya/default.nix +++ b/pkgs/development/python-modules/maya/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ dateparser humanize pendulum ruamel_yaml tzlocal ]; + requiredPythonModules = [ dateparser humanize pendulum ruamel_yaml tzlocal ]; # No tests doCheck = false; diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index 2fd536609076a..7b89f6509911c 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pyface pygments numpy vtk traitsui envisage apptools pyqt5 ]; diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index a93b00a0f91ea..53f004bc54711 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ future numpy ]; + requiredPythonModules = [ future numpy ]; # Tests disabled because of missing dependencies not in nix doCheck = false; diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index 6b7a02a76eb51..c7f20e5c5abeb 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner ]; nativeBuildInputs = [ sphinx setuptools_scm ]; - propagatedBuildInputs = [ sympy ]; + requiredPythonModules = [ sympy ]; meta = with lib; { description = "Use and manipulate unit-aware measurement objects in Python"; diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 1d63a6e2b6a1a..bb73421803b53 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "6355c11141f6d4b54a17fc2106944806b5db2711e60b120d15d83db438c333fd"; }; - propagatedBuildInputs = [ html5lib ]; + requiredPythonModules = [ html5lib ]; doCheck = false; diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index 2941505184de1..ecd88e98fa1c9 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "008c76937ac2117cc69e032dc69cea9f85fc605de9bac1417f447c41c16a56d6"; }; - propagatedBuildInputs = [ greenlet ]; + requiredPythonModules = [ greenlet ]; # No tests doCheck = false; diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix index e02e72c1add5b..3c29bdb152aaa 100644 --- a/pkgs/development/python-modules/meliae/default.nix +++ b/pkgs/development/python-modules/meliae/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { checkInputs = [ simplejson ]; - propagatedBuildInputs = [ cython ]; + requiredPythonModules = [ cython ]; meta = with stdenv.lib; { description = "Python Memory Usage Analyzer"; diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix index 0dafde83c4046..9c4cafd432975 100644 --- a/pkgs/development/python-modules/memory_profiler/default.nix +++ b/pkgs/development/python-modules/memory_profiler/default.nix @@ -11,7 +11,7 @@ python.pkgs.buildPythonPackage rec { sha256 = "1hdgh5f59bya079w4ahx4l0hf4gc5yvaz44irp5x57cj9hkpp92z"; }; - propagatedBuildInputs = with python.pkgs; [ + requiredPythonModules = with python.pkgs; [ psutil # needed to profile child processes matplotlib # needed for plotting memory usage ]; diff --git a/pkgs/development/python-modules/merkletools/default.nix b/pkgs/development/python-modules/merkletools/default.nix index 92acdaf58ed42..1e357868eb14e 100644 --- a/pkgs/development/python-modules/merkletools/default.nix +++ b/pkgs/development/python-modules/merkletools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0pdik5sil0xcrwdcgdfy86c5qcfrz24r0gfc8m8bxa0i7h7x2v9l"; }; - propagatedBuildInputs = [ pysha3 ]; + requiredPythonModules = [ pysha3 ]; meta = with lib; { description = "Python tools for creating Merkle trees, generating Merkle proofs, and verification of Merkle proofs"; diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index f8fc43808fb3b..7c3b3b0363efc 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytest tests -k "not scaffold" ''; - propagatedBuildInputs = [ cookiecutter networkx pandas tornado tqdm ]; + requiredPythonModules = [ cookiecutter networkx pandas tornado tqdm ]; meta = with stdenv.lib; { homepage = "https://github.com/projectmesa/mesa"; diff --git a/pkgs/development/python-modules/meshlabxml/default.nix b/pkgs/development/python-modules/meshlabxml/default.nix index c1091296d2e15..6866a6cdbc4f3 100644 --- a/pkgs/development/python-modules/meshlabxml/default.nix +++ b/pkgs/development/python-modules/meshlabxml/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1villmg46hqby5jjkkpxr5bxydr72y5b3cbfngwpyxxdljn091w8"; }; - propagatedBuildInputs = [ ]; + requiredPythonModules = [ ]; doCheck = false; # Upstream not currently have any tests. diff --git a/pkgs/development/python-modules/mesonpep517/default.nix b/pkgs/development/python-modules/mesonpep517/default.nix index fd44f3e4480e4..e66e9d00a2aa9 100644 --- a/pkgs/development/python-modules/mesonpep517/default.nix +++ b/pkgs/development/python-modules/mesonpep517/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ intreehooks ]; - propagatedBuildInputs = [ pytoml ]; + requiredPythonModules = [ pytoml ]; # postPatch = '' # # Meson tries to detect ninja as well, so we should patch meson as well. diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index d27fd86204597..2206623f9107a 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { || stdenv.lib.versionAtLeast django.version "2.0"; buildInputs = [ pyflakes pep8 ]; - propagatedBuildInputs = [ django django_contrib_comments filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow chardet ]; + requiredPythonModules = [ django django_contrib_comments filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow chardet ]; # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+ doCheck = false; diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index 5129fe253c71c..ce459b71eff5c 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "5e1e6fbab5bfc1edc6d575b900707c24a3484c51cf2e01f059a7e070724a3633"; }; - propagatedBuildInputs = [ beautifulsoup4 ]; + requiredPythonModules = [ beautifulsoup4 ]; meta = with stdenv.lib; { homepage = "https://micawber.readthedocs.io/en/latest/"; diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 8312ea783cb44..1459366b47fe7 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pygame python-rtmidi rtmidi-python diff --git a/pkgs/development/python-modules/milksnake/default.nix b/pkgs/development/python-modules/milksnake/default.nix index 6d063021697c1..5c835d5040f29 100644 --- a/pkgs/development/python-modules/milksnake/default.nix +++ b/pkgs/development/python-modules/milksnake/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "120nprd8lqis7x7zy72536gk2j68f7gxm8gffmx8k4ygifvl7kfz"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cffi ]; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 7799a7a9ef6d3..8d3450290bf22 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "97d275ff01ddae45101eced0d9d5258f2869308c949b17d86a77b77a2a50b7b3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ configparser future python-dateutil diff --git a/pkgs/development/python-modules/misaka/default.nix b/pkgs/development/python-modules/misaka/default.nix index 07f251f75b5f5..74d7037cc5f8e 100644 --- a/pkgs/development/python-modules/misaka/default.nix +++ b/pkgs/development/python-modules/misaka/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "1mzc29wwyhyardclj1vg2xsfdibg2lzb7f1azjcxi580ama55wv2"; }; - propagatedBuildInputs = [ cffi ]; + requiredPythonModules = [ cffi ]; # The tests require write access to $out doCheck = false; diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index cb5b5cc80f5b6..e1bf186855ffe 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { pytest -k 'not test_get_version' # expects a Git repository ''; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools # setup.py blinker diff --git a/pkgs/development/python-modules/mixpanel/default.nix b/pkgs/development/python-modules/mixpanel/default.nix index fac1afe2c97bb..668a7fe7ea710 100644 --- a/pkgs/development/python-modules/mixpanel/default.nix +++ b/pkgs/development/python-modules/mixpanel/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "1hlc717wcn71i37ngsfb3c605rlyjhsn3v6b5bplq00373r4d39z"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six ]; diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index c8531299620ef..be7f69e89a7ff 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ mkl six ]; + requiredPythonModules = [ mkl six ]; meta = with lib; { description = "Python hooks for Intel(R) Math Kernel Library runtime control settings"; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 1acd8bf569075..aa328f6de1d44 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { # also, tests use conda so can't run on NixOS without buildFHSUserEnv doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ alembic click cloudpickle diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index 5fd39d9b347af..33f5c6b97363c 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "cec83253bf6da67a7fb32b2c9ae13e9dbc6cfbcaae2aa3107993e69e9788f15e"; }; - propagatedBuildInputs = [ scikitlearn ]; + requiredPythonModules = [ scikitlearn ]; postPatch = '' sed -i 's,sklearn,scikit-learn,g' setup.py diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index 2811d0ecda549..74ed02c90c261 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "4e37eb02b2cbd56a0079cabe58a6da93e60e3e4d6e757a586d9f23d96abea931"; }; - propagatedBuildInputs = [ pbkdf2 ]; + requiredPythonModules = [ pbkdf2 ]; meta = { description = "Implementation of Bitcoin BIP-0039"; diff --git a/pkgs/development/python-modules/mnist/default.nix b/pkgs/development/python-modules/mnist/default.nix index 022cd3a2e02b0..8a8fdce5353bd 100644 --- a/pkgs/development/python-modules/mnist/default.nix +++ b/pkgs/development/python-modules/mnist/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "17r37pbxiv5dw857bmg990x836gq6sgww069w3q5jjg9m3xdm7dh"; }; - propagatedBuildInputs = [ numpy ] ++ lib.optional isPy27 mock; + requiredPythonModules = [ numpy ] ++ lib.optional isPy27 mock; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix index 391ba29a98c8a..a72763ee1826e 100644 --- a/pkgs/development/python-modules/mock-open/default.nix +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0ampbhk7kwkn0q5d2h9wrflkr8fji2bybmdck4qdzw1qkslfwwrn"; }); - propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock; + requiredPythonModules = lib.optional (pythonOlder "3.3") mock; meta = with lib; { homepage = "https://github.com/nivbend/mock-open"; diff --git a/pkgs/development/python-modules/mock/2.nix b/pkgs/development/python-modules/mock/2.nix index 190297b41a2d0..e51e9594c868d 100644 --- a/pkgs/development/python-modules/mock/2.nix +++ b/pkgs/development/python-modules/mock/2.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3"; }; - propagatedBuildInputs = [ six pbr ] ++ lib.optionals isPy27 [ funcsigs ]; + requiredPythonModules = [ six pbr ] ++ lib.optionals isPy27 [ funcsigs ]; # On PyPy for Python 2.7 in particular, Mock's tests have a known failure. # Mock upstream has a decoration to disable the failing test and make diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index e905add00f5f1..50dee50ae6d64 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "dd33eb70232b6118298d516bbcecd26704689c386594f0f3c4f13867b2c56f72"; }; - propagatedBuildInputs = [ six pbr ] ++ lib.optionals isPy27 [ funcsigs ]; + requiredPythonModules = [ six pbr ] ++ lib.optionals isPy27 [ funcsigs ]; # On PyPy for Python 2.7 in particular, Mock's tests have a known failure. # Mock upstream has a decoration to disable the failing test and make diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index ab9be69e58eb7..d3fe9d7a8b644 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace 'setup_requires=["pipenv"]' "setup_requires=[]" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ decorator http-parser python_magic diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 1238388a91c0d..27fea7578d961 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "d6b3aca6cdb92bbd47e19ebdb1a0b84ef23ab874eae5c6d505323c8657257c06"; }; - propagatedBuildInputs = stdenv.lib.optionals (!isPy3k) [ funcsigs ]; + requiredPythonModules = stdenv.lib.optionals (!isPy3k) [ funcsigs ]; checkInputs = [ pytest numpy ]; # tests are no longer packaged in pypi tarball diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index e4cdec7766d61..f570fa3465d53 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { zetup ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six moretools pathpy diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix index b4aee8c61cf7f..a35c4293b8fbe 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl_window/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1p03j91pk2bwycd13p0qi8kns1sf357180hd2mkaip8mfaf33x3q"; }; - propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr ]; + requiredPythonModules = [ numpy moderngl pyglet pillow pyrr ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix index c7b1071954d2c..f6672c7612cc3 100644 --- a/pkgs/development/python-modules/modestmaps/default.nix +++ b/pkgs/development/python-modules/modestmaps/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "698442a170f02923f8ea55f18526b56c17178162e44304f896a8a5fd65ab4457"; }; - propagatedBuildInputs = [ pillow ]; + requiredPythonModules = [ pillow ]; meta = with stdenv.lib; { description = "A library for building interactive maps"; diff --git a/pkgs/development/python-modules/mohawk/default.nix b/pkgs/development/python-modules/mohawk/default.nix index e260bb7b54a37..2402134fec8a0 100644 --- a/pkgs/development/python-modules/mohawk/default.nix +++ b/pkgs/development/python-modules/mohawk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "08wppsv65yd0gdxy5zwq37yp6jmxakfz4a2yx5wwq2d222my786j"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ mock nose pytest ]; diff --git a/pkgs/development/python-modules/mongodict/default.nix b/pkgs/development/python-modules/mongodict/default.nix index 932160bb9fad6..348c7a8ede5e6 100644 --- a/pkgs/development/python-modules/mongodict/default.nix +++ b/pkgs/development/python-modules/mongodict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0nv5amfs337m0gbxpjb0585s20rndqfc3mfrzq1iwgnds5gxcrlw"; }; - propagatedBuildInputs = [ pymongo ]; + requiredPythonModules = [ pymongo ]; meta = with stdenv.lib; { description = "MongoDB-backed Python dict-like interface"; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index a47438d5a700b..9398e47884c07 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "0wc0cvjanlszn09n61jj38pq9wdlphkjgrp3c8hvd16754is3n7f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pymongo six ]; diff --git a/pkgs/development/python-modules/monkeyhex/default.nix b/pkgs/development/python-modules/monkeyhex/default.nix index 715665f1b1ba3..40b0bf210e424 100644 --- a/pkgs/development/python-modules/monkeyhex/default.nix +++ b/pkgs/development/python-modules/monkeyhex/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "5ba913df664c34f3ce53916c83872fddf750adc78a0b0ecdd316ac3e728bb019"; }; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; # No tests in repo. doCheck = false; diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 77448d0e15fe3..9e41adfed3afa 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { }; checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo]; - propagatedBuildInputs = [ six ruamel_yaml ]; + requiredPythonModules = [ six ruamel_yaml ]; # test suite tries to decode bytes, but msgpack now returns a str # https://github.com/materialsvirtuallab/monty/pull/121 diff --git a/pkgs/development/python-modules/more-itertools/2.7.nix b/pkgs/development/python-modules/more-itertools/2.7.nix index f9a6ac732e2ea..0e9295ff7727f 100644 --- a/pkgs/development/python-modules/more-itertools/2.7.nix +++ b/pkgs/development/python-modules/more-itertools/2.7.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # iterable = range(10 ** 10) # Is efficiently reversible # OverflowError: Python int too large to convert to C long diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index ec6ce4ed3b260..0f9576fbd301d 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # iterable = range(10 ** 10) # Is efficiently reversible # OverflowError: Python int too large to convert to C long diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index c9fd953f350e4..1fe2c8d128232 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ zetup ]; checkInputs = [ six pathpy pytest ]; - propagatedBuildInputs = [ decorator ]; + requiredPythonModules = [ decorator ]; meta = with stdenv.lib; { description = '' diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 3efc09bc00178..858f15ee8d540 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ aws-xray-sdk boto boto3 diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 1e08d5dc3af2c..f39a78811bb99 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { # No tests, require network connection doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy decorator imageio imageio-ffmpeg tqdm requests proglog ] ++ (stdenv.lib.optionals advancedProcessing [ opencv3 scikitimage scikitlearn scipy matplotlib youtube-dl diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index 70b982ef4b86e..7253e3bca71f6 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }; buildInputs = [ subunit testrepository testtools six ]; - propagatedBuildInputs = [ pbr fixtures ]; + requiredPythonModules = [ pbr fixtures ]; # Disabling as several tests depdencies are missing: # https://opendev.org/openstack/mox3/src/branch/master/test-requirements.txt diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/pkgs/development/python-modules/mozsvc/default.nix index 780a162a916e5..9db45904389d3 100644 --- a/pkgs/development/python-modules/mozsvc/default.nix +++ b/pkgs/development/python-modules/mozsvc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; doCheck = false; # too many dependencies and conflicting versions; I (nadrieril) gave up - propagatedBuildInputs = [ pyramid simplejson konfig ]; + requiredPythonModules = [ pyramid simplejson konfig ]; meta = with stdenv.lib; { homepage = "https://github.com/mozilla-services/mozservices"; diff --git a/pkgs/development/python-modules/mozterm/default.nix b/pkgs/development/python-modules/mozterm/default.nix index c7f2b4cbc349b..6cbed11e263cf 100644 --- a/pkgs/development/python-modules/mozterm/default.nix +++ b/pkgs/development/python-modules/mozterm/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { # name 'unicode' is not defined disabled = isPy3k; - propagatedBuildInputs = [six]; + requiredPythonModules = [six]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix index bfe442d05f518..953f9fa553adb 100644 --- a/pkgs/development/python-modules/mplleaflet/default.nix +++ b/pkgs/development/python-modules/mplleaflet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "mplleaflet"; version = "0.0.5"; - propagatedBuildInputs = [ jinja2 six ]; + requiredPythonModules = [ jinja2 six ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index 7074dab739be8..df25594f89af5 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8" nosetests ''; - propagatedBuildInputs = [ jinja2 six ]; + requiredPythonModules = [ jinja2 six ]; meta = with stdenv.lib; { homepage = "https://github.com/domenkozar/mr.bob"; diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index 91f7ecf966762..2e6ff9b29dee9 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "31414753c484679bb3b6c6401623eb4c3ccab630af215f2f78c1d5c4f8e1d1a9"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ msal portalocker ] ++ lib.optionals isPy27 [ diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index e67868912f211..546900a050f12 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "7efb0256c96a7b2eadab49ce29ecdb91352a91440c12a40bed44303724b62fda"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyjwt requests ]; diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index ad612550d7e8f..8f90ad968162a 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ msgpack numpy ]; diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 14ed57457b297..16cf41ff1a03e 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { sha256 = "0j0dbca47qnxnhpfgj3v5bglg8dpx2cy1psix8kp3ldrkf6rjwdb"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests requests_oauthlib isodate certifi ] ++ lib.optionals (!isPy3k) [ enum34 typing ] ++ lib.optionals isPy3k [ aiohttp aiodns ]; diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix index 96c546e5d3553..63e3538ada4ef 100644 --- a/pkgs/development/python-modules/msrestazure/default.nix +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "0ik81f0n6r27f02gblgm0vl5zl3wc6ijsscihgvc1fgm9f5mk5b5"; }; - propagatedBuildInputs = [ adal msrest ]; + requiredPythonModules = [ adal msrest ]; checkInputs = [ httpretty mock pytest ] ++ lib.optionals isPy3k [ pytest-asyncio ]; diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix index ffb87ff48ee0d..363a691bf1335 100644 --- a/pkgs/development/python-modules/msrplib/default.nix +++ b/pkgs/development/python-modules/msrplib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0d0krwv4hhspjgppnvh0iz51bvdbz23cjasgrppip7x8b00514gz"; }; - propagatedBuildInputs = [ eventlib application gnutls ]; + requiredPythonModules = [ eventlib application gnutls ]; meta = with stdenv.lib; { homepage = "https://github.com/AGProjects/python-msrplib"; diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index 1604a006567e5..4a4af40668cd7 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0dicp55adbqxb7hqlck95hngb1klv5s26lszw3xim30k18bwqaxl"; }; - propagatedBuildInputs = [ ]; + requiredPythonModules = [ ]; # By default it attempts to build Windows-only functionality prePatch = '' diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index e169929294426..30bac583217c7 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "9274bc8298b2d4b69cb3936bdcda315b50e45975789f519a237bdec58346b8d7"; }; - propagatedBuildInputs = lib.optional (!isPy3k) enum34; + requiredPythonModules = lib.optional (!isPy3k) enum34; checkInputs = [ pyyaml pytest ]; diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index ed55b0421cd89..df1e283f60710 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = { homepage = "https://github.com/mrocklin/multipledispatch/"; diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index df304efb91995..08451c777061f 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "9fd5bd990132da77e73dec6e9613408602a4612e1d73caf2e2b813d2b61508e5"; }; - propagatedBuildInputs = [ dill ]; + requiredPythonModules = [ dill ]; # Python-version dependent tests doCheck = false; diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index 0d7d6f7c633af..40f4e7d305ed8 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2"; }; - propagatedBuildInputs = [ six pbr ]; + requiredPythonModules = [ six pbr ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index 273a009a1f414..afcb0193aae4d 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2"; }; - propagatedBuildInputs = [ pyparsing ]; + requiredPythonModules = [ pyparsing ]; meta = with stdenv.lib; { homepage = "https://github.com/aroig/mutag"; diff --git a/pkgs/development/python-modules/mutagen/1.43.nix b/pkgs/development/python-modules/mutagen/1.43.nix index a7a7c7c660490..467561f3cc754 100644 --- a/pkgs/development/python-modules/mutagen/1.43.nix +++ b/pkgs/development/python-modules/mutagen/1.43.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "d873baeb7815311d3420aab0a1d83f050f628228cbc2d6045a14a16460411bc9"; }; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; checkInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index df0872242a17f..3e14d031d24de 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1"; }; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; checkInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis flake8 diff --git a/pkgs/development/python-modules/mutatormath/default.nix b/pkgs/development/python-modules/mutatormath/default.nix index 9336dbf354af0..f7cf2b2bdc78c 100644 --- a/pkgs/development/python-modules/mutatormath/default.nix +++ b/pkgs/development/python-modules/mutatormath/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ fontmath unicodedata2 defcon ]; + requiredPythonModules = [ fontmath unicodedata2 defcon ]; checkInputs = [ unicodedata2 fs ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index 2744ff9a277c0..feb2a0a831b0c 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ]; - propagatedBuildInputs = [ requests requests_oauthlib six ]; + requiredPythonModules = [ requests requests_oauthlib six ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/mwlib/default.nix b/pkgs/development/python-modules/mwlib/default.nix index 55a19e1a6da31..90d273824f8df 100644 --- a/pkgs/development/python-modules/mwlib/default.nix +++ b/pkgs/development/python-modules/mwlib/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sha256 = "1dnmnkc21zdfaypskbpvkwl0wpkpn0nagj1fc338w64mbxrk8ny7"; }; - propagatedBuildInputs = [ apipkg bottle gevent lxml odfpy pillow py pyPdf pyparsing qserve roman simplejson sqlite3dbm timelib ]; + requiredPythonModules = [ apipkg bottle gevent lxml odfpy pillow py pyPdf pyparsing qserve roman simplejson sqlite3dbm timelib ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index 0a73e99391e20..20b52dcd416e9 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # package has no tests doCheck = false; - propagatedBuildInputs = [ six pyjwt requests oauthlib requests_oauthlib ]; + requiredPythonModules = [ six pyjwt requests oauthlib requests_oauthlib ]; meta = with lib; { description = "A library designed to provide a simple means to performing an OAuth handshake with a MediaWiki installation with the OAuth Extension installed."; diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index 65eb2d44ffccc..76d3cc0d6d76f 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage { inherit (pkgs.mxnet) name version src meta; buildInputs = [ pkgs.mxnet ]; - propagatedBuildInputs = [ requests numpy graphviz ]; + requiredPythonModules = [ requests numpy graphviz ]; LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ pkgs.mxnet ]; diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 0638ce5d1ee5c..077c1a2208445 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -3,7 +3,7 @@ , pytestCheckHook, mock, nose }: # TODO: Define this package in "all-packages.nix" using "toPythonApplication". -# This currently errors out, complaining about not being able to find "etree" from "lxml" even though "lxml" is defined in "propagatedBuildInputs". +# This currently errors out, complaining about not being able to find "etree" from "lxml" even though "lxml" is defined in "requiredPythonModules". buildPythonPackage rec { pname = "myfitnesspal"; @@ -21,7 +21,7 @@ buildPythonPackage rec { sed -i 's/rich>=.*/rich/' requirements.txt ''; - propagatedBuildInputs = [ blessed keyring keyrings-alt lxml measurement python-dateutil requests six rich ]; + requiredPythonModules = [ blessed keyring keyrings-alt lxml measurement python-dateutil requests six rich ]; # Integration tests require an account to be set disabledTests = [ "test_integration" ]; diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 3e0ab2cf1820b..add849ba6d90e 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { sha256 = "cf79c77e828a2de9bdc74b43ad4abd4c2a3a30f0471b46e9b4e01b9877f166fb"; }; - propagatedBuildInputs = [ protobuf ]; + requiredPythonModules = [ protobuf ]; meta = with stdenv.lib; { description = "Generate mypy stub files from protobuf specs"; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 0bcf216fa46fd..5aec0f2928e2b 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "030kn709515452n6gy2i1d9fg6fyrkmdz228lfpmbslybsld9xzg"; }; - propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; + requiredPythonModules = [ typed-ast psutil mypy-extensions typing-extensions ]; # Tests not included in pip package. doCheck = false; diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index b3bb68a53b727..9713f7d961521 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"; }; - propagatedBuildInputs = if pythonOlder "3.5" then [ typing ] else [ ]; + requiredPythonModules = if pythonOlder "3.5" then [ typing ] else [ ]; meta = with stdenv.lib; { description = "Experimental type system extensions for programs checked with the mypy typechecker"; diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index d3465110194eb..220052d8d5a9e 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -13,7 +13,7 @@ in buildPythonPackage rec { sha256 = "084q8x86ywgxgpsgdid8y9rjjys06146dqinfpmlggjswbq9kl0d"; }; - propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; + requiredPythonModules = with py.pkgs; [ protobuf dnspython ]; # Tests are failing (TODO: unknown reason) # TypeError: __init__() missing 1 required positional argument: 'string' diff --git a/pkgs/development/python-modules/namebench/default.nix b/pkgs/development/python-modules/namebench/default.nix index 44b590bae2cf8..3a76dafd1918f 100644 --- a/pkgs/development/python-modules/namebench/default.nix +++ b/pkgs/development/python-modules/namebench/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ tkinter ]; + requiredPythonModules = [ tkinter ]; # namebench expects to be run from its own source tree (it uses relative # paths to various resources), make it work. diff --git a/pkgs/development/python-modules/nanoleaf/default.nix b/pkgs/development/python-modules/nanoleaf/default.nix index ea15da78bfb5b..babe210609f53 100644 --- a/pkgs/development/python-modules/nanoleaf/default.nix +++ b/pkgs/development/python-modules/nanoleaf/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace 'gitVersion' '"${version}"' ''; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; meta = with stdenv.lib; { description = "A python interface for Nanoleaf Aurora lighting"; diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index 0df4b0218b59d..b028d2b982c47 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -94,7 +94,7 @@ buildPythonPackage rec { cp ${zlibStatic.out}/lib/libz.a deps/zlib-1.2.11/ ''; - propagatedBuildInputs = [ tls-parser ]; + requiredPythonModules = [ tls-parser ]; nativeBuildInputs = [ invoke ]; diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 168818caf666e..a3e24cc0eaf7b 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; - propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter_client ]; + requiredPythonModules = [ async_generator traitlets nbformat nest-asyncio jupyter_client ]; meta = with stdenv.lib; { homepage = "https://github.com/jupyter/nbclient"; diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix index 4e443a377eda7..03bba168c7d95 100644 --- a/pkgs/development/python-modules/nbconflux/default.nix +++ b/pkgs/development/python-modules/nbconflux/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1708qkb275d6f7b4b5zmqx3i0jh56nrx2n9rwwp5nbaah5p2wwlh"; }; - propagatedBuildInputs = [ nbconvert requests ]; + requiredPythonModules = [ nbconvert requests ]; checkInputs = [ pytest responses ]; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 49e4862999c7a..df529506f51c0 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ nose pytest glibcLocales ]; - propagatedBuildInputs = [ + requiredPythonModules = [ entrypoints bleach mistune jinja2 pygments traitlets testpath jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client defusedxml diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 7e774eed29625..4b7eb31cf3a80 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ attrs py setuptools diff --git a/pkgs/development/python-modules/nbformat/2.nix b/pkgs/development/python-modules/nbformat/2.nix index 06d02520b20d4..ff5c2f43be177 100644 --- a/pkgs/development/python-modules/nbformat/2.nix +++ b/pkgs/development/python-modules/nbformat/2.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { LC_ALL="en_US.utf8"; checkInputs = [ pytest glibcLocales ]; - propagatedBuildInputs = [ ipython_genutils traitlets testpath jsonschema jupyter_core ]; + requiredPythonModules = [ ipython_genutils traitlets testpath jsonschema jupyter_core ]; preCheck = '' mkdir tmp diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 3bd119179a452..8c1d05ce6f825 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { LC_ALL="en_US.utf8"; checkInputs = [ pytest glibcLocales ]; - propagatedBuildInputs = [ ipython_genutils traitlets testpath jsonschema jupyter_core ]; + requiredPythonModules = [ ipython_genutils traitlets testpath jsonschema jupyter_core ]; preCheck = '' mkdir tmp diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix index 79900197133a2..1f503ef338cfb 100644 --- a/pkgs/development/python-modules/nbmerge/default.nix +++ b/pkgs/development/python-modules/nbmerge/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1cn550kjadnxc1sx2xy814248fpzrj3lgvrmsbrwmk03vwaa2hmi"; }; - propagatedBuildInputs = [ nbformat ]; + requiredPythonModules = [ nbformat ]; checkInputs = [ nose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix index 8f263246893ba..ac790653a31a1 100644 --- a/pkgs/development/python-modules/nbsmoke/default.nix +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "06as8vh17m0nkp3fpkp42m990a5zjfl2iaa17da99ksh7886mjpc"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pytest holoviews jupyter_client diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index fb5eb6cbf7c9f..37de54e6d9ae5 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "369c16fe93af14c878d61fb3e81d838196fb35b27deade2cd7b95efe1fe56ea0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ docutils jinja2 nbconvert diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index 704bc21d7e1a7..476bd3b36dfac 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ + requiredPythonModules = [ coverage ipykernel jupyter_client diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index fb1945ddf427c..bca61670012bc 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -16,7 +16,7 @@ in buildPythonPackage { buildInputs = [ precis-i18n ]; checkInputs = [ gobject-introspection libsoup pygobject3 ]; - propagatedBuildInputs = [ idna pyopenssl ]; + requiredPythonModules = [ idna pyopenssl ]; meta = with stdenv.lib; { homepage = "https://dev.gajim.org/gajim/python-nbxmpp"; diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 203ffc656806d..e9a032c46a9bf 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ nose rednose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ paramiko lxml selectors2 ]; diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix index 687f589fe1afb..88ec89236774b 100644 --- a/pkgs/development/python-modules/ndg-httpsclient/default.nix +++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { version = "0.5.1"; pname = "ndg-httpsclient"; - propagatedBuildInputs = [ pyopenssl ]; + requiredPythonModules = [ pyopenssl ]; src = fetchFromGitHub { owner = "cedadev"; diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 0a6e5635a4fa1..4f13cc3f27a14 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -11,7 +11,7 @@ buildPythonPackage { disabled = isPy27; inherit (libndtypes) version src meta; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index 631beabea8a2f..663553fbef9fc 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0n74miad4dadavnzi1hqlyzyk795x7qq2adp71i011534ixs70ik"; }; - propagatedBuildInputs = [ numpy quantities ]; + requiredPythonModules = [ numpy quantities ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index 95f567a6c0c66..28523741f8be3 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + requiredPythonModules = stdenv.lib.optionals (pythonOlder "3.7") [ importlib-resources ]; checkInputs = [ glibcLocales pytestCheckHook ]; diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 874ca53d34fb0..59d4ca39264ef 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cftime numpy zlib diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index a26a212d8f7ec..0df2128eda751 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "dcaabf83b204282aacfb213b18799eb7af2d5a6defe529487bbd0548036392fe"; }; - propagatedBuildInputs = [ requests zeroconf netifaces ]; + requiredPythonModules = [ requests zeroconf netifaces ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/networkx/2.2.nix b/pkgs/development/python-modules/networkx/2.2.nix index a4c66048953be..28c8caa4f4256 100644 --- a/pkgs/development/python-modules/networkx/2.2.nix +++ b/pkgs/development/python-modules/networkx/2.2.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ decorator setuptools ]; + requiredPythonModules = [ decorator setuptools ]; meta = { homepage = "https://networkx.github.io/"; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 6075daf584677..a8cd53a93b39d 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0r2wr7aqay9fwjrgk35fkjzk8lvvb4i4df7ndaqzkr4ndw5zzx7q"; }; - propagatedBuildInputs = [ decorator setuptools ]; + requiredPythonModules = [ decorator setuptools ]; checkInputs = [ nose pytest]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/neuronpy/default.nix b/pkgs/development/python-modules/neuronpy/default.nix index 1d258effda7df..1d42f5e87d840 100644 --- a/pkgs/development/python-modules/neuronpy/default.nix +++ b/pkgs/development/python-modules/neuronpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1clhc2b5fy2l8nfrji4dagmj9419nj6kam090yqxhq5c28sngk25"; }; - propagatedBuildInputs = [ numpy matplotlib scipy ]; + requiredPythonModules = [ numpy matplotlib scipy ]; #No tests included doCheck = false; diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index 301d2c7a39471..4cded70ece5c4 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "afb6ba85a5351953578c018fcdb9dfbd62f29a8d46c58bc9652bc000a27223f3"; }; - propagatedBuildInputs = [ twisted ]; + requiredPythonModules = [ twisted ]; checkInputs = [ twisted ]; diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index dc56bf956b740..5bc9e22027067 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "5827b644d1b0833603710dac198f5f8cbb9002769f97001a191e863b32f5956c"; }; - propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ]; + requiredPythonModules = [ numpy scipy h5py packaging pydicom ]; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix index 937e6c1c91bdc..630a4bb00c70b 100644 --- a/pkgs/development/python-modules/nidaqmx/default.nix +++ b/pkgs/development/python-modules/nidaqmx/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "19m9p99qvdmvvqbwmqrqm6b50x7czgrj07gdsxbbgw04shf5bhrs"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy six ] ++ lib.optionals (pythonOlder "3.4") [ diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index c01715470f60d..f6c228a7e4861 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest nose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ joblib matplotlib nibabel diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix index bd3e92e90dbcd..1f69375e5ddf8 100644 --- a/pkgs/development/python-modules/nimfa/default.nix +++ b/pkgs/development/python-modules/nimfa/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "39cff2b86856d03ca8a3d9c38598034ecf1a768c325fd3a728bb9eadb8c6b919"; }; - propagatedBuildInputs = [ numpy scipy ]; + requiredPythonModules = [ numpy scipy ]; checkInputs = [ matplotlib pytest ]; doCheck = !isPy3k; # https://github.com/marinkaz/nimfa/issues/42 diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index fef24e837d1b0..dcbb6ea070d9c 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; buildInputs = stdenv.lib.optional doCheck [ nose ]; - propagatedBuildInputs = [ matplotlib nibabel numpy scipy sympy ]; + requiredPythonModules = [ matplotlib nibabel numpy scipy sympy ]; checkPhase = '' # wants to be run in a different directory mkdir nosetests diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 80ee7691a1a5d..d8c40cf540cce 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { sphinx ]; - propagatedBuildInputs = [ + requiredPythonModules = [ click dateutil etelemetry diff --git a/pkgs/development/python-modules/nipype/neurdflib.nix b/pkgs/development/python-modules/nipype/neurdflib.nix index 0a266ff7bf826..f1f7f56bd65e5 100644 --- a/pkgs/development/python-modules/nipype/neurdflib.nix +++ b/pkgs/development/python-modules/nipype/neurdflib.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "d34493cee15029ff5db16157429585ff863ba5542675a4d8a94a0da1bc6e3a50"; }; - propagatedBuildInputs = [ isodate html5lib SPARQLWrapper ]; + requiredPythonModules = [ isodate html5lib SPARQLWrapper ]; checkInputs = [ networkx nose ]; diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index 8fa40465c10d6..77b2254bf6dfc 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; buildInputs = [ cython ]; - propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ]; + requiredPythonModules = [ numpy scipy matplotlib networkx nibabel ]; checkPhase = "pytest nitime/tests"; diff --git a/pkgs/development/python-modules/nix-kernel/default.nix b/pkgs/development/python-modules/nix-kernel/default.nix index 5758e60fa3fc6..689848777097b 100644 --- a/pkgs/development/python-modules/nix-kernel/default.nix +++ b/pkgs/development/python-modules/nix-kernel/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { --replace "cmdclass={'install': install_with_kernelspec}," "" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ pexpect notebook ]; diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index d4307c659804d..02484854cb73f 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "sha256-STUyMUCWAHfDA6dkpiOqSRBL3/tubedUbWa94Kp/764="; }; - propagatedBuildInputs = [ + requiredPythonModules = [ attrs click effect diff --git a/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/pkgs/development/python-modules/nixpkgs-pytools/default.nix index 401c481411602..a40c00371e58f 100644 --- a/pkgs/development/python-modules/nixpkgs-pytools/default.nix +++ b/pkgs/development/python-modules/nixpkgs-pytools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "11skcbi1lf9qcv9j5ikifb4pakhbbygqpcmv3390j7gxsa85cn19"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ jinja2 setuptools rope diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index 7df6d72c55c44..aefb4282d2cae 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; buildInputs = [ pbr ]; - propagatedBuildInputs = [ pythonix ]; + requiredPythonModules = [ pythonix ]; meta = with stdenv.lib; { description = "Allows to `from nixpkgs import` stuff in interactive Python sessions"; diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 298b32ed8b8eb..51709246c2a3f 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "845365449cd8c5f9731f7cb9f8bd6fd0767553b9d53af9eb1b3abf7700936b35"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click joblib regex diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix index 55f70f74db94a..b5f776853f25c 100644 --- a/pkgs/development/python-modules/nmigen-boards/default.nix +++ b/pkgs/development/python-modules/nmigen-boards/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ setuptools nmigen ]; + requiredPythonModules = [ setuptools nmigen ]; preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" diff --git a/pkgs/development/python-modules/nmigen-soc/default.nix b/pkgs/development/python-modules/nmigen-soc/default.nix index 4c15e65e62b29..d6fc4dc661d9e 100644 --- a/pkgs/development/python-modules/nmigen-soc/default.nix +++ b/pkgs/development/python-modules/nmigen-soc/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ setuptools nmigen ]; + requiredPythonModules = [ setuptools nmigen ]; preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index 4a2327bf9288d..e6800f94edef1 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ setuptools pyvcd jinja2 ]; + requiredPythonModules = [ setuptools pyvcd jinja2 ]; checkInputs = [ pytestCheckHook yosys symbiyosys yices ]; diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index 821a2d1bccfea..cf098cc66a1a7 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "ab45090ae383b716c4ef89e690c41ff8c2b257b85b309f01f3654df3d084bd7c"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools ]; diff --git a/pkgs/development/python-modules/nose-cov/default.nix b/pkgs/development/python-modules/nose-cov/default.nix index 4b94e2657e979..5e455d64f0e88 100644 --- a/pkgs/development/python-modules/nose-cov/default.nix +++ b/pkgs/development/python-modules/nose-cov/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "04j4fw01bv648gimqqj4z88606lcczbm1k326agcc74gb4sh7v4b"; }; - propagatedBuildInputs = [ nose covCore ]; + requiredPythonModules = [ nose covCore ]; meta = with lib; { homepage = "https://pypi.org/project/nose-cov/"; diff --git a/pkgs/development/python-modules/nose-cover3/default.nix b/pkgs/development/python-modules/nose-cover3/default.nix index 7f954f7ebca35..256cbdf915a25 100644 --- a/pkgs/development/python-modules/nose-cover3/default.nix +++ b/pkgs/development/python-modules/nose-cover3/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1la4hhc1yszjpcchvkqk5xmzlb2g1b3fgxj9wwc58qc549whlcc1"; }; - propagatedBuildInputs = [ nose ]; + requiredPythonModules = [ nose ]; # No tests included doCheck = false; diff --git a/pkgs/development/python-modules/nose-exclude/default.nix b/pkgs/development/python-modules/nose-exclude/default.nix index 81204a34bd9c1..b79e08c6b33d3 100644 --- a/pkgs/development/python-modules/nose-exclude/default.nix +++ b/pkgs/development/python-modules/nose-exclude/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"; }; - propagatedBuildInputs = [ nose ]; + requiredPythonModules = [ nose ]; # "OSError: AF_UNIX path too long" for darwin doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/nose-focus/default.nix b/pkgs/development/python-modules/nose-focus/default.nix index d7b13eb1059b4..46723e5d0a083 100644 --- a/pkgs/development/python-modules/nose-focus/default.nix +++ b/pkgs/development/python-modules/nose-focus/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "nose-focus"; version = "0.1.3"; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ nose nose-of-yeti nose-pattern-exclude which ]; diff --git a/pkgs/development/python-modules/nose-of-yeti/default.nix b/pkgs/development/python-modules/nose-of-yeti/default.nix index b7fd1e241aaa7..d94d453cd0e1a 100644 --- a/pkgs/development/python-modules/nose-of-yeti/default.nix +++ b/pkgs/development/python-modules/nose-of-yeti/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "nose-of-yeti"; version = "1.8"; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ nose fudge should-dsl ]; diff --git a/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/pkgs/development/python-modules/nose-pattern-exclude/default.nix index 2170ac224d950..6819abd185cbb 100644 --- a/pkgs/development/python-modules/nose-pattern-exclude/default.nix +++ b/pkgs/development/python-modules/nose-pattern-exclude/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "nose-pattern-exclude"; version = "0.1.3"; - propagatedBuildInputs = [ nose ]; + requiredPythonModules = [ nose ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nose-timer/default.nix b/pkgs/development/python-modules/nose-timer/default.nix index c93f5bda9838a..6e007700b3eb0 100644 --- a/pkgs/development/python-modules/nose-timer/default.nix +++ b/pkgs/development/python-modules/nose-timer/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "09hwjwbczi06bfqgiylb2yxs5h88jdl26zi1fdqxdzvamrkksf2c"; }; - propagatedBuildInputs = [ nose ]; + requiredPythonModules = [ nose ]; meta = with lib; { homepage = "https://github.com/mahmoudimus/nose-timer"; diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index a5ed49a29d73a..ec2087a0753ad 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"; }; - propagatedBuildInputs = [ coverage ]; + requiredPythonModules = [ coverage ]; doCheck = false; # lot's of transient errors, too much hassle checkPhase = if python.is_py3k or false then '' diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 300ed80ca4081..3d275f06cbc67 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0pmbb6nk31yhgh4zkcblzxsznml7f7pf5q1ihgrwvbxv4mwzfql7"; }; - propagatedBuildInputs = [ six coverage ]; + requiredPythonModules = [ six coverage ]; # AttributeError: 'module' object has no attribute 'collector' doCheck = false; diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix index b4683ef12cbf6..fc4b16588b489 100644 --- a/pkgs/development/python-modules/nose_progressive/default.nix +++ b/pkgs/development/python-modules/nose_progressive/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ pillow blessings ]; + requiredPythonModules = [ pillow blessings ]; # fails with obscure error doCheck = !isPy3k; diff --git a/pkgs/development/python-modules/nose_warnings_filters/default.nix b/pkgs/development/python-modules/nose_warnings_filters/default.nix index 81e7de8815ee1..7a5d58806aa0c 100644 --- a/pkgs/development/python-modules/nose_warnings_filters/default.nix +++ b/pkgs/development/python-modules/nose_warnings_filters/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ nose ]; + requiredPythonModules = [ nose ]; checkInputs = [ nose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/nosexcover/default.nix b/pkgs/development/python-modules/nosexcover/default.nix index 84cc4994b08ac..1b3dcd8c0148b 100644 --- a/pkgs/development/python-modules/nosexcover/default.nix +++ b/pkgs/development/python-modules/nosexcover/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "298c3c655da587f6cab8a666e9f4b150320032431062dea91353988d45c8b883"; }; - propagatedBuildInputs = [ coverage nose ]; + requiredPythonModules = [ coverage nose ]; meta = with stdenv.lib; { description = "Extends nose.plugins.cover to add Cobertura-style XML reports"; diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix index 0e5cfdf43971e..544e72c011aef 100644 --- a/pkgs/development/python-modules/notebook/2.nix +++ b/pkgs/development/python-modules/notebook/2.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { checkInputs = [ nose glibcLocales ] ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); - propagatedBuildInputs = [ + requiredPythonModules = [ jinja2 tornado ipython_genutils traitlets jupyter_core send2trash jupyter_client nbformat nbconvert ipykernel terminado requests pexpect prometheus_client diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 04fe19377f8e7..851701fca3090 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { checkInputs = [ nose pytestCheckHook glibcLocales ] ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); - propagatedBuildInputs = [ + requiredPythonModules = [ jinja2 tornado ipython_genutils traitlets jupyter_core send2trash jupyter_client nbformat nbconvert ipykernel terminado requests pexpect prometheus_client argon2_cffi diff --git a/pkgs/development/python-modules/notedown/default.nix b/pkgs/development/python-modules/notedown/default.nix index 8ecbf1f5afab3..3392c0c275c9d 100644 --- a/pkgs/development/python-modules/notedown/default.nix +++ b/pkgs/development/python-modules/notedown/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "36e033ebbbe5aca0fab031ffaf3611d5bc5c50237df68ff81bb95f8be353a1ee"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ notebook nbconvert nbformat diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index 4772fc295349f..55221905f2fb5 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { --replace "loguru==0.4.1" "loguru~=0.5.0" ''; - propagatedBuildInputs = [ alsaUtils libnotify loguru which ]; + requiredPythonModules = [ alsaUtils libnotify loguru which ]; checkInputs = [ alsaUtils libnotify pytest which ]; diff --git a/pkgs/development/python-modules/notify2/default.nix b/pkgs/development/python-modules/notify2/default.nix index 28c74415c5dc1..a5627ff83d5c6 100644 --- a/pkgs/development/python-modules/notify2/default.nix +++ b/pkgs/development/python-modules/notify2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # Tests require Xorg and Dbus instance doCheck = false; - propagatedBuildInputs = [ pygobject3 + requiredPythonModules = [ pygobject3 dbus-python ]; meta = { diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index c2f484cb3a92d..2094114450346 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytest tests/ ''; - propagatedBuildInputs = [ six blinker ]; + requiredPythonModules = [ six blinker ]; checkInputs = [ mock pytest diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index 923f8c1969862..92b868f7a52da 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "0pvd9n7hcmxl9cr8m1xlqcjmy3k2hga0qmn2k3x9hripjis7pbbi"; }; - propagatedBuildInputs = [ textfsm ]; + requiredPythonModules = [ textfsm ]; checkInputs = [ pytestCheckHook ruamel_yaml yamllint ]; diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix index 080734bd25e84..55717a759eb3a 100644 --- a/pkgs/development/python-modules/ntlm-auth/default.nix +++ b/pkgs/development/python-modules/ntlm-auth/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ mock pytest requests unittest2 ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # Functional tests require networking checkPhase = '' diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index bce4c0426e409..29161ef6cb409 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0myc27k087rhgpwn1a1dffzl32rwz6ngdbf3rm2i0zlgcxh4zk9p"; }; - propagatedBuildInputs = [ docopt ]; + requiredPythonModules = [ docopt ]; checkInputs = [ delegator-py pytest ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index ad31b8e960c8c..4415971524575 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - propagatedBuildInputs = [numpy llvmlite] + requiredPythonModules = [numpy llvmlite] ++ stdenv.lib.optionals isPy27 [ funcsigs singledispatch]; # Copy test script into $out and run the test suite. diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 3857e80bbd39a..0689a258be6f2 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { gcc8 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy msgpack ]; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 3e3316788ed13..1582172e967fd 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ln -s ${numpy.cfg} site.cfg ''; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; checkPhase = '' runtest="$(pwd)/numexpr/tests/test_numexpr.py" diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 12710bbab19f8..94f99a21098e0 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkPhase = "py.test"; - propagatedBuildInputs = [ cython numpy nine python-utils enum34 ]; + requiredPythonModules = [ cython numpy nine python-utils enum34 ]; meta = with lib; { description = "Library to make reading, writing and modifying both binary and ascii STL files easy"; diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 0f57847b3a624..1c83804b673d0 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ nose pytest ]; - propagatedBuildInputs = [ sphinx jinja2 ]; + requiredPythonModules = [ sphinx jinja2 ]; meta = { description = "Sphinx extension to support docstrings in Numpy format"; diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix index 624f32fd337b5..b171871052602 100644 --- a/pkgs/development/python-modules/numtraits/default.nix +++ b/pkgs/development/python-modules/numtraits/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ six numpy traitlets]; + requiredPythonModules = [ six numpy traitlets]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 1c25d6acd55be..4848d43aad23e 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -10,7 +10,7 @@ sha256 = "1f2f42f058afd30456e47b6b92a6b7b15100f6bca0a29108ace95bd5147a8e86"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pydsdl ]; diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index b675fa6f06be3..607d489ab15f5 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ installShellFiles docutils ]; - propagatedBuildInputs = [ setuptools toml structlog appdirs tornado pycurl aiohttp ]; + requiredPythonModules = [ setuptools toml structlog appdirs tornado pycurl aiohttp ]; checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ]; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 9e7d4958e3be5..d25fba1c2d37c 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ pep8 nose unittest2 docutils ]; - propagatedBuildInputs = [ blockdiag setuptools ]; + requiredPythonModules = [ blockdiag setuptools ]; # tests fail doCheck = false; diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index aae9b5f743702..f6997e52d4139 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { branchName= "pyusb"; }; - propagatedBuildInputs = [ pyusb pybluez pyfantom git ]; + requiredPythonModules = [ pyusb pybluez pyfantom git ]; # Tests fail on Mac dependency doCheck = false; diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix index 8233b132344f6..0d98db8fef1d9 100644 --- a/pkgs/development/python-modules/oauth2/default.nix +++ b/pkgs/development/python-modules/oauth2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "c006a85e7c60107c7cc6da1b184b5c719f6dd7202098196dfa6e55df669b59bf"; }; - propagatedBuildInputs = [ httplib2 ]; + requiredPythonModules = [ httplib2 ]; buildInputs = [ mock coverage ]; # ServerNotFoundError: Unable to find the server at oauth-sandbox.sevengoslings.net diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/pkgs/development/python-modules/oauth2client/default.nix index dc6e65d95cbf7..63737f0fee879 100644 --- a/pkgs/development/python-modules/oauth2client/default.nix +++ b/pkgs/development/python-modules/oauth2client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "d486741e451287f69568a4d26d70d9acd73a2bbfa275746c535b4209891cccc6"; }; - propagatedBuildInputs = [ six httplib2 pyasn1-modules rsa ]; + requiredPythonModules = [ six httplib2 pyasn1-modules rsa ]; doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 6caaacd963bf7..33b739e00f785 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ globus-sdk mwoauth codecov flake8 pytest pytestcov pytest-tornado requests-mock pyjwt ]; - propagatedBuildInputs = [ jupyterhub ]; + requiredPythonModules = [ jupyterhub ]; disabled = pythonOlder "3.4"; diff --git a/pkgs/development/python-modules/oauthlib/3.1.nix b/pkgs/development/python-modules/oauthlib/3.1.nix index 185ef97486374..08714c2891748 100644 --- a/pkgs/development/python-modules/oauthlib/3.1.nix +++ b/pkgs/development/python-modules/oauthlib/3.1.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ mock pytest ]; - propagatedBuildInputs = [ cryptography blinker pyjwt ]; + requiredPythonModules = [ cryptography blinker pyjwt ]; checkPhase = '' py.test tests/ diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index bc2c8c1094c08..f82e9c9e6c64a 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ mock pytest ]; - propagatedBuildInputs = [ cryptography blinker pyjwt ]; + requiredPythonModules = [ cryptography blinker pyjwt ]; checkPhase = '' py.test tests/ diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index c320f299ddb1e..879683ceb5e16 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "argparse" "" ''; - propagatedBuildInputs = [ pyptlib twisted pycrypto pyyaml ]; + requiredPythonModules = [ pyptlib twisted pycrypto pyyaml ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 860f8c0051e78..173cac752f7f0 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ graphviz ]; + requiredPythonModules = [ graphviz ]; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index 531a80759a06e..c00d2e066c444 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1v1qqk9p12qla85yscq2g413l3qasn6yr4ncyc934465b5p6lxnv"; }; - propagatedBuildInputs = [ defusedxml ]; + requiredPythonModules = [ defusedxml ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix index 7eb4bef73504f..1d89b778bfcf7 100644 --- a/pkgs/development/python-modules/ofxclient/default.nix +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # ImportError: No module named tests doCheck = false; - propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup4 lxml keyring ]; + requiredPythonModules = [ ofxhome ofxparse beautifulsoup4 lxml keyring ]; meta = with stdenv.lib; { homepage = "https://github.com/captin411/ofxclient"; diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix index fbdafc291dc5e..580d12089e503 100644 --- a/pkgs/development/python-modules/ofxparse/default.nix +++ b/pkgs/development/python-modules/ofxparse/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0zn3grc6xhgzcc81qc3dxkkwk731cjjqqhb46smw12lk09cdnigb"; }; - propagatedBuildInputs = [ six beautifulsoup4 lxml ]; + requiredPythonModules = [ six beautifulsoup4 lxml ]; meta = with stdenv.lib; { homepage = "http://sites.google.com/site/ofxparse"; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 4219aad3865f1..a8dd13553bec2 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ pyyaml six ] ++ stdenv.lib.optional isPy27 pathlib2; + requiredPythonModules = [ pyyaml six ] ++ stdenv.lib.optional isPy27 pathlib2; meta = with stdenv.lib; { description = "A framework for configuring complex applications"; diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix index 117b8228d2e54..3818a1d28b2a4 100644 --- a/pkgs/development/python-modules/onkyo-eiscp/default.nix +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "761abb16c654a1136763b927d094174d41f282809e44ea32cd47e199dd79d9c9"; }; - propagatedBuildInputs = [ docopt netifaces ]; + requiredPythonModules = [ docopt netifaces ]; meta = with stdenv.lib; { description = "Control Onkyo receivers over ethernet"; diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 6c0560bbaffcd..62fd1ce7c18ec 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ + requiredPythonModules = [ protobuf numpy six diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index a9598825dd00e..dd7e7d9dadf79 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { install -m644 resources/ant-usb-sticks.rules "$out/etc/udev/rules.d/99-ant-usb-sticks.rules" ''; - propagatedBuildInputs = [ pyusb ]; + requiredPythonModules = [ pyusb ]; meta = with stdenv.lib; { homepage = "https://github.com/Tigge/openant"; diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 02f51bc3e66fd..cdb9a3abc965d 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1jw59mmd3n1d5zihdqz2a3j2axxf3m34lqp1190fw8rlndlilf3r"; }; - propagatedBuildInputs = [ jsonschema pyyaml six setuptools ] + requiredPythonModules = [ jsonschema pyyaml six setuptools ] ++ (lib.optionals (isPy27) [ pathlib ]); checkInputs = [ mock pytest pytestcov pytest-flake8 tox ]; diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix index 9cfe714ef6f2b..21a84bb3cce51 100644 --- a/pkgs/development/python-modules/openidc-client/default.nix +++ b/pkgs/development/python-modules/openidc-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "680e969cae18c30adbddd6a087ed09f6a296b4937b4c8bc69be813bdbbfa9847"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; doCheck = false; diff --git a/pkgs/development/python-modules/openpyxl/2.nix b/pkgs/development/python-modules/openpyxl/2.nix index 73300de645ff4..fea4baa33808a 100644 --- a/pkgs/development/python-modules/openpyxl/2.nix +++ b/pkgs/development/python-modules/openpyxl/2.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ jdcal et_xmlfile lxml ]; + requiredPythonModules = [ jdcal et_xmlfile lxml ]; postPatch = '' # LICENSE.rst is missing, and setup.cfg currently doesn't contain anything useful anyway diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 5a7d2a6425b04..da8e82b62d724 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ jdcal et_xmlfile lxml ]; + requiredPythonModules = [ jdcal et_xmlfile lxml ]; postPatch = '' # LICENSE.rst is missing, and setup.cfg currently doesn't contain anything useful anyway diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index fb7b48e2266fd..8bf0675dbdac2 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -28,7 +28,7 @@ buildPythonApplication (common // rec { nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - propagatedBuildInputs = [ + requiredPythonModules = [ daemonize dbus-python gobject-introspection diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/pkgs/development/python-modules/openrazer/pylib.nix index 2f9ff467b2d9c..c530d0f038e77 100644 --- a/pkgs/development/python-modules/openrazer/pylib.nix +++ b/pkgs/development/python-modules/openrazer/pylib.nix @@ -14,7 +14,7 @@ buildPythonPackage (common // rec { sourceRoot = "source/pylib"; - propagatedBuildInputs = [ + requiredPythonModules = [ dbus-python numpy openrazer-daemon diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index f132614d1ca00..a8501c4e01638 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; checkInputs = [ git ]; - propagatedBuildInputs = [ bitcoinlib GitPython pysha3 ]; + requiredPythonModules = [ bitcoinlib GitPython pysha3 ]; meta = { description = "Create and verify OpenTimestamps proofs"; diff --git a/pkgs/development/python-modules/opentracing/default.nix b/pkgs/development/python-modules/opentracing/default.nix index f499470e25c73..fca49e681aa09 100644 --- a/pkgs/development/python-modules/opentracing/default.nix +++ b/pkgs/development/python-modules/opentracing/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0rcpmhy7hm6ljlm1w455il53s1amq2vii2x1wfkrcx3sj4s0dc9k"; }; - propagatedBuildInputs = lib.optional isPy27 futures; + requiredPythonModules = lib.optional isPy27 futures; checkInputs = [ gevent mock pytest tornado ]; diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix index 5cf070d610fbc..ae2ca61f3d500 100644 --- a/pkgs/development/python-modules/openwebifpy/default.nix +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0zqa74i54ww9qjciiv8s58mxbs6vxq06cq5k4pxfarc0l75l4gh2"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests zeroconf wakeonlan diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix index 935a64b4186ea..910fac82b10d1 100644 --- a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix +++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "packaging==19.1" "packaging" ''; - propagatedBuildInputs = [ click requests packaging ]; + requiredPythonModules = [ click requests packaging ]; meta = { description = '' diff --git a/pkgs/development/python-modules/opt-einsum/2.nix b/pkgs/development/python-modules/opt-einsum/2.nix index 41c4df89f4fcd..721cf657656be 100644 --- a/pkgs/development/python-modules/opt-einsum/2.nix +++ b/pkgs/development/python-modules/opt-einsum/2.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pytest ''; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy ]; diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix index 2ded1dfc19610..ec544ef4ccb31 100644 --- a/pkgs/development/python-modules/opt-einsum/default.nix +++ b/pkgs/development/python-modules/opt-einsum/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0jb5lia0q742d1713jk33vlj41y61sf52j6pgk7pvhxvfxglgxjr"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; checkInputs = [ pytest_4 ]; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 64ed54cafbe20..5c3b83a6ff603 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { cma ]; - propagatedBuildInputs = [ + requiredPythonModules = [ sqlalchemy numpy scipy diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix index 1a3ab347945aa..60440a66c6cb5 100644 --- a/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/pkgs/development/python-modules/orderedmultidict/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ flake8 ]; - propagatedBuildInputs = [ six ] + requiredPythonModules = [ six ] ++ stdenv.lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix index dece359b0c0fa..27f81f51b3211 100644 --- a/pkgs/development/python-modules/orm/default.nix +++ b/pkgs/development/python-modules/orm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1g70cr0559iyqfzidwh6n2qq6d4dcnrr4sg0jkn1s4qzka828mj7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ databases typesystem ]; diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index cae6a468c7766..3747f0c9c1e00 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ bashInteractive ]; # needed for bash-completion helper checkInputs = [ rpm ]; - propagatedBuildInputs = [ urlgrabber m2crypto chardet ]; + requiredPythonModules = [ urlgrabber m2crypto chardet ]; postInstall = '' ln -s $out/bin/osc-wrapper.py $out/bin/osc diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index 6012398db982b..124ca51b6f0df 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { sed -e '/TLSTests/d' -e '/TrustListTests/d' -i tests/__init__.py ''; - propagatedBuildInputs = [ + requiredPythonModules = [ asn1crypto openssl ]; diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index 856c2bb45dbc9..7b2a518360d4c 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1k3y5kl4k93vxaxyanc040x44s2fyyc3m1ndy2j3kg0037z8ad4z"; }; - propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ]; + requiredPythonModules = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ]; checkInputs = [ coverage pytest coveralls ]; #Fails when using sandboxing as it requires internet connection, works fine without it diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix index 981feb3880837..b418cb1a580b0 100644 --- a/pkgs/development/python-modules/osmpythontools/default.nix +++ b/pkgs/development/python-modules/osmpythontools/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "8a33adbd266127e342d12da755075fae08f398032a6f0909b5e86bef13960a85"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ beautifulsoup4 geojson lxml diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 88189493a62fe..4cb4ca7a37781 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; dontUseCmakeConfigure = true; - propagatedBuildInputs = [ + requiredPythonModules = [ future numpy scipy diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index 6e7593cec1c3a..88c95b1aaab1b 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ attrs ]; + requiredPythonModules = [ attrs ]; # Has a test dependency on trio, which depends on outcome. doCheck = false; diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index c82668008eaba..ed3144d2a0b5a 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ dateutil pyproj pytz requests pyyaml ]; + requiredPythonModules = [ dateutil pyproj pytz requests pyyaml ]; # 'tests' dir not included in pypy distribution archive. doCheck = false; diff --git a/pkgs/development/python-modules/oyaml/default.nix b/pkgs/development/python-modules/oyaml/default.nix index 9ea527e06f19b..fd1493b84adf3 100644 --- a/pkgs/development/python-modules/oyaml/default.nix +++ b/pkgs/development/python-modules/oyaml/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0qkj8g87drvjqiqqmz36gyqiczdfcfv8zk96kkifzk4f9dl5f02j"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyyaml ]; diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index abe58d03ef37e..7dc3973e2b0fd 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"; }; - propagatedBuildInputs = [ pyparsing six ]; + requiredPythonModules = [ pyparsing six ]; checkInputs = [ pytest pretend ]; diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 1552148ae37bb..21225c85ab045 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "e333fb5ce45a3f283ddeb6261d061b39328b82eb440a89233fa08ce3fec2fcf0"; }; nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ pytest pytestrunner diff --git a/pkgs/development/python-modules/pafy/default.nix b/pkgs/development/python-modules/pafy/default.nix index c657a2fa1b12f..d2f9054a6365f 100644 --- a/pkgs/development/python-modules/pafy/default.nix +++ b/pkgs/development/python-modules/pafy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { # No tests included in archive doCheck = false; - propagatedBuildInputs = [ youtube-dl ]; + requiredPythonModules = [ youtube-dl ]; meta = with lib; { description = "A library to download YouTube content and retrieve metadata"; diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix index 92adfb9d3f16a..fcf1306dc3c7a 100644 --- a/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/pkgs/development/python-modules/pandas-datareader/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "pandas_datareader" ]; - propagatedBuildInputs = [ pandas lxml requests ]; + requiredPythonModules = [ pandas lxml requests ]; meta = with stdenv.lib; { description = "Up to date remote data access for pandas, works for multiple versions of pandas"; diff --git a/pkgs/development/python-modules/pandas/2.nix b/pkgs/development/python-modules/pandas/2.nix index e4f65a94dc53a..3142a35e2e510 100644 --- a/pkgs/development/python-modules/pandas/2.nix +++ b/pkgs/development/python-modules/pandas/2.nix @@ -43,7 +43,7 @@ in buildPythonPackage rec { nativeBuildInputs = [ cython ]; buildInputs = optional isDarwin libcxx; - propagatedBuildInputs = [ + requiredPythonModules = [ dateutil scipy numexpr diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 9d2d32d428afa..bd24ecec089bc 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -42,7 +42,7 @@ in buildPythonPackage rec { nativeBuildInputs = [ cython ]; buildInputs = optional isDarwin libcxx; - propagatedBuildInputs = [ + requiredPythonModules = [ beautifulsoup4 bottleneck dateutil diff --git a/pkgs/development/python-modules/pandoc-attributes/default.nix b/pkgs/development/python-modules/pandoc-attributes/default.nix index d4da8e3cac622..6732f08c6d2fd 100644 --- a/pkgs/development/python-modules/pandoc-attributes/default.nix +++ b/pkgs/development/python-modules/pandoc-attributes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "69221502dac74f5df1317011ce62c85a83eef5da3b71c63b1908e98224304a8c"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pandocfilters ]; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 0fc7bf7ee2917..d6741af7c3dc7 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "2e86d82bdd5e7664bf49558eedad62b664d5403ec9e422e5ddfcf69e3bd77318"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ bokeh param pyviz-comms diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 0e5c62277af29..85d2b1667de3a 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { sha256 = "ecd4cafa9179693b0eedc3b6f4560f9ee47826a6e366e42bfa3cc20f7931b3f8"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ ansiwrap click future diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index c439b4099a003..ea25c51078a26 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "7959305128fea6da8ca0cdc528783a89859dacb9b54bf8eb89fd04a518872191"; }; - propagatedBuildInputs = [ boto3 requests ]; + requiredPythonModules = [ boto3 requests ]; # tries to use /homeless-shelter to mimic container usage, etc doCheck = false; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 93eafff6c93b7..42f3922e927df 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "0bbkjyw1fsvvp0380l404h2lys8ib4xqga5s6401k1y1hld28nl6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests filetype pyparsing configparser arxiv2bib pyyaml chardet beautifulsoup4 colorama bibtexparser click python-slugify habanero isbnlib diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 41951f1d89328..4f961a80f69db 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { }) ]; checkInputs = [ invoke pytest mock pytest-relaxed ]; - propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; + requiredPythonModules = [ bcrypt cryptography pynacl pyasn1 ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 430d91a60ecc8..8ca19f840bdac 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0917211c0f083f344e7f1bc997e0d713dbc147b6380bc19f606119394f820b9a"; }; - propagatedBuildInputs = [ numpy scipy six decorator ]; + requiredPythonModules = [ numpy scipy six decorator ]; meta = with stdenv.lib; { description = "Parameterization framework for parameterized model creation and handling"; diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index a6dacf0402ee2..28ab024a1d020 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ tqdm aiohttp aioftp diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index cbf4ee0836e48..c4e9d4fbc213f 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ parse six ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + requiredPythonModules = [ parse six ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; checkPhase = '' py.test tests diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 0b7d5cd6fb4c2..94850ec7f1942 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; meta = with stdenv.lib; { description = "Parse human-readable date/time text"; diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index 319f83f727552..c4cbeede58675 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ six w3lib lxml cssselect ] ++ lib.optionals isPy27 [ functools32 ]; + requiredPythonModules = [ six w3lib lxml cssselect ] ++ lib.optionals isPy27 [ functools32 ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index 69e6d1d2bb2cc..3bf24283074cc 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { homepage = "https://github.com/erikrose/parsimonious"; diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 584b4b4315c71..43f1718edd1e2 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ locket numpy pandas pyzmq toolz ]; + requiredPythonModules = [ locket numpy pandas pyzmq toolz ]; checkPhase = '' rm partd/tests/test_zmq.py # requires network & fails diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix index 268e90020100c..bf86599262692 100644 --- a/pkgs/development/python-modules/parver/default.nix +++ b/pkgs/development/python-modules/parver/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3"; }; - propagatedBuildInputs = [ six attrs arpeggio ]; + requiredPythonModules = [ six attrs arpeggio ]; checkInputs = [ pytest hypothesis pretend ]; meta = { diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 316abb2ac32cf..672b1498a841e 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ bcrypt argon2_cffi ]; + requiredPythonModules = [ bcrypt argon2_cffi ]; meta = { description = "A password hashing library for Python"; diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 5b12f04b2e5a3..f486a229a7785 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1csqn7g9b05hp3fgd82355k4pb5rv12k9x6p2mdw2v01m385171p"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytestrunner pytest ]; diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index ce012c3d102aa..40b71924e48de 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ six paste PasteDeploy cheetah ]; + requiredPythonModules = [ six paste PasteDeploy cheetah ]; doCheck = false; diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix index 46601c1675538..2d4891b366ad2 100644 --- a/pkgs/development/python-modules/patator/default.nix +++ b/pkgs/development/python-modules/patator/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "335e432e6cc591437e316ba8c1da935484ca39fc79e595ccf60ccd9166e965f1"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ paramiko pycurl ajpy diff --git a/pkgs/development/python-modules/path.py/2.nix b/pkgs/development/python-modules/path.py/2.nix index fb4ff20b7076f..2285190475e8e 100644 --- a/pkgs/development/python-modules/path.py/2.nix +++ b/pkgs/development/python-modules/path.py/2.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ importlib-metadata ] ++ lib.optional isPy27 backports_os ; diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 56e856cff9af3..6228b909647f2 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-flake8 glibcLocales packaging ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ importlib-metadata ] ++ lib.optional isPy27 backports_os ; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 6e04f2e7a0303..6ef9058d1c46b 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"; }; - propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; + requiredPythonModules = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; checkInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock; preCheck = '' diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 2b9134750fe2f..7dd3111554c32 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "21ae2cb1d5a76dcf57d5fe93ae8719c7339f467e246163650c08ccf35b87c846"; }; - propagatedBuildInputs = [ dill pox ppft multiprocess ]; + requiredPythonModules = [ dill pox ppft multiprocess ]; # Require network doCheck = false; diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix index bd3c103b9a746..bdcd9e7d6d714 100644 --- a/pkgs/development/python-modules/patsy/default.nix +++ b/pkgs/development/python-modules/patsy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ nose parameterized ]; checkPhase = "nosetests -v"; - propagatedBuildInputs = [ + requiredPythonModules = [ six numpy scipy diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index ec4a40fec1b4e..bc95ecd580246 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ cogapp mock virtualenv ]; - propagatedBuildInputs = [ nose ]; + requiredPythonModules = [ nose ]; # the tests do not pass doCheck = false; diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix index 26c44f0b070be..35a29b106f907 100644 --- a/pkgs/development/python-modules/paypalrestsdk/default.nix +++ b/pkgs/development/python-modules/paypalrestsdk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "238713208031e8981bf70b3350b3d7f85ed64d34e0f21e4c1184444a546fee7f"; }; - propagatedBuildInputs = [ requests six pyopenssl ]; + requiredPythonModules = [ requests six pyopenssl ]; meta = { homepage = "https://developer.paypal.com/"; diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 64430ca7e1f08..dd1c051bd8999 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake swig git setuptools scikit-build ]; buildInputs = [ boost pc-ble-driver ]; - propagatedBuildInputs = [ enum34 wrapt future ]; + requiredPythonModules = [ enum34 wrapt future ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index b9342821b209c..4cde4940c18a3 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "pdf2image"; version = "1.14.0"; - propagatedBuildInputs = [ pillow poppler_utils ]; + requiredPythonModules = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 9bc8f89157017..36bdfff17dd23 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1a2fxxnnjqbx344znpvx7cnv1881dk6585ibw01inhfq3w6yj2lr"; }; - propagatedBuildInputs = [ chardet cryptography sortedcontainers ]; + requiredPythonModules = [ chardet cryptography sortedcontainers ]; checkInputs = [ nose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pdfposter/default.nix b/pkgs/development/python-modules/pdfposter/default.nix index 43e2f1f57f752..b2545613e4634 100644 --- a/pkgs/development/python-modules/pdfposter/default.nix +++ b/pkgs/development/python-modules/pdfposter/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "pdftools.pdfposter"; version = "0.7.post1"; - propagatedBuildInputs = [ pypdf2 ]; + requiredPythonModules = [ pypdf2 ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index d2397fb5c82bd..b3d0c1a07ba43 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sed -i -e "s|pdfminer2|pdfminer.six|" setup.py ''; - propagatedBuildInputs = [ pdfminer chardet ]; + requiredPythonModules = [ pdfminer chardet ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 332f5153a9811..e4a05eac9deac 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sha256 = "4b2acd6802a04b59e306d0a6ccf37701d24376f4dc044bbbafba3afdf9d3389a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ logutils Mako singledispatch diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index ee3d08a173c3a..8d2c82bec6f09 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { cython # compile speedups ]; - propagatedBuildInputs = [ + requiredPythonModules = [ apsw # sqlite performance improvement ] ++ (lib.optional withPostgres psycopg2) ++ (lib.optional withMysql mysql-connector); diff --git a/pkgs/development/python-modules/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix index 92a0d064f49c4..f467ed475b599 100644 --- a/pkgs/development/python-modules/pefile/default.nix +++ b/pkgs/development/python-modules/pefile/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pefile"; version = "2019.4.18"; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 30d6546d5705b..08c05a9f9801f 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typogrify ]; - propagatedBuildInputs = [ + requiredPythonModules = [ jinja2 pygments docutils pytz unidecode six dateutil feedgenerator blinker pillow beautifulsoup4 markupsafe lxml ]; diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 5688090b09584..c1c53a53fc59a 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -1,7 +1,6 @@ { lib, fetchPypi, buildPythonPackage, pythonOlder , dateutil , importlib-metadata -, poetry , poetry-core , pytzdata , typing @@ -22,7 +21,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ dateutil pytzdata ] + requiredPythonModules = [ dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index a563665698449..0831a0136c350 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { flit-core ]; - propagatedBuildInputs = [ + requiredPythonModules = [ toml ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata zipp diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 5f6ef894d8ff5..bef1539910925 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0937rnk3c2z1jkdmbw9hfm80p5k467q7rqhn6slfiprs4kflgpd1"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ flake8-polyfill ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix index eddf58e559dca..48ea2d0b13c6a 100644 --- a/pkgs/development/python-modules/percol/default.nix +++ b/pkgs/development/python-modules/percol/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "7a649c6fae61635519d12a6bcacc742241aad1bff3230baef2cedd693ed9cfe8"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with lib; { homepage = "https://github.com/mooz/percol"; diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 371eff249c2d7..a535f4b9421c8 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }; format = "pyproject"; - propagatedBuildInputs = [ + requiredPythonModules = [ dufte matplotlib numpy diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index ea42f7ea7fefe..ede8de0219f1a 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "periodictable"; version = "1.5.3"; - propagatedBuildInputs = [numpy pyparsing]; + requiredPythonModules = [numpy pyparsing]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 0979afa92f4a9..f343319258b6c 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "be4ea4bfc2a0c6fcfc28ebd52e23a351ee00b0ef0ddaf527526bd0f919145348"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ scikitlearn numpy matplotlib diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index 07ba3ecd1cf96..871b38490c22c 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "4.6.4"; nativeBuildInputs = [ sphinx manuel ]; - propagatedBuildInputs = [ zope_interface cffi ]; + requiredPythonModules = [ zope_interface cffi ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index aead62913c7bd..e87671c85f65b 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -17,7 +17,7 @@ buildPythonPackage (rec { # Wants to run pythonin a subprocess doCheck = false; - propagatedBuildInputs = [ ptyprocess ]; + requiredPythonModules = [ ptyprocess ]; meta = with lib; { homepage = "http://www.noah.org/wiki/Pexpect"; diff --git a/pkgs/development/python-modules/pg8000/1_12.nix b/pkgs/development/python-modules/pg8000/1_12.nix index bc4ff9f4f0318..d4ff4547de39b 100644 --- a/pkgs/development/python-modules/pg8000/1_12.nix +++ b/pkgs/development/python-modules/pg8000/1_12.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1yc3knh28cx3rjb2ifg5kmqqa78yyyw2gzzslbm9fj0mzh5aq1sx"; }; - propagatedBuildInputs = [ pytz six ]; + requiredPythonModules = [ pytz six ]; meta = with stdenv.lib; { homepage = "https://github.com/tlocke/pg8000"; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 0c94597721869..94f5ae3a45791 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "8fc1e6a62ccb7c9830f1e7e9288e2d20eaf373cc8875b5c55b7d5d9b7717be91"; }; - propagatedBuildInputs = [ passlib scramp ]; + requiredPythonModules = [ passlib scramp ]; meta = with stdenv.lib; { homepage = "https://github.com/tlocke/pg8000"; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 032524fc5df35..71f6e99421185 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.6") [ aenum ]; + requiredPythonModules = [ setuptools ] ++ lib.optionals (pythonOlder "3.6") [ aenum ]; checkInputs = [ pytest pytestcov ]; diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix index 9067817a3ba94..878f568efe7a6 100644 --- a/pkgs/development/python-modules/pgpy/default.nix +++ b/pkgs/development/python-modules/pgpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1v2b1dyq1sl48d2gw7vn4hv6sasd9ihpzzcq8yvxj9dgfak2y663"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six pyasn1 cryptography diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix index f7212493e59c6..ef909f0dbe015 100644 --- a/pkgs/development/python-modules/pgsanity/default.nix +++ b/pkgs/development/python-modules/pgsanity/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; checkInputs = [ postgresql ]; - propagatedBuildInputs = [ postgresql ]; + requiredPythonModules = [ postgresql ]; meta = with stdenv.lib; { homepage = "https://github.com/markdrago/pgsanity"; diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 61ab5532ca9d2..fd6dc2dfab06f 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ click sqlparse psycopg2 ]; + requiredPythonModules = [ click sqlparse psycopg2 ]; checkPhase = '' find tests -name \*.pyc -delete diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index b309fb287d803..6e5a7f6daa171 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { jupyter_client ]; - propagatedBuildInputs = [ + requiredPythonModules = [ joblib numpy scipy diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 1a768b7cf57fc..2d27c9b8e3be8 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "28864b04adb900597705f1367a100da869af835088bdd13f1693c4382259f128"; }; - propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; + requiredPythonModules = [ numpy pyyaml matplotlib h5py spglib ]; checkInputs = [ pytestCheckHook ]; # flakey due to floating point inaccuracy diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index bbb4fcf19934a..0f5e823dd1522 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0pn842jcf2czjks5dphivgp1s7wiifqiv93s0a89h0wxafd6pbsr"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ ipaddress ]; diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix index 496d20d52e3c1..1b32c096f8ff9 100644 --- a/pkgs/development/python-modules/pickleshare/default.nix +++ b/pkgs/development/python-modules/pickleshare/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"; }; - propagatedBuildInputs = [ pathpy ] + requiredPythonModules = [ pathpy ] ++ stdenv.lib.optional (pythonOlder "3.4") pathlib2; # No proper test suite diff --git a/pkgs/development/python-modules/picos/default.nix b/pkgs/development/python-modules/picos/default.nix index a6f1aa1a141d3..cc259dad70343 100644 --- a/pkgs/development/python-modules/picos/default.nix +++ b/pkgs/development/python-modules/picos/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { networkx ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy cvxopt ]; diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index 667a8e3b73711..29ed86b6f7e08 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0b5anpsq16xkiisws95jif5s5mplkl1kdnhy0w0i6m0zcy50jnxq"; }; - propagatedBuildInputs = [ pygments ]; + requiredPythonModules = [ pygments ]; checkInputs = [ nose ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix index c13490fb3e805..b03538c2b5c7d 100644 --- a/pkgs/development/python-modules/pika-pool/default.nix +++ b/pkgs/development/python-modules/pika-pool/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # Tests require database connections doCheck = false; - propagatedBuildInputs = [ pika ]; + requiredPythonModules = [ pika ]; meta = with stdenv.lib; { homepage = "https://github.com/bninja/pika-pool"; license = licenses.bsdOriginal; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 3db9a2642c7c2..1712ee79ab6ea 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { python-xmp-toolkit ]; - propagatedBuildInputs = [ defusedxml lxml ]; + requiredPythonModules = [ defusedxml lxml ]; postPatch = '' sed -i \ diff --git a/pkgs/development/python-modules/pillow/6.nix b/pkgs/development/python-modules/pillow/6.nix index 64f162c24eb7b..5ad3d231fd9a3 100644 --- a/pkgs/development/python-modules/pillow/6.nix +++ b/pkgs/development/python-modules/pillow/6.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { runHook postCheck ''; - propagatedBuildInputs = [ olefile ]; + requiredPythonModules = [ olefile ]; checkInputs = [ pytest pytestrunner pyroma numpy ]; diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index ab971e4201b52..fb3bbc5e6ddcd 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { # Disable darwin tests which require executables: `iconutil` and `screencapture` disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ]; - propagatedBuildInputs = [ olefile ]; + requiredPythonModules = [ olefile ]; checkInputs = [ pytestCheckHook pyroma numpy ]; diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/pkgs/development/python-modules/pillowfight/default.nix index ed0daf123d469..4e1e789caadba 100644 --- a/pkgs/development/python-modules/pillowfight/default.nix +++ b/pkgs/development/python-modules/pillowfight/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "913869b0563c5982bcf08cb1ea56fb0f87e3573d738e3e3692301bf45dba6252"; }; - propagatedBuildInputs = [ pillow ]; + requiredPythonModules = [ pillow ]; meta = with stdenv.lib; { description = "Eases the transition from PIL to Pillow for Python packages"; diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 76eaa4fac698e..aac1827fdf305 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ slicerator six numpy tifffile scikitimage ]; + requiredPythonModules = [ slicerator six numpy tifffile scikitimage ]; # not everything packaged with pypi release doCheck = false; diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index bb2a20cf62f3d..4b505fae88fe8 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ packaging ] + requiredPythonModules = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # Test suite explicitly requires pytest diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 104619711a724..1a649291af498 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; checkInputs = [ pytest git glibcLocales mock ]; - propagatedBuildInputs = [ pip click six setuptools_scm ]; + requiredPythonModules = [ pip click six setuptools_scm ]; disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) [ # Depend on network tests: diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 35fbb624e6b79..688e0fa776434 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ wheel ]; - propagatedBuildInputs = [ + requiredPythonModules = [ appdirs requests ] ++ lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 3b35b67bf091e..5e38858eeb472 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "0lq8dfkq4ji11r4k5csqzyv0757fbxiax6ixn94f9747zrikssf6"; }; - propagatedBuildInputs = [ userpath argcomplete packaging ]; + requiredPythonModules = [ userpath argcomplete packaging ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pkuseg/default.nix b/pkgs/development/python-modules/pkuseg/default.nix index 3b1c2bd5bce4d..8c7be4dc999bf 100644 --- a/pkgs/development/python-modules/pkuseg/default.nix +++ b/pkgs/development/python-modules/pkuseg/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; pythonImportsCheck = [ "pkuseg" ]; diff --git a/pkgs/development/python-modules/pkutils/default.nix b/pkgs/development/python-modules/pkutils/default.nix index d674e876b147d..5c0e64e5ca42a 100644 --- a/pkgs/development/python-modules/pkutils/default.nix +++ b/pkgs/development/python-modules/pkutils/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "01yaq9sz6vyxk8yiss6hsmy70qj642cr2ifk0sx1mlh488flcm62"; }; - propagatedBuildInputs = [ semver ]; + requiredPythonModules = [ semver ]; # Remove when https://github.com/reubano/pkutils/pull/4 merged postPatch = '' diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 96e7335604721..ed5b0d2eb9cb5 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # Integration tests require API keys and internet access checkPhase = "py.test -rxs ./tests/unit"; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; meta = { description = "Python client library for the Plaid API and Link"; diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 262bdceb5db75..12a06dc11b3d6 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { py.test ''; - propagatedBuildInputs = [ plaster PasteDeploy ]; + requiredPythonModules = [ plaster PasteDeploy ]; checkInputs = [ pytest pytestcov ]; } diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index b9a4fb34bf650..5b4d1758fc3df 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1l955q1q6lljq3bmyiayr33gzxrlw16xdwgjdaflznvyg16fcjkk"; }; - propagatedBuildInputs = [ requests tqdm websocket_client ]; + requiredPythonModules = [ requests tqdm websocket_client ]; checkInputs = [ pytest pillow ]; diff --git a/pkgs/development/python-modules/plexauth/default.nix b/pkgs/development/python-modules/plexauth/default.nix index 91407a907a449..22b143f2cd1e6 100644 --- a/pkgs/development/python-modules/plexauth/default.nix +++ b/pkgs/development/python-modules/plexauth/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1wbrn22iywl4ccz64r3w3f17k0r7vi2cqkqd2mrdkx5xqhscn9hz"; }; - propagatedBuildInputs = [ aiohttp ]; + requiredPythonModules = [ aiohttp ]; # package does not include tests doCheck = false; diff --git a/pkgs/development/python-modules/plexwebsocket/default.nix b/pkgs/development/python-modules/plexwebsocket/default.nix index 47e7778fc0fe4..c7ade8332e05b 100644 --- a/pkgs/development/python-modules/plexwebsocket/default.nix +++ b/pkgs/development/python-modules/plexwebsocket/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1xdzb268c71yb25a5mk4g2jrbq4dv8bynfirs7p4n8a51p030dz6"; }; - propagatedBuildInputs = [ aiohttp ]; + requiredPythonModules = [ aiohttp ]; # package does not include tests doCheck = false; diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index c951800454dda..85de5285cea20 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "082b03aebe81d0bdcc44a917a795ae60d3add2c2abbee11e7c335fb13d5e7ca7"; }; - propagatedBuildInputs = [ six setuptools zope_testing ]; + requiredPythonModules = [ six setuptools zope_testing ]; # Huge amount of testing dependencies (including Zope2) doCheck = false; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index cc33babd64ba9..d08d5f97de6a8 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "257f530ffd73754bd008454826905657b329053364597479bb9774437a396837"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ decorator nbformat pytz diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index ecb01f252f431..41d151745888d 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ importlib-metadata ]; + requiredPythonModules = [ importlib-metadata ]; meta = { description = "Plugin and hook calling mechanisms for Python"; diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index b0936a50baa7a..6d61414f082fb 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "59a25845d00a51098e6c9147c3c96ce89ad97395e256a4fabb4aed7cf7db5541"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; meta = with lib; { description = "NumPy-based text/binary PLY file reader/writer for Python"; diff --git a/pkgs/development/python-modules/plyplus/default.nix b/pkgs/development/python-modules/plyplus/default.nix index 4b9f1a9a0841f..d5d0803f78c21 100644 --- a/pkgs/development/python-modules/plyplus/default.nix +++ b/pkgs/development/python-modules/plyplus/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "0g3flgfm3jpb2d8v9z0qmbwca5gxdqr10cs3zvlfhv5cs06ahpnp"; }; - propagatedBuildInputs = [ ply ]; + requiredPythonModules = [ ply ]; doCheck = !isPy3k; diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix index 48504c8a3ee26..034dac5dfbe6e 100644 --- a/pkgs/development/python-modules/podcats/default.nix +++ b/pkgs/development/python-modules/podcats/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { --replace 'debug=True' 'debug=True, use_reloader=False' ''; - propagatedBuildInputs = [ flask mutagen ]; + requiredPythonModules = [ flask mutagen ]; meta = { description = "Application that generates RSS feeds for podcast episodes from local audio files"; diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 6f96a611168cd..d79d53de1ef46 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { intreehooks ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + requiredPythonModules = lib.optionals (pythonOlder "3.8") [ importlib-metadata ] ++ lib.optionals isPy27 [ pathlib2 diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 8000c667e6db2..19d2f50d012fb 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeBuildInputs = [ intreehooks ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cachecontrol cachy cleo diff --git a/pkgs/development/python-modules/polyline/default.nix b/pkgs/development/python-modules/polyline/default.nix index f1dcd699527a7..65aeb2f987d4d 100644 --- a/pkgs/development/python-modules/polyline/default.nix +++ b/pkgs/development/python-modules/polyline/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0x60lm3ccq9zrcqlzyk041xgr1mi0k9lzyyv3cbbdiq9kb88jzvw"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ flake8 nose ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index c3d5638841d60..03c23fa055645 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "070ciwww1lhjmfwd5n1kcwgxwbgdfvmhjs4l156bnf08z9dlrafl"; }; - propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; + requiredPythonModules = [ numpy scipy cython networkx joblib pyyaml ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/ponywhoosh/default.nix b/pkgs/development/python-modules/ponywhoosh/default.nix index 589be17b0163e..bcc7aa8850c57 100644 --- a/pkgs/development/python-modules/ponywhoosh/default.nix +++ b/pkgs/development/python-modules/ponywhoosh/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1mggj9d265hra4z67qyla686qvl0cf79655cszi136gh9hqlibv9"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pony whoosh ]; diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 378035bb7a51a..af2361c97b92f 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1k2vinlhkzl7lzhvbz20x3a2r2zqqila0yxg3a3fax2r6qxbxxzi"; }; - propagatedBuildInputs = [ packaging appdirs requests ]; + requiredPythonModules = [ packaging appdirs requests ]; checkInputs = [ pytestCheckHook ]; disabledTests = [ diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 6f12a9e69810b..de86ca5350da4 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { buildInputs = [ qtbase.dev poppler ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ sip pyqt5.dev ]; + requiredPythonModules = [ sip pyqt5.dev ]; # no tests, just bindings for `poppler_qt5` doCheck = false; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index b5650f7dda017..c1204256f03b4 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ tempora ]; + requiredPythonModules = [ tempora ]; checkInputs = [ pytest pytest-black pytestcov ]; diff --git a/pkgs/development/python-modules/potr/default.nix b/pkgs/development/python-modules/potr/default.nix index adcb71104676e..d25b542d14427 100644 --- a/pkgs/development/python-modules/potr/default.nix +++ b/pkgs/development/python-modules/potr/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "f95b9a7feaf8e3a6aaa898609f8a2ada55518cf52fc09152775c4c59c99b8ea6"; }; - propagatedBuildInputs = [ pycrypto ]; + requiredPythonModules = [ pycrypto ]; meta = with stdenv.lib; { description = "A pure Python OTR implementation"; diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 65325f70b4509..bc3d07c7ff04b 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "0xscckcbw75pbcl4546ndrjs4682pn2sqqrd6qvqm0s6zswg7a0y"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ socat psutil hglib diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index d8e8f33181f64..1bd63476ecaf8 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "9e2173042edd5cc9c7bee0d7731873f17fcdce0e42e4b7ab68857d0de7b631fc"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # darwin seems to hang doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index 706c6251d3ac7..efd0111b3d7c8 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { sphinx # docbuild, called by make ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cython cysignals gmpy2 diff --git a/pkgs/development/python-modules/pproxy/default.nix b/pkgs/development/python-modules/pproxy/default.nix index 9f97d7df13560..fe07b1cf1227d 100644 --- a/pkgs/development/python-modules/pproxy/default.nix +++ b/pkgs/development/python-modules/pproxy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "0g3cyi5lzakhs5p3fpwywbl8jpapnr8890zw9w45dqg8k0svc1fi"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pycryptodome uvloop ]; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 1b762fed05964..4e9697cd86c25 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytestrunner ]; - propagatedBuildInputs = [ + requiredPythonModules = [ chardet pyyaml requests diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix index 6c2201d1f1d22..c9fdaccb32943 100644 --- a/pkgs/development/python-modules/praw/6.3.nix +++ b/pkgs/development/python-modules/praw/6.3.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pytestrunner ]; - propagatedBuildInputs = [ + requiredPythonModules = [ mock prawcore update_checker diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 698c9cc1ccf62..fffc3531788ac 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pytestrunner ]; - propagatedBuildInputs = [ + requiredPythonModules = [ mock prawcore update_checker diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 7be75eae90a52..974c40eb526be 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1f1eafc8a65d671f9892354f73142014fbb5d3a9ee621568c662d0a354e0578b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests ]; diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 88fb6e3abf91d..6bd9ce22935fc 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ./languages-use-the-hardcoded-path-to-python-binaries.patch ]; - propagatedBuildInputs = [ + requiredPythonModules = [ aspy-yaml cached-property cfgv diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index a3ca7d15c77ed..ff1be0321601f 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "preggy"; version = "1.4.4"; - propagatedBuildInputs = [ six unidecode ]; + requiredPythonModules = [ six unidecode ]; checkInputs = [ nose yanc ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index c69ec9a05a1f4..c829fd86d9779 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ mock nose ]; - propagatedBuildInputs = [ cachetools cssselect cssutils lxml requests ]; + requiredPythonModules = [ cachetools cssselect cssutils lxml requests ]; meta = { description = "Turns CSS blocks into style attributes "; diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index c408782a423b4..cdc08c007dc51 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "8ad47d5d2688fabc66850f32c7b6d3b4a97e6b653726309fe09603edd6fceb23"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cython cymem murmurhash diff --git a/pkgs/development/python-modules/prison/default.nix b/pkgs/development/python-modules/prison/default.nix index 941da2bf9afd2..10fa0f90813cc 100644 --- a/pkgs/development/python-modules/prison/default.nix +++ b/pkgs/development/python-modules/prison/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "14vb468iznf9416z993bbqihywp9ibyslw5vp67wfr200zyxjwak"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six ]; diff --git a/pkgs/development/python-modules/privacyidea/default.nix b/pkgs/development/python-modules/privacyidea/default.nix index 84cc4530b34e7..522f19b3e43ce 100644 --- a/pkgs/development/python-modules/privacyidea/default.nix +++ b/pkgs/development/python-modules/privacyidea/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "188ki924dig899wlih45xfsm0s7mjkya56vii26bg02h91izrb4b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cryptography pyrad pymysql python-dateutil flask-versioned flask_script defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel diff --git a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix index ec87186a4fddd..ced50dee43342 100644 --- a/pkgs/development/python-modules/privacyidea/ldap-proxy.nix +++ b/pkgs/development/python-modules/privacyidea/ldap-proxy.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1kc1n9wr1a66xd5zvl6dq78xnkqkn5574jpzashc99pvm62dr24j"; }; - propagatedBuildInputs = [ twisted ldaptor configobj ]; + requiredPythonModules = [ twisted ldaptor configobj ]; # python 2 zope.interface test import path issues doCheck = false; diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix index 9d4ae92f2c105..4925abf64547a 100644 --- a/pkgs/development/python-modules/proboscis/default.nix +++ b/pkgs/development/python-modules/proboscis/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "b822b243a7c82030fce0de97bdc432345941306d2c24ef227ca561dd019cd238"; }; - propagatedBuildInputs = [ nose ]; + requiredPythonModules = [ nose ]; doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/proglog/default.nix b/pkgs/development/python-modules/proglog/default.nix index ef5c21f450d52..eef54555136bd 100644 --- a/pkgs/development/python-modules/proglog/default.nix +++ b/pkgs/development/python-modules/proglog/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "13diln950wk6nnn4rpmzx37rvrnpa7f803gwygiwbq1q46zwri6q"; }; - propagatedBuildInputs = [ tqdm ]; + requiredPythonModules = [ tqdm ]; meta = with stdenv.lib; { description = "Logs and progress bars manager for Python"; diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 23ebc93545992..5a29034ec083e 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "ef72be284e7f2b61ac0894b44165926f13f5d995b2bf3cd8a8dedc6224b255a7"; }; - propagatedBuildInputs = [ python-utils ]; + requiredPythonModules = [ python-utils ]; nativeBuildInputs = [ pytestrunner ]; checkInputs = [ pytest sphinx flake8 pytestpep8 pytest-flakes pytestcov diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix index 68668812fc8a9..3eb22701a195e 100644 --- a/pkgs/development/python-modules/promise/default.nix +++ b/pkgs/development/python-modules/promise/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { --replace '"futures",' "" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ gevent six ]; diff --git a/pkgs/development/python-modules/prompt_toolkit/1.nix b/pkgs/development/python-modules/prompt_toolkit/1.nix index bc39a8c922977..4c900327ed729 100644 --- a/pkgs/development/python-modules/prompt_toolkit/1.nix +++ b/pkgs/development/python-modules/prompt_toolkit/1.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; checkInputs = [ pytest ]; - propagatedBuildInputs = [ docopt six wcwidth pygments ]; + requiredPythonModules = [ docopt six wcwidth pygments ]; meta = { description = "Python library for building powerful interactive command lines"; diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index 2fa885a69f719..6e725af89ea5d 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; checkInputs = [ pytest ]; - propagatedBuildInputs = [ six wcwidth ]; + requiredPythonModules = [ six wcwidth ]; meta = { description = "Python library for building powerful interactive command lines"; diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix index ad47163e48422..0bd004cc5c7d2 100644 --- a/pkgs/development/python-modules/property-manager/default.nix +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1v7hjm7qxpgk92i477fjhpcnjgp072xgr8jrgmbrxfbsv4cvl486"; }; - propagatedBuildInputs = [ coloredlogs humanfriendly verboselogs ]; + requiredPythonModules = [ coloredlogs humanfriendly verboselogs ]; checkInputs = [ pytest pytestcov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix index ad7e4aa4af6e1..98883a42ea2ac 100644 --- a/pkgs/development/python-modules/protego/default.nix +++ b/pkgs/development/python-modules/protego/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "a682771bc7b51b2ff41466460896c1a5a653f9a1e71639ef365a72e66d8734b4"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index a32ee79bd19a8..4abb5d90864e1 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "cee328fc3da159ebbbdf15da6fb0b3bfe79ca32b075d208ff2a033854f6b324a"; }; - propagatedBuildInputs = [ protobuf ]; + requiredPythonModules = [ protobuf ]; checkInputs = [ pytestCheckHook google_api_core ]; diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index ab95eeb51f914..cd64eb6f6bd37 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ google_apputils ]; + requiredPythonModules = [ google_apputils ]; propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. nativeBuildInputs = [ google_apputils pyext ]; buildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index 1dfc671c532b0..77e77eddfd4df 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ lxml networkx dateutil diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix index 1cc2ab89360f4..202f4b12305b4 100644 --- a/pkgs/development/python-modules/prox-tv/default.nix +++ b/pkgs/development/python-modules/prox-tv/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { nose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy cffi ]; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index b439c05f0b87e..091391a1abd8a 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ fonttools lxml fs ]; + requiredPythonModules = [ fonttools lxml fs ]; checkInputs = [ pytest pytestcov pytest_xdist pytest-randomly ]; checkPhase = "pytest tests"; diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 783905c702413..6c72df8384379 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "dece6327b5aa03b53163c63e2bf90b4a7b0ff6872ef743adab140a59cb2318ff"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ docopt pillow ] ++ lib.optionals isPy27 [ enum34 ]; diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 85ba8838f667f..d56526e786f88 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "34814eb410f854c823be4c4a34124e1dc8ca696da1c1fa611f9da606c5a8a609"; }; - propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ] + requiredPythonModules = [ appdirs prompt_toolkit docopt jedi pygments ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # no tests to run diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 789a9484d7304..302e7a1982b07 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1p2qizb35f9lfhklldzrn8g9mwiar3zmpc44463h5n1ln40ymw78"; }; - propagatedBuildInputs = [ pygments urwid ]; + requiredPythonModules = [ pygments urwid ]; # Tests fail on python 3 due to writes to the read-only home directory doCheck = !isPy3k; diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 73d367f5eb11a..563a1b60c3938 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "5bbe53f854fb3b689e4faacac5bdb5fa576cb270fc12c78edef827dd46a4fb50"; }; - propagatedBuildInputs = [ pyparsing amply ]; + requiredPythonModules = [ pyparsing amply ]; # only one test that requires an extra doCheck = false; diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix index 2807611f49338..1128ec07a0cd3 100644 --- a/pkgs/development/python-modules/pure-eval/default.nix +++ b/pkgs/development/python-modules/pure-eval/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ toml ]; + requiredPythonModules = [ toml ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pure-python-adb/default.nix b/pkgs/development/python-modules/pure-python-adb/default.nix index c562f20e5ecbc..4d685643e229b 100644 --- a/pkgs/development/python-modules/pure-python-adb/default.nix +++ b/pkgs/development/python-modules/pure-python-adb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0kdr7w2fhgjpcf1k3l6an9im583iqkr6v8hb4q1zw30nh3bqkk0f"; }; - propagatedBuildInputs = [ aiofiles ]; + requiredPythonModules = [ aiofiles ]; # Disable tests as they require docker, docker-compose and a dedicated # android emulator doCheck = false; diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix index 43fd5b71ca6c7..672413a8e08c8 100644 --- a/pkgs/development/python-modules/purl/default.nix +++ b/pkgs/development/python-modules/purl/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0vi7xdm2xc1rbqrz5jwpr7x7dnkcrbjf1mb4w1q2c2f8jca0kk0g"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix index 68c9d9180dc8f..3f23cfa4ac7ad 100644 --- a/pkgs/development/python-modules/pushbullet/default.nix +++ b/pkgs/development/python-modules/pushbullet/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; }; - propagatedBuildInputs = [ requests websocket_client python_magic ]; + requiredPythonModules = [ requests websocket_client python_magic ]; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/pushover-complete/default.nix b/pkgs/development/python-modules/pushover-complete/default.nix index 33769af319d6e..e7a65b2881035 100644 --- a/pkgs/development/python-modules/pushover-complete/default.nix +++ b/pkgs/development/python-modules/pushover-complete/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "8a8f867e1f27762a28a0832c33c6003ca54ee04c935678d124b4c071f7cf5a1f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests six ]; diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix index 72d38259129e3..f1be762d92679 100644 --- a/pkgs/development/python-modules/pushover/default.nix +++ b/pkgs/development/python-modules/pushover/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "dee1b1344fb8a5874365fc9f886d9cbc7775536629999be54dfa60177cf80810"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # tests require network doCheck = false; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index f9d97c2110550..1b1140e8a9a90 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; checkInputs = [ pytestCheckHook flaky mock pytest-mock ]; - propagatedBuildInputs = [ numpy pandas pytz six requests ]; + requiredPythonModules = [ numpy pandas pytz six requests ]; # Skip a few tests that try to access some URLs pytestFlagsArray = [ "pvlib/tests" ]; diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix index aba58b54c3b53..257cfc9b61e03 100644 --- a/pkgs/development/python-modules/pweave/default.nix +++ b/pkgs/development/python-modules/pweave/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { disabled = !isPy3k; buildInputs = [ mock pkgs.glibcLocales ]; - propagatedBuildInputs = [ matplotlib nbconvert markdown ]; + requiredPythonModules = [ matplotlib nbconvert markdown ]; # fails due to trying to run CSS as test doCheck = false; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index fa4e4cc94191a..932d8f0fa1162 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { sed -i 's/unicorn>=1.0.2rc1,<1.0.2rc4/unicorn>=1.0.2rc1/' setup.py ''; - propagatedBuildInputs = [ + requiredPythonModules = [ Mako packaging pysocks diff --git a/pkgs/development/python-modules/pxml/default.nix b/pkgs/development/python-modules/pxml/default.nix index 229b174adec27..c282c27a2b8a6 100644 --- a/pkgs/development/python-modules/pxml/default.nix +++ b/pkgs/development/python-modules/pxml/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0c9zzfv6ciyf9qm7556wil45xxgykg1cj8isp1b88gimwcb2hxg4"; }; - propagatedBuildInputs = [ blessings six ]; + requiredPythonModules = [ blessings six ]; checkInputs = [ nose coverage ]; # test_prefixedWhitespace fails due to a python3 StringIO issue requiring diff --git a/pkgs/development/python-modules/py-multibase/default.nix b/pkgs/development/python-modules/py-multibase/default.nix index b229361917f68..bf23868d73338 100644 --- a/pkgs/development/python-modules/py-multibase/default.nix +++ b/pkgs/development/python-modules/py-multibase/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pytestrunner ]; - propagatedBuildInputs = [ + requiredPythonModules = [ morphys six python-baseconv diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix index e9bf5bcd48cea..0dd7f4422ffc1 100644 --- a/pkgs/development/python-modules/py-multihash/default.nix +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pytestrunner ]; - propagatedBuildInputs = [ + requiredPythonModules = [ base58 morphys six diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index 2f4a60b420aaa..778220c53f660 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "f05cecaa9fc009515086d04b6117324f30eedf1a196f67fb1ec360a9dbdad4ee"; }; - propagatedBuildInputs = [ cryptography ]; + requiredPythonModules = [ cryptography ]; checkInputs = [ flake8 mock nose pytest ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index a99dacf6204be..acd33911ed08e 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { }; doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ pytz requests tzlocal i3ipc pydbus pygobject3 pyserial setuptools dbus-python ]; buildInputs = [ file ]; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index c82f18d377d31..446dd55310d2e 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }; checkInputs = [ httpretty parameterized pytestCheckHook ]; - propagatedBuildInputs = [ cryptography deprecated pyjwt requests ]; + requiredPythonModules = [ cryptography deprecated pyjwt requests ]; # Test suite makes REST calls against github.com doCheck = false; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 2ecdfb17aa2d3..238d8389b5f59 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "ce42d84442ff2ce4918de6550cf377253f61e28e4fac2634495683d12df66d00"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; meta = with lib; { homepage = "https://github.com/eternnoir/pyTelegramBotAPI"; diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix index 79d09daba9cc5..daae62657c678 100644 --- a/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; - propagatedBuildInputs = [ numpy six ]; + requiredPythonModules = [ numpy six ]; meta = with lib; { description = "A Python string matching library including string tokenizers and string similarity measures"; diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix index 75b0964e259db..47823e408ac6e 100644 --- a/pkgs/development/python-modules/pyacoustid/default.nix +++ b/pkgs/development/python-modules/pyacoustid/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0c3dsnfyldnsmyzczp5s5aqvbzcn360s0h4l3gm3k53lg57f762z"; }; - propagatedBuildInputs = [ requests audioread ]; + requiredPythonModules = [ requests audioread ]; postPatch = '' sed -i \ diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix index 4deee467f84e4..d7d2e6a207f72 100644 --- a/pkgs/development/python-modules/pyaftership/default.nix +++ b/pkgs/development/python-modules/pyaftership/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "057dwzacc0lmsq00ipfbnxkq4rc2by8glmza6s8i6dzi1cc68v98"; }; - propagatedBuildInputs = [ aiohttp async-timeout ]; + requiredPythonModules = [ aiohttp async-timeout ]; # No tests doCheck = false; diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 084852fa5371d..faacd2877fe2c 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry ]; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp numpy pysmb diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix index 3703b5fcca4c1..8984d017c2d76 100644 --- a/pkgs/development/python-modules/pyalgotrade/default.nix +++ b/pkgs/development/python-modules/pyalgotrade/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "7927c87af202869155280a93ff6ee934bb5b46cdb1f20b70f7407337f8541cbd"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ matplotlib numpy python-dateutil pytz requests retrying scipy six tornado tweepy ws4py ]; diff --git a/pkgs/development/python-modules/pyamf/default.nix b/pkgs/development/python-modules/pyamf/default.nix index 1c31efadff7ce..6a2250b5dbd28 100644 --- a/pkgs/development/python-modules/pyamf/default.nix +++ b/pkgs/development/python-modules/pyamf/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1r3lp9gkph48g9lijby5rs5daa3lhxs204r14zw4kvp3hf4xcm84"; }; - propagatedBuildInputs = [ defusedxml ]; + requiredPythonModules = [ defusedxml ]; meta = with stdenv.lib; { description = "AMF (Action Message Format) support for Python"; diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index f229ef5839e91..d3d2248841a83 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "3ceb38ffd86e29774e759486f2961599c8ed847459c68727493cadeaf115a38a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy pytest diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 524d34c68d4a6..85d5c377471a3 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "29a5c2a68660a799103d6949167bd6c7953d031449d08802386372de1db6ad71"; }; - propagatedBuildInputs = [ pyyaml ]; + requiredPythonModules = [ pyyaml ]; checkInputs = [ unidecode ]; diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index a2dd4eaf7cf0a..bd43c3f0bee6e 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ six mypy-extensions ] + requiredPythonModules = [ six mypy-extensions ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 82f8f5da3d9c9..87086f77325cc 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sourceRoot = "apache-arrow-${version}/python"; nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; - propagatedBuildInputs = [ numpy six ]; + requiredPythonModules = [ numpy six ]; checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; PYARROW_BUILD_TYPE = "release"; diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 87e72e1ae5bdd..0aa193dbbe8e3 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e"; }; - propagatedBuildInputs = [ pyasn1 ]; + requiredPythonModules = [ pyasn1 ]; checkInputs = [ pytest diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 971b43147c6c8..19117dab65b89 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { --replace "oauthlib==3.1.0" "oauthlib" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ oauthlib requests requests_oauthlib diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index adec3bd07b31c..fb5e18beb3319 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner]; - propagatedBuildInputs = [ + requiredPythonModules = [ aiozeroconf srptools aiohttp diff --git a/pkgs/development/python-modules/pyavm/default.nix b/pkgs/development/python-modules/pyavm/default.nix index 4535767a69c9d..76105bf2a2664 100644 --- a/pkgs/development/python-modules/pyavm/default.nix +++ b/pkgs/development/python-modules/pyavm/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "f298b864e5bc101ecbb0e46252e95e18a180ac28ba6ec362e63c12a7e914e386"; }; - propagatedBuildInputs = [ astropy-helpers ]; + requiredPythonModules = [ astropy-helpers ]; checkInputs = [ pytest astropy pillow ]; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 045cf19c8c001..22e73e6f07e64 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "click==6.7" "click" ''; - propagatedBuildInputs = [ lxml click ]; + requiredPythonModules = [ lxml click ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index d48fed13543bc..d14732b558f0e 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "c430b36751dd89820c867aadd0130bbe8ce007ee570cbe91bb23012fb6f52e87"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index d6d66e754952a..54b68a6f6784e 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "a084172ae5b26a5f26b17186ade98400cda52d9244d9f0b329041741ea82b5db"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click num2words numpy diff --git a/pkgs/development/python-modules/pyblosxom/default.nix b/pkgs/development/python-modules/pyblosxom/default.nix index dfb3e94ba2765..fd61ae3e1a60b 100644 --- a/pkgs/development/python-modules/pyblosxom/default.nix +++ b/pkgs/development/python-modules/pyblosxom/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0de9a7418f4e6d1c45acecf1e77f61c8f96f036ce034493ac67124626fd0d885"; }; - propagatedBuildInputs = [ pygments markdown ]; + requiredPythonModules = [ pygments markdown ]; # FAIL:test_generate_entry and test_time # both tests fail due to time issue that doesn't seem to matter in practice diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index 47c70758e4cac..b80e1460b47cb 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { version = "unstable-20160819"; pname = "pybluez"; - propagatedBuildInputs = [ pkgs.bluez ]; + requiredPythonModules = [ pkgs.bluez ]; src = fetchFromGitHub { owner = "karulis"; diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index c5e239ab89737..fac3e5d3fe161 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "e983c9ffc0734c2e5a7c2adf5d0d0dfe399d94157c590ef70fad765f882c341f"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; meta = with stdenv.lib; { description = "Python package for controlling Neato pybotvac Connected vacuum robot"; diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix index fe5ace886ac08..27cf7dd986569 100644 --- a/pkgs/development/python-modules/pybrowserid/default.nix +++ b/pkgs/development/python-modules/pybrowserid/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1qvi79kfb8x9kxkm5lw2mp42hm82cpps1xknmsb5ghkwx1lpc8kc"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix index dd258f4271885..a7ee30e239759 100644 --- a/pkgs/development/python-modules/pybtex/default.nix +++ b/pkgs/development/python-modules/pybtex/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "pybtex"; doCheck = false; - propagatedBuildInputs = [ latexcodec pyyaml ]; + requiredPythonModules = [ latexcodec pyyaml ]; src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 8cc9d173e0f58..737e2f3b9e5e5 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { xorg.libX11 ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; patches = [ # make sure X11 and OpenGL can be found at runtime diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index a0a0ff76337b1..2a1b3562e034c 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ beautifulsoup4 lxml cssutils future enum34 six ]; + requiredPythonModules = [ beautifulsoup4 lxml cssutils future enum34 six ]; # Tests not included in pypi (?) doCheck = false; diff --git a/pkgs/development/python-modules/pycarddav/default.nix b/pkgs/development/python-modules/pycarddav/default.nix index 674c9e9af86bf..46e0c07dbec7f 100644 --- a/pkgs/development/python-modules/pycarddav/default.nix +++ b/pkgs/development/python-modules/pycarddav/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "0avkrcpisfvhz103v7vmq2jd83hvmpqrb4mlbx6ikkk1wcvclsx8"; }; - propagatedBuildInputs = [ vobject lxml requests urwid pyxdg ]; + requiredPythonModules = [ vobject lxml requests urwid pyxdg ]; meta = with stdenv.lib; { description = "Command-line interface carddav client"; diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index e233d8d70884f..ec05d0619310f 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ c-ares ]; - propagatedBuildInputs = [ cffi ]; + requiredPythonModules = [ cffi ]; checkPhase = '' ${python.interpreter} tests/tests.py diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix index d366486c8f895..b8ef794ac0132 100644 --- a/pkgs/development/python-modules/pycassa/default.nix +++ b/pkgs/development/python-modules/pycassa/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # running doCheck = false; - propagatedBuildInputs = [ thrift' ]; + requiredPythonModules = [ thrift' ]; meta = { description = "A python client library for Apache Cassandra"; diff --git a/pkgs/development/python-modules/pycategories/default.nix b/pkgs/development/python-modules/pycategories/default.nix index 55f30f9e55a97..576b2c8fc588c 100644 --- a/pkgs/development/python-modules/pycategories/default.nix +++ b/pkgs/development/python-modules/pycategories/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # Is private because the author states it's unmaintained # and shouldn't be used in production code - propagatedBuildInputs = [ (callPackage ./infix.nix { }) ]; + requiredPythonModules = [ (callPackage ./infix.nix { }) ]; checkInputs = [ pytest pytestcov ]; diff --git a/pkgs/development/python-modules/pychef/default.nix b/pkgs/development/python-modules/pychef/default.nix index 6d60573b96eb1..4360ee99edd1c 100644 --- a/pkgs/development/python-modules/pychef/default.nix +++ b/pkgs/development/python-modules/pychef/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0zdz8lw545cd3a34cpib7mdwnad83gr2mrrxyj3v74h4zhwabhmg"; }; - propagatedBuildInputs = [ six requests mock unittest2 ]; + requiredPythonModules = [ six requests mock unittest2 ]; # FIXME doCheck = false; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index ce72850fffd78..ca76596608b51 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ requests zeroconf protobuf casttube ]; + requiredPythonModules = [ requests zeroconf protobuf casttube ]; meta = with lib; { description = "Library for Python 3.4+ to communicate with the Google Chromecast"; diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index a51aa1b931aa7..11db70b00d0f9 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; checkPhase = '' pytest Test/ diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index a30c1cd344b47..5cf576a5291f9 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { --replace 'python-jose[cryptography]' 'python-jose' ''; - propagatedBuildInputs = [ + requiredPythonModules = [ boto3 envs python-jose diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index cb0431be61f87..07d91f668e285 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "65c19204cb7aece4aae30c44b5e08beecb9c118370a9f9994d6cddaee17c351d"; }; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; postPatch = '' substituteInPlace ./pycoin/cmds/tx.py --replace '"gpg"' '"${gnupg}/bin/gpg"' diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 4015f9164e9de..b0b2e4cc0978a 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1rp4wlvfywgk3v6l3hnhjx61x9yqawvvivpq4dig2jj71k3mpsyj"; }; - propagatedBuildInputs = [ numpy dateutil ]; + requiredPythonModules = [ numpy dateutil ]; # Some tests fail because they refer to test data files that don't exist # (upstream packaging issue) diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 330acab3e1d0b..fd42cf5c8a4ab 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ pyparsing decorator six future ]; + requiredPythonModules = [ pyparsing decorator six future ]; meta = with stdenv.lib; { description = "Allows to declare constraints on function parameters and return values"; diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index a9a302cf51bd4..d26c5ad3832a9 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { echo "from setuptools import setup; setup(name='${pname}', version='${version}', install_requires=['pycryptodome'])" > setup.py ''; - propagatedBuildInputs = [ pycryptodome ]; + requiredPythonModules = [ pycryptodome ]; # Our dummy has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index b2314e6edfeb8..5d8ca824da06d 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = !isPy27; checkInputs = [ pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ param pyyaml requests diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 3876485dd966b..35fc3861ec19b 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { py.test ''; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy pytools pytest diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 371bfba2f0f9e..5a90cff79982a 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ ujson email_validator typing-extensions diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix index 09f777b018132..ee46383038fa0 100644 --- a/pkgs/development/python-modules/pydbus/default.nix +++ b/pkgs/development/python-modules/pydbus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0b0gipvz7vcfa9ddmwq2jrx16d4apb0hdnl5q4i3h8jlzwp1c1s2"; }; - propagatedBuildInputs = [ pygobject3 ]; + requiredPythonModules = [ pygobject3 ]; meta = { homepage = "https://github.com/LEW21/pydbus"; diff --git a/pkgs/development/python-modules/pydenticon/default.nix b/pkgs/development/python-modules/pydenticon/default.nix index db04991e6ebc0..04af70f01bfa8 100644 --- a/pkgs/development/python-modules/pydenticon/default.nix +++ b/pkgs/development/python-modules/pydenticon/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "2ef363cdd6f4f0193ce62257486027e36884570f6140bbde51de72df321b77f1"; }; - propagatedBuildInputs = [ pillow mock ]; + requiredPythonModules = [ pillow mock ]; meta = with stdenv.lib; { homepage = "https://github.com/azaghal/pydenticon"; diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index e6602ba9da2c1..c859e035f5ef1 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "594c91f715c415ef439f498351ae68fb770c776fc5aa72f3c87eb500dc2a7470"; }; - propagatedBuildInputs = [ numpy pillow ]; + requiredPythonModules = [ numpy pillow ]; checkInputs = [ pytest pytestrunner pytestCheckHook ]; disabledTests = [ "test_invalid_bit_depth_raises" ]; diff --git a/pkgs/development/python-modules/pydocstyle/2.nix b/pkgs/development/python-modules/pydocstyle/2.nix index 21e39b68d12c2..dcfe78134f9cf 100644 --- a/pkgs/development/python-modules/pydocstyle/2.nix +++ b/pkgs/development/python-modules/pydocstyle/2.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1h0k8lpx14svc8dini62j0kqiam10pck5sdzvxa4xhsx7y689g5l"; }; - propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser; + requiredPythonModules = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser; checkInputs = [ pytest pytestpep8 mock ] ++ lib.optional (pythonOlder "3.4") pathlib; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index cef9e96442516..e1acdaad7affe 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "03z8miyppm2xncrc9yjilwl7z5c5cpv51zha580v64p8sb2l0j7j"; }; - propagatedBuildInputs = [ snowballstemmer ]; + requiredPythonModules = [ snowballstemmer ]; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/pydocumentdb/default.nix b/pkgs/development/python-modules/pydocumentdb/default.nix index 7a78730d39b05..f59f34c6da05a 100644 --- a/pkgs/development/python-modules/pydocumentdb/default.nix +++ b/pkgs/development/python-modules/pydocumentdb/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { touch changelog.md ''; - propagatedBuildInputs = [ six requests ]; + requiredPythonModules = [ six requests ]; # requires an active Azure Cosmos service doCheck = false; diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 0a637a48ba2f8..d40048df0a0c1 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { --replace "test_graphviz_regression_tests" "no_test_graphviz_regression_tests" ''; - propagatedBuildInputs = [ pyparsing ]; + requiredPythonModules = [ pyparsing ]; checkInputs = [ chardet ]; diff --git a/pkgs/development/python-modules/pydotplus/default.nix b/pkgs/development/python-modules/pydotplus/default.nix index bb25ecd85e26f..4051f3fba5824 100644 --- a/pkgs/development/python-modules/pydotplus/default.nix +++ b/pkgs/development/python-modules/pydotplus/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1i05cnk3yh722fdyaq0asr7z9xf7v7ikbmnpxa8j6pdqx6g5xs4i"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyparsing graphviz ]; diff --git a/pkgs/development/python-modules/pydrive/default.nix b/pkgs/development/python-modules/pydrive/default.nix index aa0515323e292..3e52c7fff9b2d 100644 --- a/pkgs/development/python-modules/pydrive/default.nix +++ b/pkgs/development/python-modules/pydrive/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "11q7l94mb34hfh9wkdwfrh5xw99y13wa33ba7xp1q23q4b60v2c3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ google_api_python_client oauth2client pyyaml diff --git a/pkgs/development/python-modules/pydsdl/default.nix b/pkgs/development/python-modules/pydsdl/default.nix index 655adecd5c898..09da40a35dbc5 100644 --- a/pkgs/development/python-modules/pydsdl/default.nix +++ b/pkgs/development/python-modules/pydsdl/default.nix @@ -12,7 +12,7 @@ sha256 = "03kbpzdrjzj5vpgz5rhc110pm1axdn3ynv88b42zq6iyab4k8k1x"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ ]; # allow for writable directory for darwin diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix index 82556ac1a7104..35b06da3c97dc 100644 --- a/pkgs/development/python-modules/pydy/default.nix +++ b/pkgs/development/python-modules/pydy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy sympy diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index c6bc941046d5c..dcf0473082bd5 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "fc81c2116f8573e559dfbb8d73e03d9f73c22d0770559f406516984302e07e70"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; buildInputs = [ cython ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 1c82f7c9d630d..fb44426728b9d 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "ce0915d7acd771fde6e8c2dce8ad0cb0e6f7c4fa8430cc96e3e7134e99aeb12f"; }; - propagatedBuildInputs = [ enchant2 ]; + requiredPythonModules = [ enchant2 ]; postPatch = let libext = stdenv.hostPlatform.extensions.sharedLibrary; diff --git a/pkgs/development/python-modules/pyepsg/default.nix b/pkgs/development/python-modules/pyepsg/default.nix index 2e0b2c282a26c..c3455d04d0236 100644 --- a/pkgs/development/python-modules/pyepsg/default.nix +++ b/pkgs/development/python-modules/pyepsg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "2d08fad1e7a8b47a90a4e43da485ba95705923425aefc4e2a3efa540dbd470d7"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; doCheck = false; diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix index 15014cdafd289..59be311a9fa9e 100644 --- a/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "00f15f4bae2947de49b3206f2600f78780008e044380f7aafe0ce52969cda4ca"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ lml ]; diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix index b923932ec5743..9f802053b2808 100644 --- a/pkgs/development/python-modules/pyexcel-ods/default.nix +++ b/pkgs/development/python-modules/pyexcel-ods/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "f61b56515fd4ccd4687f0a112422f74ce8535247ad2da49db90038d7e3ed397c"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyexcel-io odfpy ]; diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix index 34d11830e5707..c3d31abed423b 100644 --- a/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "c4cc1fb4ac5d1682a44d9a368a43ec2e089ad6fc46884648ccfad46863e3da0a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyexcel-io xlrd xlwt diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix index d62302c9c234b..86f5031e86f15 100644 --- a/pkgs/development/python-modules/pyexcel/default.nix +++ b/pkgs/development/python-modules/pyexcel/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "36588573ccb1c86e1a8869e1e9f6b31975a38c13803f015a197c18efd2e685ad"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ lml pyexcel-io texttable diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index 68afbafef3082..5052cff5a44b0 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "a3e22a4d31429f0d5b9ff50aaac3fb47e4f7da678b6b0439a7b91ef40675f88d"; }; - propagatedBuildInputs = [ setuptools six traits ]; + requiredPythonModules = [ setuptools six traits ]; doCheck = false; # Needs X server diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 399d889db2b85..8090228c48dcf 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "eda8af04ba4da4fd63fdc35a62e0e41dfc06aa1a511728dfbdd7707e3b382855"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with lib; { homepage = "https://github.com/mdshw5/pyfaidx"; diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix index 8fdb051a4846e..1255d25adebe8 100644 --- a/pkgs/development/python-modules/pyfcm/default.nix +++ b/pkgs/development/python-modules/pyfcm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # pyfcm's unit testing suite requires network access doCheck = false; diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index c8dc83b4eba51..2fa3e7617124b 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ fftw fftwFloat fftwLongDouble]; - propagatedBuildInputs = [ numpy scipy cython dask ]; + requiredPythonModules = [ numpy scipy cython dask ]; # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix index e71550867a3dd..cf186abd8b273 100644 --- a/pkgs/development/python-modules/pyfribidi/default.nix +++ b/pkgs/development/python-modules/pyfribidi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { patches = stdenv.lib.optional stdenv.cc.isClang ./pyfribidi-clang.patch; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { description = "A simple wrapper around fribidi"; diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index 7c5dfecd269b2..52f85019d31e4 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0ncyv8svw0fhs01ijjkb1gcinb3jpyjvv9xw1bhnf4ri7b27g6ww"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests ]; diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index 4cb6138d5ebb4..ffe541bffcff2 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "14mkwk44bgm6s4kqagz7nm6p6gsygmksl2628jaqh7ppblxca9as"; }; - propagatedBuildInputs = [ pyusb pyserial ]; + requiredPythonModules = [ pyusb pyserial ]; pythonImportsCheck = [ "pyftdi" ]; diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index 721d279478d6d..f0a8b673e9b5b 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ mock psutil ]; - propagatedBuildInputs = [ pyopenssl pysendfile ]; + requiredPythonModules = [ pyopenssl pysendfile ]; # impure filesystem-related tests cause timeouts # on Hydra: https://hydra.nixos.org/build/84374861 diff --git a/pkgs/development/python-modules/pyfttt/default.nix b/pkgs/development/python-modules/pyfttt/default.nix index 8592d9b0aeefa..583bd69c817b7 100644 --- a/pkgs/development/python-modules/pyfttt/default.nix +++ b/pkgs/development/python-modules/pyfttt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "10iq7c9c832ssl2xrvf62xf7znfvqzax6sq8ppsibq6wpb8dlnj5"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # tests need a server to run against doCheck = false; diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index eb5403c2b9685..b87dc3360a7c4 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { rm fxa/tests/test_core.py ''; - propagatedBuildInputs = [ + requiredPythonModules = [ pyjwt requests cryptography pybrowserid hawkauthlib six ]; diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index b02b604342528..35518be6b0d82 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" ''; - propagatedBuildInputs = [ cairosvg tinycss cssselect ] + requiredPythonModules = [ cairosvg tinycss cssselect ] ++ stdenv.lib.optionals (!isPyPy) [ lxml ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pygbm/default.nix b/pkgs/development/python-modules/pygbm/default.nix index 0d2747c1cb46d..0c8bb1a0108f0 100644 --- a/pkgs/development/python-modules/pygbm/default.nix +++ b/pkgs/development/python-modules/pygbm/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1qg2md86d0z5aa6jn8kj3rxsippsqsccx1dbraspdsdkycncvww3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ scipy numpy numba diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index c2c5ca826bcff..417663cba110a 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { libgit2 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cached-property ] ++ lib.optional (!isPyPy) cffi; diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index a37872d909450..24499ca8d2dd1 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { EOF ''; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; # needs an X server. Keep an eye on # https://bitbucket.org/pyglet/pyglet/issues/219/egl-support-headless-rendering diff --git a/pkgs/development/python-modules/pygments-better-html/default.nix b/pkgs/development/python-modules/pygments-better-html/default.nix index 87b8e0b3ffb74..22fb09cad8945 100644 --- a/pkgs/development/python-modules/pygments-better-html/default.nix +++ b/pkgs/development/python-modules/pygments-better-html/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "028szd3k295yhz943bj19i4kx6f0pfh1fd2q14id0g84dl4i49dm"; }; - propagatedBuildInputs = [ pygments ]; + requiredPythonModules = [ pygments ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix index 8f41995cf395e..922f12c4e7a8d 100644 --- a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix +++ b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1pzb5wy23q3fhs0rqzasjnw6hdzwjngpakb73i98cn0b8lk8q4jc"; }; - propagatedBuildInputs = [ pygments ]; + requiredPythonModules = [ pygments ]; doCheck = false; diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index d846cc4f18c72..af77927af6971 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -13,7 +13,7 @@ }: let - propagatedBuildInputs = [ numpy cloudpickle ipyparallel numba ]; + requiredPythonModules = [ numpy cloudpickle ipyparallel numba ]; pagmo2WithPython = pagmo2.overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ @@ -21,7 +21,7 @@ let "-DPAGMO_BUILD_PAGMO=no" "-DPagmo_DIR=${pagmo2}" ]; - buildInputs = [ eigen nlopt ipopt boost pagmo2 ] ++ propagatedBuildInputs; + buildInputs = [ eigen nlopt ipopt boost pagmo2 ] ++ requiredPythonModules; postInstall = '' mv wheel $out ''; @@ -31,7 +31,7 @@ in buildPythonPackage { pname = "pygmo"; version = pagmo2WithPython.version; - inherit propagatedBuildInputs; + inherit requiredPythonModules; src = pagmo2WithPython; diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 378419cc835b1..5d93ebd1bde75 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { --replace "env.get(\"GMT_LIBRARY_PATH\", \"\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")" ''; - propagatedBuildInputs = [ numpy netcdf4 pandas packaging xarray ]; + requiredPythonModules = [ numpy netcdf4 pandas packaging xarray ]; doCheck = false; # requires network access diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 6e34e7f910070..4593b1d7465b0 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -19,7 +19,8 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ]; buildInputs = [ glib gobject-introspection ] ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; - propagatedBuildInputs = [ pycairo cairo ]; + propagatedBuildInputs = [ cairo ]; + requiredPythonModules = [ pycairo ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/pkgs/development/python-modules/pygpgme/default.nix index 4322e76e3e74c..513a9e8f74059 100644 --- a/pkgs/development/python-modules/pygpgme/default.nix +++ b/pkgs/development/python-modules/pygpgme/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ gpgme ]; + requiredPythonModules = [ gpgme ]; meta = with stdenv.lib; { homepage = "https://launchpad.net/pygpgme"; diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix index bdced30f9831e..1510b63680f9c 100644 --- a/pkgs/development/python-modules/pygreat/default.nix +++ b/pkgs/development/python-modules/pygreat/default.nix @@ -11,7 +11,7 @@ buildPythonPackage { sha256 = "1h0z83k1k4z8j36z936h61l8j3cjr3wsxr86k91v5c5h93g9dkqh"; }; - propagatedBuildInputs = [ future pyusb ]; + requiredPythonModules = [ future pyusb ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pygrok/default.nix b/pkgs/development/python-modules/pygrok/default.nix index 8f694a117fe54..b06df76e39c4f 100644 --- a/pkgs/development/python-modules/pygrok/default.nix +++ b/pkgs/development/python-modules/pygrok/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "07487rcmv74srnchh60jp0vg46g086qmpkaj8gxqhp9rj47r1s4m"; }; - propagatedBuildInputs = [ regex ]; + requiredPythonModules = [ regex ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 4779f76aed462..ca415257433eb 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pango ] ++ stdenv.lib.optional (libglade != null) libglade; - propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; + requiredPythonModules = [ gtk2 pygobject2 pycairo ]; configurePhase = "configurePhase"; diff --git a/pkgs/development/python-modules/pyhamcrest/1.nix b/pkgs/development/python-modules/pyhamcrest/1.nix index 592172c6550d0..80006d5981b3b 100644 --- a/pkgs/development/python-modules/pyhamcrest/1.nix +++ b/pkgs/development/python-modules/pyhamcrest/1.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkInputs = [ mock pytest ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; doCheck = false; # pypi tarball does not include tests diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index 40469bd0deba6..12726178e8a33 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkInputs = [ mock pytest ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; doCheck = false; # pypi tarball does not include tests diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index b6ef4bc4a8ba5..e3a8dc1767612 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy3k -# propagatedBuildInputs +# requiredPythonModules , aiohttp , async-timeout , semantic-version @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "376a1b232a26035bc82d64affa1c4f312d782234fe5453e8d0f9e1350a97be5b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp async-timeout semantic-version diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index 487f7ca66f313..289c42d3c4053 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1lr56piiasnq1aiwli8ldw2wc3xjfck8az991mr5rdbqqsrh9vkv"; }; - propagatedBuildInputs = [ pyparsing ]; + requiredPythonModules = [ pyparsing ]; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/pyhs100/default.nix b/pkgs/development/python-modules/pyhs100/default.nix index 2e6d7164b8bf1..6e062a76a6b71 100644 --- a/pkgs/development/python-modules/pyhs100/default.nix +++ b/pkgs/development/python-modules/pyhs100/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1vddr9sjn6337i1vx0mm7pb3qibvl2gx6nx18vm4fajgv9vcjxny"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click click-datetime deprecation diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 6e808a0105853..d32ed773514ac 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "dcebb32e474bc28aa77b944a0a64949ef3b5b852cbef6256fbc95347a04e777c"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests keyring keyrings-alt diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 9dcdfb64c93aa..a1d4cf8d77da7 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ icu ]; # for icu-config buildInputs = [ icu ]; checkInputs = [ pytest ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { homepage = "https://pypi.python.org/pypi/PyICU/"; diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index 98bb6360ce544..4db2056923e30 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0ar3mkyfa9qi3av3885bvacpwlxh420if9ymdj8i4x06ymzc213d"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp deepmerge yarl diff --git a/pkgs/development/python-modules/pyjade/default.nix b/pkgs/development/python-modules/pyjade/default.nix index ad6742f5deb3a..a7a6ce19f03c5 100644 --- a/pkgs/development/python-modules/pyjade/default.nix +++ b/pkgs/development/python-modules/pyjade/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ pyramid_mako nose django jinja2 tornado pyramid Mako ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; postPatch = '' sed -i 's/1.4.99/1.99/' setup.py ''; diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix index abf4beaada0dd..3525c8303b017 100644 --- a/pkgs/development/python-modules/pyjet/default.nix +++ b/pkgs/development/python-modules/pyjet/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { done ''; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; checkInputs = [ pytest ]; checkPhase = '' mv pyjet _pyjet diff --git a/pkgs/development/python-modules/pyjks/default.nix b/pkgs/development/python-modules/pyjks/default.nix index a05dcadeb84d0..6ad662e512722 100644 --- a/pkgs/development/python-modules/pyjks/default.nix +++ b/pkgs/development/python-modules/pyjks/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0378cec15fb11b2ed27ba54dad9fd987d48e6f62f49fcff138f5f7a8b312b044"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyasn1-modules pycryptodomex twofish diff --git a/pkgs/development/python-modules/pyjwkest/default.nix b/pkgs/development/python-modules/pyjwkest/default.nix index 945cc20528e3d..3e904beefc264 100644 --- a/pkgs/development/python-modules/pyjwkest/default.nix +++ b/pkgs/development/python-modules/pyjwkest/default.nix @@ -18,5 +18,5 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ future pycryptodomex requests six ]; + requiredPythonModules = [ future pycryptodomex requests six ]; } diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 9255c02ac2eef..c52e8d77edb22 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; }; - propagatedBuildInputs = [ cryptography ecdsa ]; + requiredPythonModules = [ cryptography ecdsa ]; checkInputs = [ pytestrunner pytestcov pytest ]; diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index f266d17bb4608..9ccff764e4b6a 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { buildInputs = [ openmp ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 584c98f6cb091..7aedf3b50e3a8 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "==" ">=" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ lxml pycryptodomex construct argon2_cffi dateutil future ]; diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix index 6461f0391caa3..0dcff145780de 100644 --- a/pkgs/development/python-modules/pykickstart/default.nix +++ b/pkgs/development/python-modules/pykickstart/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { key=lambda m: m.__name__)/" tests/baseclass.py ''; - propagatedBuildInputs = [ urlgrabber ]; + requiredPythonModules = [ urlgrabber ]; checkPhase = '' ${python.interpreter} tests/baseclass.py -vv diff --git a/pkgs/development/python-modules/pykwalify/default.nix b/pkgs/development/python-modules/pykwalify/default.nix index d2b31ebbf4cd7..822efadc98b02 100644 --- a/pkgs/development/python-modules/pykwalify/default.nix +++ b/pkgs/development/python-modules/pykwalify/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1cnfzkg1b01f825ikpw2fhjclf9c8akxjfrbd1vc22x1lg2kk2vy"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ dateutil docopt pyyaml diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 1aa96dfe464db..04a0427b8e9aa 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "9bae53ef9c1a431371d6a8dca406816a60d547147b60a4934721898f553b7d8f"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ eradicate mccabe pycodestyle diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 12fac476f633c..21aececf19a98 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ certifi six ]; + requiredPythonModules = [ certifi six ]; # tests require last.fm credentials doCheck = false; diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/pkgs/development/python-modules/pylibconfig2/default.nix index 3c2a0be941df0..438d035ce7b10 100644 --- a/pkgs/development/python-modules/pylibconfig2/default.nix +++ b/pkgs/development/python-modules/pylibconfig2/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { # tests not included in the distribution doCheck = false; - propagatedBuildInputs = [ pyparsing ]; + requiredPythonModules = [ pyparsing ]; meta = with stdenv.lib; { homepage = "https://github.com/heinzK1X/pylibconfig2"; diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index c001594d625a3..dd3a1f7f73f5d 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "bb0ec74df292ef884aa37bf1e98fb9df4d338718e1559eebda363317a792123e"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ libftdi1 libusb1 ]; diff --git a/pkgs/development/python-modules/pylint-celery/default.nix b/pkgs/development/python-modules/pylint-celery/default.nix index 6bc7a93049e93..9f8f058131170 100644 --- a/pkgs/development/python-modules/pylint-celery/default.nix +++ b/pkgs/development/python-modules/pylint-celery/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "05fhwraq12c2724pn4py1bjzy5rmsrb1x68zck73nlp5icba6yap"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pylint-plugin-utils ]; diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index c5dfbd48fe128..5d49affecb1ad 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "1088waraiigi2bnlighn7bvnvqmpx5fbw70c8jd8sh25mj38wgly"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ django pylint-plugin-utils ]; diff --git a/pkgs/development/python-modules/pylint-flask/default.nix b/pkgs/development/python-modules/pylint-flask/default.nix index 5077d07a936b2..e154bb8669fb1 100644 --- a/pkgs/development/python-modules/pylint-flask/default.nix +++ b/pkgs/development/python-modules/pylint-flask/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "05qmwgkpvaa5k05abqjxfbrfk3wpdqb8ph690z7bzxvb47i7vngl"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pylint-plugin-utils ]; diff --git a/pkgs/development/python-modules/pylint-plugin-utils/default.nix b/pkgs/development/python-modules/pylint-plugin-utils/default.nix index f2bbef2cc8c14..308443774e668 100644 --- a/pkgs/development/python-modules/pylint-plugin-utils/default.nix +++ b/pkgs/development/python-modules/pylint-plugin-utils/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "1zapmbczxs1phrwbd0yvpfxhljd2pyv4pi9rwggaq38lcnc325s7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pylint toml ]; diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix index e283cc10d16a9..efd914384ad70 100644 --- a/pkgs/development/python-modules/pylint/1.9.nix +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ]; + requiredPythonModules = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ]; postPatch = lib.optionalString stdenv.isDarwin '' # Remove broken darwin test diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 102619b2b31e8..6a25aefc1f933 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-benchmark ]; - propagatedBuildInputs = [ astroid isort mccabe toml ]; + requiredPythonModules = [ astroid isort mccabe toml ]; postPatch = lib.optionalString stdenv.isDarwin '' # Remove broken darwin test diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix index c59a67606ee6c..e45745711dcbf 100644 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ black toml python-language-server ]; + requiredPythonModules = [ black toml python-language-server ]; meta = with lib; { homepage = "https://github.com/rupert/pyls-black"; diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index 9dc614035e0ee..bbc995a949db2 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # no tests doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ isort python-language-server ]; diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index b9cf9738ed425..76e47aa49e634 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { checkInputs = [ mock pytestcov coverage pytestCheckHook ]; - propagatedBuildInputs = [ + requiredPythonModules = [ mypy python-language-server configparser ] ++ lib.optional (isPy27) [ future diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix index 752755700b272..cc8c2487c714f 100644 --- a/pkgs/development/python-modules/pylti/default.nix +++ b/pkgs/development/python-modules/pylti/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "mock==1.0.1" "mock" ''; - propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; + requiredPythonModules = [ httplib2 oauth oauth2 semantic-version ]; checkInputs = [ flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore pytest-flakes pytestpep8 sphinx mock chalice diff --git a/pkgs/development/python-modules/pymacaroons/default.nix b/pkgs/development/python-modules/pymacaroons/default.nix index c9ffcc0a0702c..418f4e43062a3 100644 --- a/pkgs/development/python-modules/pymacaroons/default.nix +++ b/pkgs/development/python-modules/pymacaroons/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1e6bba42a5f66c245adf38a5a4006a99dcc06a0703786ea636098667d42903b8"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six pynacl ]; diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix index 9bf2559e2f0c2..3423f347204d0 100644 --- a/pkgs/development/python-modules/pymaging_png/default.nix +++ b/pkgs/development/python-modules/pymaging_png/default.nix @@ -15,7 +15,7 @@ buildPythonPackage { sha256 = "1mknxvsq0lr1ffm8amzm3w2prn043c6ghqgpxlkw83r988p5fn57"; }; - propagatedBuildInputs = [ pymaging ]; + requiredPythonModules = [ pymaging ]; meta = with stdenv.lib; { description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; diff --git a/pkgs/development/python-modules/pymatgen-lammps/default.nix b/pkgs/development/python-modules/pymatgen-lammps/default.nix index c80472a6730a5..536e1cc54c13e 100644 --- a/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ pytestrunner ]; checkInputs = [ pytest ]; - propagatedBuildInputs = [ pymatgen ]; + requiredPythonModules = [ pymatgen ]; meta = { description = "A LAMMPS wrapper using pymatgen"; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 635d951f56eb5..1b13675697806 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ + requiredPythonModules = [ enum34 matplotlib monty diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index f0a5b222c224d..3264fe428a965 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "2954bb071ff67fc5ab29ed2dabe3b5355c4063fb8b014477d9bfbceb87358bc6"; }; - propagatedBuildInputs = [ future lxml ]; + requiredPythonModules = [ future lxml ]; # No tests included in PyPI tarball doCheck = false; diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 23c88ca28d457..5f9b2b3a611a8 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; checkInputs = [ sympy pexpect symengine pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pytools six ]; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index dfbfe90d2421d..89f153f9fdf66 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace ", 'pytest-cov'" "" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ Theano pandas patsy diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index 92e26c4f6e536..228abba7a7ab4 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1jngf0mbn5hn166pqh1ga5snwwvv7n5kv1k9kaksrfibixkvpw6h"; }; - propagatedBuildInputs = [ aiohttp async-timeout pytz xmltodict ]; + requiredPythonModules = [ aiohttp async-timeout pytz xmltodict ]; pythonImportsCheck = [ "metno"]; diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix index d844144addbcd..98d7a92353971 100644 --- a/pkgs/development/python-modules/pymsgbox/default.nix +++ b/pkgs/development/python-modules/pymsgbox/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ tkinter ]; + requiredPythonModules = [ tkinter ]; # Finding tests fails doCheck = false; diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix index 6e72309a58d33..d3c11222925e0 100644 --- a/pkgs/development/python-modules/pymumble/default.nix +++ b/pkgs/development/python-modules/pymumble/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1r1sch8xrpbzffsb72lhp5xjr3ac3xb599n44vsfmaam3xklz6vz"; }; - propagatedBuildInputs = [ opuslib protobuf ]; + requiredPythonModules = [ opuslib protobuf ]; pythonImportsCheck = [ "pymumble_py3" ]; diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix index e2c2e8f05a1c4..8fe7159a38f02 100644 --- a/pkgs/development/python-modules/pymvglive/default.nix +++ b/pkgs/development/python-modules/pymvglive/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0sh4xm74im9qxzpbrlc5h1vnpgvpybnpvdcav1iws0b561zdr08c"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; meta = with lib; { description = "get live-data from mvg-live.de"; diff --git a/pkgs/development/python-modules/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix index c243bf8f9540e..fc45afd4fdb5b 100644 --- a/pkgs/development/python-modules/pymysql/default.nix +++ b/pkgs/development/python-modules/pymysql/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "263040d2779a3b84930f7ac9da5132be0fefcd6f453a885756656103f8ee1fdd"; }; - propagatedBuildInputs = [ cryptography ]; + requiredPythonModules = [ cryptography ]; # Wants to connect to MySQL doCheck = false; diff --git a/pkgs/development/python-modules/pymysqlsa/default.nix b/pkgs/development/python-modules/pymysqlsa/default.nix index 16c0e1a58d3fa..619b0174396de 100644 --- a/pkgs/development/python-modules/pymysqlsa/default.nix +++ b/pkgs/development/python-modules/pymysqlsa/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "a2676bce514a29b2d6ab418812259b0c2f7564150ac53455420a20bd7935314a"; }; - propagatedBuildInputs = [ pymysql sqlalchemy ]; + requiredPythonModules = [ pymysql sqlalchemy ]; meta = with stdenv.lib; { description = "PyMySQL dialect for SQL Alchemy"; diff --git a/pkgs/development/python-modules/pymystem3/default.nix b/pkgs/development/python-modules/pymystem3/default.nix index 8c909b868b397..3703f5b52c579 100644 --- a/pkgs/development/python-modules/pymystem3/default.nix +++ b/pkgs/development/python-modules/pymystem3/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "15gv78m17g958gfka6rr3rg230g6b5ssgk8bfpsp7k2iajhxdbhs"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ flake8 mock pytest ]; doCheck = isPy3k; # fails on linting diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 5ce85acc194e9..57139c2140382 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytest hypothesis_4 ]; buildInputs = [ libsodium ]; - propagatedBuildInputs = [ cffi six ]; + requiredPythonModules = [ cffi six ]; SODIUM_INSTALL = "system"; diff --git a/pkgs/development/python-modules/pynamecheap/default.nix b/pkgs/development/python-modules/pynamecheap/default.nix index 84c13b9d1caaa..f5bf27523fb5c 100644 --- a/pkgs/development/python-modules/pynamecheap/default.nix +++ b/pkgs/development/python-modules/pynamecheap/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "PyNamecheap"; version = "0.0.3"; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # Tests require access to api.sandbox.namecheap.com doCheck = false; diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 53df38b5836b2..21f828a2596d3 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "ced47c200073dbbfafb10b26931b9c9bf3c6b898f41dffa3676f5c2e2eddc2f0"; }; - propagatedBuildInputs = [ python-dateutil botocore ]; + requiredPythonModules = [ python-dateutil botocore ]; checkInputs = [ requests mock pytest mypy ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pynanoleaf/default.nix b/pkgs/development/python-modules/pynanoleaf/default.nix index 40e2783aa5773..d69860d68b6f6 100644 --- a/pkgs/development/python-modules/pynanoleaf/default.nix +++ b/pkgs/development/python-modules/pynanoleaf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # pynanoleaf does not contain tests doCheck = false; diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index b7c819c4593da..15ce4b57bcfef 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; buildInputs = [ pkgs.coreutils ]; - propagatedBuildInputs = [ dateutil ]; + requiredPythonModules = [ dateutil ]; preInstall = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 27e41f300c728..50d8aa8e40f92 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1b1079315ad1009de108c9ad701f6ae5274264e64503fc22c2de366d99953f34"; }; - propagatedBuildInputs = [ psutil docutils ]; + requiredPythonModules = [ psutil docutils ]; # no tests in the Pypi archive doCheck = false; diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index 2b83f4c1223b2..7fd22a8e32828 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sphinx ]; - propagatedBuildInputs = [ setuptools-lint xlib ]; + requiredPythonModules = [ setuptools-lint xlib ]; doCheck = false; diff --git a/pkgs/development/python-modules/pynrrd/default.nix b/pkgs/development/python-modules/pynrrd/default.nix index 7a136176cf64f..c2d34c46778fe 100644 --- a/pkgs/development/python-modules/pynrrd/default.nix +++ b/pkgs/development/python-modules/pynrrd/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1wn3ara3i19fi1y9a5j4imyczpa6dkkzd5djggxg4kkl1ff9awrj"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; meta = with lib; { homepage = "https://github.com/mhe/pynrrd"; diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 53bb06b13dd0a..b43f110236551 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { # which we cannot add because of circular dependency. doCheck = false; - propagatedBuildInputs = [ msgpack ] + requiredPythonModules = [ msgpack ] ++ lib.optional (!isPyPy) greenlet ++ lib.optional (pythonOlder "3.4") trollius; diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index 75d8056fa5576..bcdb24a5542ac 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0pfykj1amqh1rixp90rg85v1nj6qmx89fahqr6ii4zlcckffmm68"; }; - propagatedBuildInputs = [ cudatoolkit ]; + requiredPythonModules = [ cudatoolkit ]; doCheck = false; # no tests in PyPi dist pythonImportsCheck = [ "pynvml" "pynvml.smi" ]; diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 8cfce9ba43f1f..25e2ad752d731 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; buildInputs = [ setuptools_scm setuptools-scm-git-archive ]; - propagatedBuildInputs = [ pillow ]; + requiredPythonModules = [ pillow ]; checkInputs = [ pytest tox ]; checkPhase = "pytest"; diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 99f002b9317b6..0c2cad1eaba55 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pyutilib appdirs ply diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 4552fab5b856a..22e9ee7f02fb3 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; - propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; + requiredPythonModules = [ numpy cffi pytools decorator appdirs six Mako ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 2a3b90733c46f..dcb2871be55c3 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0bdf5ed600df30c8830455702338902528717c0af85ac5914f1dc5aa0bfa6eee"; }; - propagatedBuildInputs = [ pillow ]; + requiredPythonModules = [ pillow ]; patchPhase = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 33fd3c6e10d40..5098ff1f87541 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -107,7 +107,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; nativeBuildInputs = [ openssl ]; - propagatedBuildInputs = [ cryptography pyasn1 idna six ]; + requiredPythonModules = [ cryptography pyasn1 idna six ]; checkInputs = [ pytest pretend flaky glibcLocales ]; } diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 423d38ab25d8c..4733cc9f4f22e 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "a7b18297a9189dbe5f6b454b12d61a407e35c7eb9ca75bcabfe5e1c83245290d"; }; - propagatedBuildInputs = [ requests geojson ]; + requiredPythonModules = [ requests geojson ]; # This may actually break the package. postPatch = '' diff --git a/pkgs/development/python-modules/pyparser/default.nix b/pkgs/development/python-modules/pyparser/default.nix index 8e4deafd542c7..9727a618b8493 100644 --- a/pkgs/development/python-modules/pyparser/default.nix +++ b/pkgs/development/python-modules/pyparser/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { postPatch = "sed -i 's/parse==/parse>=/' requirements.txt"; - propagatedBuildInputs = [ parse ]; + requiredPythonModules = [ parse ]; meta = { description = "Simple library that makes it easier to parse files"; diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index c51c55a5eb238..0752fdb8cdd9c 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -2,9 +2,11 @@ , fetchFromGitHub , buildPythonPackage , isPyPy -, pkgs +, parted , python , six +, e2fsprogs +, pkg-config }: buildPythonPackage rec { @@ -20,7 +22,7 @@ buildPythonPackage rec { }; postPatch = '' - sed -i -e 's|mke2fs|${pkgs.e2fsprogs}/bin/mke2fs|' tests/baseclass.py + sed -i -e 's|mke2fs|${e2fsprogs}/bin/mke2fs|' tests/baseclass.py sed -i -e ' s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| ' tests/test__ped_ped.py @@ -35,12 +37,12 @@ buildPythonPackage rec { ]; preConfigure = '' - PATH="${pkgs.parted}/sbin:$PATH" + PATH="${parted}/sbin:$PATH" ''; - nativeBuildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; checkInputs = [ six ]; - propagatedBuildInputs = [ pkgs.parted ]; + buildInputs = [ parted ]; checkPhase = '' patchShebangs Makefile diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index f17f83bd17b96..d5fcbf17f19ee 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { checkInputs = [ nose psutil ] ++ lib.optionals isPy27 [ contextlib2 mock unittest2 ]; - propagatedBuildInputs = [ six ] ++ + requiredPythonModules = [ six ] ++ lib.optionals (pythonOlder "3.4") [ statistics ]; # tests not included in pypi repository diff --git a/pkgs/development/python-modules/pyphotonfile/default.nix b/pkgs/development/python-modules/pyphotonfile/default.nix index 7a350bd3b13fe..e95ba74808ecf 100644 --- a/pkgs/development/python-modules/pyphotonfile/default.nix +++ b/pkgs/development/python-modules/pyphotonfile/default.nix @@ -10,7 +10,7 @@ in buildPythonPackage { pname = "pyphotonfile"; inherit version; - propagatedBuildInputs = [ pillow numpy ]; + requiredPythonModules = [ pillow numpy ]; src = fetchFromGitHub { owner = "fookatchu"; diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix index feb1f9451bca6..55573f7d48a98 100644 --- a/pkgs/development/python-modules/pypillowfight/default.nix +++ b/pkgs/development/python-modules/pypillowfight/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # This is needed by setup.py regardless of whether tests are enabled. buildInputs = [ nose ]; - propagatedBuildInputs = [ pillow ]; + requiredPythonModules = [ pillow ]; meta = with stdenv.lib; { description = "Library containing various image processing algorithms"; diff --git a/pkgs/development/python-modules/pypoppler/default.nix b/pkgs/development/python-modules/pypoppler/default.nix index 3287c70db9cb1..2bfcb126f8606 100644 --- a/pkgs/development/python-modules/pypoppler/default.nix +++ b/pkgs/development/python-modules/pypoppler/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/"; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.poppler.dev ]; - propagatedBuildInputs = [ pycairo pygobject2 ]; + requiredPythonModules = [ pycairo pygobject2 ]; patches = [ ./pypoppler-0.39.0.patch diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index b23cb010f0171..a8ed2b8db01aa 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { buildInputs = [ cython pkgs.proj ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy shapely ] ++ lib.optional (pythonOlder "3.6") aenum; diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 05cf0aba354b9..cd2e1abdc30ab 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig lndir makeWrapper qt4 ]; buildInputs = [ qt4 dbus ]; - propagatedBuildInputs = [ sip ]; + requiredPythonModules = [ sip ]; postInstall = '' for i in $out/bin/*; do diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 5b971c48d785d..4eeac326b21e0 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -67,7 +67,7 @@ in buildPythonPackage rec { ++ lib.optional withWebSockets qtwebsockets ; - propagatedBuildInputs = [ + requiredPythonModules = [ dbus-python sip ] ++ lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index d1850c1288d6b..1ceffcd3596cf 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0p5k73wjfh0zzjvby8b5107cx7x0c2rdj66zh1nc8y95i0anf2na"; }; - propagatedBuildInputs = [ scipy numpy pyqt4 pyopengl ]; + requiredPythonModules = [ scipy numpy pyqt4 pyopengl ]; doCheck = false; # "PyQtGraph requires either PyQt4 or PySide; neither package could be imported." diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 51506598ca18b..ff9738bf2208d 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -42,7 +42,7 @@ in buildPythonPackage rec { qtwebengine ]; - propagatedBuildInputs = [ pyqt5 ] + requiredPythonModules = [ pyqt5 ] ++ lib.optional (!isPy3k) enum34; configurePhase = '' diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix index 6ba9cb91982b4..3ef2778ecf4f4 100644 --- a/pkgs/development/python-modules/pyquery/default.nix +++ b/pkgs/development/python-modules/pyquery/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "00p6f1dfma65192hc72dxd506491lsq3g5wgxqafi1xpg2w1xia6"; }; - propagatedBuildInputs = [ cssselect lxml webob ]; + requiredPythonModules = [ cssselect lxml webob ]; # circular dependency on webtest doCheck = false; diff --git a/pkgs/development/python-modules/pyrabbit2/default.nix b/pkgs/development/python-modules/pyrabbit2/default.nix index 96f5d66cf650a..e36fbbb624490 100644 --- a/pkgs/development/python-modules/pyrabbit2/default.nix +++ b/pkgs/development/python-modules/pyrabbit2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "d27160cb35c096f0072df57307233d01b117a451236e136604a8e51be6f106c0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests ]; diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 31cbf77d94e0f..b0ac0d2db07ca 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0hy7999av47s8100afbhxfjb8phbmrqcv530xlvskndby4a8w94k"; }; - propagatedBuildInputs = [ netaddr six ]; + requiredPythonModules = [ netaddr six ]; checkInputs = [ nose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 3de55f628c44a..e093de76b4ac7 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ webtest zope_component ]; - propagatedBuildInputs = [ hupper PasteDeploy plaster plaster-pastedeploy repoze_lru translationstring venusian webob zope_deprecation zope_interface ]; + requiredPythonModules = [ hupper PasteDeploy plaster plaster-pastedeploy repoze_lru translationstring venusian webob zope_deprecation zope_interface ]; # Failing tests # https://github.com/Pylons/pyramid/issues/1899 diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix index 19b26a30ad712..459911a9e0312 100644 --- a/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/pkgs/development/python-modules/pyramid_beaker/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ beaker pyramid ]; + requiredPythonModules = [ beaker pyramid ]; meta = with stdenv.lib; { maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/pkgs/development/python-modules/pyramid_chameleon/default.nix index 9e148ca8ed515..37ea8518786ec 100644 --- a/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ./test-renderers-pyramid-import.patch ]; - propagatedBuildInputs = [ chameleon pyramid zope_interface setuptools ]; + requiredPythonModules = [ chameleon pyramid zope_interface setuptools ]; meta = with stdenv.lib; { description = "Chameleon template compiler for pyramid"; diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix index 0c2abeb74e282..f88f9afe5209f 100644 --- a/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "d05ced5c12407507154de6750036bc83861b85c11be70b3ec3098c929652c14b"; }; - propagatedBuildInputs = [ pyramid ]; + requiredPythonModules = [ pyramid ]; meta = with stdenv.lib; { description = "A package which logs to a Python logger when an exception is raised by a Pyramid application"; diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix index fc76d9af68d9e..60328e1980394 100644 --- a/pkgs/development/python-modules/pyramid_hawkauth/default.nix +++ b/pkgs/development/python-modules/pyramid_hawkauth/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h"; }; - propagatedBuildInputs = [ pyramid hawkauthlib tokenlib ]; + requiredPythonModules = [ pyramid hawkauthlib tokenlib ]; buildInputs = [ webtest ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index 6be0fe479d2ff..5c1433f1d7423 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ webtest ]; - propagatedBuildInputs = [ jinja2 pyramid ]; + requiredPythonModules = [ jinja2 pyramid ]; meta = with stdenv.lib; { description = "Jinja2 template bindings for the Pyramid web framework"; diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid_mako/default.nix index 2bae93d1e306e..5c407f3b93d16 100644 --- a/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/pkgs/development/python-modules/pyramid_mako/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ webtest ]; - propagatedBuildInputs = [ pyramid Mako ]; + requiredPythonModules = [ pyramid Mako ]; meta = with stdenv.lib; { homepage = "https://github.com/Pylons/pyramid_mako"; diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid_multiauth/default.nix index f441aaed8c13f..d0be8beb235b0 100644 --- a/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid_multiauth/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0lprqjyg3zcji6033p1l3s4nigjigc5423wgivkfhz46vq0jmniy"; }; - propagatedBuildInputs = [ pyramid ]; + requiredPythonModules = [ pyramid ]; meta = with stdenv.lib; { description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; diff --git a/pkgs/development/python-modules/pyreadability/default.nix b/pkgs/development/python-modules/pyreadability/default.nix index 9aa87d238ec94..ed395d492f5d4 100644 --- a/pkgs/development/python-modules/pyreadability/default.nix +++ b/pkgs/development/python-modules/pyreadability/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1k6fq416pdmjcdqh6gdxl0y0k8kj1zlpzwp5574xsvsha18p2zpn"; }; - propagatedBuildInputs = [ requests chardet cssselect lxml ]; + requiredPythonModules = [ requests chardet cssselect lxml ]; # ModuleNotFoundError: No module named 'tests' doCheck = false; diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index b1868e7edde51..519587f563b88 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "a8ac5f764b53ec332f6bc43f6f2193ca13e8b7d5a3fb2e20ced6b2ea42a9d094"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyparsing numpy cython diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix index d4bd8789144af..ce0c51efe75c3 100644 --- a/pkgs/development/python-modules/pyres/default.nix +++ b/pkgs/development/python-modules/pyres/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { version = "1.5"; # ps is used in Worker.worker_pids method - propagatedBuildInputs = [ simplejson setproctitle redis' pkgs.ps ]; + requiredPythonModules = [ simplejson setproctitle redis' pkgs.ps ]; checkInputs = [ nose pkgs.redis ]; # PyPI tarball doesn't contain tests so let's use GitHub diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index 3c157d83fec1b..e18b04ad3b382 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "06jv7ar7lpvvk0dixzwdr3wgm0g1lipxs429s2z7knwwa7hwpf41"; }; - propagatedBuildInputs = [ pytz ]; + requiredPythonModules = [ pytz ]; buildInputs = [ nose ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index c3157c3d301c3..cbefdc528f0ae 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "e863321bee141fb8d20d621aedc5925c472e06c08988447490115f54a31487ad"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pytorch contextlib2 # TODO(tom): graphviz pulls in a lot of dependencies - make diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index 3cf9d3f31437c..cb9e89d995334 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "46847ca703de3f483fbd0b2d22622f36eff03e6ef7ec7704d4ecaa3964cb2220"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ serpent ] ++ lib.optionals isPy27 [ selectors34 ]; diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix index 5afce4a37dacb..cdf275d2a88b7 100644 --- a/pkgs/development/python-modules/pyro5/default.nix +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "867cdd291d85560373e0c468da7fd18754f2568ef60e0bc504af42f391d7a3e5"; }; - propagatedBuildInputs = [ serpent ]; + requiredPythonModules = [ serpent ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index 4ec06506b38b7..3ad77a32c7a5c 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "00j1j81kiipi5yppmk385cbfccf2ih0xyapl7pw6nqhrf8vh1764"; }; - propagatedBuildInputs = [ docutils pygments setuptools ]; + requiredPythonModules = [ docutils pygments setuptools ]; meta = with stdenv.lib; { description = "Test your project's packaging friendliness"; diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index 96d160619588a..b8e3d9606e768 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools ]; - propagatedBuildInputs = [ multipledispatch numpy ]; + requiredPythonModules = [ multipledispatch numpy ]; meta = with stdenv.lib; { description = "3D mathematical functions using NumPy"; diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index ae22dad1223d9..70def81029a00 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "aa2ae1c2e496f4d6777f869ea5de7166a8ccb9c2e06ebcf6c7ff1b670c98c5ef"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytestrunner pytest_4 hypothesis_4 ]; diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 593911c064ec4..852b4372c4bb5 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml ''; - propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ]; + requiredPythonModules = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ]; checkInputs = [ mock pyasn1 pymongo pytest responses ]; diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index d02c85fb4ffdd..21f21007b62fb 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { --subst-var-by 'sc2path' '${sc2-headless}' ''; - propagatedBuildInputs = [ + requiredPythonModules = [ absl-py enum34 future diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index d563a62a46b3a..d5b88cac7dda0 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -45,7 +45,10 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; + makeWrapperArgs = [ + "--prefix PATH : ${stdenv.lib.makeBinPath (if withApplePCSC then [ PCSC ] else [ pcsclite ])}" + ]; + nativeBuildInputs = [ swig ]; meta = { diff --git a/pkgs/development/python-modules/pyschedule/default.nix b/pkgs/development/python-modules/pyschedule/default.nix index c387bdef4b8c8..523e4421f3566 100644 --- a/pkgs/development/python-modules/pyschedule/default.nix +++ b/pkgs/development/python-modules/pyschedule/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "6bba9e9ea07906ce2dfe3cd847c1822b137f6b13e9f975c50b347312fd98e110"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pulp ]; diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix index ec67b7649ea95..c96e86ec65e99 100644 --- a/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "dec8517cb18faf4f983dd2ee6636924e472a5644da1480ae871786dfcac244e9"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ EasyProcess entrypoint2 pillow diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index 30b5205050ddc..3f495f83ee8b8 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ six ] + requiredPythonModules = [ six ] ++ (stdenv.lib.optionals (pythonOlder "3.4") [ enum34 pathlib ]) ++ (stdenv.lib.optionals (pythonOlder "2.7") [ ordereddict ]); diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index be9663245bb50..c053f7538054e 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # Deliberately not in propagated build inputs; users can decide # which library they want to include. buildInputs = [ SDL2_ttf SDL2_image SDL2_gfx SDL2_mixer ]; - propagatedBuildInputs = [ SDL2 ]; + requiredPythonModules = [ SDL2 ]; patches = [ (substituteAll ({ src = ./PySDL2-dll.patch; diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/pkgs/development/python-modules/pyserial-asyncio/default.nix index cf90275cd19ca..61868d29a3aaa 100644 --- a/pkgs/development/python-modules/pyserial-asyncio/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1vlsb0d03krxlj7vpvyhpinnyxyy8s3lk5rs8ba2932dhyl7f1n4"; }; - propagatedBuildInputs = [ pyserial ]; + requiredPythonModules = [ pyserial ]; meta = with stdenv.lib; { description = "asyncio extension package for pyserial"; diff --git a/pkgs/development/python-modules/pysftp/default.nix b/pkgs/development/python-modules/pysftp/default.nix index 61fc4f122d291..9020f9e472f33 100644 --- a/pkgs/development/python-modules/pysftp/default.nix +++ b/pkgs/development/python-modules/pysftp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0jl5qix5cxzrv4lb8rfpjkpcghbkacnxkb006ikn7mkl5s05mxgv"; }; - propagatedBuildInputs = [ paramiko ]; + requiredPythonModules = [ paramiko ]; meta = with stdenv.lib; { homepage = "https://bitbucket.org/dundeemt/pysftp"; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index cc52a0502f287..707c7f0b4f891 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { buildInputs = [ qt4 ]; - propagatedBuildInputs = [ pyside pysideShiboken ]; + requiredPythonModules = [ pyside pysideShiboken ]; meta = with lib; { description = "Development tools (pyside-uic/rcc/lupdate) for PySide, the LGPL-licensed Python bindings for the Qt framework"; diff --git a/pkgs/development/python-modules/pyside2-tools/default.nix b/pkgs/development/python-modules/pyside2-tools/default.nix index 9f1f94ffecbb5..f7966c8ab6d97 100644 --- a/pkgs/development/python-modules/pyside2-tools/default.nix +++ b/pkgs/development/python-modules/pyside2-tools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ cmake wrapPython ]; - propagatedBuildInputs = [ shiboken2 pyside2 ]; + requiredPythonModules = [ shiboken2 pyside2 ]; buildInputs = [ python qt5.qtbase ]; cmakeFlags = [ diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index ed0ab2d533aa9..dc436a7cc96e2 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { qtbase qtxmlpatterns qtmultimedia qttools qtx11extras qtlocation qtscript qtwebsockets qtwebengine qtwebchannel qtcharts qtsensors qtsvg ]; - propagatedBuildInputs = [ shiboken2 ]; + requiredPythonModules = [ shiboken2 ]; meta = with stdenv.lib; { description = "LGPL-licensed Python bindings for Qt"; diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 8a5c3ae348a36..735efc0c9254a 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "7aedd5e003992c6c78b41a0da4bf165359a46ea25ab2a9a1594d13f471ad7287"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix index a3a7c3d7ec102..9cefcf81df5f2 100644 --- a/pkgs/development/python-modules/pysmi/default.nix +++ b/pkgs/development/python-modules/pysmi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "bd15a15020aee8376cab5be264c26330824a8b8164ed0195bd402dd59e4e8f7c"; }; - propagatedBuildInputs = [ ply ]; + requiredPythonModules = [ ply ]; # Tests require pysnmp, which in turn requires pysmi => infinite recursion doCheck = false; diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index c0bed855a4cd8..f646767d9fa61 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # NameError: name 'mibBuilder' is not defined doCheck = false; - propagatedBuildInputs = [ pyasn1 pycryptodomex pysmi ]; + requiredPythonModules = [ pyasn1 pycryptodomex pysmi ]; meta = with stdenv.lib; { homepage = "http://snmplabs.com/pysnmp/index.html"; diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index d8d6b4f4401b6..c4424e1d411d4 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ poetry ]; - propagatedBuildInputs = [ + requiredPythonModules = [ brotli ijson python_magic diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix index bf56d7ca56e67..b82ff84c27967 100644 --- a/pkgs/development/python-modules/pysolr/default.nix +++ b/pkgs/development/python-modules/pysolr/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index c51849d171c12..e6a5bd8651902 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "3a0f8f6eb6ba0623b93a6995c1978cf72c4eedc5fbedac194e6d89e1b6b985e4"; }; - propagatedBuildInputs = [ xmltodict requests ifaddr ]; + requiredPythonModules = [ xmltodict requests ifaddr ]; checkInputs = [ pytest pylint flake8 graphviz diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index d71cf2a0f4379..8e82e7918b042 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace py4j==0.10.7 'py4j>=0.10.7,<0.11' ''; - propagatedBuildInputs = [ py4j ]; + requiredPythonModules = [ py4j ]; # Tests assume running spark... doCheck = false; diff --git a/pkgs/development/python-modules/pysparse/default.nix b/pkgs/development/python-modules/pysparse/default.nix index fda5ad596088c..16e65b9a86cad 100644 --- a/pkgs/development/python-modules/pysparse/default.nix +++ b/pkgs/development/python-modules/pysparse/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { hardeningDisable = [ "all" ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy blas lapack diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix index 74e264b9da092..5f8967c7ccc38 100644 --- a/pkgs/development/python-modules/pyspf/default.nix +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0bmimlmwrq9glnjc4i6pwch30n3y5wyqmkjfyayxqxkfrixqwydi"; }; - propagatedBuildInputs = [ pydns ]; + requiredPythonModules = [ pydns ]; # requires /etc/resolv.conf to exist doCheck = false; diff --git a/pkgs/development/python-modules/pyspice/default.nix b/pkgs/development/python-modules/pyspice/default.nix index bed00ddabe7dd..f385be344aa83 100644 --- a/pkgs/development/python-modules/pyspice/default.nix +++ b/pkgs/development/python-modules/pyspice/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "0mnyy8nr06d1al99kniyqcm0p9a8dvkg719s42sajl8yf51sayc9"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools requests pyyaml diff --git a/pkgs/development/python-modules/pyspinel/default.nix b/pkgs/development/python-modules/pyspinel/default.nix index dcd35132c2ed0..a252c42b671a0 100644 --- a/pkgs/development/python-modules/pyspinel/default.nix +++ b/pkgs/development/python-modules/pyspinel/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0nfmdkgbhmkl82dfxjpwiiarxngm6a3fvdrzpaqp60a4b17pipqg"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ future ipaddress pyserial diff --git a/pkgs/development/python-modules/pyspotify/default.nix b/pkgs/development/python-modules/pyspotify/default.nix index d6d0a6007f661..9af9525fcc22f 100644 --- a/pkgs/development/python-modules/pyspotify/default.nix +++ b/pkgs/development/python-modules/pyspotify/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1y1zqkqi9jz5m9bb2z7wmax7g40c1snm3c6di6b63726qrf26rb7"; }; - propagatedBuildInputs = [ cffi ]; + requiredPythonModules = [ cffi ]; buildInputs = [ pkgs.libspotify ]; # python zip complains about old timestamps diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index cf62af03002dc..cbf39b4eb3609 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "69edad3e4a3bcfb728beb3ad32e308096c29234cc0f7398ecd26a51e10b75978"; }; - propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ]; + requiredPythonModules = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ]; # Could also (optionally) add pyrsvg and python bindings for libvlc # Tests try to access X Display diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index 478595c1bfc59..ad5ecfecaf45d 100644 --- a/pkgs/development/python-modules/pysptk/default.nix +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy six diff --git a/pkgs/development/python-modules/pysqlite/default.nix b/pkgs/development/python-modules/pysqlite/default.nix index a1916f09a6cd8..73350e5bfc652 100644 --- a/pkgs/development/python-modules/pysqlite/default.nix +++ b/pkgs/development/python-modules/pysqlite/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # it a propagated input. propagatedBuildInputs = [ pkgs.sqlite ]; - patchPhase = '' + postPatch = '' substituteInPlace "setup.cfg" \ --replace "/usr/local/include" "${pkgs.sqlite.dev}/include" \ --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib" diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 33149e99e92f5..9a332f8f52ab1 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "02d73e98314a63a38c314d40942a0b098fb59d2f08ac39b2627cfa73f785cf0d"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix index b8570427d3031..56e82b93b35d1 100644 --- a/pkgs/development/python-modules/pysrim/default.nix +++ b/pkgs/development/python-modules/pysrim/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ numpy pyyaml ]; + requiredPythonModules = [ numpy pyyaml ]; # Tests require git lfs download of repository doCheck = false; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index e8c9aa3d5c88c..a5a4358437287 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nosetests -v ''; - propagatedBuildInputs = [ chardet ]; + requiredPythonModules = [ chardet ]; meta = with stdenv.lib; { homepage = "https://github.com/byroot/pysrt"; diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix index ad2057351d9ad..177a24489eed7 100644 --- a/pkgs/development/python-modules/pyssim/default.nix +++ b/pkgs/development/python-modules/pyssim/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "pyssim"; version = "0.4"; - propagatedBuildInputs = [ numpy scipy pillow ]; + requiredPythonModules = [ numpy scipy pillow ]; # PyPI tarball doesn't contain test images so let's use GitHub src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix index 6b4bdb59f1ef3..9a2b627456066 100644 --- a/pkgs/development/python-modules/pystray/default.nix +++ b/pkgs/development/python-modules/pystray/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0q5yqfm5mzffx9vnp9xcnclgjzgs0b7f50i9xmxn1m1iha1zawh1"; }; - propagatedBuildInputs = [ pillow xlib six ]; + requiredPythonModules = [ pillow xlib six ]; nativeBuildInputs = [ sphinx ]; checkInputs = [ xvfb_run ]; diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index f09bd95d0703a..8b88ce3ee8c50 100644 --- a/pkgs/development/python-modules/pyte/default.nix +++ b/pkgs/development/python-modules/pyte/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "7e71d03e972d6f262cbe8704ff70039855f05ee6f7ad9d7129df9c977b5a88c5"; }; - propagatedBuildInputs = [ wcwidth ]; + requiredPythonModules = [ wcwidth ]; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index ac3bf6dbf5be7..2bf3a854e89da 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ]; buildInputs = [ tesseract ]; - propagatedBuildInputs = [ pillow ]; + requiredPythonModules = [ pillow ]; # the package doesn't have any tests. doCheck = false; diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index f2491bd571c1f..4c7f82e2c8a7e 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9"; }; - propagatedBuildInputs = [ pytest aiohttp ]; + requiredPythonModules = [ pytest aiohttp ]; # There are no tests doCheck = false; diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix index 53879bffbc8af..867c977641527 100644 --- a/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pyannotate ]; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 2e98654c5d460..454773ef6512c 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # requires pandoc < 2.0 # buildInputs = [ setuptools-markdown ]; checkInputs = [ mock ]; - propagatedBuildInputs = [ ansible pytest ]; + requiredPythonModules = [ ansible pytest ]; # tests not included with release, even on github doCheck = false; diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix index 8b1de360f4940..d8cb87061c1f2 100644 --- a/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "de2d62f53ecc107ed754d70d562adfa7573677a263216a7f19aa332f20dc6c15"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy six pytest diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix index 05c6135a4b9de..367e304ccd92d 100644 --- a/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1y87agr324p6x5gvhziymxjlw54pyn4gqnd49papbl941djpkp5g"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index ae3bc04d0b4c0..0e279c6259c67 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ hypothesis pytest pytest-astropy-header diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index ccde881d38399..9a4fd49cd7e02 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "1yqzz44as4pxffmg4hk9lijvnvlc2chg1maq1fbj5i4k4jpagvjz"; }; - propagatedBuildInputs = [ glob2 Mako parse parse-type py pytest six ]; + requiredPythonModules = [ glob2 Mako parse parse-type py pytest six ]; # Tests require extra dependencies checkInputs = [ execnet mock pytest ]; diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index eedbbc274f4f3..9e5ce7de41e0d 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1hslzzinpwc1zqhbpllqh3sllmiyk69pcycl7ahr0rz3micgwczj"; }; - propagatedBuildInputs = [ pytest py-cpuinfo ] ++ lib.optionals (pythonOlder "3.4") [ pathlib statistics ]; + requiredPythonModules = [ pytest py-cpuinfo ] ++ lib.optionals (pythonOlder "3.4") [ pathlib statistics ]; meta = { description = "Py.test fixture for benchmarking code"; diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix index 20b2483c9d160..3f5ea376ff771 100644 --- a/pkgs/development/python-modules/pytest-black/default.nix +++ b/pkgs/development/python-modules/pytest-black/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ black pytest toml ]; + requiredPythonModules = [ black pytest toml ]; pythonImportsCheck = [ "pytest_black" ]; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 9636d20c73b73..9279d219a1cef 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0asrrz0fgk6wqffsz1ffd6z9xyw314fwh5bwjzcq75w8w1g4ass9"; }; - propagatedBuildInputs = [ pytest ]; + requiredPythonModules = [ pytest ]; checkInputs = [ pytestCheckHook ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/pkgs/development/python-modules/pytest-click/default.nix index e271373b73ef0..5586e278c2df7 100644 --- a/pkgs/development/python-modules/pytest-click/default.nix +++ b/pkgs/development/python-modules/pytest-click/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { --replace "mock==1.0.1" "mock" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ pytest click ]; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 649e41f7d6629..32565ae08987f 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ coverage ]; + requiredPythonModules = [ coverage ]; # xdist related tests fail with the following error # OSError: [Errno 13] Permission denied: 'py/_code' diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index 55ee719cd20f8..e4afd2536189e 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "pytest-cram"; checkInputs = [ pytest ]; - propagatedBuildInputs = [ cram ]; + requiredPythonModules = [ cram ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix index 9e570a801f999..5540d9a046852 100644 --- a/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/pkgs/development/python-modules/pytest-dependency/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b"; }; - propagatedBuildInputs = [ pytest ]; + requiredPythonModules = [ pytest ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 9763e074cee9f..29f25f8629ee9 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytest setuptools_scm ]; checkInputs = [ pytest django-configurations pytest_xdist six ]; - propagatedBuildInputs = [ django ]; + requiredPythonModules = [ django ]; # Complicated. Requires Django setup. doCheck = false; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index c9c373a275252..ac8643eae8671 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "fb083925a17ce636f33997c275f61123e63372c1db11fefac1e991ed25a4ca37"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six numpy pytest diff --git a/pkgs/development/python-modules/pytest-expect/default.nix b/pkgs/development/python-modules/pytest-expect/default.nix index dfd498c6b1e16..83a55f6fa04aa 100644 --- a/pkgs/development/python-modules/pytest-expect/default.nix +++ b/pkgs/development/python-modules/pytest-expect/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ u-msgpack-python six ]; + requiredPythonModules = [ u-msgpack-python six ]; # Tests in neither the archive nor the repo doCheck = false; diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index 44a59730146c7..dad4ae1d06951 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn"; }; - propagatedBuildInputs = [ factory_boy inflection pytest ]; + requiredPythonModules = [ factory_boy inflection pytest ]; # The project uses tox, which we can't. So we simply run pytest manually. checkInputs = [ diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 6caf4d9c772e6..697da8558a2c0 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pytest pytest-doctestplus pytestcov diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index a5ed447aceac0..2dd9bddf1890a 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -5,10 +5,10 @@ buildPythonPackage rec { version = "1.0.6"; # although pytest is a runtime dependency, do not add it as - # propagatedBuildInputs in order to allow packages depend on another version + # requiredPythonModules in order to allow packages depend on another version # of pytest more easily checkInputs = [ pytest ]; - propagatedBuildInputs = [ flake8 ]; + requiredPythonModules = [ flake8 ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index 8c38544d8120f..0da2abe8a64c7 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytestpep8 pytest ]; - propagatedBuildInputs = [ pytest pyflakes ]; + requiredPythonModules = [ pytest pyflakes ]; # no longer passes doCheck = false; diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index 61c9d37267ef3..02216b6b955dd 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ pytest flask werkzeug diff --git a/pkgs/development/python-modules/pytest-freezegun/default.nix b/pkgs/development/python-modules/pytest-freezegun/default.nix index 424d8fde23267..03b1af9178930 100644 --- a/pkgs/development/python-modules/pytest-freezegun/default.nix +++ b/pkgs/development/python-modules/pytest-freezegun/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "19c82d5633751bf3ec92caa481fb5cffaac1787bd485f0df6436fd6242176949"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ freezegun pytest ]; diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 2c0c23ebdca14..baa08215c4e0f 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pytest pytest-metadata ]; + requiredPythonModules = [ pytest pytest-metadata ]; meta = with stdenv.lib; { description = "Plugin for generating HTML reports"; diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 836da1e157ffa..10c2dd6da3360 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ httpbin six ]; + requiredPythonModules = [ httpbin six ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 869466c650014..47711140227cb 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "01j0sx8yxd7sbmvwky68mvnwrxxs5bjkvi61043jzff1ga92kg9h"; }; - propagatedBuildInputs = [ isort ]; + requiredPythonModules = [ isort ]; checkInputs = [ pytest ] ++ lib.optionals isPy27 [ mock ]; diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 577400b859eb3..35ba1f3698988 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "3a5427909d1dfda10772c1bae4b9803679c0a8f04adb66c338ac607773bfefc2"; }; - propagatedBuildInputs = [ werkzeug ]; + requiredPythonModules = [ werkzeug ]; # all tests access network: does not work in sandbox doCheck = false; diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 53ab515e6f06e..a116a0b17ed58 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pytest ]; + requiredPythonModules = [ pytest ]; meta = with stdenv.lib; { description = "Plugin for accessing test session metadata"; diff --git a/pkgs/development/python-modules/pytest-mock/2.nix b/pkgs/development/python-modules/pytest-mock/2.nix index 3764a05af0572..28ceeb93c33a3 100644 --- a/pkgs/development/python-modules/pytest-mock/2.nix +++ b/pkgs/development/python-modules/pytest-mock/2.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "b35eb281e93aafed138db25c8772b95d3756108b601947f89af503f8c629413f"; }; - propagatedBuildInputs = lib.optional (!isPy3k) mock; + requiredPythonModules = lib.optional (!isPy3k) mock; nativeBuildInputs = [ setuptools_scm diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index c21175bf3381b..87341e1420da6 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "7122d55505d5ed5a6f3df940ad174b3f606ecae5e9bc379569cdcbd4cd9d2b83"; }; - propagatedBuildInputs = lib.optional (!isPy3k) mock; + requiredPythonModules = lib.optional (!isPy3k) mock; nativeBuildInputs = [ setuptools_scm diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index a239c1dbe634f..e48853e97be74 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ matplotlib nose pillow diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 368d13a913944..8a21187872871 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pytest mypy filelock ]; + requiredPythonModules = [ pytest mypy filelock ]; meta = with lib; { description = "Mypy static type checker plugin for Pytest"; diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix index bb7bdf03d00d9..7845d2e8342fd 100644 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pytest psutil ]; diff --git a/pkgs/development/python-modules/pytest-pep257/default.nix b/pkgs/development/python-modules/pytest-pep257/default.nix index 8c20cf873aba8..08dd977d94686 100644 --- a/pkgs/development/python-modules/pytest-pep257/default.nix +++ b/pkgs/development/python-modules/pytest-pep257/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ pep257 ]; + requiredPythonModules = [ pep257 ]; meta = with stdenv.lib; { homepage = "https://github.com/anderslime/pytest-pep257"; diff --git a/pkgs/development/python-modules/pytest-pep8/default.nix b/pkgs/development/python-modules/pytest-pep8/default.nix index 82a900a9d2f02..883b87ce61d47 100644 --- a/pkgs/development/python-modules/pytest-pep8/default.nix +++ b/pkgs/development/python-modules/pytest-pep8/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ pytestcache pep8 ]; + requiredPythonModules = [ pytestcache pep8 ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index f7a9a31430659..db516f93a2380 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pytest pylint six diff --git a/pkgs/development/python-modules/pytest-pythonpath/default.nix b/pkgs/development/python-modules/pytest-pythonpath/default.nix index 4194b7bd0e94c..471c820940066 100644 --- a/pkgs/development/python-modules/pytest-pythonpath/default.nix +++ b/pkgs/development/python-modules/pytest-pythonpath/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0qhxh0z2b3p52v3i0za9mrmjnb1nlvvyi2g23rf88b3xrrm59z33"; }; - propagatedBuildInputs = [ pytest ]; + requiredPythonModules = [ pytest ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix index 201da93b0187f..3f88143ab0ad2 100644 --- a/pkgs/development/python-modules/pytest-qt/default.nix +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index f3a62a79db93c..9dea7726a4e85 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ pytest-flakes pytestpep8 tox ]; + requiredPythonModules = [ pytest-flakes pytestpep8 tox ]; meta = with stdenv.lib; { license = licenses.asl20; diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix index 088f8702436fb..11aa5260e360d 100644 --- a/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/pkgs/development/python-modules/pytest-random-order/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; - propagatedBuildInputs = [ pytest ]; + requiredPythonModules = [ pytest ]; meta = with stdenv.lib; { homepage = "https://github.com/jbasko/pytest-random-order"; diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index c4523ac728c6f..c82eec9825832 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0s9cx692cdchfrjqx7fgf9wnm3fdac211a4hjq1cx9qqnbpdpl2z"; }; - propagatedBuildInputs = [ numpy factory_boy faker ]; + requiredPythonModules = [ numpy factory_boy faker ]; checkInputs = [ pytest pytest_xdist ]; diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index c9871368bbe4e..81307df89e0f1 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; checkInputs = [ pytest ]; - propagatedBuildInputs = [ six decorator ]; + requiredPythonModules = [ six decorator ]; patchPhase = '' sed -i "s/pytest>=3,<5/pytest/g" setup.py diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix index 94bc02159bf43..0bda826f67790 100644 --- a/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "e20c58d4b7c359c4975dc3c3d3d67be0905180d2368be0be3ae09b15a136cfc0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six pytest ]; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 384681eee1f9c..b9055ac2c9f08 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest ]; - propagatedBuildInputs = [ pytest ]; + requiredPythonModules = [ pytest ]; checkPhase = '' py.test test_pytest_rerunfailures.py diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix index 0044a13d2c9a5..e143cfbab89c4 100644 --- a/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/pkgs/development/python-modules/pytest-sanic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "6428ed8cc2e6cfa05b92689a8589149aacdc1f0640fcf9673211aa733e6a5209"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pytest aiohttp async_generator diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index 90b60686ee6c7..c33747edc56f2 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ pytest-shutil pytest-fixture-config psutil requests future retry ]; + requiredPythonModules = [ pytest-shutil pytest-fixture-config psutil requests future retry ]; # RuntimeError: Unable to find a free server number to start Xvfb doCheck = false; diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 93b60ecbe415f..6f641b12d48c8 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0037101eaa17e050542808ecb2e799e9b2b148f1867f62b2296329fdd2034cf5"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests psutil pytest diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index ef03762e188d7..fbb66e0eab555 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkInputs = [ cmdline pytest ]; - propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; + requiredPythonModules = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; nativeBuildInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix index dcfa203601467..868028d766ab7 100644 --- a/pkgs/development/python-modules/pytest-socket/default.nix +++ b/pkgs/development/python-modules/pytest-socket/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1jbzkyp4xki81h01yl4vg3nrg9b6shsk1ryrmkaslffyhrqnj8zh"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index d1f271ea2bcbf..66c3bd2e385af 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "b1b2186b0a72aada6859bea2a5764145e3aaa2c1cfbb23c3a19b5f7b697563d3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ termcolor pytest packaging diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index b86947f5f7586..23c935e04f21f 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "927a73dd510b90a2e4a48ea4d37e82c4490b56caa745663262024ea0cd278169"; }; - propagatedBuildInputs = [ coverage ]; + requiredPythonModules = [ coverage ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 6bf3483d40f9a..d2a076bf97ecc 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0xnsigs0kmpq1za0d4i522sp3f71x5bgpdh3ski0rs74yqy13cr0"; }; - propagatedBuildInputs = [ pytest ]; + requiredPythonModules = [ pytest ]; checkInputs = [ pytestCheckHook pexpect pytestcov ]; diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index 658ca7122f4ba..e8ddb0489a270 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # package has no tests doCheck = false; - propagatedBuildInputs = [ pytest tornado ]; + requiredPythonModules = [ pytest tornado ]; meta = with lib; { description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications."; diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix index be1e76d21e4f4..b98b9ef9305ae 100644 --- a/pkgs/development/python-modules/pytest-tornasync/default.nix +++ b/pkgs/development/python-modules/pytest-tornasync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "04cg1cfrr55dbi8nljkpcsc103i5c6p0nr46vjr0bnxgkxx03x36"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pytest tornado ]; diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index 923fe14cfacfe..b80a99af34703 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "09v2031yxm8ryhq12205ldcck76n3wwqhjjsgfmn6dxfiqb0vbw9"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ trio async_generator outcome diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix index 19e1091c8c765..0fd3411c74401 100644 --- a/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/pkgs/development/python-modules/pytest-twisted/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "cee2320becc5625050ab221b8f38533e636651a24644612f4726891fdf1f1847"; }; - propagatedBuildInputs = [ greenlet pytest decorator ]; + requiredPythonModules = [ greenlet pytest decorator ]; meta = with lib; { description = "A twisted plugin for py.test"; diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 27350efd74576..f87458667653a 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestcov mock cmdline ]; - propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ]; + requiredPythonModules = [ pytest-fixture-config pytest-shutil virtualenv ]; checkPhase = '' py.test tests/unit ''; nativeBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix index 600ffbfdc7fc8..2ef4a446a3f09 100644 --- a/pkgs/development/python-modules/pytest-warnings/default.nix +++ b/pkgs/development/python-modules/pytest-warnings/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "5939f76fe04ad18297e53af0c9fb38aca1ec74db807bd40ad72733603adbbc7d"; }; - propagatedBuildInputs = [ pytest ]; + requiredPythonModules = [ pytest ]; meta = { description = "Plugin to list Python warnings in pytest report"; diff --git a/pkgs/development/python-modules/pytest-watch/default.nix b/pkgs/development/python-modules/pytest-watch/default.nix index 12b06c2e1b63e..aff35a9c8951d 100644 --- a/pkgs/development/python-modules/pytest-watch/default.nix +++ b/pkgs/development/python-modules/pytest-watch/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # No Tests doCheck = false; - propagatedBuildInputs = [ pytest colorama docopt watchdog ]; + requiredPythonModules = [ pytest colorama docopt watchdog ]; meta = with lib; { homepage = "https://github.com/joeyespo/pytest-watch"; diff --git a/pkgs/development/python-modules/pytest-xdist/2.nix b/pkgs/development/python-modules/pytest-xdist/2.nix index cc58c5ab6bde4..ebd4acda39b47 100644 --- a/pkgs/development/python-modules/pytest-xdist/2.nix +++ b/pkgs/development/python-modules/pytest-xdist/2.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm pytest_6 ]; checkInputs = [ pytest_6 filelock ]; - propagatedBuildInputs = [ execnet pytest-forked psutil six ]; + requiredPythonModules = [ execnet pytest-forked psutil six ]; # pytest6 doesn't allow for new lines # capture_deprecated not compatible with latest pytest6 diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 6dc4b666db54f..4096c89d4756f 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm pytest ]; checkInputs = [ pytest filelock ]; - propagatedBuildInputs = [ execnet pytest-forked psutil six ]; + requiredPythonModules = [ execnet pytest-forked psutil six ]; # Encountered a memory leak # https://github.com/pytest-dev/pytest-xdist/issues/462 diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 1dd11133a6290..ac2d270e985be 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ psutil pytest ]; + requiredPythonModules = [ psutil pytest ]; # Remove test QoL package from install_requires postPatch = '' diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix index 64078d68a8b88..119cba76590ba 100644 --- a/pkgs/development/python-modules/pytest-xvfb/default.nix +++ b/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1kyq5rg27dsnj7dc6x9y7r8vwf8rc88y2ppnnw6r96alw0nn9fn4"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pytest virtual-display ]; diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index 43cfe6c822c4f..87fd9eea37244 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] + requiredPythonModules = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix index 2b45c330cf385..05f94108f6215 100644 --- a/pkgs/development/python-modules/pytest/5.nix +++ b/pkgs/development/python-modules/pytest/5.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis pygments ]; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ atomicwrites attrs more-itertools diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 93282218871ab..632c3890e9475 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis pygments ]; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ atomicwrites attrs iniconfig diff --git a/pkgs/development/python-modules/pytestcache/default.nix b/pkgs/development/python-modules/pytestcache/default.nix index f2427991e3f24..8b6cc11cc60dd 100644 --- a/pkgs/development/python-modules/pytestcache/default.nix +++ b/pkgs/development/python-modules/pytestcache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ execnet ]; + requiredPythonModules = [ execnet ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix index 3b55811f4e47c..5557ac0917dfa 100644 --- a/pkgs/development/python-modules/python-axolotl/default.nix +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1bwdp24fmriffwx91aigs9k162albb51iskp23nc939z893q23py"; }; - propagatedBuildInputs = [ cryptography python-axolotl-curve25519 protobuf ]; + requiredPythonModules = [ cryptography python-axolotl-curve25519 protobuf ]; meta = with lib; { homepage = "https://github.com/tgalal/python-axolotl"; diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 1ad3a5128be68..279c4c7fa4fae 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; # Tries to test multiple interpreters with tox checkInputs = [ pytest requests-mock tox ]; - propagatedBuildInputs = [ autobahn certifi chardet cryptography dateparser pyopenssl requests service-identity twisted ]; + requiredPythonModules = [ autobahn certifi chardet cryptography dateparser pyopenssl requests service-identity twisted ]; meta = { description = "Binance Exchange API python implementation for automated trading"; diff --git a/pkgs/development/python-modules/python-csxcad/default.nix b/pkgs/development/python-modules/python-csxcad/default.nix index 885208e0e61ca..6beebddbce713 100644 --- a/pkgs/development/python-modules/python-csxcad/default.nix +++ b/pkgs/development/python-modules/python-csxcad/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ openems csxcad numpy diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index d8b501d62e5a1..da7f9282e7e67 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ twine ]; - propagatedBuildInputs = [ docutils lockfile ]; + requiredPythonModules = [ docutils lockfile ]; checkInputs = [ pytest_4 mock testscenarios ]; checkPhase = '' diff --git a/pkgs/development/python-modules/python-didl-lite/default.nix b/pkgs/development/python-modules/python-didl-lite/default.nix index e160c1aa623f7..b7b41581fca59 100644 --- a/pkgs/development/python-modules/python-didl-lite/default.nix +++ b/pkgs/development/python-modules/python-didl-lite/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0jf1d5m4r8qd3pn0hh1xqbkblkx9wzrrcmk7qa7q8lzfysp4z217"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ defusedxml ]; diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index 025a13958cd07..9943fb204573c 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ behave mock pyparsing pytest ]; - propagatedBuildInputs = [ lxml ]; + requiredPythonModules = [ lxml ]; checkPhase = '' py.test tests diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index dd9191835a447..8e861b48ab919 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0gf3r4xvqk9ai1k3ka8c4dlblqhs7286zbd1b20adn953fdcj44c"; }; - propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ]; + requiredPythonModules = [ click ] ++ lib.optionals isPy27 [ typing ]; checkInputs = [ ipython mock pytest sh ]; diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 4e3cffa9d223c..d66a6eec0ab54 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { buildInputs = [ enlightenment.efl ]; - propagatedBuildInputs = [ dbus-python ]; + requiredPythonModules = [ dbus-python ]; preConfigure = '' NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE" diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index a74ee0455f2f1..e435988a3e7f9 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "1hn5nnxp7y2dpf52vrwdxza2sqmzj8admcnwgjkmcxk65s2dhvy1"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six ]; diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix index 714c324b44051..aac5584caade7 100644 --- a/pkgs/development/python-modules/python-etcd/default.nix +++ b/pkgs/development/python-modules/python-etcd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ nose mock pyopenssl ]; - propagatedBuildInputs = [ urllib3 dnspython ]; + requiredPythonModules = [ urllib3 dnspython ]; postPatch = '' sed -i '19s/dns/"dnspython"/' setup.py diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/pkgs/development/python-modules/python-forecastio/default.nix index 7ef2eee4f2e51..f7df850d9e801 100644 --- a/pkgs/development/python-modules/python-forecastio/default.nix +++ b/pkgs/development/python-modules/python-forecastio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; - propagatedBuildInputs = [ requests responses ]; + requiredPythonModules = [ requests responses ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 6108ea74a23af..3d63539f9fa53 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "68b42aafd4b620ab2534ff78a52584c7f799e4e55d5ac297eab4263066e6f74b"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ mock httmock pytest responses ]; diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index 51d544eb5f81a..914c59f23ca02 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ igraph ]; - propagatedBuildInputs = [ texttable ]; + requiredPythonModules = [ texttable ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index 06a5d234ecf6d..a352017da6d98 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }; buildInputs = [ mock ]; - propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ]; + requiredPythonModules = [ pbr pyyaml setuptools six multi_key_dict requests ]; checkInputs = [ unittest2 testscenarios requests-mock ]; checkPhase = '' diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 6b8104516ea91..8534bedff8308 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { "test_key_too_short" ]; - propagatedBuildInputs = [ future six ecdsa rsa ]; + requiredPythonModules = [ future six ecdsa rsa ]; meta = with stdenv.lib; { homepage = "https://github.com/mpdavis/python-jose"; diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 12ad5170a7c5c..74ed3e8c3691d 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ future ujson ] + requiredPythonModules = [ future ujson ] ++ stdenv.lib.optional (pythonOlder "3.2") futures; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 4558bc7edba48..1754904bbe234 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { "test_numpy_hover" ] ++ stdenv.lib.optional isPy27 "test_flake8_lint"; - propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ] + requiredPythonModules = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ] ++ stdenv.lib.optional (withProvider "autopep8") autopep8 ++ stdenv.lib.optional (withProvider "mccabe") mccabe ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix index 3f543e8569b91..48addf096cf70 100644 --- a/pkgs/development/python-modules/python-ldap-test/default.nix +++ b/pkgs/development/python-modules/python-ldap-test/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1qh9x3lncaldnw79fgpqbayichs8pbz8abr6pxb5qxbs7zrnyrwf"; }; - propagatedBuildInputs = [ py4j ]; + requiredPythonModules = [ py4j ]; # Tests needs java to be present in path doCheck = false; diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index e9317d3f7c67f..a5a075004428b 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm pkgconfig pytestrunner ]; checkInputs = [ pytest pytestcov psutil ]; - propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; + requiredPythonModules = lib.optionals (!isPy3k) [ future ]; # give a hint to setuptools_scm on package version preBuild = '' diff --git a/pkgs/development/python-modules/python-lzo/default.nix b/pkgs/development/python-modules/python-lzo/default.nix index 5025b86361a30..8970c7360c7ed 100644 --- a/pkgs/development/python-modules/python-lzo/default.nix +++ b/pkgs/development/python-modules/python-lzo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ lzo ]; - propagatedBuildInputs = [ ]; + requiredPythonModules = [ ]; checkInputs = [ nose ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 61cd5e34855ce..96eb2b426e47d 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -55,7 +55,7 @@ in buildPythonPackage rec { proj zlib ]); - propagatedBuildInputs = [ pillow pycairo ]; + requiredPythonModules = [ pillow pycairo ]; meta = with stdenv.lib; { description = "Python bindings for Mapnik"; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 6bd140ae5b4c3..8de0f3a47f3bf 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ''; checkInputs = [ pytest pytest-mock]; - propagatedBuildInputs = [ appdirs click construct croniter cryptography importlib-metadata zeroconf attrs pytz tqdm netifaces ]; + requiredPythonModules = [ appdirs click construct croniter cryptography importlib-metadata zeroconf attrs pytz tqdm netifaces ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 82ee7e2092415..8caba978264f5 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # 'mpv-jsonipc' does not have any tests doCheck = false; - propagatedBuildInputs = [ requests tqdm websocket_client ]; + requiredPythonModules = [ requests tqdm websocket_client ]; pythonImportsCheck = [ "python_mpv_jsonipc" ]; diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index c279234248723..96aabec38a0a4 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pyyaml ]; - propagatedBuildInputs = [ + requiredPythonModules = [ six ]; diff --git a/pkgs/development/python-modules/python-nest/default.nix b/pkgs/development/python-modules/python-nest/default.nix index c894654e41e68..bc5574e298188 100644 --- a/pkgs/development/python-modules/python-nest/default.nix +++ b/pkgs/development/python-modules/python-nest/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "12iyypbl92ybh8w1bf4z0c2g0sb9id2c07c89vzvnlxgjylw3wbi"; }; - propagatedBuildInputs = [ python-dateutil requests six sseclient-py ]; + requiredPythonModules = [ python-dateutil requests six sseclient-py ]; # has no tests doCheck = false; pythonImportsCheck = [ "nest" ]; diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index f03b3b10e4871..da0d10f8936f0 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0ivkfdrmb4wpyawvwrgm3jvx6hn49vqjpwbkmkmamigghqqwacx3"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # Tests require nomad agent doCheck = false; diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix index b1e01f7f4abfa..1c1f76f34b696 100644 --- a/pkgs/development/python-modules/python-olm/default.nix +++ b/pkgs/development/python-modules/python-olm/default.nix @@ -12,7 +12,7 @@ buildPythonPackage { make include/olm/olm.h ''; - propagatedBuildInputs = [ + requiredPythonModules = [ cffi future ] ++ lib.optionals (!isPy3k) [ typing ]; diff --git a/pkgs/development/python-modules/python-openems/default.nix b/pkgs/development/python-modules/python-openems/default.nix index dd669cf547545..efd59060292df 100644 --- a/pkgs/development/python-modules/python-openems/default.nix +++ b/pkgs/development/python-modules/python-openems/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { boost ]; - propagatedBuildInputs = [ + requiredPythonModules = [ openems csxcad python-csxcad diff --git a/pkgs/development/python-modules/python-otr/default.nix b/pkgs/development/python-modules/python-otr/default.nix index d83d259724506..b77d217aed0d2 100644 --- a/pkgs/development/python-modules/python-otr/default.nix +++ b/pkgs/development/python-modules/python-otr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "0p3b1n8jlxwd65gbk2k5007fkhdyjwcvr4982s42hncivxvabzzy"; }; - propagatedBuildInputs = [ zope_interface cryptography application gmpy2 ]; + requiredPythonModules = [ zope_interface cryptography application gmpy2 ]; meta = with stdenv.lib; { description = "A pure python implementation of OTR"; diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix index 420efb40039e4..d704c8eda14de 100644 --- a/pkgs/development/python-modules/python-packer/default.nix +++ b/pkgs/development/python-modules/python-packer/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0rgmkyn7i6y1xs8m75dpl8hq7j2ns2s3dvp7kv9j4zwic93rrlsc"; }; - propagatedBuildInputs = [ sh ]; + requiredPythonModules = [ sh ]; # Tests requires network connections doCheck = false; diff --git a/pkgs/development/python-modules/python-pipedrive/default.nix b/pkgs/development/python-modules/python-pipedrive/default.nix index e21f01d5cd6b3..18f83af54c7a4 100644 --- a/pkgs/development/python-modules/python-pipedrive/default.nix +++ b/pkgs/development/python-modules/python-pipedrive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0f8qiyl82bpwxwjw2746vdvkps2010mvn1x9b6j6ppmifff2d4pl"; }; - propagatedBuildInputs = [ httplib2 ]; + requiredPythonModules = [ httplib2 ]; doCheck = false; # Tests are not provided. diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index 5eff4707d4e26..7b021179f71ca 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # requires distorm, which is optionally doCheck = false; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { description = "Python binding of ptrace library"; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index defd5430f2ee0..89b98499d75ae 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # buildInputs = [ ]; checkInputs = [ pytest pytz ]; - # propagatedBuildInputs = [ ]; + # requiredPythonModules = [ ]; checkPhase = '' pytest tests diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 2ee21137141a1..a7a98494cc378 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pytest tests/ ''; - propagatedBuildInputs = [ redis ] + requiredPythonModules = [ redis ] ++ stdenv.lib.optional withDjango django_redis; diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix index ea3d1bfb444a8..4955353b4f8e8 100644 --- a/pkgs/development/python-modules/python-sat/default.nix +++ b/pkgs/development/python-modules/python-sat/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1gckxhqkvzyw7pmwg8xzxq146jysqy0s23l5mjc3awm6swdij66y"; }; - propagatedBuildInputs = [ six pypblib ]; + requiredPythonModules = [ six pypblib ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 30ce55a12a0cb..3ad2bc028250f 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270"; }; - propagatedBuildInputs = [ text-unidecode ]; + requiredPythonModules = [ text-unidecode ]; checkPhase = '' ${python.interpreter} test.py diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix index 06e1185e3430a..b18a679b6d8b4 100644 --- a/pkgs/development/python-modules/python-snap7/default.nix +++ b/pkgs/development/python-modules/python-snap7/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "169zd1nxq86nmi6132vxl1f6wxm9w3waihq2wn14kkmld1vkmvfd"; }; - propagatedBuildInputs = [ setuptools six ]; + requiredPythonModules = [ setuptools six ]; prePatch = '' substituteInPlace snap7/common.py \ diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index 084c66e172ad0..fd598a00d9912 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ snappy ]; - propagatedBuildInputs = lib.optional isPyPy cffi; + requiredPythonModules = lib.optional isPyPy cffi; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index cbddc023a152d..5a53f161226cf 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "358d8fbbc029c4538ea25bcaa283e47f375be0017fcba829de8a3a731c9df25a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six python-engineio ]; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 0552b18f80025..914b6c8804270 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ certifi future urllib3 tornado decorator ]; + requiredPythonModules = [ certifi future urllib3 tornado decorator ]; # --with-upstream-urllib3 is not working properly postPatch = '' diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix index 6210c13f56e84..d04060f9658d8 100644 --- a/pkgs/development/python-modules/python-twitter/default.nix +++ b/pkgs/development/python-modules/python-twitter/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ future requests requests_oauthlib ]; + requiredPythonModules = [ future requests requests_oauthlib ]; checkInputs = [ pytest responses hypothesis ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix index eddf0deb015c9..e7acf296d81f7 100644 --- a/pkgs/development/python-modules/python-u2flib-host/default.nix +++ b/pkgs/development/python-modules/python-u2flib-host/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "02pwafd5kyjpc310ys0pgnd0adff1laz18naxxwsfrllqafqnrxb"; }; - propagatedBuildInputs = [ requests hidapi ]; + requiredPythonModules = [ requests hidapi ]; # Tests fail: "ValueError: underlying buffer has been detached" doCheck = false; diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 936a1eb2e3ed5..b726cf0935894 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { py.test tests ''; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with lib; { description = "Module with some convenient utilities"; diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index cdafd3cd2a0f5..b96c0aea21ca1 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "f148d4534e3a4dda9050a6a038868594c1216ea2413f2144ca6697e0e20c9cad"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ oath pycryptodome requests diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index 6f83f587f5880..b291a9e71d22d 100644 --- a/pkgs/development/python-modules/python-vlc/default.nix +++ b/pkgs/development/python-modules/python-vlc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "a4d3bdddfce84a8fb1b2d5447193a0239c55c16ca246e5194d48efd59c4e236b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index e5d7a7f0326d5..6b819252836bd 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { checkInputs = stdenv.lib.optionals (pythonOlder "3.3") [ mock ]; - propagatedBuildInputs = [ pytz ]; + requiredPythonModules = [ pytz ]; postPatch = '' substituteInPlace libxmp/exempi.py \ diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix index 2a85482cbb68c..376c902ef1fa1 100644 --- a/pkgs/development/python-modules/python3-openid/default.nix +++ b/pkgs/development/python-modules/python3-openid/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1bxf9a3ny1js422j962zfzl4a9dhj192pvai05whn7j0iy9gdyrk"; }; - propagatedBuildInputs = [ defusedxml ]; + requiredPythonModules = [ defusedxml ]; doCheck = false; diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index 8c9cac7576155..e7dbedad00e50 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "efb675929ebf588c2deffa2058ff407e65d1889bca1b545a58f525135367c9e4"; }; - propagatedBuildInputs = [ kitchen requests bunch paver lockfile + requiredPythonModules = [ kitchen requests bunch paver lockfile six munch urllib3 beautifulsoup4 openidc-client ]; doCheck = false; diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index d3f1a0a81204a..d4d0a45291afe 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ systemd libyaml openzwave cython ]; - propagatedBuildInputs = [ six urwid pydispatcher pyserial ]; + requiredPythonModules = [ six urwid pydispatcher pyserial ]; # primary location for the .xml files is in /etc/openzwave so we override the # /usr/local/etc lookup instead as that allows us to dump new .xml files into diff --git a/pkgs/development/python-modules/pythonirclib/default.nix b/pkgs/development/python-modules/pythonirclib/default.nix index 6074b76d300ac..331d7907c2cb4 100644 --- a/pkgs/development/python-modules/pythonirclib/default.nix +++ b/pkgs/development/python-modules/pythonirclib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { patchFlags = [ "irclib.py" ]; - propagatedBuildInputs = [ paver ]; + requiredPythonModules = [ paver ]; meta = with stdenv.lib; { description = "Python IRC library"; diff --git a/pkgs/development/python-modules/pytmx/default.nix b/pkgs/development/python-modules/pytmx/default.nix index aa6eecfdeb53c..418d1154c7674 100644 --- a/pkgs/development/python-modules/pytmx/default.nix +++ b/pkgs/development/python-modules/pytmx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0480pr61v54bwdyzb983sk0fqkyfbcgrdn8k11yf1yck4zb119gc"; }; - propagatedBuildInputs = [ pygame pyglet pysdl2 six ]; + requiredPythonModules = [ pygame pyglet pysdl2 six ]; checkPhase = '' python -m unittest tests.pytmx.test_pytmx diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 4add5ac5e8571..c3838d906b343 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ decorator appdirs six diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 63991752a8ac2..063eea8aea690 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "12zhq4pnfcwbgcx7cs99c751gp3w0ysaf5ykv2lv8f4i360w3r5a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ future pytorch pyyaml diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index daf6accb89355..58884bf186915 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "0c2dyi4qi7clln43481xq66f6r4fadrz84jphjc5phz97bp33ds8"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy pytorch scikitlearn diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index f073c408f7098..d70e8b365d12d 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -37,7 +37,7 @@ in buildPythonPackage { patchelf ]; - propagatedBuildInputs = [ + requiredPythonModules = [ future numpy pyyaml diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 4635f813c3a6c..38514f2c03148 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -212,7 +212,7 @@ in buildPythonPackage rec { ++ lib.optionals cudaSupport [ cudnn magma nccl ] ++ lib.optionals stdenv.isLinux [ numactl ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cffi click numpy diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix index 8317c5ea0182f..29557ed7ef697 100644 --- a/pkgs/development/python-modules/pytrends/default.nix +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; - propagatedBuildInputs = [ requests lxml pandas ]; + requiredPythonModules = [ requests lxml pandas ]; meta = with stdenv.lib; { description = "Pseudo API for Google Trends"; diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix index c703a8fe30c4a..29c7a3be82591 100644 --- a/pkgs/development/python-modules/pyu2f/default.nix +++ b/pkgs/development/python-modules/pyu2f/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { rm pyu2f/tests/hid/macos_test.py ''; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytest six mock pyfakefs unittest2 ]; diff --git a/pkgs/development/python-modules/pyuavcan/default.nix b/pkgs/development/python-modules/pyuavcan/default.nix index ff01ea90e227a..ab469ec4bbd8f 100644 --- a/pkgs/development/python-modules/pyuavcan/default.nix +++ b/pkgs/development/python-modules/pyuavcan/default.nix @@ -13,7 +13,7 @@ sha256 = "0fmbmdnnh679zkllv5m6pkrasg7m9vjwabqnmz5m7flrgdh6h4qa"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy nunavut pyserial diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index aabf9cd5de521..127317b9b5f8c 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; checkInputs = [ pytest mock hypothesis docutils ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index ed2dd4cc25649..5328cb2e0923d 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "b52d1b0d87365fcfed8572b5dbd8d675bffece4ab3484bf083863f278c727d3d"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; meta = with stdenv.lib; { description = "API towards Ubiquity Networks UniFi controller"; diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index 9ce93d67a52ad..e9792083f8b97 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "016f50853b4d72e5ddb963b042caa45fb60fa4d3f13aee819d829af21e55ef07"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # As of 0.2.16, pyupdate is intimately tied to Home Assistant which is py3 only disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index a943c8eb523ba..245d44eeeab94 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []); - propagatedBuildInputs = [ twisted ]; + requiredPythonModules = [ twisted ]; # Tests fail because they try to write new code into the twisted # package, apparently some kind of plugin. diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix index 3877db3254b77..02d9daa19f3b7 100644 --- a/pkgs/development/python-modules/pyutilib/default.nix +++ b/pkgs/development/python-modules/pyutilib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0bdb5hlj6kyb9m3xnpxzasfv5psnxfj21qx6md8ym8zkcqyq1qs5"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ nose six ]; diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 11fe52d553a9d..86a714eeb67dd 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 0f5f9a4b43ad5..9b31ae5b3ca01 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ glib vips ]; - propagatedBuildInputs = [ cffi ]; + requiredPythonModules = [ cffi ]; # tests are not included in pypi tarball doCheck = false; diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index 260311a51ad6e..82aa8a069fe6a 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "cd9649a9ea9dfcb9b34d78f9a64e1870aa8b6b94de546e2c99c6bb53d64ab5d1"; }; - propagatedBuildInputs = [ param ]; + requiredPythonModules = [ param ]; # there are not tests with the package doCheck = false; diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 25845c9847a30..6ee1da962b3e8 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # requires old version of vcrpy doCheck = false; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; meta = with lib; { description = "Python SDK for the VMware vSphere API that allows you to manage ESX, ESXi, and vCenter"; diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index 66c996a487ba9..9dcc212a767e9 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { buildInputs = [ cython ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; # Somehow nosetests doesn't run the tests, so let's use pytest instead doCheck = false; # tests use relative paths, which fail to resolve diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index e944f693503ef..6c0b09ce3e6bc 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "a6c53d9426326e0e722a5b1af3a1d55810259cb3afa92ca5e4029a6d533cab37"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ mock pbr ply diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index 5bb8989506f21..505381800f078 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "596c74020f9cbabc99f7964127ab0bb6cc045fcfe781b7c73cffb3ea45947820"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ http-ece py-vapid requests ]; diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 545fb23673225..438fcd90b9429 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "015z7n0hdgkzn0p7aw1xsv6lwc260p8q67jx0zyd1zghnwyj8k79"; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + requiredPythonModules = lib.optionals (pythonOlder "3.7") [ importlib-resources ]; checkInputs = [ pytest xvfb_run ]; diff --git a/pkgs/development/python-modules/pywick/default.nix b/pkgs/development/python-modules/pywick/default.nix index c675686ef8332..e199e1841f936 100644 --- a/pkgs/development/python-modules/pywick/default.nix +++ b/pkgs/development/python-modules/pywick/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sha256 = "1gmlifnv9kji0d1jwg1pa8d96zg48w17qg0sgxwy1y1jf3hn37bm"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ h5py hickle numpy pandas pillow six pytorch torchvision tqdm ]; diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index 798364afd0d22..d7bc685d49cd8 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; checkInputs = [ mock pytest ]; - propagatedBuildInputs = [ requests requests_ntlm six kerberos xmltodict ]; + requiredPythonModules = [ requests requests_ntlm six kerberos xmltodict ]; meta = with lib; { description = "Python library for Windows Remote Management"; diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix index 2c2557537228b..0f6f4110799f3 100644 --- a/pkgs/development/python-modules/pyxnat/default.nix +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "113d13cs5ab7wy4vmyqyh8isjhlgfvan7y2g8n25vcpn3j4j00h0"; }; - propagatedBuildInputs = [ lxml requests ]; + requiredPythonModules = [ lxml requests ]; checkInputs = [ nose ]; checkPhase = "nosetests pyxnat/tests"; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index f23d86eb4b73d..10eacfa1a6428 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ pytest tornado ]; buildInputs = [ zeromq ]; - propagatedBuildInputs = [ py ]; + requiredPythonModules = [ py ]; # test_socket.py seems to be hanging # others fail diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix index 2c5121e61e807..f16727bc7af9f 100644 --- a/pkgs/development/python-modules/pyzufall/default.nix +++ b/pkgs/development/python-modules/pyzufall/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; checkInputs = [ nose coverage ]; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; checkPhase = '' ${python.interpreter} setup.py nosetests diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix index 962ba62f509c1..f4f7722e071e4 100644 --- a/pkgs/development/python-modules/qasm2image/default.nix +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -24,7 +24,7 @@ buildPythonPackage { disabled = pythonOlder "3.5"; - propagatedBuildInputs = [ + requiredPythonModules = [ cairocffi cairosvg cffi diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix index 6b9b94b603f42..b18503200fb89 100644 --- a/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/pkgs/development/python-modules/qdarkstyle/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - propagatedBuildInputs = [ helpdev qtpy ]; + requiredPythonModules = [ helpdev qtpy ]; meta = with lib; { description = "A dark stylesheet for Python and Qt applications"; diff --git a/pkgs/development/python-modules/qds_sdk/default.nix b/pkgs/development/python-modules/qds_sdk/default.nix index 56b3f36c367c8..1ab2562291af9 100644 --- a/pkgs/development/python-modules/qds_sdk/default.nix +++ b/pkgs/development/python-modules/qds_sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "0xxg9s0y6fz7vb1kab4q93q7ryi71z8x6q9qspm6s506yr3mc67l"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ boto inflection requests diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/pkgs/development/python-modules/qimage2ndarray/default.nix index a7c0fa3ff4a4c..7deae274b2073 100644 --- a/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy pyqt5 ]; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 8e73e942be92f..3e4c634b8e3a5 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { muparserx ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cvxpy cython # generates some cython files at runtime that need to be cython-ized numpy diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index c90f9ddf2e2c2..b07d4393be19a 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. - propagatedBuildInputs = [ + requiredPythonModules = [ # cplex cvxpy docplex diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index eaf10fd60829d..9f506764c4385 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { sha256 = "0rrpwr4a82j69j5ibl2g0nw8wbpg201cfz6f234k2v6pj500x9nl"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ arrow nest-asyncio qiskit-terra diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index d40afe43f9e7a..0a26f49550128 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sha256 = "07mxhaknkp121xm6mgrpcrbj9qw6j924ra3k0s6vr8qgvfcxvh0y"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy qiskit-terra scikitlearn diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index aad0370c3d7c5..2347d39c30242 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ dill fastjsonschema jsonschema diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 46fcf49859746..65a2adae11411 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "1r23pjnql49gczf4k4m6ir5rr95gqdxjrks60p8a93d243mxx3c9"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ qiskit-aer qiskit-aqua qiskit-ibmq-provider diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index 714c741889763..a9ca50e78e3de 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369"; }; - propagatedBuildInputs = [ six pillow pymaging_png setuptools ]; + requiredPythonModules = [ six pillow pymaging_png setuptools ]; checkInputs = [ mock ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/qreactor/default.nix b/pkgs/development/python-modules/qreactor/default.nix index dc2031c702873..a408bd4c4c1c0 100644 --- a/pkgs/development/python-modules/qreactor/default.nix +++ b/pkgs/development/python-modules/qreactor/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.0"; - propagatedBuildInputs = [ + requiredPythonModules = [ twisted qtpy ]; diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 2ee9c82f08db7..cfb64f4bb38e0 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -12,7 +12,7 @@ buildPythonPackage { nativeBuildInputs = [ sip qtbase ]; buildInputs = [ qscintilla ]; - propagatedBuildInputs = [ pyqt5 ]; + requiredPythonModules = [ pyqt5 ]; postPatch = '' substituteInPlace Python/configure.py \ diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 6ec8ce367735a..49a249405fe53 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "d612a313e531966d17f5a8fb7604faba961cf7ce3c77a9168c6f60e60140b767"; }; - propagatedBuildInputs = [ qtpy six ]; + requiredPythonModules = [ qtpy six ]; checkInputs = [ pyqt5 pytest ]; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 4d1123aaa78a0..fce33a9245da6 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; - propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5 qtpy]; + requiredPythonModules = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5 qtpy]; # : cannot connect to X server doCheck = false; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 313b1266a52d9..215d409fc3be7 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"; }; - # no concrete propagatedBuildInputs as multiple backends are supposed + # no concrete requiredPythonModules as multiple backends are supposed checkInputs = [ pyside pytest ]; doCheck = false; # require X diff --git a/pkgs/development/python-modules/quamash/default.nix b/pkgs/development/python-modules/quamash/default.nix index ed52c191c2278..d0a62f9c5ec6b 100644 --- a/pkgs/development/python-modules/quamash/default.nix +++ b/pkgs/development/python-modules/quamash/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "117rp9r4lz0kfz4dmmpa35hp6nhbh6b4xq0jmgvqm68g9hwdxmqa"; }; - propagatedBuildInputs = [ pyqt ]; + requiredPythonModules = [ pyqt ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index 33fc54241d9a4..9d5c80158bd1b 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { factory_boy ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pandas numpy requests diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index ca6d8f0cfdb32..a9e3ced73a50b 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "12qx6cgib3wxmm2cvann4zw4jnhhn24ms61ifq9f3jbh31nn6gd3"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; checkPhase = '' ${python.interpreter} setup.py test -V 1 diff --git a/pkgs/development/python-modules/querystring-parser/default.nix b/pkgs/development/python-modules/querystring-parser/default.nix index f9d04a8f797c5..209fb13c29ad2 100644 --- a/pkgs/development/python-modules/querystring-parser/default.nix +++ b/pkgs/development/python-modules/querystring-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "644fce1cffe0530453b43a83a38094dbe422ccba8c9b2f2a1c00280e14ca8a62"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six ]; diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix index 9844c8dca4438..d55d68d72f52a 100644 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ b/pkgs/development/python-modules/rabbitpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0m5z3i3d5adrz1wh6y35xjlls3cq6p4y9p1mzghw3k7hdvg26cck"; }; - propagatedBuildInputs = [ pamqp ]; + requiredPythonModules = [ pamqp ]; checkInputs = [ mock nose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix index 8ed5c720ef317..c433295289e1e 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio_beam/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0g1nqiikv023ab60gfqrvc13kfjv8m70bpfk264vlliaq6mvxdf2"; }; - propagatedBuildInputs = [ astropy ]; + requiredPythonModules = [ astropy ]; nativeBuildInputs = [ astropy-helpers ]; diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index b2d22346dd74e..9faa80686d831 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { sha256 = "1k7l0j8w221pa6k990x4rfm7km4asx5zy4zpzvh029lb9nw2pp8b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ lark-parser click colorful diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix index 0f870a5ab7a1b..53f36533f33f9 100644 --- a/pkgs/development/python-modules/ramlfications/default.nix +++ b/pkgs/development/python-modules/ramlfications/default.nix @@ -25,5 +25,5 @@ buildPythonPackage rec { buildInputs = [ mock pytest pytest-mock pytest-server-fixtures pytest-localserver ]; - propagatedBuildInputs = [ termcolor click markdown2 six jsonref pyyaml xmltodict attrs ]; + requiredPythonModules = [ termcolor click markdown2 six jsonref pyyaml xmltodict attrs ]; } diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 236970a5d3439..147dcee210b1c 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; nativeBuildInputs = [ cython gdal ]; - propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; + requiredPythonModules = [ gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; meta = with lib; { description = "Python package to read and write geospatial raster data"; diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 45a408640b520..e5e2e39bdc65a 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # see https://github.com/getsentry/raven-python/blob/master/setup.py doCheck = false; - propagatedBuildInputs = [ blinker ] ++ lib.optionals (!isPy3k) [ contextlib2 ]; + requiredPythonModules = [ blinker ] ++ lib.optionals (!isPy3k) [ contextlib2 ]; meta = { description = "A Python client for Sentry (getsentry.com)"; diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index 477a11f2ce907..e40ccf4e92307 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "577c2f8bbf88f77bda84ee95af0310b59111c156f48a5aab56ca481e2f77eaf4"; }; - propagatedBuildInputs = [ six texttable tqdm colorama setuptools ]; + requiredPythonModules = [ six texttable tqdm colorama setuptools ]; # The kgb test dependency is not in nixpkgs doCheck = false; diff --git a/pkgs/development/python-modules/rdflib-jsonld/default.nix b/pkgs/development/python-modules/rdflib-jsonld/default.nix index 6e038dd334333..ecde9d76fd119 100644 --- a/pkgs/development/python-modules/rdflib-jsonld/default.nix +++ b/pkgs/development/python-modules/rdflib-jsonld/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ nose ]; - propagatedBuildInputs = [ rdflib ]; + requiredPythonModules = [ rdflib ]; meta = with lib; { homepage = "https://github.com/RDFLib/rdflib-jsonld"; diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 261ba794e70a6..29c6750393775 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0mdi7xh4zcr3ngqwlgqdqf0i5bxghwfddyxdng1zwpiqkpa9s53q"; }; - propagatedBuildInputs = [isodate html5lib SPARQLWrapper ]; + requiredPythonModules = [isodate html5lib SPARQLWrapper ]; checkInputs = [ networkx nose ]; diff --git a/pkgs/development/python-modules/readme/default.nix b/pkgs/development/python-modules/readme/default.nix index 057283babe7b5..e3754e76fe258 100644 --- a/pkgs/development/python-modules/readme/default.nix +++ b/pkgs/development/python-modules/readme/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ readme_renderer ]; diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 9ffb986b9f5ab..602e18e5d9d33 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ + requiredPythonModules = [ bleach cmarkgfm docutils future pygments six ]; diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 1a97320dc36a9..41b43b3d03198 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1d8343982cae238da82c809dcbd82d53f9560b50e17b1dd727123f576385139d"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ pytest mock sphinx ]; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index f1591e4df7415..07011a44aa07f 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # Some kind of trickery with imports that doesn't work. doCheck = false; buildInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ six regex ]; + requiredPythonModules = [ six regex ]; meta = with stdenv.lib; { homepage = "https://github.com/Toilal/rebulk/"; diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index 8ad1e6f7dfa8b..e90c44b8244ae 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ CommonMark docutils sphinx ]; + requiredPythonModules = [ CommonMark docutils sphinx ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/development/python-modules/redbaron/default.nix b/pkgs/development/python-modules/redbaron/default.nix index 841d6a31fb2ca..16b5f571f35db 100644 --- a/pkgs/development/python-modules/redbaron/default.nix +++ b/pkgs/development/python-modules/redbaron/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0bqkq0wn20cc3qrcd1ifq74p4m570j345bkq4axl08kbr8whfba7"; }; - propagatedBuildInputs = [ baron ]; + requiredPythonModules = [ baron ]; preCheck = '' rm -rf tests/__pycache__ diff --git a/pkgs/development/python-modules/rednose/default.nix b/pkgs/development/python-modules/rednose/default.nix index 948fe39dae7d9..674185a60daaa 100644 --- a/pkgs/development/python-modules/rednose/default.nix +++ b/pkgs/development/python-modules/rednose/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = !(isPy27 || (stdenv.isDarwin && pythonAtLeast "3.8")); checkInputs = [ six ]; - propagatedBuildInputs = [ nose colorama termstyle ]; + requiredPythonModules = [ nose colorama termstyle ]; meta = with stdenv.lib; { description = "A python nose plugin adding color to console results"; diff --git a/pkgs/development/python-modules/regional/default.nix b/pkgs/development/python-modules/regional/default.nix index 26f0755b3fe11..04ac36435781d 100644 --- a/pkgs/development/python-modules/regional/default.nix +++ b/pkgs/development/python-modules/regional/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "03qgm35q9sa5cy0kkw4bj60zfylw0isfzb96nlhdfrsigzs2zkxv"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy matplotlib diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index ebe3dc772d72a..136ef128ae0be 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ sphinx pytestcov pytest ]; - propagatedBuildInputs = [ Mako numpy funcsigs ] + requiredPythonModules = [ Mako numpy funcsigs ] ++ stdenv.lib.optional withCuda pycuda ++ stdenv.lib.optional withOpenCL pyopencl; diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index b723cd0b1858d..8ef16ee6c1f8b 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0753e78b235b1e8da275509351257a861cf2cf9fafe1b414f8c1deb858a4f94e"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ genshi lxml python_magic diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix index 9ab250f78afbd..24255c7ebc1b5 100644 --- a/pkgs/development/python-modules/remotecv/default.nix +++ b/pkgs/development/python-modules/remotecv/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "remotecv"; version = "2.2.2"; - propagatedBuildInputs = [ pillow pyres ]; + requiredPythonModules = [ pillow pyres ]; checkInputs = [ nose preggy numpy yanc nose-focus mock opencv ]; diff --git a/pkgs/development/python-modules/repeated_test/default.nix b/pkgs/development/python-modules/repeated_test/default.nix index c5c2e43b6573a..f9f8ed59607a8 100644 --- a/pkgs/development/python-modules/repeated_test/default.nix +++ b/pkgs/development/python-modules/repeated_test/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ unittest2 ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { description = "A quick unittest-compatible framework for repeating a test function over many fixtures"; diff --git a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix index 0cc55ef7fea5c..ed12723712ff9 100644 --- a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix +++ b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "8ef0383276ab722efb1e4a6523726262058dfd82615ccf7e5004aee3fe8ecc23"; }; - propagatedBuildInputs = [ zope_interface sphinx ]; + requiredPythonModules = [ zope_interface sphinx ]; meta = with stdenv.lib; { homepage = "https://github.com/repoze/repoze.sphinx.autointerface"; diff --git a/pkgs/development/python-modules/repoze_who/default.nix b/pkgs/development/python-modules/repoze_who/default.nix index 7f4a89f3d24e2..4e0dbf9bdf002 100644 --- a/pkgs/development/python-modules/repoze_who/default.nix +++ b/pkgs/development/python-modules/repoze_who/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "cf97450de3c8eb5c03b4037be75b018db91befab1094204e452a0b1c0f7a94a6"; }; - propagatedBuildInputs = [ zope_interface webob ]; + requiredPythonModules = [ zope_interface webob ]; meta = with stdenv.lib; { description = "WSGI Authentication Middleware / API"; diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index ccc76734461e5..006af1cd0552f 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "1jsc3ad518vyys5987fr1achq8qvnz8rm80zp5an9qxlwr4zmh4m"; }; - propagatedBuildInputs = [ numpy astropy astropy-healpix astropy-helpers scipy ]; + requiredPythonModules = [ numpy astropy astropy-healpix astropy-helpers scipy ]; nativeBuildInputs = [ astropy-helpers cython extension-helpers setuptools_scm ]; diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index a2e92283dc72f..ef3f57c902d26 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "9a4a5f4a61c49f098f5f669410308ac5b0ea2682fd511ee3a4f9ff73b5bb275a"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # pypi package no longer contains tests doCheck = false; diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 4042197e1c31a..b4f275b0e71ce 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ mock ]; - propagatedBuildInputs = [ requests six urllib3 ]; + requiredPythonModules = [ requests six urllib3 ]; meta = with stdenv.lib; { description = "Persistent cache for requests library"; diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix index 374627a1bb9a2..f0006fa0c485a 100644 --- a/pkgs/development/python-modules/requests-file/default.nix +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e"; }; - propagatedBuildInputs = [ requests six ]; + requiredPythonModules = [ requests six ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/requests-hawk/default.nix b/pkgs/development/python-modules/requests-hawk/default.nix index 9641ee9d12ce8..e39fb6c99b495 100644 --- a/pkgs/development/python-modules/requests-hawk/default.nix +++ b/pkgs/development/python-modules/requests-hawk/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1qcga289yr6qlkmc6fjk0ia6l5cg0galklpdzpslf1y8ky9zb7rl"; }; - propagatedBuildInputs = [ mohawk requests ]; + requiredPythonModules = [ mohawk requests ]; meta = with lib; { description = "Hawk authentication strategy for the requests python library."; diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index 992c54930ca62..a0e7cb765c6f1 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0y96wsbci296m1rcxx0ybx8r44rdvyb59p1jl27p7rgz7isr3kx1"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkPhase = '' ${python.interpreter} test/test.py diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index ab0758a84e16b..4bafc0c481b9f 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; checkInputs = [ mock ]; - propagatedBuildInputs = [ requests pykerberos ]; + requiredPythonModules = [ requests pykerberos ]; # they have a setup.py which mentions a test suite that doesn't exist... patches = [ ./fix_setup.patch ]; diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 5e85ba7d38bdb..ad9780f298f96 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sed -i 's@python@${python.interpreter}@' .testr.conf ''; - propagatedBuildInputs = [ requests six ]; + requiredPythonModules = [ requests six ]; checkInputs = [ mock purl testrepository testtools pytest ]; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index c4394fa87cdf4..bf4559d713b25 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; doCheck = false; # Internet tests fail when building in chroot - propagatedBuildInputs = [ oauthlib requests ]; + requiredPythonModules = [ oauthlib requests ]; meta = with stdenv.lib; { description = "OAuthlib authentication support for Requests"; diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index 5a87d0a0e05bc..3120916543594 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pyopenssl betamax mock pytest ]; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkPhase = '' # disabled tests access the network diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix index a244b9ba30c4d..ea04e593ce674 100644 --- a/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ pytest pytestpep8 waitress ]; checkPhase = '' diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 9ed590ba19ba7..da82c40cb5ff7 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytest ]; - propagatedBuildInputs = [ urllib3 idna chardet certifi ]; + requiredPythonModules = [ urllib3 idna chardet certifi ]; # sadly, tests require networking doCheck = false; diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix index b31573a91ca0b..8a9d0fdafcb1e 100644 --- a/pkgs/development/python-modules/requests_download/default.nix +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; meta = { description = "Download files using requests and save them to a target path"; diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix index 2a34f73c0a7d1..068130ebac5ab 100644 --- a/pkgs/development/python-modules/requests_ntlm/default.nix +++ b/pkgs/development/python-modules/requests_ntlm/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "9189c92e8c61ae91402a64b972c4802b2457ce6a799d658256ebf084d5c7eb71"; }; - propagatedBuildInputs = [ ntlm-auth requests ]; + requiredPythonModules = [ ntlm-auth requests ]; # Tests require networking doCheck = false; diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/pkgs/development/python-modules/requestsexceptions/default.nix index 55b3209553510..115ba3119aa76 100644 --- a/pkgs/development/python-modules/requestsexceptions/default.nix +++ b/pkgs/development/python-modules/requestsexceptions/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065"; }; - propagatedBuildInputs = [ pbr ]; + requiredPythonModules = [ pbr ]; # upstream hacking package is not required for functional testing patchPhase = '' diff --git a/pkgs/development/python-modules/requirements-detector/default.nix b/pkgs/development/python-modules/requirements-detector/default.nix index 0d91cbc7509fd..d505c5363b23f 100644 --- a/pkgs/development/python-modules/requirements-detector/default.nix +++ b/pkgs/development/python-modules/requirements-detector/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "1sfmm7daz0kpdx6pynsvi6qlfhrzxx783l1wb69c8dfzya4xssym"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ astroid ]; diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 43088cf5122ec..39a9c7fe8e5d1 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestcov ]; - propagatedBuildInputs = [ numpy scipy cython numba six ]; + requiredPythonModules = [ numpy scipy cython numba six ]; checkPhase = '' pytest tests diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 78daa0e24f31e..b4d258bdb8f4d 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "fa125311607ab3e57d8fcc4da20587f041b4485bdfb06dd6bdf19d8b66f870c1"; }; - propagatedBuildInputs = [ cookies mock requests six ]; + requiredPythonModules = [ cookies mock requests six ]; doCheck = false; } diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 09b713dc87cba..d39e5681cde46 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1g0sffn6ifkl1w8gq15rpaqm8c7l68bsnm77wcd3flyzzydmd050"; }; - #propagatedBuildInputs = [ xmltodict requests ifaddr ]; + #requiredPythonModules = [ xmltodict requests ifaddr ]; checkInputs = [ pytest pytest-mock diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 17bf5fbf29744..897e68e57940f 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ nose testtools ]; - propagatedBuildInputs = [ docutils ]; + requiredPythonModules = [ docutils ]; checkPhase = '' nosetests --nocapture diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index acce48c45d044..4015e2d363a15 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "de87c84f19526bd4a76505f6d40b51b7bb03ca43b6067c93f82f1c7237ac9e84"; }; - propagatedBuildInputs = [ docutils readme_renderer packaging pygments ]; + requiredPythonModules = [ docutils readme_renderer packaging pygments ]; checkInputs = [ mock ]; patches = [ diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index 616cabc29a012..572877447ee78 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "945b5efdc10f468fc056bd53a4e4224ec4c2fe1a7e83ae47443bbb6e7c7a1f7d"; }; - propagatedBuildInputs = [ six setuptools ]; + requiredPythonModules = [ six setuptools ]; doCheck = false; pythonImportsCheck = [ "rethinkdb" ]; diff --git a/pkgs/development/python-modules/retry/default.nix b/pkgs/development/python-modules/retry/default.nix index 03deee5bae215..2b04897f89b85 100644 --- a/pkgs/development/python-modules/retry/default.nix +++ b/pkgs/development/python-modules/retry/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pbr ]; - propagatedBuildInputs = [ + requiredPythonModules = [ decorator py ]; diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index 75a17fb6dc44b..a34c5e2d81d8d 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0fwp86xv0rvkncjdvy2mwcvbglw4w9k0fva25i7zx8kd19b3kh08"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # doesn't ship tests in tarball doCheck = false; diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index 49e4b1c2fc34c..8f5bfa788ba42 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { } ) ]; - propagatedBuildInputs = [ python ]; + requiredPythonModules = [ python ]; nativeBuildInputs = [ pipInstallHook maturin pip ]; diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix index 0bd7b0ca686c9..800ea1c6d3b58 100644 --- a/pkgs/development/python-modules/rfc6555/default.nix +++ b/pkgs/development/python-modules/rfc6555/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "05sjrd6jc0sdvx0z7d3llk82rx366jlmc7ijam0nalsv66hbn70r"; }; - propagatedBuildInputs = with pythonPackages; [ selectors2 ]; + requiredPythonModules = with pythonPackages; [ selectors2 ]; checkInputs = with pythonPackages; [ mock pytest ]; # disabling tests that require a functional DNS IPv{4,6} stack to pass. diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 6284ed7b649a3..03245d9571bdb 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { format = "pyproject"; nativeBuildInputs = [ poetry ]; - propagatedBuildInputs = [ + requiredPythonModules = [ CommonMark colorama ipywidgets diff --git a/pkgs/development/python-modules/rig/default.nix b/pkgs/development/python-modules/rig/default.nix index bc43aac3551ad..5eca78afc5d21 100644 --- a/pkgs/development/python-modules/rig/default.nix +++ b/pkgs/development/python-modules/rig/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "5a3896dbde3f291c5dd34769e7329ef5d5e4da34fee53479bd13dc5e5d540b8a"; }; - propagatedBuildInputs = [ numpy pytz six sentinel enum-compat ]; + requiredPythonModules = [ numpy pytz six sentinel enum-compat ]; # This is the list of officially supported versions. Other versions may work # as well. diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 9e2e76464d801..a2d179e6b007b 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cython numpy scipy diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index eb9afc8353c75..7bc14c445e382 100644 --- a/pkgs/development/python-modules/rising/default.nix +++ b/pkgs/development/python-modules/rising/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "0fb9894ppcp18wc2dhhjizj8ja53gbv9wpql4mixxxdz8z2bn33c"; }; - propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ]; + requiredPythonModules = [ numpy pytorch threadpoolctl tqdm ]; checkInputs = [ dill pytestcov pytestCheckHook ]; disabledTests = [ "test_affine" ]; # deprecated division operator '/' diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix index e9efb0c02b4ec..edf3bd13b6b38 100644 --- a/pkgs/development/python-modules/rl-coach/default.nix +++ b/pkgs/development/python-modules/rl-coach/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { sha256 = "0i47hf0l76ydyrky6f8h760bfr0zg5g3vy675x6m6pgm9wrklkqc"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ tensorflow annoy pillow diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index 303a8bc6d7fd4..61d851c9deacf 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest hypothesis ]; - propagatedBuildInputs = [ eth-utils ]; + requiredPythonModules = [ eth-utils ]; # setuptools-markdown uses pypandoc which is broken at the moment preConfigure = '' diff --git a/pkgs/development/python-modules/rnc2rng/default.nix b/pkgs/development/python-modules/rnc2rng/default.nix index 8e42baf8ff74c..03b404d84fc60 100644 --- a/pkgs/development/python-modules/rnc2rng/default.nix +++ b/pkgs/development/python-modules/rnc2rng/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1kmp3iwxxyzjsd47j2sprd47ihhkwhb3yydih3af5bbfq0ibh1w8"; }; - propagatedBuildInputs = [ rply ]; + requiredPythonModules = [ rply ]; checkPhase = "${python.interpreter} test.py"; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 11fff472e98a1..0943e19b85a6b 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "4251d405759a38f1e665acc245dcbcdec319376718169a73c57560183370fe0e"; }; - propagatedBuildInputs = [ pyparsing robotframework allpairspy ]; + requiredPythonModules = [ pyparsing robotframework allpairspy ]; # Remove Windows .bat files postInstall = '' diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix index 9387f3775beba..feda70cb7c44b 100644 --- a/pkgs/development/python-modules/roboschool/default.nix +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { # fails to find boost_python for some reason disabled = !isPy3k; - propagatedBuildInputs = [ + requiredPythonModules = [ gym ]; diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/pkgs/development/python-modules/robot-detection/default.nix index 5cf864cd8019e..99cdeb649c431 100644 --- a/pkgs/development/python-modules/robot-detection/default.nix +++ b/pkgs/development/python-modules/robot-detection/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1xd2jm3yn31bnk1kqzggils2rxj26ylxsfz3ap7bhr3ilhnbg3rx"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # no tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 73b538aa12f7c..f07f8c2108492 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # unit tests are impure doCheck = false; - propagatedBuildInputs = [ robotframework ]; + requiredPythonModules = [ robotframework ]; meta = with stdenv.lib; { description = "Database Library contains utilities meant for Robot Framework"; diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index 72f7aabb70ce5..1bc52eac92d67 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; buildInputs = [ unittest2 ]; - propagatedBuildInputs = [ robotframework lxml requests ]; + requiredPythonModules = [ robotframework lxml requests ]; meta = with stdenv.lib; { description = "Robot Framework keyword library wrapper around the HTTP client library requests"; diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix index 368c4e4c15ade..0c37f0fb33635 100644 --- a/pkgs/development/python-modules/robotframework-ride/default.nix +++ b/pkgs/development/python-modules/robotframework-ride/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j"; }; - propagatedBuildInputs = [ pygments wxPython ]; + requiredPythonModules = [ pygments wxPython ]; # ride_postinstall.py checks that needed deps are installed and creates a # desktop shortcut. We don't really need it and it clutters up bin/ so diff --git a/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/pkgs/development/python-modules/robotframework-selenium2library/default.nix index 14ce2db5d0b2b..008bb230addd1 100644 --- a/pkgs/development/python-modules/robotframework-selenium2library/default.nix +++ b/pkgs/development/python-modules/robotframework-selenium2library/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # Neither the PyPI tarball nor the repository has tests doCheck = false; - propagatedBuildInputs = [ robotframework-seleniumlibrary ]; + requiredPythonModules = [ robotframework-seleniumlibrary ]; meta = with stdenv.lib; { description = "Web testing library for Robot Framework"; diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 2bba9cfbdd8af..d6e7f3ddb5428 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0dabc5dwx0pwsyiy74d7wj97k72yl28a17sasjzrdq819pyc3dvq"; }; - propagatedBuildInputs = [ robotframework selenium ]; + requiredPythonModules = [ robotframework selenium ]; checkInputs = [ mockito robotstatuschecker approvaltests ]; # Only execute Unit Tests. Acceptance Tests require headlesschrome, currently diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index e9565cff15932..e62ef87020e6e 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # unit tests are impure doCheck = false; - propagatedBuildInputs = [ robotframework paramiko scp ]; + requiredPythonModules = [ robotframework paramiko scp ]; meta = with stdenv.lib; { description = "SSHLibrary is a Robot Framework test library for SSH and SFTP"; diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 0ed0bcaf4948b..72cfa027c5206 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { zetup ]; - propagatedBuildInputs = [ + requiredPythonModules = [ robotframework moretools pathpy diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index c5094b4ee59d4..532a2492f6f39 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0rppwwpp4djn5c43x7icwslnxbzcfnnn3c6awpg1k97j69d2nmln"; }; - propagatedBuildInputs = [ robotframework ]; + requiredPythonModules = [ robotframework ]; checkPhase = '' ${python.interpreter} test/run.py diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index e9d4ddbed1168..d2985cebe3c61 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; buildInputs = [ unittest2 ]; - propagatedBuildInputs = [ robotframework lxml ]; + requiredPythonModules = [ robotframework lxml ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix index 6cdfa2aa15b1a..391d3c4a1659b 100644 --- a/pkgs/development/python-modules/roku/default.nix +++ b/pkgs/development/python-modules/roku/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "09mq59kjll7gj1srw4qc921ncsm7cld95sbz5v3p2bwmgckpqza7"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ pytest flask ]; pythonImportsCheck = [ "roku" ]; diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 51fc191dd4676..12051687c0ae5 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { doCheck = false; # Tests not included in archive checkInputs = [pytest]; - propagatedBuildInputs = [ capstone filebytes ]; + requiredPythonModules = [ capstone filebytes ]; meta = with stdenv.lib; { homepage = "https://scoding.de/ropper/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix index 985f6244cc652..9e595c1931c99 100644 --- a/pkgs/development/python-modules/routes/default.nix +++ b/pkgs/development/python-modules/routes/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1zamff3m0kc4vyfniyhxpkkcqv1rrgnmh37ykxv34nna1ws47vi6"; }; - propagatedBuildInputs = [ repoze_lru six webob ]; + requiredPythonModules = [ repoze_lru six webob ]; checkInputs = [ coverage webtest ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix index 2be6830130dc6..cd51066218761 100644 --- a/pkgs/development/python-modules/rpkg/default.nix +++ b/pkgs/development/python-modules/rpkg/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; - propagatedBuildInputs = [ pycurl koji cccolutils six rpmfluff ]; + requiredPythonModules = [ pycurl koji cccolutils six rpmfluff ]; doCheck = false; # needs /var/lib/rpm database to run tests diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index 1c4fd16eedf63..f92a6b7284956 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1qv37hn7hhxd388znri76g0zjxsbwhxhcaic94dvw9pq4l60vqp6"; }; - propagatedBuildInputs = [ appdirs ]; + requiredPythonModules = [ appdirs ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/rpy2/2.nix b/pkgs/development/python-modules/rpy2/2.nix index e178d3c821163..ec5982001068f 100644 --- a/pkgs/development/python-modules/rpy2/2.nix +++ b/pkgs/development/python-modules/rpy2/2.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { doPatchelf = false; # fails because of "missing filename" patchelfPhase = ""; - propagatedBuildInputs = [ + requiredPythonModules = [ singledispatch six jinja2 diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index c0c0420e925a5..4dc412b019545 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -82,7 +82,7 @@ buildPythonPackage rec { substituteInPlace 'rpy2/rinterface_lib/embedded.py' --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ ipython jinja2 pytz diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 5b6dba0f9ed01..c061cf855eeea 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "145mi8p37x9cbfm5117g4ng7b5rmghjjwgm319qqhwgzvqg3y4j9"; }; - propagatedBuildInputs = [ plumbum ]; + requiredPythonModules = [ plumbum ]; checkInputs = [ nose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 66ca024b2bb53..97c53b02cc88b 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # test require a running redis rerver, which is something we can't do yet doCheck = false; - propagatedBuildInputs = [ click redis ]; + requiredPythonModules = [ click redis ]; meta = with stdenv.lib; { description = "A simple, lightweight library for creating background jobs, and processing them"; diff --git a/pkgs/development/python-modules/rsa/4_0.nix b/pkgs/development/python-modules/rsa/4_0.nix index 459ca04379689..1d71b546c46cd 100644 --- a/pkgs/development/python-modules/rsa/4_0.nix +++ b/pkgs/development/python-modules/rsa/4_0.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ unittest2 mock ]; - propagatedBuildInputs = [ pyasn1 ]; + requiredPythonModules = [ pyasn1 ]; preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") '' substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')" diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index a5380709eda97..58124992caf91 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ unittest2 mock ]; - propagatedBuildInputs = [ pyasn1 ]; + requiredPythonModules = [ pyasn1 ]; preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") '' substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')" diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix index 1d9b8114df7b3..64c4ae42de030 100644 --- a/pkgs/development/python-modules/rtmixer/default.nix +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { buildInputs = [ portaudio ]; nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cffi pa-ringbuffer sounddevice diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index 28b66ec5a521c..a7bc263ed38a6 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "13kycf9xkyxm1ik8yh3qpd96vird8y65daigyiyb4jvx0lmrd0kv"; }; - propagatedBuildInputs = [ six pyudev pygobject3 ]; + requiredPythonModules = [ six pyudev pygobject3 ]; meta = with stdenv.lib; { description = "A Python object API for managing the Linux LIO kernel target"; diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 6bda50d24ad5d..11c34b8f8a698 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # Tests use relative paths doCheck = false; - propagatedBuildInputs = [ ruamel_base ] + requiredPythonModules = [ ruamel_base ] ++ lib.optional (!isPy3k) ruamel_ordereddict ++ lib.optional (!isPyPy) ruamel_yaml_clib; diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index 6115702009acd..8a3a120062ad4 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "94aa84fa42393f773c8215fab679bd3b72bbdb9f7931643d3672184cde9981d9"; }; - propagatedBuildInputs = [ hypothesis ]; + requiredPythonModules = [ hypothesis ]; # pypi doesn't distribute tests doCheck = false; diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix index da905f7ab477d..f78cdf5e97ed2 100644 --- a/pkgs/development/python-modules/ruffus/default.nix +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0fnzpchwwqsy5h18fs0n90s51w25n0dx0l74j0ka6lvhjl5sxn4c"; }; - propagatedBuildInputs = [ gevent ]; + requiredPythonModules = [ gevent ]; checkInputs = [ hostname diff --git a/pkgs/development/python-modules/runsnakerun/default.nix b/pkgs/development/python-modules/runsnakerun/default.nix index 6d601197d76ee..28b30fb75af53 100644 --- a/pkgs/development/python-modules/runsnakerun/default.nix +++ b/pkgs/development/python-modules/runsnakerun/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "a66a0cdf0333dc3c0830c18e2f3d62f741dea197cd01a7e0059da4886a3a123f"; }; - propagatedBuildInputs = [ squaremap wxPython ]; + requiredPythonModules = [ squaremap wxPython ]; meta = with stdenv.lib; { description = "GUI Viewer for Python profiling runs"; diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 9c7f89585d89a..bd7f2563ded1d 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ colorcet flask flask-compress diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 7f3e6527d060f..17a953e6e6591 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "1dw3ayrzknai2279bhkgzcapzw06rhijlny33rymlbp7irp0gvnj"; }; - propagatedBuildInputs = [ defusedxml requests ]; + requiredPythonModules = [ defusedxml requests ]; checkInputs = [ pytest requests-mock mock pytestcov pytest-timeout testtools ]; checkPhase = '' diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 535f8efec9168..86a5330c4cddf 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ docutils ]; - propagatedBuildInputs = [ boto3 fsspec ]; + requiredPythonModules = [ boto3 fsspec ]; # Depends on `moto` which has a long dependency chain with exact # version requirements that can't be made to work with current diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 27551a798d7b0..f5c7519be8bd4 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "921a37e2aefc64145e7b73d50c71bb4f26f46e4c9f414dc648c6245ff92cf7db"; }; - propagatedBuildInputs = + requiredPythonModules = [ botocore ] ++ stdenv.lib.optional (pythonOlder "3") futures; diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix index f5c0ee715c3a3..dbc2763fdfcc9 100644 --- a/pkgs/development/python-modules/sacremoses/default.nix +++ b/pkgs/development/python-modules/sacremoses/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1gzr56w8yx82mn08wax5m0xyg15ym4ri5l80gmagp8r53443j770"; }; - propagatedBuildInputs = [ click six tqdm joblib ]; + requiredPythonModules = [ click six tqdm joblib ]; checkInputs = [ pytest ]; # ignore tests which call to remote host diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index c268f26995950..2f6719934eae7 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "23bf20690d4400edc795836b0c983c2b4cbbb922233108ff925b7dd7750f00c9"; }; - propagatedBuildInputs = [ requests dparse click setuptools ]; + requiredPythonModules = [ requests dparse click setuptools ]; # Disable tests depending on online services checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index a33bec431d68a..71f507d4e5e7d 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; checkInputs = [ jinja2 mock ]; - propagatedBuildInputs = [ chardet dnspython lmtpd python-daemon six click ]; + requiredPythonModules = [ chardet dnspython lmtpd python-daemon six click ]; # Darwin tests fail without this. See: # https://github.com/NixOS/nixpkgs/pull/82166#discussion_r399909846 diff --git a/pkgs/development/python-modules/sampledata/default.nix b/pkgs/development/python-modules/sampledata/default.nix index 93d45b3d1a0da..d68191dac6b8c 100644 --- a/pkgs/development/python-modules/sampledata/default.nix +++ b/pkgs/development/python-modules/sampledata/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ nose versiontools ]; - propagatedBuildInputs = [ pytz six ]; + requiredPythonModules = [ pytz six ]; # ERROR: test_image_path_from_directory (tests.tests.TestImageHelpers) # ERROR: test_image_stream (tests.tests.TestImageHelpers) diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 02278d9be415c..f63e7fe00b3d5 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -15,7 +15,7 @@ buildPythonPackage { }; buildInputs = [ pkgs.libsamplerate ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; preConfigure = '' cat > site.cfg << END diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix index d29e89db84628..ffef046d016aa 100644 --- a/pkgs/development/python-modules/samsungctl/default.nix +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ websocket_client ]; diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index b41935c582561..7bad744f59182 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "websocket-client==" "websocket-client>=" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ websocket_client requests ]; diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix index 4642b69f7d2e0..3c3a3b46bcfe3 100644 --- a/pkgs/development/python-modules/sanic-auth/default.nix +++ b/pkgs/development/python-modules/sanic-auth/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "b7cb9e93296c035ada0aa1ebfb33f9f7b62f7774c519e374b7fe703ff73589cb"; }; - propagatedBuildInputs = [ sanic ]; + requiredPythonModules = [ sanic ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index c4f56e2d4c6da..e18f92a0619f7 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -44,7 +44,7 @@ let sha256 = "0n3bamaixxhcm27gf1ws3g6rkamvqx87087c88r6hyyl52si1ycn"; }; - propagatedBuildInputs = [ certifi chardet h11 h2 idna rfc3986 ]; + requiredPythonModules = [ certifi chardet h11 h2 idna rfc3986 ]; # relax pinned old version of h11 postConfigure = '' @@ -66,7 +66,7 @@ let sha256 = "8731420451383196ecf2fd96082bfc8ae5103ada90aba185888499d7784dde6f"; }; - propagatedBuildInputs = [ requests httpcore ]; + requiredPythonModules = [ requests httpcore ]; # LICENCE.md gets propagated without this, causing collisions postInstall = '' @@ -85,7 +85,7 @@ buildPythonPackage rec { sha256 = "0b1qqsvdjkibrw5kgr0pm7n7jzb1403132wjmb0lx3k5wyvqfi95"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ httptools aiofiles websockets diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix index 847acb3c9cd41..79e8c37c9a6b0 100644 --- a/pkgs/development/python-modules/sapi-python-client/default.nix +++ b/pkgs/development/python-modules/sapi-python-client/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ git setuptools_scm ]; - propagatedBuildInputs = [ setuptools requests boto3 responses ]; + requiredPythonModules = [ setuptools requests boto3 responses ]; meta = with stdenv.lib; { description = "Keboola Connection Storage API client"; diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 06d2d40d18024..49d5c1d24ba1c 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ opencl-headers ]; checkInputs = [ pytest ]; - propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ]; + requiredPythonModules = [ docutils matplotlib numpy scipy pyopencl ]; checkPhase = '' HOME=$(mktemp -d) py.test -c ./pytest.ini diff --git a/pkgs/development/python-modules/scales/default.nix b/pkgs/development/python-modules/scales/default.nix index 0407c1fa86d89..79251e4affbcb 100644 --- a/pkgs/development/python-modules/scales/default.nix +++ b/pkgs/development/python-modules/scales/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # No tests included doCheck = false; diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 2b9eb5517a46d..083098b6fc8d6 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { substituteInPlace scapy/data.py --replace "/opt/wireshark" "${wireshark}" ''; - propagatedBuildInputs = [ pycrypto ecdsa ] + requiredPythonModules = [ pycrypto ecdsa ] ++ lib.optionals withOptionalDeps [ tcpdump ipython ] ++ lib.optional withCryptography cryptography ++ lib.optional withVoipSupport sox diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 8dd89480074ab..fec6c83bdb1ee 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { substituteInPlace requirements.txt --replace '==' '>=' ''; - propagatedBuildInputs = [ contextlib2 ]; + requiredPythonModules = [ contextlib2 ]; checkInputs = [ pytest mock ]; checkPhase = "pytest ./test_schema.py"; diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 650a677099130..b15bad1939fc3 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { buildInputs = [ cython ]; checkInputs = [ coverage ]; - propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ]; + requiredPythonModules = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ]; # remove on when version > 0.5.4 postPatch = '' diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 6694c3abe4df6..565bab963cf03 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sha256 = "0p4smkl2rbpl00m5va5qa8hp2hqb3284p2cs6k8zlmi4kgbdyh6s"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ distro packaging setuptools diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index 8705488ba14cf..36e493d18af37 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "eb64b6d8e30b8df8f8636d5fc4fd7ca6a9b05938ccd62518c80c1d9e823069dd"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy ]; diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 44d2c240ce547..b735fff5631b5 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cloudpickle dask imageio diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix index 0a5171f22fbfa..2864ee596c8dc 100644 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/pkgs/development/python-modules/scikit-optimize/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "1bz8gxccx8n99abw49j8h5zf3i568g5hcf8nz1yinma8jqhxjkjh"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ matplotlib numpy scipy diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index f6d573573b9c4..4b57f74d7b763 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sha256 = "0a90k6i9fkmc9gf250b4fidx2fzd2qrn025l74mjk51fvf23q13a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy scikitlearn diff --git a/pkgs/development/python-modules/scikitlearn/0.20.nix b/pkgs/development/python-modules/scikitlearn/0.20.nix index 4d8e8d00f4345..54072de4dd230 100644 --- a/pkgs/development/python-modules/scikitlearn/0.20.nix +++ b/pkgs/development/python-modules/scikitlearn/0.20.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; buildInputs = [ pillow gfortran glibcLocales ]; - propagatedBuildInputs = [ numpy scipy numpy.blas ]; + requiredPythonModules = [ numpy scipy numpy.blas ]; checkInputs = [ pytest ]; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index cffd29f09d3a2..ebdec0357b025 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy numpy.blas diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index d85d8e396f20f..8e559accc69b8 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy sundials scipy diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 218415354db71..2027d02b6b078 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -19,7 +19,7 @@ in buildPythonPackage rec { checkInputs = [ nose pytest ]; nativeBuildInputs = [ gfortran ]; buildInputs = [ numpy.blas pybind ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; # Remove tests because of broken wrapper prePatch = '' diff --git a/pkgs/development/python-modules/scour/default.nix b/pkgs/development/python-modules/scour/default.nix index 3d2e07226612a..ce0da4ecfc4d7 100644 --- a/pkgs/development/python-modules/scour/default.nix +++ b/pkgs/development/python-modules/scour/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "81b93dcfc57338f1260db4fb62697b653770a8a8bd756dcba3640c9b558a7145"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # No tests included in archive doCheck = false; diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index a37927b9a6416..e198bcbc602d3 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "8bd748293d7362073169b96ce4b8c4f93bcc62cfc5f7e1d949e01e406a025bd4"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ paramiko ]; diff --git a/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/pkgs/development/python-modules/scrapy-deltafetch/default.nix index cf6f8a0107140..2f3271c7b2a96 100644 --- a/pkgs/development/python-modules/scrapy-deltafetch/default.nix +++ b/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1m511psddvlapg492ny36l8rzy7z4i39yx6a1agxzfz6s9b83fq8"; }; - propagatedBuildInputs = [ bsddb3 scrapy ]; + requiredPythonModules = [ bsddb3 scrapy ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index b2de4e9a993bd..6b73ac72862ed 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0yb7d51jws665rdfqkmi077w0pjxmb2ni7ysphj7lx7b18whq54j"; }; - propagatedBuildInputs = [ fake-useragent faker ]; + requiredPythonModules = [ fake-useragent faker ]; checkInputs = [ pytestCheckHook scrapy pytestcov pytest-mock ]; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index a2db6b9cb3b28..1dcd1acda702b 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { botocore ]; - propagatedBuildInputs = [ + requiredPythonModules = [ twisted cryptography cssselect diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index 1b79a43af9c96..b2bd97f970722 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")" ''; - propagatedBuildInputs = stdenv.lib.optional isPy36 dataclasses; + requiredPythonModules = stdenv.lib.optional isPy36 dataclasses; buildInputs = [ libX11 libXinerama libXrandr]; diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 128e9276608dd..ebc3a654b161c 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { blas ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy ]; diff --git a/pkgs/development/python-modules/seaborn/0.9.1.nix b/pkgs/development/python-modules/seaborn/0.9.1.nix index 79361a4916981..6f991eb5a9e3d 100644 --- a/pkgs/development/python-modules/seaborn/0.9.1.nix +++ b/pkgs/development/python-modules/seaborn/0.9.1.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ pandas matplotlib ]; + requiredPythonModules = [ pandas matplotlib ]; checkPhase = '' nosetests -v diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 9438320c1ad83..65199270d0b4c 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ pandas matplotlib ]; + requiredPythonModules = [ pandas matplotlib ]; checkPhase = '' nosetests -v diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 7cf062765d3be..5ad39743999dd 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { # (c libs are used with anaconda, which we don't care about as we use the alternative path, being that of pyusb). doCheck = false; - propagatedBuildInputs = [ pyusb numpy ]; + requiredPythonModules = [ pyusb numpy ]; setupPyBuildFlags = [ "--without-cseabreeze" ]; diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 3cd6b2fe3ccd0..0c8a6c49a62f3 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig ]; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ cffi secp256k1 ]; + requiredPythonModules = [ cffi secp256k1 ]; # Tests are not included in archive doCheck = false; diff --git a/pkgs/development/python-modules/secretstorage/2.nix b/pkgs/development/python-modules/secretstorage/2.nix index 378be5be31300..f10cd20712bde 100644 --- a/pkgs/development/python-modules/secretstorage/2.nix +++ b/pkgs/development/python-modules/secretstorage/2.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1di9gx4m27brs6ar774m64s017iz742mnmw39kvfc8skfs3mrxis"; }; - propagatedBuildInputs = [ cryptography dbus-python ]; + requiredPythonModules = [ cryptography dbus-python ]; # Needs a D-Bus Sesison doCheck = false; diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index d10ea9c8be2b1..aaf8c810fa843 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "14lznnn916ddn6yrd3w2nr2zq49zc8hw53yjz1k9yhd492p9gir0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cryptography jeepney ]; diff --git a/pkgs/development/python-modules/secure/default.nix b/pkgs/development/python-modules/secure/default.nix index 49fcb52a154ff..212bd25bc9ca5 100644 --- a/pkgs/development/python-modules/secure/default.nix +++ b/pkgs/development/python-modules/secure/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1nbxwi0zccrha6js14ibd596kdi1wpqr7jgs442mqclw4b3f77q5"; }; - propagatedBuildInputs = [ maya requests ]; + requiredPythonModules = [ maya requests ]; # no tests in release doCheck = false; diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index e70ba02ce0e33..f434bee997885 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { LC_ALL = "en_US.utf-8"; # scipy isn't listed in install_requires, but used in package - propagatedBuildInputs = [ numpy spglib future scipy ]; + requiredPythonModules = [ numpy spglib future scipy ]; nativeBuildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index 8c2e22708aabf..7f4376d26330b 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "--cov" "" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ regex csvw clldutils diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix index 6d02c9dc79b28..c349710399f95 100644 --- a/pkgs/development/python-modules/selectors34/default.nix +++ b/pkgs/development/python-modules/selectors34/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "09f5066337f8a76fb5233f267873f89a27a17c10bf79575954894bb71686451c"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkPhase = '' ${python.interpreter} setup.py test diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index b32dfe2653e43..2820ee614a2aa 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { buildInputs = [xorg.libX11]; - propagatedBuildInputs = [ + requiredPythonModules = [ geckodriver urllib3 ]; diff --git a/pkgs/development/python-modules/semantic/default.nix b/pkgs/development/python-modules/semantic/default.nix index f0371f860cf56..231eff0253d23 100644 --- a/pkgs/development/python-modules/semantic/default.nix +++ b/pkgs/development/python-modules/semantic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "bbc47dad03dddb1ba5895612fdfa1e43cfb3c497534976cebacd4f3684b505b4"; }; - propagatedBuildInputs = [ quantities numpy ]; + requiredPythonModules = [ quantities numpy ]; # strange setuptools error (can not import semantic.test) doCheck = false; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 8aa61748af86f..23f714335bc44 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { executing pure-eval asttokens ] ++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ]; - propagatedBuildInputs = [ urllib3 certifi ]; + requiredPythonModules = [ urllib3 certifi ]; meta = with stdenv.lib; { homepage = "https://github.com/getsentry/sentry-python"; diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix index 94fd2d65d4645..0f307d41381e5 100644 --- a/pkgs/development/python-modules/sepaxml/default.nix +++ b/pkgs/development/python-modules/sepaxml/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1qmgdcz61hs65m2fddwn9jpyk2sxifdb0f3jz1n0lgy774z0pmas"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ text-unidecode xmlschema ]; diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index b7fba99860026..f4b9f30178678 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ pep8 nose unittest2 docutils ]; - propagatedBuildInputs = [ blockdiag ]; + requiredPythonModules = [ blockdiag ]; # Tests fail: # ... diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index cfb734e54759e..948a1d9bd5785 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "72753820246a7d8486e8b385353e3bbf769abfceec2e850fa527a288b084ff7a"; }; - propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; + requiredPythonModules = lib.optionals isPy27 [ enum34 ]; checkInputs = [ attrs pytz ]; checkPhase = '' diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index 7a1b8348a0e65..b1ca3731b7be6 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ flake8 py pyflakes tox ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # ImportError: No module named 'tests doCheck = false; diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix index 1e6f8307fbcab..fa66c38952b98 100644 --- a/pkgs/development/python-modules/serverlessrepo/default.nix +++ b/pkgs/development/python-modules/serverlessrepo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "671f48038123f121437b717ed51f253a55775590f00fbab6fbc6a01f8d05c017"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six boto3 pyyaml diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index e8541da6cd454..a7e0195bfb836 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { }; checkInputs = [ testfixtures unittest2 webtest ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql pymysqlsa umemcache WSGIProxy requests pybrowserid ]; diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index 5465fe7c99426..7f49b9dc1b714 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "1aw475ksmd4vpl8cwfdcsw2v063nbhnnxpy633sb75iqp9aazhlx"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyasn1 pyasn1-modules idna attrs cryptography ] ++ lib.optionals (pythonOlder "3.3") [ ipaddress ]; diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix index 5c0b40b4af4e0..d8894dcc1a6a0 100644 --- a/pkgs/development/python-modules/setuptools-git/default.nix +++ b/pkgs/development/python-modules/setuptools-git/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445"; }; - propagatedBuildInputs = [ pkgs.git ]; + requiredPythonModules = [ pkgs.git ]; doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/setuptools-lint/default.nix b/pkgs/development/python-modules/setuptools-lint/default.nix index fbe1528c4c3b2..04b146b0e7485 100644 --- a/pkgs/development/python-modules/setuptools-lint/default.nix +++ b/pkgs/development/python-modules/setuptools-lint/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577"; }; - propagatedBuildInputs = [ pylint ]; + requiredPythonModules = [ pylint ]; meta = with stdenv.lib; { description = "Package to expose pylint as a lint command into setup.py"; diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index cfffffb94bf6e..659fd1c54a6c5 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ semantic-version setuptools toml ]; + requiredPythonModules = [ semantic-version setuptools toml ]; meta = with stdenv.lib; { description = "Setuptools plugin for Rust support"; diff --git a/pkgs/development/python-modules/setuptoolsdarcs/default.nix b/pkgs/development/python-modules/setuptoolsdarcs/default.nix index 5e58f80985f5e..7027166758a45 100644 --- a/pkgs/development/python-modules/setuptoolsdarcs/default.nix +++ b/pkgs/development/python-modules/setuptoolsdarcs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # In order to break the dependency on darcs -> ghc, we don't add # darcs as a propagated build input. - propagatedBuildInputs = [ darcsver ]; + requiredPythonModules = [ darcsver ]; # ugly hack to specify version that should otherwise come from darcs patchPhase = '' diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/pkgs/development/python-modules/setuptoolstrial/default.nix index b393d0eb2003b..2a52c9ab31c61 100644 --- a/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/pkgs/development/python-modules/setuptoolstrial/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest virtualenv pytestrunner pytest-virtualenv ]; - propagatedBuildInputs = [ twisted pathlib2 ]; + requiredPythonModules = [ twisted pathlib2 ]; postPatch = '' sed -i '12,$d' tests/test_main.py diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 8a37f41086eae..546c18fee0420 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "1l9vgcw09l6bwhgfzlbn68fzpvns25r6nkd1pcp7hz5165hs6zzn"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy cython scipy diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 2225466658d56..f41e5d0476559 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1cc08d276e05b13cd32bd3b0c5d1cb6c30254e0086e0f6857ec106d4cceff121"; }; - propagatedBuildInputs = [ click colorama ]; + requiredPythonModules = [ click colorama ]; meta = with lib; { description = "Reference implementation of SLIP-0039"; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index d4d52a9bf035c..289f016930b60 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; # environment variable used in shapely/_buildcfg.py GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/pkgs/development/python-modules/sharedmem/default.nix index 942e272229a7f..fdf98da20eebb 100644 --- a/pkgs/development/python-modules/sharedmem/default.nix +++ b/pkgs/development/python-modules/sharedmem/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "c654a6bee2e2f35c82e6cc8b6c262fcabd378f5ba11ac9ef71530f8dabb8e2f7"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; meta = { homepage = "http://rainwoodman.github.io/sharedmem/"; diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index f361659d9acb6..62f0e1c5cb1e7 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0b5ec40c954cd48c4e3234e81ad92afdc68438f82ad392fed35b7097eb77b6dd"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click-plugins colorama requests diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/pkgs/development/python-modules/shouldbe/default.nix index 068ed9343117f..84bc51330b66b 100644 --- a/pkgs/development/python-modules/shouldbe/default.nix +++ b/pkgs/development/python-modules/shouldbe/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ forbiddenfruit ]; + requiredPythonModules = [ forbiddenfruit ]; meta = with stdenv.lib; { description = "Python Assertion Helpers inspired by Shouldly"; diff --git a/pkgs/development/python-modules/showit/default.nix b/pkgs/development/python-modules/showit/default.nix index 0cc379161324c..029cbb90b5d2f 100644 --- a/pkgs/development/python-modules/showit/default.nix +++ b/pkgs/development/python-modules/showit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0xd8isrlwwxlgji90lly1sq4l2a37rqvhsmyhv7bd3aj1dyjmdr6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy matplotlib ]; diff --git a/pkgs/development/python-modules/sievelib/default.nix b/pkgs/development/python-modules/sievelib/default.nix index 7fd955abd17c1..011cd556f17e6 100644 --- a/pkgs/development/python-modules/sievelib/default.nix +++ b/pkgs/development/python-modules/sievelib/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ future six ]; + requiredPythonModules = [ future six ]; checkInputs = [ mock ]; meta = { diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 69f7a93f509d6..d2ccfa1495114 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "18s388hm3babnvakbbgfqk0jzq25nnznvhygywd3azp9b4yzmd5c"; }; - propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ]; + requiredPythonModules = [ canonicaljson unpaddedbase64 pynacl typing-extensions ]; meta = with stdenv.lib; { homepage = "https://pypi.org/project/signedjson/"; diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix index 92a39e26da0e6..8ef3f0a2cd520 100644 --- a/pkgs/development/python-modules/sigtools/default.nix +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; buildInputs = [ repeated_test sphinx mock coverage unittest2 ]; - propagatedBuildInputs = [ funcsigs six ]; + requiredPythonModules = [ funcsigs six ]; patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py''; diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 3b6803aa5de20..12be09558ae6b 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "1n960xgrnmv20l31nm0im7pb4nfa83bmx4x4clqrh2jkpzq3ric0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests pyopenssl cryptography diff --git a/pkgs/development/python-modules/simpleai/default.nix b/pkgs/development/python-modules/simpleai/default.nix index c8d1a99326f96..e229915b38db0 100644 --- a/pkgs/development/python-modules/simpleai/default.nix +++ b/pkgs/development/python-modules/simpleai/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "2927d460b09ff6dd177999c2f48f3275c84c956efe5b41b567b5316e2259d21e"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; #No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index f718b3655f6fa..271a738e54738 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/pkgs/development/python-modules/singledispatch/default.nix index 789a24f3e818f..6e9a22734d6f3 100644 --- a/pkgs/development/python-modules/singledispatch/default.nix +++ b/pkgs/development/python-modules/singledispatch/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # pypi singledispatch tarbal does not contain tests doCheck = false; diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index d7791fcf96cba..0ca2314c92d82 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ]; - propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; + requiredPythonModules = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; meta = with lib; { description = "SIP SIMPLE implementation for Python"; diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index 32320c5042fcb..564941e452f47 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { inherit pname version src; disabled = isPy27; - propagatedBuildInputs = with pythonPackages; [ cryptography grpcio grpcio-tools jupyter pytest pyyaml requests jre ]; + requiredPythonModules = with pythonPackages; [ cryptography grpcio grpcio-tools jupyter pytest pyyaml requests jre ]; preBuild = '' # Ensure skein.jar exists skips the maven build in setup.py diff --git a/pkgs/development/python-modules/skidl/default.nix b/pkgs/development/python-modules/skidl/default.nix index 3d2007732e8cf..86eabc97c3395 100644 --- a/pkgs/development/python-modules/skidl/default.nix +++ b/pkgs/development/python-modules/skidl/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "1g65cyxpkqshgsggav2q3f76rbj5pzh7sacyhmhzvfz4zfarkcxk"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests future kinparse diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix index e4a01778352ad..c7338071a2b5a 100644 --- a/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ numpy scipy deap scikitlearn ]; + requiredPythonModules = [ numpy scipy deap scikitlearn ]; checkPhase = '' ${python.interpreter} test.py diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 8e3fcc12f5525..50943edebf185 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "1l576dws9drjakfsn0pfpbr48b21vpxv3vd3dz8lkbn8q71zs22r"; }; - propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; + requiredPythonModules = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; # on CPU, these expect artifacts from previous GPU run diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index b2578d5dd63da..9b55a819d902f 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { sha256 = "1ngj1mivbln19546195k400w9yaw69g0w6is7c75rqwyxr8wgzsk"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp websocket_client requests diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix index 426019fc8a97c..1fd87150ecec8 100644 --- a/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/pkgs/development/python-modules/sleekxmpp/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "sleekxmpp"; version = "1.3.3"; - propagatedBuildInputs = [ dns pyasn1 ]; + requiredPythonModules = [ dns pyasn1 ]; patches = [ ./dnspython-ip6.patch diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index 08bdc183186cb..2d028931c3aa0 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "7369f1d7fa09f6c9969625c4b76a8a63d2507a94c6fc257183da1c10261703e9"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ boto3 diskcache packaging diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix index 45d406f560e6f..e031c9a32f87b 100644 --- a/pkgs/development/python-modules/slicerator/default.nix +++ b/pkgs/development/python-modules/slicerator/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "18e60393e6765ca96986f801bbae62a617a1eba6ed57784e61b165ffc7dc1848"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkPhase = '' ${python.interpreter} run_tests.py diff --git a/pkgs/development/python-modules/slimit/default.nix b/pkgs/development/python-modules/slimit/default.nix index 30654bd03f618..08098654f366f 100644 --- a/pkgs/development/python-modules/slimit/default.nix +++ b/pkgs/development/python-modules/slimit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ ply ]; + requiredPythonModules = [ ply ]; checkPhase = '' ${python.interpreter} -m unittest discover -s src/slimit diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index d2b904f53491d..025436136af4b 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ prettytable setuptools ]; + requiredPythonModules = [ prettytable setuptools ]; postFixup = '' wrapProgram $out/bin/slither \ diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 2fd7d92e3d7cd..235fa79f8e7cc 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ aiodns pyasn1 pyasn1-modules aiohttp ]; + requiredPythonModules = [ aiodns pyasn1 pyasn1-modules aiohttp ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 9e6ba2ff63500..f1c93eb647c04 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { sha256 = "1r510s4r124s121wwdm9qgap6zivlqqxrhxljz8nx0kv0cdyypi5"; }; - propagatedBuildInputs = [ PyICU ]; + requiredPythonModules = [ PyICU ]; checkPhase = '' ${python.interpreter} -m unittest slob diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index d5177dfd2e97f..c866d0cdba469 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ mock moto responses ]; # upstream code requires both boto and boto3 - propagatedBuildInputs = [ boto boto3 bz2file requests ]; + requiredPythonModules = [ boto boto3 bz2file requests ]; meta = { license = lib.licenses.mit; description = "smart_open is a Python 2 & Python 3 library for efficient streaming of very large file"; diff --git a/pkgs/development/python-modules/smartdc/default.nix b/pkgs/development/python-modules/smartdc/default.nix index 2fe9926cab9a0..bb595f4a1ad6e 100644 --- a/pkgs/development/python-modules/smartdc/default.nix +++ b/pkgs/development/python-modules/smartdc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "6ffd866fb98386324e189e24d4f7532f66c1b20eece35ca1a6cb4b2a2639fc85"; }; - propagatedBuildInputs = [ requests http_signature ]; + requiredPythonModules = [ requests http_signature ]; meta = with stdenv.lib; { description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests"; diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index fe22f121efb7e..82d60686f9c75 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0jzxlfwf0861ilh4xyd70hmkdbvdki52aalglm1bnpxkg6i3jhfz"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ tox mock pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/snakebite/default.nix b/pkgs/development/python-modules/snakebite/default.nix index b4d83e672271f..af94a1fcf9822 100644 --- a/pkgs/development/python-modules/snakebite/default.nix +++ b/pkgs/development/python-modules/snakebite/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { virtualenv ]; - propagatedBuildInputs = [ + requiredPythonModules = [ protobuf ]; diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index a34996b8734cc..1e6e8e6768993 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { # Upstream doesn't run tests from setup.py doCheck = false; - propagatedBuildInputs = [ tornado ]; + requiredPythonModules = [ tornado ]; meta = with stdenv.lib; { description = "Browser based viewer for profiling data"; diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 93d7d1d9d9cf8..d07ca2e942126 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ construct ]; + requiredPythonModules = [ construct ]; # no checks from Pypi - https://github.com/happyleavesaoc/python-snapcast/issues/23 doCheck = false; diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix index ff274c1ba8b3f..4013659afc704 100644 --- a/pkgs/development/python-modules/snappergui/default.nix +++ b/pkgs/development/python-modules/snappergui/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { # no tests available doCheck = false; - propagatedBuildInputs = [ pygobject3 dbus-python ]; + requiredPythonModules = [ pygobject3 dbus-python ]; meta = with stdenv.lib; { homepage = "https://github.com/ricardomv/snapper-gui"; diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix index 82275762ce3dc..881a2716a7188 100644 --- a/pkgs/development/python-modules/sniffio/default.nix +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ glibcLocales ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ contextvars ]; + requiredPythonModules = lib.optionals (pythonOlder "3.7") [ contextvars ]; checkInputs = [ pytest curio ]; diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 901987fbff66a..cd24f70a8b994 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1nscfwycclfbll709w1q46w6rl0r5c3b85rsc7zwc3ixd1k8aajp"; }; - propagatedBuildInputs = [ attrs cryptography async-timeout ]; + requiredPythonModules = [ attrs cryptography async-timeout ]; checkInputs = [ pytestCheckHook pytest-aiohttp ]; diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index c546fefcf5034..4433ede5df4e9 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # No tests included doCheck = false; - propagatedBuildInputs = [ PyStemmer ]; + requiredPythonModules = [ PyStemmer ]; meta = with stdenv.lib; { description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms"; diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index bc60d7897c1a0..a3dd9f083365a 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sha256 = "b953a53141a88406e9c0e3144582a7c257e5c89fa81e97664d520999991812e7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ azure-storage-blob asn1crypto boto3 diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 99c5822f35044..e3fd24ce83106 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "e79d83d4947a0945488699324802eda4ad4a63c7680ad5b2a42c71f4faa2cd8b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ sqlalchemy snowflake-connector-python ]; diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index b7d7f25614d91..d5bbc8bae71c9 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ]; + requiredPythonModules = [ setuptools requests lxml beautifulsoup4 ]; meta = with lib; { homepage = "https://github.com/JustAnotherArchivist/snscrape"; diff --git a/pkgs/development/python-modules/snug/default.nix b/pkgs/development/python-modules/snug/default.nix index 08896467b4e52..7b14150eb4d36 100644 --- a/pkgs/development/python-modules/snug/default.nix +++ b/pkgs/development/python-modules/snug/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { buildInputs = [ glibcLocales ]; LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = + requiredPythonModules = lib.optionals (pythonOlder "3.4") [ singledispatch ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix index f88b6080fdf3c..69be4dfa07f26 100644 --- a/pkgs/development/python-modules/snuggs/default.nix +++ b/pkgs/development/python-modules/snuggs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1p3lh9s2ylsnrzbs931y2vn7mp2y2xskgqmh767c9l1a33shfgwf"; }; - propagatedBuildInputs = [ click numpy pyparsing ]; + requiredPythonModules = [ click numpy pyparsing ]; checkInputs = [ pytest hypothesis ]; checkPhase = "pytest test_snuggs.py"; diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix index c7235468370f2..e34d29cab6d2a 100644 --- a/pkgs/development/python-modules/sockjs-tornado/default.nix +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "02ff25466b3a46b1a7dbe477340b042770ac078de7ea475a6285a28a75eb1fab"; }; - propagatedBuildInputs = [ tornado ]; + requiredPythonModules = [ tornado ]; meta = with lib; { homepage = "https://github.com/mrjoes/sockjs-tornado/"; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index b56e43e132192..2f60d8c60e5e0 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0dgca286vhrabm4r4jj545k895z6w2c70ars06vrjhf9cpgg7qck"; }; - propagatedBuildInputs = [ xmltodict requests toml ]; + requiredPythonModules = [ xmltodict requests toml ]; checkInputs = [ pytest pytestcov coveralls pylint flake8 graphviz mock sphinx sphinx_rtd_theme diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 3c2a5e2a356d9..34fe493365da3 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { version = "5.8.4"; disabled = isPy27; - propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ]; + requiredPythonModules = [ ptable click requests prompt_toolkit pygments urllib3 ]; checkInputs = [ pytest pytestcov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ]; diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 0ce6e338e61fc..a2c0a5d7ba36f 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -19,7 +19,7 @@ sed -i '/fido2/c\"fido2",' pyproject.toml ''; - propagatedBuildInputs = [ + requiredPythonModules = [ click ecdsa fido2 diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index c0b8aaca24fc7..f46d99c354687 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0yj3yb0qvfdv4wh7nzcsh9in8nzk7b59dvjj0x02rsmlv4kw9ah1"; }; - propagatedBuildInputs = [ regex ]; + requiredPythonModules = [ regex ]; meta = with stdenv.lib; { description = "Tokenizer and sentence splitter for German and English web texts"; diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 0c4c3f9b7b227..ea75336e4707b 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "5e394d9797e221f90a95e5eb9987e8c1faf4f2488964f521e8ca1628798f0a38"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ dnspython geoip2 ipython diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix index 3742c625205c1..29d76354eef8f 100644 --- a/pkgs/development/python-modules/sortedcollections/default.nix +++ b/pkgs/development/python-modules/sortedcollections/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0sihzm5aqz7r3irh4jn6rzicb7lf81d27z7vl6kaslnhwcsizhsq"; }; - propagatedBuildInputs = [ sortedcontainers ]; + requiredPythonModules = [ sortedcontainers ]; # No tests in PyPi tarball doCheck = false; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 7787e8b16b856..dd0afdb3dc808 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "f21978921186c0c7183af032fab77b735d824f3e926d76adb3fd0912e289ce0b"; }; - propagatedBuildInputs = [ cffi numpy portaudio ]; + requiredPythonModules = [ cffi numpy portaudio ]; # No tests included nor upstream available. doCheck = false; diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index dea0e345a9997..11e9ab5e35eb1 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy libsndfile cffi ]; + requiredPythonModules = [ numpy libsndfile cffi ]; meta = { description = "An audio library based on libsndfile, CFFI and NumPy"; diff --git a/pkgs/development/python-modules/soupsieve/1.nix b/pkgs/development/python-modules/soupsieve/1.nix index bb5ecbc839c2f..09beda6433f7e 100644 --- a/pkgs/development/python-modules/soupsieve/1.nix +++ b/pkgs/development/python-modules/soupsieve/1.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest beautifulsoup4 ]; - propagatedBuildInputs = lib.optional (!isPy3k) backports_functools_lru_cache; + requiredPythonModules = lib.optional (!isPy3k) backports_functools_lru_cache; # Circular test dependency on beautifulsoup4 doCheck = false; diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index 22d1926d8bb4e..b9052b4aa8356 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest beautifulsoup4 ]; - propagatedBuildInputs = lib.optional (!isPy3k) backports_functools_lru_cache; + requiredPythonModules = lib.optional (!isPy3k) backports_functools_lru_cache; # Circular test dependency on beautifulsoup4 doCheck = false; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 077aea4dc9a35..e02ccfd52dd8a 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sha256 = "07zf7kivj4r1n6xwisld7n90bpi095bqbc9xpv668grq1rpf53c1"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ blis catalogue cymem diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index c4a314ea47429..0117a6b46fa62 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -11,7 +11,7 @@ let inherit sha256; }; - propagatedBuildInputs = [ spacy ] + requiredPythonModules = [ spacy ] ++ lib.optionals (lang == "zh") [ jieba pkuseg ]; pythonImportsCheck = [ pname ]; diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix index 4038e2255afa2..5b38520c2f210 100644 --- a/pkgs/development/python-modules/spake2/default.nix +++ b/pkgs/development/python-modules/spake2/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ hkdf ]; + requiredPythonModules = [ hkdf ]; checkPhase = '' py.test $out diff --git a/pkgs/development/python-modules/spambayes/default.nix b/pkgs/development/python-modules/spambayes/default.nix index f33748379d1ed..8e5131d8a3b54 100644 --- a/pkgs/development/python-modules/spambayes/default.nix +++ b/pkgs/development/python-modules/spambayes/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "016r3g43ja73rls1nh1dl82d75lgsjdl4cv2r5s7zcihm47nb38q"; }; - propagatedBuildInputs = [ bsddb3 pydns lockfile ]; + requiredPythonModules = [ bsddb3 pydns lockfile ]; meta = { description = "Statistical anti-spam filter, initially based on the work of Paul Graham"; diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix index b513a9f33c8c5..2ec85e9eeaa54 100644 --- a/pkgs/development/python-modules/spark_parser/default.nix +++ b/pkgs/development/python-modules/spark_parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ click ]; + requiredPythonModules = [ click ]; meta = with stdenv.lib; { description = ''An Early-Algorithm Context-free grammar Parser''; diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix index fe400630507bc..2a980ee5be704 100644 --- a/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # Doesn't actually run tests doCheck = false; - propagatedBuildInputs = [ six isodate pyparsing html5lib keepalive ]; + requiredPythonModules = [ six isodate pyparsing html5lib keepalive ]; meta = with stdenv.lib; { description = "This is a wrapper around a SPARQL service. It helps in creating the query URI and, possibly, convert the result into a more manageable format"; diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 93ffa89c76c43..3c380fd5acebf 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest dask ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy numba diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index b0b3e4b8f65fd..e8325fe5102a8 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1xc1m6vpl0bm600fx9vypa7zcvwg7yvhgn0w89y6v9d1vl0qcs7z"; }; - propagatedBuildInputs = [ astropy radio_beam ]; + requiredPythonModules = [ astropy radio_beam ]; nativeBuildInputs = [ astropy-helpers ]; diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 37b9c24a22e1d..2ab567de969c7 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "94d056e48e7e6fe2e6fe4161471e774ac03221a6225fd83d551d3184220c1edf"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; checkInputs = [ nose pyyaml ]; diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix index 79f7aa0739cdd..dcc05efb9fb81 100644 --- a/pkgs/development/python-modules/sphfile/default.nix +++ b/pkgs/development/python-modules/sphfile/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1596d801facc2b03a40a1bc67a839701f068a41597059feb82fc9378420c52c0"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; doCheck = false; diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix index 3f1a80c3c97ba..8e0108d51da96 100644 --- a/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkPhase = "py.test"; - propagatedBuildInputs = [ + requiredPythonModules = [ sphinx ]; diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix index 060d7f14a3369..f53674fa12b94 100644 --- a/pkgs/development/python-modules/sphinx-jinja/default.nix +++ b/pkgs/development/python-modules/sphinx-jinja/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; buildInputs = [ pbr ]; - propagatedBuildInputs = [ sphinx ]; + requiredPythonModules = [ sphinx ]; checkInputs = [ sphinx-testing nose glibcLocales ]; diff --git a/pkgs/development/python-modules/sphinx-navtree/default.nix b/pkgs/development/python-modules/sphinx-navtree/default.nix index 02e5711e888f4..764f62d7e0813 100644 --- a/pkgs/development/python-modules/sphinx-navtree/default.nix +++ b/pkgs/development/python-modules/sphinx-navtree/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "1nqcsbqwr8ihk1fv534i0naag1qw04f7ibcgl2j8csvkh8q90b4p"; }; - propagatedBuildInputs = [ sphinx ]; + requiredPythonModules = [ sphinx ]; meta = { description = "Navigation tree customization for Sphinx"; diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix index 1a8521bf43825..3a55df2e615ee 100644 --- a/pkgs/development/python-modules/sphinx-testing/default.nix +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ mock ]; - propagatedBuildInputs = [ sphinx six ]; + requiredPythonModules = [ sphinx six ]; checkPhase = '' ${python.interpreter} -m unittest discover -s tests diff --git a/pkgs/development/python-modules/sphinx/2.nix b/pkgs/development/python-modules/sphinx/2.nix index 5cf2cecd97f2d..305b922f064ac 100644 --- a/pkgs/development/python-modules/sphinx/2.nix +++ b/pkgs/development/python-modules/sphinx/2.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { checkPhase = '' cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' ''; - propagatedBuildInputs = [ + requiredPythonModules = [ docutils jinja2 pygments diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index b4cbd3bff9a16..2952dfd8ec61d 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { checkPhase = '' cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' ''; - propagatedBuildInputs = [ + requiredPythonModules = [ docutils jinja2 pygments diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index bb9fcb293da7c..b647bcc165b19 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a"; }; - propagatedBuildInputs = [ sphinx ]; + requiredPythonModules = [ sphinx ]; checkInputs = [ readthedocs-sphinx-ext pytest ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index bc9a90efcf235..07f2defd77b01 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "629612b001f86784669d65e662377a482052decfd9a0a17c46860878eef7b9e0"; }; - propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; + requiredPythonModules = [ oset pybtex pybtex-docutils sphinx ]; meta = { description = "A Sphinx extension for BibTeX style citations"; diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index b8f23afabcd50..b8c77f02116ac 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ mock sphinx-testing ]; - propagatedBuildInputs = [ sphinx blockdiag ]; + requiredPythonModules = [ sphinx blockdiag ]; # Seems to look for files in the wrong dir doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix index 57535c6f137c7..11c74d3b13218 100644 --- a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ sphinx ]; + requiredPythonModules = [ sphinx ]; # There are no unit tests doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 95bd4b5920106..4bbe00db18613 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "88320b2780f350d67f84a5424973ce24aee65701e8e163a7f5856c5df3353188"; }; - propagatedBuildInputs = [ sphinx ]; + requiredPythonModules = [ sphinx ]; # There are no unit tests doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index bd62d2ef4f8f5..3d107c36991e3 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pyyaml jsonschema m2r sphinxcontrib_httpdomain ]; + requiredPythonModules = [ pyyaml jsonschema m2r sphinxcontrib_httpdomain ]; doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 6b366ee517ce0..5d45c4136921f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "c8250ff02e6033c3aeabc41e91dc185168fecefb0c5722aaa3e2055a829e1e4c"; }; - propagatedBuildInputs = [ sphinx pyenchant pbr ] + requiredPythonModules = [ sphinx pyenchant pbr ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # No tests included diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 6b03c245ebb71..92b4475170225 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ sphinx ]; + requiredPythonModules = [ sphinx ]; # no tests in package doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix index b1bdf6a0dff62..6c45abf783fc0 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index 45027ba15c43c..326fc35f8ffc9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "4edf0223a0685a7c485ae5a156b6f529ba1ee481a1417817935b20bde1956232"; }; - propagatedBuildInputs = [ six sphinxcontrib-serializinghtml ]; + requiredPythonModules = [ six sphinxcontrib-serializinghtml ]; doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix index 9f042efcc97b7..5e0bf937871d9 100644 --- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "ac40b4fba58c76b073b03931c7b8ead611066a6aebccafb34dc19694f4eb6335"; }; - propagatedBuildInputs = [ sphinx ]; + requiredPythonModules = [ sphinx ]; # Check is disabled due to this issue: # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix index 93c53581c4fac..13880e3b0f8a7 100644 --- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"; }; - propagatedBuildInputs = [ sphinx ]; + requiredPythonModules = [ sphinx ]; meta = with stdenv.lib; { description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index b5dd9e11db035..390fa4b0fba14 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # No tests included. doCheck = false; - propagatedBuildInputs = [ sphinx plantuml ]; + requiredPythonModules = [ sphinx plantuml ]; meta = with stdenv.lib; { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index fde5733a864a6..2f5a7a8af749c 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "459e39e7a9f7572db6f1cdb5fdc5ccfc6404f021dccb969ee6287be2386a40db"; }; - propagatedBuildInputs = [ selenium ]; + requiredPythonModules = [ selenium ]; checkInputs = [ flask coverage ]; diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index 63ec4abcac422..f1e16e3d9b6ef 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1f50xczv8kgly6wz6zrvqzwdj6nvhdlgx8wnrhmbipjrb6qacr25"; }; - propagatedBuildInputs = [ requests six ]; + requiredPythonModules = [ requests six ]; # tests want to access the spotify API doCheck = false; diff --git a/pkgs/development/python-modules/spyder-kernels/0.x.nix b/pkgs/development/python-modules/spyder-kernels/0.x.nix index 63ed0604fe52f..0ada37b499877 100644 --- a/pkgs/development/python-modules/spyder-kernels/0.x.nix +++ b/pkgs/development/python-modules/spyder-kernels/0.x.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { # requirement xarray not available on Py2k disabled = !isPy3k; - propagatedBuildInputs = [ + requiredPythonModules = [ cloudpickle ipykernel wurlitzer diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 868ce80558a65..255d820fb8577 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "ca9d997c475b714b54d2fd67aa140837ec3630e91cbbc2e0cd190f1b0bd9fe9d"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cloudpickle ipykernel wurlitzer diff --git a/pkgs/development/python-modules/spyder/3.nix b/pkgs/development/python-modules/spyder/3.nix index cac20ad6fce5d..fbd987ef5d29c 100644 --- a/pkgs/development/python-modules/spyder/3.nix +++ b/pkgs/development/python-modules/spyder/3.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1sk9xajhzpklk5bcbdhpfhx3gxhyrahsmj9bv2m6kvbqxdlx6bq6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5 pygments qtpy pyzmq chardet pyqtwebengine diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 2b0276afc9d8e..c34f4c50b4993 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; - propagatedBuildInputs = [ + requiredPythonModules = [ intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server diff --git a/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/pkgs/development/python-modules/sqlalchemy-citext/default.nix index bf8a9d3bbdbd8..5aa6ddd8e2874 100644 --- a/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "69ba00f5505f92a1455a94eefc6d3fcf72dda3691ab5398a0b4d0d8d85bd6aab"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ sqlalchemy ]; diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 4050adc29f551..36cf837545d22 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1c9yd9s98crqgs39rc2ld2r0nchgyjrfbjdlqb99y4hhc6lv04xw"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ sqlalchemy sqlalchemy-utils ]; diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix index 4ef0adefe3e74..e32ac614a8487 100644 --- a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "15xah8643p29kciz365ixs9pbsflj92pzr2d9anbdh2biyf4cka8"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ sqlalchemy sqlalchemy-utils ]; diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix index 35e6854137e39..bc9b09faa1ffe 100644 --- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest Wand.imagemagick webob ]; - propagatedBuildInputs = [ sqlalchemy Wand ]; + requiredPythonModules = [ sqlalchemy Wand ]; checkPhase = '' cd tests diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index c64d8f61f79c9..179ead4fee090 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }) ]; checkInputs = [ unittest2 scripttest pytz mock testtools testrepository ]; - propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; + requiredPythonModules = [ pbr tempita decorator sqlalchemy six sqlparse ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 657ec7ac0721d..e653bc4477154 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0srs5w486wp5zydjs70igi5ypgxhm6h73grb85jz03fqpqaanzvs"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six sqlalchemy ]; diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index ccd4190bbfdec..32d43f41d22e6 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ FormEncode PasteDeploy paste pydispatcher ]; + requiredPythonModules = [ FormEncode PasteDeploy paste pydispatcher ]; meta = with stdenv.lib; { description = "Object Relational Manager for providing an object interface to your database"; diff --git a/pkgs/development/python-modules/sqlsoup/default.nix b/pkgs/development/python-modules/sqlsoup/default.nix index a6ffd3227cd44..f29653d66ec85 100644 --- a/pkgs/development/python-modules/sqlsoup/default.nix +++ b/pkgs/development/python-modules/sqlsoup/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1mj00fhxj75ac3i8xk9jmm7hvcjz9p4x2r3yndcwsgb659rvgbrg"; }; - propagatedBuildInputs = [ sqlalchemy ]; + requiredPythonModules = [ sqlalchemy ]; checkInputs = [ nose ]; meta = with lib; { diff --git a/pkgs/development/python-modules/squaremap/default.nix b/pkgs/development/python-modules/squaremap/default.nix index 4927d8c725d4e..4eddbcac605a2 100644 --- a/pkgs/development/python-modules/squaremap/default.nix +++ b/pkgs/development/python-modules/squaremap/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1a79jm7mp0pvi3a19za5c3idavnj7hlral01hhr3x9mz1jayav5i"; }; - propagatedBuildInputs = [ six wxPython ]; + requiredPythonModules = [ six wxPython ]; meta = with stdenv.lib; { description = "Hierarchic visualization control for wxPython"; diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix index 2afbb22d64e50..d141a8adb4405 100644 --- a/pkgs/development/python-modules/srp/default.nix +++ b/pkgs/development/python-modules/srp/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "c943b7181322a2bdd50d20e1244536c404916e546131dc1fae10a7cb99a013e9"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # Tests ends up with libssl.so cannot load shared doCheck = false; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index 9fca318db0b9a..a2272ae455f58 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "7fa4337256a1542e8f5bb4bed19e1d9aea98fe5ff9baf76693342a1dd6ac7c96"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix index 6cbdc81ef86d2..dae593d4a4534 100644 --- a/pkgs/development/python-modules/srvlookup/default.nix +++ b/pkgs/development/python-modules/srvlookup/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1zf1v04zd5phabyqh0nhplr5a8vxskzfrzdh4akljnz1yk2n2a0b"; }; - propagatedBuildInputs = [ dnspython ]; + requiredPythonModules = [ dnspython ]; checkInputs = [ mock nose ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index fc6b548ed5b85..4e15f41975a7e 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.ssdeep pytestrunner ]; checkInputs = [ pytest ]; - propagatedBuildInputs = [ cffi six ]; + requiredPythonModules = [ cffi six ]; # tests repository does not include required files doCheck = false; diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index ebc6435bc7946..89262af860ddb 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "b2fe534dcb33b1d3faad13d60c5a7c718e28f85987f2a034ecf5ec279918c11c"; }; - propagatedBuildInputs = [ requests six ]; + requiredPythonModules = [ requests six ]; # some tests use python3 strings doCheck = !isPy27; diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/pkgs/development/python-modules/sshpubkeys/default.nix index 6e250cf85f2f4..0caebd623ac7f 100644 --- a/pkgs/development/python-modules/sshpubkeys/default.nix +++ b/pkgs/development/python-modules/sshpubkeys/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1h4gwmcfn84kkqh83km1vfz8sc5kr2g4gzgzmr8gz704jmqiv7nq"; }; - propagatedBuildInputs = [ cryptography ecdsa ]; + requiredPythonModules = [ cryptography ecdsa ]; meta = with lib; { description = "OpenSSH Public Key Parser for Python"; diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index b8f2ab998266f..e4b14dc07d552 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1801b144b42b9bdb2f931923e85837f9193b877f3d490cd5776e1d4062c62fb4"; }; - propagatedBuildInputs = [ paramiko ]; + requiredPythonModules = [ paramiko ]; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index 24b334ef88228..68146055aa5c6 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ''; pythonImportsCheck = [ "sslyze" ]; - propagatedBuildInputs = [ nassl cryptography typing-extensions faker ]; + requiredPythonModules = [ nassl cryptography typing-extensions faker ]; meta = with lib; { homepage = "https://github.com/nabla-c0d3/sslyze"; diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index ff8a93d335ea9..a2f99513082f6 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { sha256 = "11i0yd8cqwscixajl734g11vf8pghki11c81chzfh8ifmj6mf9jk"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ aiofiles graphene itsdangerous diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 29fd116c0d590..d66c6c6fbec01 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "fbd61cca1dad44b6891d1a1d72b11ae100e21b3909802e3ff1861ab55bf16603"; }; - propagatedBuildInputs = [ jinja2 docopt easywatch ]; + requiredPythonModules = [ jinja2 docopt easywatch ]; # There are no tests on pypi doCheck = false; diff --git a/pkgs/development/python-modules/statistics/default.nix b/pkgs/development/python-modules/statistics/default.nix index 283954c838ba1..b61a9b308e4af 100644 --- a/pkgs/development/python-modules/statistics/default.nix +++ b/pkgs/development/python-modules/statistics/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "2dc379b80b07bf2ddd5488cad06b2b9531da4dd31edb04dc9ec0dc226486c138"; }; - propagatedBuildInputs = [ docutils ]; + requiredPythonModules = [ docutils ]; # statistics package does not have any tests doCheck = false; diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index f538cdf0c04bf..a68fa9c10bee3 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; checkInputs = [ nose ]; - propagatedBuildInputs = [ numpy scipy pandas patsy matplotlib ]; + requiredPythonModules = [ numpy scipy pandas patsy matplotlib ]; # Huge test suites with several test failures doCheck = false; diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 06d614feaacf2..a17730decf4d6 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "f845868b3a3a77a2489d226568abe7328b5c2d4f6a011cc759dfa99144a521f0"; }; - propagatedBuildInputs = [ pbr setuptools six ] + requiredPythonModules = [ pbr setuptools six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; doCheck = false; diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 3e09506ac66bc..a70cfca4485ec 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0135qzxlrivvkq6wgkw7shfz94n755qs2c1754p1hc2jk0nqayrg"; }; - propagatedBuildInputs = [ progress pyserial ]; + requiredPythonModules = [ progress pyserial ]; checkInputs = [ pytest ] ++ lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/strategies/default.nix b/pkgs/development/python-modules/strategies/default.nix index 2b03ddcf9c941..90133c88e5cd2 100644 --- a/pkgs/development/python-modules/strategies/default.nix +++ b/pkgs/development/python-modules/strategies/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "02i4ydrs9k61p8iv2vl2akks8p9gc88rw8031wlwb1zqsyjmb328"; }; - propagatedBuildInputs = [ multipledispatch toolz ]; + requiredPythonModules = [ multipledispatch toolz ]; checkInputs = [ pytest ]; meta = { diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index 1615f57d5e59a..6f0bca067dd52 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ arrow requests units diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index c8cad2282f229..0893a21c3a675 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "d2ca46c9f77ec444310c6ee45b66e8d59bb3a04607a0386297c10668ba7fca3a"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ networkx tornado toolz diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index 44345a9aa5056..14a80a18cbc07 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "6b07dbd4f77ab023ed4167c43ffc1b9f9354fb6075cc6ff3b91fefcbb80342ca"; }; - propagatedBuildInputs = [ ruamel_yaml python-dateutil ]; + requiredPythonModules = [ ruamel_yaml python-dateutil ]; # Library tested with external tool # https://hitchdev.com/approach/contributing-to-hitch-libraries/ diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index c70cac59920e0..9983e3a8cf929 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml"; }; - propagatedBuildInputs = [ antlr ]; + requiredPythonModules = [ antlr ]; disabled = isPy3k; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 5070d7d1947e9..863732befac5c 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "a622bce0d6d0ac99a53b6e6a6475c39250207d644f28ad0ed276af7b96d12617"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ pytest pytestcov pytest-mock pytest_xdist ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 8f7e73a454a44..5aa211e1254af 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-asyncio pretend freezegun simplejson twisted ] ++ lib.optionals (pythonAtLeast "3.6") [ python-rapidjson ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkPhase = '' # rm tests/test_twisted.py* diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 3ace2e925cbb4..b570f5ef6995a 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "0s2s3y855jjwdb7p55zx8lknplz58ghpw547yzmqisacr968b67w"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy numba diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/pkgs/development/python-modules/stups-cli-support/default.nix index 35aaf45ed1a24..63b525113a074 100644 --- a/pkgs/development/python-modules/stups-cli-support/default.nix +++ b/pkgs/development/python-modules/stups-cli-support/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1r6g29gd009p87m8a6wv4rzx7f0564zdv67qz5xys4wsgvc95bx0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ clickclick dnspython requests diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix index 5f51112324aa7..561245de8408f 100644 --- a/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/pkgs/development/python-modules/stups-fullstop/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1cpzz1b8g2mich7c1p74vfgw70vlxpgwi82a1ld82wv3srwqa0h3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests stups-cli-support stups-zign diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index aaa049916411b..8791af1204030 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "1ggfizw27wpcagbbk15xpfrhq6b250cx4278b5d7y8s438g128cs"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests stups-cli-support stups-zign diff --git a/pkgs/development/python-modules/stups-tokens/default.nix b/pkgs/development/python-modules/stups-tokens/default.nix index 3e785d8febbe1..180a8c8d17942 100644 --- a/pkgs/development/python-modules/stups-tokens/default.nix +++ b/pkgs/development/python-modules/stups-tokens/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "09z3l3xzdlwpivbi141gk1k0zd9m75mjwbdy81zc386rr9k8s0im"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests ]; diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix index 6b80f55636a92..5376a0e7cfc39 100644 --- a/pkgs/development/python-modules/stups-zign/default.nix +++ b/pkgs/development/python-modules/stups-zign/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ stups-tokens stups-cli-support ]; diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 88adbe4f7d944..60bbe6fa50110 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; - propagatedBuildInputs = [ + requiredPythonModules = [ opencv3 pyqt5 pyqtgraph diff --git a/pkgs/development/python-modules/subdownloader/default.nix b/pkgs/development/python-modules/subdownloader/default.nix index c4d57bef0ea9f..4a11d3266099e 100644 --- a/pkgs/development/python-modules/subdownloader/default.nix +++ b/pkgs/development/python-modules/subdownloader/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0manlfdpb585niw23ibb8n21mindd1bazp0pnxvmdjrp2mnw97ig"; }; - propagatedBuildInputs = [ mmpython pyqt4 ]; + requiredPythonModules = [ mmpython pyqt4 ]; setup = '' import os diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 25e20a44118cc..24bd7d93d252a 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { sha256 = "12v2clnbic8320fjsvkg3xfxfa7x8inhjk61z00pzwx46g3rqhy6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ guessit babelfish enzyme beautifulsoup4 requests click dogpile_cache stevedore chardet pysrt six appdirs rarfile pytz diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix index f462268918774..320e3b6cc1ef1 100644 --- a/pkgs/development/python-modules/subunit/default.nix +++ b/pkgs/development/python-modules/subunit/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ check cppunit ]; - propagatedBuildInputs = [ testtools ]; + requiredPythonModules = [ testtools ]; checkInputs = [ testscenarios hypothesis fixtures pytest ]; # ignore tests which call shell code, or call methods which haven't been implemented diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index 504d912128740..d9732b4e1ff5e 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "1zw86qp9ycw2k0anw6pzvwgd3zds0z2cwy0s663zhiv9mnb5hx1n"; }; - propagatedBuildInputs = [ numpy scipy spglib pymatgen h5py matplotlib seekpath phonopy ]; + requiredPythonModules = [ numpy scipy spglib pymatgen h5py matplotlib seekpath phonopy ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 6830c7c134304..9f7e1d0f57505 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { sha256 = "0j2yfhfxgi95rig8cfp9lvszb7694gq90jvs0xrb472hwnzgh2sk"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy matplotlib diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index 687aec08a0172..e2f73b77f18a2 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { # In the git repo, supervise_api lives inside a python subdir patchFlags = [ "-p2" ]; - propagatedBuildInputs = lib.optional (!isPy3k) whichcraft; + requiredPythonModules = lib.optional (!isPy3k) whichcraft; checkInputs = [ utillinux ]; diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 10c8f28e44633..ca88b3263b2ee 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pytest ''; - propagatedBuildInputs = [ meld3 setuptools ]; + requiredPythonModules = [ meld3 setuptools ]; meta = with lib; { description = "A system for controlling process state under UNIX"; diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index 2e6e7548efd8d..f95e18c4c5b31 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ rednose ]; - propagatedBuildInputs = [ six mock ]; + requiredPythonModules = [ six mock ]; meta = with stdenv.lib; { description = "Utility belt for automated testing"; diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix index 1c36f45090b8c..7ea276dde3e28 100644 --- a/pkgs/development/python-modules/suseapi/default.nix +++ b/pkgs/development/python-modules/suseapi/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "0hyzq0h1w8gp0zfvhqh7qsgcg1wp05a14371m6bn5a7gss93rbv4"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil requests ]; diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index b592ee75decec..54a0f1bd5c15d 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage { version = "1.0.0"; disabled = ! isPy27; - propagatedBuildInputs = [ lxml ]; + requiredPythonModules = [ lxml ]; src = fetchgit { url = "https://github.com/kjellmf/svg2tikz"; diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix index acd8fcb7816e4..45f4a181831ea 100644 --- a/pkgs/development/python-modules/svglib/default.nix +++ b/pkgs/development/python-modules/svglib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ + requiredPythonModules = [ cssselect2 lxml pillow diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix index bdb78096aef27..1df75f8e6c229 100644 --- a/pkgs/development/python-modules/swagger-spec-validator/default.nix +++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pytest tests ''; - propagatedBuildInputs = [ + requiredPythonModules = [ pyyaml jsonschema six diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix index 823f834b417c4..38c0df83ac189 100644 --- a/pkgs/development/python-modules/swagger-ui-bundle/default.nix +++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "setup_requires=['pytest-runner', 'flake8']" "setup_requires=[]" ''; - propagatedBuildInputs = [ jinja2 ]; + requiredPythonModules = [ jinja2 ]; # package contains no tests doCheck = false; diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix index 27e5f0cb0bb82..69144bceb0785 100644 --- a/pkgs/development/python-modules/swspotify/default.nix +++ b/pkgs/development/python-modules/swspotify/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0jxcvy8lw8kpjbl4q6mi11164pvi0w9m9p76bxj2m7i7s5p4dxd4"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests flask-cors dbus-python ]; diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix index 8fd0f023d0fa3..0ce1c4ff89a50 100644 --- a/pkgs/development/python-modules/sybase/default.nix +++ b/pkgs/development/python-modules/sybase/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0pm88hyn18dy7ljam4mdx9qqgmgraf2zy2wl02g5vsjl4ncvq90j"; }; - propagatedBuildInputs = [ freetds ]; + requiredPythonModules = [ freetds ]; SYBASE = freetds; setupPyBuildFlags = [ "-DHAVE_FREETDS" "-UWANT_BULKCOPY" ]; diff --git a/pkgs/development/python-modules/sympy/1_5.nix b/pkgs/development/python-modules/sympy/1_5.nix index 3a03fae154d77..e77378088671c 100644 --- a/pkgs/development/python-modules/sympy/1_5.nix +++ b/pkgs/development/python-modules/sympy/1_5.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ glibcLocales ]; - propagatedBuildInputs = [ mpmath ]; + requiredPythonModules = [ mpmath ]; # tests take ~1h doCheck = false; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 52e2bb5af127b..6f22d86f61a18 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ glibcLocales ]; - propagatedBuildInputs = [ mpmath ]; + requiredPythonModules = [ mpmath ]; # tests take ~1h doCheck = false; diff --git a/pkgs/development/python-modules/tables/3.5.nix b/pkgs/development/python-modules/tables/3.5.nix index bf0eb51c851c1..f5d45fa674222 100644 --- a/pkgs/development/python-modules/tables/3.5.nix +++ b/pkgs/development/python-modules/tables/3.5.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ hdf5 cython bzip2 lzo c-blosc ]; - propagatedBuildInputs = [ numpy numexpr six mock ]; + requiredPythonModules = [ numpy numexpr six mock ]; # The setup script complains about missing run-paths, but they are # actually set. diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index cd2af0dc28d6e..b77eae403ea21 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; buildInputs = [ hdf5 bzip2 lzo c-blosc ]; - propagatedBuildInputs = [ numpy numexpr six mock ]; + requiredPythonModules = [ numpy numexpr six mock ]; # When doing `make distclean`, ignore docs postPatch = '' diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index b1427a8133125..da3391e46e960 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "1rvvdchdva7j9b29ay0sg8y33pjhpmzynl38wz2rl89pph8gmhlc"; }; - propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; + requiredPythonModules = [ xlwt openpyxl pyyaml xlrd odfpy ]; checkInputs = [ pytest pytestcov unicodecsv pandas ]; # test_tablib needs MarkupPy, which isn't packaged yet diff --git a/pkgs/development/python-modules/tadasets/default.nix b/pkgs/development/python-modules/tadasets/default.nix index d1de836a5b8c4..cb1f22ba901a6 100644 --- a/pkgs/development/python-modules/tadasets/default.nix +++ b/pkgs/development/python-modules/tadasets/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "a0e6c14678750315febd97fcf334bbbfd2695ebd91b4fe7707bb1220d7348416"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy matplotlib ]; diff --git a/pkgs/development/python-modules/tarman/default.nix b/pkgs/development/python-modules/tarman/default.nix index f2a503cb55d86..c96ccfe01a68d 100644 --- a/pkgs/development/python-modules/tarman/default.nix +++ b/pkgs/development/python-modules/tarman/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; buildInputs = [ unittest2 nose mock ]; - propagatedBuildInputs = [ libarchive ]; + requiredPythonModules = [ libarchive ]; # tests are still failing doCheck = false; diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix index 319dd98234d2b..a9934f3841531 100644 --- a/pkgs/development/python-modules/tasklib/default.nix +++ b/pkgs/development/python-modules/tasklib/default.nix @@ -15,7 +15,7 @@ in buildPythonPackage rec { sha256 = "21525a34469928876b64edf8abf79cf788bb3fa796d4554ba22a68bc1f0693f5"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six pytz tzlocal diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index ee9a9716d1178..0c35c3089c450 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ nose pkgs.taskwarrior tox ]; - propagatedBuildInputs = [ six dateutil kitchen pytz ]; + requiredPythonModules = [ six dateutil kitchen pytz ]; meta = with stdenv.lib; { homepage = "https://github.com/ralphbean/taskw"; diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 922ca1b9b9573..12ccc72b92e74 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ colorama mypy pyyaml regex ] + requiredPythonModules = [ colorama mypy pyyaml regex ] ++ stdenv.lib.optionals (pythonOlder "3.7") [ dataclasses ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ pytest-mypy ]; diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index 2d0efeceda042..991e38c3a5b1d 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "235748cceeb22c042e32d2fdfd4d710021bac9b938c4f2c35e1fce1cfd58f7ec"; }; - propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; + requiredPythonModules = [ attrs pendulum pprintpp wrapt ]; # this versioning was done to prevent normal pip users from encountering # issues with package failing to build from source, but nixpkgs is better diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index 20fa793a8a63b..15051a01dbc50 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "f847c57302a102eb88e29ed95b8f4efa69582db2966fd806c21376b9a66ad4a8"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ sqlalchemy ]; diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index f8c0661f0cd87..945e6395938ee 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1fg12gcg6ca7rjh7m3g48m30cx4aaw5g09855nlyz2sa1kw3gfyq"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ async_generator rsa pyaes diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 0536b0f2ccd46..ff40d394a3a85 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six pytz jaraco_functools ]; + requiredPythonModules = [ six pytz jaraco_functools ]; checkInputs = [ pytest-freezegun pytest freezegun backports_unittest-mock diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 18570c90c00f1..1b42cc7e5c49d 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pbr setuptools_scm ]; - propagatedBuildInputs = [ six ] + requiredPythonModules = [ six ] ++ lib.optionals isPy27 [ futures monotonic typing ]; checkInputs = [ pytest sphinx tornado ] diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index d2532777d0068..851c5576d26f4 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pytestCheckHook boto3 crc32c matplotlib moto pillow pytorch tensorflow-tensorboard torchvision ]; - propagatedBuildInputs = [ numpy protobuf six ]; + requiredPythonModules = [ numpy protobuf six ]; disabledTests = [ "test_TorchVis" "test_onnx_graph" ]; diff --git a/pkgs/development/python-modules/tensorflow-estimator/1/default.nix b/pkgs/development/python-modules/tensorflow-estimator/1/default.nix index c34d6948d89eb..cac92c083f4a5 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/1/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/1/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1fc61wmc0w22frs79j2x4g6wnv5g21xc6rix1g4bsvy9qfvvylw8"; }; - propagatedBuildInputs = [ mock numpy absl-py ]; + requiredPythonModules = [ mock numpy absl-py ]; meta = with stdenv.lib; { description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting."; diff --git a/pkgs/development/python-modules/tensorflow-estimator/2/default.nix b/pkgs/development/python-modules/tensorflow-estimator/2/default.nix index 750ef6e8a9076..f5ad2dcc0470c 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/2/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "11n4sl9wfr00fv1i837b7a36ink86ggmlsgj7i06kcfc011h6pmp"; }; - propagatedBuildInputs = [ mock numpy absl-py ]; + requiredPythonModules = [ mock numpy absl-py ]; meta = with stdenv.lib; { description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting."; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index a89c6fa307eaf..95a51c9146846 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -88,7 +88,7 @@ in buildPythonPackage { src = bazel-wheel; - propagatedBuildInputs = [ + requiredPythonModules = [ tensorflow six numpy diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix index 6cc3636b7f303..56ec029f0a82b 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { sha256 = "0l3zc8j2sh7h1z4qpy8kfvclv3kzndri55p10i42q6xahs9phav1"; })); - propagatedBuildInputs = [ + requiredPythonModules = [ numpy werkzeug protobuf diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix index 945896dda018a..9a9cc00d30c25 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { sha256 = "1f805839xa36wxb7xac9fyxzaww92vw4d50vs6g61wnlr4byp00w"; })); - propagatedBuildInputs = [ + requiredPythonModules = [ numpy werkzeug protobuf diff --git a/pkgs/development/python-modules/tensorflow/1/bin.nix b/pkgs/development/python-modules/tensorflow/1/bin.nix index 9bd2bc78437a9..fda538ee0f79e 100644 --- a/pkgs/development/python-modules/tensorflow/1/bin.nix +++ b/pkgs/development/python-modules/tensorflow/1/bin.nix @@ -61,7 +61,7 @@ in buildPythonPackage { key = "${platform}_py_${pyver}_${unit}"; in fetchurl packages.${key}; - propagatedBuildInputs = [ + requiredPythonModules = [ protobuf numpy termcolor diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index 599f809f86468..41e7d99fdb1dc 100644 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -378,7 +378,7 @@ in buildPythonPackage { setupPyGlobalFlags = [ "--project_name ${pname}" ]; # tensorflow/tools/pip_package/setup.py - propagatedBuildInputs = [ + requiredPythonModules = [ absl-py astor gast diff --git a/pkgs/development/python-modules/tensorflow/2/bin.nix b/pkgs/development/python-modules/tensorflow/2/bin.nix index acb5f473ec9d5..cc64944014978 100644 --- a/pkgs/development/python-modules/tensorflow/2/bin.nix +++ b/pkgs/development/python-modules/tensorflow/2/bin.nix @@ -63,7 +63,7 @@ in buildPythonPackage { key = "${platform}_py_${pyVerNoDot}_${unit}"; in fetchurl packages.${key}; - propagatedBuildInputs = [ + requiredPythonModules = [ protobuf numpy scipy diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix index 7925cb15f03b9..0d687bcf716e9 100644 --- a/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -355,7 +355,7 @@ in buildPythonPackage { setupPyGlobalFlags = [ "--project_name ${pname}" ]; # tensorflow/tools/pip_package/setup.py - propagatedBuildInputs = [ + requiredPythonModules = [ absl-py astor gast diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix index 54f32d182c0cb..2edac2c30bd5e 100644 --- a/pkgs/development/python-modules/tensorly/default.nix +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "1ml91yaxwx4msisxbm92yf22qfrscvk58f3z2r1jhi96pw2k4i7x"; }; - propagatedBuildInputs = [ numpy scipy sparse ] + requiredPythonModules = [ numpy scipy sparse ] ++ lib.optionals (!doCheck) [ nose ]; # upstream added nose to install_requires checkInputs = [ pytest nose pytorch ]; diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index 51e9b98db5bb4..402e1923b2c63 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "4804a774f802306a7d9af7322193c5390f1da0abb429e082a10ef1d46e6fb2c2"; }; - propagatedBuildInputs = [ ptyprocess tornado ]; + requiredPythonModules = [ ptyprocess tornado ]; # test_max_terminals fails doCheck = false; diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix index 883d541f81203..c6bf3f506a50c 100644 --- a/pkgs/development/python-modules/tess/default.nix +++ b/pkgs/development/python-modules/tess/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { buildInputs = [ cython ]; - propagatedBuildInputs = [ numpy scipy ]; + requiredPythonModules = [ numpy scipy ]; meta = with lib; { description = "A module for calculating and analyzing Voronoi tessellations"; diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index df1b02283043c..e47d1d37b2e5b 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython pkg-config ]; buildInputs = [ leptonica tesseract ]; - propagatedBuildInputs = [ pillow ]; + requiredPythonModules = [ pillow ]; meta = with lib; { description = "A simple, Pillow-friendly, wrapper around the tesseract-ocr API for Optical Character Recognition (OCR)"; diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix index f0c26292c84ba..530eeb0184597 100644 --- a/pkgs/development/python-modules/test-tube/default.nix +++ b/pkgs/development/python-modules/test-tube/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pytestCheckHook ]; - propagatedBuildInputs = [ + requiredPythonModules = [ future imageio numpy diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index f3c7e169207f0..73960b418d7d5 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ testresources ]; buildInputs = [ pbr ]; - propagatedBuildInputs = [ fixtures subunit testtools ]; + requiredPythonModules = [ fixtures subunit testtools ]; checkPhase = '' ${python.interpreter} ./testr diff --git a/pkgs/development/python-modules/testresources/default.nix b/pkgs/development/python-modules/testresources/default.nix index 1aaddc3dec9c3..51526b0326941 100644 --- a/pkgs/development/python-modules/testresources/default.nix +++ b/pkgs/development/python-modules/testresources/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "ee9d1982154a1e212d4e4bac6b610800bfb558e4fb853572a827bc14a96e4417"; }; - propagatedBuildInputs = [ pbr ]; + requiredPythonModules = [ pbr ]; checkInputs = [ fixtures testtools ]; diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix index 751ab02670a3b..890d2c63cdd37 100644 --- a/pkgs/development/python-modules/testscenarios/default.nix +++ b/pkgs/development/python-modules/testscenarios/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { --replace "catch = 1" "" ''; - propagatedBuildInputs = [ testtools ]; + requiredPythonModules = [ testtools ]; meta = with stdenv.lib; { description = "A pyunit extension for dependency injection"; diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 8ef3d9c4320f1..e697efcc553bf 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "64c974a6cca4385d05f4bbfa2deca1c39ce88ede31c3448bee86a7259a9a61c8"; }; - propagatedBuildInputs = [ pbr python_mimeparse extras unittest2 ]; + requiredPythonModules = [ pbr python_mimeparse extras unittest2 ]; buildInputs = [ traceback2 ]; # testscenarios has a circular dependency on testtools diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 616db71a94f4d..06b0e4357b802 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "ff72adc6dbb85db6981324e226fff77830da57d7fe7e4adb2cafd9dc2a8bfa7d"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cachetools cytoolz jellyfish diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix index 04bc47913d8f8..c5e4a2e1bf370 100644 --- a/pkgs/development/python-modules/textfsm/default.nix +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ six future ]; + requiredPythonModules = [ six future ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tflearn/default.nix b/pkgs/development/python-modules/tflearn/default.nix index 03185ae4d9fe0..7e3f50fb2e2d2 100644 --- a/pkgs/development/python-modules/tflearn/default.nix +++ b/pkgs/development/python-modules/tflearn/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ scipy h5py pillow tensorflow ]; + requiredPythonModules = [ scipy h5py pillow tensorflow ]; doCheck = false; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 5ac55f5f57dd1..01c3cc96708bf 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { Accelerate CoreFoundation CoreGraphics CoreVideo ]); - propagatedBuildInputs = [ + requiredPythonModules = [ blis catalogue cymem diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index 999d950771c71..58f09e11321b8 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "9af1c86bf73433afc6010ed376a6c6aca2b54099cc0d61895f640870a9ae7d89"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; # No tests. Breaks when not disabling. doCheck = false; diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index 86a2dd2001108..bc4e67aa0c650 100644 --- a/pkgs/development/python-modules/thumbor/default.nix +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { pkgs.gifsicle ]; - propagatedBuildInputs = [ + requiredPythonModules = [ tornado pycrypto pycurl diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 77187f42b5e4b..cb78c03a01018 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pytest ''; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy ] ++ lib.optionals isPy3k [ imagecodecs-lite diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index d5379b849adee..23f3704d9360c 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { tiledb ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy wheel # No idea why but it is listed ]; diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix index d4e54fcc40e16..68f9a780956d0 100644 --- a/pkgs/development/python-modules/tilestache/default.nix +++ b/pkgs/development/python-modules/tilestache/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1qjrabl6qr7i6yj6v647ck92abcyklb0vmb6h6kj7x8v2cj5xbvk"; }; - propagatedBuildInputs = [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ]; + requiredPythonModules = [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ]; meta = with stdenv.lib; { description = "A tile server for rendered geographic data"; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index ca07b50ceff87..4c3bbb22c1b29 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "c84e0f4b501419349e67972d25c535d9b5fd6c100c319747049b67812a4c6b97"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy ]; diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix index 42250b058d587..d0ae103a5e7cf 100644 --- a/pkgs/development/python-modules/tinycss/default.nix +++ b/pkgs/development/python-modules/tinycss/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ cssutils ]; + requiredPythonModules = [ cssutils ]; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 35c0f76b08434..64c8e9f7e8c4e 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ) ]; - propagatedBuildInputs = [ webencodings ]; + requiredPythonModules = [ webencodings ]; checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix index edc4bbdebb133..ba34f8ad68b41 100644 --- a/pkgs/development/python-modules/tiros/default.nix +++ b/pkgs/development/python-modules/tiros/default.nix @@ -16,5 +16,5 @@ buildPythonPackage rec { sed -i "s/'datetime',//" setup.py ''; - propagatedBuildInputs = [ semantic-version boto3 flask docutils requests ]; + requiredPythonModules = [ semantic-version boto3 flask docutils requests ]; } diff --git a/pkgs/development/python-modules/tissue/default.nix b/pkgs/development/python-modules/tissue/default.nix index 8f551ab5926da..cbcead053a34c 100644 --- a/pkgs/development/python-modules/tissue/default.nix +++ b/pkgs/development/python-modules/tissue/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ pep8 ]; + requiredPythonModules = [ pep8 ]; meta = with stdenv.lib; { homepage = "https://github.com/WoLpH/tissue"; diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index acc8b9c567050..b3ab0f832a24e 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "16e279edf085293bc9c44a68ce959c7d6cd5c653e6b5669a3a3640015cb63eb6"; }; - propagatedBuildInputs = [ regex ]; + requiredPythonModules = [ regex ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index a8d00d075142f..33352621fefb0 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -9,7 +9,7 @@ python.pkgs.buildPythonPackage rec { sha256 = "cf8410a7ed7b9477f563fa158dabef5117d8374cba55f65142ba0af6dcd15d4d"; }; - propagatedBuildInputs = with python.pkgs; [ six ]; + requiredPythonModules = with python.pkgs; [ six ]; checkInputs = with python.pkgs; [ factory_boy faker pytestcov tox pytestCheckHook]; # https://github.com/barseghyanartur/tld/issues/54 diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index b7df857533a0f..6290960c4545c 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "ab0e38977a129c72729476d5f8c85a8e1f8e49e9202e1db8dca76e95da7be9a8"; }; - propagatedBuildInputs = [ requests requests-file idna ]; + requiredPythonModules = [ requests requests-file idna ]; checkInputs = [ pytest responses ]; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index ac78179623000..c41aa07be4881 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ requests ] ++ stdenv.lib.optional (pythonOlder "3.5") typing; + requiredPythonModules = [ requests ] ++ stdenv.lib.optional (pythonOlder "3.5") typing; meta = { description = "The official Todoist Python API library"; diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 89c612abfef87..39e6beed73a1f 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { runHook postCheck ''; - propagatedBuildInputs = [ + requiredPythonModules = [ click click-completion inquirer diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix index 7c8e99cc399a9..ca31978a9b685 100644 --- a/pkgs/development/python-modules/tokenlib/default.nix +++ b/pkgs/development/python-modules/tokenlib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0bq6dqyfwh29pg8ngmrm4mx4q27an9lsj0p9l79p9snn4g2rxzc8"; }; - propagatedBuildInputs = [ requests webob ]; + requiredPythonModules = [ requests webob ]; meta = with stdenv.lib; { homepage = "https://github.com/mozilla-services/tokenlib"; diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix index 6d3c7e2be0548..3c04e92c732eb 100644 --- a/pkgs/development/python-modules/tokenserver/default.nix +++ b/pkgs/development/python-modules/tokenserver/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "04z0r8xzrmhvh04y8ggdz9gs8qa8lv3qr7kasf6lm63fixsfgrlp"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ alembic boto cornice hawkauthlib mozsvc paste pybrowserid pyfxa pymysql pymysqlsa sqlalchemy testfixtures tokenlib umemcache ]; diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 27f952386f127..80397847d600d 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"; }; - propagatedBuildInputs = + requiredPythonModules = lib.optionals isPy27 [ enum34 functools32 ] ++ lib.optional isPy27 typing; diff --git a/pkgs/development/python-modules/torchgpipe/default.nix b/pkgs/development/python-modules/torchgpipe/default.nix index 6e621ee8b6887..4921e546777ea 100644 --- a/pkgs/development/python-modules/torchgpipe/default.nix +++ b/pkgs/development/python-modules/torchgpipe/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "0ki0njhmz1i3pkpr3y6h6ac7p5qh1kih06mknc2s18mfw34f2l55"; }; - propagatedBuildInputs = [ pytorch ]; + requiredPythonModules = [ pytorch ]; checkInputs = [ pytest pytestrunner pytestCheckHook ]; disabledTests = [ "test_inplace_on_requires_grad" ]; diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 4d37157909969..dc5a71e9183d6 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "18gvdabkmzfjg47ns0lw38mf85ry28nq1mas5rzlwvb4l5zmw2ms"; }; - propagatedBuildInputs = [ six numpy pillow pytorch ]; + requiredPythonModules = [ six numpy pillow pytorch ]; meta = { description = "PyTorch vision library"; diff --git a/pkgs/development/python-modules/tornado/4.nix b/pkgs/development/python-modules/tornado/4.nix index 6d889a09d25ef..33777d2d749a7 100644 --- a/pkgs/development/python-modules/tornado/4.nix +++ b/pkgs/development/python-modules/tornado/4.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tornado"; version = "4.5.3"; - propagatedBuildInputs = lib.optionals isPy27 [ backports_abc certifi singledispatch backports_ssl_match_hostname futures ]; + requiredPythonModules = lib.optionals isPy27 [ backports_abc certifi singledispatch backports_ssl_match_hostname futures ]; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 diff --git a/pkgs/development/python-modules/tornado/5.nix b/pkgs/development/python-modules/tornado/5.nix index da270331978d3..c74e9476b533f 100644 --- a/pkgs/development/python-modules/tornado/5.nix +++ b/pkgs/development/python-modules/tornado/5.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tornado"; version = "5.1.1"; - propagatedBuildInputs = lib.optionals isPy27 [ backports_abc certifi singledispatch backports_ssl_match_hostname futures ]; + requiredPythonModules = lib.optionals isPy27 [ backports_abc certifi singledispatch backports_ssl_match_hostname futures ]; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index a7573e669a8ca..3427c32a326d3 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "15l1gb0hhi9pf3mhhb9vpc93w6w3hrih2ljmzbkgfb3dwqd1l9a8"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click click-default-group incremental diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 40883928f5658..58111fee87d6e 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { version = "3.19.0"; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; + requiredPythonModules = [ packaging pluggy py six virtualenv toml filelock ]; doCheck = false; diff --git a/pkgs/development/python-modules/traceback2/default.nix b/pkgs/development/python-modules/traceback2/default.nix index 3a70df1548d0c..0fc81b531c90c 100644 --- a/pkgs/development/python-modules/traceback2/default.nix +++ b/pkgs/development/python-modules/traceback2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0c1h3jas1jp1fdbn9z2mrgn3jj0hw1x3yhnkxp7jw34q15xcdb05"; }; - propagatedBuildInputs = [ pbr linecache2 ]; + requiredPythonModules = [ pbr linecache2 ]; # circular dependencies for tests doCheck = false; diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index 6d198534149d2..b5e53aaf84c9d 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "16mc22z3104fvygky4gy3gvifjijm42db48v2z1y0fmyf6whi9p6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scipy six diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 001106328085a..7d8be992019ad 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ glibcLocales pytest mock ]; - propagatedBuildInputs = [ ipython_genutils decorator six ] ++ lib.optional (pythonOlder "3.4") enum34; + requiredPythonModules = [ ipython_genutils decorator six ] ++ lib.optional (pythonOlder "3.4") enum34; checkPhase = '' LC_ALL="en_US.UTF-8" py.test diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 789ba7a1691ec..395ccdf29e224 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # Use pytest because its easier to discover tests buildInputs = [ pytest ]; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; checkPhase = '' py.test $out/${python.sitePackages} diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index 01788f63d4f43..3790d69ae6c46 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "74fb4db848ac1343241fa4dc5d9bf3fab561f309826c602e8a3568309df91fe3"; }; - propagatedBuildInputs = [ traits pyface six ]; + requiredPythonModules = [ traits pyface six ]; doCheck = false; # Needs X server diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix index 2c8f6dd803129..1ef12d0846bae 100644 --- a/pkgs/development/python-modules/traittypes/default.nix +++ b/pkgs/development/python-modules/traittypes/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ traitlets ]; + requiredPythonModules = [ traitlets ]; checkInputs = [ numpy pandas xarray nose pytest ]; diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 887c46863362c..c39d17c9c67ca 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "3b0ad400cb7fa25f95d1516756c4c4557bb78890510f69393ad0bd15869eaa2d"; }; - propagatedBuildInputs = [ zope_interface mock ]; + requiredPythonModules = [ zope_interface mock ]; meta = with stdenv.lib; { description = "Transaction management"; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index e3fd150fbcf79..00e410ed55afc 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sha256 = "1v09gryxsg57d2cjwagna1535m8mbxlazdbhsww210lxa818m5qj"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ filelock numpy protobuf diff --git a/pkgs/development/python-modules/transforms3d/default.nix b/pkgs/development/python-modules/transforms3d/default.nix index 8b21e64e9a7ec..95d65f7c87e89 100644 --- a/pkgs/development/python-modules/transforms3d/default.nix +++ b/pkgs/development/python-modules/transforms3d/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "1z789hgk71a6rj6mqp9srpzamg06g58hs2p1l1p344cfnkj5a4kc"; }; - propagatedBuildInputs = [ numpy sympy ]; + requiredPythonModules = [ numpy sympy ]; checkInputs = [ pytest scipy ]; checkPhase = "pytest transforms3d"; diff --git a/pkgs/development/python-modules/transip/default.nix b/pkgs/development/python-modules/transip/default.nix index 8ea70a19ead49..c0539e5e51ff2 100644 --- a/pkgs/development/python-modules/transip/default.nix +++ b/pkgs/development/python-modules/transip/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; - propagatedBuildInputs = [ requests cryptography suds-jurko ]; + requiredPythonModules = [ requests cryptography suds-jurko ]; meta = with stdenv.lib; { description = "TransIP API Connector"; diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index a372e492f9f67..0a7f8d08a12fb 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "dill<0.2.7" dill ''; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ nose mock dill pycodestyle ]; diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix index eb209a0d49ecd..dcc986433c646 100644 --- a/pkgs/development/python-modules/transmissionrpc/default.nix +++ b/pkgs/development/python-modules/transmissionrpc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; meta = with stdenv.lib; { description = "Python implementation of the Transmission bittorent client RPC protocol"; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 919ef529407ae..ee2c11119fdaa 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "83cd2ca75aef4f1fbdbe144c186426d930c3e8b20385df8cec9e12d442986da2"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests six incremental diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index bb85ca6b6f3c2..594d59404173a 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -35,7 +35,11 @@ buildPythonPackage rec { nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ + buildInputs = lib.optionals stdenv.isLinux [ + trezor-udev-rules + ]; + + requiredPythonModules = [ attrs click construct @@ -50,8 +54,6 @@ buildPythonPackage rec { rlp shamir-mnemonic typing-extensions - ] ++ lib.optionals stdenv.isLinux [ - trezor-udev-rules ]; checkInputs = [ diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index 82cb14b31cb15..ae4c24700e841 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "139d917d6495bf290bcc21da457f84ccd2e74c78b4d59a649e0cdde4288cd20c"; }; - propagatedBuildInputs = [ setuptools trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ]; + requiredPythonModules = [ setuptools trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ]; meta = with stdenv.lib; { description = "Using Trezor as hardware SSH agent"; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 3afb2de58c313..311859aa4716a 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "932670e753abdec162d1d9c661920db871236de782890ad88577b2af0d824c7f"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; # tests are not included in pypi distributions and would require lots of # optional dependencies diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 94da63cd3ec6a..e0762ae8e535f 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { "static_tool_sees_all_symbols" ]; - propagatedBuildInputs = [ + requiredPythonModules = [ attrs sortedcontainers async_generator diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index b81a92d08e668..884403950e44f 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { checkInputs = [ mock ] ++ lib.optional (!isPy3k) unittest2; - propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) futures; + requiredPythonModules = [ six ] ++ lib.optional (!isPy3k) futures; patches = [ ./tests.patch diff --git a/pkgs/development/python-modules/trueskill/default.nix b/pkgs/development/python-modules/trueskill/default.nix index 18033aff391c4..e5fbc822fb85d 100644 --- a/pkgs/development/python-modules/trueskill/default.nix +++ b/pkgs/development/python-modules/trueskill/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1fv7g1szyjykja9mzax2w4js7jm2z7wwzgnr5dqrsdi84j6v8qlx"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six ]; diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 4c99c8e937709..6d6d3fdab8068 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { service-identity ]; - propagatedBuildInputs = [ + requiredPythonModules = [ cryptography idna ] ++ lib.optionals (!isPy3k) [ diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 5a9495746cd91..719f0238160ce 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -39,7 +39,7 @@ buildPythonApplication rec { buildInputs = [ mock ]; - propagatedBuildInputs = [ + requiredPythonModules = [ lxml relatorio genshi diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 02269cdbfb285..e3c72bd47d078 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "docopt==0.6.2" "docopt" ''; - propagatedBuildInputs = [ internetarchive docopt youtube-dl ]; + requiredPythonModules = [ internetarchive docopt youtube-dl ]; pythonImportsCheck = [ "tubeup" ]; diff --git a/pkgs/development/python-modules/tunigo/default.nix b/pkgs/development/python-modules/tunigo/default.nix index 9f2f177552de8..5b51c38c0c8c8 100644 --- a/pkgs/development/python-modules/tunigo/default.nix +++ b/pkgs/development/python-modules/tunigo/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "tunigo"; version = "1.0.0"; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; src = fetchFromGitHub { owner = "trygveaa"; diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix index beabc8c231068..841684252d1d9 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "6a0135815cb680da38d78121d4d659d8e54a25f4db2816cd86d62916b92f23b2"; }; - propagatedBuildInputs = [ requests-cache ]; + requiredPythonModules = [ requests-cache ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix index 2dc819ac63e0b..5b4f0b2eb1645 100644 --- a/pkgs/development/python-modules/tvnamer/default.nix +++ b/pkgs/development/python-modules/tvnamer/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ tvdb_api ]; + requiredPythonModules = [ tvdb_api ]; # a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or .. doCheck = false; diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 1c5535ec079b6..999d86016e58d 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; doCheck = false; - propagatedBuildInputs = [ requests six requests_oauthlib ]; + requiredPythonModules = [ requests six requests_oauthlib ]; meta = with lib; { homepage = "https://github.com/tweepy/tweepy"; diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix index fdff4a90f9e12..c960896ca9d09 100644 --- a/pkgs/development/python-modules/twiggy/default.nix +++ b/pkgs/development/python-modules/twiggy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "259ae96cb22e80c49e75c37dc2f7497028c5dc19018958f05fa00ec08fc2569f"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index d4cd7b5d59bfd..caae1672b238e 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ nose mock ]; - propagatedBuildInputs = [ pyjwt pysocks pytz six requests ]; + requiredPythonModules = [ pyjwt pysocks pytz six requests ]; meta = with stdenv.lib; { description = "Twilio API client and TwiML generator"; diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index a717ab2bc9d2d..24637bde800a7 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; - propagatedBuildInputs = [ + requiredPythonModules = [ lxml requests pyparsing diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 47f9fe1a034ea..5e5dfbda23d91 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ keyring pkginfo pyblake2 diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index d38d6aebcbd88..1f6c95ecc2be6 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "040yzha6cyshnn6ljgk2birgh6mh2cnra48xp5ina5vfsnsmab6p"; }; - propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ]; + requiredPythonModules = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ]; passthru.extras.tls = [ pyopenssl service-identity idna ]; diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix index d562eac5cc7d8..f62371c4f9f4d 100644 --- a/pkgs/development/python-modules/twitter-common-collections/default.nix +++ b/pkgs/development/python-modules/twitter-common-collections/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "ede4caff74928156f7ff38dac9b0811893de41966c39cd5b2fdea53418349ca8"; }; - propagatedBuildInputs = [ twitter-common-lang ]; + requiredPythonModules = [ twitter-common-lang ]; meta = with stdenv.lib; { description = "Twitter's common collections"; diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix index 1253b8077e753..9e2bc89255b01 100644 --- a/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ b/pkgs/development/python-modules/twitter-common-confluence/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "323dde2c519f85020569d7a343432f3aac16bce6ebe5e34774dbde557296697c"; }; - propagatedBuildInputs = [ twitter-common-log ]; + requiredPythonModules = [ twitter-common-log ]; meta = with stdenv.lib; { description = "Twitter's API to the confluence wiki"; diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix index df2f614c5a040..e8dc51b1484c6 100644 --- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ b/pkgs/development/python-modules/twitter-common-dirutil/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "49aeecad2434ac23c16abbfc1fccffd3790c056a9eb01468ec26c83e65a10119"; }; - propagatedBuildInputs = [ twitter-common-lang ]; + requiredPythonModules = [ twitter-common-lang ]; meta = with stdenv.lib; { description = "Utilities for manipulating and finding files and directories"; diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix index 1c3d1808f5ddc..4b57c4a5e138d 100644 --- a/pkgs/development/python-modules/twitter-common-log/default.nix +++ b/pkgs/development/python-modules/twitter-common-log/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "7160a864eed30044705e05b816077dd193aec0c66f50ef1c077b7f8490e0d06a"; }; - propagatedBuildInputs = [ twitter-common-options twitter-common-dirutil ]; + requiredPythonModules = [ twitter-common-options twitter-common-dirutil ]; meta = with stdenv.lib; { description = "Twitter's common logging library"; diff --git a/pkgs/development/python-modules/twofish/default.nix b/pkgs/development/python-modules/twofish/default.nix index 1fe541b072907..5ec6348a0b6f2 100644 --- a/pkgs/development/python-modules/twofish/default.nix +++ b/pkgs/development/python-modules/twofish/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1yihp2n42amrxw0wk9f66llpb3w5kwhgkcdg9krkzcik1nsqp7dh"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ javaobj-py3 ]; diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 7e87a2d59ea4a..c6510bcf5157d 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ six twisted ]; + requiredPythonModules = [ six twisted ]; checkPhase = '' py.test -k "not test_sdist" diff --git a/pkgs/development/python-modules/txamqp/default.nix b/pkgs/development/python-modules/txamqp/default.nix index db973dbffbed8..3d65b4b72c68e 100644 --- a/pkgs/development/python-modules/txamqp/default.nix +++ b/pkgs/development/python-modules/txamqp/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0jd9864k3csc06kipiwzjlk9mq4054s8kzk5q1cfnxj8572s4iv4"; }; - propagatedBuildInputs = [ twisted ]; + requiredPythonModules = [ twisted ]; meta = with stdenv.lib; { homepage = "https://github.com/txamqp/txamqp"; diff --git a/pkgs/development/python-modules/txdbus/default.nix b/pkgs/development/python-modules/txdbus/default.nix index f6bc44981fb17..d158fb4de3843 100644 --- a/pkgs/development/python-modules/txdbus/default.nix +++ b/pkgs/development/python-modules/txdbus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "8375a5fb68a12054f0def91af800c821fb2232949337756ed975f88d8ea2bc97"; }; - propagatedBuildInputs = [ six twisted ]; + requiredPythonModules = [ six twisted ]; pythonImportsCheck = [ "txdbus" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/txgithub/default.nix b/pkgs/development/python-modules/txgithub/default.nix index 5340b202e688a..066f563802e11 100644 --- a/pkgs/development/python-modules/txgithub/default.nix +++ b/pkgs/development/python-modules/txgithub/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "16gbizy8vkxasxylwzj4p66yw8979nvzxdj6csidgmng7gi2k8nx"; }; - propagatedBuildInputs = [ pyopenssl twisted service-identity ]; + requiredPythonModules = [ pyopenssl twisted service-identity ]; # fix python3 issues patchPhase = '' diff --git a/pkgs/development/python-modules/txrequests/default.nix b/pkgs/development/python-modules/txrequests/default.nix index ee7d09d516578..6337faf3e9f49 100644 --- a/pkgs/development/python-modules/txrequests/default.nix +++ b/pkgs/development/python-modules/txrequests/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "b452a1cafa4d005678f6fa47922a330feb4907d5b4732d1841ca98e89f1362e1"; }; - propagatedBuildInputs = [ twisted requests cryptography ]; + requiredPythonModules = [ twisted requests cryptography ]; # Require network access doCheck = false; diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 01a7cd3d87ac7..9282b63ef9f70 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { version = "20.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; - propagatedBuildInputs = [ + requiredPythonModules = [ incremental twisted automat zope_interface # extra dependencies required by twisted[tls] idna pyopenssl service-identity diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 61adcf9254ff6..1e46d73a68b79 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "00v3h63dq8yxahp9vg3yb9r27l2niwv8gv0dbds9dzrc298dfmal"; }; - propagatedBuildInputs = [ click ]; + requiredPythonModules = [ click ]; checkInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix index ef3b1c78c3990..983ddb8e544d9 100644 --- a/pkgs/development/python-modules/typesentry/default.nix +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { sha256 = "0z615f9dxaab3bay3v27j7q99qm6l6q8xv872yvsp87sxj7apfki"; }; - propagatedBuildInputs = [ colorama ]; + requiredPythonModules = [ colorama ]; checkInputs = [ pytest pytestcov ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index bfaed58b13fb2..8fde274eeb5ab 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "1k0jwcky17zwaz2vx4x2zbsnp270g4mgn7kx5bpl8jgx76qmsnba"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ jinja2 pyyaml ]; diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index 849b56d2d0c21..bf304f6a1b153 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1dzs9a1pr23dhbvmnvms2jv7l7jk26023g5ysf0zvnq8b791s6wg"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ typing-extensions mypy-extensions ]; diff --git a/pkgs/development/python-modules/typogrify/default.nix b/pkgs/development/python-modules/typogrify/default.nix index f5724877bf2b7..bdf97c43d27b0 100644 --- a/pkgs/development/python-modules/typogrify/default.nix +++ b/pkgs/development/python-modules/typogrify/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"; }; - propagatedBuildInputs = [ django smartypants jinja2 ]; + requiredPythonModules = [ django smartypants jinja2 ]; # Wants to set up Django doCheck = false; diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index e5ab115953034..16f0af678dde2 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "tzlocal"; version = "2.1"; - propagatedBuildInputs = [ pytz ]; + requiredPythonModules = [ pytz ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 37ba1ab25e2fd..1f245edc1adae 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; # currently has circular dependency module import, remove when bumping to >0.5.1 checkInputs = [ pytest nbval pytestcov numba ]; - propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions black ]; + requiredPythonModules = [ matchpy numpy astunparse typing-extensions black ]; pythonImportsCheck = [ "uarray" ]; diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix index d80009e647886..a23c34e26d258 100644 --- a/pkgs/development/python-modules/ueberzug/default.nix +++ b/pkgs/development/python-modules/ueberzug/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; buildInputs = [ libX11 libXext ]; - propagatedBuildInputs = [ attrs docopt pillow psutil xlib ]; + requiredPythonModules = [ attrs docopt pillow psutil xlib ]; meta = with lib; { homepage = "https://github.com/seebye/ueberzug"; diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix index db5b1400fe452..f00491bc754b7 100644 --- a/pkgs/development/python-modules/ufoprocessor/default.nix +++ b/pkgs/development/python-modules/ufoprocessor/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ defcon lxml fonttools diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index f471fbef4c8c8..1726d0513e058 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pytestCheckHook ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scikitlearn scipy diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 8cf0662455935..ff4e21ffd6d11 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0s69kdhl8vhqazhxqdvb06l83x0iqdm0yr4vp3p52alzi6a8lm33"; }; - propagatedBuildInputs = [ future ]; + requiredPythonModules = [ future ]; checkInputs = [ nose numpy ]; checkPhase = "python setup.py nosetests -sv"; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 5d1a32a296551..5afe167cadf2b 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ nose pytest hypothesis six ]; - propagatedBuildInputs = [ spark_parser xdis ]; + requiredPythonModules = [ spark_parser xdis ]; # six import errors (yet it is supplied...) checkPhase = '' diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix index 111ff6278eab3..f97ffe9f6c120 100644 --- a/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/pkgs/development/python-modules/unicode-slugify/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0l7nphfdq9rgiczbl8n3mra9gx7pxap0xz540pkyz034zbz3mkrl"; }; - propagatedBuildInputs = [ six unidecode ]; + requiredPythonModules = [ six unidecode ]; checkInputs = [ nose unittest2 ]; diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 8bd6507bb5ba0..f0d84545fd9fc 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { ln -s ${unicorn-emu}/lib/libunicorn.a prebuilt/ ''; - propagatedBuildInputs = [ setuptools ]; + requiredPythonModules = [ setuptools ]; meta = with stdenv.lib; { description = "Python bindings for Unicorn CPU emulator engine"; diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix index 4d2eae618c32f..c20a2852635e4 100644 --- a/pkgs/development/python-modules/unifi/default.nix +++ b/pkgs/development/python-modules/unifi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0prgx01hzs49prrazgxrinm7ivqzy57ch06qm2h7s1p957sazds8"; }; - propagatedBuildInputs = [ urllib3 ]; + requiredPythonModules = [ urllib3 ]; # upstream has no tests doCheck = false; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index c8d1edc421094..aa55b4db99137 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { version = "3.0.4"; disabled = isPy27; - propagatedBuildInputs = [six]; + requiredPythonModules = [six]; # The tarball from Pypi doesn't actually contain the unit tests doCheck = false; diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix index 65774d1e33ab0..c08ae87d7b153 100644 --- a/pkgs/development/python-modules/unittest2/default.nix +++ b/pkgs/development/python-modules/unittest2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212"; }; - propagatedBuildInputs = [ six traceback2 ]; + requiredPythonModules = [ six traceback2 ]; # # 1.0.0 and up create a circle dependency with traceback2/pbr doCheck = false; diff --git a/pkgs/development/python-modules/unrpa/default.nix b/pkgs/development/python-modules/unrpa/default.nix index aad23c6fdf9f4..985a4e8d72a69 100644 --- a/pkgs/development/python-modules/unrpa/default.nix +++ b/pkgs/development/python-modules/unrpa/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0yl4qdwp3in170ks98qnldqz3r2iyzil5g1775ccg98qkh95s724"; }; - propagatedBuildInputs = [ uncompyle6 ]; + requiredPythonModules = [ uncompyle6 ]; pythonImportsCheck = [ "unrpa" ]; diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index 2d532be36404f..6e9c9c779dec5 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0f2lyi7xhvb60pvzx82dpc13ksdj5k92ww09czclkdz8k0dxa7hb"; }; - propagatedBuildInputs = [ pyperclip urwid ]; + requiredPythonModules = [ pyperclip urwid ]; doCheck = false; diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/pkgs/development/python-modules/update-dotdee/default.nix index ec9dbd947c089..021bddedc60ee 100644 --- a/pkgs/development/python-modules/update-dotdee/default.nix +++ b/pkgs/development/python-modules/update-dotdee/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1h3m593nwzx6vwa24k0wizb7la49yhqxwn73ipclxgxxi4dfdj01"; }; - propagatedBuildInputs = [ executor naturalsort ]; + requiredPythonModules = [ executor naturalsort ]; meta = with lib; { description = "Generic modularized configuration file manager"; diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix index 6779a50e2c47e..cefac96fcdf24 100644 --- a/pkgs/development/python-modules/update_checker/default.nix +++ b/pkgs/development/python-modules/update_checker/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "6a2d45bb4ac585884a6b03f9eade9161cedd9e8111545141e9aa9058932acb13"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # requires network doCheck = false; diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index 298f6c96d58d9..783475c11005b 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "7f110208a3a2aa9b4d6da11233fd0f206ea039b52bca4bfe312f1b9dcf788476"; }; - propagatedBuildInputs = [ numpy awkward ]; + requiredPythonModules = [ numpy awkward ]; # No tests on PyPi doCheck = false; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 81b6f276289cc..8a006a0cbb62b 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { xxhash ] ++ lib.optional isPy27 backports_lzma; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy cachetools uproot-methods diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 0bcfa0305e8c3..d0c768492b889 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5.0"; buildInputs = [ python gettext ]; - propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcus ]; + requiredPythonModules = [ pyqt5 numpy scipy shapely libarcus ]; nativeBuildInputs = [ cmake doxygen ]; postPatch = '' diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix index 5077267528a5f..a958020561e1b 100644 --- a/pkgs/development/python-modules/uritemplate/default.nix +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae"; }; - propagatedBuildInputs = [ simplejson ]; + requiredPythonModules = [ simplejson ]; checkInputs = [ pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index 7af69e5ded89e..cdc45678684fa 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "075af8afabae6362482d254e5ac3ffa595d1766117b684e53d9c25c2e937e139"; }; - propagatedBuildInputs = [ pycurl six ]; + requiredPythonModules = [ pycurl six ]; meta = with stdenv.lib; { homepage = "http://urlgrabber.baseurl.org"; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 96bb2a0e53259..242677d234415 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; checkInputs = [ pytest mock tornado ]; - propagatedBuildInputs = [ pyopenssl cryptography idna certifi ipaddress pysocks ]; + requiredPythonModules = [ pyopenssl cryptography idna certifi ipaddress pysocks ]; meta = with stdenv.lib; { description = "Powerful, sanity-friendly HTTP client for Python"; diff --git a/pkgs/development/python-modules/urwid-readline/default.nix b/pkgs/development/python-modules/urwid-readline/default.nix index 1ded152cba91c..b01f84e04169f 100644 --- a/pkgs/development/python-modules/urwid-readline/default.nix +++ b/pkgs/development/python-modules/urwid-readline/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "24e376d4b75940d19e8bc81c264be5d383f8d4da560f68f648dd16c85f6afdb5"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ urwid ]; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index 1b5c58b9ca508..5c393b92c9a0a 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2"; }; - propagatedBuildInputs = [ urwid ]; + requiredPythonModules = [ urwid ]; checkInputs = [ glibcLocales ]; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix index 4e7d97068f25e..717a1028180b7 100644 --- a/pkgs/development/python-modules/us/default.nix +++ b/pkgs/development/python-modules/us/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "us"; version = "2.0.2"; - propagatedBuildInputs = [ jellyfish ]; + requiredPythonModules = [ jellyfish ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix index 34e6025dcfb6c..f1c1327974785 100644 --- a/pkgs/development/python-modules/usbtmc/default.nix +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "14f4j77ljr45crnjwlp1dqbxwa45s20y2fpq5rg59r60w15al4yw"; }; - propagatedBuildInputs = [ pyusb ]; + requiredPythonModules = [ pyusb ]; meta = with stdenv.lib; { description = "Python implementation of the USBTMC instrument control protocol"; diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index 80985eed48120..172c98e05c58f 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "04bndajsfnpymxfiggnj7g38cmlvca3ry5k2611x8ibp38x53yhc"; }; - propagatedBuildInputs = [ ua-parser ]; + requiredPythonModules = [ ua-parser ]; meta = with stdenv.lib; { description = "A Python library to identify devices by parsing user agent strings"; diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix index 8366a56158dde..688be762113cb 100644 --- a/pkgs/development/python-modules/userpath/default.nix +++ b/pkgs/development/python-modules/userpath/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256="0mfjmvx286z1dmnrc7bm65x8gj8qrmkcyagl0vf5ywfq0bm48591"; }; - propagatedBuildInputs = [ click distro ]; + requiredPythonModules = [ click distro ]; # test suite is difficult to emulate in sandbox due to shell manipulation doCheck = false; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index ddf98d2d4921e..406481e029f35 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "0cf0vw6kzxwlkvk5gw85wv3kg1kdil0wkq3s7rmxpvrk6gjk8jvq"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click h11 httptools diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 6ec8db3406813..b3b9a090add0b 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "401cb441dd61bb1a03b10c8a3a884642409e22a2a19e03bbfc4891e0ddbc7268"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six decorator ]; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index e67bbc59e9329..a14ff0db183ac 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pytest-httpbin ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pyyaml wrapt six diff --git a/pkgs/development/python-modules/vcver/default.nix b/pkgs/development/python-modules/vcver/default.nix index 74b44cddc464b..0d166d92c7688 100644 --- a/pkgs/development/python-modules/vcver/default.nix +++ b/pkgs/development/python-modules/vcver/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1cvgs70jf7ki78338zaglaw2dkvyndmx15ybd6k4zqwwsfgk490b"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ packaging ]; diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 1a5494634bb03..f7720e9645629 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click click-log click-threading requests_toolbelt requests diff --git a/pkgs/development/python-modules/vdirsyncer/stable.nix b/pkgs/development/python-modules/vdirsyncer/stable.nix index 6e1dc98256702..2f45b1f5488c2 100644 --- a/pkgs/development/python-modules/vdirsyncer/stable.nix +++ b/pkgs/development/python-modules/vdirsyncer/stable.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click click-log click-threading requests_toolbelt requests diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index b81481b0774a3..4a6c0c5ebaccc 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ]; + requiredPythonModules = [ jupyter jupyter_core pandas ipywidgets ]; # currently, recommonmark is broken on python3 doCheck = false; diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix index 5845557c54c15..423f97e662d7e 100644 --- a/pkgs/development/python-modules/vega_datasets/default.nix +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "db8883dab72b6f414e1fafdbf1e8db7543bba6ed77912a4e0c197d74fcfa1c20"; }; - propagatedBuildInputs = [ pandas ]; + requiredPythonModules = [ pandas ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 5e704cdcb252d..1da50d351748c 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "f042cf60ddd69eeb17c9f1586bae25da5b7282ca53d9afe0be30b943b4194d52"; }; - propagatedBuildInputs = [ future dateutil six ]; + requiredPythonModules = [ future dateutil six ]; checkInputs = [ pytest mock parameterized ]; diff --git a/pkgs/development/python-modules/veryprettytable/default.nix b/pkgs/development/python-modules/veryprettytable/default.nix index eff996c3ae4c8..fe75971b5ecd9 100644 --- a/pkgs/development/python-modules/veryprettytable/default.nix +++ b/pkgs/development/python-modules/veryprettytable/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1k1rifz8x6qcicmx2is9vgxcj0qb2f5pvzrp7zhmvbmci3yack3f"; }; - propagatedBuildInputs = [ termcolor colorama ]; + requiredPythonModules = [ termcolor colorama ]; meta = with stdenv.lib; { description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index f43fe542677b6..036d287098752 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy pandas imutils progress matplotlib ]; + requiredPythonModules = [ numpy pandas imutils progress matplotlib ]; # tests not packaged with pypi doCheck = false; diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix index 958f8a01704ce..8049b7b8ad005 100644 --- a/pkgs/development/python-modules/virtual-display/default.nix +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "PyVirtualDisplay"; version = "1.3.2"; - propagatedBuildInputs = [ EasyProcess ]; + requiredPythonModules = [ EasyProcess ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index cc68d4b7090fd..17da8a3b325ee 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ virtualenv ]; + requiredPythonModules = [ virtualenv ]; # needs tox to run the tests doCheck = false; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 4642a44762aac..ce89779b14e1e 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ appdirs distlib filelock diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 19ec56a1ece8b..76293a539281c 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { preConfigure = "export HOME=$TMPDIR"; buildInputs = [ pbr pip pkgs.which ]; - propagatedBuildInputs = [ stevedore virtualenv virtualenv-clone ]; + requiredPythonModules = [ stevedore virtualenv virtualenv-clone ]; postPatch = '' for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index efe444fa8d707..e844c16991203 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { cython setuptools_scm setuptools-scm-git-archive ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy freetype-py fontconfig libGL ]; diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index 149efb753e20c..569b0db82ea72 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ libunwind ]; - propagatedBuildInputs = [ colorama requests six pytz ]; + requiredPythonModules = [ colorama requests six pytz ]; # No tests included doCheck = false; diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 1bb87d9d12223..216a551c5cf1e 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = isPyPy; - propagatedBuildInputs = [ dateutil ]; + requiredPythonModules = [ dateutil ]; checkPhase = "${python.interpreter} tests.py"; diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 383eed03a4e3b..f6eeb097affa0 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1r7avibzf009h5rlh7mbh1fc01daligvi2axjn5qxh810g5igfn6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ voluptuous ]; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index ddd36a98cb6d4..e4161ee54733a 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { zlib.dev ]; - propagatedBuildInputs = [ + requiredPythonModules = [ numpy scikitlearn scipy diff --git a/pkgs/development/python-modules/vsts-cd-manager/default.nix b/pkgs/development/python-modules/vsts-cd-manager/default.nix index 5946fec05b75f..a5af7841e02b8 100644 --- a/pkgs/development/python-modules/vsts-cd-manager/default.nix +++ b/pkgs/development/python-modules/vsts-cd-manager/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0ys4hrmjbxl4qr26qr3dhhs27yfwn1635vwjdqh1qgjmrmcr1c0b"; }; - propagatedBuildInputs = [ msrest mock ]; + requiredPythonModules = [ msrest mock ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/vsts/default.nix b/pkgs/development/python-modules/vsts/default.nix index 8095ccf98f0c1..d4b51a77c9378 100644 --- a/pkgs/development/python-modules/vsts/default.nix +++ b/pkgs/development/python-modules/vsts/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "15sgwqa72ynpahj101r2kc15s3dnsafg5gqx0sz3hnqz29h925ys"; }; - propagatedBuildInputs = [ msrest ]; + requiredPythonModules = [ msrest ]; # Tests are highly impure checkPhase = '' diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix index 236e4121cf865..d49f29d6df44a 100644 --- a/pkgs/development/python-modules/vultr/default.nix +++ b/pkgs/development/python-modules/vultr/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # Tests disabled. They fail because they try to access the network doCheck = false; diff --git a/pkgs/development/python-modules/wadllib/default.nix b/pkgs/development/python-modules/wadllib/default.nix index 45b5a47345692..eb1ede163b389 100644 --- a/pkgs/development/python-modules/wadllib/default.nix +++ b/pkgs/development/python-modules/wadllib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "e995691713d3c795d2b36278de8e212241870f46bec6ecba91794ea3cc5bd67d"; }; - propagatedBuildInputs = [ setuptools lazr-uri ]; + requiredPythonModules = [ setuptools lazr-uri ]; doCheck = isPy3k; diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix index e76d1f1102966..388c90095d5d9 100644 --- a/pkgs/development/python-modules/waitress-django/default.nix +++ b/pkgs/development/python-modules/waitress-django/default.nix @@ -5,7 +5,7 @@ buildPythonPackage { version = "0.0.0"; src = ./.; - pythonPath = [ django waitress ]; + requiredPythonModules = [ django waitress ]; doCheck = false; meta.description = "A waitress WSGI server serving django"; } diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index 34815f99a94c5..49462b398b8c5 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "a093c4d04b42b7907f69086e476a766b7639dca50d95edc83aef6aeab9db2090"; }; - propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ]; + requiredPythonModules = [ six jsonpatch jsonschema jsonpointer ]; meta = with stdenv.lib; { homepage = "https://github.com/bcwaldon/warlock"; diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index a4bbee43d012b..df4067e5baad7 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -30,7 +30,7 @@ buildPythonPackage { checkInputs = [ mock ]; - propagatedBuildInputs = [ boto3 envs python-jose requests ]; + requiredPythonModules = [ boto3 envs python-jose requests ]; # all the checks are failing doCheck = false; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 17f7b540c6052..d2aa61884c749 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.CoreServices ]; - propagatedBuildInputs = [ argh pathtools pyyaml ]; + requiredPythonModules = [ argh pathtools pyyaml ]; doCheck = false; diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index 7d5cbc69ecaaa..e2c9f9b152846 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ setuptools ] ++ lib.optionals (!isPy3k) [ + requiredPythonModules = [ setuptools ] ++ lib.optionals (!isPy3k) [ backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index c1eaa1fd75437..dee9eaff0cf58 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; - propagatedBuildInputs = [ cairosvg pyphen cffi cssselect lxml html5lib tinycss pygobject2 ]; + requiredPythonModules = [ cairosvg pyphen cffi cssselect lxml html5lib tinycss pygobject2 ]; patches = [ (substituteAll { diff --git a/pkgs/development/python-modules/webapp2/default.nix b/pkgs/development/python-modules/webapp2/default.nix index 01c1ca309d4c2..4f14f8ee433c7 100644 --- a/pkgs/development/python-modules/webapp2/default.nix +++ b/pkgs/development/python-modules/webapp2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # # error in tests when running with python 3+ doCheck = false; - propagatedBuildInputs = [ webob six ]; + requiredPythonModules = [ webob six ]; meta = with stdenv.lib; { description = "Taking Google App Engine's webapp to the next level"; diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix index 176d2f6616087..f91872ec95ac9 100644 --- a/pkgs/development/python-modules/webassets/default.nix +++ b/pkgs/development/python-modules/webassets/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1kc1042jydgk54xpgcp0r1ib4gys91nhy285jzfcxj3pfqrk4w8n"; }; - propagatedBuildInputs = [ pyyaml ]; + requiredPythonModules = [ pyyaml ]; checkInputs = [ nose jinja2 mock pytest ]; # Needs Babel CLI tool diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index 273cd7ac5d18d..807aa7bb616ba 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "76f360636957d1c976db7466bc71dcb713bb95ac8911944dffc55c01cb516de6"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkPhase = '' ${python.interpreter} -m unittest discover -s tests diff --git a/pkgs/development/python-modules/webdavclient3/default.nix b/pkgs/development/python-modules/webdavclient3/default.nix index eb13cd6b9bbfb..66d5e3f372601 100644 --- a/pkgs/development/python-modules/webdavclient3/default.nix +++ b/pkgs/development/python-modules/webdavclient3/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0yw3n5m70ysjn1ch48znpn4zr4a1bd0lsm7q2grqz7q5hfjzjwk0"; }; - propagatedBuildInputs = [ dateutil lxml requests ]; + requiredPythonModules = [ dateutil lxml requests ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index 17b20ecd34dda..8775e0ec45519 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "aa3a917ed752ba3e0b242234b2a373f9c4e2a75d35291dcbe977649bd21fd108"; }; - propagatedBuildInputs = [ nose pytest ]; + requiredPythonModules = [ nose pytest ]; meta = with stdenv.lib; { description = "WSGI request and response object"; diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 7c3d25068e303..262fb935d3090 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pyqt5 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ Babel cssselect dateutil diff --git a/pkgs/development/python-modules/websocket_client/default.nix b/pkgs/development/python-modules/websocket_client/default.nix index dacae3e81e1f7..772473ebb486a 100644 --- a/pkgs/development/python-modules/websocket_client/default.nix +++ b/pkgs/development/python-modules/websocket_client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ six ] ++ lib.optional isPy27 backports_ssl_match_hostname; diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index e885a1ba9b724..a0f0fabb24696 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1nnalv0jkkj34hw6yb12lp6r6fj1ps9vkkyshjvx65y5xdwmnny3"; }; - propagatedBuildInputs = [ numpy ]; + requiredPythonModules = [ numpy ]; meta = with stdenv.lib; { description = "WebSockets support for any application/server"; diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index 48acb6c881de8..fabadefb4a362 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "nose<1.3.0" "nose" ''; - propagatedBuildInputs = [ webob six beautifulsoup4 waitress ]; + requiredPythonModules = [ webob six beautifulsoup4 waitress ]; checkInputs = [ nose mock PasteDeploy wsgiproxy2 pyquery ]; diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index a4146d4d3b12c..0c245e24b28b8 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; }; - propagatedBuildInputs = [ itsdangerous ]; + requiredPythonModules = [ itsdangerous ]; checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ]; disabledTests = stdenv.lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 686ba1196b1fb..24aacbc785c47 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "86a36049ae3c8b1ce12d3183911b3082b38b2998e858285309581e37dc22d8fa"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ colorama configobj packaging diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix index a43aa915ea0ba..4df5899cca23f 100644 --- a/pkgs/development/python-modules/wfuzz/default.nix +++ b/pkgs/development/python-modules/wfuzz/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { buildInputs = [ pyparsing configparser ]; - propagatedBuildInputs = [ + requiredPythonModules = [ chardet future pycurl diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index 70709d3e6663a..609a732f316e8 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "08biw3g6x6p2aa1nlvfazbgcs1xvf6m0hvskdjhgwnsbwxk1xq46"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ mock ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index bb8f1ab3b4d5c..9711aa886141a 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "079f87d87270bce047512400efd70238820751a11d2d8cb137a5a5bdbaf255c7"; }; - propagatedBuildInputs = [ notebook ]; + requiredPythonModules = [ notebook ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index e9e5001fec91c..2d8a55b17e86a 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0b3lh7z98nlh4yn0cmvk7bimhfk5w4qvbmjr6jn880ji9h2ixq6d"; }; - propagatedBuildInputs = [ six pillow ]; + requiredPythonModules = [ six pillow ]; # Test data is not included # https://github.com/torchbox/Willow/issues/34 diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 92dbc210c6de5..4b43426726cc8 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "1adh23v4c9kia3ddqdq0brksd5rhgh4ff7l5hil8klx4dmkrjfz3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp backoff packaging diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index 1e448c377096a..e46e9ad4bae45 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm gcc ]; - propagatedBuildInputs = [ cython numpy scikitlearn six ]; + requiredPythonModules = [ cython numpy scikitlearn six ]; checkInputs = [ pytest pytestcov ]; diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index d005527b4c359..3fb91d9871689 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1ncjr90m3w3b4zi23kw6ai11gxahdyah96x8jb2yn2x4573022x2"; }; - propagatedBuildInputs = [ matplotlib numpy pillow ]; + requiredPythonModules = [ matplotlib numpy pillow ]; # Tests require extra dependencies checkInputs = [ mock pytest pytestcov ]; diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index d687ffd2d0b92..de49307651d09 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "078657iiksrqzcc2wvwhiilf3xxq5vlinsv0kz03qzqr1qyvbmas"; }; - propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ]; + requiredPythonModules = [ regex langcodes ftfy msgpack mecab-python3 jieba ]; # patch to relax version requirements for regex # dependency to prevent break in upgrade diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index dafa948f69d83..9d1afb13d53cc 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ln -s ${src-data} worldengine-data ''; - propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng h5py gdal ]; + requiredPythonModules = [ noise numpy pyplatec protobuf purepng h5py gdal ]; prePatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index 7caf36fa6b2b7..6a6dd8b333877 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "h2==" "h2>=" ''; - propagatedBuildInputs = [ six h2 ]; + requiredPythonModules = [ six h2 ]; meta = { description = "A webserver intended for web browser testing"; diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index c4bc74a58d230..b54c8c6053918 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1rklkki54z5392cpwwy78bnmsy2ghc187l3j7nv0rzn6jk5bvyi7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ wrapt numpy setuptools diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 83e1fbad3233c..825882f551dbc 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock git ]; - propagatedBuildInputs = [ cherrypy gevent tornado ]; + requiredPythonModules = [ cherrypy gevent tornado ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/wsgiproxy/default.nix b/pkgs/development/python-modules/wsgiproxy/default.nix index 8ae8b4aefa541..931411bc7eec4 100644 --- a/pkgs/development/python-modules/wsgiproxy/default.nix +++ b/pkgs/development/python-modules/wsgiproxy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0wqz1q8cvb81a37gb4kkxxpv4w7k8192a08qzyz67rn68ln2wcig"; }; - propagatedBuildInputs = [ paste six ]; + requiredPythonModules = [ paste six ]; meta = with stdenv.lib; { description = "WSGIProxy gives tools to proxy arbitrary(ish) WSGI requests to other"; diff --git a/pkgs/development/python-modules/wsgiproxy2/default.nix b/pkgs/development/python-modules/wsgiproxy2/default.nix index ef3ce69742c12..ba7cf73b70888 100644 --- a/pkgs/development/python-modules/wsgiproxy2/default.nix +++ b/pkgs/development/python-modules/wsgiproxy2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "13kf9bdxrc95y9vriaz0viry3ah11nz4rlrykcfvb8nlqpx3dcm4"; }; - propagatedBuildInputs = [ six webob ]; + requiredPythonModules = [ six webob ]; # circular dep on webtest doCheck = false; diff --git a/pkgs/development/python-modules/wsproto/0.14.nix b/pkgs/development/python-modules/wsproto/0.14.nix index a8488d8c4ab8c..f191641b17f50 100644 --- a/pkgs/development/python-modules/wsproto/0.14.nix +++ b/pkgs/development/python-modules/wsproto/0.14.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; }; - propagatedBuildInputs = [ h11 enum34 ]; + requiredPythonModules = [ h11 enum34 ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index 95ed95cb860bc..b6996c0daa64b 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "17gsxlli4w8am1wwwl3k90hpdfa213ax40ycbbvb7hjx1v1rhiv1"; }; - propagatedBuildInputs = [ h11 ] ++ lib.optional isPy36 dataclasses; + requiredPythonModules = [ h11 ] ++ lib.optional isPy36 dataclasses; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix index 69db4e50f6758..b13ab5c0f42a8 100644 --- a/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/pkgs/development/python-modules/wtf-peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "03qs6np5s9r0nmsryfzll29ajcqk27b18kcbgd9plf80ys3nb6kd"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ peewee wtforms ]; diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 66667c74ef3dc..6867c3be1ebf7 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c"; }; - propagatedBuildInputs = [ markupsafe ]; + requiredPythonModules = [ markupsafe ]; # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet." doCheck = false; diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index e6897830fb7b7..88b799fda1503 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0hvmbc41kdwrjns8z1s4a59a4azdvzb8q3vs7nn1li4qm4l0g3yh"; }; - propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ]; + requiredPythonModules = lib.optionals isPy27 [ selectors2 ]; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index de779fc2c00ba..52431143173a8 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "1pp3z4q6ryxcc26kaq222j53ji110n2v7rx29c7vy1fbb8mq64im"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ psutil pygobject3 gtk3 diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index d905a11e3418c..ceb9529fe077e 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy pandas setuptools ]; + requiredPythonModules = [ numpy pandas setuptools ]; checkPhase = '' pytest $out/${python.sitePackages} diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 8634d616b736b..12fb1742d6ac1 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "b0bbca828e04ef2d484a6522ae7b3a7ccad5e43fa1c6f54d78e24bb870f49d44"; }; - propagatedBuildInputs = [ cffi ]; + requiredPythonModules = [ cffi ]; # https://github.com/xattr/xattr/issues/43 doCheck = false; diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix index 25061d5321abf..9026888c06257 100644 --- a/pkgs/development/python-modules/xcaplib/default.nix +++ b/pkgs/development/python-modules/xcaplib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "15ww8f0a9zh37mypw5s4q1qk44cwf7jlhc9q1z4vjlpvnzimg54v"; }; - propagatedBuildInputs = [ eventlib application ]; + requiredPythonModules = [ eventlib application ]; meta = with stdenv.lib; { homepage = "https://github.com/AGProjects/python-xcaplib"; diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index 8f949f20e92ae..2161075319bcc 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sed -e 's,ffi\.dlopen(,&"${xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py ''; - propagatedBuildInputs = [ cffi six ]; + requiredPythonModules = [ cffi six ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix index 8b2d73b00fb8c..a15fec24ec517 100644 --- a/pkgs/development/python-modules/xdg/default.nix +++ b/pkgs/development/python-modules/xdg/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry ]; - propagatedBuildInputs = [ + requiredPythonModules = [ clikit ]; diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 280470957dc79..f0db7626ec7b1 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ six click ]; + requiredPythonModules = [ six click ]; checkPhase = '' make check diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 6a4d7f01cc116..612cf621ada39 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { disabled = !isPy3k; nativeBuildInputs = [ wrapGAppsHook ]; - propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 ]; + requiredPythonModules = [ gobject-introspection pygobject3 graphviz gtk3 ]; meta = with lib; { description = "An interactive viewer for graphs written in Graphviz's dot"; diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 81a8d05f5bf0c..ca26e8b65606c 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { postPatch = "cd python-package"; - propagatedBuildInputs = [ scipy ]; + requiredPythonModules = [ scipy ]; buildInputs = [ xgboost ]; checkInputs = [ nose pytest scikitlearn pandas matplotlib graphviz datatable ]; diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index c35d0b484d37e..32022943bf78a 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xhtml2pdf"; version = "0.2.5"; - propagatedBuildInputs = [pillow html5lib pypdf2 reportlab six]; + requiredPythonModules = [pillow html5lib pypdf2 reportlab six]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 3d82b599dc067..22b7b577f288c 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ mock nose utillinux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ]; nativeBuildInputs = [ setuptools_scm ]; buildInputs = [ xorg.libX11 ]; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index d02b7e2e066a5..b52ce55459fec 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "7f621ed0e5a30c2b67c0e50778627b7a35e1ccfea9db19ea89b4c72a8faf42c0"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ intervaltree jinja2 pyflakes diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index d06bbd409b5c8..f30cb12592227 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0rsa75x86gdjalvy4riq7613szb616hff80crx006chyppzdkxmq"; }; - propagatedBuildInputs = [ elementpath ]; + requiredPythonModules = [ elementpath ]; checkInputs = [ lxml pytest ]; diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index 3178e171f8442..29f0d604f3e3a 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -12,7 +12,7 @@ buildPythonPackage { disabled = isPy27; inherit (libxnd) version src meta; - propagatedBuildInputs = [ ndtypes ]; + requiredPythonModules = [ ndtypes ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/xpybutil/default.nix b/pkgs/development/python-modules/xpybutil/default.nix index 07cfc96e7fddf..551a32b3cf78c 100644 --- a/pkgs/development/python-modules/xpybutil/default.nix +++ b/pkgs/development/python-modules/xpybutil/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; # pillow is a dependency in image.py which is not listed in setup.py - propagatedBuildInputs = [ xcffib pillow ]; + requiredPythonModules = [ xcffib pillow ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix index 3eac032991090..2d8e6cb64b948 100644 --- a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - propagatedBuildInputs = [ xstatic-jquery ]; + requiredPythonModules = [ xstatic-jquery ]; meta = with lib;{ homepage = "http://plugins.jquery.com/project/jQuery-File-Upload"; diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix index 8c872d0bbd19c..94e5bbed1053b 100644 --- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - propagatedBuildInputs = [ xstatic-jquery ]; + requiredPythonModules = [ xstatic-jquery ]; meta = with lib;{ homepage = "https://jqueryui.com/"; diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index dacb3b6343688..4b203c0e68078 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "097wxhvp01ikqpg1z3v8rqhss6f1vwr399zpz9a05d2135bsxx5w"; }; - propagatedBuildInputs = [ xorgserver ]; + requiredPythonModules = [ xorgserver ]; # See: https://github.com/cgoldberg/xvfbwrapper/issues/30 doCheck = false; diff --git a/pkgs/development/python-modules/yamale/default.nix b/pkgs/development/python-modules/yamale/default.nix index 9b2c7b116c6d8..7527138fda286 100644 --- a/pkgs/development/python-modules/yamale/default.nix +++ b/pkgs/development/python-modules/yamale/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "1xjvah4r3gpwk4zxql3c9jpllb34k175fm6iq1zvsd2vv2fwf8s2"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyyaml ruamel_yaml ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index f0407dff17351..01c204377be04 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; - propagatedBuildInputs = [ pyyaml pathspec ]; + requiredPythonModules = [ pyyaml pathspec ]; # Two test failures doCheck = false; diff --git a/pkgs/development/python-modules/yamlordereddictloader/default.nix b/pkgs/development/python-modules/yamlordereddictloader/default.nix index ce9602a4720c3..d06334b0efc4f 100644 --- a/pkgs/development/python-modules/yamlordereddictloader/default.nix +++ b/pkgs/development/python-modules/yamlordereddictloader/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "03h8wa6pzqjiw25s3jv9gydn77gs444mf31lrgvpgy53kswz0c3z"; }; - propagatedBuildInputs = [ pyyaml ] ++ lib.optional (isPy27) ordereddict; + requiredPythonModules = [ pyyaml ] ++ lib.optional (isPy27) ordereddict; # no tests doCheck = false; diff --git a/pkgs/development/python-modules/yarg/default.nix b/pkgs/development/python-modules/yarg/default.nix index 97237ba09b094..1b33a56c9bf58 100644 --- a/pkgs/development/python-modules/yarg/default.nix +++ b/pkgs/development/python-modules/yarg/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1isq02s404fp9whkm8w2kvb2ik1sz0r258iby0q532zw81lga0d0"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ nose mock ]; checkPhase = '' diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 3ab7fb49c43a1..5911a25a9950c 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ multidict idna ] + requiredPythonModules = [ multidict idna ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index 443b4daec854a..ecd6dfd8471d9 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0j2c5pzd3kny7ghr9q7xn9vs8dffvyzz5igaavvvd04w7aph29sy"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ future ifaddr ] ++ lib.optional (pythonOlder "3.4") enum-compat; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 7ae56cacbb68d..7e37d3ce0037c 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "65d39bccf16bef35f6a08bf0df33650c0515b5ce8ea3c53924601f5fe00590cb"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ multitasking numpy pandas diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index 0436fe8a0f00e..bc7ef0ecc0c7a 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { patches = [ ./dependency-fixes.patch ]; - propagatedBuildInputs = [ six python-axolotl consonance appdirs ]; + requiredPythonModules = [ six python-axolotl consonance appdirs ]; meta = with stdenv.lib; { homepage = "https://github.com/tgalal/yowsup"; diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index 6108763926517..84cde3d9f1664 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyyaml xmltodict argcomplete diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix index 353400120f3c6..489e99e0512df 100644 --- a/pkgs/development/python-modules/yt/default.nix +++ b/pkgs/development/python-modules/yt/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { cython ]; - propagatedBuildInputs = [ + requiredPythonModules = [ matplotlib setuptools sympy diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/pkgs/development/python-modules/yubico-client/default.nix index e8457055c1808..ce83934cd8085 100644 --- a/pkgs/development/python-modules/yubico-client/default.nix +++ b/pkgs/development/python-modules/yubico-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "e3b86cd2a123105edfacad40551c7b26e9c1193d81ffe168ee704ebfd3d11162"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; # pypi package missing test_utils and github releases is behind doCheck = false; diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index f4f42cf9e3fcd..ddf912ffdd342 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "b45bd22ae01ed60933694fb5abede1ff71fe8ffa79b37082b2fcf38a2f0dec9d"; }; - propagatedBuildInputs = [ zc_buildout ]; + requiredPythonModules = [ zc_buildout ]; checkInputs = [ zope_testrunner ]; doCheck = !python.pkgs.isPy27; checkPhase = '' diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix index 8eafaafadf587..7e12572f03567 100644 --- a/pkgs/development/python-modules/zake/default.nix +++ b/pkgs/development/python-modules/zake/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1rp4xxy7qp0s0wnq3ig4ji8xsl31g901qkdp339ndxn466cqal2s"; }; - propagatedBuildInputs = [ kazoo six ]; + requiredPythonModules = [ kazoo six ]; buildInputs = [ testtools ]; checkPhase = '' # Skip test - fails with our new kazoo version diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index e12ce5860917d..98e3847c3c236 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools_scm ]; - propagatedBuildInputs = [ + requiredPythonModules = [ asciitree numpy fasteners diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix index a87bd3093f4f8..66bddf1eb9402 100644 --- a/pkgs/development/python-modules/zbaemon/default.nix +++ b/pkgs/development/python-modules/zbaemon/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "f249fc6885646d165d7d6b228a7b71f5170fc7117de9e0688271f8fb97840f72"; }; - propagatedBuildInputs = [ zconfig ]; + requiredPythonModules = [ zconfig ]; # too many deps.. doCheck = false; diff --git a/pkgs/development/python-modules/zbase32/default.nix b/pkgs/development/python-modules/zbase32/default.nix index 9c97ad066ed5f..35626e08e50e1 100644 --- a/pkgs/development/python-modules/zbase32/default.nix +++ b/pkgs/development/python-modules/zbase32/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # Tests require `pyutil' so disable them to avoid circular references. doCheck = false; - propagatedBuildInputs = [ setuptoolsDarcs pyutil ]; + requiredPythonModules = [ setuptoolsDarcs pyutil ]; meta = with stdenv.lib; { description = "zbase32, a base32 encoder/decoder"; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 18fc7bcf51150..91447eb809530 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ mock ]; - propagatedBuildInputs = [ zope_testing ]; + requiredPythonModules = [ zope_testing ]; meta = with stdenv.lib; { description = "Inter-process locks"; diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index ef4754504dd66..7c74737d07635 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; - propagatedBuildInputs = [ zope_testrunner ]; + requiredPythonModules = [ zope_testrunner ]; meta = with stdenv.lib; { description = "Structured Configuration Library"; diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index a87bd3093f4f8..66bddf1eb9402 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "f249fc6885646d165d7d6b228a7b71f5170fc7117de9e0688271f8fb97840f72"; }; - propagatedBuildInputs = [ zconfig ]; + requiredPythonModules = [ zconfig ]; # too many deps.. doCheck = false; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 50dda4c8edbda..8fd72185e4dc8 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ appdirs attrs cached-property diff --git a/pkgs/development/python-modules/zerobin/default.nix b/pkgs/development/python-modules/zerobin/default.nix index efc2bb380b8ec..109f2946b18f6 100644 --- a/pkgs/development/python-modules/zerobin/default.nix +++ b/pkgs/development/python-modules/zerobin/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { sha256 = "1pzcwy454kn5216pvwjqzz311s6jbh7viw9s6kw4xps6f5h44bid"; }; - propagatedBuildInputs = [ cherrypy bottle lockfile clize ]; + requiredPythonModules = [ cherrypy bottle lockfile clize ]; # zerobin doesn't have any tests, but includes a copy of cherrypy which # can wrongly fail the check phase. diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index a8715a2133c39..5ac02a323d655 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "70f10f0f16e3a8c4eb5e1a106b812b8d052253041cf1ee1195933df706f5261c"; }; - propagatedBuildInputs = [ ifaddr ] + requiredPythonModules = [ ifaddr ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zerorpc/default.nix b/pkgs/development/python-modules/zerorpc/default.nix index 343c7c6e2515a..699b861b8951c 100644 --- a/pkgs/development/python-modules/zerorpc/default.nix +++ b/pkgs/development/python-modules/zerorpc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "d2ee247a566fc703f29c277d767f6f61f1e12f76d0402faea4bd815f32cbf37f"; }; - propagatedBuildInputs = [ future gevent msgpack pyzmq ]; + requiredPythonModules = [ future gevent msgpack pyzmq ]; doCheck = false; # pypi version doesn't include tests diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 85e950b830e89..cd7e4c1fbe294 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; checkInputs = [ pytest pathpy nbconvert ]; - propagatedBuildInputs = [ setuptools_scm ]; + requiredPythonModules = [ setuptools_scm ]; meta = with lib; { description = "Zimmermann's Extensible Tools for Unified Project setups"; diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index dbcd8303ef2f1..f0b76214c6563 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptoolsDarcs ]; - propagatedBuildInputs = [ pyutil ]; + requiredPythonModules = [ pyutil ]; # argparse is in the stdlib but zfec doesn't know that. postPatch = '' diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index c5629a6fb73f2..7a0c59ccb71d7 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; buildInputs = [ pytest ]; - propagatedBuildInputs = [ heapdict ]; + requiredPythonModules = [ heapdict ]; meta = with stdenv.lib; { description = "Mutable mapping tools."; diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix index 79b9d910053aa..7eb49db5fc75e 100644 --- a/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "U3S8tQ3zPlexZDt5GvCd+rOv7CBVeXJJM1NGe7nRl2o="; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyserial pyserial-asyncio zigpy diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index af52e94253077..76d80d4991d19 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; version = "0.9.2"; - propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; + requiredPythonModules = [ pyserial pyserial-asyncio zigpy ]; checkInputs = [ pytest pytest-asyncio asynctest ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 7a942a213720d..fc5737bbf1860 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sha256 = "a98RYPvcYE1NPERmPo1jPwMf86N+0297u4pOKuaB6u4="; }; - propagatedBuildInputs = [ + requiredPythonModules = [ async-timeout coloredlogs pyserial diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 54f0df340169f..b8869e0e91c07 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "ba8Ru6RCbFOHhctFtklnrxVD3uEpxF4XDvO5RMgXPBs="; }; - propagatedBuildInputs = [ + requiredPythonModules = [ aiohttp crccheck pycrypto diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index 338dd93150b32..2a01eb269406e 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ + requiredPythonModules = [ pyflakes flake8-import-order setuptools diff --git a/pkgs/development/python-modules/zipp/1.nix b/pkgs/development/python-modules/zipp/1.nix index 0de729928d0f6..ead050200d5c1 100644 --- a/pkgs/development/python-modules/zipp/1.nix +++ b/pkgs/development/python-modules/zipp/1.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ more-itertools ]; + requiredPythonModules = [ more-itertools ]; checkInputs = [ pytest pytest-flake8 ]; diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 5d4bc589d3614..82413460d0b78 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm toml ]; - propagatedBuildInputs = [ more-itertools ]; + requiredPythonModules = [ more-itertools ]; checkInputs = [ pytest pytest-flake8 ]; diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix index 3ce0711569362..9def381ad69a1 100644 --- a/pkgs/development/python-modules/zm-py/default.nix +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { disabled = !isPy3k; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index e8097461d3b19..7e5b072383a55 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { # ZConfig 3.5.0 is not compatible with Python 3.8 disabled = pythonAtLeast "3.8"; - propagatedBuildInputs = [ + requiredPythonModules = [ transaction six zope_interface diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 2998376b67268..008618099fd4e 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "2ddef5a7ecfff132a2dd796253366ecf9748a446e30f1a0b3a636aec9d9c05c5"; }; - propagatedBuildInputs = [ zope_proxy ]; + requiredPythonModules = [ zope_proxy ]; checkInputs = [ zope_testrunner ]; diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index df0835841bced..79e8c5638dbfd 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "91628918218b3e6f6323de2a7b845e09ddc5cae131c034896c051b084bba3c92"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ zope-deferredimport zope_deprecation zope_event zope-hookable zope_interface zope_configuration zope_i18nmessageid ]; diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index 587cbf60d88c9..29598a3f86a0e 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ zope_testrunner manuel ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_schema ]; + requiredPythonModules = [ zope_i18nmessageid zope_schema ]; # Need to investigate how to run the tests with zope-testrunner doCheck = false; diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix index 0d1ae412262d4..1dc4a4ef81ded 100644 --- a/pkgs/development/python-modules/zope_copy/default.nix +++ b/pkgs/development/python-modules/zope_copy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "47bb9d09ff06c600b446f220f47a742396598ac4828d738d3d85e6490629a71a"; }; - propagatedBuildInputs = [ zope_interface ]; + requiredPythonModules = [ zope_interface ]; doCheck = !isPy27; # namespace conflicts checkInputs = [ zope_location zope_schema ]; diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index ae7797b8736b4..07cba58722a60 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0d72886b1bb8af4c346a117a540f28ab122577f5e3a105a261be72cd15776fda"; }; - propagatedBuildInputs = [ zope_interface ]; + requiredPythonModules = [ zope_interface ]; # circular deps doCheck = false; diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix index 635727a117345..f8b66c22cdeca 100644 --- a/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1mp2r80v6ns92j089l7ngh8l9fk95g2661vkp4vqw7c71irs9g1z"; }; - propagatedBuildInputs = [ zope_interface zope_schema ]; + requiredPythonModules = [ zope_interface zope_schema ]; checkPhase = '' cd src/zope/filerepresentation && python -m unittest diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix index ca5f818cd6206..2026e2d9311e1 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "9534142b684c986f5303f469573978e5a340f05ba2eee4f872933f1c38b1b059"; }; - propagatedBuildInputs = [ six ]; + requiredPythonModules = [ six ]; checkInputs = [ coverage zope_testrunner ]; diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index acef337e782e0..b239d8e76ef50 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "c9c8e53a5472b77f6a391b515c771105011f4b40740ce53af8428d1c8ca20004"; }; - propagatedBuildInputs = [ zope_event ]; + requiredPythonModules = [ zope_event ]; doCheck = false; # Circular deps. diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 6494aa7a71afc..dd44a8c8eb696 100644 --- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "7ec39087cc1524e55557e7d9dc6295eb1b95b09b125e293c0e2dd068574f0aee"; }; - propagatedBuildInputs = [ zope_event zope_component ]; + requiredPythonModules = [ zope_event zope_component ]; # namespace colides with local directory doCheck = false; diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix index 1c868a7397193..68b5440350b40 100644 --- a/pkgs/development/python-modules/zope_location/default.nix +++ b/pkgs/development/python-modules/zope_location/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "a720f9e3c8a51d5007ed6fcd47e1834df02671d85dbfd1062a0d808de8bf80ac"; }; - propagatedBuildInputs = [ zope_proxy ]; + requiredPythonModules = [ zope_proxy ]; # ignore circular dependency on zope_schema preBuild = '' diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 7092f7508708d..5622255e53cce 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "a66a0d94e5b081d5d695e66d6667e91e74d79e273eee95c1747717ba9cb70792"; }; - propagatedBuildInputs = [ zope_interface ]; + requiredPythonModules = [ zope_interface ]; # circular deps doCheck = false; diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index d32fb05ef94ae..c0f446bd2290a 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "20fbbce8a0726ba34f0e3958676498feebb818f06575193254e139d8d7214f26"; }; - propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; + requiredPythonModules = [ zope_location zope_event zope_interface zope_testing ]; # ImportError: No module named 'zope.event' # even though zope_event has been included. diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix index 92df0aa1eb7e6..9e5e453b1e1ab 100644 --- a/pkgs/development/python-modules/zope_size/default.nix +++ b/pkgs/development/python-modules/zope_size/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "6f3eb687c9181e3b7400c5cd4d4209a2f676475b7b85c99ee11de2404b3493ec"; }; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; + requiredPythonModules = [ zope_i18nmessageid zope_interface ]; meta = with stdenv.lib; { homepage = "https://github.com/zopefoundation/zope.size"; diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix index 1ea12eb377d92..2becb31db94b4 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = !isPyPy; - propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ]; + requiredPythonModules = [ zope_interface zope_exceptions zope_location ]; meta = with stdenv.lib; { description = "Zope testing helpers"; diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 90fa0b8143cde..122e681f4f433 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "873d6017abadc213992a0c38c786ed020341b6e0fe78d14bc2a684cf5a70de4b"; }; - propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; + requiredPythonModules = [ zope_interface zope_exceptions zope_testing six ]; doCheck = false; # custom test modifies sys.path diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index 58b3c5af82525..617eefd2a28c6 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0lkn7n3bfp7zip6hkqwkqwc8pxmhhs4rr699k77h51rfln6kjllh"; }; - propagatedBuildInputs = [ cffi ]; + requiredPythonModules = [ cffi ]; checkInputs = [ hypothesis ]; diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix index 229a4f17bd340..e59f1f28816f3 100644 --- a/pkgs/development/python-modules/zulip/default.nix +++ b/pkgs/development/python-modules/zulip/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; sourceRoot = "source/zulip"; - propagatedBuildInputs = [ + requiredPythonModules = [ requests matrix-client distro diff --git a/pkgs/development/tools/agda-pkg/default.nix b/pkgs/development/tools/agda-pkg/default.nix index 7c4ddb8a68832..5e206a42b81bf 100644 --- a/pkgs/development/tools/agda-pkg/default.nix +++ b/pkgs/development/tools/agda-pkg/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { HOME=$NIX_BUILD_TOP $out/bin/apkg --help > /dev/null ''; - propagatedBuildInputs = [ + requiredPythonModules = [ click GitPython pony diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix index 396a5817c672c..4bb889b2c0d49 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/pkgs/development/tools/analysis/autoflake/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { sha256 = "61a353012cff6ab94ca062823d1fb2f692c4acda51c76ff83a8d77915fba51ea"; }; - propagatedBuildInputs = [ pyflakes ]; + requiredPythonModules = [ pyflakes ]; doCheck = true; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 68a0c0f6073e6..1ac153382f8cc 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { nativeBuildInputs = [ makeWrapper cmake ]; checkInputs = [ pytestrunner pytest ]; - propagatedBuildInputs = [ pyparsing asn1ate six ]; + requiredPythonModules = [ pyparsing asn1ate six ]; meta = with stdenv.lib; { description = "An ASN.1 compiler with a backend for Quick DER"; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index f123aa79a1078..0359e22b2a7cd 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { # Tests are not included in the PyPI package doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ aws-lambda-builders aws-sam-translator chevron diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 46e54465ab673..c789218324c9e 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { sha256 = "00zs0a580vvfm2w4ja68mc46360p475wlgagjkq1hi4m8s4qwd75"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ b2sdk class-registry setuptools diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix index ad9813cde6fb4..48d32a35876da 100644 --- a/pkgs/development/tools/build-managers/alibuild/default.nix +++ b/pkgs/development/tools/build-managers/alibuild/default.nix @@ -10,7 +10,7 @@ python.pkgs.buildPythonApplication rec { }; doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ python.pkgs.requests python.pkgs.pyyaml ]; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index e09277e498d2d..311eb9908812a 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -49,7 +49,7 @@ in newPython.pkgs.buildPythonApplication rec { sha256 = "0ncqs1p4g23fmzgdmwppgxr8w275h38hgjdzs456cgivz8xs9rjl"; }; - propagatedBuildInputs = with newPython.pkgs; [ + requiredPythonModules = with newPython.pkgs; [ bottle colorama dateutil diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix index b906d64f0af95..4f39176b59d85 100644 --- a/pkgs/development/tools/build-managers/doit/default.nix +++ b/pkgs/development/tools/build-managers/doit/default.nix @@ -15,7 +15,7 @@ in python3Packages.buildPythonApplication { buildInputs = with python3Packages; [ mock pytest ]; - propagatedBuildInputs = with python3Packages; [ cloudpickle ] + requiredPythonModules = with python3Packages; [ cloudpickle ] ++ stdenv.lib.optional stdenv.isLinux pyinotify ++ stdenv.lib.optional stdenv.isDarwin macfsevents; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 32948adfb6c0f..5b01895ac2573 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -77,9 +77,6 @@ python3.pkgs.buildPythonApplication rec { mv ".$i-wrapped" "$i" done popd - - # Do not propagate Python - rm $out/nix-support/propagated-build-inputs ''; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 9757d8cda8d13..34d563507a5bf 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. dontStrip = true; - propagatedBuildInputs = [ + requiredPythonModules = [ twitter-common-collections setproctitle ansicolors packaging pathspec scandir twitter-common-dirutil psutil requests pystache pex docutils markdown pygments twitter-common-confluence fasteners pywatchman diff --git a/pkgs/development/tools/cmake-format/default.nix b/pkgs/development/tools/cmake-format/default.nix index 0d9edebe19b5b..065219d881866 100644 --- a/pkgs/development/tools/cmake-format/default.nix +++ b/pkgs/development/tools/cmake-format/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { sha256 = "0kmggnfbv6bba75l3zfzqwk0swi90brjka307m2kcz2w35kr8jvn"; }; - propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ]; + requiredPythonModules = [ autopep8 flake8 jinja2 pylint pyyaml ]; doCheck = false; diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix index 628bb31fbe934..434347770cfcd 100644 --- a/pkgs/development/tools/cmake-language-server/default.nix +++ b/pkgs/development/tools/cmake-language-server/default.nix @@ -28,7 +28,7 @@ buildPythonApplication rec { ''; nativeBuildInputs = [ poetry ]; - propagatedBuildInputs = [ pygls pyparsing ]; + requiredPythonModules = [ pygls pyparsing ]; checkInputs = [ cmake pytest pytest-datadir ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index 3d24ac34b3eb0..5007a2f7bb9a7 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { sha256 = "FARWjtbS5zi/XQDyAVImUmArLj8xATz1jZ4jnXFdq1w="; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ cli-helpers click configobj diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index b6d7f65896e87..333712bfbb209 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { sha256 = "10j01bd031fys1vcihibsi5rrfd8w1kgahpcsbk4l07871c24829"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ cli-helpers click configobj humanize prompt_toolkit psycopg2 pygments sqlparse pgspecial setproctitle keyring ]; diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix index c86a0f6df8bd1..628cc50302484 100644 --- a/pkgs/development/tools/database/pyrseas/default.nix +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -12,7 +12,7 @@ let }; # The tests are impure (they try to access a PostgreSQL server) doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ pythonPackages.psycopg2 pythonPackages.pytest ]; @@ -30,7 +30,7 @@ pythonPackages.buildPythonApplication { }; # The tests are impure (they try to access a PostgreSQL server) doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ pythonPackages.psycopg2 pythonPackages.pytest pythonPackages.pyyaml diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/development/tools/database/sqlite-web/default.nix index 9a9314fde9b1e..e27e720799986 100644 --- a/pkgs/development/tools/database/sqlite-web/default.nix +++ b/pkgs/development/tools/database/sqlite-web/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "17pymadm063358nji70xzma64zkfv26c3pai5i1whsfp9ahqzasg"; }; - propagatedBuildInputs = with python3Packages; [ flask peewee pygments ]; + requiredPythonModules = with python3Packages; [ flask peewee pygments ]; # no tests in repository doCheck = false; diff --git a/pkgs/development/tools/detect-secrets/default.nix b/pkgs/development/tools/detect-secrets/default.nix index 1e42a32f7caaa..15a08c2aaffac 100644 --- a/pkgs/development/tools/detect-secrets/default.nix +++ b/pkgs/development/tools/detect-secrets/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { sha256 = "01y5xd0irxxib4wnf5834gwa7ibb81h5y4dl8b26gyzgvm5zfpk1"; }; - propagatedBuildInputs = [ pyyaml ] + requiredPythonModules = [ pyyaml ] ++ lib.optionals isPy27 [ configparser enum34 future functools32 ]; checkInputs = [ mock pytest unidiff ]; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 1a0fdf403082e..0c44b2d08371c 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -5,7 +5,7 @@ , glibcLocales , pkginfo , check-manifest -# propagatedBuildInputs +# requiredPythonModules , py , devpi-common , pluggy @@ -34,7 +34,7 @@ buildPythonApplication rec { buildInputs = [ glibcLocales pkginfo check-manifest ]; - propagatedBuildInputs = [ py devpi-common pluggy setuptools ]; + requiredPythonModules = [ py devpi-common pluggy setuptools ]; checkInputs = [ pytest pytest-flake8 webtest mock diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 53950d08f76b5..0048897962734 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; sourceRoot = "source/server"; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ py appdirs devpi-common diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/development/tools/distgen/default.nix index dbf00ea8e05e7..5cc6c14001f55 100644 --- a/pkgs/development/tools/distgen/default.nix +++ b/pkgs/development/tools/distgen/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { mock ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ distro jinja2 six diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 54c37fa618370..5c4162f021a65 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -21,7 +21,7 @@ python2Packages.buildPythonApplication rec { substituteInPlace xml2po/xml2po/Makefile --replace '-e "s+^#!.*python.*+#!$(PYTHON)+"' '-e "s\"^#!.*python.*\"#!$(PYTHON)\""' ''; - propagatedBuildInputs = [ libxml2Python ]; + requiredPythonModules = [ libxml2Python ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index d7779540f97d1..0c7a79faee07b 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { dblatex ]; - pythonPath = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42 (anytree.override { withGraphviz = false; }) lxml @@ -62,12 +62,6 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; # requires a lot of stuff doInstallCheck = false; # fails - postFixup = '' - # Do not propagate Python - substituteInPlace $out/nix-support/propagated-build-inputs \ - --replace "${python3}" "" - ''; - # find: ‘...-gtk-doc-1.32/lib/python3.8/site-packages’: No such file or directory # https://github.com/NixOS/nixpkgs/pull/90208#issuecomment-644051108 dontUsePythonRecompileBytecode = true; diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 8d4480945bda3..59b9937ef1eca 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { checkPhase = "nosetests mkdocs"; - propagatedBuildInputs = [ + requiredPythonModules = [ tornado livereload click diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix index 776a3b06143ad..e54caf3290e08 100644 --- a/pkgs/development/tools/dt-schema/default.nix +++ b/pkgs/development/tools/dt-schema/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm git ]; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools ruamel_yaml jsonschema diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix index 95108c21bb9cf..ec96685c7f37f 100644 --- a/pkgs/development/tools/eliot-tree/default.nix +++ b/pkgs/development/tools/eliot-tree/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { pytest ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ colored eliot iso8601 diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 2b96830b00224..83fee3db8a856 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -28,7 +28,7 @@ python.pkgs.buildPythonApplication rec { buildInputs = [ python.pkgs.Babel ]; - propagatedBuildInputs = with python.pkgs; [ + requiredPythonModules = with python.pkgs; [ androguard clint defusedxml diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix index 4fbecc2d58d0e..aba966a985c44 100644 --- a/pkgs/development/tools/fedpkg/default.nix +++ b/pkgs/development/tools/fedpkg/default.nix @@ -10,7 +10,7 @@ let url = "https://releases.pagure.org/fedora-packager/fedora-packager-${version}.tar.bz2"; sha256 = "02f22072wx1zg3rhyfw6gbxryzcbh66s92nb98mb9kdhxixv6p0z"; }; - propagatedBuildInputs = [ python_fedora pyopenssl ]; + requiredPythonModules = [ python_fedora pyopenssl ]; doCheck = false; }; in buildPythonApplication rec { @@ -24,7 +24,7 @@ in buildPythonApplication rec { sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631"; }; patches = [ ./fix-paths.patch ]; - propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ]; + requiredPythonModules = [ rpkg offtrac urlgrabber fedora_cert ]; meta = with stdenv.lib; { description = "Subclass of the rpkg project for dealing with rpm packaging"; diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index 077dc8b87f997..e305490a9c520 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgsCross.arm-embedded.buildPackages.gcc makeWrapper python3Packages.wrapPython ]; buildInputs = [ python3 python3Packages.pyusb ]; - pythonPath = with python3Packages; [ pyusb ]; + requiredPythonModules = with python3Packages; [ pyusb ]; meta = with stdenv.lib; { homepage = "https://github.com/Cease-and-DeSwitch/fusee-launcher"; diff --git a/pkgs/development/tools/git-repo-updater/default.nix b/pkgs/development/tools/git-repo-updater/default.nix index dbf83677999ab..a28a099ae4aed 100644 --- a/pkgs/development/tools/git-repo-updater/default.nix +++ b/pkgs/development/tools/git-repo-updater/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { sha256 = "1pa612rcc94nc461zs9sag9p46sycc214622b06gdn35rmwp0y2g"; }; - propagatedBuildInputs = [ colorama GitPython ]; + requiredPythonModules = [ colorama GitPython ]; meta = with lib; { description = "Easily update multiple Git repositories at once"; diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix index 5eb65dc4fbdf1..0fcbf4c13252a 100644 --- a/pkgs/development/tools/github/cligh/default.nix +++ b/pkgs/development/tools/github/cligh/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "0d1fd78rzl2n75xpmy1gnxh1shvcs4qm0j4qqszqvfriwkg2flxn"; }; - propagatedBuildInputs = [ pyxdg PyGithub ]; + requiredPythonModules = [ pyxdg PyGithub ]; meta = with stdenv.lib; { homepage = "http://the-brannons.com/software/cligh.html"; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 84b3d2a6b1ee0..cbcbd9ca46a59 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libXi libX11 ] ++ (with python3Packages; [ python setuptools wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin Cocoa; - pythonPath = with python3Packages; [ pyyaml requests ]; + requiredPythonModules = with python3Packages; [ pyyaml requests ]; # Makefile has /usr/local/bin hard-coded for 'make install' preConfigure = '' diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix index ce336241b65d7..e90831c7f2b34 100644 --- a/pkgs/development/tools/grabserial/default.nix +++ b/pkgs/development/tools/grabserial/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0ryk4w8q6zfmia71nwnk5b7xaxw0sf45dw9q50xp7k76i3k5f9f3"; }; - propagatedBuildInputs = [ pythonPackages.pyserial ]; + requiredPythonModules = [ pythonPackages.pyserial ]; meta = with lib; { description = "Python based serial dump and timing program"; diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 19d6fa392dd2e..3195f6486c711 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/pkgs/development/tools/jira_cli/default.nix @@ -18,7 +18,7 @@ in doCheck = false; checkInputs = with python3Packages; [ vcrpy mock hiro ]; buildInputs = [ libffi openssl ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ ordereddict requests six suds-jurko termcolor keyring jira keyrings-alt ]; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 53ba94c7e81e6..20f9aa3cf4edf 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { libwnck3 ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pygobject3 ]; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index ecbfc2ae75698..d3b13f1ad1065 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { version = "0.13.2.1"; buildInputs = [ gdb ]; - propagatedBuildInputs = [ + requiredPythonModules = [ flask flask-socketio flask-compress diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index d46256f039aa4..3db8ad5dce6d8 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2"; }; - pythonPath = [ python3.pkgs.libxml2 ]; + requiredPythonModules = [ python3.pkgs.libxml2 ]; buildInputs = [ python3 python3.pkgs.libxml2 ]; nativeBuildInputs = [ python3.pkgs.wrapPython ]; diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix index eeb9100a4c8ff..f9546ba944bd6 100644 --- a/pkgs/development/tools/misc/nrfutil/default.nix +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -11,7 +11,7 @@ with python37Packages; buildPythonApplication rec { sha256 = "0g43lf5jmk0qxb7r4h68wr38fli6pjjk67w8l2cpdm9rd8jz4lpn"; }; - propagatedBuildInputs = [ pc-ble-driver-py six pyserial enum34 click ecdsa + requiredPythonModules = [ pc-ble-driver-py six pyserial enum34 click ecdsa protobuf tqdm piccata pyspinel intelhex pyyaml crcmod libusb1 ipaddress ]; checkInputs = [ nose behave ]; diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index f9d792d185f82..7c39df257f7d2 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -6,7 +6,7 @@ }: let - pythonPath = with python3.pkgs; makePythonPath [ + requiredPythonModules = with python3.pkgs; makePythonPath [ future isort psutil @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { chmod +x $out/share/pwndbg/gdbinit.py makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \ --add-flags "-q -x $out/share/pwndbg/gdbinit.py" \ - --set NIX_PYTHONPATH ${pythonPath} + --set NIX_PYTHONPATH ${requiredPythonModules} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/replacement/default.nix b/pkgs/development/tools/misc/replacement/default.nix index 3d0218ffab232..199805bfe8e14 100644 --- a/pkgs/development/tools/misc/replacement/default.nix +++ b/pkgs/development/tools/misc/replacement/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0j4lvn3rx1kqvxcsd8nhc2lgk48jyyl7qffhlkvakhy60f9lymj3"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ ruamel_yaml ]; diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix index 4618906038eb5..2a87dba58cfd7 100644 --- a/pkgs/development/tools/misc/tinyprog/default.nix +++ b/pkgs/development/tools/misc/tinyprog/default.nix @@ -17,7 +17,7 @@ with python3Packages; buildPythonApplication rec { sourceRoot = "source/programmer"; - propagatedBuildInputs = [ + requiredPythonModules = [ pyserial jsonmerge intelhex diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/development/tools/misc/tockloader/default.nix index 3aff6c6d36cc6..a5ffbeb8ae3a1 100644 --- a/pkgs/development/tools/misc/tockloader/default.nix +++ b/pkgs/development/tools/misc/tockloader/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "11k4ppwq845lnj265ydfr0cn1rrym5amx2i19x1h3ccbxc3gsy3x"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ argcomplete colorama crcmod diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/development/tools/mpfshell/default.nix index 69048acb5baf2..ee93f4c25ddb8 100644 --- a/pkgs/development/tools/mpfshell/default.nix +++ b/pkgs/development/tools/mpfshell/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec { sha256 = "1n4ap4yfii54y125f9n9krc0lc0drwg3hsq4z6g89xbswdx9sygr"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pyserial colorama websocket_client ]; diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index a7fabb7839516..211eeb104dae7 100644 --- a/pkgs/development/tools/pew/default.nix +++ b/pkgs/development/tools/pew/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq"; }; - propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; + requiredPythonModules = [ virtualenv virtualenv-clone setuptools ]; # no tests are packaged checkPhase = '' diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 3a6ea879e58b9..eafb46000a7f3 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -36,7 +36,7 @@ in buildPythonApplication rec { --replace "sys.executable" "'${pythonEnv.interpreter}'" ''; - propagatedBuildInputs = runtimeDeps python3.pkgs; + requiredPythonModules = runtimeDeps python3.pkgs; doCheck = true; checkPhase = '' diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index e47dbc99f2a75..eeb58a0f728b7 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -61,7 +61,7 @@ let in { buildInputs = mkInput "buildInputs" (if includeBuildSystem then buildSystemPkgs else [ ]); - propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); + requiredPythonModules = mkInput "requiredPythonModules" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); nativeBuildInputs = mkInput "nativeBuildInputs" [ ]; checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); }; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 9619e3649379a..0d8ba168dd841 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -118,7 +118,7 @@ pythonPackages.callPackage ++ lib.optional (!__isBootstrap) [ pythonPackages.poetry ] ); - propagatedBuildInputs = + requiredPythonModules = let compat = isCompatible (poetryLib.getPythonVersion python); deps = lib.filterAttrs diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index ca6c0c7cc49b8..01d1cf157c3bc 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -8,7 +8,7 @@ self: super: { automat = super.automat.overridePythonAttrs ( old: rec { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.m2r ]; + requiredPythonModules = old.requiredPythonModules ++ [ self.m2r ]; } ); @@ -21,7 +21,7 @@ self: super: # Inputs copied from nixpkgs as ansible doesn't specify it's dependencies # in a correct manner. - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + requiredPythonModules = old.requiredPythonModules ++ [ self.pycrypto self.paramiko self.jinja2 @@ -127,7 +127,7 @@ self: super: dictdiffer = super.dictdiffer.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + requiredPythonModules = old.requiredPythonModules ++ [ self.setuptools ]; } ); @@ -237,7 +237,7 @@ self: super: horovod = super.horovod.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + requiredPythonModules = old.requiredPythonModules ++ [ pkgs.openmpi ]; } ); @@ -301,7 +301,7 @@ self: super: # importlib-metadata has an incomplete dependency specification importlib-metadata = super.importlib-metadata.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; + requiredPythonModules = old.requiredPythonModules ++ lib.optional self.python.isPy2 self.pathlib2; } ); @@ -313,7 +313,7 @@ self: super: isort = super.isort.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + requiredPythonModules = old.requiredPythonModules ++ [ self.setuptools ]; } ); @@ -360,7 +360,7 @@ self: super: lap = super.lap.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + requiredPythonModules = old.requiredPythonModules ++ [ self.numpy ]; } @@ -368,7 +368,7 @@ self: super: libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkgconfig ]; - propagatedBuildInputs = [ pkgs.libvirt ]; + requiredPythonModules = [ pkgs.libvirt ]; }); llvmlite = super.llvmlite.overridePythonAttrs ( @@ -396,7 +396,7 @@ self: super: lockfile = super.lockfile.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; + requiredPythonModules = old.requiredPythonModules ++ [ self.pbr ]; } ); @@ -443,7 +443,7 @@ self: super: EOF ''; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + requiredPythonModules = old.requiredPythonModules ++ [ pkgs.libpng pkgs.freetype ] @@ -511,7 +511,7 @@ self: super: self.cython ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + requiredPythonModules = old.requiredPythonModules ++ [ pkgs.zlib pkgs.netcdf pkgs.hdf5 @@ -585,7 +585,7 @@ self: super: in { buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; - propagatedBuildInputs = old.propagatedBuildInputs + requiredPythonModules = old.requiredPythonModules ++ lib.optional withPostgres self.psycopg2 ++ lib.optional withMysql self.mysql-connector; } @@ -714,7 +714,7 @@ self: super: pkgs.pkgconfig ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + requiredPythonModules = old.requiredPythonModules ++ [ pkgs.cairo pkgs.xlibsWrapper ]; @@ -952,7 +952,7 @@ self: super: pyzmq = super.pyzmq.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; + requiredPythonModules = old.requiredPythonModules ++ [ pkgs.zeromq ]; } ); @@ -1005,7 +1005,7 @@ self: super: old: if old.format != "wheel" then { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; + requiredPythonModules = old.requiredPythonModules ++ [ self.pybind11 ]; setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; enableParallelBuilding = true; buildInputs = old.buildInputs ++ [ self.numpy.blas ]; @@ -1057,7 +1057,7 @@ self: super: old: { HDF5_DIR = "${pkgs.hdf5}"; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; + requiredPythonModules = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; } ); @@ -1095,7 +1095,7 @@ self: super: urwidtrees = super.urwidtrees.overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + requiredPythonModules = old.requiredPythonModules ++ [ self.urwid ]; } @@ -1187,7 +1187,7 @@ self: super: ) else super.zipp ).overridePythonAttrs ( old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + requiredPythonModules = old.requiredPythonModules ++ [ self.toml ]; } diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix index 38472ce86f018..bf50b0927f763 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -45,7 +45,7 @@ buildPythonApplication rec { --replace 'pycodestyle<=2.4.0' 'pycodestyle<=2.5.0' ''; - propagatedBuildInputs = [ + requiredPythonModules = [ astroid django dodgy diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 980aa0f09ea5b..19fd35955a085 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -9,7 +9,7 @@ pkgs.buildPythonApplication rec { inherit pname version; sha256 = "0y4zkkcijz5hchd8j6a106ysrg1dnad7dzdgnmz38rgm6zbrky0d"; }; - propagatedBuildInputs = with pkgs; [ + requiredPythonModules = with pkgs; [ attrs click jinja2 diff --git a/pkgs/development/tools/rdbtools/default.nix b/pkgs/development/tools/rdbtools/default.nix index 624434101d996..4ec88b43df1d2 100644 --- a/pkgs/development/tools/rdbtools/default.nix +++ b/pkgs/development/tools/rdbtools/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "689e57e42f43bdc73ea4e893d9676819980d17968696826b69fbd951f59772de"; }; - propagatedBuildInputs = [ redis python-lzf ]; + requiredPythonModules = [ redis python-lzf ]; # No tests in published package doCheck = false; diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index d28ca286f086d..31357cf9578a6 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "16425aa1575a271dd3705d812b06276eeedc3ac557e7fd28e06822ad14cd0667"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pyyaml cbor2 dateutil tomlkit u-msgpack-python ]; diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index b05bb2cd26a30..abf8e4e726cdd 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -14,7 +14,7 @@ with python3Packages; buildPythonApplication rec { sha256 = "2510e3aae4874674187f88f22f854e6b0ea1881b77039808a68ac1a5e8ee69b6"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ dulwich pbr pyyaml diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix index 4e3e12a8eeb15..d8f2b69996534 100644 --- a/pkgs/development/tools/rshell/default.nix +++ b/pkgs/development/tools/rshell/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { sha256 = "1crnlv0khplpibl9mj3flrgp877pnr1xz6hnnsi6hk3kfbc6p3nj"; }; - propagatedBuildInputs = [ pyserial pyudev ]; + requiredPythonModules = [ pyserial pyudev ]; meta = with lib; { homepage = "https://github.com/dhylands/rshell"; diff --git a/pkgs/development/tools/sourcetrail/jedi.nix b/pkgs/development/tools/sourcetrail/jedi.nix index 14a40a6e6db46..d532b168bdf51 100644 --- a/pkgs/development/tools/sourcetrail/jedi.nix +++ b/pkgs/development/tools/sourcetrail/jedi.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ pytest glibcLocales tox pytestcov ]; - propagatedBuildInputs = [ parso ]; + requiredPythonModules = [ parso ]; checkPhase = '' LC_ALL="en_US.UTF-8" py.test test diff --git a/pkgs/development/tools/sourcetrail/python.nix b/pkgs/development/tools/sourcetrail/python.nix index 113abb77d61b6..9be12e6c73539 100644 --- a/pkgs/development/tools/sourcetrail/python.nix +++ b/pkgs/development/tools/sourcetrail/python.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapPython cmake swig ]; buildInputs = [ python ]; - pythonPath = [ jedi parso ]; + requiredPythonModules = [ jedi parso ]; dontUseCmakeConfigure = true; cmakeFlags = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; checkPhase = '' - buildPythonPath "$pythonPath" + buildPythonPath "$requiredPythonModules" # FIXME: some tests are failing # PYTHONPATH="$program_PYTHONPATH:SourcetrailDB/build/bindings_python" \ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { cp _sourcetraildb* $out/libexec/_sourcetraildb.so popd - wrapPythonProgramsIn "$out/libexec" "$pythonPath" + wrapPythonProgramsIn "$out/libexec" "$requiredPythonModules" ''; doCheck = true; diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index 9657543e0c70a..be6551162f529 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { sha256 = "1lb0j120sj76swi702ah6ryn770m1y7gh69237zxpyh897pn5paa"; }; - propagatedBuildInputs = [ pyyaml setuptools ]; + requiredPythonModules = [ pyyaml setuptools ]; makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git breezy subversion ])]; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index fcab1f952f2b8..7116f9f4578d7 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { disabled = ! pythonAtLeast "3.5"; checkInputs = [ pytest pytestcov ]; - propagatedBuildInputs = [ ansicolor chardet pyyaml setuptools ]; + requiredPythonModules = [ ansicolor chardet pyyaml setuptools ]; # Unpin test dependency versions. This is fixed in master but not yet released. preCheck = '' diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index 8db0b719c67bf..140322d74b3ee 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs"; }; - propagatedBuildInputs = [ pythonPackages.wxPython ]; + requiredPythonModules = [ pythonPackages.wxPython ]; desktopItem = makeDesktopItem { name = "winpdb"; diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix index 510808fc41272..3091161f8e4cd 100644 --- a/pkgs/development/tools/ydiff/default.nix +++ b/pkgs/development/tools/ydiff/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { ''; buildInputs = [ docutils pygments ]; - propagatedBuildInputs = [ less patchutils ]; + requiredPythonModules = [ less patchutils ]; checkInputs = [ coverage coreutils git subversion which ]; checkTarget = if isPy3k then "test3" else "test"; diff --git a/pkgs/games/20kly/default.nix b/pkgs/games/20kly/default.nix index 8c81b8b2360e6..95f4d3ee073d1 100644 --- a/pkgs/games/20kly/default.nix +++ b/pkgs/games/20kly/default.nix @@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec { "LIGHTYEARS_DIR = \"$out/share\"" ''; - propagatedBuildInputs = with python.pkgs; [ pygame ]; + requiredPythonModules = with python.pkgs; [ pygame ]; buildPhase = "python -O -m compileall ."; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 0d713b1f71e19..500837bd872c9 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -86,7 +86,7 @@ buildPythonApplication rec { outputs = [ "out" "doc" "man" ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pyqtwebengine sqlalchemy beautifulsoup4 diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix index 4e855dbd053f7..852d35f48cf08 100644 --- a/pkgs/games/endgame-singularity/default.nix +++ b/pkgs/games/endgame-singularity/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { sourceRoot = "source"; nativeBuildInputs = [ unzip ]; # The music is zipped - propagatedBuildInputs = with python3.pkgs; [ pygame numpy polib ]; + requiredPythonModules = with python3.pkgs; [ pygame numpy polib ]; # Add the music postInstall = stdenv.lib.optionalString enableDefaultMusicPack '' diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 307c09dfa1b3a..c216fbe7aa4e4 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -22,7 +22,7 @@ buildPythonApplication { gnome3.adwaita-icon-theme gtk3 gobject-introspection ]; - propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ]; + requiredPythonModules = with python3Packages; [ gst-python pygobject3 ]; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index 9004bd3d0423a..2936450e905da 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pygobject3 pycairo ]; diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index edf8b853c3c64..3e6ab245a0a5f 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { sha256 = "0kdrhdvh9gxq1zinh5w852f5fjls9902pcrkhkhm2c0vvq7jfass"; }; - propagatedBuildInputs = [ requests ]; + requiredPythonModules = [ requests ]; disabled = pythonOlder "3.8"; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 4a92b8c1014a6..e4ca790f4d0c0 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -16,7 +16,7 @@ python.pkgs.buildPythonApplication rec { buildInputs = [ anki ]; - propagatedBuildInputs = with python.pkgs; [ + requiredPythonModules = with python.pkgs; [ cheroot cherrypy googletrans diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index 07451b8dc2a41..55353951db476 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { --replace "RustExtension(\"portmod.portmod\", binding=Binding.PyO3, strip=True)" "" ''; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ setuptools_scm setuptools requests diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index 5689edf4f4c4f..4ad4e3341bfb1 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { sha256 = "0h0fibjv47j8lkc1bwnlbbvrx2nr3l2hzv717kcgagwhc7v2mrqh"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ tkinter six random2 # optional : pygame freecell-solver pillow diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix index b104f359363bf..7318d326e7e8b 100644 --- a/pkgs/misc/autotiling/default.nix +++ b/pkgs/misc/autotiling/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { sha256 = "0hwvy9bxwv9fakqqiyrkmpckxgm0z85c240p84ibdhja9sm086v0"; }; - propagatedBuildInputs = [ i3ipc importlib-metadata ]; + requiredPythonModules = [ i3ipc importlib-metadata ]; doCheck = false; meta = with lib; { diff --git a/pkgs/misc/cbeams/default.nix b/pkgs/misc/cbeams/default.nix index 928b03df09f7d..21427f80bd267 100644 --- a/pkgs/misc/cbeams/default.nix +++ b/pkgs/misc/cbeams/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { sha256 = "1agcjg6kmcyvk834xd2j60mi349qi9iw3dc2vwpd7pqwq1daq3gi"; }; - propagatedBuildInputs = [ blessings docopt ]; + requiredPythonModules = [ blessings docopt ]; meta = with lib; { homepage = "https://github.com/tartley/cbeams"; diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 452c2c425c1d7..e2b40cc739939 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -63,7 +63,7 @@ python2Packages.buildPythonApplication { pkgconfig ]; - pythonPath = with python2Packages; [ + requiredPythonModules = with python2Packages; [ dbus pillow pygobject2 @@ -152,7 +152,7 @@ python2Packages.buildPythonApplication { # 2. Making our own wrapper pointing directly to the original script. dontWrapPythonPrograms = true; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $requiredPythonModules" for bin in $out/bin/*; do py=$(readlink -m $bin) diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index f9064720fb645..0ac6473ce0c8c 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -69,7 +69,7 @@ python2Packages.buildPythonApplication { pkgconfig ]; - pythonPath = with python2Packages; [ + requiredPythonModules = with python2Packages; [ dbus pillow pygobject2 @@ -184,7 +184,7 @@ python2Packages.buildPythonApplication { # 2. Making our own wrapper pointing directly to the original script. dontWrapPythonPrograms = true; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $requiredPythonModules" for bin in $out/bin/*; do py=$(readlink -m $bin) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index afd1f8f6fe4f6..da909c621ef98 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -72,7 +72,7 @@ python3Packages.buildPythonApplication { removeReferencesTo ] ++ stdenv.lib.optional withQt5 qt5.wrapQtAppsHook; - pythonPath = with python3Packages; [ + requiredPythonModules = with python3Packages; [ dbus pillow pygobject3 @@ -196,7 +196,7 @@ python3Packages.buildPythonApplication { # 2. Making our own wrapper pointing directly to the original script. dontWrapPythonPrograms = true; preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $requiredPythonModules" for bin in $out/bin/*; do py=$(readlink -m $bin) diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 23c5e3f9dc8ce..09291bc236778 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection libappindicator-gtk3 librsvg ]; - propagatedBuildInputs = [ evdev pygobject3 pylibacl ]; + requiredPythonModules = [ evdev pygobject3 pylibacl ]; checkInputs = [ pytest ]; diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index ca5607b530720..2f61f0ba78bb0 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -21,7 +21,7 @@ buildPythonApplication { ''; buildInputs = [ libusb1 ]; - propagatedBuildInputs = + requiredPythonModules = [ psutil python3Packages.libusb1 ] ++ lib.optionals GyroplotSupport [ pyqtgraph pyside ]; diff --git a/pkgs/misc/emulators/termtekst/default.nix b/pkgs/misc/emulators/termtekst/default.nix index 8186aba1ee565..9851132187e59 100644 --- a/pkgs/misc/emulators/termtekst/default.nix +++ b/pkgs/misc/emulators/termtekst/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1gm7j5d49a60wm7px82b76f610i8pl8ccz4r6qsz90z4mp3lyw9b"; }; - propagatedBuildInputs = with python3Packages; [ ncurses requests ]; + requiredPythonModules = with python3Packages; [ ncurses requests ]; patchPhase = '' substituteInPlace setup.py \ diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 98f368132a91f..5b3cd53273697 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { }; nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ i3ipc xcffib click cffi xpybutil marshmallow pyyaml ]; + requiredPythonModules = [ i3ipc xcffib click cffi xpybutil marshmallow pyyaml ]; # Tests require access to a X session doCheck = false; diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 82a3aa8c7befc..bbcc2aac946e4 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "07hjlq29npasn2bsb3qrzr1gikyvcc85avx0sxybfih329bvjk03"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ lilypond pygame python-ly sip pyqt5 poppler-qt5 pyqtwebengine diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 21a89e5f5f2e0..7c0996a9a422f 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--disable-console" ]; - pythonPath = with python2.pkgs; [ + requiredPythonModules = with python2.pkgs; [ future libsearpc ]; diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 71d9d682be47d..64e74c802c906 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { nativeBuildInputs = [ gettext pkgconfig texinfo wrapGAppsHook ]; buildInputs = [ gobject-introspection gtk3 librsvg ]; - propagatedBuildInputs = [ pycairo pygobject3 ]; + requiredPythonModules = [ pycairo pygobject3 ]; preBuild = '' sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \ diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 1d86f82d278f0..88206e81e4223 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -63,12 +63,12 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { python3.pkgs.wrapPython ]; - pythonPath = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ setuptools ]; postPatch = '' - # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`. + # Patch `packages.json` so that nix's *python* is used as default value for `python.requiredPythonModules`. substituteInPlace "./package.json" \ --replace "\"default\": \"python\"" "\"default\": \"${pythonDefaultsTo}\"" diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index a90b2fce34d54..d5b53575491d0 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -34,7 +34,7 @@ python.pkgs.buildPythonApplication rec { }) ]; - propagatedBuildInputs = [ python.pkgs.netaddr ]; + requiredPythonModules = [ python.pkgs.netaddr ]; nativeBuildInputs = [ makeWrapper cmake flex bison ] # libelf is incompatible with elfutils-libelf ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; @@ -71,7 +71,7 @@ python.pkgs.buildPythonApplication rec { ''; postFixup = '' - wrapPythonProgramsIn "$out/share/bcc/tools" "$out $pythonPath" + wrapPythonProgramsIn "$out/share/bcc/tools" "$out $requiredPythonModules" ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 8e110fb13aceb..d396e6642edb9 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -12,7 +12,7 @@ , systemd , udev }: let - pythonPath = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ dbus-python pygobject3 recursivePthLoader @@ -92,7 +92,7 @@ in stdenv.mkDerivation rec { ln -s ../test/$a $test/bin/bluez-$a done popd - wrapPythonProgramsIn $test/test "$test/test ${toString pythonPath}" + wrapPythonProgramsIn $test/test "$test/test ${toString requiredPythonModules}" '' + '' # for bluez4 compatibility for NixOS mkdir $out/sbin diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/pkgs/os-specific/linux/cpuset/default.nix index 90352a944d5bd..a60b0378dd084 100644 --- a/pkgs/os-specific/linux/cpuset/default.nix +++ b/pkgs/os-specific/linux/cpuset/default.nix @@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec { pname = "cpuset"; version = "1.5.8"; - propagatedBuildInputs = [ ]; + requiredPythonModules = [ ]; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 6d2d8eb75b00b..9e4eae07c10a8 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec { sha256 = "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6"; }; - propagatedBuildInputs = with python2Packages; [ python-wifi ]; + requiredPythonModules = with python2Packages; [ python-wifi ]; patches = [ ./fix_pluginpath.patch ]; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index adf37a1b71b6c..a9de06eed1f4a 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { checkInputs = [ openssl ]; - pythonPath = [ + requiredPythonModules = [ python3Packages.dbus-python python3Packages.pygobject3 ]; diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 641c8b8ba81f0..dbefdf687c7aa 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ]; - propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [ + requiredPythonModules = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [ gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now ]; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index c0ed4102aaf18..da39451530203 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { nativeBuildInputs = [ cython ]; buildInputs = [ libsepol ]; - propagatedBuildInputs = [ enum34 libselinux networkx ] + requiredPythonModules = [ enum34 libselinux networkx ] ++ optionals withGraphics [ pyqt5 ]; checkInputs = [ tox checkpolicy ]; diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/pkgs/os-specific/linux/speedometer/default.nix index e4d374b0c41f3..eac64407d1dd2 100644 --- a/pkgs/os-specific/linux/speedometer/default.nix +++ b/pkgs/os-specific/linux/speedometer/default.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "060bikv3gwr203jbdmvawsfhc0yq0bg1m42dk8czx1nqvwvgv6fm"; }; - propagatedBuildInputs = [ pythonPackages.urwid ]; + requiredPythonModules = [ pythonPackages.urwid ]; postPatch = '' sed -i "/'entry_points': {/d" setup.py diff --git a/pkgs/os-specific/linux/systemd-wait/default.nix b/pkgs/os-specific/linux/systemd-wait/default.nix index 348549a1bc64a..e161b596ac36b 100644 --- a/pkgs/os-specific/linux/systemd-wait/default.nix +++ b/pkgs/os-specific/linux/systemd-wait/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1l8rd0wzf3m7fk0g1c8wc0csdisdfac0filhixpgp0ck9ignayq5"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ dbus-python pygobject3 ]; diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/os-specific/linux/targetcli/default.nix index 94920c4012a40..4147ae02a2b17 100644 --- a/pkgs/os-specific/linux/targetcli/default.nix +++ b/pkgs/os-specific/linux/targetcli/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1qrq7y5hnghzbxgrxgl153n8jlhw31kqjbr93jsvlvhz5b3ci750"; }; - propagatedBuildInputs = with python3.pkgs; [ configshell rtslib ]; + requiredPythonModules = with python3.pkgs; [ configshell rtslib ]; postInstall = '' install -D targetcli.8 -t $out/share/man/man8/ diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 4f7186f31404a..7d9164d185de4 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -51,7 +51,7 @@ let sourceRoot = "${name}/management/python"; - propagatedBuildInputs = [ qpid-python ]; + requiredPythonModules = [ qpid-python ]; }; in buildEnv { name = "${name}-env"; diff --git a/pkgs/servers/ankisyncd/default.nix b/pkgs/servers/ankisyncd/default.nix index e109867012376..156c15920d048 100644 --- a/pkgs/servers/ankisyncd/default.nix +++ b/pkgs/servers/ankisyncd/default.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ ]; - propagatedBuildInputs = [ anki ]; + requiredPythonModules = [ anki ]; checkPhase = '' # Exclude tests that require sqlite's sqldiff command, since diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index e65021599ad41..da6a35e0e3ab1 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { nativeBuildInputs = [ pytestrunner flake8]; - propagatedBuildInputs = [ + requiredPythonModules = [ aioh2 dnspython aiohttp-remotes diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 5f9beb4b83484..8e9b38ac748b0 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { libxslt libusb1 pps-tools ]; - pythonPath = [ + requiredPythonModules = [ python2Packages.pygobject2 python2Packages.pygtk ]; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "udev-install" ]; postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" + wrapPythonProgramsIn $out/bin "$out $requiredPythonModules" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 2c0854d0a8b40..6d3908060d39e 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -48,7 +48,7 @@ in python.pkgs.buildPythonApplication rec { sha256 = "13qzjv11b0c7s1c66j70qmc222a78805n10lv2svj9yyk1v4xhjv"; }; - propagatedBuildInputs = with python.pkgs; [ + requiredPythonModules = with python.pkgs; [ daemonize astral requests websocket_client aiohttp yarl jinja2 aiohttp-jinja2 pyyaml voluptuous feedparser iso8601 bcrypt paho-mqtt setuptools deepdiff dateutil bcrypt python-socketio pid diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index 6b7758dd5e138..2b0ffacf44d78 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" setup.py ''; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ requests netdisco click click-log tabulate jsonpath_rw jinja2 dateparser regex ruamel_yaml aiohttp ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 995d0bd0ede07..c834c20f84d19 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -3,7 +3,7 @@ # Look up dependencies of specified components in component-packages.nix , extraComponents ? [ ] -# Additional packages to add to propagatedBuildInputs +# Additional packages to add to requiredPythonModules , extraPackages ? ps: [] # Override Python packages using @@ -97,7 +97,7 @@ in with py.pkgs; buildPythonApplication rec { substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; - propagatedBuildInputs = [ + requiredPythonModules = [ # From setup.py aiohttp astral async-timeout attrs bcrypt certifi ciso8601 httpx jinja2 pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index d2387a1fa6295..e5d5028e3a234 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -15,7 +15,7 @@ with python3Packages; buildPythonApplication rec { sha256 = "02jgfzq3svd54zj09jj7lm2r7ypqqjynzxa9dgnnm0pqvq728wzr"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ itsdangerous jinja2 misaka diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index e91c35538a255..35aa3bc4e82e1 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -40,7 +40,7 @@ let sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89"; }; - propagatedBuildInputs = with pythonPackages; [ zope_interface ]; + requiredPythonModules = with pythonPackages; [ zope_interface ]; # Generate Twisted's plug-in cache. Twited users must do it as well. See # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 879fd19adb0a8..8d38b7fe6ed5b 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0idfiv48jjgc0jq4731094ddhraqq8bxnwmjk6sg5ask0jss9kxq"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ alembic aiosmtpd click dnspython falcon flufl_bounce flufl_i18n flufl_lock importlib-resources lazr_config passlib requests zope_configuration zope_component authheaders gunicorn diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 5ed5b74d309af..e981beca4751d 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ isort ]; - propagatedBuildInputs = [ + requiredPythonModules = [ robot-detection django_extensions rjsmin cssmin django-mailman3 django-haystack flufl_lock networkx dateutil defusedxml django-paintstore djangorestframework django django-q diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index ae797fa6cbc70..d36d0206d2a69 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "08jn23gblbkfl09qlykbpsmp39mmach3sl69h1j5cd5kkx839rwa"; }; - propagatedBuildInputs = [ django-mailman3 readme_renderer ]; + requiredPythonModules = [ django-mailman3 readme_renderer ]; checkInputs = [ beautifulsoup4 vcrpy mock ]; # Tries to connect to database. diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index 53fdf851cfe88..ffa302f749295 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ git makeWrapper ]; - propagatedBuildInputs = [ hyperkitty postorius whoosh ]; + requiredPythonModules = [ hyperkitty postorius whoosh ]; # Tries to check runtime configuration. doCheck = false; diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix index cbc63ff535a11..02cad5767855f 100644 --- a/pkgs/servers/mail/pypolicyd-spf/default.nix +++ b/pkgs/servers/mail/pypolicyd-spf/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z"; }; - propagatedBuildInputs = [ pyspf ]; + requiredPythonModules = [ pyspf ]; preBuild = '' substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index fbdce3a2220ed..482d5d232dd92 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { ./homeserver-script.patch ]; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools bcrypt bleach diff --git a/pkgs/servers/matrix-synapse/plugins/ldap3.nix b/pkgs/servers/matrix-synapse/plugins/ldap3.nix index 9f1aec20033b3..9ca5fe7b859f8 100644 --- a/pkgs/servers/matrix-synapse/plugins/ldap3.nix +++ b/pkgs/servers/matrix-synapse/plugins/ldap3.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "01bms89sl16nyh9f141idsz4mnhxvjrc3gj721wxh1fhikps0djx"; }; - propagatedBuildInputs = [ service-identity ldap3 twisted ]; + requiredPythonModules = [ service-identity ldap3 twisted ]; # ldaptor is not ready for py3 yet doCheck = !isPy3k; diff --git a/pkgs/servers/matrix-synapse/plugins/pam.nix b/pkgs/servers/matrix-synapse/plugins/pam.nix index 47ee28a7794cc..ce3495a151472 100644 --- a/pkgs/servers/matrix-synapse/plugins/pam.nix +++ b/pkgs/servers/matrix-synapse/plugins/pam.nix @@ -11,5 +11,5 @@ buildPythonPackage rec { sha256 = "10byma9hxz3g4sirw5sa4pvljn83h9vs7zc15chhpl2n14bdx45l"; }; - propagatedBuildInputs = [ twisted python-pam ]; + requiredPythonModules = [ twisted python-pam ]; } diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index c39d4fc0d861d..e1549c8f74791 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -25,7 +25,7 @@ in buildPythonPackage rec { sed -i -e '/alembic>/d' requirements.txt ''; - propagatedBuildInputs = [ + requiredPythonModules = [ Mako aiohttp mautrix @@ -48,7 +48,7 @@ in buildPythonPackage rec { # Hence we need to patch away `alembic` from `mautrix-telegram` and create an `alembic` # which has `mautrix-telegram` in its environment. passthru.alembic = alembic.overrideAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ dbDrivers ++ [ + requiredPythonModules = old.requiredPythonModules ++ dbDrivers ++ [ mautrix-telegram ]; }); diff --git a/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix b/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix index 62f6bc96a523f..2c3874746adec 100644 --- a/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix +++ b/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1xjhkhdpmqa7ngcpcfhrkmj4cid2wla3fzgr04wvw672ysffv2vz"; }; - propagatedBuildInputs = with python3Packages; [ nagiosplugin ]; + requiredPythonModules = with python3Packages; [ nagiosplugin ]; meta = with lib; { description = "Simple and easy nagios check for systemd status"; diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 897d6395f95a7..1c7e9617fa94b 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -27,7 +27,7 @@ in python2Packages.buildPythonApplication rec { runHook postInstall ''; - propagatedBuildInputs = with python2Packages; [ pywbem ]; + requiredPythonModules = with python2Packages; [ pywbem ]; meta = with stdenv.lib; { homepage = "https://www.claudiokuenzler.com/nagios-plugins/"; diff --git a/pkgs/servers/monitoring/prometheus/cups-exporter.nix b/pkgs/servers/monitoring/prometheus/cups-exporter.nix index a02dab88a3a65..d1b4b4eb4a5d1 100644 --- a/pkgs/servers/monitoring/prometheus/cups-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/cups-exporter.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1cwk2gbw2svqjlzgwv5wqzhq7fxwrwsrr0kkbnqn4mfb0kq6pa8m"; }; - propagatedBuildInputs = with python3Packages; [ prometheus_client pycups ]; + requiredPythonModules = with python3Packages; [ prometheus_client pycups ]; installPhase = '' mkdir -p $out/share/ diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix index bc8022f9feb14..f5b269ef9fbdd 100644 --- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1gzf42z0cgdqijbi9cwpjkqzkvnabaxkkfa5ac5h27r3pxx3q4n0"; }; - propagatedBuildInputs = with python3Packages; [ prometheus_client stem retrying ]; + requiredPythonModules = with python3Packages; [ prometheus_client stem retrying ]; installPhase = '' mkdir -p $out/share/ diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index 93e6f1767ada4..b80cc63620706 100644 --- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "17aq6v4ahnga82r350kx1y8i7zgikpzmwzaacj7a339kh8hxkh63"; }; - propagatedBuildInputs = with pythonPackages; [ slixmpp prometheus_client pyyaml ]; + requiredPythonModules = with pythonPackages; [ slixmpp prometheus_client pyyaml ]; meta = { description = "XMPP Web hook for Prometheus"; diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix index 9faa7ec56bf22..20d63fd33cd9a 100644 --- a/pkgs/servers/mtprotoproxy/default.nix +++ b/pkgs/servers/mtprotoproxy/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapPython ]; - pythonPath = [ pyaes pycrypto uvloop ]; + requiredPythonModules = [ pyaes pycrypto uvloop ]; installPhase = '' install -Dm755 mtprotoproxy.py $out/bin/mtprotoproxy diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index 3b360e308b571..083a5c2c7e53a 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; - pythonPath = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ]; + requiredPythonModules = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ]; configureFlags = [ "--disable-debug" "--enable-tools" "--enable-ese" "--with-systemdsystemunitdir=$out/lib/systemd/system" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # INFO: the config option "--enable-test" would copy the apps to $out/lib/neard/test/ instead install -d $out/lib/neard install -m 0755 test/* $out/lib/neard/ - wrapPythonProgramsIn $out/lib/neard "$out $pythonPath" + wrapPythonProgramsIn $out/lib/neard "$out $requiredPythonModules" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix index dd7e8e4879c5a..b3c0c93d8e638 100644 --- a/pkgs/servers/nextcloud/news-updater.nix +++ b/pkgs/servers/nextcloud/news-updater.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = [ php ]; + requiredPythonModules = [ php ]; meta = { description = "Fast parallel feed updater for the Nextcloud news app"; diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 16fa6a7196ab0..c0b4fbc6aa2ce 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -28,7 +28,7 @@ in with python.pkgs; buildPythonApplication rec { poetry ]; - propagatedBuildInputs = [ + requiredPythonModules = [ click docutils tornado diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index 90f7d6b49f563..7a3961321f493 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "07gc5iwbyprb8nihnjjl2zd06z8p4nl3a3drzh9a8ny35ig1khq0"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pkgs.git appdirs click diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix index 96c94c2bc6b2b..f1e262253e6ab 100644 --- a/pkgs/servers/radicale/1.x.nix +++ b/pkgs/servers/radicale/1.x.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0ay90nj6fmr2aq8imi0mbjl4m2rzq7a83ikj8qs9gxsylj71j1y0"; }; - propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [ + requiredPythonModules = stdenv.lib.optionals (!pythonPackages.isPy3k) [ pythonPackages.flup pythonPackages.ldap pythonPackages.sqlalchemy diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix index 8d36717ec69b1..41d9a96971376 100644 --- a/pkgs/servers/radicale/2.x.nix +++ b/pkgs/servers/radicale/2.x.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { sed -i "/^addopts/d" setup.cfg ''; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ vobject python-dateutil passlib diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 4b49b1e40c822..9be7fe27f4b04 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0w8qkjm7b62cr49dbis41kvv3179sfmvvzlhlc0rbqss6vmwbq4p"; }; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ defusedxml passlib vobject diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index 1634b0b5b74b5..181a3232b10fb 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { done ''; - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ boto click consul diff --git a/pkgs/servers/syncserver/default.nix b/pkgs/servers/syncserver/default.nix index 24c093fde5050..ffca80593ecac 100644 --- a/pkgs/servers/syncserver/default.nix +++ b/pkgs/servers/syncserver/default.nix @@ -32,7 +32,7 @@ in python.pkgs.buildPythonPackage rec { # There are no tests doCheck = false; - propagatedBuildInputs = with python.pkgs; [ + requiredPythonModules = with python.pkgs; [ cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver serversyncstorage configparser ]; diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 1fbf94beb18b7..10a40afc84173 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "2.2.4"; pname = "Tautulli"; - pythonPath = [ python.pkgs.setuptools ]; + requiredPythonModules = [ python.pkgs.setuptools ]; buildInputs = [ python.pkgs.setuptools ]; nativeBuildInputs = [ python.pkgs.wrapPython ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # Creat backwards compatibility symlink to bin/plexpy ln -s $out/bin/tautulli $out/bin/plexpy - wrapPythonProgramsIn "$out" "$out $pythonPath" + wrapPythonProgramsIn "$out" "$out $requiredPythonModules" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index dc87acddd881c..ef22213eeb1b6 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { sed -i 's/==.*$//' requirements.txt ''; - propagatedBuildInputs = [ + requiredPythonModules = [ pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz dateutil pygments pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index 6bd3ebc4232c2..471703b9aff7a 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1x0bylmdizirvlcn6ryd43lffpmlq0cklj3jz956scmxgq4p6wby"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ aiohttp dulwich defusedxml diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 7db8ec3b60499..8777916ceb805 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.wrapPython ]; - pythonPath = [ + requiredPythonModules = [ xmpppy pythonIRClib ]; diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index 0c85f322f4873..7632edc15b173 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e"; }; - pythonPath = [ xmpppy ]; + requiredPythonModules = [ xmpppy ]; buildInputs = [ pythonPackages.wrapPython ]; installPhase = '' diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 711d7060fa55d..67033f4bfa769 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { checkInputs = [ python3Packages.pytest python3Packages.pytest-rerunfailures glibcLocales git ]; - propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit pygments ]; + requiredPythonModules = with python3Packages; [ ply prompt_toolkit pygments ]; meta = with stdenv.lib; { description = "A Python-ish, BASHwards-compatible shell"; diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 94e3ac36d078b..b31c4507d275f 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -29,7 +29,7 @@ in buildPythonApplication rec { buildInputs = [ docutils gsettings-desktop-schemas gtk3 ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; - propagatedBuildInputs = [ xrandr pygobject3 ]; + requiredPythonModules = [ xrandr pygobject3 ]; meta = { homepage = "http://christian.amsuess.com/tools/arandr/"; diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix index 4f709ee9db08f..c90d43d981732 100644 --- a/pkgs/tools/X11/caffeine-ng/default.nix +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { gdk-pixbuf gobject-introspection libnotify gtk3 python3Packages.setuptools_scm ]; - pythonPath = with python3Packages; [ + requiredPythonModules = with python3Packages; [ dbus-python docopt ewmh pygobject3 pyxdg setproctitle ]; diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 84d1f379e8aa5..5c7e826f13c07 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { libxslt ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pygobject3 pillow pywal diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 7f46e017c3672..414454a469e37 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -71,7 +71,7 @@ in buildPythonApplication rec { pam gobject-introspection ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pillow rencode pycrypto cryptography pycups lz4 dbus-python netifaces numpy pygobject3 pycairo gst-python pam pyopengl paramiko opencv4 python-uinput pyxdg diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix index a9a49beda2f33..a15c3f7315c97 100644 --- a/pkgs/tools/admin/aws-google-auth/default.nix +++ b/pkgs/tools/admin/aws-google-auth/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { sha256 = "099r020v33sij2b3816cjp4fpy35c886l559szfxqx6kgy19y9z7"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ beautifulsoup4 boto3 configparser diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 79d6f42628f3b..2dbd707d697f8 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -33,7 +33,7 @@ in with py.pkgs; buildPythonApplication rec { # No tests included doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ botocore bcdoc s3transfer diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index e89df04e3bd1e..81d3d572011ca 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -48,7 +48,7 @@ with py.pkgs; buildPythonApplication rec { # No tests included doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ bcdoc botocore colorama diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index 4a33d74207655..1db5e99119f82 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ boto3 termcolor dateutil docutils setuptools ]; diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index ce3b3f657b8f0..ce59d40af9fc9 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -53,7 +53,7 @@ let sourceRoot = "source/src/azure-cli-core"; - propagatedBuildInputs = with self; [ + requiredPythonModules = with self; [ adal argcomplete azure-common @@ -107,7 +107,7 @@ let sourceRoot = "source/src/azure-cli-telemetry"; - propagatedBuildInputs = with super; [ + requiredPythonModules = with super; [ applicationinsights portalocker ]; @@ -352,7 +352,7 @@ let sha256 = "0jfxm8lx8dzs3v2b04ljizk8gfckbm5l2v86rm7k0npbfvryba1p"; }; - propagatedBuildInputs = with self; [ + requiredPythonModules = with self; [ azure-common azure-nspkg msrest msrestazure cryptography ]; pythonNamespaces = [ "azure" ]; diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix index 60a7e0586f5fc..907884f99a3b6 100644 --- a/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { # The test hangs so we disable it. doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ click certifi requests-aws4auth diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 118457d408022..ef268e9743a0e 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -19,7 +19,7 @@ python.pkgs.buildPythonApplication rec { sed -ie '/argparse/d' setup.py ''; - propagatedBuildInputs = with python.pkgs; [ + requiredPythonModules = with python.pkgs; [ cached-property ConfigArgParse pyparsing diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 4e87a68866cef..f03d6e0476cba 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -45,7 +45,7 @@ buildPythonApplication rec { poetry ]; - propagatedBuildInputs = [ + requiredPythonModules = [ beautifulsoup4 boto3 cryptography diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 4745d065be935..507080158d032 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { sha256 = "1lq2x95553vdmhw13cxcgsd2g2i32izhsb7hxd4m1iwf9b3msbpv"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ paramiko pymysql configobj sqlparse prompt_toolkit pygments click pycrypto cli-helpers ]; diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/tools/admin/s3bro/default.nix index 154b4aae96656..c9c623f97314b 100644 --- a/pkgs/tools/admin/s3bro/default.nix +++ b/pkgs/tools/admin/s3bro/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonPackage rec { sha256 = "0k25g3vch0q772f29jlghda5mjvps55h5lgwhwwbd5g2nlnrrspq"; }; - propagatedBuildInputs = with python3Packages; [ boto3 botocore click termcolor ]; + requiredPythonModules = with python3Packages; [ boto3 botocore click termcolor ]; # No tests doCheck = false; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index b66911c9325b0..7d9ba05892d7a 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0pp7qcfwsvg4419hzfka1180pw3saa9mrhl0z9951zn9fw2nllsc"; }; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ distro jinja2 markupsafe diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix index 471a8788a95ed..8adf8822cb1da 100644 --- a/pkgs/tools/admin/sewer/default.nix +++ b/pkgs/tools/admin/sewer/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0s8f0w6nv8dcs5yw7rn49981b3c9mnnx4f6wzqw4zha0rpp60z22"; }; - propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ]; + requiredPythonModules = with python3Packages; [ pyopenssl requests tldextract ]; meta = with stdenv.lib; { homepage = "https://github.com/komuw/sewer"; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 6ff547ab5322e..d3b1aeb24e3ef 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { $out/bin/simp_le --test ''; - propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ]; + requiredPythonModules = with python3Packages; [ acme setuptools_scm josepy idna ]; meta = with stdenv.lib; { homepage = "https://github.com/zenhack/simp_le"; diff --git a/pkgs/tools/admin/ssh-import-id/default.nix b/pkgs/tools/admin/ssh-import-id/default.nix index 77d30e56d5fc3..63b9fd3a7a400 100644 --- a/pkgs/tools/admin/ssh-import-id/default.nix +++ b/pkgs/tools/admin/ssh-import-id/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0l9gya1hyf2qfidlmvg2cgfils1fp9rn5r8sihwvx4qfsfp5yaak"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ requests ] ++ extraHandlers; diff --git a/pkgs/tools/admin/swiftclient/default.nix b/pkgs/tools/admin/swiftclient/default.nix index 82480d38d17a2..24c8edf2e2bde 100644 --- a/pkgs/tools/admin/swiftclient/default.nix +++ b/pkgs/tools/admin/swiftclient/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { sha256 = "0176b17aa14cc2ef82a327dc70b66af670bdb39dcf836896f81269db376932ea"; }; - propagatedBuildInputs = [ requests six pbr setuptools ]; + requiredPythonModules = [ requests six pbr setuptools ]; # For the tests the following requirements are needed: # https://github.com/openstack/python-swiftclient/blob/master/test-requirements.txt diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix index 3c5fb64f7224e..4d25620e3660f 100644 --- a/pkgs/tools/admin/virtscreen/default.nix +++ b/pkgs/tools/admin/virtscreen/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ netifaces pyqt5 quamash diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/tools/admin/vncdo/default.nix index 5ca633a944b24..6d3f0d4a35f5d 100644 --- a/pkgs/tools/admin/vncdo/default.nix +++ b/pkgs/tools/admin/vncdo/default.nix @@ -12,7 +12,7 @@ python2Packages.buildPythonPackage { sha256 = "0k03b09ipsz8vp362x7sx7z68mxgqw9qzvkii2f8j9vx2y79rjsh"; }; - propagatedBuildInputs = with python2Packages; [ + requiredPythonModules = with python2Packages; [ pillow twisted pexpect diff --git a/pkgs/tools/audio/beets/check-plugin.nix b/pkgs/tools/audio/beets/check-plugin.nix index 241dcdad45213..61eb781bc801c 100644 --- a/pkgs/tools/audio/beets/check-plugin.nix +++ b/pkgs/tools/audio/beets/check-plugin.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ beets ]; checkInputs = [ pythonPackages.nose flac liboggz mp3val ]; - propagatedBuildInputs = [ flac liboggz mp3val ]; + requiredPythonModules = [ flac liboggz mp3val ]; # patch out broken tests patches = [ ./beet-check-tests.patch ]; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 56551891a4a5f..8838f8fc29c0e 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -126,7 +126,7 @@ in pythonPackages.buildPythonApplication rec { sha256 = "1qxdqbzvz97zgykzdwn78g2xyxmg0q2jdb12dnjnrwvhmjv67vi8"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pythonPackages.six pythonPackages.enum34 pythonPackages.jellyfish diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix index 8720065470313..e488074ab817b 100644 --- a/pkgs/tools/audio/dir2opus/default.nix +++ b/pkgs/tools/audio/dir2opus/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "dir2opus"; inherit version; - pythonPath = [ mutagen ]; + requiredPythonModules = [ mutagen ]; buildInputs = [ wrapPython ]; propagatedBuildInputs = [ opusTools mpg123 ]; diff --git a/pkgs/tools/audio/google-music-scripts/default.nix b/pkgs/tools/audio/google-music-scripts/default.nix index 272cf9025392b..c139baec44c86 100644 --- a/pkgs/tools/audio/google-music-scripts/default.nix +++ b/pkgs/tools/audio/google-music-scripts/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ appdirs audio-metadata google-music diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix index addb95b9f1bdd..75b88ee1f19ca 100644 --- a/pkgs/tools/audio/mididings/default.nix +++ b/pkgs/tools/audio/mididings/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib alsaLib libjack2 pythonPackages.boost ]; - propagatedBuildInputs = with pythonPackages; [ decorator ] + requiredPythonModules = with pythonPackages; [ decorator ] # for livedings ++ [ tkinter pyliblo ] # for mididings.extra diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 029dcd127f130..1ca740931d9cf 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { libnotify ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ dbus-python mpd2 mutagen diff --git a/pkgs/tools/audio/mpdsync/default.nix b/pkgs/tools/audio/mpdsync/default.nix index 51f5ba6561689..02a316ba7e75e 100644 --- a/pkgs/tools/audio/mpdsync/default.nix +++ b/pkgs/tools/audio/mpdsync/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1mfg3ipqj5dvyyqbgp6ia6sc1ja5gmm2c9mfrwx0jw2dl182if6q"; }; - pythonPath = [ mpd2 ]; + requiredPythonModules = [ mpd2 ]; nativeBuildInputs = [ wrapPython diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index cf9297119e9f5..25e352f8ae15e 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -19,7 +19,7 @@ in pythonPackages.buildPythonApplication rec { sha256 = "174ijn8bc306529scd23szvgx1apanm2qmwk4lwmi64rhkm6dapx"; }; - propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ]; + requiredPythonModules = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ]; installPhase = '' install -Dm755 v2m.py $out/bin/v2m.py diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix index 2a55015be1052..228e0995c144f 100644 --- a/pkgs/tools/audio/volctl/default.nix +++ b/pkgs/tools/audio/volctl/default.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { libpulseaudio ]; - pythonPath = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ pygobject3 ]; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 7bfb9e5739223..ae6e6372f9551 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ libb2 lz4 zstd openssl python3.pkgs.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ cython llfuse ]; diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix index 4c8d1a28c27c4..7abee883507e0 100644 --- a/pkgs/tools/backup/ddar/default.nix +++ b/pkgs/tools/backup/ddar/default.nix @@ -24,7 +24,7 @@ python2.pkgs.buildPythonApplication rec { ''; nativeBuildInputs = with python2.pkgs; [ protobuf.protobuf ]; - propagatedBuildInputs = with python2.pkgs; [ protobuf ]; + requiredPythonModules = with python2.pkgs; [ protobuf ]; checkInputs = [ roundup ncurses ]; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index c12cc1198c9cf..3c6a8c1b0a217 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -46,7 +46,7 @@ pythonPackages.buildPythonApplication rec { librsync ]; - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ b2sdk boto cffi @@ -87,7 +87,7 @@ pythonPackages.buildPythonApplication rec { ''; preCheck = '' - wrapPythonProgramsIn "$PWD/testing/overrides/bin" "$pythonPath" + wrapPythonProgramsIn "$PWD/testing/overrides/bin" "$requiredPythonModules" # Add 'duplicity' to PATH for tests. # Normally, 'setup.py test' adds 'build/scripts-2.7/' to PATH before running diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index e69823ab45d60..7d6be853e3b57 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -19,7 +19,7 @@ in with python.pkgs; buildPythonApplication rec { sha256 = "1v1hnhv5knzdl0kj3574ccwlh171vcb7faddp095ycdmiiybalk4"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ click ludios_wpull manhole lmdb autobahn fb-re2 websockets cchardet ]; diff --git a/pkgs/tools/backup/iceshelf/default.nix b/pkgs/tools/backup/iceshelf/default.nix index 546339ca002a4..f66c97de0d000 100644 --- a/pkgs/tools/backup/iceshelf/default.nix +++ b/pkgs/tools/backup/iceshelf/default.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ git awscli python3.pkgs.python-gnupg diff --git a/pkgs/tools/backup/pyznap/default.nix b/pkgs/tools/backup/pyznap/default.nix index 81f3a99ecd917..622eda81a136d 100644 --- a/pkgs/tools/backup/pyznap/default.nix +++ b/pkgs/tools/backup/pyznap/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "88bf1d6de2c11f14acbdfa01b61eb95c94f95d829ddebdaee3786b64ccb93ae3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ setuptools ]; diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/tools/backup/rotate-backups/default.nix index c0a06e1b9ae58..493d6074ff038 100644 --- a/pkgs/tools/backup/rotate-backups/default.nix +++ b/pkgs/tools/backup/rotate-backups/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0i59qfv1cfm0ss63ab2nrkn5wr4rxpqqmvfd7pf9c3pl9dbfq20c"; }; - propagatedBuildInputs = [ update-dotdee simpleeval dateutil ]; + requiredPythonModules = [ update-dotdee simpleeval dateutil ]; meta = with lib; { description = "Simple command line interface for backup rotation"; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 346f8d2796461..7cfc63db1c6ec 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; checkInputs = [ which ] ++ (with python3Packages; [ cython pytest ]); - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ sqlite apsw pycrypto requests defusedxml dugong llfuse cython pytest pytest-catchlog google_auth google-auth-oauthlib ]; diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix index b02ce82291aac..d102edf1dff99 100644 --- a/pkgs/tools/backup/tarsnapper/default.nix +++ b/pkgs/tools/backup/tarsnapper/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { py.test . ''; - propagatedBuildInputs = with python3Packages; [ pyyaml dateutil pexpect ]; + requiredPythonModules = with python3Packages; [ pyyaml dateutil pexpect ]; patches = [ ./remove-argparse.patch ]; diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index a6d5b6b48010c..eb56c8d0bf404 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { # needs tox doCheck = false; - propagatedBuildInputs = (with python3Packages; [ + requiredPythonModules = (with python3Packages; [ boto gevent google_cloud_storage diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index 782133fd8d7bb..3b37ef83ca336 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { pytestrunner ]; - propagatedBuildInputs = [ + requiredPythonModules = [ click stringcase ]; diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 16563c3809989..6a28ed0961fb5 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { utillinux ]; - pythonPath = with python3Packages; [ + requiredPythonModules = with python3Packages; [ dbus-python pygobject3 setproctitle @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - wrapPythonProgramsIn $out/lib "$out $pythonPath" + wrapPythonProgramsIn $out/lib "$out $requiredPythonModules" ''; meta = with lib; { diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index ac50f3667c4e1..39f3845ef80a5 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { buildInputs = [ bluez gtk3 pythonPackages.python librsvg gnome3.adwaita-icon-theme iproute libappindicator networkmanager ] - ++ pythonPath + ++ requiredPythonModules ++ lib.optional withPulseAudio libpulseaudio; patches = [ @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py ''; - pythonPath = with pythonPackages; [ pygobject3 pycairo ]; + requiredPythonModules = with pythonPackages; [ pygobject3 pycairo ]; propagatedUserEnvPkgs = [ obex_data_server ]; @@ -56,8 +56,8 @@ in stdenv.mkDerivation rec { postFixup = '' makeWrapperArgs="--prefix PATH ':' ${binPath}" # This mimics ../../../development/interpreters/python/wrap.sh - wrapPythonProgramsIn "$out/bin" "$out $pythonPath" - wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" + wrapPythonProgramsIn "$out/bin" "$out $requiredPythonModules" + wrapPythonProgramsIn "$out/libexec" "$out $requiredPythonModules" ''; meta = with lib; { diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/tools/cd-dvd/isolyzer/default.nix index 1fd704d90f195..b04434e246088 100644 --- a/pkgs/tools/cd-dvd/isolyzer/default.nix +++ b/pkgs/tools/cd-dvd/isolyzer/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1fysm05cz0z54apn1p889xhbgjnfwax6fngi05yij5qp2zxqghf9"; }; - propagatedBuildInputs = with python3.pkgs; [ setuptools six ]; + requiredPythonModules = with python3.pkgs; [ setuptools six ]; meta = with stdenv.lib; { homepage = "https://github.com/KBNLresearch/isolyzer"; diff --git a/pkgs/tools/filesystems/buttersink/default.nix b/pkgs/tools/filesystems/buttersink/default.nix index aa0f317787f82..aa086ebf0c65b 100644 --- a/pkgs/tools/filesystems/buttersink/default.nix +++ b/pkgs/tools/filesystems/buttersink/default.nix @@ -9,7 +9,7 @@ python2.pkgs.buildPythonApplication rec { sha256 = "a797b6e92ad2acdf41e033c1368ab365aa268f4d8458b396a5770fa6c2bc3f54"; }; - propagatedBuildInputs = with python2.pkgs; [ boto crcmod psutil ]; + requiredPythonModules = with python2.pkgs; [ boto crcmod psutil ]; # No tests implemented doCheck = false; diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index 25de04467ef97..8f0a06846c5d2 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { sha256 = "0myhvflph4fayl2bg8m9a7prh5pcnvnb75p0jb4jpmbx7jyn7ihp"; }; - propagatedBuildInputs = [ docopt anytree ]; + requiredPythonModules = [ docopt anytree ]; postPatch = '' patchShebangs . ''; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index b221025f85b80..2ad0277b84ada 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -90,7 +90,7 @@ let sourceRoot = "ceph-${version}/src/python-common"; checkInputs = [ python3Packages.pytest ]; - propagatedBuildInputs = with python3Packages; [ pyyaml six ]; + requiredPythonModules = with python3Packages; [ pyyaml six ]; meta = getMeta "Ceph common module for code shared by manager modules"; }; @@ -155,7 +155,7 @@ in rec { optFcgi optExpat optCurl optFuse optLibedit ]; - pythonPath = [ ceph-python-env "${placeholder "out"}/${ceph-python-env.sitePackages}" ]; + requiredPythonModules = [ ceph-python-env "${placeholder "out"}/${ceph-python-env.sitePackages}" ]; preConfigure ='' substituteInPlace src/common/module.c --replace "/sbin/modinfo" "modinfo" diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 0f66955360f7a..0b98b52232bcc 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { ''; checkInputs = with python3Packages; [ pytest pytestcov mock ]; - propagatedBuildInputs = with python3Packages; [ atomiclong fusepy pygit2 six ]; + requiredPythonModules = with python3Packages; [ atomiclong fusepy pygit2 six ]; checkPhase = "py.test"; doCheck = false; diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 6ba29cb98d404..cb30968a58e10 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { }' blivet/pyudev.py ''; - propagatedBuildInputs = [ + requiredPythonModules = [ pykickstart pyparted pyblock libselinux cryptsetup ] ++ stdenv.lib.optional useNixUdev systemd; diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 1f672701d382c..27ece57d26a67 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -63,7 +63,7 @@ in buildPythonApplication rec { sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp"; }; - propagatedBuildInputs = [ blivet ]; + requiredPythonModules = [ blivet ]; doCheck = false; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 0698dcd9ecb73..ea2e8b6b2123a 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { key=lambda m: m.__name__)/" tests/baseclass.py ''; - propagatedBuildInputs = [ urlgrabber ]; + requiredPythonModules = [ urlgrabber ]; checkPhase = '' ${python}/bin/${python.executable} tests/baseclass.py -vv diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index f71e7c3a06db3..7b741fbd8401f 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ parted ]; + requiredPythonModules = [ parted ]; checkPhase = '' patchShebangs Makefile diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 809c5256873ea..d0bb1d2a2fb65 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp"; }; - propagatedBuildInputs = [ blivet ]; + requiredPythonModules = [ blivet ]; meta = { description = "NixOS storage manager/partitioner"; diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index 4feca6a040b40..2b3c7797707a5 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1hiivlgni4r3nd5n2rzl5qzw6y2wpjpmyls5lybrc8imd6rmj3w2"; }; - propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo ]; + requiredPythonModules = with python3.pkgs; [ crcmod python-lzo ]; phases = [ "unpackPhase" "patchPhase" "installPhase" "installCheckPhase" ]; diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index 4a887688c4f54..0eb73479d235d 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -13,7 +13,7 @@ buildPythonApplication { sha256 = "0x7za74lkwn3v6j9j04ifgdwdlx9akh1izkw7vkkzj9ag9qjrzb0"; }; - propagatedBuildInputs = [ pygtk numpy ]; + requiredPythonModules = [ pygtk numpy ]; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix index 690c7336b6955..a5c40d1c5a453 100644 --- a/pkgs/tools/graphics/facedetect/default.nix +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ python2Packages.python python2Packages.wrapPython ]; - pythonPath = [ python2Packages.numpy python2Packages.opencv4 ]; + requiredPythonModules = [ python2Packages.numpy python2Packages.opencv4 ]; phases = [ "unpackPhase" "patchPhase" "installPhase" ]; diff --git a/pkgs/tools/graphics/pdfredacttools/default.nix b/pkgs/tools/graphics/pdfredacttools/default.nix index 28b13c782b915..1680699d1969d 100644 --- a/pkgs/tools/graphics/pdfredacttools/default.nix +++ b/pkgs/tools/graphics/pdfredacttools/default.nix @@ -17,7 +17,7 @@ python2Packages.buildPythonApplication rec { --replace \'file\' \'${file}/bin/file\' ''; - propagatedBuildInputs = [ imagemagick exiftool ghostscript ]; + requiredPythonModules = [ imagemagick exiftool ghostscript ]; meta = with stdenv.lib; { description = "Redact and strip metadata from documents before publishing"; diff --git a/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/pkgs/tools/inputmethods/evdevremapkeys/default.nix index 0dc6f67392575..178b716de0cf4 100644 --- a/pkgs/tools/inputmethods/evdevremapkeys/default.nix +++ b/pkgs/tools/inputmethods/evdevremapkeys/default.nix @@ -14,7 +14,7 @@ in pythonPackages.buildPythonPackage rec { sha256 = "0c9slflakm5jqd8s1zpxm7gmrrk0335m040d7m70hnsak42jvs2f"; }; - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ pyyaml pyxdg python-daemon diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix index 31ef3e2487bec..76006cdc33f9e 100644 --- a/pkgs/tools/misc/adafruit-ampy/default.nix +++ b/pkgs/tools/misc/adafruit-ampy/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ click python-dotenv pyserial ]; + requiredPythonModules = [ click python-dotenv pyserial ]; # No tests doCheck = false; diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index 2105ad0ae0178..9de176d91884f 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { sha256 = "0w5lh4aavab9ynfy2mq09ga6j4vss4k0vlc3g6f5a9i4175g9pmr"; }; - propagatedBuildInputs = [ dateutil argh psycopg2 boto3 argcomplete ]; + requiredPythonModules = [ dateutil argh psycopg2 boto3 argcomplete ]; # Tests are not present in tarball checkPhase = '' diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 460f20a5f5f92..9c9b02166199a 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -23,7 +23,7 @@ in with python.pkgs; buildPythonPackage rec { pname = "bepasty"; version = "0.5.0"; - propagatedBuildInputs = [ + requiredPythonModules = [ flask pygments setuptools diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 85d54c1673604..fcbe7f54d1570 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -36,7 +36,7 @@ buildPythonApplication rec { substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" ''; - propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ]; + requiredPythonModules = [ arrow click keyring parsedatetime requests six termcolor ]; meta = with stdenv.lib; { homepage = "https://pypi.python.org/pypi/bonfire"; diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix index 96b13c060e4ba..457196cbacb6d 100644 --- a/pkgs/tools/misc/broadlink-cli/default.nix +++ b/pkgs/tools/misc/broadlink-cli/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication { format = "other"; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ broadlink ]; diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix index c7a5642050ac7..1075863e4780f 100644 --- a/pkgs/tools/misc/brotab/default.nix +++ b/pkgs/tools/misc/brotab/default.nix @@ -11,7 +11,7 @@ python.pkgs.buildPythonApplication rec { sha256 = "1ja9qaf3rxm0chgzs5mpw973h7ibb454k9mbfbb2gl12gr9zllyw"; }; - propagatedBuildInputs = with python.pkgs; [ + requiredPythonModules = with python.pkgs; [ requests flask psutil diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/tools/misc/codebraid/default.nix index eea5260a989c8..9c2205d1452d3 100644 --- a/pkgs/tools/misc/codebraid/default.nix +++ b/pkgs/tools/misc/codebraid/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1f31yaiwc33ivjbipym7sggsqwqxn70kgf9dixi8392pk70jzq6p"; }; - propagatedBuildInputs = with python3Packages; [ bespon ]; + requiredPythonModules = with python3Packages; [ bespon ]; # unfortunately upstream doesn't contain tests checkPhase = '' $out/bin/codebraid --help > /dev/null diff --git a/pkgs/tools/misc/colorz/default.nix b/pkgs/tools/misc/colorz/default.nix index aadd050dae2bb..96cd5f6bebd22 100644 --- a/pkgs/tools/misc/colorz/default.nix +++ b/pkgs/tools/misc/colorz/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0ghd90lgplf051fs5n5bb42zffd3fqpgzkbv6bhjw7r8jqwgcky0"; }; - propagatedBuildInputs = with python3Packages; [ pillow scipy ]; + requiredPythonModules = with python3Packages; [ pillow scipy ]; checkPhase = '' $out/bin/colorz --help > /dev/null diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index 1a49446e9c01e..277416542971c 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ help2man installShellFiles ]; - propagatedBuildInputs = with python3Packages; [ iniparse ]; + requiredPythonModules = with python3Packages; [ iniparse ]; postPatch = '' substituteInPlace crudini-help \ diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 011c5432089d2..e7d5df0f649e7 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -13,6 +13,46 @@ let makeWrapper "${jdk}/bin/java" "$out/bin/apksigner" \ --add-flags "-jar ${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3/lib/apksigner.jar" ''; + + runtimeDeps = [ + binutils-unwrapped + bzip2 + colordiff + coreutils + cpio + db + diffutils + dtc + e2fsprogs + file + findutils + fontforge-fonttools + gettext + gnutar + gzip + libarchive + libcaca + lz4 + openssl + pgpdump + sng + sqlite + squashfsTools + unzip + xxd + xz + zip + zstd + acl + cdrkit + ] ++ lib.optionals stdenv.isLinux [ + acl + cdrkit + ] ++ lib.optionals enableBloat [ + abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric + hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt + ]; + in python3Packages.buildPythonApplication rec { pname = "diffoscope"; @@ -38,29 +78,46 @@ python3Packages.buildPythonApplication rec { substituteInPlace doc/Makefile --replace "../bin" "$out/bin" ''; - nativeBuildInputs = [ docutils help2man ]; + nativeBuildInputs = [ + docutils + help2man + ]; # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # # Still missing these tools: docx2txt dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon - pythonPath = [ - binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils - dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip - libarchive libcaca lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd - xz zip zstd - ] - ++ (with python3Packages; [ - argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c - python_magic progressbar33 pypdf2 rpm tlsh - ]) - ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ] - ++ lib.optionals enableBloat ([ - abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric - hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt - ] ++ (with python3Packages; [ binwalk guestfs h5py ])); + # + # TODO: remove non-Python run-time dependencies. Note having them here does not hurt. + requiredPythonModules = with python3Packages; [ + argcomplete + debian + defusedxml + jsondiff + jsbeautifier + libarchive-c + python_magic + progressbar33 + pypdf2 + rpm + tlsh + ] ++ lib.optionals stdenv.isLinux [ + pyxattr + ] ++ lib.optionals enableBloat [ + binwalk + guestfs + h5py + ]; + + checkInputs = with python3Packages; [ + pytest + ]; - checkInputs = with python3Packages; [ pytest ] ++ pythonPath; + makeWrapperArgs = [ + # Extend PATH with non-Python run-time dependencies. + # TODO remove Python run-time dependencies. + "--prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps }" + ]; postInstall = '' make -C doc diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index 3c0406a4ea0ed..1e517f9ff8646 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "03qrs032x206xrl0x3z0fpvxgjivzz9rkmb11bqlk1id10707cac"; }; - propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ]; + requiredPythonModules = with python3Packages; [ click click-completion click-didyoumean ]; # disable tests (too many failures) doCheck = false; diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix index 69b689fb8244e..fe2442c71da07 100644 --- a/pkgs/tools/misc/dpt-rp1-py/default.nix +++ b/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ httpsig requests pbkdf2 diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 74eccc029ac05..77994283385fe 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -20,7 +20,7 @@ in python.pkgs.buildPythonApplication rec { ESPHOME_USE_SUBPROCESS = ""; - propagatedBuildInputs = with python.pkgs; [ + requiredPythonModules = with python.pkgs; [ voluptuous pyyaml paho-mqtt colorlog tornado protobuf tzlocal pyserial ifaddr protobuf click diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 465e30e76157f..d6dc4fa661198 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { }; checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order openssl ]; - propagatedBuildInputs = with python3.pkgs; [ pyserial pyaes ecdsa ]; + requiredPythonModules = with python3.pkgs; [ pyserial pyaes ecdsa ]; meta = with stdenv.lib; { description = "ESP8266 and ESP32 serial bootloader utility"; diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix index 52d3e043ce9cb..f98d2ba8bfa56 100644 --- a/pkgs/tools/misc/gif-for-cli/default.nix +++ b/pkgs/tools/misc/gif-for-cli/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication { checkInputs = [ python3Packages.coverage ]; buildInputs = [ zlib libjpeg ]; - propagatedBuildInputs = with python3Packages; [ ffmpeg pillow requests x256 ]; + requiredPythonModules = with python3Packages; [ ffmpeg pillow requests x256 ]; meta = with stdenv.lib; { description = "Render gifs as ASCII art in your cli"; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index ad9c41d47052b..614090dc71ba7 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ pythonPackages.pyyaml pythonPackages.i3-py ]; + requiredPythonModules = [ pythonPackages.pyyaml pythonPackages.i3-py ]; # No tests doCheck = false; diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index ac40eb762d50a..d1d665a288257 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "1iq3vrmglag9gpsir03yz7556m0bz99nwb2mf594378cqzbr6db3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ ansible boto cffi diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 55cc9717688a6..fa9a250b88f85 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ file desktop-file-utils ]; - propagatedBuildInputs = [ python3Packages.pyxdg ]; + requiredPythonModules = [ python3Packages.pyxdg ]; preConfigure = '' substituteInPlace Mimeo.py \ diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index 9b063947a4491..0c8f4b8659966 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { # Test assumes darwin doCheck = false; - propagatedBuildInputs = with pythonPackages; [ configparser pyqt5 psutil requests + requiredPythonModules = with pythonPackages; [ configparser pyqt5 psutil requests beautifulsoup4 keyring requests-kerberos kerberos lxml ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix index b934b12887031..8dc31021c53cd 100644 --- a/pkgs/tools/misc/noteshrink/default.nix +++ b/pkgs/tools/misc/noteshrink/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "0xhrvg3d8ffnbbizsrfppcd2y98znvkgxjdmvbvin458m2rwccka"; }; - propagatedBuildInputs = [ numpy scipy imagemagick pillow ]; + requiredPythonModules = [ numpy scipy imagemagick pillow ]; meta = with stdenv.lib; { description = "Convert scans of handwritten notes to beautiful, compact PDFs"; diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index 593a8cfc637d5..c7b529e123b15 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { mock ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ requests ruamel_yaml appdirs sleekxmpp dns emoji diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index 4d65a406e53a0..15434eac67a1a 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { sha256 = "1aiq9cwr40md54swzm7wkwj0h65psxmvj2japvw79s9x0pp8iwqs"; }; - propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ]; + requiredPythonModules = [ opentimestamps appdirs GitPython pysocks ]; meta = { description = "Command-line tool to create and verify OpenTimestamps proofs"; diff --git a/pkgs/tools/misc/pandoc-imagine/default.nix b/pkgs/tools/misc/pandoc-imagine/default.nix index 67e27da960fc5..e19891a3a32fc 100644 --- a/pkgs/tools/misc/pandoc-imagine/default.nix +++ b/pkgs/tools/misc/pandoc-imagine/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "1wpnckc7qyrf6ga5xhr6gv38k1anpy9nx888n7n3rh6nixzcz2dw"; }; - propagatedBuildInputs = [ pandocfilters six ]; + requiredPythonModules = [ pandocfilters six ]; # No tests in archive doCheck = false; diff --git a/pkgs/tools/misc/pandoc-plantuml-filter/default.nix b/pkgs/tools/misc/pandoc-plantuml-filter/default.nix index cdf0ab862df49..0f57336a64dda 100644 --- a/pkgs/tools/misc/pandoc-plantuml-filter/default.nix +++ b/pkgs/tools/misc/pandoc-plantuml-filter/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "08673mfwxsw6s52mgglbdz7ybb68svqyr3s9w97d7rifbwvvc9ia"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pandocfilters ]; diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix index 37f9e2f4ce5b3..dc0963f2b9c55 100644 --- a/pkgs/tools/misc/pdd/default.nix +++ b/pkgs/tools/misc/pdd/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { format = "other"; - propagatedBuildInputs = [ dateutil ]; + requiredPythonModules = [ dateutil ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/pipreqs/default.nix b/pkgs/tools/misc/pipreqs/default.nix index bbd4125c4b0e4..ec1df15dfc2f7 100644 --- a/pkgs/tools/misc/pipreqs/default.nix +++ b/pkgs/tools/misc/pipreqs/default.nix @@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec { sha256 = "0fdr3mbxjpmrxr7yfc1sn9kbpcyb0qwafimhhrrqvf989dj1sdcy"; }; - propagatedBuildInputs = with python2Packages; [ yarg docopt ]; + requiredPythonModules = with python2Packages; [ yarg docopt ]; # Tests requires network access. Works fine without sandboxing doCheck = false; diff --git a/pkgs/tools/misc/psrecord/default.nix b/pkgs/tools/misc/psrecord/default.nix index 728314e6e7697..f2d6051473382 100644 --- a/pkgs/tools/misc/psrecord/default.nix +++ b/pkgs/tools/misc/psrecord/default.nix @@ -8,7 +8,7 @@ buildPythonApplication rec { sha256 = "5d48410e543b71e5dc4677705acc2a753db65814d3ccbdfbca8d5d3a09b053b1"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ psutil matplotlib ]; diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 158b56e2a5d9c..e95551511691b 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0npgsyxj7kby5laznk5ilkrychs3i68y57gphwk48w8k9fvnl3zc"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six beautifulsoup4 ]; diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix index d604f1a68fe26..ddd574d741701 100644 --- a/pkgs/tools/misc/scfbuild/default.nix +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -19,7 +19,7 @@ buildPythonApplication { ./python-3.patch ]; - propagatedBuildInputs = [ pyyaml fonttools fontforge ]; + requiredPythonModules = [ pyyaml fonttools fontforge ]; installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/sonota/default.nix b/pkgs/tools/misc/sonota/default.nix index d111e0b2b7176..350666b7e1bb3 100644 --- a/pkgs/tools/misc/sonota/default.nix +++ b/pkgs/tools/misc/sonota/default.nix @@ -32,7 +32,7 @@ in buildPythonApplication rec { format = "other"; - propagatedBuildInputs = [ httplib2 netifaces tornado ]; + requiredPythonModules = [ httplib2 netifaces tornado ]; installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index a3e973be544c3..aaa1ab6a47a9f 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -17,8 +17,8 @@ in stdenv.mkDerivation rec { sha256 = "0gcw7hwbr9jniwvqix37vvd2fiplsz70qab9w45d21i8jrfnhxb5"; }; - pythonPaths = [ pycrypto pyyaml requests ]; - buildInputs = [ python perl nose mock makeWrapper python-dateutil setuptools ] ++ pythonPaths; + requiredPythonModuless = [ pycrypto pyyaml requests ]; + buildInputs = [ python perl nose mock makeWrapper python-dateutil setuptools ] ++ requiredPythonModuless; nativeBuildInputs = [ gitMinimal zip ]; postPatch = '' diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/tools/misc/swaglyrics/default.nix index 048dac85fdb23..4d32e42ea44df 100644 --- a/pkgs/tools/misc/swaglyrics/default.nix +++ b/pkgs/tools/misc/swaglyrics/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1dwj9fpyhqqpm2z3imp8hfribkzxya891shh77yg77rc2xghp7mh"; }; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ unidecode colorama beautifulsoup4 flask requests swspotify ]; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 8a0c881a277b4..5e73c992a82af 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { wrapGAppsHook autoreconfHook ]; - pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; + requiredPythonModules = with python3Packages; computeRequiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; configureFlags = [ "--with-udev-rules" @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { postInstall = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $requiredPythonModules" gappsWrapperArgs+=( --prefix PATH : "$program_PATH" --set CUPS_DATADIR "${cups-filters}/share/cups" diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix index a89ed808c8b14..241a54694bbe9 100644 --- a/pkgs/tools/misc/termtosvg/default.nix +++ b/pkgs/tools/misc/termtosvg/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1vk5kn8w3zf2ymi76l8cpwmvvavkmh3b9lb18xw3x1vzbmhz2f7d"; }; - propagatedBuildInputs = with python3Packages; [ lxml pyte wcwidth ]; + requiredPythonModules = with python3Packages; [ lxml pyte wcwidth ]; meta = with lib; { homepage = "https://nbedos.github.io/termtosvg/"; diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index d923a3f449188..c242384befdb3 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { sha256 = "0fnf78956pwhb9cgv1jmgypnkma5xzflkivfrkfiadbgin848yfg"; }; - propagatedBuildInputs = [ colorama decorator psutil pyte six ]; + requiredPythonModules = [ colorama decorator psutil pyte six ]; checkInputs = [ pytest pytest-mock ]; diff --git a/pkgs/tools/misc/thinkpad-scripts/default.nix b/pkgs/tools/misc/thinkpad-scripts/default.nix index 5b9b9eae7ad5a..e340f18dbe9c2 100644 --- a/pkgs/tools/misc/thinkpad-scripts/default.nix +++ b/pkgs/tools/misc/thinkpad-scripts/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "08adx8r5pwwazbnfahay42l5f203mmvcn2ipz5hg8myqc9jxm2ky"; }; - propagatedBuildInputs = with python3Packages; [ setuptools ]; + requiredPythonModules = with python3Packages; [ setuptools ]; meta = { description = "Screen rotation, docking and other scripts for ThinkPad® X220 and X230 Tablet"; diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 515d7001fbc7e..4269989e47ed1 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { # No tests in archive doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ click colorama kaptan libtmux ]; diff --git a/pkgs/tools/misc/trac/default.nix b/pkgs/tools/misc/trac/default.nix index 1d0f9a5d8288f..289594ff13f74 100644 --- a/pkgs/tools/misc/trac/default.nix +++ b/pkgs/tools/misc/trac/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { --replace "suite.addTest(pygments.test_suite())" "" ''; - propagatedBuildInputs = [ + requiredPythonModules = [ Babel docutils pygments diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix index 58fc991beb3e6..50d6c92e36904 100644 --- a/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { sha256 = "50032c62947422c8afbc1733e50526818df7d885d1cc41a27ff65fc26cd3c1c5"; }; - propagatedBuildInputs= [ + requiredPythonModules= [ markdown pygments ]; diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix index 00f1899f97afb..5897b7d6caf9d 100644 --- a/pkgs/tools/misc/xdxf2slob/default.nix +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication { sha256 = "0m3dnc3816ja3kmik1wabb706dkqdf5sxvabwgf2rcrq891xcddd"; }; - propagatedBuildInputs = [ python3Packages.PyICU python3Packages.slob ]; + requiredPythonModules = [ python3Packages.PyICU python3Packages.slob ]; meta = with stdenv.lib; { description = "Tool to convert XDXF dictionary files to slob format"; diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 03a458e818d2f..0e8ed887d3f85 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "09zphcd9821ink63636swql4g85hg6lpsazqg1mawlk9ikc8zbps"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ pyxdg pexpect pygobject3 diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 40bf214f4630d..2cc23374726d2 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -11,10 +11,12 @@ python3Packages.buildPythonApplication rec { sha256 = "0p56pb3wxdzqgs4fsh4hn06xs0mgzgznqqr0bn2vkkkibnkr1asp"; }; - propagatedBuildInputs = with python3Packages; [ - attrs ConfigArgParse ffmpeg_3 future lxml requests + requiredPythonModules = with python3Packages; [ + attrs ConfigArgParse future lxml requests + ]; + makeWrapperArgs = [ + "--prefix PATH ${stdenv.lib.makeBinPath [ ffmpeg_3 rtmpdump php wget ]}" ]; - pythonPath = [ rtmpdump php wget ]; doCheck = false; # tests require network access checkInputs = with python3Packages; [ ffmpeg_3 pytest pytestrunner ]; @@ -24,6 +26,5 @@ python3Packages.buildPythonApplication rec { homepage = "https://aajanki.github.io/yle-dl/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dezgeg SuperSandro2000 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7de5f2369bc06..e993c30e7d10c 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ zip ] ++ lib.optional generateManPage pandoc; - propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome; + requiredPythonModules = lib.optional hlsEncryptedSupport pycryptodome; # Ensure these utilities are available in $PATH: # - ffmpeg: post-processing & transcoding support diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 5b5fb66be306c..328debe5c9b59 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - pythonPath = [ yubikey-manager ]; + requiredPythonModules = [ yubikey-manager ]; dontWrapQtApps = true; postInstall = '' - buildPythonPath "$pythonPath" + buildPythonPath "$requiredPythonModules" wrapQtApp $out/bin/ykman-gui \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 505d26bb582f7..dd4807d024485 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonPackage rec { sha256 = "1yhc8j67phrj5xgx09b5h7c67pgc4wj4jnkmkq0r3s6j7jn43vv8"; }; - propagatedBuildInputs = + requiredPythonModules = with python3Packages; [ click cryptography diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix index cb37ae249289e..4cfe6b44416ba 100644 --- a/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ b/pkgs/tools/misc/yubikey-neo-manager/default.nix @@ -10,7 +10,7 @@ python27Packages.buildPythonPackage rec { sha256 = "1isxvx27hk0avxwgwcwys2z8ickfs816ii1aklvmi09ak1rgrf1g"; }; - propagatedBuildInputs = with python27Packages; [ pyside pycrypto ]; + requiredPythonModules = with python27Packages; [ pyside pycrypto ]; patches = [ ./fix-pyside-requirement.diff ]; # aid ctypes load_libary() diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index 74e7e7223d145..a8e1468e53911 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -6,7 +6,7 @@ in pythonPackages.buildPythonApplication rec { pname = "zabbix-cli"; version = "2.2.1"; - propagatedBuildInputs = with pythonPackages; [ ipaddr requests ]; + requiredPythonModules = with pythonPackages; [ ipaddr requests ]; # argparse is part of the standardlib prePatch = '' diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index ea03f8878b209..6608876773d61 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { doCheck = false; # weird error - propagatedBuildInputs = [ iowait psutil pyzmq tornado six ]; + requiredPythonModules = [ iowait psutil pyzmq tornado six ]; meta = with stdenv.lib; { description = "A process and socket manager"; diff --git a/pkgs/tools/networking/cloud-custodian/default.nix b/pkgs/tools/networking/cloud-custodian/default.nix index a57d9f13d7852..02599c28ddb0b 100644 --- a/pkgs/tools/networking/cloud-custodian/default.nix +++ b/pkgs/tools/networking/cloud-custodian/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { sha256 = "0c199gdmpm83xfghrbzp02xliyxiygsnx2fvb35j9qpf37wzzp3z"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ argcomplete boto3 botocore diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix index df72a9474899e..9efc6e75cb880 100644 --- a/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/pkgs/tools/networking/connman/connman-notify/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication { buildInputs = [ glib ]; - pythonPath = with python3Packages; [ dbus-python pygobject3 ]; + requiredPythonModules = with python3Packages; [ dbus-python pygobject3 ]; strictDeps = false; diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index dd206eb8c975b..f45a946734c52 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -14,7 +14,7 @@ let sha256 = "1awzpbrkh4fympqzddz5i3ml81b7f0i0nwkvbpmyxjjfqx6l0m4m"; }; - propagatedBuildInputs = with self; [ + requiredPythonModules = with self; [ six requests websocket_client @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { consul docker ]); - propagatedBuildInputs = with python'.pkgs; [ python tornado ]; + requiredPythonModules = with python'.pkgs; [ python tornado ]; buildCommand = '' mkdir -p $out/bin diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix index edf7a8faaf865..2497c7a96dc35 100644 --- a/pkgs/tools/networking/dd-agent/integrations-core.nix +++ b/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -64,7 +64,7 @@ let datadog_checks_base = buildIntegration { pname = "checks-base"; sourceRoot = "datadog_checks_base"; - propagatedBuildInputs = with python.pkgs; [ + requiredPythonModules = with python.pkgs; [ requests protobuf prometheus_client uuid simplejson uptime ]; }; @@ -82,7 +82,7 @@ let integrations = defaultIntegrations // extraIntegrations; builtIntegrations = mapAttrs (pname: fdeps: buildIntegration { inherit pname; - propagatedBuildInputs = (fdeps python.pkgs) ++ [ datadog_checks_base ]; + requiredPythonModules = (fdeps python.pkgs) ++ [ datadog_checks_base ]; }) integrations; in builtIntegrations // { diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index b323cde28bc28..8f8ecf26d342b 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "1jcabpphlm6qajw8dz0h4gynm03g1mxi0cn900i3v7wdfww1gfab"; }; - propagatedBuildInputs = [ click ipy pyyaml requests ]; + requiredPythonModules = [ click ipy pyyaml requests ]; doCheck = false; # Tests try to contact the actual remote API diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index 31b91c01c2d6e..7501ef0aa1099 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook chardet ]; + requiredPythonModules = with pythonPackages; [ gdata IMAPClient Logbook chardet ]; startScript = ./gmvault.py; diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 092f3611abb78..b0fef130e400a 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "gping"; version = "1.1"; - propagatedBuildInputs = with python3Packages; [ colorama ]; + requiredPythonModules = with python3Packages; [ colorama ]; src = python3Packages.fetchPypi { inherit version; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 9c524c0cc090a..2c017851391eb 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0kngz2izcqjphbrdkg489p0xmf65xjc8ki1a2szcc8sgwc7z74xy"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ click httpie parsimonious diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index bf80cd48ffa2e..346a7239f5fb1 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { outputs = [ "out" "doc" "man" ]; - propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ]; + requiredPythonModules = with python3Packages; [ pygments requests setuptools ]; dontUseSetuptoolsCheck = true; patches = [ ./strip-venv.patch diff --git a/pkgs/tools/networking/ipgrep/default.nix b/pkgs/tools/networking/ipgrep/default.nix index d9fc41e94b6f7..9f8c48fff903a 100644 --- a/pkgs/tools/networking/ipgrep/default.nix +++ b/pkgs/tools/networking/ipgrep/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { --replace "'scripts': []" "'scripts': { '${pname}.py' }" ''; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ pycares urllib3 requests diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 2418d7e90cc6c..18a4bd6f1cfa7 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = [ + requiredPythonModules = [ ConfigArgParse argcomplete beautifulsoup4 diff --git a/pkgs/tools/networking/nxdomain/default.nix b/pkgs/tools/networking/nxdomain/default.nix index 073ac48b8d348..bc34c1a187764 100644 --- a/pkgs/tools/networking/nxdomain/default.nix +++ b/pkgs/tools/networking/nxdomain/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { sha256 = "1z9iffggqq2kw6kpnj30shi98cg0bkvkwpglmhnkgwac6g55n2zn"; }; - propagatedBuildInputs = [ dnspython ]; + requiredPythonModules = [ dnspython ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/tools/networking/nyx/default.nix b/pkgs/tools/networking/nyx/default.nix index 6ae81609eec83..5331297170f51 100644 --- a/pkgs/tools/networking/nyx/default.nix +++ b/pkgs/tools/networking/nyx/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "02rrlllz2ci6i6cs3iddyfns7ang9a54jrlygd2jw1f9s6418ll8"; }; - propagatedBuildInputs = [ stem ]; + requiredPythonModules = [ stem ]; # ./run_tests.py returns `TypeError: testFailure() takes exactly 1 argument` doCheck = false; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 73e2e6b60f51d..717b2663781fe 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -23,7 +23,7 @@ python2Packages.buildPythonApplication rec { doCheck = false; nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xsl ]; - propagatedBuildInputs = with python2Packages; [ six kerberos rfc6555 pysocks ]; + requiredPythonModules = with python2Packages; [ six kerberos rfc6555 pysocks ]; postInstall = '' make -C docs man diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index d55a46f609b11..8520e93edaa49 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -51,7 +51,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = with pythonPackages; [ sphinx texinfo ]; # The `backup' command requires `sqlite3'. - propagatedBuildInputs = with pythonPackages; [ + requiredPythonModules = with pythonPackages; [ twisted foolscap nevow simplejson zfec pycryptopp darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface service-identity pyyaml magic-wormhole treq characteristic diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index 32fb053f811c7..3014abd1bc8c5 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -50,7 +50,7 @@ buildPythonApplication rec { ''''${qtWrapperArgs[@]}'' ]; - propagatedBuildInputs = [ + requiredPythonModules = [ pulseaudio psutil pyqt5 diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index 22da1320803e5..76a786367553f 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { dontBuild = true; doCheck = false; - propagatedBuildInputs = with python3Packages; [ requests urllib3 tld ]; + requiredPythonModules = with python3Packages; [ requests urllib3 tld ]; installPhase = '' mkdir -p "$out"/{bin,share/photon} diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index b89ab8164cc4b..4f9bd2be0f835 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "07s5ss9dxccx1mip7pyga1fagywkqchxmzz55ng47ac9053ffxkq"; }; - propagatedBuildInputs = [ colorama veryprettytable pyperclip ]; + requiredPythonModules = [ colorama veryprettytable pyperclip ]; meta = with stdenv.lib; { description = "A command line interface for The Pirate Bay"; diff --git a/pkgs/tools/networking/py-wmi-client/default.nix b/pkgs/tools/networking/py-wmi-client/default.nix index 7a2774002891f..24889176f2aaa 100644 --- a/pkgs/tools/networking/py-wmi-client/default.nix +++ b/pkgs/tools/networking/py-wmi-client/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1kd12gi1knqv477f1shzqr0h349s5336vzp3fpfp3xl0b502ld8d"; }; - propagatedBuildInputs = with pythonPackages; [ impacket natsort pyasn1 pycrypto ]; + requiredPythonModules = with pythonPackages; [ impacket natsort pyasn1 pycrypto ]; # no tests doCheck = false; diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index 345999c00bcd9..41434b53ccf5d 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -42,7 +42,7 @@ in buildPythonApplication rec { sourceRoot = "source/py-kms"; - propagatedBuildInputs = [ systemd pytz tzlocal ]; + requiredPythonModules = [ systemd pytz tzlocal ]; # Fix https://github.com/SystemRage/py-kms/issues/64 : patches = [ ./log-to-current-directory-by-default.patch ]; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 53f24ddb75245..e1be35f161cd6 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "0p6mbgai7f0c12pkw4s7d649gj1f8hywj60pscxvj9jsna3iifhs"; }; - propagatedBuildInputs = [ python_magic dateutil ]; + requiredPythonModules = [ python_magic dateutil ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix index dedbc751179f0..0e6be662c42bd 100644 --- a/pkgs/tools/networking/s4cmd/default.nix +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0d4mx98i3qhvlmr9x898mjvf827smzx6x5ji6daiwgjdlxc60mj2"; }; - propagatedBuildInputs = with python3Packages; [ boto3 pytz ]; + requiredPythonModules = with python3Packages; [ boto3 pytz ]; # The upstream package tries to install some bash shell completion scripts in /etc. # Setuptools is bugged and doesn't handle --prefix properly: https://github.com/pypa/setuptools/issues/130 diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index f23aed3707bee..a6680c7876fdc 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "05vxs0x8gnsv2r9cy0brqny1y5jnj2mw11lqc8lqahx84xcs2m00"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ appdirs cssselect keyring diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/tools/networking/vpn-slice/default.nix index 9511c214c08c0..9ce188003a7f7 100644 --- a/pkgs/tools/networking/vpn-slice/default.nix +++ b/pkgs/tools/networking/vpn-slice/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "1z2mdl3arzl95zrj4ir57f762gcimmmq5nk91j679cshxz4snxyr"; }; - propagatedBuildInputs = with python3Packages; [ setproctitle dnspython ]; + requiredPythonModules = with python3Packages; [ setproctitle dnspython ]; doCheck = false; diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/tools/networking/wifite2/default.nix index 101c4643a77f9..24c489a7cf4b0 100644 --- a/pkgs/tools/networking/wifite2/default.nix +++ b/pkgs/tools/networking/wifite2/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { }) ]; - propagatedBuildInputs = [ + requiredPythonModules = [ aircrack-ng wireshark-cli reaverwps-t6x @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { mv ${sitePackagesDir}/wifite/__main__.py ${sitePackagesDir}/wifite/wifite.py ''; - checkInputs = propagatedBuildInputs; + checkInputs = requiredPythonModules; checkPhase = "python -m unittest discover tests -v"; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix index 9b76d033829ff..a6ac583b2c319 100644 --- a/pkgs/tools/networking/yrd/default.nix +++ b/pkgs/tools/networking/yrd/default.nix @@ -15,7 +15,7 @@ in pythonPackages.buildPythonApplication { inherit sha256; }; - propagatedBuildInputs = with pythonPackages; [ argh ]; + requiredPythonModules = with pythonPackages; [ argh ]; meta = with stdenv.lib; { description = "Cjdns swiss army knife"; diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index dc38648c369cd..439ebf05d56b4 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = with python3Packages; [ feedparser lxml sqlalchemy youtube-dl ]; + requiredPythonModules = with python3Packages; [ feedparser lxml sqlalchemy youtube-dl ]; checkInputs = with python3Packages; [ nose pytest ]; diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index a2add8f8a78eb..4bc40089421ea 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { rev = "version-0.6.3"; sha256 = "157wvv9vnaszzwbj68jpdc0imcm1hdab3z760bx2axbsgfpqqilz"; }; - propagatedBuildInputs = [ nix-prefetch-scripts ]; + requiredPythonModules = [ nix-prefetch-scripts ]; passthru = { # NOTE: `fetch` should not be used within nixpkgs because it # uses a non-idiomatic structure. It is provided for use by diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix index 462c9e615a139..b1eb82dad4a31 100644 --- a/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix +++ b/pkgs/tools/package-management/nixops/azure-mgmt-compute/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; - propagatedBuildInputs = [ azure-mgmt-common ]; + requiredPythonModules = [ azure-mgmt-common ]; meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix index fd47f8895fd4b..7b2dbc54cb348 100644 --- a/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix +++ b/pkgs/tools/package-management/nixops/azure-mgmt-network/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; - propagatedBuildInputs = [ azure-mgmt-common ]; + requiredPythonModules = [ azure-mgmt-common ]; meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix index aa037b48b4f5d..7b95669748a15 100644 --- a/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix +++ b/pkgs/tools/package-management/nixops/azure-mgmt-nspkg/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq"; }; - propagatedBuildInputs = [ azure-nspkg ]; + requiredPythonModules = [ azure-nspkg ]; meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix index b60e3aee34028..c9217960bba03 100644 --- a/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix +++ b/pkgs/tools/package-management/nixops/azure-mgmt-resource/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; - propagatedBuildInputs = [ azure-mgmt-common ]; + requiredPythonModules = [ azure-mgmt-common ]; meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; diff --git a/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix b/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix index 2e0523bb25cc1..c771a97ba4a76 100644 --- a/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix +++ b/pkgs/tools/package-management/nixops/azure-mgmt-storage/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; - propagatedBuildInputs = [ azure-mgmt-common ]; + requiredPythonModules = [ azure-mgmt-common ]; meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; diff --git a/pkgs/tools/package-management/nixops/azure-storage/default.nix b/pkgs/tools/package-management/nixops/azure-storage/default.nix index 6693a7464d438..f5238c464ac4f 100644 --- a/pkgs/tools/package-management/nixops/azure-storage/default.nix +++ b/pkgs/tools/package-management/nixops/azure-storage/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; }; - propagatedBuildInputs = [ azure-common dateutil requests ] + requiredPythonModules = [ azure-common dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; postInstall = '' diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 59d139d288475..07871e9c5658a 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -10,7 +10,7 @@ python2Packages.buildPythonApplication { buildInputs = [ libxslt ]; - pythonPath = with python2Packages; + requiredPythonModules = with python2Packages; [ prettytable boto boto3 diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index bf98f5400b8eb..90739f67e38e1 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3Packages.pbr git ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ dogpile_cache click requests diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 02bc599f47dc2..071a5002fbfb3 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { ''; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ vdf ]; + requiredPythonModules = [ vdf ]; # The wine install shipped with Proton must run under steam's # chrootenv, but winetricks and zenity break when running under diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix index 675ec61f4db92..e596e16178b1d 100644 --- a/pkgs/tools/package-management/python2nix/default.nix +++ b/pkgs/tools/package-management/python2nix/default.nix @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication { sha256 = "022gr0gw6azfi3iq4ggb3fhkw2jljs6n5rncn45hb5liwakigj8i"; }; - propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ]; + requiredPythonModules = with pythonPackages; [ requests pip setuptools ]; meta = with stdenv.lib; { maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 01a1bf4a93366..30e29a0b259bc 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "0wkk107s0bpvbknapns0qdzf8csrzc2j6gliy6pa8z208fcfzyy3"; }; - propagatedBuildInputs = [ + requiredPythonModules = [ binaryornot boolean-py debian diff --git a/pkgs/tools/security/creddump/default.nix b/pkgs/tools/security/creddump/default.nix index d37c58a51591b..86a0630098b13 100644 --- a/pkgs/tools/security/creddump/default.nix +++ b/pkgs/tools/security/creddump/default.nix @@ -15,7 +15,7 @@ python2Packages.buildPythonApplication rec { # No setup.py is available dontBuild = true; doCheck = false; - propagatedBuildInputs = [ python2Packages.pycrypto ]; + requiredPythonModules = [ python2Packages.pycrypto ]; installPhase = '' mkdir -p ${placeholder "out"}/bin diff --git a/pkgs/tools/security/crowbar/default.nix b/pkgs/tools/security/crowbar/default.nix index cd4e7db87186e..7f7bdaeea444a 100644 --- a/pkgs/tools/security/crowbar/default.nix +++ b/pkgs/tools/security/crowbar/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { sha256 = "05m9vywr9976pc7il0ak8nl26mklzxlcqx0p8rlfyx1q766myqzf"; }; - propagatedBuildInputs = [ python3Packages.paramiko ]; + requiredPythonModules = [ python3Packages.paramiko ]; patchPhase = '' sed -i 's,/usr/bin/xfreerdp,${freerdp}/bin/xfreerdp,g' lib/main.py diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 2575636aeca24..f9da6fb6dc3a8 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; - pythonPath = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ dns netaddr lxml ]; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index c27f82d70536b..9e6d477b1ec8e 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication { sha256 = "0kqvkxpb72y3kgmxf6g36w67499c6gcd2a9yyblagwx12y05f1sh"; }; - pythonPath = with python3.pkgs; + requiredPythonModules = with python3.pkgs; stdenv.lib.optionals stdenv.isLinux [ systemd ]; diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/tools/security/fierce/default.nix index 13146c3373e7a..c14b05cb23d39 100644 --- a/pkgs/tools/security/fierce/default.nix +++ b/pkgs/tools/security/fierce/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace requirements.txt --replace 'dnspython==1.16.0' 'dnspython' ''; - propagatedBuildInputs = [ python3.pkgs.dns ]; + requiredPythonModules = [ python3.pkgs.dns ]; # tests require network access doCheck = false; diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index 4b9a6fb0e3219..e0bbf0f13ca15 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { (gst_all_1.gst-plugins-bad.override { enableZbar = true; }) # for zbar plug-in ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ dbus-python future gpgme diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index 4fa0499f1dded..404f0d6f6c7be 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { sha256 = "05wn744ydclpnpyah6yfjqlfjlasrrhzj48lqmm5a91nyps5yqyn"; }; - pythonPath = with pythonPackages; [ dnspython m2crypto ipaddr python-gnupg + requiredPythonModules = with pythonPackages; [ dnspython m2crypto ipaddr python-gnupg pyunbound ]; buildInputs = [ pythonPackages.wrapPython ]; - propagatedBuildInputs = [ unbound libreswan ] ++ pythonPath; + propagatedBuildInputs = [ unbound libreswan ] ++ requiredPythonModules; propagatedUserEnvPkgs = [ unbound libreswan ]; patchPhase = '' diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix index 9478bb4ca237c..8d9b99c2e2205 100644 --- a/pkgs/tools/security/knockknock/default.nix +++ b/pkgs/tools/security/knockknock/default.nix @@ -12,7 +12,7 @@ in python2Packages.buildPythonApplication rec { sha256 = "1chpfs3w2vkjrgay69pbdr116z1jldv53fi768a1i05fdqhy1px4"; }; - propagatedBuildInputs = [ python2Packages.pycrypto ]; + requiredPythonModules = [ python2Packages.pycrypto ]; # No tests doCheck = false; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index f03a794b6800f..5b99695c24519 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc.targetPrefix}gcc" ]; - pythonPath = with python2.pkgs; optionals graphicalSupport [ + requiredPythonModules = with python2.pkgs; optionals graphicalSupport [ pygtk pysqlite pygobject2 pycairo ]; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ]); postInstall = optionalString graphicalSupport '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $requiredPythonModules" patchPythonScript $out/bin/ndiff patchPythonScript $out/bin/zenmap ''; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 92888a8de2a15..361d3788336b4 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ intltool ]; buildInputs = [ intltool gtk3 gobject-introspection ]; - propagatedBuildInputs = with python3.pkgs; [ stem distutils_extra pygobject3 ]; + requiredPythonModules = with python3.pkgs; [ stem distutils_extra pygobject3 ]; postFixup = '' wrapProgram "$out/bin/onioncircuits" \ diff --git a/pkgs/tools/security/pwgen-secure/default.nix b/pkgs/tools/security/pwgen-secure/default.nix index c3141676b3707..6ef1611e5fabe 100644 --- a/pkgs/tools/security/pwgen-secure/default.nix +++ b/pkgs/tools/security/pwgen-secure/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { sha256 = "15md5606hzy1xfhj2lxmc0nvynyrcs4vxa5jdi34kfm31rdklj28"; }; - propagatedBuildInputs = [ docopt ]; + requiredPythonModules = [ docopt ]; postInstall = '' install -Dm755 spwgen.py $out/bin/spwgen diff --git a/pkgs/tools/security/pyrit/default.nix b/pkgs/tools/security/pyrit/default.nix index 93ae86416e13c..879d4b6664691 100644 --- a/pkgs/tools/security/pyrit/default.nix +++ b/pkgs/tools/security/pyrit/default.nix @@ -30,7 +30,7 @@ python2Packages.buildPythonApplication rec { inherit version src; buildInputs = [ openssl zlib libpcap ]; - propagatedBuildInputs = [ cpyrit_opencl ]; + requiredPythonModules = [ cpyrit_opencl ]; meta = with stdenv.lib; { homepage = "https://github.com/JPaulMora/Pyrit"; diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index 4153ddafbf480..39be3f1a368c4 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0lxzxfa9wbzim50d2jmd27i57szd0grm1dfayhnym86jn01qpvn3"; }; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ aiodns beautifulsoup4 dns grequests netaddr plotly pyyaml requests retrying shodan texttable ]; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 353590ed87c81..167e66ccb970f 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -24,7 +24,7 @@ in substituteInPlace setup.py --replace "GitPython ==" "GitPython >= " ''; - propagatedBuildInputs = [ python3Packages.GitPython truffleHogRegexes ]; + requiredPythonModules = [ python3Packages.GitPython truffleHogRegexes ]; # Test cases run git clone and require network access doCheck = false; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 8cf904c39c5fd..33dd88e7178f7 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ]; + requiredPythonModules = [ pythonPackages.pycrypto pythonPackages.distorm3 ]; meta = with stdenv.lib; { homepage = "https://www.volatilityfoundation.org/"; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index d4a3a0c621a1c..ce6e8dc742060 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { pytest-flake8 ]; - propagatedBuildInputs = [ + requiredPythonModules = [ nix ] ++ (with python3Packages; [ click diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix index acfe440b5d5c9..a8c332ecbdec8 100644 --- a/pkgs/tools/system/cm-rgb/default.nix +++ b/pkgs/tools/system/cm-rgb/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { wrapGAppsHook ]; - propagatedBuildInputs = [ + requiredPythonModules = [ click hidapi psutil diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix index b41196b85c914..2fd561e9d203a 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/tools/system/journalwatch/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pytest ''; - propagatedBuildInputs = [ + requiredPythonModules = [ systemd ]; diff --git a/pkgs/tools/system/krakenx/default.nix b/pkgs/tools/system/krakenx/default.nix index e5b1e3ec1c94e..31418d9c4b067 100644 --- a/pkgs/tools/system/krakenx/default.nix +++ b/pkgs/tools/system/krakenx/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1khw1rxra5hn7hwp16i6kgj89znq8vjsyly3r2dxx2z2bddil000"; }; - propagatedBuildInputs = lib.singleton python3Packages.pyusb; + requiredPythonModules = lib.singleton python3Packages.pyusb; doCheck = false; # there are no tests diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 1192a1762632d..6551f6001828c 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonPackage rec { sha256 = "1gqrb2xxii43j7kszy7kvv4f6hr8ac4p0m9q8i1xs5fhsqcx186i"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ urwid psutil ]; diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index 71bb6dfb357d1..77f3164c8dff4 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3Packages.wrapPython ]; - pythonPath = with python3Packages; [ + requiredPythonModules = with python3Packages; [ configparser dbus-python pygobject3 diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 05e0cf119bf18..7a61fdda4c63a 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { }) ]; - propagatedBuildInputs = with python3.pkgs; [ + requiredPythonModules = with python3.pkgs; [ agate agate-excel agate-dbf diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 1dbe451436319..219ea2726548f 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "16hklfbww6ibmjr32gg98nlnzl4dwanz6lm3fzg2x3vd7d54m92c"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ beautifulsoup4 chardet html5lib diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index 78ab971f0c0d3..c77818a89fdd4 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec { makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ imagemagick xpdf tesseract ]) ]; - propagatedBuildInputs = with python3Packages; [ unidecode dateparser pyyaml pillow chardet pdfminer ]; + requiredPythonModules = with python3Packages; [ unidecode dateparser pyyaml pillow chardet pdfminer ]; # Tests fails even when ran manually on my ubuntu machine !! doCheck = false; diff --git a/pkgs/tools/text/markdown-pp/default.nix b/pkgs/tools/text/markdown-pp/default.nix index eaaa0547964dc..e4ff22fcbeb75 100644 --- a/pkgs/tools/text/markdown-pp/default.nix +++ b/pkgs/tools/text/markdown-pp/default.nix @@ -4,7 +4,7 @@ with pythonPackages; buildPythonApplication rec { pname = "MarkdownPP"; version = "1.5.1"; - propagatedBuildInputs = [ pillow watchdog ]; + requiredPythonModules = [ pillow watchdog ]; checkPhase = '' cd test PATH=$out/bin:$PATH ${python}/bin/${python.executable} test.py diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index bfa22a4fd1825..f173695ec8cc9 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -46,7 +46,7 @@ buildPythonApplication rec { setuptools_scm ]; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ cffi chardet coloredlogs diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index 36a68f9406d39..377742985fd60 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "017risn0j1bjy9ygzfgphjnyjl4gk7wbrr4qv1vvrlan60wyp1rs"; }; - propagatedBuildInputs = [ click future six ]; + requiredPythonModules = [ click future six ]; meta = with stdenv.lib; { description = "A linter for prose"; diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix index d20ce99dd74e2..7cc934eb56e7b 100644 --- a/pkgs/tools/text/rst2html5/default.nix +++ b/pkgs/tools/text/rst2html5/default.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73"; }; - propagatedBuildInputs = with pythonPackages; + requiredPythonModules = with pythonPackages; [ docutils genshi pygments beautifulsoup4 ]; meta = with stdenv.lib;{ diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index ac10564c9f769..a67df54ce622e 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -5,7 +5,7 @@ buildPythonApplication rec { pname = "transifex-client"; version = "0.13.9"; - propagatedBuildInputs = [ + requiredPythonModules = [ urllib3 requests python-slugify six setuptools ]; diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix index b91d24e1137d7..1b7c6ccc22733 100644 --- a/pkgs/tools/text/yaml-merge/default.nix +++ b/pkgs/tools/text/yaml-merge/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0mwda2shk43i6f22l379fcdchmb07fm7nf4i2ii7fk3ihkhb8dgp"; }; - pythonPath = with pythonPackages; [ pyyaml ]; + requiredPythonModules = with pythonPackages; [ pyyaml ]; nativeBuildInputs = [ pythonPackages.wrapPython ]; installPhase = '' diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 4b85a252c1308..29ad41da63e00 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "005eecc73c65b9d4c09532547940718a7b308cd565f62a213dfa040827d4d565"; }; - propagatedBuildInputs = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ]; + requiredPythonModules = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ]; checkInputs = with pythonPackages; [ nose diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 672d5af68c806..9fa6306a3e705 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -299,7 +299,7 @@ latexindent = perlPackages.buildPerlPackage rec { outputs = [ "out" ]; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - propagatedBuildInputs = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ]; + requiredPythonModules = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ]; postPatch = '' substituteInPlace scripts/latexindent/LatexIndent/GetYamlSettings.pm \ @@ -327,7 +327,7 @@ pygmentex = python2Packages.buildPythonApplication rec { src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs); - propagatedBuildInputs = with python2Packages; [ pygments chardet ]; + requiredPythonModules = with python2Packages; [ pygments chardet ]; dontBuild = true; diff --git a/pkgs/tools/video/vcsi/default.nix b/pkgs/tools/video/vcsi/default.nix index 84e6c2e6d41dd..9f8277474deef 100644 --- a/pkgs/tools/video/vcsi/default.nix +++ b/pkgs/tools/video/vcsi/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0dks0yr2a0cpr32vrwhdrhsb4qyj7rz1yv44fjbr8z8j8p84yjx5"; }; - propagatedBuildInputs = with python3Packages; [ + requiredPythonModules = with python3Packages; [ numpy pillow jinja2 diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index aff00519a2dc8..a5128a53b7115 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -74,7 +74,7 @@ in with localPython.pkgs; buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = [ + requiredPythonModules = [ # FIXME: Add optional docker dependency, which requires requests >= 2.14.2. # Otherwise, awsebcli will try to install it using pip when using some # commands (like "eb local run"). diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 24ecb7f99c374..d9de9a53534ac 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -43,7 +43,7 @@ in buildPythonApplication { done ''; - propagatedBuildInputs = [ + requiredPythonModules = [ jinja2 oauthlib configobj diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix index 8b9cd18cd0a7b..7d83a6b358016 100644 --- a/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { pname = "cloudmonkey"; version = "5.3.3"; - propagatedBuildInputs = [ argcomplete pygments ]; + requiredPythonModules = [ argcomplete pygments ]; doCheck = false; # upstream has no tests defined diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index 3d7b62777aa5d..5046ddc808323 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -12,7 +12,7 @@ in buildPythonApplication { sha256 = "0grsgn5gbvk1hlfa8qx7ppz7iyfyi2pdhxy8njr8lm60w4amfiyq"; }; - propagatedBuildInputs = [ boto m2crypto ]; + requiredPythonModules = [ boto m2crypto ]; meta = { homepage = "https://github.com/eucalyptus/euca2ools"; diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 34f2bc9e19097..d1f4a6c186e5f 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { }; buildInputs = [ bash ]; - propagatedBuildInputs = [ boto setuptools distro ]; + requiredPythonModules = [ boto setuptools distro ]; postPatch = '' diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 47953d21dfe0e..2a9f7d40b01d4 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -44,7 +44,7 @@ buildPythonApplication rec { --replace "version=get_version()," "version='${version}'," ''; - propagatedBuildInputs = [ + requiredPythonModules = [ terminaltables colorclass requests diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/tools/virtualization/mininet/default.nix index 78ddc8e6dfd5c..112d87dd0da70 100644 --- a/pkgs/tools/virtualization/mininet/default.nix +++ b/pkgs/tools/virtualization/mininet/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildFlags = [ "mnexec" ]; makeFlags = [ "PREFIX=$(out)" ]; - pythonPath = [ python.pkgs.setuptools ]; + requiredPythonModules = [ python.pkgs.setuptools ]; buildInputs = [ python which help2man ]; installTargets = [ "install-mnexec" "install-manpages" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dfcb448f06b19..6970750607206 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15,9 +15,11 @@ with pkgs.lib; let + python_ = python; packages = ( self: - let + python = toPythonModule python_; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; callPackage = pkgs.newScope self; @@ -61,13 +63,13 @@ let hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; # Get list of required Python modules given a list of derivations. - requiredPythonModules = drvs: let + computeRequiredPythonModules = drvs: let modules = filter hasPythonModule drvs; in unique ([python] ++ modules ++ concatLists (catAttrs "requiredPythonModules" modules)); # Create a PYTHONPATH from a list of derivations. This function recurses into the items to find derivations # providing Python modules. - makePythonPath = drvs: stdenv.lib.makeSearchPath python.sitePackages (requiredPythonModules drvs); + makePythonPath = drvs: stdenv.lib.makeSearchPath python.sitePackages (computeRequiredPythonModules drvs); removePythonPrefix = name: removePrefix namePrefix name; @@ -78,8 +80,7 @@ let # Use passthru in order to prevent rebuilds when possible. passthru = (oldAttrs.passthru or {})// { pythonModule = python; - pythonPath = [ ]; # Deprecated, for compatibility. - requiredPythonModules = requiredPythonModules drv.propagatedBuildInputs; + requiredPythonModules = computeRequiredPythonModules ([ drv ] ++ optionals (drv?requiredPythonModules) drv.requiredPythonModules); }; }); @@ -103,7 +104,7 @@ in { inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; inherit fetchPypi callPackage; - inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; + inherit hasPythonModule computeRequiredPythonModules makePythonPath disabledIf; inherit toPythonModule toPythonApplication; inherit buildSetupcfg; @@ -121,6 +122,7 @@ in { pythonRecompileBytecodeHook pythonRemoveBinBytecodeHook pythonRemoveTestsDirHook + pythonWriteRequiredPythonModulesHook setuptoolsBuildHook setuptoolsCheckHook venvShellHook @@ -5287,7 +5289,9 @@ in { pyparsing = callPackage ../development/python-modules/pyparsing { }; - pyparted = callPackage ../development/python-modules/pyparted { }; + pyparted = callPackage ../development/python-modules/pyparted { + inherit (pkgs) parted; + }; pypblib = callPackage ../development/python-modules/pypblib { }; @@ -5334,7 +5338,7 @@ in { /* `pyqt5_with_qtwebkit` should not be used by python libraries in pkgs/development/python-modules/*. Putting this attribute in - `propagatedBuildInputs` may cause collisions. + `requiredPythonModules` may cause collisions. */ pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; };