Vladimír Čunát
b4af993c3f
Merge branch 'master' into staging
...
Conflicts (simple):
pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Domen Kožar
39d1bc755e
python: add python.interpreter attribute
2014-11-13 00:42:36 +01:00
Peter Simons
b11060d8db
Merge remote-tracking branch 'origin/master' into staging.
2014-10-31 11:14:24 +01:00
Domen Kožar
0272a469a9
Merge pull request #4646 from geerds/python26-sqlite3
...
Fix python26Packages.sqlite3
2014-10-24 16:13:45 +02:00
Eelco Dolstra
f4be4f5e54
Merge remote-tracking branch 'origin/master' into staging
2014-10-24 12:24:13 +02:00
Rok Garbas
c44c00d56c
python: adding test/test_support.py module in all python versions
...
- test/test_support.py module is used by many libraries which backport python
3.0 functionality to 2.6/2.7
- enable subprocess32 tests (now passing for python 2.6/2.7)
2014-10-24 10:44:15 +02:00
Jascha Geerds
d49556a976
Fix python26Packages.sqlite3
2014-10-23 22:56:55 +02:00
Vladimír Čunát
2cf17b0802
Merge recent master into staging
...
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Domen Kožar
2d6582d14e
python27FullBuildEnv -> python.buildEnv for all interpreters
2014-10-19 19:48:18 +02:00
Eelco Dolstra
09dc132e04
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Domen Kožar
68b183e309
simplify
2014-10-16 13:13:13 +02:00
Domen Kožar
8de9ac5bd4
python: make 2.6 and 2.7 expr similar, introduce includeModules
...
When includeModules is true, python is built with all optional modules
as part of derivation.
2014-10-13 21:35:21 +02:00
Domen Kožar
482779e582
python: get rid of ssl module as it's always builtin
2014-10-11 20:23:51 +02:00
Vladimír Čunát
1e389c976c
merge 'staging' into modular-stdenv
...
In 2c62a36b77
the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.
Conflicts:
pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Florian Friesdorf
53490bd17e
include ssl with python2.6 as is the case with 2.7
...
Signed-off-by: Domen Kožar <domen@dev.si>
2014-08-12 13:33:23 +02:00
Eelco Dolstra
e3f7dbbac8
Cleanup: Use += to append to envHooks
2014-08-09 12:47:05 +02:00
Florian Friesdorf
4fd6168e8a
python.isPyXY markers
2014-07-10 16:40:35 +02:00
Florian Friesdorf
7dde165353
pythonX.Y sitePackages passthru
...
Let python tell you the correct path for site-packages.
2014-07-10 16:34:45 +02:00
Domen Kožar
67cc87a35a
python2.6: 2.6.8 -> 2.6.9
2014-02-20 00:44:08 +01:00
William A. Kennington III
bdb842d5eb
Move all db4 packages to the default db5
2014-02-15 12:03:02 +01:00
Vladimír Čunát
e740b565cf
Merge master into stdenv-updates
...
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Peter Simons
4e917cdc35
python-2.6-bsddb: build this module with Berkeley DB 4.5
...
The current 'db' attribute refers to DB 4.8, which Python 2.6 does
recognize: <http://hydra.nixos.org/build/7320517/nixlog/1/raw >.
2013-12-23 21:45:46 +01:00
Peter Simons
6be8ad3392
Merge branch 'origin/master' into stdenv-updates.
...
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Michael Raskin
ebdec6418d
Reflect addition of curses_panel python module
2013-10-18 12:54:49 +04:00
Peter Simons
76244ac2e2
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Domen Kožar
b331056e75
python2.6: add crpyt module
2013-08-14 08:42:48 +02:00
Peter Simons
522acfd2f4
Merge remote-tracking branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/applications/version-management/git-and-tools/git/default.nix
pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Domen Kozar
5ec6cf3756
add python3 support to pythonPackages
2013-07-29 12:09:06 +02:00
Eelco Dolstra
83ec7aa92f
python: Remove --with-wctype-functions flag
...
This causes functions like string.upper() to misbehave on non-ASCII
characters. Upstream also advises against it:
http://bugs.python.org/issue9210
http://bugs.python.org/issue11309
2013-06-21 14:05:46 +02:00
Florian Friesdorf
ee0204d2c8
for some reason the python2.6 manpage is not gzipped
2013-01-09 08:27:39 +01:00
Florian Friesdorf
723d5a5581
fix python-2.6 build: purity for systems with stdenv.gcc.libc
...
On other systems python26 will continue to look for
/usr/include/netinet/in.h among others. I don't know whether/what to
do about that.
2013-01-09 08:26:15 +01:00
Florian Friesdorf
16e2a9133f
python-2.6.8: long overdue
2013-01-09 08:06:46 +01:00
Florian Friesdorf
838761cad2
python manpages as python2.6, python2.7 and python
...
see #68
2012-12-22 03:26:26 +01:00
Florian Friesdorf
3665e02901
python: make pdb.py available as bin/pdb and bin/pdb${python.majorVersion}
2012-07-20 21:43:14 +02:00
Ludovic Courtès
04600bbec1
Darwin: Add mig',
lipo', etc. to `stdenvNative'.
...
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.
svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Yury G. Kudryashov
92f1b06907
This is sha256, not md5
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32715
2012-03-01 07:19:01 +00:00
Eelco Dolstra
b14a737a4d
* Since we're rebuilding everything that depends on Python anyway, we
...
may as well update Python to the latest stable version.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32675
2012-02-28 11:09:36 +00:00
Florian Friesdorf
ff37a57373
Revert "remove empty readonly site-packages"
...
This reverts commit 92b56e5686b06237c23ba41b6b8918ea643781dc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32674
2012-02-28 10:31:28 +00:00
Florian Friesdorf
1c504b49b4
remove empty readonly site-packages
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32590
2012-02-26 17:23:31 +00:00
Florian Friesdorf
8e32380a79
add PSFL, update python meta (license, maintainers, unify description)
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32585
2012-02-26 17:23:16 +00:00
Eelco Dolstra
cf00c432ae
* By popular demand, restore Python 2.6.
...
svn path=/nixpkgs/trunk/; revision=26726
2011-04-06 21:57:30 +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
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
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
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