Frederik Rietdijk
7c8b1e7b24
python36: 3.6.0b2 -> 3.6.0rc1
2016-12-12 09:31:25 +01:00
Frederik Rietdijk
736169d01d
buildPythonPackage: yet another fix, fixes #20943
...
I didn't copy the old behaviour correctly with
c1d98d959b
2016-12-06 16:48:55 +01:00
Frederik Rietdijk
c1d98d959b
buildPythonPackage: add configurePhase, fixes #20926
...
I had removed the configurePhase in
https://github.com/NixOS/nixpkgs/pull/20894 because it was empty. This
seemed to break packages that use cmake.
2016-12-05 17:33:17 +01:00
Frederik Rietdijk
42bad32e13
buildPythonPackage: refactor
2016-12-05 10:29:22 +01:00
Frederik Rietdijk
31e32b6d9e
Python interpreters: add pkgs attribute
...
A package set is constructed for a specific interpreter. Therefore, we add the
possibility to override the package set to the interpreter. This should make it
easier to override the interpreter and the package set at the same time.
2016-12-05 09:43:44 +01:00
Dmitry Kalinkin
46dd9dfc52
numpy: enable numpy.distutils patch only if it's also in distutils
...
Fixes: 095095c
2016-10-26 21:29:55 +00:00
Frederik Rietdijk
7077a270bf
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-26 13:06:43 +02:00
Frederik Rietdijk
85a87f5155
mkPythonDerivation: append postFixup, fixes #9204
2016-10-26 10:46:12 +02:00
Frederik Rietdijk
fea23020fe
Merge pull request #19585 from veprbl/distutils_fix
...
python: add C++ compiler support for distutils
2016-10-25 14:16:28 +02:00
Frederik Rietdijk
3b9d7260a3
python27: add missing parameter
...
that was accidentally removed during merging.
2016-10-22 22:33:15 +02:00
Frederik Rietdijk
e56832d730
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-22 17:23:24 +02:00
Vladimír Čunát
d26a6a87df
Merge #19450 : python: fix 'nproc not found' on darwin
2016-10-22 16:49:44 +02:00
Dmitry Kalinkin
95237f828b
python: fix 'nproc not found' on darwin
...
Fixes: 58b862b75
2016-10-19 19:29:17 -04:00
Frederik Rietdijk
2081a69092
pypy: fix build
2016-10-18 23:16:10 +02:00
Frederik Rietdijk
635b4fbce8
Python3: also create symlink pkgconfig/python.pc
2016-10-18 23:16:03 +02:00
Aneesh Agrawal
708822250e
Python 3.x: Add python symlink
...
Add a symlink for "python" in the python3 derivation to provide a
default Python executable.
2016-10-18 23:14:31 +02:00
Dmitry Kalinkin
095095c479
python: add C++ compiler support for distutils
...
This should help with builds against clang
2016-10-17 11:23:13 -04:00
Frederik Rietdijk
107c035bf0
Python: remove pythonSmall
...
In #19309 a separate output for tkinter was added.
Several dependencies of Python depend indirectly on Python. We have the
following two paths:
```
‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘libXrender-0.9.10’ -
‘libX11-1.6.4’ - ‘libxcb-1.12’ - ‘libxslt-1.1.29’- ‘libxml2-2.9.4’ -
‘python-2.7.12’
‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘fontconfig-2.12.1’ -
‘dejavu-fonts-2.37’ - ‘fontforge-20160404’ - ‘python-2.7.12’
```
Because only `tkinter` needs this, I added
```
pythonSmall = python.override {x11Support = false;};
```
to break the infinite recursion. We also still have the output
`tkinter`.
However, we might as well build without x11Support by default. Then we build with x11Support as well so we get the tkinter module and put that in a separate package.
2016-10-16 14:31:26 +02:00
Frederik Rietdijk
80433e7030
Python: further unify expressions interpreters
2016-10-14 15:52:14 +02:00
Frederik Rietdijk
cffdffe1f6
Merge pull request #19309 from FRidh/outputs
...
Python: use separate output for tkinter
2016-10-13 10:40:14 +02:00
Louis Taylor
39e8623906
Python 3.6: 3.6b1 -> 3.6b2
2016-10-11 22:29:22 +01:00
Frederik Rietdijk
104c50dd1a
Python: remove modules and pythonFull
2016-10-10 10:33:24 +02:00
Frederik Rietdijk
a2720a25b9
Python 3.6: separate output for tkinter
2016-10-10 10:33:24 +02:00
Frederik Rietdijk
0a08fcd858
Python 3.5: separate output for tkinter
2016-10-10 10:33:24 +02:00
Frederik Rietdijk
0bd4b31f87
Python 3.4: separate output for tkinter
2016-10-10 10:33:24 +02:00
Frederik Rietdijk
cf0932ee84
Python 3.3: separate output for tkinter
2016-10-10 10:33:24 +02:00
Frederik Rietdijk
bee439207b
Python 2.7: separate output for tkinter
2016-10-10 10:33:24 +02:00
Eelco Dolstra
7a4209c356
Merge remote-tracking branch 'origin/master' into staging
2016-09-20 17:46:09 +02:00
Frederik Rietdijk
8c30f3d962
python3.6: 3.6.0a3 -> 3.6.0b1
...
/Lib/plat* has been removed in this release.
http://bugs.python.org/issue28027
2016-09-20 15:48:32 +02:00
Frederik Rietdijk
63ec0068a7
Python on Nix is not manylinux1 compatible
...
Fixes https://github.com/NixOS/nixpkgs/issues/18484
2016-09-20 15:48:32 +02:00
Frederik Rietdijk
2b66563cde
Python: make versions/prefixes more similar
2016-09-20 15:48:32 +02:00
Frederik Rietdijk
1dbb72b91a
python.buildenv: don't filter non-python packages
...
python.buildenv is used to build an env that provides binaries that can
import all modules that were passed in to the env.
Before this change it filtered the propagatedBuildInputs to remove all
non-Python packages, thereby possibly reducing the amount of packages
that were referenced. However, Python packages often don't have non-
Python packages as propagatedBuildInputs. And occasionally, we do want
to be able to add other packages to the env.
2016-09-17 14:28:12 +02:00
Vladimír Čunát
52e1a198cf
Merge branch 'master' into staging
2016-09-17 00:31:34 +02:00
Herwig Hochleitner
1172c6be9b
pypy: 5.4.0 -> 5.4.1
2016-09-14 18:11:17 +02:00
Dan Peebles
7b9d3f8605
stdenv-darwin: upgrade a few more things
...
It's a long build and generally painful to split into smaller commits,
so I apologize for lumping many changes into one commit but this is far
easier.
There are still several outdated parts of the darwin stdenv but these
changes should bring us closer to the goal.
Fixes #18461
2016-09-12 01:46:44 -04:00
Josef Kemetmueller
b7819e38c4
python3.x: Patch extra stack size on darwin
...
Compiling python with "-Wl,-stack_size,1000000" causes problems when
compiling for example pygobject3. pygobject3 uses "python3.x-config
--ldflags" during installation and then fails when
"-Wl,-stack_size,1000000" is present. Maybe we should investigate
removing this during the build of pyobject3, but this stack_size flag is
also not used on the popular darwin homebrew-core channel for python3.5,
so it seems safe to remove it.
2016-09-04 10:14:51 +02:00
Frederik Rietdijk
203004d59a
pypy27: 5.3.1 -> 5.4.0
2016-09-03 11:42:55 +02:00
Tuomas Tynkkynen
e2c6740c37
Merge commit 'adaee73' from staging into master
...
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.
Conflicts:
pkgs/data/documentation/man-pages/default.nix
2016-09-03 01:02:51 +03:00
Eelco Dolstra
7f520bdad8
Revert "Python 2.6: add less"
...
This reverts commit 6b11c96c86
2016-09-01 18:58:14 +02:00
Eelco Dolstra
1e370d7de4
Revert "Python 2.7: add less"
...
This reverts commit bce5a51a9f
2016-09-01 18:58:09 +02:00
Eelco Dolstra
0810decaa7
python-3.5: Drop dependency on Berkeley DB
...
The previous commit revealed that Python wasn't actually using
Berkeley DB; it only had it in its closure due to the build-time flag
dump in Makefile and _sysconfigdata.py. When Python detects both GNU
gdbm and Berkeley DB at build time, it will use the former.
2016-09-01 18:57:43 +02:00
Eelco Dolstra
fdd7399a3c
python-3.5: Also remove -L flags
...
This reduces the Python closure size by another 10 MiB.
2016-09-01 18:57:43 +02:00
Eelco Dolstra
168192f116
python-3.5: Eliminate -dev paths from the runtime closure
...
This reduces Python's closure size from 200 MiB to 129 MiB. Even
better would be to get move tkinter to a separate output or package
(since that would get rid of all X11 stuff), but that's a bit harder.
2016-09-01 18:57:43 +02:00
Frederik Rietdijk
e1d1a573e5
Python: fix mkPythonDerivation doCheck
2016-09-01 17:11:32 +02:00
Frederik Rietdijk
4f6b6f1472
pythonPackages: use mkPythonDerivation
2016-09-01 16:16:31 +02:00
Frederik Rietdijk
3e05cce97c
Python: separate buildPythonPackage into two functions
...
1. mkDerivation which is used when the source is without setup.py and
not a wheel
2. buildPythonPackage which is used as before and calls mkDerivation
2016-09-01 16:16:31 +02:00
Frederik Rietdijk
725c37b4d3
Python: move wrapPython into own file
2016-09-01 16:16:31 +02:00
Frederik Rietdijk
b080748d42
Python: move python-modules/generic to interpreter folder
2016-09-01 16:16:31 +02:00
Domen Kožar
10b45d654a
fix eval after 0c3b1112af
2016-09-01 13:05:45 +02:00
Eelco Dolstra
0c3b1112af
Revert "Python 3.5: add less"
...
This reverts commit e261818c68
2016-09-01 12:54:46 +02:00
Tuomas Tynkkynen
c3bcb4e1ce
treewide: Use explicit 'dev' references to glibc
2016-08-30 03:11:09 +03:00
Franz Pletz
bd739d1fae
pypy: disable pic hardening on i686
2016-08-25 01:54:55 +02:00
Frederik Rietdijk
84bcaf5461
pypy27: 5.1.1 -> 5.3.1
2016-08-17 23:12:30 +02:00
Frederik Rietdijk
1da6775775
Python: move interpreters
...
Move Python interpreters (CPython, PyPy) to same folder and share
layout.
2016-07-28 17:10:15 +02:00
Frederik Rietdijk
b49bedd75b
Python 2.7.11 -> 2.7.12
2016-07-19 11:49:38 +02:00
Frederik Rietdijk
6b11c96c86
Python 2.6: add less
2016-07-19 11:11:03 +02:00
Frederik Rietdijk
bce5a51a9f
Python 2.7: add less
2016-07-19 10:27:14 +02:00
Frederik Rietdijk
c59d211b4b
Python 3.3: add less
2016-07-19 10:27:14 +02:00
Frederik Rietdijk
b410631d6d
Python 3.4: add less
2016-07-19 10:27:14 +02:00
Frederik Rietdijk
e261818c68
Python 3.5: add less
2016-07-19 10:27:14 +02:00
Frederik Rietdijk
773f6225cb
Python 3.6: add less
2016-07-19 10:27:14 +02:00
Louis Taylor
7c75fa4bc2
python: add alpha release of 3.6
...
This might be jumping the gun a little, but I needed to use 3.6 locally
and thought I may as well push it upstream.
2016-07-19 10:27:14 +02:00
Frederik Rietdijk
f04b018111
python 3.4.4 -> 3.4.5
2016-07-10 19:16:56 +02:00
Frederik Rietdijk
52bc8d203f
python 3.5.1 -> 3.5.2
2016-07-10 19:05:12 +02:00
Tuomas Tynkkynen
2cf8cb7f46
Merge remote-tracking branch 'upstream/master' into staging
2016-07-05 13:34:36 +03:00
Frederik Rietdijk
880475bbd5
python: fix modules in buildEnv, closes #16646
...
Python 2.7 on Nix is stripped of some modules, which can be added when
needed. This was broken with python.buildEnv.
2016-07-01 16:16:55 +02:00
Eelco Dolstra
de1b4e71c1
python-2.7: Don't use ldconfig and speed up uuid load
2016-07-01 14:57:40 +02:00
Bjørn Forsman
bd01fad0ed
Captialize meta.description of all packages
...
In line with the Nixpkgs manual.
A mechanical change, done with this command:
find pkgs -name "*.nix" | \
while read f; do \
sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
done
I manually skipped some:
* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Benno Fünfstück
c3ed3914bb
python: add python.withPackages function
...
Fixes #15801
2016-05-29 15:12:23 +02:00
Domen Kožar
b49bf121b8
rename iElectric to domenkozar to match GitHub
2016-05-17 13:00:47 +01:00
Peter Simons
8e462995ba
Bring my stdenv.lib.maintainers user name in line with my github nick.
2016-05-16 22:49:55 +02:00
Frederik Rietdijk
022f5fdf83
Merge pull request #15477 from FRidh/pythonbuildinputs
...
Python: be explicit about buildInputs
2016-05-16 12:11:39 +02:00
Frederik Rietdijk
91834cfe3e
Python 3.5: be explicit about buildInputs
2016-05-16 12:10:33 +02:00
Frederik Rietdijk
56e96b8b10
Python 3.4: be explicit about buildInputs
2016-05-16 12:10:32 +02:00
Frederik Rietdijk
58ec2d47ea
Python 3.3: be explicit about buildInputs
2016-05-16 12:10:32 +02:00
Rok Garbas
913e869f8d
remove python32 due to pip 8.1.2 not supporting python 3.2 anymore
2016-05-15 15:09:23 +02:00
Vladimír Čunát
387915e99c
python3*: port the fix from parent commit
...
I really love such copied expressions...
but this case was easy compared to usual consequences
of file-copying in long-running branches.
2016-04-26 10:52:18 +02:00
Vladimír Čunát
626e5bd4dd
python3: fix build after 5ff40dded, refactor
...
The path list was passed in a format not suitable for gcc command-line.
Also, let's utilize that we had `with stdenv.lib;`.
/cc @abbradar.
2016-04-26 10:43:48 +02:00
Nikolay Amiantov
5ff40ddedf
add get* helper functions and mass-replace manual outputs search with them
2016-04-25 13:24:39 +03:00
Tuomas Tynkkynen
34922a3951
python2: Fix on non-Linux
...
The location of this 'regen' script (whatever is does) depends on the
platform. AFAICT it always exists due to this:
$(srcdir)/Lib/$(PLATDIR):
mkdir $(srcdir)/Lib/$(PLATDIR)
cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
2016-02-13 16:03:55 -05:00
Tuomas Tynkkynen
78e62da7f1
python2: Fix on Darwin
...
Presumably $out/lib/python*/plat-linux2/ is a Linux-only thing.
2016-02-13 15:52:23 -05:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Domen Kožar
78096e9b89
python: 3.4.3 -> 3.4.4
2016-01-07 11:19:40 +01:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Rok Garbas
7e2a828fd6
python35: 3.5.0 -> 3.5.1
2015-12-08 04:35:17 +01:00
Rok Garbas
124e70a459
python27: 2.7.10 -> 2.7.11
2015-12-08 04:35:17 +01:00
Vladimír Čunát
263fd55d4b
Merge recent staging built on Hydra
...
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
Domen Kožar
dc977f78a8
Merge pull request #11147 from FRidh/wrapper
...
python: apply wrapper to all packages in python.buildEnv extraLibs
2015-11-30 11:08:19 +01:00
Frederik Rietdijk
12e8f3c6aa
python: apply wrapper to all packages in python.buildEnv extraLibs
...
Currently, when constructing a buildEnv and adding packages via
extraLibs, then binaries in extraLibs cannot access the other Python
modules. An example is having ipython/jupyter in extraLibs; in that case
ipython cannot import any other modules.
2015-11-30 10:52:57 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Jude Taylor
df80090d09
use per-derivation sandbox profiles
2015-11-19 11:31:06 -08:00
Jude Taylor
58b862b750
darwin purity: pythonPackages.pandas
2015-11-03 14:00:51 -08:00
Asko Soukka
caafa68a7e
darwin: python35: add needed inputs
2015-10-22 07:56:40 +03:00
Jude Taylor
a7f478a368
darwin: add needed inputs to python-3.4
2015-10-20 15:54:33 -07:00
Tuomas Tynkkynen
0054c8aa5a
python3: Use correct build inputs for multi-output deps
...
Without this, python will silently build without native extensions (e.g
openssl); this causes wget to fail its tests for instance.
vcunat added python-3.5.
2015-10-03 14:08:51 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
21e3ff658a
x11: replace its usage by xlibsWrapper directly
...
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Domen Kožar
cabb050528
add python35 and python35Packages
2015-09-15 07:46:46 +02:00
Nikolay Amiantov
344e522166
python: add .env for convenient nix-shell's
2015-08-17 21:22:50 +03:00
William A. Kennington III
333f145d76
Merge branch 'master.upstream' into staging.upstream
2015-07-13 15:11:31 -07:00
James Cook
98fb18af3e
python-2.6: mark broken because being insecure for years
2015-07-12 10:12:33 +02:00
Jude Taylor
e3927f6b92
remove unbuildables from impure darwin stdenv
2015-06-19 22:08:11 -07:00
Jude Taylor
f048ff3969
darwin purity: python-2.7
2015-06-19 12:56:39 -07:00
Vladimír Čunát
61596bf405
Merge #8363 : pure-darwin stdenv
2015-06-18 22:38:08 +02:00
Jude Taylor
fa9c81f694
pure darwin stdenv
2015-06-18 12:37:41 -07:00
William A. Kennington III
4c8f84e8af
python: Correctly detect ncurses opaque api
2015-06-15 17:55:44 -07:00
Rok Garbas
617c16f8f6
cygwin: python27 gdbm module needs gettext
2015-06-12 12:17:12 +02:00
Rok Garbas
93d507cac8
cygwin: for 2.7.10 export-PyNode_SizeOf patch not needed anymore
2015-05-28 14:15:47 +02:00
Florian Friesdorf
5f4a9c3391
cygwin: python-2.7
2015-05-28 10:53:36 +02:00
Domen Kožar
c918903381
python: 2.7.9 -> 2.7.10
2015-05-24 18:55:53 +02:00
Domen Kožar
3dc204f42e
fix eval
2015-05-14 20:21:56 +02:00
Domen Kožar
d769b52307
python: pass stdenv.glibc to crypt module to expose crypt.so
2015-05-13 18:39:50 +02:00
aszlig
a7028d3d07
python2: Pass configureFlags to modules as well.
...
Fixes regression from 086e801d51
2015-05-12 18:06:33 +02:00
aszlig
55e66db0fa
python2: Don't fail silently on module build.
...
A build output of such a failure can be found here:
http://hydra.nixos.org/build/21994789/nixlog/1/raw
The build_ext command doesn't return non-zero if it fails but instead
produces a file with a "_failed.so" suffix, which we're now checking
after the build_ext command.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-12 18:06:33 +02:00
Dario Bertini
086e801d51
Enable old pythons' wide builds
2015-05-06 07:50:52 +01:00
Vladimír Čunát
2b5e7bd2ba
python2*: fix modules as well after 4101db0be
...
There was a typo that failed them.
Also, drop pkgconfig again, as it seems unused; and fix python26.
Now all python*.modules build, except for python26.tkinter
which fails on master as well.
2015-04-19 16:31:05 +02:00
Vladimír Čunát
4101db0bec
python2*: fix detecting C libs, no header references
2015-04-18 21:00:26 +02:00
Jan Malakhovski
a3e00bf6c4
python 2.7: add x11Support option
2015-03-29 23:30:39 +00:00
Domen Kožar
61c3aa5047
python: 3.4.2 -> 3.4.3
2015-02-25 15:21:14 +01:00
Dario Bertini
57577f2019
Explicitly specify the pythonVersion and use that together with versionOlder/versionAtLeast to specify bounds
2015-01-24 10:38:54 +00:00
Domen Kožar
652cfc36e9
python2.6: add a patch to fix parallel make failure
...
(cherry picked from commit 23a202519cb1d8704a0b4294d8d13a224efb1a74)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-18 19:20:07 +01:00
John Wiegley
ce59dec5bb
python34: as a workaround, explicitly set MACOSX_DEPLOYMENT_TARGET
...
Otherwise, it crashes with a segfault while running the tests.
2015-01-06 09:56:08 -05:00
Shea Levy
05edd656f6
Missed gcc refs
2014-12-26 12:28:15 -05:00
John Wiegley
28b6fb61e6
Change occurrences of gcc to the more general cc
...
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Domen Kožar
272206e706
python: 2.7.8 -> 2.7.9
...
(cherry picked from commit 1f059cd5a91fee7d4ec50c7272bca5bc6733f245)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 19:05:59 +01:00
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
Luca Bruno
6af0d6974f
Merge branch 'master' into staging
2014-11-10 10:03:52 +01:00
Domen Kožar
c1d6a4a8fb
remove unused pythonLinkmeWrapper
2014-11-08 20:19:55 +01:00
Peter Simons
a9c53037fa
Merge remote-tracking branch 'origin/master' into staging.
2014-11-02 16:15:53 +01:00
Domen Kožar
92503a0424
python: 3.3.5 -> 3.3.6
2014-11-01 04:50:26 +01:00
Domen Kožar
7fe78cad98
python: 3.2.5 -> 3.2.6
2014-11-01 04:50:26 +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
74fde7c388
Merge pull request #4495 from NixOS/pythonFull_improvements
...
PythonFull improvements
2014-10-16 13:24:18 +02:00
Domen Kožar
68b183e309
simplify
2014-10-16 13:13:13 +02:00
William A. Kennington III
eed5207845
python27: Remove avoid daemon thread shutdown #i21963
2014-10-16 11:28:37 +02:00
Domen Kožar
a2a7abc67c
pythonFull -> python with all modules, pythonFullWithPkgs -> buildEnv
2014-10-13 21:35:21 +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
Domen Kožar
9aeb10fa12
python: 3.4.1 -> 3.4.2
2014-10-08 13:43:36 +02:00
Alexander Kjeldaas
3bf4362381
python: improve library determinism
...
1) Make the core python libraries deterministic.
2) Make the python libraries created by glib deterministic.
@vcunat put back the removal of share/gtk-doc in glib.
2014-09-13 15:03:12 +02:00
Vladimír Čunát
82797f98f2
Merge branch 'staging' into modular-stdenv
...
Conflicts:
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c
merge 'staging' into modular-stdenv
...
In 2c62a36b77
2014-09-08 18:16:54 +02:00
Domen Kožar
33949a413c
python34: include a patch to fix http://bugs.python.org/issue21121
2014-08-30 20:43:31 +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
Charles Strahan
08f2ce1172
Fix Python 3.{2,3,4} on Darwin.
...
This removes the `-lcrypt` linker flag when compiling under Darwin.
2014-07-09 00:18:11 -04:00
Domen Kožar
2e70c676ca
python: link gcc_s
...
Signed-off-by: Domen Kožar <domen@dev.si>
2014-07-02 19:57:16 +02:00
Domen Kožar
cfcbfb494e
python: 2.7.7 -> 2.7.8
2014-07-02 18:45:34 +02:00
Vladimír Čunát
5a98b9f514
Merge recent master into p/stdenv
...
Merged just before the pypi update, as it seems to cause problems on Hydra.
2014-06-09 19:07:31 +02:00
Domen Kožar
73169b3a37
python: 2.7.6 -> 2.7.7
2014-06-04 16:18:36 +02:00
Vladimír Čunát
872860e6de
Merge #1187 into p/stdenv
...
Tested building firefox, kdelibs, evince on x86_64-linux.
2014-05-29 22:16:07 +02:00
Domen Kožar
53465c35a0
python: 3.4.0 -> 3.4.1
2014-05-22 09:05:38 +02:00
Ricardo M. Correia
f3967570e7
python-3.4: Add support for grsecurity
2014-05-15 13:25:50 +02:00
Ricardo M. Correia
982c84514b
python-3.3: Add support for grsecurity
2014-05-15 13:25:50 +02:00
Ricardo M. Correia
6a4fd79b51
python-2.7: Add support for grsecurity
2014-05-15 13:25:50 +02:00
James Cook
21cb9c24f0
Patch python32 for CVE-2014-1912.
2014-04-13 05:15:19 +02:00
James Cook
324ade4658
Patch python27 for CVE-2014-1912.
2014-04-13 05:15:19 +02:00
Ricardo M. Correia
842ae7674b
python-3.4: Add support for lzma
2014-03-23 21:26:54 +01:00
Ricardo M. Correia
c173ddb70e
python-3.3: Add support for lzma
2014-03-23 21:26:54 +01:00
Georges Dubus
24e9c676d2
python: update 3.4.0 to stable release
2014-03-17 17:07:20 +01:00
Domen Kozar
f911d51243
python 3.3.4 -> 3.3.5
2014-03-09 21:04:14 +01:00
Domen Kožar
83771bd926
add python 3.4.0rc2
2014-03-03 14:21:28 +01:00
Peter Simons
51c9dbc9f3
python-wrapper: add 'ignoreCollisions' parameter (which default to 'false')
2014-02-24 12:41:12 +01:00
Domen Kožar
a0ff8f687f
python3.3: 3.3.3 -> 3.3.4
2014-02-20 00:44:51 +01:00
Domen Kožar
31949ead32
python2.7: 2.7.5 -> 2.7.6
2014-02-20 00:44:27 +01: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
161d029d7d
preferLocalBuild: set to true for wrappers and fetchers
2014-02-10 21:04:17 +01:00
Eelco Dolstra
82359bba65
python-3.3: Only build on Linux
...
It doesn't build on Darwin: http://hydra.nixos.org/build/8597946
2014-01-30 13:57:16 +01:00
Vladimír Čunát
9443129b08
Merge master into stdenv-updates
...
Conflicts:
pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +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
William A. Kennington III
e4b4df6f43
Update python3 from 3.3.2 -> 3.3.3
2013-12-28 21:04:50 +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
c32bf83301
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/interpreters/perl/5.16/default.nix
pkgs/tools/networking/curl/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-python.nix
pkgs/top-level/release-small.nix
pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Shea Levy
06fe4d9904
Partial revert of b09f8110db
...
Didn't mean to commit this change
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-19 09:04:32 -05:00
Shea Levy
b09f8110db
nspr: Bump to 4.10.2
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-18 15:23:30 -05:00
Peter Simons
29588edfe1
python-wrapper: split 'extraLibs' into 'stdLibs' and 'extraLibs', and add 'postBuild' step
...
The default setting for extraLibs used to be the set of modules that come with
python by default but aren't usually enabled in our standard python derivation
because they require additional libraries. This meant that users who want to
*add* libraries to that set had to use a fairly complicated override, to add
more entries without loosing the ones set by default.
After this patch, the "standard libraries" such as "curses' are listed in
stdLibs while the extraLibs argument remains empty by default. This allows
users to override extraLibs without overriding the standard libraries.
Furthermore, the wrapper environment can be messed around with in an
additional 'postBuild' step. One nice application of this build step is
to patch scripts and binaries to use the wrapped python interpreter
instead of the pristine one, thereby enabling them to pick up all
modules that have been configured. The following example shows how this
is done for the 'pylint' utility:
pkgs.python27Full.override {
extraLibs = [pkgs.pylint];
postBuild = ''
cd ${pkgs.pylint}/bin
for i in *; do
rm $out/bin/$i
sed -r -e "s|^exec |exec $out/bin/python -- |" <$i >$out/bin/$i
chmod +x $out/bin/$i
done;
'';
};
2013-11-07 15:13:02 +01:00
Peter Simons
46419ae454
python-wrapper: recursively include all dependencies of the specified 'extraLibs' in the generated environment
...
This patch means that adding 'matplotlib' to extraLibs will automatically
include 'numpy', too, because matplotlib depends on it.
2013-11-07 14:00:08 +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
Michael Raskin
fb2cb7bc0f
Adding Glances system monitoring tool
2013-10-18 11:11:47 +04:00
Shea Levy
f6e835a2c3
Fix pythonWrapper when all of the binaries come from python
...
See discussion in #834
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-03 15:25:43 -04:00
Peter Simons
742d6597ca
Re-implement python-wrapper with buildEnv.
...
The new wrapper creates an environment that contains all files from
Python and the extra libraries that have been specified. All files are
found at run-time by means of the $PYTHONHOME variable; the wrapper no
longer uses $PYTHONPATH.
2013-10-02 22:47:19 +02: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
Domen Kožar
1974c55d91
add python application substanced and it's dependencies
2013-08-13 11:14:24 +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
918e5efb99
recurse into python33 and pypy packages
2013-07-29 14:52:19 +02:00
Domen Kozar
5ec6cf3756
add python3 support to pythonPackages
2013-07-29 12:09:06 +02:00
Domen Kozar
e41fc2a677
add python32
2013-07-23 11:55:35 +02:00
Domen Kozar
e491997a6b
python3: 3.3.1 -> 3.3.2
2013-07-23 11:21:38 +02:00
Vladimír Čunát
8ba92b8895
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/tools/misc/binutils/default.nix
pkgs/tools/package-management/disnix/default.nix
pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
Jason \"Don\" O'Conal
9007e57f28
python27: compile with tkinterp on darwin
2013-07-04 13:11:25 +02:00
Vladimír Čunát
4251b70c7e
Merge master into stdenv-updates (contains new X stuff)
2013-06-27 16:24:57 +02:00
Evgeny Egorochkin
09e6ae577b
Python: add DETERMINISTIC_BUILD env var. If set, python doesn't write timestamps to pyc files. Tested by
...
building argparse, compiling from cli, compiling using py_compile.
2013-06-22 09:45:01 +03: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
Domen Kozar
1a1d8dfc69
Python: 2.7.4 -> 2.7.5
2013-06-05 21:07:46 +02:00
Domen Kozar
bf58711b2b
python: 2.7.3 -> 2.7.4
2013-05-03 09:06:06 +02:00
Vladimír Čunát
8249695b61
Merge branch 'master' into x-updates
...
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Peter Simons
022f120a2c
Merge branch 'master' into stdenv-updates.
2013-04-07 23:37:12 +02:00
Domen Kozar
b4ac9a4c9f
python: 2.7.3 -> 2.7.4
2013-04-07 12:22:40 +02:00
Domen Kozar
ec25d38261
python 3.3.1rc1 -> 3.3.1
2013-04-07 11:13:37 +02:00
Vladimír Čunát
eb2e46aab2
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/applications/graphics/rawtherapee/default.nix
pkgs/applications/misc/blender/default.nix
pkgs/applications/networking/browsers/chromium/sources.nix
pkgs/os-specific/linux/kernel/linux-3.9.nix
pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Cillian de Róiste
0ad1f78760
Python3: fix the download URL
2013-03-28 22:57:37 +01:00
Cillian de Róiste
a5e48c0f20
Python 3.3 upgrade to 3.3.1rc1 to fix an important bug for Nix
...
http://bugs.python.org/issue15833
When Python 3.3.0 attempts to compile python bytecode in the system
directories it raises and exception and stops. Since Python 3.3 is
only required by the latest Blender, I hope it's OK to use the RC
until the final release.
2013-03-28 01:10:23 +01:00
Peter Simons
270a0009be
python3: update to version 3.3.0
2013-03-26 01:16:15 +01:00
Florian Friesdorf
870f4cca73
fix pythonWrapper for non-gnu ln
2013-03-25 15:13:08 +01:00
Vladimír Čunát
b1eeae8cac
Merge branch 'master' into x-updates
...
Conflicts (easy):
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Florian Friesdorf
94f2013c0c
pythonDocs: recurseIntoAttrs does not recurse, bypass problem
2013-03-13 13:16:03 +01:00
Vladimír Čunát
86639d9bb9
Merge branch 'master' into x-updates
...
Conflicts (taken master versions):
pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
pkgs/desktops/xfce/applications/gigolo.nix
pkgs/desktops/xfce/applications/mousepad.nix
pkgs/desktops/xfce/applications/ristretto.nix
pkgs/desktops/xfce/applications/terminal.nix
pkgs/desktops/xfce/applications/xfce4-mixer.nix
pkgs/desktops/xfce/applications/xfce4-notifyd.nix
pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
pkgs/desktops/xfce/art/xfce4-icon-theme.nix
pkgs/desktops/xfce/core/exo.nix
pkgs/desktops/xfce/core/garcon.nix
pkgs/desktops/xfce/core/gtk-xfce-engine.nix
pkgs/desktops/xfce/core/libxfce4ui.nix
pkgs/desktops/xfce/core/libxfce4util.nix
pkgs/desktops/xfce/core/libxfcegui4.nix
pkgs/desktops/xfce/core/thunar-volman.nix
pkgs/desktops/xfce/core/thunar.nix
pkgs/desktops/xfce/core/tumbler.nix
pkgs/desktops/xfce/core/xfce4-appfinder.nix
pkgs/desktops/xfce/core/xfce4-panel.nix
pkgs/desktops/xfce/core/xfce4-power-manager.nix
pkgs/desktops/xfce/core/xfce4-session.nix
pkgs/desktops/xfce/core/xfce4-settings.nix
pkgs/desktops/xfce/core/xfconf.nix
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/desktops/xfce/core/xfwm4.nix
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
pkgs/development/libraries/webkit/default.nix
pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Florian Friesdorf
b345bca3af
pythonDocs: group in subfolders pythonXY/TYPE
...
I got it now - promised.
2013-03-05 12:41:30 +01:00
Florian Friesdorf
2e21e4fadc
fix pythondocs (missing lib, doc instead of docs)
2013-03-05 12:28:48 +01:00
Florian Friesdorf
930e4d5391
pythonDocs: add meta.maintainers, subgroup attrset by doctype
2013-03-03 06:48:05 +01:00
Florian Friesdorf
06e4059f80
fix pythonDocs install path
2013-03-02 16:01:42 +01:00
Florian Friesdorf
0314b8b00f
add python docs
2013-03-02 05:42:26 +01:00
Lluís Batlle i Rossell
bcbf9472ea
Merge remote-tracking branch 'central/master' into x-updates
2013-02-18 13:49:11 +01:00
Vladimír Čunát
b3ce50d88a
add python33 (needed by new blender)
2013-02-16 18:11:32 +01:00
Vladimír Čunát
dbcdc27e03
python3: fix libPrefix passthru
2013-02-16 18:10:43 +01:00
Florian Friesdorf
1a52c7659d
python: fix linkme-wrapper
2013-02-15 06:14:58 +01:00
Florian Friesdorf
906be2ea98
python-linkme-wrapper: optimize some escaping
2013-02-05 20:12:28 +01:00
Florian Friesdorf
a63bb419f2
remove pythonhome-wrapper, python-linkme-wrapper is more flexible
2013-01-22 15:28:30 +01:00
Florian Friesdorf
1fa2e7f9a9
python-linkme-wrapper
2013-01-22 15:28:30 +01:00
Florian Friesdorf
212b4df91c
recursivePthLoader included via wrapper, not propagated by modules
2013-01-11 09:53:28 +01: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
Eelco Dolstra
356ce12cd0
* Python 2.7.3 (including various security fixes).
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=34008
2012-05-07 20:08:10 +00:00
Peter Simons
27de563164
Updated Python 3.x.
...
- updated to version 3.2.3
- fixed version numbers in setup-hook.sh
- sort input variable list alphabetically
- tk support needs x11 support as well
- deleted obsolete version 3.1
Furthermore, all CPPFLAGS and LDFLAGS required to find the build inputs are now
explicitly passed to ./configure. The python 3.x build systems tries to ignore
the environment as much as possible to provide deterministic builds. This means
that our magic environment variable stuff won't work, and previously built
python3 binaries lacked all kinds of extensions, such as zlib, etc.
svn path=/nixpkgs/trunk/; revision=33937
2012-04-27 08:20:46 +00: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
Eelco Dolstra
934ef8e3fc
* Fix evaluation of pythonPackages.bugz.
...
svn path=/nixpkgs/trunk/; revision=33815
2012-04-17 15:31:44 +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
4956884de5
Revert "do not propagate makeWrapper via pythonXYFull"
...
This reverts commit 3ee2667e4c60c2ed850da8538cf135fe7f716f30.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32656
2012-02-28 00:07:33 +00:00
Florian Friesdorf
bf1fe3aa09
Revert "pysite support for pythonXYFull wrapper"
...
This reverts commit f77b9a16a9ef52951a601997593dc557a42660b9.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32653
2012-02-28 00:07:23 +00:00
Florian Friesdorf
1d2e06e068
pysite support for pythonXYFull wrapper
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32593
2012-02-26 17:23:42 +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
95f0b6119c
do not propagate makeWrapper via pythonXYFull
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32589
2012-02-26 17:23:28 +00:00
![](/avatar/2f93d08a773b27d6548598c5f45aa3a9?size=56 "Jason \\"Don\\" O'Conal"){kind=small}
