From b080748d42d18a3a51e4afacc962d9528ae4200d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 31 Aug 2016 10:13:15 +0200
Subject: [PATCH] Python: move python-modules/generic to interpreter folder

---
 doc/languages-frameworks/python.md                            | 2 +-
 .../python/buildpythonpackage.nix}                            | 0
 .../generic => interpreters/python}/catch_conflicts.py        | 0
 .../generic => interpreters/python}/run_setup.py              | 0
 .../{python-modules/generic => interpreters/python}/wrap.sh   | 0
 pkgs/top-level/python-packages.nix                            | 4 ++--
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/development/{python-modules/generic/default.nix => interpreters/python/buildpythonpackage.nix} (100%)
 rename pkgs/development/{python-modules/generic => interpreters/python}/catch_conflicts.py (100%)
 rename pkgs/development/{python-modules/generic => interpreters/python}/run_setup.py (100%)
 rename pkgs/development/{python-modules/generic => interpreters/python}/wrap.sh (100%)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index c38266413bf..ffda162ffde 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
similarity index 100%
rename from pkgs/development/python-modules/generic/default.nix
rename to 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
similarity index 100%
rename from pkgs/development/python-modules/generic/catch_conflicts.py
rename to 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
similarity index 100%
rename from pkgs/development/python-modules/generic/run_setup.py
rename to pkgs/development/interpreters/python/run_setup.py
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/interpreters/python/wrap.sh
similarity index 100%
rename from pkgs/development/python-modules/generic/wrap.sh
rename to pkgs/development/interpreters/python/wrap.sh
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 574cff47122..991ceaf1f12 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