From 8a26c93b4c11915b3169d966d35aa816e3a11d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 8 Mar 2021 01:31:00 +0100 Subject: [PATCH] pythonPackages: move overrides into new lines --- .../python-modules/objgraph/default.nix | 4 +- pkgs/top-level/python-packages.nix | 503 ++++++++++++------ 2 files changed, 346 insertions(+), 161 deletions(-) diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index c79b11252be0..0d2da52f015c 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPyPy , substituteAll -, graphvizPkg +, graphvizPkgs , graphviz , mock }: @@ -23,7 +23,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./hardcode-graphviz-path.patch; - graphviz = graphvizPkg; + graphviz = graphvizPkgs; }) ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7799b6356b39..dc5902dcb27b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -386,15 +386,21 @@ in { ansiwrap = callPackage ../development/python-modules/ansiwrap { }; - antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { antlr4 = pkgs.antlr4; }; + antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { + inherit (pkgs) antlr4; + }; - antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; + antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { + inherit (pkgs) antlr4; + }; anyio = callPackage ../development/python-modules/anyio { }; anyjson = callPackage ../development/python-modules/anyjson { }; - anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; + anytree = callPackage ../development/python-modules/anytree { + inherit (pkgs) graphviz; + }; apache-airflow = callPackage ../development/python-modules/apache-airflow { }; @@ -432,9 +438,13 @@ in { area = callPackage ../development/python-modules/area { }; - arelle = callPackage ../development/python-modules/arelle { gui = true; }; + arelle = callPackage ../development/python-modules/arelle { + gui = true; + }; - arelle-headless = callPackage ../development/python-modules/arelle { gui = false; }; + arelle-headless = callPackage ../development/python-modules/arelle { + gui = false; + }; aresponses = callPackage ../development/python-modules/aresponses { }; @@ -446,7 +456,7 @@ in { args = callPackage ../development/python-modules/args { }; - aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2; }; + aria2p = callPackage ../development/python-modules/aria2p { }; arrayqueues = callPackage ../development/python-modules/arrayqueues { }; @@ -558,7 +568,9 @@ in { audiotools = callPackage ../development/python-modules/audiotools { }; - augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; }; + augeas = callPackage ../development/python-modules/augeas { + inherit (pkgs) augeas; + }; auroranoaa = callPackage ../development/python-modules/auroranoaa { }; @@ -730,8 +742,7 @@ in { azure-mgmt-iothub = callPackage ../development/python-modules/azure-mgmt-iothub { }; - azure-mgmt-iothubprovisioningservices = - callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; + azure-mgmt-iothubprovisioningservices = callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; azure-mgmt-keyvault = callPackage ../development/python-modules/azure-mgmt-keyvault { }; @@ -873,8 +884,7 @@ in { backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; - backports_ssl_match_hostname = - if !(pythonOlder "3.5") then null else callPackage ../development/python-modules/backports_ssl_match_hostname { }; + backports_ssl_match_hostname = callPackage ../development/python-modules/backports_ssl_match_hostname { }; backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; @@ -886,7 +896,9 @@ in { bandit = callPackage ../development/python-modules/bandit { }; - bap = callPackage ../development/python-modules/bap { inherit (pkgs.ocaml-ng.ocamlPackages) bap; }; + bap = callPackage ../development/python-modules/bap { + inherit (pkgs.ocaml-ng.ocamlPackages) bap; + }; baron = callPackage ../development/python-modules/baron { }; @@ -898,11 +910,11 @@ in { basemap = callPackage ../development/python-modules/basemap { }; - bash_kernel = callPackage ../development/python-modules/bash_kernel { inherit (pkgs) bash; }; + bash_kernel = callPackage ../development/python-modules/bash_kernel { }; bashlex = callPackage ../development/python-modules/bashlex { }; - basiciw = callPackage ../development/python-modules/basiciw { inherit (pkgs) gcc wirelesstools; }; + basiciw = callPackage ../development/python-modules/basiciw { }; batchgenerators = callPackage ../development/python-modules/batchgenerators { }; @@ -1118,8 +1130,7 @@ in { buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = self.buildbot.withPlugins - (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); + buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; @@ -1133,7 +1144,7 @@ in { bunch = callPackage ../development/python-modules/bunch { }; - bx-python = callPackage ../development/python-modules/bx-python { inherit (pkgs) zlib; }; + bx-python = callPackage ../development/python-modules/bx-python { }; bwapy = callPackage ../development/python-modules/bwapy { }; @@ -1180,7 +1191,9 @@ in { canopen = callPackage ../development/python-modules/canopen { }; - capstone = callPackage ../development/python-modules/capstone { inherit (pkgs) capstone; }; + capstone = callPackage ../development/python-modules/capstone { + inherit (pkgs) capstone; + }; capturer = callPackage ../development/python-modules/capturer { }; @@ -1260,7 +1273,9 @@ in { chai = callPackage ../development/python-modules/chai { }; - chainer = callPackage ../development/python-modules/chainer { cudaSupport = pkgs.config.cudaSupport or false; }; + chainer = callPackage ../development/python-modules/chainer { + cudaSupport = pkgs.config.cudaSupport or false; + }; chainmap = callPackage ../development/python-modules/chainmap { }; @@ -1618,9 +1633,7 @@ in { dask-gateway = callPackage ../development/python-modules/dask-gateway { }; - dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { - inherit (pkgs) go; - }; + dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { }; dask-glm = callPackage ../development/python-modules/dask-glm { }; @@ -1638,9 +1651,7 @@ in { databricks-cli = callPackage ../development/python-modules/databricks-cli { }; - databricks-connect = callPackage ../development/python-modules/databricks-connect { - inherit (pkgs) jdk; - }; + databricks-connect = callPackage ../development/python-modules/databricks-connect { }; dataclasses = callPackage ../development/python-modules/dataclasses { }; @@ -1662,9 +1673,7 @@ in { datashape = callPackage ../development/python-modules/datashape { }; - datatable = callPackage ../development/python-modules/datatable { - inherit (pkgs.llvmPackages) libcxx; - }; + datatable = callPackage ../development/python-modules/datatable { }; dateparser = callPackage ../development/python-modules/dateparser { }; @@ -2016,9 +2025,7 @@ in { ds-store = callPackage ../development/python-modules/ds-store { }; - ds4drv = callPackage ../development/python-modules/ds4drv { - inherit (pkgs) bluez; - }; + ds4drv = callPackage ../development/python-modules/ds4drv { }; dtopt = callPackage ../development/python-modules/dtopt { }; @@ -2047,10 +2054,7 @@ in { EasyProcess = callPackage ../development/python-modules/easyprocess { }; - easysnmp = callPackage ../development/python-modules/easysnmp { - openssl = pkgs.openssl; - net-snmp = pkgs.net-snmp; - }; + easysnmp = callPackage ../development/python-modules/easysnmp { }; easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; @@ -2085,7 +2089,7 @@ in { elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { }; - elasticsearchdsl = self.elasticsearch-dsl; # alias + elasticsearchdsl = self.elasticsearch-dsl; elementpath = callPackage ../development/python-modules/elementpath { }; @@ -2299,9 +2303,7 @@ in { fints = callPackage ../development/python-modules/fints { }; - fiona = callPackage ../development/python-modules/fiona { - gdal_2 = pkgs.gdal_2; - }; + fiona = callPackage ../development/python-modules/fiona { }; fipy = callPackage ../development/python-modules/fipy { }; @@ -2808,6 +2810,7 @@ in { gorilla = callPackage ../development/python-modules/gorilla { }; gpapi = callPackage ../development/python-modules/gpapi { }; + gplaycli = callPackage ../development/python-modules/gplaycli { }; gpgme = toPythonModule (pkgs.gpgme.override { @@ -2817,7 +2820,9 @@ in { gphoto2 = callPackage ../development/python-modules/gphoto2 { }; - gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; + gprof2dot = callPackage ../development/python-modules/gprof2dot { + inherit (pkgs) graphviz; + }; gps3 = callPackage ../development/python-modules/gps3 { }; @@ -2859,7 +2864,9 @@ in { graphtage = callPackage ../development/python-modules/graphtage { }; - graphviz = callPackage ../development/python-modules/graphviz { inherit (pkgs) graphviz; }; + graphviz = callPackage ../development/python-modules/graphviz { + inherit (pkgs) graphviz; + }; grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; @@ -2924,7 +2931,9 @@ in { guppy3 = callPackage ../development/python-modules/guppy3 { }; gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" then - callPackage ../development/python-modules/gurobipy/darwin.nix { inherit (pkgs.darwin) cctools insert_dylib; } + callPackage ../development/python-modules/gurobipy/darwin.nix { + inherit (pkgs.darwin) cctools insert_dylib; + } else if stdenv.hostPlatform.system == "x86_64-linux" then callPackage ../development/python-modules/gurobipy/linux.nix { } else @@ -2947,13 +2956,17 @@ in { h2 = callPackage ../development/python-modules/h2 { }; - h3 = callPackage ../development/python-modules/h3 { inherit (pkgs) h3; }; + h3 = callPackage ../development/python-modules/h3 { + inherit (pkgs) h3; + }; h5netcdf = callPackage ../development/python-modules/h5netcdf { }; - h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; + h5py = callPackage ../development/python-modules/h5py { }; - h5py-mpi = self.h5py.override { hdf5 = pkgs.hdf5-mpi; }; + h5py-mpi = self.h5py.override { + hdf5 = pkgs.hdf5-mpi; + }; habanero = callPackage ../development/python-modules/habanero { }; @@ -2991,7 +3004,9 @@ in { helper = callPackage ../development/python-modules/helper { }; - hepmc3 = toPythonModule (pkgs.hepmc3.override { inherit python; }); + hepmc3 = toPythonModule (pkgs.hepmc3.override { + inherit python; + }); hetzner = callPackage ../development/python-modules/hetzner { }; @@ -3007,7 +3022,9 @@ in { hickle = callPackage ../development/python-modules/hickle { }; - hidapi = callPackage ../development/python-modules/hidapi { inherit (pkgs) udev libusb1; }; + hidapi = callPackage ../development/python-modules/hidapi { + inherit (pkgs) udev libusb1; + }; hieroglyph = callPackage ../development/python-modules/hieroglyph { }; @@ -3035,7 +3052,9 @@ in { homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; - hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { inherit python; }); + hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { + inherit python; + }); hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; @@ -3127,8 +3146,8 @@ in { hyperopt = callPackage ../development/python-modules/hyperopt { }; - hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix - { }; # File name is called 2.nix because this one will need to remain for Python 2. + # File name is called 2.nix because this one will need to remain for Python 2. + hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix { }; hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { }; @@ -3417,13 +3436,17 @@ in { josepy = callPackage ../development/python-modules/josepy { }; - journalwatch = callPackage ../tools/system/journalwatch { inherit (self) systemd pytest; }; + journalwatch = callPackage ../tools/system/journalwatch { + inherit (self) systemd pytest; + }; jpylyzer = callPackage ../development/python-modules/jpylyzer { }; JPype1 = callPackage ../development/python-modules/JPype1 { }; - jq = callPackage ../development/python-modules/jq { inherit (pkgs) jq; }; + jq = callPackage ../development/python-modules/jq { + inherit (pkgs) jq; + }; jsbeautifier = callPackage ../development/python-modules/jsbeautifier { }; @@ -3507,8 +3530,7 @@ in { jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; - jupyterhub-systemdspawner = - callPackage ../development/python-modules/jupyterhub-systemdspawner { inherit (pkgs) bash; }; + jupyterhub-systemdspawner = callPackage ../development/python-modules/jupyterhub-systemdspawner { }; jupyterhub-tmpauthenticator = callPackage ../development/python-modules/jupyterhub-tmpauthenticator { }; @@ -3522,7 +3544,9 @@ in { jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; - jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; }; + jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { + pkgs-docker = pkgs.docker; + }; jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { }; @@ -3532,7 +3556,9 @@ in { jwcrypto = callPackage ../development/python-modules/jwcrypto { }; - k5test = callPackage ../development/python-modules/k5test { inherit (pkgs) krb5Full findutils which; }; + k5test = callPackage ../development/python-modules/k5test { + inherit (pkgs) krb5Full findutils which; + }; kaa-base = callPackage ../development/python-modules/kaa-base { }; @@ -3566,7 +3592,9 @@ in { keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; - kerberos = callPackage ../development/python-modules/kerberos { inherit (pkgs) kerberos; }; + kerberos = callPackage ../development/python-modules/kerberos { + inherit (pkgs) kerberos; + }; keyring = if isPy3k then callPackage ../development/python-modules/keyring { } @@ -3577,9 +3605,13 @@ in { keystone-engine = callPackage ../development/python-modules/keystone-engine { }; - keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; + keyutils = callPackage ../development/python-modules/keyutils { + inherit (pkgs) keyutils; + }; - kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { python3 = python; }).src); + kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { + python3 = python; + }).src); kinparse = callPackage ../development/python-modules/kinparse { }; @@ -3623,7 +3655,7 @@ in { labgrid = callPackage ../development/python-modules/labgrid { }; - lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.mpi; }; + lammps-cython = callPackage ../development/python-modules/lammps-cython { }; langcodes = callPackage ../development/python-modules/langcodes { }; @@ -3689,11 +3721,17 @@ in { libais = callPackage ../development/python-modules/libais { }; - libarchive-c = callPackage ../development/python-modules/libarchive-c { inherit (pkgs) libarchive; }; + libarchive-c = callPackage ../development/python-modules/libarchive-c { + inherit (pkgs) libarchive; + }; - libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; + libarcus = callPackage ../development/python-modules/libarcus { + inherit (pkgs) protobuf; + }; - libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns; }; + libasyncns = callPackage ../development/python-modules/libasyncns { + inherit (pkgs) libasyncns; + }; libcloud = if isPy27 then callPackage ../development/python-modules/libcloud/2.nix { } @@ -3741,7 +3779,9 @@ in { libmr = callPackage ../development/python-modules/libmr { }; - libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; }; + libnacl = callPackage ../development/python-modules/libnacl { + inherit (pkgs) libsodium; + }; libnl-python = disabledIf isPy3k (toPythonModule (pkgs.libnl.override { pythonSupport = true; @@ -3771,7 +3811,9 @@ in { librouteros = callPackage ../development/python-modules/librouteros { }; - libsass = (callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; }); + libsass = (callPackage ../development/python-modules/libsass { + inherit (pkgs) libsass; + }); libsavitar = callPackage ../development/python-modules/libsavitar { }; @@ -3861,7 +3903,9 @@ in { liquidctl = callPackage ../development/python-modules/liquidctl { }; - lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; })); + lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { + python3 = python; + })); littleutils = callPackage ../development/python-modules/littleutils { }; @@ -3933,7 +3977,9 @@ in { lxc = callPackage ../development/python-modules/lxc { }; - lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; }; + lxml = callPackage ../development/python-modules/lxml { + inherit (pkgs) libxml2 libxslt zlib; + }; lyricwikia = callPackage ../development/python-modules/lyricwikia { }; @@ -4001,7 +4047,9 @@ in { manuel = callPackage ../development/python-modules/manuel { }; - manticore = callPackage ../development/python-modules/manticore { inherit (pkgs) z3; }; + manticore = callPackage ../development/python-modules/manticore { + inherit (pkgs) z3; + }; mapbox = callPackage ../development/python-modules/mapbox { }; @@ -4011,7 +4059,9 @@ in { marionette-harness = callPackage ../development/python-modules/marionette-harness { }; - marisa = callPackage ../development/python-modules/marisa { marisa = pkgs.marisa; }; + marisa = callPackage ../development/python-modules/marisa { + inherit (pkgs) marisa; + }; marisa-trie = callPackage ../development/python-modules/marisa-trie { }; @@ -4101,7 +4151,9 @@ in { memory_profiler = callPackage ../development/python-modules/memory_profiler { }; - mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { python3Packages = self; })); + mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { + python3Packages = self; + })); mergedeep = callPackage ../development/python-modules/mergedeep { }; @@ -4144,7 +4196,9 @@ in { minimock = callPackage ../development/python-modules/minimock { }; - mininet-python = (toPythonModule (pkgs.mininet.override { inherit python; })).py; + mininet-python = (toPythonModule (pkgs.mininet.override { + inherit python; + })).py; minio = callPackage ../development/python-modules/minio { }; @@ -4199,8 +4253,8 @@ in { mohawk = callPackage ../development/python-modules/mohawk { }; - moinmoin = callPackage ../development/python-modules/moinmoin - { }; # Needed here because moinmoin is loaded as a Python library. + # Needed here because moinmoin is loaded as a Python library. + moinmoin = callPackage ../development/python-modules/moinmoin { }; mongodict = callPackage ../development/python-modules/mongodict { }; @@ -4268,13 +4322,15 @@ in { mpd = callPackage ../development/python-modules/mpd { }; - mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.mpi; }; + mpi4py = callPackage ../development/python-modules/mpi4py { }; mplleaflet = callPackage ../development/python-modules/mplleaflet { }; mpmath = callPackage ../development/python-modules/mpmath { }; - mpv = callPackage ../development/python-modules/mpv { mpv = pkgs.mpv; }; + mpv = callPackage ../development/python-modules/mpv { + inherit (pkgs) mpv; + }; mpyq = callPackage ../development/python-modules/mpyq { }; @@ -4377,7 +4433,9 @@ in { nanoleaf = callPackage ../development/python-modules/nanoleaf { }; - nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + nanomsg-python = callPackage ../development/python-modules/nanomsg-python { + inherit (pkgs) nanomsg; + }; nanotime = callPackage ../development/python-modules/nanotime { }; @@ -4467,16 +4525,20 @@ in { nipy = callPackage ../development/python-modules/nipy { }; - nipype = callPackage ../development/python-modules/nipype { inherit (pkgs) which; }; + nipype = callPackage ../development/python-modules/nipype { + inherit (pkgs) which; + }; nitime = callPackage ../development/python-modules/nitime { }; nitpick = callPackage ../applications/version-management/nitpick { }; - nix-kernel = callPackage ../development/python-modules/nix-kernel { inherit (pkgs) nix; }; + nix-kernel = callPackage ../development/python-modules/nix-kernel { + inherit (pkgs) nix; + }; - nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 - { }; # This is used for NixOps to make sure we won't break it with the next major version of nixpart. + # This is used for NixOps to make sure we won't break it with the next major version of nixpart. + nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; nixpart = callPackage ../tools/filesystems/nixpart { }; @@ -4549,8 +4611,13 @@ in { notify-py = callPackage ../development/python-modules/notify-py { }; - notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; }; - notmuch2 = callPackage ../development/python-modules/notmuch/2.nix { inherit (pkgs) notmuch; }; + notmuch = callPackage ../development/python-modules/notmuch { + inherit (pkgs) notmuch; + }; + + notmuch2 = callPackage ../development/python-modules/notmuch/2.nix { + inherit (pkgs) notmuch; + }; nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; @@ -4570,7 +4637,7 @@ in { numba = callPackage ../development/python-modules/numba { }; - numcodecs = callPackage ../development/python-modules/numcodecs { inherit (pkgs) gcc8; }; + numcodecs = callPackage ../development/python-modules/numcodecs { }; numericalunits = callPackage ../development/python-modules/numericalunits { }; @@ -4612,7 +4679,10 @@ in { obfsproxy = callPackage ../development/python-modules/obfsproxy { }; - objgraph = callPackage ../development/python-modules/objgraph { graphvizPkg = pkgs.graphviz; }; + objgraph = callPackage ../development/python-modules/objgraph { + # requires both the graphviz package and python package + graphvizPkgs = pkgs.graphviz; + }; od = callPackage ../development/python-modules/od { }; @@ -4884,7 +4954,9 @@ in { pefile = callPackage ../development/python-modules/pefile { }; - pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; }; + pelican = callPackage ../development/python-modules/pelican { + inherit (pkgs) glibcLocales git; + }; pendulum = callPackage ../development/python-modules/pendulum { }; @@ -4917,6 +4989,7 @@ in { pexpect = callPackage ../development/python-modules/pexpect { }; pg8000 = callPackage ../development/python-modules/pg8000 { }; + pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { }; pgcli = callPackage ../development/tools/database/pgcli { }; @@ -4993,7 +5066,7 @@ in { pip-tools = callPackage ../development/python-modules/pip-tools { git = pkgs.gitMinimal; - glibcLocales = pkgs.glibcLocales; + inherit (pkgs) glibcLocales; }; pipx = callPackage ../development/python-modules/pipx { }; @@ -5175,6 +5248,7 @@ in { prison = callPackage ../development/python-modules/prison { }; privacyidea = callPackage ../development/python-modules/privacyidea { }; + privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; proboscis = callPackage ../development/python-modules/proboscis { }; @@ -5214,9 +5288,9 @@ in { protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; - doCheck = - !isPy3k; # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. - protobuf = pkgs.protobuf; + # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. + doCheck = !isPy3k; + inherit (pkgs) protobuf; }; protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { }; @@ -5241,7 +5315,7 @@ in { ptest = callPackage ../development/python-modules/ptest { }; - ptpython = callPackage ../development/python-modules/ptpython { prompt_toolkit = self.prompt_toolkit; }; + ptpython = callPackage ../development/python-modules/ptpython { }; ptyprocess = callPackage ../development/python-modules/ptyprocess { }; @@ -5281,7 +5355,9 @@ in { Pweave = callPackage ../development/python-modules/pweave { }; - pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; }; + pwntools = callPackage ../development/python-modules/pwntools { + debugger = pkgs.gdb; + }; pxml = callPackage ../development/python-modules/pxml { }; @@ -5492,7 +5568,9 @@ in { pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; - pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; }; + pydot = callPackage ../development/python-modules/pydot { + inherit (pkgs) graphviz; + }; pydrive = callPackage ../development/python-modules/pydrive { }; @@ -5514,7 +5592,9 @@ in { pyemd = callPackage ../development/python-modules/pyemd { }; - pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; }; + pyenchant = callPackage ../development/python-modules/pyenchant { + inherit (pkgs) enchant2; + }; pyepsg = callPackage ../development/python-modules/pyepsg { }; @@ -5616,9 +5696,13 @@ in { pygobject2 = callPackage ../development/python-modules/pygobject { }; pygobject3 = if isPy3k then - callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson; } + callPackage ../development/python-modules/pygobject/3.nix { + inherit (pkgs) meson; + } else - callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson; }; + callPackage ../development/python-modules/pygobject/3.36.nix { + inherit (pkgs) meson; + }; pygogo = callPackage ../development/python-modules/pygogo { }; @@ -5626,7 +5710,7 @@ in { pygraphviz = callPackage ../development/python-modules/pygraphviz { inherit (pkgs) graphviz; - }; # not the python package + }; pygreat = callPackage ../development/python-modules/pygreat { }; @@ -5687,7 +5771,9 @@ in { pykdl = callPackage ../development/python-modules/pykdl { }; - pykdtree = callPackage ../development/python-modules/pykdtree { inherit (pkgs.llvmPackages) openmp; }; + pykdtree = callPackage ../development/python-modules/pykdtree { + inherit (pkgs.llvmPackages) openmp; + }; pykeepass = callPackage ../development/python-modules/pykeepass { }; @@ -5722,7 +5808,9 @@ in { pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; - pylibftdi = callPackage ../development/python-modules/pylibftdi { inherit (pkgs) libusb1; }; + pylibftdi = callPackage ../development/python-modules/pylibftdi { + inherit (pkgs) libusb1; + }; pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 @@ -5967,20 +6055,28 @@ in { pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { }; - pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { + pythonPackages = self; + }; - pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; + pyqt5_with_qtmultimedia = self.pyqt5.override { + withMultimedia = true; + }; /* `pyqt5_with_qtwebkit` should not be used by python libraries in pkgs/development/python-modules/*. Putting this attribute in `propagatedBuildInputs` may cause collisions. */ - pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; + pyqt5_with_qtwebkit = self.pyqt5.override { + withWebKit = true; + }; pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { + pythonPackages = self; + }; pyquery = callPackage ../development/python-modules/pyquery { }; @@ -6059,11 +6155,15 @@ in { pysam = callPackage ../development/python-modules/pysam { }; - pysaml2 = callPackage ../development/python-modules/pysaml2 { inherit (pkgs) xmlsec; }; + pysaml2 = callPackage ../development/python-modules/pysaml2 { + inherit (pkgs) xmlsec; + }; pysc2 = callPackage ../development/python-modules/pysc2 { }; - pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; + pyscard = callPackage ../development/python-modules/pyscard { + inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; + }; pyschedule = callPackage ../development/python-modules/pyschedule { }; @@ -6091,14 +6191,21 @@ in { pyshp = callPackage ../development/python-modules/pyshp { }; - pyside2-tools = - toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); + pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools { + inherit (pkgs) cmake qt5; + }); - pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja qt5; }); + pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { + inherit (pkgs) cmake ninja qt5; + }); - pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; + pyside = callPackage ../development/python-modules/pyside { + inherit (pkgs) mesa; + }; - pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { inherit (pkgs) libxml2 libxslt; }; + pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { + inherit (pkgs) libxml2 libxslt; + }; pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; @@ -6106,7 +6213,9 @@ in { pysingleton = callPackage ../development/python-modules/pysingleton { }; - pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; }; + pyslurm = callPackage ../development/python-modules/pyslurm { + inherit (pkgs) slurm; + }; pysma = callPackage ../development/python-modules/pysma { }; @@ -6172,7 +6281,9 @@ in { pystache = callPackage ../development/python-modules/pystache { }; - pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; }; + pystemd = callPackage ../development/python-modules/pystemd { + inherit (pkgs) systemd; + }; PyStemmer = callPackage ../development/python-modules/pystemmer { }; @@ -6210,18 +6321,27 @@ in { pytest = if isPy3k then self.pytest_6 else self.pytest_4; pytest_4 = callPackage - ../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; + ../development/python-modules/pytest/4.nix { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { + doCheck = false; + }; }; pytest_5 = callPackage - ../development/python-modules/pytest/5.nix { # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; + ../development/python-modules/pytest/5.nix { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { + doCheck = false; + }; }; pytest_6 = - callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; + callPackage ../development/python-modules/pytest { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { + doCheck = false; + }; }; pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; @@ -6512,7 +6632,9 @@ in { python-lzf = callPackage ../development/python-modules/python-lzf { }; - python-lzo = callPackage ../development/python-modules/python-lzo { inherit (pkgs) lzo; }; + python-lzo = callPackage ../development/python-modules/python-lzo { + inherit (pkgs) lzo; + }; python_magic = callPackage ../development/python-modules/python-magic { }; @@ -6596,7 +6718,9 @@ in { inherit (pkgs) snap7; }; - python-snappy = callPackage ../development/python-modules/python-snappy { inherit (pkgs) snappy; }; + python-snappy = callPackage ../development/python-modules/python-snappy { + inherit (pkgs) snappy; + }; python-socketio = callPackage ../development/python-modules/python-socketio { }; @@ -6654,7 +6778,9 @@ in { pytools = callPackage ../development/python-modules/pytools { }; - pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; }; + pytorch = callPackage ../development/python-modules/pytorch { + cudaSupport = pkgs.config.cudaSupport or false; + }; pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { }; @@ -6662,9 +6788,13 @@ in { pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; - pytorchWithCuda = self.pytorch.override { cudaSupport = true; }; + pytorchWithCuda = self.pytorch.override { + cudaSupport = true; + }; - pytorchWithoutCuda = self.pytorch.override { cudaSupport = false; }; + pytorchWithoutCuda = self.pytorch.override { + cudaSupport = false; + }; pytrafikverket = callPackage ../development/python-modules/pytrafikverket { }; @@ -6691,7 +6821,9 @@ in { }); }; - pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) systemd; }; + pyudev = callPackage ../development/python-modules/pyudev { + inherit (pkgs) systemd; + }; pyunbound = callPackage ../tools/networking/unbound/python.nix { }; @@ -6701,7 +6833,9 @@ in { pyupgrade = callPackage ../development/python-modules/pyupgrade { }; - pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; }; + pyusb = callPackage ../development/python-modules/pyusb { + inherit (pkgs) libusb1; + }; pyutil = callPackage ../development/python-modules/pyutil { }; @@ -6745,8 +6879,9 @@ in { pywavelets = callPackage ../development/python-modules/pywavelets { }; - # We need "normal" libxml2 and not the python package by the same name. - pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; + pywbem = callPackage ../development/python-modules/pywbem { + inherit (pkgs) libxml2; + }; PyWebDAV = callPackage ../development/python-modules/pywebdav { }; @@ -6827,7 +6962,9 @@ in { qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; - qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; + qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { + pythonPackages = self; + }; qscintilla = self.qscintilla-qt4; @@ -6843,8 +6980,8 @@ in { quandl = callPackage ../development/python-modules/quandl { }; - Quandl = - callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3 + # TODO: rename this + Quandl = callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3 quantities = callPackage ../development/python-modules/quantities { }; @@ -6874,9 +7011,13 @@ in { random2 = callPackage ../development/python-modules/random2 { }; - rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; + rarfile = callPackage ../development/python-modules/rarfile { + inherit (pkgs) libarchive; + }; - rasterio = callPackage ../development/python-modules/rasterio { gdal = pkgs.gdal_2; }; # gdal 3.0 not supported yet + rasterio = callPackage ../development/python-modules/rasterio { + gdal = pkgs.gdal_2; + }; ratelimit = callPackage ../development/python-modules/ratelimit { }; @@ -7026,7 +7167,9 @@ in { rising = callPackage ../development/python-modules/rising { }; - rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { python3 = python; })); + rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { + python3 = python; + })); rjsmin = callPackage ../development/python-modules/rjsmin { }; @@ -7088,7 +7231,9 @@ in { rply = callPackage ../development/python-modules/rply { }; - rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override { inherit python; })); + rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override { + inherit python; + })); rpmfluff = callPackage ../development/python-modules/rpmfluff { }; @@ -7108,7 +7253,9 @@ in { rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; - Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; + Rtree = callPackage ../development/python-modules/Rtree { + inherit (pkgs) libspatialindex; + }; rtslib = callPackage ../development/python-modules/rtslib { }; @@ -7274,7 +7421,9 @@ in { seccomp = callPackage ../development/python-modules/seccomp { }; - secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1; }; + secp256k1 = callPackage ../development/python-modules/secp256k1 { + inherit (pkgs) secp256k1; + }; secretstorage = if isPy3k then callPackage ../development/python-modules/secretstorage { } @@ -7303,7 +7452,9 @@ in { sendgrid = callPackage ../development/python-modules/sendgrid { }; - sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece; }; + sentencepiece = callPackage ../development/python-modules/sentencepiece { + inherit (pkgs) sentencepiece; + }; sentinel = callPackage ../development/python-modules/sentinel { }; @@ -7365,8 +7516,9 @@ in { shellingham = callPackage ../development/python-modules/shellingham { }; - shiboken2 = - toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages qt5; }); + shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 { + inherit (pkgs) cmake llvmPackages qt5; + }); shippai = callPackage ../development/python-modules/shippai { }; @@ -7456,7 +7608,9 @@ in { slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; - slixmpp = callPackage ../development/python-modules/slixmpp { inherit (pkgs) gnupg; }; + slixmpp = callPackage ../development/python-modules/slixmpp { + inherit (pkgs) gnupg; + }; slob = callPackage ../development/python-modules/slob { }; @@ -7480,7 +7634,9 @@ in { smpplib = callPackage ../development/python-modules/smpplib { }; - snack = toPythonModule (pkgs.newt.override { inherit (self) python; }); + snack = toPythonModule (pkgs.newt.override { + inherit (self) python; + }); snakebite = callPackage ../development/python-modules/snakebite { }; @@ -7599,8 +7755,9 @@ in { sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; - sphinxcontrib_plantuml = - callPackage ../development/python-modules/sphinxcontrib_plantuml { inherit (pkgs) plantuml; }; + sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { + inherit (pkgs) plantuml; + }; sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { }; @@ -7643,9 +7800,11 @@ in { spotipy = callPackage ../development/python-modules/spotipy { }; spyder = callPackage ../development/python-modules/spyder { }; + spyder_3 = callPackage ../development/python-modules/spyder/3.nix { }; spyder-kernels = callPackage ../development/python-modules/spyder-kernels { }; + spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix { }; sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; @@ -7667,6 +7826,7 @@ in { sqlitedict = callPackage ../development/python-modules/sqlitedict { }; sqlite-fts4 = callPackage ../development/python-modules/sqlite-fts4 { }; + sqlite-utils = callPackage ../development/python-modules/sqlite-utils { }; sqlmap = callPackage ../development/python-modules/sqlmap { }; @@ -7767,7 +7927,9 @@ in { subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit cppunit check; }; + subunit = callPackage ../development/python-modules/subunit { + inherit (pkgs) subunit cppunit check; + }; suds = callPackage ../development/python-modules/suds { }; @@ -7818,16 +7980,18 @@ in { else callPackage ../development/python-modules/sympy/1_5.nix { }; - systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; }; + systemd = callPackage ../development/python-modules/systemd { + inherit (pkgs) systemd; + }; sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; tables = if isPy3k then - callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; } + callPackage ../development/python-modules/tables { } else - callPackage ../development/python-modules/tables/3.5.nix { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; + callPackage ../development/python-modules/tables/3.5.nix { }; tablib = callPackage ../development/python-modules/tablib { }; @@ -7906,9 +8070,13 @@ in { tensorflow-tensorboard = self.tensorflow-tensorboard_2; - tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; }; + tensorflowWithCuda = self.tensorflow.override { + cudaSupport = true; + }; - tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; }; + tensorflowWithoutCuda = self.tensorflow.override { + cudaSupport = false; + }; tensorly = callPackage ../development/python-modules/tensorly { }; @@ -7993,14 +8161,16 @@ in { thumborPexif = callPackage ../development/python-modules/thumborpexif { }; tkinter = let - py = python.override{x11Support=true;}; + py = python.override { x11Support=true; }; in callPackage ../development/python-modules/tkinter { py = py; }; tidylib = callPackage ../development/python-modules/pytidylib { }; tifffile = callPackage ../development/python-modules/tifffile { }; - tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; }; + tiledb = callPackage ../development/python-modules/tiledb { + inherit (pkgs) tiledb; + }; tilestache = callPackage ../development/python-modules/tilestache { }; @@ -8078,7 +8248,9 @@ in { # Used by streamlit, graphite_beacon, 2021-01-29 tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; - towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; }; + towncrier = callPackage ../development/python-modules/towncrier { + inherit (pkgs) git; + }; tox = callPackage ../development/python-modules/tox { }; @@ -8231,7 +8403,9 @@ in { uarray = callPackage ../development/python-modules/uarray { }; - ueberzug = callPackage ../development/python-modules/ueberzug { inherit (pkgs.xorg) libX11 libXext; }; + ueberzug = callPackage ../development/python-modules/ueberzug { + inherit (pkgs.xorg) libX11 libXext; + }; ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; @@ -8610,7 +8784,9 @@ in { x256 = callPackage ../development/python-modules/x256 { }; - xapian = callPackage ../development/python-modules/xapian { xapian = pkgs.xapian; }; + xapian = callPackage ../development/python-modules/xapian { + inherit (pkgs) xapian; + }; xapp = callPackage ../development/python-modules/xapp { inherit (pkgs) gtk3 gobject-introspection polkit; @@ -8635,7 +8811,9 @@ in { xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); - xgboost = callPackage ../development/python-modules/xgboost { xgboost = pkgs.xgboost; }; + xgboost = callPackage ../development/python-modules/xgboost { + inherit (pkgs) xgboost; + }; xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; @@ -8685,7 +8863,9 @@ in { xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments { }; - xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { inherit (pkgs.xorg) xorgserver; }; + xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { + inherit (pkgs.xorg) xorgserver; + }; xxhash = callPackage ../development/python-modules/xxhash { }; @@ -8744,7 +8924,9 @@ in { z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; - z3 = (toPythonModule (pkgs.z3.override { inherit python; })).python; + z3 = (toPythonModule (pkgs.z3.override { + inherit python; + })).python; zake = callPackage ../development/python-modules/zake { }; @@ -8770,7 +8952,9 @@ in { zeep = callPackage ../development/python-modules/zeep { }; - zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py; + zeitgeist = (toPythonModule (pkgs.zeitgeist.override { + python3 = python; + })).py; zerobin = callPackage ../development/python-modules/zerobin { }; @@ -8863,10 +9047,11 @@ in { zstandard = callPackage ../development/python-modules/zstandard { }; - zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd; }; + zstd = callPackage ../development/python-modules/zstd { + inherit (pkgs) zstd; + }; zulip = callPackage ../development/python-modules/zulip { }; zxcvbn = callPackage ../development/python-modules/zxcvbn { }; - }