2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-23 06:03:40 +00:00
Commit Graph

91 Commits

Author SHA1 Message Date
github-actions[bot]
c90f3611dc
Merge master into staging-next 2023-08-06 00:02:21 +00:00
Theodore Ni
809de4d210
python2.pkgs.wcwidth: add missing python2 dependency 2023-08-03 07:49:32 -07:00
Theodore Ni
9058cdef7d
python2.pkgs.backports-functools-lru-cache: init at 1.6.6 2023-08-03 07:49:18 -07:00
github-actions[bot]
82235cc6e6
Merge staging-next into staging 2023-07-24 00:02:59 +00:00
Sandro Jäckel
cf6c96533b
treewide: reduce packages I maintainer 2023-07-23 19:30:22 +02:00
Sandro
c7ba59e485
Merge pull request from winterqt/bootstrapped-pip-remove-extraneous-pythonpath-entry 2023-07-19 15:22:52 +02:00
Artturin
226e149145 treewide: env.NIX_CFLAGS_COMPILE use optionalString instead of optional
env values must be strings
2023-02-22 21:23:05 +02:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Winter
e59046bc48 python{2,3}Packages.bootstrapped-pip: remove extraneous entry from PYTHONPATH
From my testing, wheel is only retrieved from its installation in $out,
and removing it doesn't break anything. I'm unsure if it was required when
bootstrapping was initially added [0], but it definitely isn't now.

I also took the chance to clarify the comment a bit.

[0]: 56727dc1ff
2023-02-21 16:21:41 -05:00
Frederik Rietdijk
93f577aed8 python2Packages.wheel: keep 0.37.1 for python2 since 0.38 dropped support 2023-02-05 12:01:22 +01: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
github-actions[bot]
bf81ac4bc6
Merge master into staging-next 2022-12-15 12:01:09 +00:00
Fabián Heredia Montiel
2230108f55 python2Packages.typing: revert removal
This reverts commit ff69267377.
2022-12-15 00:28:46 -08:00
Fabián Heredia Montiel
8549e49c18 python2Packages.scandir: revert removal
This reverts commit 7d4a0668d2.

