Commit Graph

2158 Commits

Author SHA1 Message Date
github-actions[bot]
520c7e2ee8 Merge staging-next into staging 2024-06-15 06:01:20 +00:00
Silvan Mosberger
3f2e484083 python3.tests.nix-pythonprefix-mypy: Avoid unnecessary rebuilds
E.g. when the Nix is changed
2024-06-14 21:27:46 +02:00
Martin Weinelt
3bfb20e638 mk-python-derivation: add pythonRelaxDepsHook
Configuring `pythonRelaxDeps` or `pythonRemoveDeps` does not require
adding `pythonRelaxDepsHook` into `nativeBuildInputs` anymore.

Co-Authored-By: superherointj <5861043+superherointj@users.noreply.github.com>
2024-06-14 14:51:23 +02:00
github-actions[bot]
c8c2ff3b9b Merge staging-next into staging 2024-06-10 00:02:49 +00:00
Alyssa Ross
3df6bb2c85 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/applications/blockchains/polkadot/default.nix
2024-06-09 22:47:12 +01:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
github-actions[bot]
afa876d6fe Merge staging-next into staging 2024-06-09 12:01:33 +00:00
github-actions[bot]
668adff0d4 Merge master into staging-next 2024-06-09 12:01:06 +00:00
kirillrdy
beb090cc96 Merge pull request #318167 from rhelmot/freebsd-python-cross
python3: Enable FreeBSD cross build
2024-06-09 09:40:11 +00:00
github-actions[bot]
b04ad4178b Merge staging-next into staging 2024-06-08 12:01:35 +00:00
github-actions[bot]
1d15f93175 Merge master into staging-next 2024-06-08 12:01:10 +00:00
Audrey Dutcher
22913c86f1 python3: Enable FreeBSD cross build
This only enables x86_64-unknown-freebsd, not any other FreeBSD, since I
do not have any other machines to tests on. If you're reading this, feel
free to try out other arches!
2024-06-07 20:28:29 -07:00
natsukium
f58da4a91d python312: 3.12.3 -> 3.12.4
https://docs.python.org/release/3.12.4/whatsnew/changelog.html
2024-06-07 15:40:56 +09:00
natsukium
6a469b3cfe python313: 3.13.0b1 -> 3.13.0b2
https://www.python.org/downloads/release/python-3130b2/
2024-06-07 14:26:44 +09:00
Moritz Sanft
d163f12f2c python/hooks/python-imports-check-hook: use $python output if existing 2024-06-04 16:48:57 +02:00
Randy Eckenrode
07ab74e4aa python3: fix build on Darwin
https://github.com/NixOS/nixpkgs/pull/311767 improved build purity, but Python’s configure script checks the Darwin version to enable platform features. Replacing the check with a check for Darwin without the version allows the build to succeed again.
2024-05-30 19:40:13 -04:00
Audrey Dutcher
948d0cf589 python3: fix build on native FreeBSD
* Make use of libxcrypt conditional (documented inline)
* Patch use of uname to to not pull in some impure information
* Various cases where behavior is split out among operating systems are
  now inclusive of FreeBSD
2024-05-26 11:48:09 -07:00
github-actions[bot]
a47743431b Merge master into staging-next 2024-05-14 18:01:03 +00:00
lassulus
3501d3565e Merge pull request #311122 from phaer/catch-conflicts-exponential
pythonCatchConflictsHook: prevent exponential worst-case
2024-05-12 22:07:45 +02:00
Michael Raskin
be3dadb563 pypy: drop pycparser dependency to fix build 2024-05-12 16:01:00 +02:00
Martin Weinelt
d029669a9a Merge pull request #309477 from Atry/patch-4
python: add an error message for debugging infinite recursion
2024-05-10 09:58:07 +02:00
Martin Weinelt
98e7084e4a python313: 3.13.0a6 -> 3.13.0b1
https://docs.python.org/3.13/whatsnew/changelog.html#python-3-13-0b1
2024-05-09 13:32:38 +02:00
Jonas Meurer
229bf85d5f rustpython: 0.3.0 -> 0.3.1
The package can not be build with Rust 1.76.0 or later. The issue was
fixed in 0.3.1.
2024-05-07 16:42:00 +02:00
Yang, Bo
002054c95f python: add error message for debugging infinite recursion 2024-05-06 07:04:21 +00:00
Frederik Rietdijk
5772ac5a75 Removing FRidh as active maintainer of packages
In the past I was very active with Python packaging.
For several years now I was hardly around as maintainer,
so it does not make sense I am listed as a maintainer for
these makes. Looking back, I should have removed myself
as maintainer already much longer ago. Anyway, better late
than never.

