Thiago Kenji Okada
6ae570f76b
pythonInterpreters.pypy27_prebuilt: 3.7.11 -> 3.7.12
2023-09-25 11:50:03 +01:00
Peder Bergebakken Sundt
bdda7b0a53
python3Packages.flitBuildHook: remove
2023-09-22 21:11:24 +02:00
github-actions[bot] and GitHub
2b20c287ac
Merge master into staging-next
2023-09-21 00:02:13 +00:00
Martin Weinelt and GitHub
eaf1374d93
Merge pull request #256132 from SuperSandro2000/python2
...
python2: 2.7.18.6 -> 2.7.18.7
2023-09-21 00:51:12 +02:00
Fabián Heredia Montiel
b2f85dbf28
Merge remote-tracking branch 'origin/master' into staging-next
2023-09-20 15:08:16 -06:00
Martin Weinelt
f74c16f4fc
python312: 3.12.0rc2 -> 3.12.0rc3
...
https://docs.python.org/3.12/whatsnew/changelog.html#python-3-12-0rc3
2023-09-20 03:10:36 +02:00
Sandro Jäckel
63f0a174a0
python2: 2.7.18.6 -> 2.7.18.7
2023-09-19 16:18:58 +02:00
Lassulus and GitHub
67b2f14549
Merge pull request #254547 from DavHau/fix-pyproject-build
...
python3.pkgs.pypaBuildHook: fix conflicts via propagated inputs
2023-09-15 21:40:45 +02:00
Frederik Rietdijk and GitHub
53dd1a6edb
Merge pull request #254136 from figsoda/python
...
python310Packages.buildPythonPackage: introduce pyproject option
2023-09-14 18:33:49 +02:00
figsoda
6893201945
python310Packages.buildPythonPackage: introduce pyproject option
2023-09-12 19:54:03 -04:00
DavHau
c57e6b692a
python3.pkgs.pypaBuildHook: fix conflicts
...
This modifies the pypaBuildHook to not propagate its own python dependencies into the build environment. This prevents package conflicts.
- modify pypa-build-hook.sh to call pyproject-build via an absolute path. This removes the need of putting the dependencies inside the hook's propagatedBuildInputs
- remove the hook's dependencies from propagatedBuildInputs
- add a passthru test to the hook testing for the fix
2023-09-12 21:04:26 +02:00
Anderson Torres and GitHub
3fc613c5ba
Merge branch 'master' into staging-next
2023-09-11 23:25:38 +00:00
Martin Weinelt and GitHub
1faf0ef118
Merge pull request #254221 from natsukium/cpython312/update
...
python312: 3.12.0b4 -> 3.12.0rc2; python38: 3.8.17 -> 3.7.18; python39: 3.9.17 -> 3.9.18
2023-09-11 16:47:20 +02:00
github-actions[bot] and GitHub
b6eb350562
Merge master into staging-next
2023-09-10 00:02:16 +00:00
Leandro Reina
a391639845
python3Packages.sphinxHook: Fix cross compilation
...
Failed due to using host sphinx instead of build one.
2023-09-09 21:34:33 +02:00
natsukium
0a6f3b5857
python39: 3.9.17 -> 3.9.18
...
https://docs.python.org/release/3.9.18/whatsnew/changelog.html
Fixes: CVE-2023-40217
2023-09-09 19:42:16 +09:00
natsukium
ab5b8e656a
python38: 3.8.17 -> 3.8.18
...
https://docs.python.org/release/3.8.18/whatsnew/changelog.html
Fixes: CVE-2023-40217
2023-09-09 19:42:16 +09:00
natsukium
bc9bf8621c
python312: 3.12.0b4 -> 3.12.0rc2
...
https://docs.python.org/3.12/whatsnew/changelog.html#python-3-12-0rc2
Fixes: CVE-2023-40217
2023-09-09 19:42:07 +09:00
github-actions[bot] and GitHub
d987b47512
Merge master into staging-next
2023-09-08 06:00:58 +00:00
marius david and Artturin
a02761d722
python311: enable cross-compilation to windows
2023-09-07 02:16:21 +03:00
28c0cd5b17
cpython: remove broken include/python3.X/python3.Xm symlink
...
The m flag was removed in Python 3.8:
https://docs.python.org/3/whatsnew/3.8.html#build-and-c-api-changes
Co-authored-by: Anders Kaseorg <26471+andersk@users.noreply.github.com >
2023-09-01 02:52:50 +03:00
Theodore Ni and GitHub
130e063a3d
pypaInstallHook: enter "dist" directory before installing ( #250464 )
2023-08-21 08:45:47 +02:00
Theodore Ni
d494084017
Merge branch 'staging-next' into staging
...
Merging https://github.com/NixOS/nixpkgs/pull/245957 with https://github.com/NixOS/nixpkgs/pull/246022 .
2023-08-20 20:09:45 -07:00
Theodore Ni
dab839357e
Merge branch 'master' into staging-next
...
Had to merge https://github.com/NixOS/nixpkgs/pull/245957 and
https://github.com/NixOS/nixpkgs/pull/247245 .
2023-08-20 12:01:22 -07:00
Artturi and GitHub
bde196dde9
Merge pull request #245957 from amjoseph-nixpkgs/pr/lib/customization/makeScopeWithSplicing2
2023-08-20 18:57:05 +03:00
Theodore Ni and Frederik Rietdijk
dd1256d2ca
python3.pkgs.pythonRelaxDepsHook: don't propagate wheel
...
The usage of wheel should be restricted to the hook. I discovered this
when trying to remove wheel from the Python bootstrap. Some packages
that needed wheel did not need it added explicitly because they use this
hook. This implicit change to the dependency tree shouldn't happen (even
though it is mostly harmless).
2023-08-20 11:00:51 +02:00
Theodore Ni and Frederik Rietdijk
4e7188c39a
python3.pkgs.buildPythonPackage: disable conflict check for setuptools and wheel
...
We can do this automatically for packages we know cannot use the
conflict check hook when it would lead to infinite recursion.
2023-08-20 10:59:47 +02:00
Theodore Ni and Frederik Rietdijk
6c85fff302
python3.pkgs.buildPythonPackage: switch to PyPA build and installer
2023-08-20 10:59:47 +02:00
Theodore Ni and Frederik Rietdijk
e8cca499a8
python2.{buildPythonPackage,buildPythonApplication}: extract into its own file
...
As we continue iterating on Python infrastructure for Python 3, some
code is starting to diverge for Python 2. If we copy the current state
of mk-python-derivation.nix and freeze it for Python 2, we can iterate
on it for Python 3 with more freedom.
2023-08-20 10:59:46 +02:00
Theodore Ni and Frederik Rietdijk
93d25dda84
python3.pkgs.pypaBuildHook: switch to pyproject-build
...
Upstream's recommended "python -m build" way of invoking build fails
when the working directory contains a file named "build.py". This is
common for poetry projects that build C extensions.
2023-08-20 10:59:46 +02:00
Theodore Ni and Frederik Rietdijk
a4d66bcc5f
python3.pkgs.pypaInstallHook: init
2023-08-20 10:59:46 +02:00
github-actions[bot] and GitHub
bb1bf988bc
Merge staging-next into staging
2023-08-19 12:01:31 +00:00
github-actions[bot] and GitHub
d3b2560b73
Merge master into staging-next
2023-08-19 12:01:03 +00:00
Theodore Ni and GitHub
4ed77bebec
Merge pull request #247868 from doronbehar/pkg/python-tk-test
...
python.tests.tkinter: init
2023-08-19 04:04:24 -07:00
Doron Behar
ca499f6965
python.tests.tkinter: init
2023-08-19 14:00:56 +03:00
Theodore Ni
ece0953571
Merge branch 'staging-next' into staging
2023-08-18 16:02:27 -07:00
github-actions[bot] and GitHub
03146a5454
Merge master into staging-next
2023-08-18 06:01:01 +00:00
Nick Cao and GitHub
e19e2222d7
python3Packages.pythonNamespacesHook: use findutils from buildPackages ( #249864 )
2023-08-18 07:39:36 +02:00
Adam Joseph and Artturin
cbc8aa437c
treewide: use uncurried version of makeScopeWithSplicing
2023-08-14 02:51:10 +03:00
Thiago Kenji Okada and GitHub
5dda73a162
Merge pull request #248516 from thiagokokada/remove-version-from-python-relax-deps-hook
...
pythonRelaxDepsHook: remove version from pkg_name
2023-08-12 00:57:55 +00:00
Thiago Kenji Okada
98de48fc8f
pythonRelaxDepsHook: remove version from pkg_name
...
Since the wheel file name is based on the package metadata instead of
what we set in the derivation, if you set the version as `unstable-YYYYMMDD`,
for example, the hook would silently fail. We will ignore the version
now and just use a glob instead to match anything that has the package
name in its path.
Fixes #248185 .
2023-08-11 14:56:14 +01:00
github-actions[bot] and GitHub
80be812da1
Merge staging-next into staging
2023-08-09 06:01:27 +00:00
Ben Wolsieffer and GitHub
02719f21e6
cpython: fix _PYTHON_SYSCONFIGDATA_NAME on armv7l with musl ( #240770 )
...
Python always uses "gnu" prefixed ABI names, and this patch handles this by
doing a musl->gnu string replacement.
With pkgsCross.armv7l-hf-multiplatform.pkgsStatic, the previous name was:
_sysconfigdata__linux_arm-linux-gnu
Now, the corrected name is:
_sysconfigdata__linux_arm-linux-gnueabihf
2023-08-09 07:16:58 +02:00
github-actions[bot] and GitHub
792f4d7934
Merge staging-next into staging
2023-08-08 18:01:27 +00:00
Sandro Jäckel and Anderson Torres
4514e57231
cpython: use correct variable to set meta.mainProgram
2023-08-08 17:25:28 +00:00
Adam Joseph and GitHub
e67ff6614b
Merge pull request #247245 from Artturin/passthrufunthng1
...
Revert "Revert "python3: splice python within python3Packages.callPackage""
2023-08-05 21:33:38 +00:00
Artturin
8eff2eea8c
Revert "Revert "python3: splice python within python3Packages.callPackage""
...
This reverts commit 2ffca30cde .
`793cc9d982415b71cdba729cf779bfc49e9d2ae7` `python3: splice python within python3Packages.callPackage`
Was reverted because it broke
`pkgsCross.aarch64-multiplatform.python3Packages.cryptography`
But by reverting the revert `pkgsCross.aarch64-multiplatform.python3Packages.cryptography` still builds.
I tried reverting the 2 cryptography update commits, and it still
worked, so I do not know why this would work now.
2023-08-05 02:37:16 +03:00
github-actions[bot] and GitHub
5827446dce
Merge master into staging-next
2023-08-03 00:01:56 +00:00
Robert Hensing
34ee0260ec
treewide: Add meta.mainProgram
...
Based on ofborg feedback.
Part of https://github.com/NixOS/nixpkgs/pull/246386
2023-08-01 12:21:05 +02:00
Silvan Mosberger and GitHub
a0b8caf3bc
Revert "lib.customisation: uncurry makeScopeWithSplicing"
2023-07-28 23:04:09 +02:00