Closes https://github.com/NixOS/nixpkgs/issues/205742
2022-12-15 00:28:46 -08:00
Vladimír Čunát
de033ae75a
Merge branch 'master' into staging-next 2022-12-10 16:19:36 +01:00
Robert Schütz
5efd8de503
python2Packages.pygobject2: move to python2-modules 2022-12-09 22:36:50 +01:00
Robert Schütz
c760e71626 python2Packages.pygobject3: remove 2022-12-09 12:17:25 -08:00
Robert Schütz
4bd693080a python2Packages.gtkme: remove 2022-12-09 12:15:46 -08:00
Robert Schütz
a9028840ef python2Packages.idna: remove 2022-12-09 12:15:13 -08:00
Robert Schütz
7d4a0668d2 python2Packages.scandir: remove 2022-12-09 08:37:41 -08:00
Robert Schütz
563a4cd15d python2Packages.pysqlite: remove 2022-12-09 08:37:41 -08:00
Robert Schütz
3627a1fe1d python2Packages.certifi: remove 2022-12-09 08:37:41 -08:00
Robert Schütz
ff69267377 python2Packages.typing: remove 2022-12-09 08:37:41 -08:00
Robert Schütz
c2b5367847 python2Packages.google-apputils: remove 2022-12-09 08:37:41 -08:00
Robert Schütz
3817fec3e2 python2Packages.protobuf: remove 2022-12-09 08:37:40 -08:00
Robert Schütz
cf285d46cb python2Packages.pygments: remove 2022-12-09 08:37:40 -08:00
Robert Schütz
cb695919b2 python2Packages.botocore: remove 2022-12-09 08:37:40 -08:00
Robert Schütz
7cb6c63e86 python2Packages.s3transfer: remove 2022-12-09 08:37:40 -08:00
Robert Schütz
dc42927243 python2Packages.boto3: remove 2022-12-09 08:37:40 -08:00
Robert Schütz
d2fa83297a python2Packages.pyroma: remove 2022-12-09 08:13:35 -08:00
Robert Schütz
0cc6df3f8f python2Packages.pytest-runner: remove 2022-12-09 08:10:55 -08:00
Robert Schütz
5eb43616fe python2Packages.chardet: remove 2022-12-09 08:09:23 -08:00
Robert Schütz
3ff1f3d1c1 python2Packages.sphinxcontrib-websupport: remove 2022-12-09 08:06:32 -08:00
Robert Schütz
04c143eedb python2Packages.sphinx: remove 2022-12-09 08:05:58 -08:00
Robert Schütz
a1bde47ce0 python2Packages.marisa: remove 2022-12-09 08:03:50 -08:00
Vladimír Čunát
9c497bb8d6
Merge branch 'staging-next' into staging 2022-12-09 10:27:46 +01:00
Theodore Ni
73dea7fb56
python27Packages.unittest: remove completely 2022-12-07 14:25:04 -08:00
Theodore Ni
de0f03b56d
python{27,310}Packages.unittest2: move to python2-modules 2022-12-07 14:25:01 -08:00
Robert Schütz
0fa639e2aa python2Packages.numpy: remove 2022-12-03 22:50:20 -08:00
Robert Schütz
e5f735efd3 python2Packages.construct: remove 2022-12-03 22:50:20 -08:00
Robert Schütz
76320a7d94 python2Packages.pillow: remove 2022-12-03 22:50:20 -08:00
Robert Schütz
b64c0b1a12 python2Packages.pyyaml: remove 2022-12-03 22:50:20 -08:00
Robert Schütz
47cd6b0a4e python2Packages.markdown: remove 2022-12-03 21:54:50 -08:00
Robert Schütz
ccd71595e9 python2Packages.cheetah: remove 2022-12-03 19:00:03 -08:00
Robert Schütz
d3b70b47e3 python2Packages.TurboCheetah: remove 2022-12-03 18:58:11 -08:00
Robert Schütz
1d3f70b5fb python2Packages.httpretty: remove 2022-12-03 18:57:20 -08:00
Robert Schütz
53013ae601 python2Packages.prettytable: remove 2022-12-03 18:57:20 -08:00
Robert Schütz
c99c95f795 python2Packages.mutagen: remove 2022-12-03 18:57:20 -08:00
Robert Schütz
2eb15da448 python2Packages.qpid-python: remove 2022-12-03 18:57:19 -08:00
Theodore Ni
4fc97dce3c
python310Packages.cffi: patch closures to work on M1 machines
Trusts the libffi library inside of nixpkgs on Apple devices.

When Apple's fork of libffi is not detected, cffi assumes that libffi
uses a strategy for creating closures (i.e. callbacks) that is in
certain cases susceptible to a security exploit.

Based on some analysis I did:

  https://groups.google.com/g/python-cffi/c/xU0Usa8dvhk

I believe that libffi already contains the code from Apple's fork that
is deemed safe to trust in cffi.

It uses a more sophisticated strategy for creating trampolines to
support closures that works on Apple Silicon, while the simple approach
that cffi falls back on does not, so this patch enables code that uses
closures on M1 Macs again.

Notably, pyOpenSSL is impacted and will be fixed by this, reported in

  https://github.com/pyca/pyopenssl/issues/873

Note that libffi closures still will not work on signed apps without the
com.apple.security.cs.allow-unsigned-executable-memory entitlement while

  https://github.com/libffi/libffi/pull/621

is still open (which I haven't tested but is my best guess from reading).

I am hopeful that all of these changes will be upstreamed back into cffi
and libffi, and that this comment provides enough breadcrumbs for future
maintainers to track and clean this up.
2022-11-20 16:16:07 -08:00