summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2009-10-19 23:10:09 +0000
committerPeter Simons <simons@cryp.to>2009-10-19 23:10:09 +0000
commit0b25624891b1045953aed021fb649952fbfb1fc0 (patch)
treea72c022bbaaeb9ba3f5546029a974c8d70d59edb /pkgs/top-level/all-packages.nix
parent3b3ee13b9d33362d980b65ce09be1ae79fd7905d (diff)
downloadnixpkgs-0b25624891b1045953aed021fb649952fbfb1fc0.tar
nixpkgs-0b25624891b1045953aed021fb649952fbfb1fc0.tar.gz
nixpkgs-0b25624891b1045953aed021fb649952fbfb1fc0.tar.bz2
nixpkgs-0b25624891b1045953aed021fb649952fbfb1fc0.tar.lz
nixpkgs-0b25624891b1045953aed021fb649952fbfb1fc0.tar.xz
nixpkgs-0b25624891b1045953aed021fb649952fbfb1fc0.tar.zst
nixpkgs-0b25624891b1045953aed021fb649952fbfb1fc0.zip
python 2.6.3: initial version of python 2.6 support
The build succeeds on i686-linux. Other platforms look good, too,
because there were hardly any changes necessary to update the expression
from 2.5.

svn path=/nixpkgs/trunk/; revision=17889
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix16
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 672bc2fb351..8197e5c67a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2406,6 +2406,22 @@ let
     xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null;
   };
 
+  python26Base = composedArgsAndFun (import ../development/interpreters/python/2.6) {
+    inherit fetchurl stdenv zlib bzip2 gdbm;
+  };
+
+  python26Full = python26Base.passthru.function {
+    # FIXME: We lack ncurses support, needed, e.g., for `gpsd'.
+    db4 = if getConfig ["python" "db4Support"] true then db4 else null;
+    sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null;
+    readline = if getConfig ["python" "readlineSupport"] true then readline else null;
+    openssl = if getConfig ["python" "opensslSupport"] true then openssl else null;
+    tk = if getConfig ["python" "tkSupport"] true then tk else null;
+    tcl = if getConfig ["python" "tkSupport"] true then tcl else null;
+    libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null;
+    xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null;
+  };
+
   # new python and lib proposal
   # - adding a python lib to buildinputs should be enough
   #   (handles .pth files by patching site.py