Commit Graph

2158 Commits

Author SHA1 Message Date
Martin Weinelt
a94804c451 python39: Move out of sources attrset 2023-02-11 17:50:08 +01:00
Artturi
aaa9ea8ec6 Merge pull request #208537 from Artturin/makesetuphooksupportstrictdeps 2023-02-10 20:08:32 +02:00
github-actions[bot]
87e315024e Merge staging-next into staging 2023-02-09 18:01:44 +00:00
Martin Weinelt
21d200b26d python312: 3.12.0a3 -> 3.12.0a5
https://docs.python.org/3.12/whatsnew/changelog.html#python-3-12-0-alpha-4
https://docs.python.org/3.12/whatsnew/changelog.html#python-3-12-0-alpha-5
2023-02-08 21:38:13 +00:00
Artturin
4e3dcf364e treewide: makeSetupHook deps -> propagatedBuildInputs 2023-02-07 21:02:00 +02:00
Artturin
9a9c42e19f makeSetupHook: support depsTargetTargetPropagated 2023-02-07 21:00:18 +02:00
github-actions[bot]
dfee1a3150 Merge staging-next into staging 2023-02-05 00:03:15 +00:00
superherointj
a411b337d6 Merge pull request #209622 from NickCao/python311-cross
python311: fix cross compilation
2023-02-04 18:04:43 -03:00
Artturi
dcc7df7fe6 Merge pull request #211685 from Artturin/splicingstuff1-split 2023-02-03 12:49:08 +02:00
Weijia Wang
b062ec5b83 rustpython: unbreak on x86_64-darwin 2023-02-03 00:02:17 +01:00
Alyssa Ross
d608fbb9f6 buildPython*: allow overriding disabled packages
Previously:

	nix-repl> python3.pkgs.WSME
	error: WSME-0.11.0 not supported for interpreter python3.10

	nix-repl> python3.pkgs.WSME.overridePythonAttrs (_: { disabled = false; })
	error: WSME-0.11.0 not supported for interpreter python3.10

Now:

	nix-repl> python3.pkgs.WSME
	error: WSME-0.11.0 not supported for interpreter python3.10
	«derivation

	nix-repl> python3.pkgs.WSME.overridePythonAttrs (_: { disabled = false; })
	«derivation /nix/store/cxkiwdfm146zvl573s2hahlbjd1wfrrp-python3.10-WSME-0.11.0.drv»
2023-02-02 16:49:27 +01:00
github-actions[bot]
d7f991bb53 Merge master into staging-next 2023-01-29 00:02:27 +00:00
Alyssa Ross
b682fef8e9 python3.pkgs: fix splice through unsupported hosts
Previously, unless unsupported platforms were allowed, the following
would fail to evaluate (from an "x86_64-linux" system):

    pkgsCross.x86_64-freebsd.__splicedPackages.docutils.__spliced.buildHost

It shouldn't have, because the buildHost package ends up being for
Linux.  This broke evaluation of e.g. pkgsCross.x86_64-freebsd.libdrm,
because it has docutils in nativeBuildInputs.  mkDerivation would try
to go through __spliced.buildHost on docutils to get to the Linux
version, but the check in ensurePythonModules would kick in first,
triggering the meta check because of the equality check in the
implementation of hasPythonModule, which would fail because Python is
not marked as supported on FreeBSD in Nixpkgs at the moment.  Thus,
even though they're not supposed to be, the meta checks would be
triggered even though the only attribute being accessed on the
unsupported derivation was __spliced.

We can fix this by using the same mechanism used to implement the meta
checks themselves: lib.extendDerivation.  Now, attempting to access
drvPath or outPath on an attribute that fails the validity check will
produce the same error as before, but other accesses will be allowed
through, fixing splicing.

I've tested evaluation of packages that pass and fail the validity
check, and confirmed that the behaviour is still correct.
2023-01-28 21:08:50 +00:00
Alyssa Ross
02ee33a5c1 python3.pkgs: simplify ensurePythonModules logic
It wasn't clear before, but it turns out that this is just four
separate conditions, and an attribute is valid if any of the
conditions is true, so we don't need a sea of parentheses to express
it.
2023-01-28 21:08:50 +00:00
Vladimír Čunát
8a77ed60ac Merge branch 'master' into staging-next 2023-01-27 09:36:55 +01:00
Shawn8901
a59dda942c treewide: remove global with lib; statements in pkgs/development 2023-01-26 18:31:02 +01:00
github-actions[bot]
d8bfd0a059 Merge master into staging-next 2023-01-23 06:01:12 +00:00
Nick Cao
6ad4d75364 Merge pull request #211079 from NickCao/py37
python37: remove leftovers
2023-01-23 11:22:35 +08:00
Guillaume Girol
33afbf39f6 treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
2023-01-21 12:00:00 +00:00
Guillaume Girol
339a5491bb buildPythonPackage: support nativeCheckInputs 2023-01-21 16:42:09 +01:00
Guillaume Girol
90c78aee6c Merge branch 'nativeCheckInputs' into staging-nativeCheckInputs 2023-01-21 12:00:00 +00:00
figsoda
3290828905 fetchPypi: move to top level
fetchPypi doesn't use python under the hood and doesn't need to be tied
to a specific version of python. Moving it to top level makes it more
consistent with other fetchers and makes code generation easier.
2023-01-21 08:21:33 +01:00
Artturin
b94fa2c253 python-packages-base: use extends instead of //
// shouldn't be used when overrideAttrs is available

