Johannes Bornhold
249b34aadc
python: Move catch_conflicts.py into subdirectory ( #23600 )
...
Python does add the script's directory into "sys.path". For the case of
"catch_conflicts.py" this means "/nix/store" is added to "sys.path". This can
result in very long delays if the store contains a lot of entries.
(moved from master commit 76213d102c
2017-04-01 12:22:36 +02:00
Vladimír Čunát
2839b101f9
Merge commit older staging
...
No new failures on Hydra.
2017-03-05 08:00:42 +01:00
Domen Kožar
fb40889ddb
mk-python-derivation: remove me as maintainer
...
The time has come ...
2017-03-03 14:37:28 +01:00
Frederik Rietdijk
a1f6b8b5fc
Python 3.6 fixup expat and libffi, fixes #23406
2017-03-03 07:46:52 +01:00
Frederik Rietdijk
b588ed95b9
Python 3.4: fixup expat and libffi, fixes #23325
2017-03-02 13:17:40 +01:00
Frederik Rietdijk
079353e208
Python 2.7: increase priority - fixup
...
From the manual:
> This attribute should be a number, with a higher value denoting a
lower priority. The default priority is 0.
Just passing -5 or -10 wasn't sufficient, so let's make it -100.
2017-02-26 16:27:45 +01:00
Frederik Rietdijk
4bc1d02698
Python 2.7: increase priority
...
Higher priority than Python 3.x so that `/bin/python` points to
`/bin/python2` in case both 2 and 3 are installed.
2017-02-26 16:07:52 +01:00
Frederik Rietdijk
04b7a2791e
Python 3.4: improve determinism
2017-02-26 14:51:26 +01:00
Frederik Rietdijk
57ded03833
Python 3.4: use system expat and ffi
2017-02-26 14:51:26 +01:00
Frederik Rietdijk
1bbf249bef
Python 3.4: improve determinism
2017-02-26 14:51:26 +01:00
Frederik Rietdijk
d33f6f4032
Python 3.6: use system expat and ffi
2017-02-26 14:51:26 +01:00
Frederik Rietdijk
1531b5edd2
Python 3.6: improve determinism
2017-02-26 14:51:26 +01:00
Frederik Rietdijk
14a88e76cf
Python 3.5: use system expat and ffi
2017-02-26 14:50:09 +01:00
Frederik Rietdijk
dd3a501a4b
Python: mkPythonDerivation: use PYTHONHASHSEED=0
2017-02-26 14:50:09 +01:00
Frederik Rietdijk
8970a9c86e
Python 3.5: improve determinism
...
- Windows installers are indeterministic and we don't need them.
- since Python 3 ensurepip is installed by default. pip is indeteministic and we don't need it.
- rebuild bytecode to ensure its deterministic
2017-02-26 14:50:09 +01:00
Frederik Rietdijk
09f6b03b2e
Python 2.7: improve determinism
...
There is some randomness in the Windows installers. Since we don't need
them, we delete them.
2017-02-26 14:50:09 +01:00
Vladimír Čunát
2f1945dcd3
python-3.6: fix random numbers with glibc-2.25
...
I missed this upstream patch. /cc #22874 .
2017-02-22 17:34:33 +01:00
Vladimír Čunát
cab0b445be
python-3.4: fixup with glibc-2.25 (/cc #22874 )
...
Upstream won't support it, but let me trick the code into behaving
as if glibc was older. It seems 3.3 branch should be unaffected.
2017-02-21 17:56:32 +01:00
Vladimír Čunát
2cb76ff1ff
Merge branch 'glibc-2.25' into staging
...
The largest problem-causers should be fixed now (within).
2017-02-20 21:18:48 +01:00
Nikolay Amiantov
7cbe538e94
pythonPackages.wrapPython: fix for paths with spaces
2017-02-19 01:43:12 +03:00
Vladimír Čunát
110f136dc2
python*: upstream patches to fix with glibc-2.25
...
https://bugs.python.org/issue29157
The 3.6 release already contains the fix (from 3.5);
the branches in-between are claimed to be unaffected.
/cc #22874 .
2017-02-16 23:13:38 +01:00
Frederik Rietdijk
12285d162c
pypy: inherit pythonVersion
2017-02-14 09:23:59 +01:00
Frederik Rietdijk
c2e2a4d2c5
Python: remove 2.6
2017-02-13 14:42:24 +01:00
Frederik Rietdijk
b846a53d2a
python34: 3.4.5 -> 3.4.6
2017-02-08 20:48:14 +01:00
Frederik Rietdijk
939f426906
python35: 3.5.2 -> 3.5.3
2017-02-08 20:48:14 +01:00
Vladimír Čunát
adab4cd58b
Merge branch 'master' into staging
2017-02-03 11:47:38 +01:00
Frederik Rietdijk
7b6b7f6b78
Python Flit: run tests by default
2017-02-01 14:54:20 +01:00
Frederik Rietdijk
e33bc13349
Merge pull request #22086 from timbertson/pip-stderr
...
buildPythonPackage: send pip output to stderr
2017-01-24 11:20:53 +01:00
Tim Cuthbertson
7af2d3d6e2
buildPythonPackage: send pip output to stderr
2017-01-24 21:08:42 +11:00
Charles Strahan
d298a961f1
Merge pull request #21416 from cstrahan/mesos-1.1.0
...
mesos: 1.0.1 -> 1.1.0
2017-01-21 19:05:18 -05:00
Frederik Rietdijk
a3018650a3
Merge pull request #21643 from symphorien/python-tix
...
Python tix module
2017-01-04 20:51:33 +01:00
Symphorien Gibol
a6e3d71361
python: support the tkinter.tix module
2017-01-04 19:39:33 +01:00
Daiderd Jordan
27660cfdc0
Merge branch 'master' into staging
2017-01-04 01:42:26 +01:00
Daiderd Jordan
538d1b688a
stdenv: bootstrap cmake and python on darwin
2017-01-03 18:01:47 +01:00
Herwig Hochleitner
09f66a7457
pypy: 5.4.1 -> 5.6.0
2017-01-02 13:41:28 +01:00
Frederik Rietdijk
d68aba4cfb
Python: script names now include full path
...
Certain programs, like zim, calibre and now also apparently mercurial,
rely on sys.argv[0] providing not just the script name but the full
path.
The Python docs [1] state the following on the matter:
> argv[0] is the script name (it is operating system dependent whether
this is a full pathname or not).
Therefore, scripts should not expect to receive a full path.
Unfortunately some do. While this can be considered a bug, there doesn't
seem any reason not to provide the full path. Therefore we now provide
the full path.
[1]
https://docs.python.org/3.5/library/sys.html?highlight=sys.argv#sys.argv
2017-01-02 11:29:11 +01:00
Charles Strahan
7ebcada020
mesos: 1.0.1 -> 1.1.0
2016-12-29 20:09:46 -05:00
Frederik Rietdijk
b09000e785
python36: 3.6.0rc1 -> 3.6.0
2016-12-24 16:00:52 +01:00
Frederik Rietdijk
591eda8310
python27: 2.7.12 -> 2.7.13
2016-12-24 16:00:31 +01:00
Frederik Rietdijk
2bcd41b9ff
buildPythonPackage: install builds reproducibly
...
Without --build a temporary directory is created to unpack the wheel in.
We now set a directory instead.
2016-12-13 14:45:05 +01:00
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
