diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:47:40 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:47:40 +0200 |
commit | 9894a70299497ee1d2bb746374d986e8d0f771e3 (patch) | |
tree | dd3c241c075e47283065a5d70d3510eaa5c6ae5f /pkgs/top-level/python-packages.nix | |
parent | 66bc7fc1b3e7a85a2cfde9bb121498a181d411a4 (diff) | |
parent | 3263254cfb3163ec5b036d135b7d516f175014da (diff) | |
download | nixlib-9894a70299497ee1d2bb746374d986e8d0f771e3.tar nixlib-9894a70299497ee1d2bb746374d986e8d0f771e3.tar.gz nixlib-9894a70299497ee1d2bb746374d986e8d0f771e3.tar.bz2 nixlib-9894a70299497ee1d2bb746374d986e8d0f771e3.tar.lz nixlib-9894a70299497ee1d2bb746374d986e8d0f771e3.tar.xz nixlib-9894a70299497ee1d2bb746374d986e8d0f771e3.tar.zst nixlib-9894a70299497ee1d2bb746374d986e8d0f771e3.zip |
Merge staging into staging-next
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa4d6521c005..19ce618e9e48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -42,17 +42,14 @@ let } else ff; - buildPythonPackage = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { - flit = self.flit; - # We want Python libraries to be named like e.g. "python3.6-${name}" - inherit namePrefix; - inherit toPythonModule; + buildPythonPackage = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix { + inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}" + inherit toPythonModule; # Libraries provide modules })); - buildPythonApplication = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { - flit = self.flit; - namePrefix = ""; - toPythonModule = x: x; # Application does not provide modules. + buildPythonApplication = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix { + namePrefix = ""; # Python applications should not have any prefix + toPythonModule = x: x; # Application does not provide modules. })); # See build-setupcfg/default.nix for documentation. @@ -110,6 +107,9 @@ in { inherit toPythonModule toPythonApplication; inherit buildSetupcfg; + inherit (callPackage ../development/interpreters/python/hooks { }) + flitBuildHook pipBuildHook pipInstallHook pytestCheckHook pythonCatchConflictsHook pythonImportsCheckHook pythonRemoveBinBytecodeHook setuptoolsBuildHook setuptoolsCheckHook wheelUnpackHook; + # helpers wrapPython = callPackage ../development/interpreters/python/wrap-python.nix {inherit python; inherit (pkgs) makeSetupHook makeWrapper; }; @@ -121,7 +121,7 @@ in { recursivePthLoader = callPackage ../development/python-modules/recursive-pth-loader { }; - setuptools = toPythonModule (callPackage ../development/python-modules/setuptools { }); + setuptools = callPackage ../development/python-modules/setuptools { }; vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; @@ -1400,8 +1400,6 @@ in { argcomplete = callPackage ../development/python-modules/argcomplete { }; - area53 = callPackage ../development/python-modules/area53 { }; - arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; chai = callPackage ../development/python-modules/chai { }; @@ -2252,8 +2250,6 @@ in { pythonPackages = self; }); - EditorConfig = callPackage ../development/python-modules/editorconfig { }; - edward = callPackage ../development/python-modules/edward { }; elasticsearch = callPackage ../development/python-modules/elasticsearch { }; @@ -4239,8 +4235,6 @@ in { pysoundfile = self.soundfile; # Alias added 23-06-2019 - python3pika = callPackage ../development/python-modules/python3pika { }; - python-jenkins = callPackage ../development/python-modules/python-jenkins { }; pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; @@ -4376,8 +4370,6 @@ in { pyenchant = callPackage ../development/python-modules/pyenchant { }; - pyev = callPackage ../development/python-modules/pyev { }; - pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; pyext = callPackage ../development/python-modules/pyext { }; |