Commit Graph

354 Commits

Author SHA1 Message Date
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 and
others. Having Python propagate less really doesn't make sense.
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.

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
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