Commit graph

79 commits

Author SHA1 Message Date
Eelco Dolstra b9293b6c20 * `patch' on FreeBSD doesn't like paths with // in them.
svn path=/nixpkgs/branches/modular-python/; revision=26682
2011-04-04 15:48:58 +00:00
Eelco Dolstra d449c4db98 * Remove Python 2.6, since the only remaining package that used it
(Calibre) also works with 2.7.

svn path=/nixpkgs/branches/modular-python/; revision=26561
2011-03-28 11:50:47 +00:00
Eelco Dolstra 8ca5d5d8b6 * Move python/2.7/modules.nix into python/2.7/default.nix. Also
remove the pythonModules attribute.  The built-in modules are now
  accessible as (e.g.) "python.modules.ssl" or "pythonPackages.ssl".

svn path=/nixpkgs/branches/modular-python/; revision=26559
2011-03-28 09:48:57 +00:00
Eelco Dolstra a8334929f1 * Delete Python 2.4. It was only used by "zope", which doesn't even
build.

svn path=/nixpkgs/branches/modular-python/; revision=26350
2011-03-16 09:56:19 +00:00
Eelco Dolstra b3667a1e8f * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26347
2011-03-16 09:39:40 +00:00
Peter Simons d23005c2f9 pkgs/development/interpreters/python/3.1: major simplification of the expression
This change allows 'python3' to be built with approximately the same features
as 'python27Full'.

svn path=/nixpkgs/trunk/; revision=25757
2011-02-02 11:17:06 +00:00
Peter Simons 775542900b pkgs/development/interpreters/python/3.1: enable parallel building
svn path=/nixpkgs/trunk/; revision=25754
2011-02-02 11:16:53 +00:00
Peter Simons c60fad3978 pkgs/development/interpreters/python/3.1: added missing meta section attributes
svn path=/nixpkgs/trunk/; revision=25753
2011-02-02 11:16:49 +00:00
Peter Simons 4685f4b74e pkgs/development/interpreters/python/3.1/setup-hook.sh: fixed bogus version number
svn path=/nixpkgs/trunk/; revision=25752
2011-02-02 11:16:45 +00:00
Peter Simons c80d448a64 pkgs/development/interpreters/python/3.1: updated to version 3.1.3
svn path=/nixpkgs/trunk/; revision=25751
2011-02-02 11:16:41 +00:00
Eelco Dolstra dc1ac3c5d9 * Add some more Python modules.
svn path=/nixpkgs/branches/modular-python/; revision=25390
2011-01-04 16:10:28 +00:00
Eelco Dolstra 4a5042a1a1 * Python recompiles a Python if the mtime stored *in* the pyc/pyo file
differs from the mtime of the source file.  This doesn't work in Nix
  because Nix changes the mtime of files in the Nix store to 1.  So
  treat that as a special case.

  Yes, this should make Python programs faster.

svn path=/nixpkgs/branches/modular-python/; revision=25387
2011-01-04 15:10:03 +00:00
Eelco Dolstra b7b1fc322a * Python 2.7: get rid of most dependencies.
svn path=/nixpkgs/branches/modular-python/; revision=25385
2011-01-04 14:47:36 +00:00
Eelco Dolstra c1eb464f3c * Build those Python modules in the Python distribution that require
additional dependencies (e.g. SQLite, X11, or Tcl/Tk) outside the
  main Python package (i.e., pythonBase).  This makes pythonFull
  unnecessary: you can just pass the additional modules as
  buildInputs to packages that require them, e.g.

    buildInputs = [ pythonModules.sqlite3 ];

svn path=/nixpkgs/branches/modular-python/; revision=25364
2011-01-03 16:25:11 +00:00
Eelco Dolstra e1309dee31 * Python 2.7.1.
svn path=/nixpkgs/trunk/; revision=25362
2011-01-03 15:52:48 +00:00
Peter Simons 3b94efffe5 pkgs/development/interpreters/python/2.5: removed obsolete python version 2.5
Python 2.5 is unused in nixpkgs -- 2.6 has been the default version for
quite a while.

svn path=/nixpkgs/trunk/; revision=23454
2010-08-26 12:09:42 +00:00
Peter Simons 0b529ff4d7 pkgs/development/interpreters/python/2.7: added various meta attributes
svn path=/nixpkgs/trunk/; revision=23228
2010-08-18 15:03:34 +00:00
Peter Simons f01ceffb9e pkgs/development/interpreters/python/wrapper.nix: clean up debug code
svn path=/nixpkgs/trunk/; revision=23200
2010-08-17 10:17:32 +00:00
Peter Simons 9670fca780 Added "python-$version-wrapper" expression.
The python wrapper expression expects a list of Python modules, $extraLibs,
which are added to $PYTHONPATH before executing the actual Python interpreter.

svn path=/nixpkgs/trunk/; revision=23194
2010-08-16 17:03:35 +00:00
Peter Simons 3658a8b040 pkgs/development/interpreters/python/2.7/setup-hook.sh: fixed incorrect version number
svn path=/nixpkgs/trunk/; revision=23121
2010-08-11 17:05:44 +00:00
Peter Simons 2b37d181a5 Added Python version 2.7.
svn path=/nixpkgs/trunk/; revision=23117
2010-08-11 15:49:03 +00:00
Peter Simons 1a6039cb45 Enable parallel building of gcc, glibc, gmp, mpfr, ncurses, coreutils, perl, python, git, and qt4.
If a build expressions has set "enableParallelBuilding = true", then the
generic builder may utilize more than one CPU core to build that particular
expression. This feature works out of the box for GNU Make. Expressions that
use other build drivers like Boost.Jam or SCons have to specify appropriate
flags such as "-j${NIX_BUILD_CORES}" themselves.

svn path=/nixpkgs/trunk/; revision=23042
2010-08-08 18:51:42 +00:00
Michael Raskin 7c5e566c5c Cleaned up the unspecified-extra-argument calls where there is no way to access extra arguments. Tarball and full instantiation checks passed.
svn path=/nixpkgs/trunk/; revision=22539
2010-07-08 19:22:50 +00:00
Michael Raskin ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.
svn path=/nixpkgs/trunk/; revision=22529
2010-07-08 13:25:52 +00:00
Marc Weber 3303106e97 python: support ncurses, replace composedArgsAndFun by makeOverridable
because composedArgsAndFun didn't pass values to the builder

svn path=/nixpkgs/trunk/; revision=21686
2010-05-09 14:33:50 +00:00
Peter Simons bba637c718 pkgs/development/interpreters/python/3.1: renamed this package to "python3"
Python version 3.x is really quite different from 2.x. Using a new name
for the package prevents Nix from performing unintended updates to the
3.x version.

svn path=/nixpkgs/trunk/; revision=21264
2010-04-23 10:42:29 +00:00
Marc Weber 8c0b7e4ad2 - adding experimental python31 build
- cleanup python libraries:
 * moving all python libraries into a attr set into a directory
   so that expressions can be used for both: python 2.5 and 2.6 easily
 * disabling packages which don't build

svn path=/nixpkgs/trunk/; revision=21142
2010-04-17 18:28:25 +00:00
Peter Simons d791abd982 pkgs/development/interpreters/python/2.6: updated to version 2.6.5
svn path=/nixpkgs/trunk/; revision=20775
2010-03-23 09:34:52 +00:00
Lluís Batlle i Rossell b14e1f31c9 Fixing the 'platforms' at python 2.6.
svn path=/nixpkgs/trunk/; revision=19602
2010-01-21 16:43:27 +00:00
Rob Vermaas d8800474f7 x86_64 darwin related changes
svn path=/nixpkgs/trunk/; revision=18665
2009-11-27 10:16:42 +00:00
Peter Simons 4d675a283e pkgs/development/interpreters/python/2.6/default.nix: fixed build on Darwin
svn path=/nixpkgs/trunk/; revision=18136
2009-11-05 13:44:30 +00:00
Peter Simons f9b71e1c54 pkgs/development/interpreters/python/2.6/default.nix: updated to version 2.6.4
svn path=/nixpkgs/trunk/; revision=18090
2009-11-04 10:29:43 +00:00
Peter Simons 90dd9d14bf python-2.6: fixed build on Darwin
* Dropped "nolongdouble.patch". The patch no longer applies to Python 2.6, and
   apparently isn't required anymore either.

 * Added access to native Darwin arch utility. Python tries to run 'arch' in
   the configure stage, but that binary reside in /usr/bin. To make it
   available to the expression, the small wrapper darwinArchUtility is added as
   a buildInput if appropriate.

 * Don't pass --enable-shared. The build fails if we try to enable building of
   shared libraries, apparently because some required libraries aren't linked,
   i.e. the linker call isn't right.

TODO:

 * Figure out how to enable shared linking.

 * The resulting binary on Darwin seem to lack the binascii module.

svn path=/nixpkgs/trunk/; revision=17894
2009-10-20 12:13:49 +00:00
Peter Simons 0b25624891 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
2009-10-19 23:10:09 +00:00
Eelco Dolstra 257ffc8e73 * Fix broken meta attributes.
svn path=/nixpkgs/trunk/; revision=17773
2009-10-13 09:39:27 +00:00
Ludovic Courtès cb865a1ac1 Python 2.5: Add `passthru.platforms'.
svn path=/nixpkgs/trunk/; revision=17198
2009-09-16 14:42:56 +00:00
Rob Vermaas 685bb27c64 remove -Wno-long-double flag for python on darwin
svn path=/nixpkgs/trunk/; revision=16456
2009-07-24 14:51:04 +00:00
Marc Weber 2d99612b73 update python 2.4. It's only used by zope and even plone (beeing based
on zope) runs with this python version so it should be fine (?)

