Anders Kaseorg
d08ec2f195
pythonInterpreters.pypy36_prebuilt: Set pythonOnBuildForHost
...
This was broken by #105155 .
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-02-20 11:29:46 +01:00
Anders Kaseorg
1c5c184079
pythonInterpreters.pypy36_prebuilt: Add missing lib argument
...
This was broken by commit 001c0cbe54
(#110591 ).
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-02-20 11:29:46 +01:00
Frederik Rietdijk
1e47264608
python.tests: test overriding functions
2021-02-19 10:12:21 +01:00
github-actions[bot]
1c7975a26f
Merge master into staging-next
2021-02-13 18:15:59 +00:00
taku0
28adb5b0c1
Merge pull request #104150 from andersk/pypy-7.3.2
...
pypy, pypy3: 7.3.1 → 7.3.2
2021-02-13 21:48:05 +09:00
github-actions[bot]
257f90a43f
Merge master into staging-next
2021-02-13 12:19:38 +00:00
Frederik Rietdijk
b962afabd4
python.tests: add some comments to the tests
2021-02-13 09:44:51 +01:00
Martin Weinelt
0f5743bee2
pytestCheckHook: Fix support for multiple files.
...
Quoting here will lead to the shell treating them as a single item.
2021-01-24 15:44:45 -08:00
Martin Weinelt
45e5ebfad8
pytestCheckHook: Fix support for spaces in disabled file paths
2021-01-24 15:44:45 -08:00
Jan Tojnar
cc8fd11ffb
Merge branch 'master' into staging-next
2021-01-24 20:41:42 +01:00
volth
bc0d605cf1
treewide: fix double quoted strings in meta.description
...
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Jan Tojnar
01ee4ea574
Merge branch 'master' into staging-next
2021-01-24 00:09:45 +01:00
Ben Siraphob
001c0cbe54
pkgs/development/interpreters: stdenv.lib -> lib
2021-01-23 20:29:03 +07:00
github-actions[bot]
8103cb9089
Merge staging-next into staging
2021-01-23 01:18:03 +00:00
Peter Woodman
858eebe1f9
cpython: fix extensions when using a musl toolchain
2021-01-22 23:56:19 +01:00
github-actions[bot]
08c4f9056e
Merge staging-next into staging
2021-01-22 18:52:00 +00:00
Jonathan Ringer
0389d5b148
python310: 3.10.0a3 -> 3.10.0a4
2021-01-22 07:27:21 -08:00
Jan Tojnar
fc7bd322df
Merge branch 'staging-next' into staging
2021-01-19 13:50:04 +01:00
Jonathan Ringer
9bb3fccb5b
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
...
continuation of #109595
pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.
python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Sandro Jäckel
6f7f01a244
pytestCheckHook: Add disabledTestFiles option
2021-01-16 09:09:26 -08:00
Jan Tojnar
b813710c04
Merge branch 'master' into staging-next
2021-01-14 02:24:17 +01:00
Fabian Möller
07e7cea102
python36: enable ctypes.util.find_library patch
2021-01-13 13:13:02 +01:00
github-actions[bot]
bd9e17e21f
Merge staging-next into staging
2021-01-10 18:41:46 +00:00
github-actions[bot]
76394e4624
Merge master into staging-next
2021-01-10 18:41:43 +00:00
Profpatsch
2497553b23
toplevel: stdenv.lib -> lib
...
The library does not depend on stdenv, that `stdenv` exposes `lib` is
an artifact of the ancient origins of nixpkgs.
2021-01-10 17:44:59 +01:00
Frederik Rietdijk
7c61ecbefd
Revert "Revert "python: 3.8.6 -> 3.8.7.""
...
This was originally reverted because of an invalid patch.
This has been fixed and now we want this update again.
This reverts commit e1ed9b3b08
.
2021-01-09 13:12:44 +01:00
github-actions[bot]
7aced83bf9
Merge staging-next into staging
2021-01-08 12:29:39 +00:00
Orivej Desh
349585e778
python2: fix ctypes.util.find_library with gcc10
...
Fixes #108243
2021-01-08 11:19:39 +01:00
Frederik Rietdijk
5c8df2235a
python3: don't use sysconfigdataHook on darwin
...
Resolves issue when building wheels which is a regression introduced by
1a65c5df5f
```
AssertionError: would build wheel with unsupported tag ('cp38', 'cp38',
'darwin_x86_64')
```
2021-01-08 09:34:36 +01:00
Jan Tojnar
0ea0dacc20
Merge branch 'staging-next' into staging
2021-01-07 13:06:41 +01:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
...
b04fc593e7
seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
github-actions[bot]
2f7fa4bb88
Merge staging-next into staging
2021-01-05 00:57:02 +00:00
Jonathan Ringer
16174037b3
python38: remove obsolete find_library patch
2021-01-04 15:44:35 -08:00
Frederik Rietdijk
e1ed9b3b08
Revert "python: 3.8.6 -> 3.8.7."
...
Need to fix a patch first. Next iteration.
This reverts commit 507efdb11f
.
2021-01-04 20:58:21 +01:00
Drew Hess
507efdb11f
python: 3.8.6 -> 3.8.7.
2021-01-04 20:48:55 +01:00
John Ericson
5c2965145f
treewide: Inline more of the static overlay
...
Picking up where #107238 left off. I think I'll have gotten all the easy
stuff with this.
2021-01-03 21:46:14 +00:00
Ben Wolsieffer
1a65c5df5f
cpython: fix finding headers when cross-compiling extension modules
2020-12-28 13:09:00 +01:00
Lucas Ransan
188f1375d8
cpython: fix ctypes.util.find_library
2020-12-28 08:43:32 +01:00
github-actions[bot]
abb757ba28
Merge master into staging-next
2020-12-18 00:42:45 +00:00
Jonathan Ringer
222fafa02b
python310: 3.10.0a2 -> 3.10.0a3
2020-12-17 11:18:47 -08:00
Greg Roodt
42d28c2a77
python: 3.9.0 -> 3.9.1
2020-12-12 19:32:08 +01:00
Frederik Rietdijk
76966f8ddd
pythonPackages.pip-install-hook: remove --build option
...
Pip had the option --build to build in a custom or temporary directory.
Nowadays, pip just listens to TMPDIR, which we already set.
This option was deprecated and is removed in pip 20.3.
2020-12-01 14:44:26 +01:00
Frederik Rietdijk
9a63b3d3d6
Merge pull request #104781 from NixOS/staging-next
...
Staging next
2020-11-30 18:27:29 +01:00
adisbladis
49b8738a5f
python: Propagate packageOverrides to pythonForBuild
...
When overriding versions of build tools injected via hooks
`packageOverrides` was not taken into account and 2 incompatible
versions of the same package (`wheel` in this case) ended up in the
closure, causing the builds to fail.
2020-11-30 11:12:59 +01:00
Frederik Rietdijk
0d8491cb2b
Merge master into staging-next
2020-11-29 13:51:10 +01:00
Frederik Rietdijk
455774e546
Python: add todo note regarding pythonForBuild
2020-11-28 17:36:23 +01:00
Frederik Rietdijk
5804c8a7f5
Python splicing: splice package sets, not Python derivation
...
In the original commit the various builds of Python were added to
`otherSplices`, instead of the intended Python package sets.
2020-11-28 17:36:23 +01:00
Frederik Rietdijk
6cf25f9dbd
Python: rename parameters and arguments passed to passthru
...
As part of the splicing the build/host/target combinations of the interpreter
need to be passed around internally. The chosen names were not very clear,
implying they were package sets whereas actually there were derivations.
2020-11-28 17:36:23 +01:00
Frederik Rietdijk
8220b0449c
python.tests: use self.callPackage instead of super.callPackage
...
super was incorrectly possible until https://github.com/NixOS/nixpkgs/pull/104201
got merged.
2020-11-28 16:57:07 +01:00
Frederik Rietdijk
cce2fd547b
Python: use pythonPackagesBuildHost instead of pythonForBuild
...
Follow-up to #104201 , related to #105113 .
2020-11-28 16:36:03 +01:00