Commit graph

264 commits

Author SHA1 Message Date
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.

The switch tu UCS-4 only happened for the main Python interpreter and
libraries, but the extension modules were using the same source but
without any configureFlags, so the extensions still referred to UCS-2
symbols.

Tested module builds of Python 2.7 and all modules except crypto fail.
Also tested against sqlite3 module of Python 2.6, although for other
modules there still seems to be an unrelated build failure with Tcl/Tk
libraries, so we might need to fix that later.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
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