svn path=/nixpkgs/trunk/; revision=16293
2009-07-09 22:23:54 +00:00
Rob Vermaas 342d9834bf * -msse2 flag for python on i686-darwin
svn path=/nixpkgs/trunk/; revision=15914
2009-06-10 09:18:51 +00:00
Armijn Hemel 7445bc765c update python to 2.5.4
update scummvm to 0.13.1

svn path=/nixpkgs/trunk/; revision=15414
2009-04-30 14:01:25 +00:00
Eelco Dolstra 7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra 6b9ccbaf78 * setup.sh: turn on nullglob globally.
* setup.sh: removed some obsolete features, specifically some that
  were only used by the old build farm.
* addToSearchPath: removed some parameters that weren't used
  anywhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15136
2009-04-18 22:22:51 +00:00
Michael Raskin d6f1d7acb3 Added Tk support for Python
svn path=/nixpkgs/trunk/; revision=13526
2008-12-01 00:02:25 +00:00
Eelco Dolstra 4192f35202 * unixODBCDrivers needs sqlite.
svn path=/nixpkgs/trunk/; revision=12072
2008-06-13 09:44:43 +00:00
Michael Raskin 99c9108757 OpenSSL support for Python
svn path=/nixpkgs/trunk/; revision=11894
2008-05-26 12:27:17 +00:00
Michael Raskin 9d3b0a2cb7 Added bazaar tools (not installed globally, just copied to share, you have to symlink them to your ~/.bazaar/plugins). Also readline support for python.
svn path=/nixpkgs/trunk/; revision=11893
2008-05-26 11:39:08 +00:00
Michael Raskin 642ff45e22 Added codeville - a distributed revision control system with special efforts spent on merging. Heh, efforts into RCS availability seem to have side effects on Python side, too..
svn path=/nixpkgs/trunk/; revision=11891
2008-05-26 07:47:07 +00:00
Michael Raskin 26bdb2a619 Added option for SQLite support to Python2.5
svn path=/nixpkgs/trunk/; revision=11754
2008-05-06 07:01:34 +00:00
Ludovic Courtès d0d98958d2 Python 2.5: Add GDBM support.
svn path=/nixpkgs/trunk/; revision=11485
2008-04-08 07:37:49 +00:00
Eelco Dolstra 26a152653d * Adde xpra. Doesn't quite work yet.
* Removed python_alts.

svn path=/nixpkgs/trunk/; revision=11161
2008-03-17 13:45:50 +00:00