public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade default to python version 2.5.x.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12910
This commit is contained in:
Peter Simons 2008-09-24 08:50:32 +00:00
parent e2d7d57ff6
commit b3ab93e46e
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/top-level/all-packages.nix
View File

@ -553,8 +553,7 @@ let
}; };
cheetahTemplate = builderDefsPackage (selectVersion ../tools/text/cheetah-template "2.0.1") { cheetahTemplate = builderDefsPackage (selectVersion ../tools/text/cheetah-template "2.0.1") {
inherit makeWrapper; inherit makeWrapper python;
python = python25;
}; };
chkrootkit = import ../tools/security/chkrootkit { chkrootkit = import ../tools/security/chkrootkit {
@ -1780,8 +1779,7 @@ let
viewMtn = builderDefsPackage (selectVersion ../applications/version-management/viewmtn "0.10") viewMtn = builderDefsPackage (selectVersion ../applications/version-management/viewmtn "0.10")
{ {
inherit monotone flup cheetahTemplate highlight ctags inherit monotone flup cheetahTemplate highlight ctags
makeWrapper graphviz which; makeWrapper graphviz which python;
python = python25;
}; };
nasm = import ../development/compilers/nasm { nasm = import ../development/compilers/nasm {
@ -1993,7 +1991,7 @@ let
libXt; libXt;
}; };
python = python24; python = python25;
python24 = import ../development/interpreters/python/2.4 { python24 = import ../development/interpreters/python/2.4 {
inherit fetchurl stdenv zlib bzip2; inherit fetchurl stdenv zlib bzip2;
@ -2456,8 +2454,7 @@ let
xxdiff = builderDefsPackage (selectVersion ../development/tools/misc/xxdiff "3.2") { xxdiff = builderDefsPackage (selectVersion ../development/tools/misc/xxdiff "3.2") {
flex = flex2535; flex = flex2535;
qt = qt3; qt = qt3;
python = python25; inherit pkgconfig makeWrapper bison python;
inherit pkgconfig makeWrapper bison;
inherit (xlibs) libXext libX11; inherit (xlibs) libXext libX11;
}; };
@ -4567,17 +4564,15 @@ let
}; };
pyopengl = import ../development/python-modules/pyopengl { pyopengl = import ../development/python-modules/pyopengl {
inherit fetchurl stdenv setuptools mesa freeglut pil; inherit fetchurl stdenv setuptools mesa freeglut pil python;
python = python25;
}; };
pythonSip = builderDefsPackage (selectVersion ../development/python-modules/python-sip "4.7.4") { pythonSip = builderDefsPackage (selectVersion ../development/python-modules/python-sip "4.7.4") {
python=python25; inherit python;
}; };
pyqt = builderDefsPackage (selectVersion ../development/python-modules/pyqt "4.3.3") { pyqt = builderDefsPackage (selectVersion ../development/python-modules/pyqt "4.3.3") {
inherit pkgconfig pythonSip; inherit pkgconfig python pythonSip;
python = python25;
inherit (xlibs) libX11 libXext; inherit (xlibs) libX11 libXext;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
qt = qt4; qt = qt4;
@ -4592,7 +4587,7 @@ let
}; };
setuptools = builderDefsPackage (selectVersion ../development/python-modules/setuptools "0.6c8") { setuptools = builderDefsPackage (selectVersion ../development/python-modules/setuptools "0.6c8") {
python = python25; inherit python;
}; };
wxPython = wxPython26; wxPython = wxPython26;
@ -5834,8 +5829,7 @@ let
}; };
bazaar = import ../applications/version-management/bazaar { bazaar = import ../applications/version-management/bazaar {
inherit fetchurl stdenv makeWrapper; inherit fetchurl stdenv makeWrapper python;
python = python25;
}; };
bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) { bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) {
@ -5871,8 +5865,7 @@ let
blender = import ../applications/misc/blender { blender = import ../applications/misc/blender {
inherit stdenv cmake mesa gettext freetype SDL libtiff fetchurl glibc scons x11 lib inherit stdenv cmake mesa gettext freetype SDL libtiff fetchurl glibc scons x11 lib
libjpeg libpng zlib /* smpeg sdl */; libjpeg libpng zlib /* smpeg sdl */;
inherit (xlibs) inputproto libXi; inherit (xlibs) inputproto libXi python;
python = python25;
freealut = freealut_soft; freealut = freealut_soft;
openal = openalSoft; openal = openalSoft;
openexr = openexr_1_4_0; openexr = openexr_1_4_0;
@ -5999,8 +5992,7 @@ let
}; };
codeville = builderDefsPackage (selectVersion ../applications/version-management/codeville "0.8.0") { codeville = builderDefsPackage (selectVersion ../applications/version-management/codeville "0.8.0") {
python = python25; inherit makeWrapper python;
inherit makeWrapper;
}; };
cua = import ../applications/editors/emacs-modes/cua { cua = import ../applications/editors/emacs-modes/cua {
@ -6389,8 +6381,7 @@ let
}; };
keyjnote = import ../applications/office/keyjnote { keyjnote = import ../applications/office/keyjnote {
inherit fetchurl stdenv xpdf pil pyopengl pygame makeWrapper lib; inherit fetchurl stdenv xpdf pil pyopengl pygame makeWrapper lib python;
python = python25;
# XXX These are the PyOpenGL dependencies, which we need here. # XXX These are the PyOpenGL dependencies, which we need here.
inherit setuptools mesa freeglut; inherit setuptools mesa freeglut;
@ -6658,8 +6649,7 @@ let
}; };
pythonmagick = import ../applications/graphics/PythonMagick { pythonmagick = import ../applications/graphics/PythonMagick {
inherit fetchurl stdenv pkgconfig imagemagick boost; inherit fetchurl stdenv pkgconfig imagemagick boost python;
python = python25;
}; };
qemu = import ../applications/virtualization/qemu/0.9.1.nix { qemu = import ../applications/virtualization/qemu/0.9.1.nix {
@ -6814,8 +6804,7 @@ let
}; };
tailor = builderDefsPackage (selectVersion ../applications/version-management/tailor "0.9.35") { tailor = builderDefsPackage (selectVersion ../applications/version-management/tailor "0.9.35") {
python = python25; inherit makeWrapper python;
inherit makeWrapper;
}; };
/* does'nt work yet i686-linux only (32bit version) /* does'nt work yet i686-linux only (32bit version)
@ -7386,8 +7375,7 @@ let
inherit fetchurl freeglut qt4 libpng lib3ds libQGLViewer swig; inherit fetchurl freeglut qt4 libpng lib3ds libQGLViewer swig;
inherit (xlibs) libXi; inherit (xlibs) libXi;
#stdenv = overrideGCC stdenv gcc41; #stdenv = overrideGCC stdenv gcc41;
inherit stdenv; inherit stdenv python;
python = python25;
}; };
generator = import ../misc/emulators/generator { generator = import ../misc/emulators/generator {