diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-31 10:13:15 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-09-01 16:16:31 +0200 |
commit | b080748d42d18a3a51e4afacc962d9528ae4200d (patch) | |
tree | 93aad640de499a1473afadf22207468bc2f62b25 | |
parent | b17cd148ba7a9eaadd689c49e8b72c80151dcecb (diff) |
Python: move python-modules/generic to interpreter folder
-rw-r--r-- | doc/languages-frameworks/python.md | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/buildpythonpackage.nix (renamed from pkgs/development/python-modules/generic/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/catch_conflicts.py (renamed from pkgs/development/python-modules/generic/catch_conflicts.py) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/run_setup.py (renamed from pkgs/development/python-modules/generic/run_setup.py) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/wrap.sh (renamed from pkgs/development/python-modules/generic/wrap.sh) | 0 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
6 files changed, 3 insertions, 3 deletions
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index c38266413bf7e..ffda162ffde54 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -481,7 +481,7 @@ and the aliases #### `buildPythonPackage` function The `buildPythonPackage` function is implemented in -`pkgs/development/python-modules/generic/default.nix` +`pkgs/development/interpreters/python/buildpythonpackage.nix` and can be used as: diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/interpreters/python/buildpythonpackage.nix index 38d74e0824459..38d74e0824459 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/interpreters/python/buildpythonpackage.nix diff --git a/pkgs/development/python-modules/generic/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts.py index bb82900c65a92..bb82900c65a92 100644 --- a/pkgs/development/python-modules/generic/catch_conflicts.py +++ b/pkgs/development/interpreters/python/catch_conflicts.py diff --git a/pkgs/development/python-modules/generic/run_setup.py b/pkgs/development/interpreters/python/run_setup.py index e3a530eb0cb6a..e3a530eb0cb6a 100644 --- a/pkgs/development/python-modules/generic/run_setup.py +++ b/pkgs/development/interpreters/python/run_setup.py diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index f4b63b826403b..f4b63b826403b 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 574cff47122aa..991ceaf1f12c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,7 +18,7 @@ let bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { }; - buildPythonPackage = makeOverridable (callPackage ../development/python-modules/generic { + buildPythonPackage = makeOverridable (callPackage ../development/interpreters/python/buildpythonpackage.nix { inherit bootstrapped-pip; }); @@ -82,7 +82,7 @@ in modules // { } ''; } - ../development/python-modules/generic/wrap.sh; + ../development/interpreters/python/wrap.sh; # specials |