It's been a fun ride, and  I do intend to occasionally contribute
to Nixpkgs, but not in the same way it once was.
2024-04-28 12:20:07 +02:00
Ben Wolsieffer
f9de72f247 pythonCatchConflictsHook: split propagated-build-inputs on runs of whitespace
Currently, nix-support/propagated-build-inputs is parsed by splitting on
a single space. This means that if this file contains multiple spaces
separating two paths, the build_inputs list will end up containing an
empty string.

Instead, call split() with no arguments, which splits on runs of
whitespace and also ignores whitespace at the beginning and end of the
string, eliminating the need for strip().
2024-04-26 21:05:42 -04:00
Ben Wolsieffer
7f14d675a7 pythonCatchConflictsHook: cleanup due to visiting each path once
Now that we only visit each path once, a few things can be simplified.
We no longer have to keep a list of different dependency chains leading
to a package, since only one chain will ever be found. Also, the already
visited check also takes care of cycles, so the other cycle check can be
removed.
2024-04-26 21:05:42 -04:00
Ben Wolsieffer
a25e43e6d7 pythonCatchConflictsHook: prevent exponential worst-case
The hook performs a depth first search on the graph defined by
propagatedBuildInputs. This traverses all paths through the graph,
except for any cycles. In the worst case with a highly connected graph,
this search can take exponential time. In practice, this means that in
cases with long dependency chains and multiple packages depending on the
same package, the hook can take several hours to run.

Avoid this problem by keeping track of already visited paths and only
visiting each path once. This makes the search complete in linear time.

The visible effect of this change is that, if a conflict is found, only
one dependency chain that leads to the conflicting package is printed,
rather than all the possible dependency chains.
2024-04-26 21:05:42 -04:00
Ben Wolsieffer
21833407b4 pythonCatchConflictsHook: add test for multiple dependency chains
Add a test where a conflicting package can be found at the end of
multiple dependency chains. This is far too simple an example to
demonstrate the ill effects of exponential time complexity, but does
serve to demonstrate how the error output changes when each path is only
visited once.
2024-04-26 21:05:41 -04:00
github-actions[bot]
257e7bee59 Merge master into staging-next 2024-04-14 14:04:38 +00:00
Martin Weinelt
72502ca655 python313: 3.13.0a5 -> 3.13.0a6
https://docs.python.org/3.13/whatsnew/changelog.html#python-3-13-0-alpha-6
2024-04-12 00:27:07 +02:00
Sandro Jäckel
b3b12c2d08 Revert "Fix venv creation in Python environments"
This commit reverts all python changes from 234bb31f61.
2024-04-11 08:26:39 -07:00
Sandro Jäckel
636edfdeb1 Revert "Unwrap python scripts when building an environment"
This reverts commit 96118850f3.
2024-04-11 08:26:39 -07:00
Martin Weinelt
9f67702776 Merge pull request #303057 from mweinelt/python-3.12.3_3.11.9
python312: 3.12.2 -> 3.12.3; python311: 3.11.8 -> 3.11.9
2024-04-11 09:15:22 +02:00
Martin Weinelt
e05a3ec1ce cpython: disable failing passthru tests on darwin
````
usage: virtualenv [--version] [--with-traceback] [-v | -q] [--read-only-app-data] [--app-data APP_DATA] [--reset-app-data] [--upgrade-embed-wheels] [--discovery {builtin}] [-p py] [--try-first-with py_exe]
                  [--creator {builtin,cpython3-posix,venv}] [--seeder {app-data,pip}] [--no-seed] [--activators comma_sep_list] [--clear] [--no-vcs-ignore] [--system-site-packages] [--symlinks | --copies] [--no-download | --download]
                  [--extra-search-dir d [d ...]] [--pip version] [--setuptools version] [--wheel version] [--no-pip] [--no-setuptools] [--no-wheel] [--no-periodic-update] [--symlink-app-data] [--prompt prompt] [-h]
                  dest
