diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-09-09 08:09:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-09 08:09:36 +0200 |
commit | 731c82a447d916e78f31642ad757a3ce8911f1ea (patch) | |
tree | 8630c820679c3d3245267a4f701ae9a4a9cd3e3e /pkgs/top-level/python-packages.nix | |
parent | 21f61dde0dcf436660224acdb7ee5bd6d72ee192 (diff) | |
parent | b5284a56d9b2c0bace0e7d9acdb2003b47fe581e (diff) |
Merge pull request #68244 from NixOS/staging-next
Staging next that includes gcc8
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80e5420bf002..6e936afd5ea1 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 { }; @@ -4237,8 +4233,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 { }; |