Author: simons
Date: Wed Feb  2 11:16:27 2011
New Revision: 25748
URL: https://svn.nixos.org/websvn/nix/?rev=25748&sc=1

Log:
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'.

Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Wed Feb  2 09:07:17 
2011        (r25747)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Wed Feb  2 11:16:27 
2011        (r25748)
@@ -2338,7 +2338,7 @@
     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 @@
     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 {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to