here we can use extends instead of overrideAttrs for performance
2023-01-20 19:19:18 +02:00
Alyssa Ross
0ae87d514f treewide: add names to all setup hooks 2023-01-19 15:00:36 +00:00
Minijackson
2b43490121 python: improve ABI name detection 2023-01-19 15:20:31 +01:00
Nick Cao
dde298c126 python37: remove leftover files 2023-01-16 19:49:16 +08:00
Thiago Kenji Okada
79194a913d Merge pull request #210078 from thiagokokada/dont-expose-resholve
resholve: mark it as knownVulnerabilities, allow resholve-utils usage
2023-01-15 18:10:34 +00:00
Thiago Kenji Okada
66093a4120 python27: remove stripLibs argument
Since we are now guarantee that the `resholve` is not exposing `python27`,
let's remove the `stripLibs` hack that tried to reduce its size.
2023-01-15 12:29:42 +00:00
github-actions[bot]
ceb05ad4bf Merge master into staging-next 2023-01-13 06:01:09 +00:00
Mario Rodas
e7b6fb49fd Merge pull request #208744 from wegank/python312-darwin
python312: fix build on darwin
2023-01-12 22:35:07 -05:00
github-actions[bot]
fce67420c4 Merge master into staging-next 2023-01-09 00:02:14 +00:00
Thiago Kenji Okada
4b74c3c3d1 pypy39: fix pypy3 symlink 2023-01-08 19:34:59 +00:00
Thiago Kenji Okada
c04fc21156 pythonInterpreters.pypy39_prebuilt: remove global with lib 2023-01-08 19:34:59 +00:00
Thiago Kenji Okada
eddcc1c01c pythonInterpreters.pypy27_prebuilt: remove global with lib 2023-01-08 19:34:59 +00:00
Thiago Kenji Okada
a7ffcced44 pypy{27,38,39}: remove global with lib 2023-01-08 19:34:59 +00:00
Thiago Kenji Okada
92f0173213 pypy{27,38,39}: refactor derivation
- Remove code related to i686 archs (not supported anymore since #209100)
- Split non-install steps in installPhase in installCheckPhase/preFixup
- Add missing pre/post hooks
2023-01-08 19:34:59 +00:00
Weijia Wang
9d10b68a85 pypy27: unbreak on aarch64-darwin 2023-01-08 19:00:31 +01:00
Martin Weinelt
4d65509504 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-08 16:34:30 +01:00
Thiago Kenji Okada
2a19c135fc Merge pull request #209597 from wegank/pypy27-darwin
pythonInterpreters.pypy27_prebuilt: fix install check on darwin
2023-01-08 11:05:31 +00:00
Thiago Kenji Okada
dac15fbb93 Merge pull request #209598 from wegank/pypy39-darwin
pythonInterpreters.pypy39_prebuilt: add darwin support
2023-01-08 11:01:17 +00:00
Nick Cao
f742c6d443 python311: fix cross compilation 2023-01-08 12:39:02 +08:00
Weijia Wang
fd6ddd9923 pythonInterpreters.pypy39_prebuilt: add darwin support 2023-01-08 02:04:15 +01:00
Weijia Wang
e380607d07 pythonInterpreters.pypy27_prebuilt: fix install check on darwin 2023-01-08 02:02:45 +01:00
github-actions[bot]
4bf238a8fb Merge master into staging-next 2023-01-08 00:02:31 +00:00
Fabián Heredia Montiel
d9fbb33f92 python27: mark as vulnerable/insecure due to EOL on 2020-01-01
More information: https://www.activestate.com/products/python/python-2-end-of-life-security-updates/
2023-01-07 16:25:35 -06:00
Thiago Kenji Okada
aa0c474f4b pypy{27,38,39}: mark as broken in aarch64-darwin 2023-01-07 21:14:22 +00:00
Thiago Kenji Okada
997a09e612 pypy39: fix build in darwin 2023-01-07 21:11:49 +00:00
Thiago Kenji Okada
4645ec9de6 pypy{27,38,39}: remove i686-linux, add aarch64-darwin 2023-01-07 21:11:49 +00:00
Thiago Kenji Okada
40db51d563 pythonInterpreters.pypy27_prebuilt: add support to darwin 2023-01-07 21:11:49 +00:00
Thiago Kenji Okada
3d440c1c1e pythonInterpreters.pypy39_prebuilt: use autoPatchelfHook 2023-01-07 21:11:49 +00:00