summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-02-02 11:16:27 +0000
committerPeter Simons <simons@cryp.to>2011-02-02 11:16:27 +0000
commit1891300e1154cd58a0216c137a790cc39881c3e4 (patch)
tree66733a54485582de1418ee6ddd6b8f24b29a091e /pkgs
parent03c08712bde351ea492d70dcd9c93930fa05fbaa (diff)
downloadnixpkgs-1891300e1154cd58a0216c137a790cc39881c3e4.tar
nixpkgs-1891300e1154cd58a0216c137a790cc39881c3e4.tar.gz
nixpkgs-1891300e1154cd58a0216c137a790cc39881c3e4.tar.bz2
nixpkgs-1891300e1154cd58a0216c137a790cc39881c3e4.tar.lz
nixpkgs-1891300e1154cd58a0216c137a790cc39881c3e4.tar.xz
nixpkgs-1891300e1154cd58a0216c137a790cc39881c3e4.tar.zst
nixpkgs-1891300e1154cd58a0216c137a790cc39881c3e4.zip
pkgs/top-level/all-packages.nix: renamed 'python31Base' attribute to 'python3'
The distinction between pythonBase and pythonFull is useful for bootstrapping
purposes, because it allows a version of Python to be built that has very few
dependencies. Python 3.x, however, isn't used in the low-level system, so a
"base variant" of that package is not required. Even if it were, the best
approach to implement that feature would be using 'override'.

svn path=/nixpkgs/trunk/; revision=25748
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ddb4a537649..88af3e71777 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2338,7 +2338,7 @@ let
     inherit (pkgs.xlibs) libX11 xproto;
   });
 
-  python31Base = lowPrio (makeOverridable (import ../development/interpreters/python/3.1) {
+  python3 = lowPrio (makeOverridable (import ../development/interpreters/python/3.1) {
     inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
     arch = if stdenv.isDarwin then darwinArchUtility else null;
     sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
@@ -5626,7 +5626,7 @@ let
     inherit stdenv fetchurl cmake mesa gettext libjpeg libpng zlib openal SDL openexr
       libsamplerate libtiff ilmbase;
     inherit (xlibs) libXi;
-    python = python31Base;
+    python = python3;
   });
 
   bmp = callPackage ../applications/audio/bmp {