summary refs log tree commit diff
path: root/pkgs/development/interpreters/python
diff options
context:
space:
mode:
authorFlorian Friesdorf <flo@chaoflow.net>2014-07-09 17:34:08 +0200
committerFlorian Friesdorf <flo@chaoflow.net>2014-07-10 16:40:35 +0200
commit4fd6168e8a3211233ce5643988517f5d27df1e3c (patch)
tree13859783295361e2fd7b7fb41e3cf278ae134bbf /pkgs/development/interpreters/python
parent168bfea8678a57f67101be928000f8ce426855af (diff)
downloadnixpkgs-4fd6168e8a3211233ce5643988517f5d27df1e3c.tar
nixpkgs-4fd6168e8a3211233ce5643988517f5d27df1e3c.tar.gz
nixpkgs-4fd6168e8a3211233ce5643988517f5d27df1e3c.tar.bz2
nixpkgs-4fd6168e8a3211233ce5643988517f5d27df1e3c.tar.lz
nixpkgs-4fd6168e8a3211233ce5643988517f5d27df1e3c.tar.xz
nixpkgs-4fd6168e8a3211233ce5643988517f5d27df1e3c.tar.zst
nixpkgs-4fd6168e8a3211233ce5643988517f5d27df1e3c.zip
python.isPyXY markers
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r--pkgs/development/interpreters/python/2.6/default.nix2
-rw-r--r--pkgs/development/interpreters/python/2.7/default.nix2
-rw-r--r--pkgs/development/interpreters/python/3.2/default.nix4
-rw-r--r--pkgs/development/interpreters/python/3.3/default.nix4
-rw-r--r--pkgs/development/interpreters/python/3.4/default.nix4
5 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 1217403f3fd..940b667e86a 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -73,6 +73,8 @@ let
 
     passthru = rec {
       inherit zlibSupport;
+      isPy2 = true;
+      isPy26 = true;
       libPrefix = "python${majorVersion}";
       executable = libPrefix;
       sitePackages = "lib/${libPrefix}/site-packages";
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index df38299cb1c..c19430862c2 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -87,6 +87,8 @@ let
 
     passthru = rec {
       inherit zlibSupport;
+      isPy2 = true;
+      isPy27 = true;
       libPrefix = "python${majorVersion}";
       executable = libPrefix;
       sitePackages = "lib/${libPrefix}/site-packages";
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index 3451b218f74..489d0509c1a 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -69,7 +69,9 @@ stdenv.mkDerivation {
     tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
     libPrefix = "python${majorVersion}";
     executable = "python3.2m";
-    is_py3k = true;
+    isPy3 = true;
+    isPy32 = true;
+    is_py3k = true;  # deprecated
     sitePackages = "lib/${libPrefix}/site-packages";
   };
 
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 20fc66367ca..fcc03380349 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -66,7 +66,9 @@ stdenv.mkDerivation {
     tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
     libPrefix = "python${majorVersion}";
     executable = "python3.3m";
-    is_py3k = true;
+    isPy3 = true;
+    isPy33 = true;
+    is_py3k = true;  # deprecated
     sitePackages = "lib/${libPrefix}/site-packages";
   };
 
diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index a468807dcbd..3477cedf4b7 100644
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -67,7 +67,9 @@ stdenv.mkDerivation {
     tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
     libPrefix = "python${majorVersion}";
     executable = "python3.4m";
-    is_py3k = true;
+    isPy3 = true;
+    isPy34 = true;
+    is_py3k = true;  # deprecated
     sitePackages = "lib/${libPrefix}/site-packages";
   };