virtualenv: error: argument dest: the destination . is not write-able at /nix/store
SystemExit: 2
````
2024-04-10 18:00:32 +02:00
Martin Weinelt
3546ac2240 python311: 3.11.8 -> 3.11.9
https://docs.python.org/release/3.11.9/whatsnew/changelog.html
2024-04-10 10:38:40 +02:00
Martin Weinelt
e8eb0ced9f python312: 3.12.2 -> 3.12.3
https://docs.python.org/release/3.12.3/whatsnew/changelog.html
2024-04-10 10:38:39 +02:00
github-actions[bot]
61006b247a Merge staging-next into staging 2024-03-31 06:01:45 +00:00
github-actions[bot]
6b7b5776be Merge master into staging-next 2024-03-31 06:01:15 +00:00
Martin Weinelt
0c7078367b Merge pull request #291293 from danc86/no-pypi-yanked
update-python-libraries: ignore yanked releases on PyPI
2024-03-31 05:21:40 +02:00
github-actions[bot]
49b966576c Merge staging-next into staging 2024-03-30 12:01:34 +00:00
github-actions[bot]
48d06167c6 Merge master into staging-next 2024-03-30 12:01:06 +00:00
adisbladis
cfb98374f3 Merge pull request #293151 from adisbladis/mk-python-derivation-refactor
mk-python-derivation: Refactor
2024-03-30 20:23:38 +13:00
github-actions[bot]
bd2d42a4f8 Merge staging-next into staging 2024-03-26 06:01:43 +00:00
github-actions[bot]
40938cc5ef Merge master into staging-next 2024-03-26 06:01:14 +00:00
OTABI Tomoya
da0502af11 Merge pull request #298085 from natsukium/cpython/update
python39: 3.9.18 -> 3.9.19; python310: 3.10.13 -> 3.10.14
2024-03-26 09:48:38 +09:00
Sergei Trofimovich
187ac583a0 python/hooks/setuptools-build-hook.sh: use --parallel flag only for fresh setuptools
Without the change attempt to enable parallelist for `python2` packages
fails with unsupported `--parallel` flag for `setuptools`-based
packages:

    $ nix build --no-link -f. --arg config '{enableParallelBuildingByDefault = true;}' xdg-utils
    error: builder for '/nix/store/...-python2.7-setuptools-44.0.0.drv' failed with exit code 1;
       last 10 log lines:
       > no configure script, doing nothing
       > Running phase: buildPhase
       > Executing setuptoolsBuildPhase
       > usage: nix_run_setup [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
       >    or: nix_run_setup --help [cmd1 cmd2 ...]
       >    or: nix_run_setup --help-commands
       >    or: nix_run_setup cmd --help
       >
       > error: option --parallel not recognized
2024-03-25 13:18:45 +01:00
Thomas Watson
d521f03303 python3Packages.setuptoolsBuildHook: correct name
Make `name` attribute into the same format as every other hook (modulo
.sh).

Nothing else in nixpkgs appears to refer to the old name.
2024-03-24 19:21:58 -05:00
Thomas Watson
26ccdea3d7 python3Packages.setuptoolsBuildHook: delete broken setuptoolsShellHook
Broken since the switch to PyPA's build/installer in
6c85fff302.

The hook was always janky and maintainers appear to not want its current
implementation in-tree. No replacement is currently planned.

However, this leaves the path open for future replacements as a broken
hook will no longer be installed by default.
2024-03-24 19:21:55 -05:00
github-actions[bot]
97f05fe383 Merge staging-next into staging 2024-03-23 12:01:37 +00:00