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
This commit is contained in:
parent
03c08712bd
commit
1891300e11
@ -2338,7 +2338,7 @@ let
|
|||||||
inherit (pkgs.xlibs) libX11 xproto;
|
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;
|
inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
|
||||||
arch = if stdenv.isDarwin then darwinArchUtility else null;
|
arch = if stdenv.isDarwin then darwinArchUtility else null;
|
||||||
sw_vers = if stdenv.isDarwin then darwinSwVersUtility 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
|
inherit stdenv fetchurl cmake mesa gettext libjpeg libpng zlib openal SDL openexr
|
||||||
libsamplerate libtiff ilmbase;
|
libsamplerate libtiff ilmbase;
|
||||||
inherit (xlibs) libXi;
|
inherit (xlibs) libXi;
|
||||||
python = python31Base;
|
python = python3;
|
||||||
});
|
});
|
||||||
|
|
||||||
bmp = callPackage ../applications/audio/bmp {
|
bmp = callPackage ../applications/audio/bmp {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user