Florian Klink
414cde4df4
python: allow stripping IDLE
2019-08-18 23:47:16 +02:00
Frederik Rietdijk
f65aa21bb2
Merge master into staging-next
2019-08-18 12:53:44 +02:00
adisbladis
5c0d493df4
python: Enable building without openssl
2019-08-18 08:18:58 +01:00
volth
46420bbaa3
treewide: name -> pname (easy cases) ( #66585 )
...
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
2019-08-15 13:41:18 +01:00
Emily
ec07b882b3
pypy{2,27,3,35 -> 36}: 7.0.0 -> 7.1.1
2019-08-13 16:49:27 -07:00
Emily
5638dd55e3
pythonInterpreters.pypy{27,35 -> 36}_prebuilt: 6.0.0 -> 7.1.1
2019-08-13 16:49:27 -07:00
Frederik Rietdijk
658c0f0ce9
python38: 3.8.0b2 -> 3.8.0b3
2019-08-03 08:14:25 +02:00
Robin Gloster
30969073f0
Merge remote-tracking branch 'upstream/master' into openssl-1.1
2019-08-02 03:01:30 +02:00
Michael Weiss
8760c695d4
swiften, pypy: Mark as broken
...
swiften is broken since 2018-10-18:
x86_64-linux: https://hydra.nixos.org/build/97180305
aarch64-linux: https://hydra.nixos.org/build/97193043
pypy is broken since 2019-05-29:
x86_64-linux (pypy): https://hydra.nixos.org/build/97214777
x86_64-linux (pypy3): https://hydra.nixos.org/build/97221287
The builds for swiften and reposurgeon (depends on pypy) regularly fail
during rebuilds for SCons updates (e.g. [0]).
[0]: https://github.com/NixOS/nixpkgs/pull/65392
2019-07-30 19:25:43 +02:00
Andreas Rammhold
d80649d2a3
pypy: use openssl 1.0.2
...
While upstream claims support of OpenSSL 1.1 the test suite fails.
2019-07-29 21:25:13 +02:00
Frederik Rietdijk
bd47c5721f
Python: introduce NIX_PYTHONEXECUTABLE in order to set sys.executable
...
This is needed in case of `python.buildEnv` to make sure sys.executable
does not point to the unwrapped executable.
2019-07-27 11:52:49 +02:00
Nikolay Amiantov
da295a1206
python2: backport fix for pyc race condition, part 2
...
Turns out fixing this only in importlib is not sufficient and we
need to backport CPython part of the fix too.
This patch is based on https://hg.python.org/cpython/rev/c16063765d3a
but because the code around is different there are some changes (C-strings
instead of Python objects etc.)
With this patch Tensorflow builds successfully on many-core machine.
2019-07-17 10:22:11 +02:00
Frederik Rietdijk
0d832585b7
Merge staging-next into staging
2019-07-17 10:14:29 +02:00
Frederik Rietdijk
7da15d9b36
buildPythonPackage: add support for setupPyGlobalFlags (2)
2019-07-15 17:47:57 +02:00
Mario Rodas
7094a1af0c
python37: fix distutils C++ patch (PR #64758 )
...
Update distutils patch to the upstream changes.
See: 6c0e0d141a
2019-07-15 09:37:43 +02:00
Frederik Rietdijk
271b57c219
Revert "buildPythonPackage: add support for setupPyDistFlags"
...
I merged this a bit too quick. We need to have a closer look at it.
See the points brought up in https://github.com/NixOS/nixpkgs/pull/64682 .
This reverts commit 1e0ebdb8a4
.
2019-07-13 13:25:32 +02:00
Kirill Boltaev
1e0ebdb8a4
buildPythonPackage: add support for setupPyDistFlags
...
Flags passed to the "python setup.py" command.
2019-07-13 09:47:00 +02:00
Frederik Rietdijk
4aee94629d
Merge staging-next into staging
2019-07-13 09:46:03 +02:00
Frederik Rietdijk
54065ae20d
Merge master into staging-next
2019-07-13 09:45:40 +02:00
Frederik Rietdijk
ec7f569211
python.buildEnv: use NIX_PYTHONPATH
2019-07-13 09:37:33 +02:00
Frederik Rietdijk
46409b5c32
Python: add sitecustomize.py, listen to NIX_PYTHONPATH
...
This commit adds a Nix-specific module that recursively adds paths that
are on `NIX_PYTHONPATH` to `sys.path`. In order to process possible
`.pth` files `site.addsitedir` is used.
The paths listed in `PYTHONPATH` are added to `sys.path` afterwards, but
they will be added before the entries we add here and thus take
precedence.
The reason for adding support for this environment variable is that we
can set it in a wrapper without breaking support for `PYTHONPATH`.
2019-07-13 09:37:33 +02:00
Frederik Rietdijk
8074133844
pythonPackages.fetchPypi: support SRI hashes
2019-07-11 18:01:04 +02:00
Frederik Rietdijk
30f299027a
pythonPackages.fetchPypi: separate url computation from fetchurl
2019-07-11 18:01:04 +02:00
Frederik Rietdijk
f2a8117492
pythonPackages.fetchPypi: put expression in own file
...
Also fixes an evaluation bug.
2019-07-11 18:01:04 +02:00
Charlie Dyson
0426ae63f8
fix : #64340 building python wheels in non-standard store
2019-07-11 10:27:28 +02:00
Frederik Rietdijk
79a03641d5
Merge staging-next into staging
2019-07-09 15:46:26 +02:00
Frederik Rietdijk
74c24385cb
Merge master into staging-next
2019-07-09 15:46:00 +02:00
Frederik Rietdijk
421a87d94c
python38: init at 3.8.0b2
2019-07-09 15:31:37 +02:00
Frederik Rietdijk
46d91410af
python37: 3.7.3 -> 3.7.4
2019-07-09 10:04:25 +02:00
Frederik Rietdijk
a88e319591
python36: 3.6.8 -> 3.6.9
2019-07-09 10:04:25 +02:00
Timo Kaufmann
9db3a5869e
python2: backport fix for pyc race condition
...
This is python bug https://bugs.python.org/issue13146 . Fixed since
python 3.4. It makes pyc creation atomic, preventing a race condition.
The patch has been rebased on our deterministic build patch.
It wasn't backported to python 2.7 because there was a complaint about
changed semantics. Since files are now created in a temporary directory
and then moved, symlinks will be overridden. See
https://bugs.python.org/issue17222 .
That is an edge-case however. Ubuntu and debian have backported the fix
in 2013 already, making it mainstream enough for us to adopt.
2019-07-03 08:40:51 +02:00
volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Matthew Bauer
9f7bb1f512
python27: add override to build statically
2019-06-03 12:28:25 -04:00
Frederik Rietdijk
d801204fdd
Merge pull request #51641 from codedownio/nousersite-master
...
Allow skipping the use of the PYTHONNOUSERSITE variable
2019-05-13 12:39:25 +02:00
Tom McLaughlin
a3f24daa7b
Add flag to disable PYTHONNOUSERSITE for wrapped binaries in python environments
2019-05-13 02:56:56 -07:00
Tom McLaughlin
0045164b15
Add flag to disable PYTHONNOUSERSITE for wrapped python binaries
2019-05-13 02:56:32 -07:00
Frederik Rietdijk
3462fe27d9
Merge staging-next into staging
2019-04-30 15:52:19 +02:00
Ihar Hrachyshka
43f9d5ccaa
Generate python3 docs
2019-04-28 09:24:01 +02:00
Daiderd Jordan
a76e11a8c5
python: make it possible to disable the python setup-hook
...
Without this it's impossible to use a python binary that depends on a
different python version than what's used during the current build.
2019-04-28 09:20:41 +02:00
Dmitry Kalinkin
8fa36fc8a1
python: provide hasCxxDistutils attribute for pythonPackages.numpy
...
Patching numpy.distutils used to be required for pythonPackages.cython
to build on darwin. It was later accidentally disabled during one of the
refactorings, but that did not break cython. This change reinstantiates
the patch. It still applies, so it should be low maintenance and it can
still be useful.
2019-04-28 09:17:59 +02:00
Jan Tojnar
83914f2c56
buildPython*: allow overriding strictDeps
2019-04-24 22:27:06 +02:00
Frederik Rietdijk
9d87ccabce
Merge master into staging-next
2019-04-18 08:25:25 +02:00
bb010g
28ac309309
python3{5,6}: Reintroduce bytecode determinism
...
Originally introduced in 8970a9c
and 1531b5e
, these patches were lost in
efbe87f
when the CPython version files were merged, likely due to
CPython 3.7 not needing them anymore. These patches should remain
in-tree until CPython 3.5 and 3.6 support is dropped completely.
Found with the diffoscope ( https://diffoscope.org/ ).
2019-04-18 08:12:29 +02:00
Frederik Rietdijk
bae32a9f5c
Merge staging-next into staging
2019-04-16 18:54:15 +02:00
Matthew Glazar
fdbcf5ba36
python37: fix build on macOS
...
The upstream patch for distutils does not apply cleanly to Python
3.7.3's sources. (The patch applies cleanly to Python 3.7.2's sources,
but nixpkgs commit 0ddae82e6a
upgraded
Python to 3.7.3.) Fix the patch to make python37 build on macOS.
2019-04-15 10:49:34 -07:00
Corbin
edd5555029
pypy: Disable broken test on 3.x.
2019-04-09 20:41:08 +02:00
Corbin
9c04b75cf9
pypy: 6.0.0 -> 7.0.0
...
Note that this bumps both the 2.7 and 3.5 flavors of PyPy.
2019-04-09 20:41:08 +02:00
Corbin
5719f892e1
python: Make .isPyPy flag more accurate.
...
nix-repl> map (s: s.isPyPy) [ python python3 pypy pypy3 ]
[ false false true true ]
2019-04-09 20:41:08 +02:00
Frederik Rietdijk
0ddae82e6a
python3: 3.7.2 -> 3.7.3
2019-03-26 16:24:04 +01:00
Frederik Rietdijk
23e431387b
Merge staging-next into staging
2019-03-23 09:20:09 +01:00
Frederik Rietdijk
2cc6444113
python35 -> 3.5.6 -> 3.5.7
2019-03-23 09:17:35 +01:00
Wael M. Nasreddine
5af0780492
Merge remote-tracking branch 'origin/master' into staging
...
* origin/master: (693 commits)
buildGoModule: use go_1_12 instead of go_1_11 (#58103 )
gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091 )
signal-desktop: 1.22.0 -> 1.23.0
added missing semicolon to documentation
terminus_font_ttf: 4.46.0 -> 4.47.0
buildGoModule: remove SSL env vars in favor of cacert in buildInputs (#58071 )
dav1d: init at 0.2.1
dropbox-cli: 2018.11.28 -> 2019.02.14
atlassian-confluence: 6.14.1 -> 6.14.2
maintainers: update email for dywedir
python.pkgs.hglib: use patch to specify hg path (#57926 )
chkrootkit: 0.52 -> 0.53
radare2-cutter: 1.7.2 -> 1.8.0
autorandr: 1.7 -> 1.8
pythonPackages.pyhepmc: fix build
llvm-polly/clang-polly: use latest llvm
apulse: 0.1.11.1 -> 0.1.12, cleanup
factorio: experimental 0.17.14 → 0.17.16 (#58000 )
sequeler: 0.6.7 -> 0.6.8
nasc: 0.5.1 -> 0.5.2
...
2019-03-21 21:01:25 -07:00
Matthew Glazar
0bf2d63366
python35: fix build on macOS
...
The upstream patch for distutils does not apply cleanly to Python 3.5's
sources. Fix the patch to make python35 build on macOS.
2019-03-10 13:38:43 +01:00
Vladimír Čunát
8d502fd425
Merge branch 'staging-next' into staging
2019-03-10 08:05:27 +01:00
Frederik Rietdijk
a2736d27d1
buildPythonPackage: fix building with flit
2019-03-06 13:42:46 +01:00
Frederik Rietdijk
347680df96
python: 2.7.15 -> 2.7.16
2019-03-05 08:30:04 +01:00
Frederik Rietdijk
c2eac6741b
Merge master into staging-next
2019-02-24 09:19:12 +01:00
Frederik Rietdijk
1fccd25595
buildPythonPackage: always export LANG=C.UTF-8
2019-02-23 20:08:26 +01:00
Frederik Rietdijk
e7b4608d02
buildPythonPackage: initial support for PEP 517
2019-02-23 20:05:19 +01:00
Florian Friesdorf
fbef5ab82f
Remove myself as maintainer from packages
...
I'm currently not maintaining any packages.
2019-02-22 16:14:13 +01:00
Frederik Rietdijk
b4acd97729
buildPython*: enable strictDeps
2019-02-17 14:40:48 +01:00
Averell Dalton
91aeda1432
python: sysconfig: fix paths
2019-02-07 18:52:08 +01:00
Frederik Rietdijk
9cfae76fc5
Merge staging-next into staging
2019-01-17 09:21:29 +01:00
Anders Kaseorg
004b908ae6
pypy, pypy3: Remove wrapper
...
The wrapper is not needed because the runpath is already set correctly,
and LD_LIBRARY_PATH was breaking child processes linked against
different libc versions.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-01-16 08:36:47 +01:00
Anders Kaseorg
6282071229
pypy: Correct Python version in meta description
...
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-01-16 08:15:50 +01:00
Frederik Rietdijk
c5d99308de
buildPython*: fix nativeBuildInputs
2019-01-15 10:16:11 +01:00
Lengyel Balazs
f4a53ff3bc
treewide/xorg: replace *proto with xorgproto
2019-01-04 14:38:57 +01:00
Frederik Rietdijk
63bcd07888
python: add isPy2 attribute to passthru
...
Some packages relied on it. For consistency, also introduce isPy3 (which
is the same as isPy3k).
2019-01-04 12:31:42 +01:00
Frederik Rietdijk
d91b496eac
pythonInterpreters.pypy{27,35}_prebuilt: init at 6.0.0
...
These interpreters are prebuilt by upstream and patched using patchelf.
They are primarily added for testing purposes and development on the
non-prebuilt PyPy interpreters as it can speed up translation
significantly.
2019-01-04 10:45:22 +01:00
Frederik Rietdijk
0a2caa41fe
Python: drop python.majorVersion
...
Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`.
For implementation version, use `python.sourceVersion`.
Some expressions were broken. Those that were identified were fixed.
fixup major
2019-01-04 10:45:22 +01:00
Frederik Rietdijk
f665828fa3
Python: improve cross-compilation
...
This changeset allows for cross-compilation of Python packages. Packages
built with buildPythonPackage are not allowed to refer to the build
machine. Executables that have shebangs will refer to the host.
2019-01-04 10:45:22 +01:00
Frederik Rietdijk
613498af97
pypy: merge 2.7 and 3.5 into a single expression
...
This commit merges the two expressions in a single one, using
the passthru function that is shared with CPython.
2019-01-04 10:45:22 +01:00
Frederik Rietdijk
efbe87f3ef
CPython: merge expressions of interpreters
...
Each time a new major/minor version of CPython was released, a new
expression would be written, typically copied from the previous release.
Often fixes are only made in the current/latest release. By merging the
expressions it's more likely that modifications end up in all versions,
as is likely intended.
This commit introduces one expression for Python 3, and another for 2.7.
These two may also be merged, but it will result in a lot of extra
conditionals making the expression harder to follow.
A common passthru is introduced for CPython and PyPy.
python 2.7: use common passthru
2019-01-04 10:45:22 +01:00
Franz Pletz
47587f5d31
python37: fix cross build
2019-01-01 23:00:56 +01:00
Frederik Rietdijk
10afccf145
Merge staging-next into staging
2018-12-27 18:11:34 +01:00
Mario Rodas
1764870813
python37: fix darwin build
...
Remove issue24658 patch because is already fixed and backported to
Python 3.7 178d1c0777
2018-12-27 09:27:59 +01:00
Mario Rodas
31680c54e1
python36: fix darwin build
...
Remove issue24658 patch because is already fixed and backported to
Python 3.6 a5ebc205be
2018-12-27 09:27:59 +01:00
Frederik Rietdijk
2526f9f157
python37: remove references to openssl.dev
2018-12-26 10:37:55 +01:00
Frederik Rietdijk
e45ca47f14
Merge staging-next into staging
2018-12-26 09:30:32 +01:00
Frederik Rietdijk
552d8a70d4
python37: 3.7.1 -> 3.7.2
2018-12-25 10:05:49 +01:00
Frederik Rietdijk
741e00fd10
python36: 3.6.7 -> 3.6.8
2018-12-25 10:05:38 +01:00
Jan Tojnar
ef935fa101
Merge branch 'master' into staging
2018-12-24 15:02:29 +01:00
Frederik Rietdijk
3d5025ba79
buildPython*: don't override custom updateScript
2018-12-23 09:59:56 +01:00
Jörg Thalheim
1b146a8c6f
treewide: remove paxutils from stdenv
...
More then one year ago we removed grsecurity kernels from nixpkgs:
https://github.com/NixOS/nixpkgs/pull/25277
This removes now also paxutils from stdenv.
2018-12-22 12:55:05 +01:00
Jörg Thalheim
855777ad22
wrap-python: fix pypy site-packages path
2018-12-20 14:18:25 +00:00
Jörg Thalheim
cc30e48624
Merge pull request #52481 from Mic92/python37-cross
...
python37: fix cross-compilation
2018-12-20 15:06:22 +01:00
Jan Tojnar
e69ee9b53e
buildPython*: simplify updateScript
...
updateScript accepts a list, in which case, it will execute the head with the
tail as arguments. Switching to this style will allow us to get rid of the need
to create extra script doing just that.
2018-12-20 00:28:49 +01:00
Anders Kaseorg
85379a29ec
pypy3: init at 6.0.0
...
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-12-19 09:53:31 +01:00
Jörg Thalheim
ab9c602fd4
Merge pull request #40459 from andersk/pypy
...
pypy: 5.10.0 -> 6.0.0
2018-12-18 20:35:38 +00:00
Jörg Thalheim
14b2dcea8f
python37: fix cross-compilation
2018-12-18 12:39:24 +00:00
Frederik Rietdijk
74d0b82f29
buildPython*: add updateScript to passthru
...
All Python packages now have an updateScript. The script calls
`update-python-libraries` and passes it the position of the derivation
expression obtained using `meta.position`. This works fine in case a Nix
expression represents only a single derivation. If there are more in it,
`update-python-libraries` will fail.
2018-12-07 15:48:54 +01:00
Anders Kaseorg
6d80927a43
pypy: Set isPy2, isPy27
...
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-11-20 01:59:08 -08:00
Anders Kaseorg
8b80dec522
pypy: Reenable tests fixed upstream
...
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-11-20 01:59:08 -08:00
Anders Kaseorg
91333c1740
pypy: Remove redundant --withmod-* flags
...
--allworkingmodules is already the default.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-11-20 01:59:08 -08:00
Anders Kaseorg
f96349c456
pypy: Change libPrefix from pypy5.10 to pypy2.7
...
To avoid conflicting with pypy3, as per
https://github.com/NixOS/nixpkgs/pull/34066#issuecomment-359155484 .
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-11-20 01:59:08 -08:00
Frederik Rietdijk
63c6875f26
Merge master into staging-next
2018-11-18 10:32:12 +01:00
Travis Athougies
d0eb502327
Enable cross compilation for cpython 2.7 ( #50245 )
2018-11-15 19:36:03 +01:00
Frederik Rietdijk
917400bcff
Revert "Python: reduce amount of warnings when building with buildPython*
"
...
Turns out that many packages' testsuites rely on the default warnings setup.
This reverts commit c1e003ff2f
.
2018-11-12 18:55:50 +01:00
Franz Pletz
ae3e9b5a27
python27: add patch to fix CVE-2018-1000802
2018-11-11 09:00:31 +01:00
Frederik Rietdijk
53d00c3351
Merge master into staging-next
2018-11-10 11:08:54 +01:00