| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge remote-tracking branch 'upstream/master' into structured-attrsorigin/structured-attrs | Robin Gloster | 2021-05-24 | 1 | -0/+2 |
| |\ |
|
| | * | treewide: Do a number of no-op cleanups for cross and darwin•••I am taking the non-invasive parts of #110914 to hopefully help out with #111988.
In particular:
- Use `lib.makeScopeWithSplicing` to make the `darwin` package set have
a proper `callPackage`.
- Adjust Darwin `stdenv`'s overlays keeping things from the previous
stage to not stick around too much.
- Expose `binutilsNoLibc` / `darwin.binutilsNoLibc` to hopefully get us
closer to a unified LLVM and GCC bootstrap.
| John Ericson | 2021-05-06 | 1 | -0/+2 |
| * | | Merge remote-tracking branch 'upstream/master' into structured-attrs | Robin Gloster | 2021-04-29 | 4 | -6/+403 |
| |\| |
|
| | * | Merge pull request #118403 from dotlambda/CVE-2021-23336•••python27: fix CVE-2021-23336 | Anderson Torres | 2021-04-12 | 2 | -0/+392 |
| | |\ |
|
| | | * | python27: fix CVE-2021-23336•••From the archive `python-gentoo-patches-2.7.18_p8.tar.xz` found at
https://dev.gentoo.org/~mgorny/dist/python/, I copied
`0024-3.6-bpo-42967-only-use-as-a-query-string-separator-G.patch`.
| Robert Schütz | 2021-04-03 | 2 | -0/+392 |
| | * | | Merge branch 'staging-next' into staging | Jan Tojnar | 2021-04-06 | 2 | -4/+4 |
| | |\ \ |
|
| | * | | | python39: 3.9.3 -> 3.9.4 | Frederik Rietdijk | 2021-04-05 | 1 | -2/+2 |
| | * | | | buildPythonPackage: avoid recursion•••Sometimes an infinite recursion error shows up.
| Frederik Rietdijk | 2021-04-03 | 1 | -1/+3 |
| | * | | | python2Packages: separate extension | Frederik Rietdijk | 2021-04-03 | 1 | -1/+4 |
| | * | | | python39: 3.9.2 -> 3.9.3 | Frederik Rietdijk | 2021-04-03 | 1 | -2/+2 |
| | * | | | python38: 3.8.8 -> 3.8.9 | Frederik Rietdijk | 2021-04-03 | 1 | -2/+2 |
| * | | | | wrapPythonPrograms: handle pythonPath correctly | Robin Gloster | 2021-04-23 | 1 | -5/+7 |
| * | | | | Merge remote-tracking branch 'upstream/master' into structured-attrs | Robin Gloster | 2021-04-23 | 8 | -44/+185 |
| |\ \ \ \
| | |/ /
| |/| | |
|
| | * | | | Merge branch 'master' into staging-next | Jan Tojnar | 2021-04-06 | 2 | -4/+4 |
| | |\ \ \
| | |/ /
| |/| | |
|
| | | * | | lzma: deprecate alias | Sandro Jäckel | 2021-04-04 | 2 | -4/+4 |
| | | |/ |
|
| | * / | pythonPackages: fix editable setuptools installations | Frederik Rietdijk | 2021-03-23 | 1 | -0/+7 |
| | |/ |
|
| | * | cpython: allow $out reference again•••This regression got introduced with 738746a34b675297624338ab9aa3adb3d3cd4cf6
| Sandro Jäckel | 2021-03-15 | 1 | -0/+1 |
| | * | python3Minimal and python3: don't override python3•••This reduces the amount of packages that are required to use
builtins.fetchurl to fetch. Without this change, mime-types
would not be able to use fetchzip when mime-types support is
added to python3.
| Frederik Rietdijk | 2021-03-14 | 1 | -11/+18 |
| | * | python3: express references to keep as a nix list | Frederik Rietdijk | 2021-03-14 | 1 | -3/+9 |
| | * | python3: mimetypesSupport is optional | Frederik Rietdijk | 2021-03-14 | 2 | -1/+6 |
| | * | cpython: Pull in the mime-types database•••Closes #113901
| nicoo | 2021-03-14 | 2 | -0/+28 |
| | * | python39: hardcode path to tzdata•••Python 3.9 has a new module `zoneinfo` which requires tzdata. By default
it searches TZPATH for folders containing `zoneinfo`.
This commit makes the dependency on tzdata pure.
| Frederik Rietdijk | 2021-03-13 | 2 | -3/+10 |
| | * | python: reproducible builds•••Achieve reproducible builds of the interpreter. Note this meant
disabling optimizations again.
| Frederik Rietdijk | 2021-03-13 | 2 | -21/+48 |
| | * | Merge staging into staging-next | Frederik Rietdijk | 2021-03-08 | 4 | -4/+57 |
| | |\ |
|
| | | * | python37, python2: remove win64 workaround to fix aarch64-darwin•••The issue manifests itself as the following on `aarch64-darwin`:
```
>>> import ctypes
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/nix/store/i8cq0xrjirz1rcp65wzcyhj6ypzlw9il-python3-3.7.10/lib/python3.7/ctypes/__init__.py", line 551, in <module>
_reset_cache()
File "/nix/store/i8cq0xrjirz1rcp65wzcyhj6ypzlw9il-python3-3.7.10/lib/python3.7/ctypes/__init__.py", line 273, in _reset_cache
CFUNCTYPE(c_int)(lambda: None)
MemoryError
```
The commit we backport is included in Python 3.8, and it reverts
the change that was introduced all the way back in Python 2.7.
| Ivan Babrou | 2021-03-03 | 3 | -0/+48 |
| | | * | treewide: Fix various tools wrappers "with packages"•••Now that `buildEnv` is ready, always put `makeWrapper` in
`nativeBuildInputs`, rather than `buildInputs` or (worse) mucking around
with setup hooks by hand.
(C.f. #112276, which didn't catch these because the manual setup hook
sourcing is such a hack to being with!)
Fixes #114687
| John Ericson | 2021-03-02 | 1 | -4/+9 |
| * | | | treewide: fix package builds with structured-attrs | Robin Gloster | 2021-04-21 | 1 | -1/+3 |
| * | | | Merge remote-tracking branch 'upstream/master' into structured-attrs | Robin Gloster | 2021-03-16 | 1 | -8/+8 |
| |\| | |
|
| | * | | Merge pull request #113142 from andersk/pypy-7.3.3•••pypy, pypy3: 7.3.2 → 7.3.3 | Lassulus | 2021-03-07 | 1 | -8/+8 |
| | |\ \
| | |/
| |/| |
|
| | | * | pypy, pypy3: 7.3.2 → 7.3.3•••Signed-off-by: Anders Kaseorg <andersk@mit.edu>
| Anders Kaseorg | 2021-02-14 | 1 | -8/+8 |
| * | | | Merge remote-tracking branch 'upstream/master' into structured-attrs | Robin Gloster | 2021-03-04 | 9 | -32/+250 |
| |\| | |
|
| | * | | python: fix full builds by referring to the correct interpreter•••The package set is an attribute of the interpreter. The function to
build an environment (`buildEnv`/`withPackages`) is part of the
interpreter. The interpreter is passed to itself, and needs to be
updated when overridden.
For cross-compilation we splice the package set, and for that the
various `build/host` interpreters and sets need to be available. We
select these currently through `pkgs.${pythonAttr}`. The `pythonAttr`
attribute was not fixed for `pythonFull`.
https://github.com/NixOS/rfcs/pull/83
https://github.com/NixOS/nixpkgs/pull/104201
We need a better solution for this because this is very brittle.
| Frederik Rietdijk | 2021-02-27 | 1 | -0/+1 |
| | * | | Merge master into staging-next | github-actions[bot] | 2021-02-20 | 1 | -2/+9 |
| | |\ \ |
|
| | | * | | pythonInterpreters.pypy36_prebuilt: Set pythonOnBuildForHost•••This was broken by #105155.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
| Anders Kaseorg | 2021-02-20 | 1 | -1/+7 |
| | | * | | pythonInterpreters.pypy36_prebuilt: Add missing lib argument•••This was broken by commit 001c0cbe54228f88d5634f431fcaf460b8ff4590
(#110591).
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
| Anders Kaseorg | 2021-02-20 | 1 | -1/+2 |
| | * | | | python37: 3.7.9 -> 3.7.10, fixup patches | Martin Weinelt | 2021-02-20 | 3 | -13/+21 |
| | * | | | python310: 3.10.0a4 -> 3.10.0a5 | Frederik Rietdijk | 2021-02-20 | 1 | -2/+2 |
| | * | | | python36: 3.6.12 -> 3.6.13 | Frederik Rietdijk | 2021-02-20 | 1 | -2/+2 |
| | * | | | python27: Fix CVE-2021-3177•••Thanks to the Gentoo team maintaining a fork of python2¹ we can easily
apply their backported patch for this security vulnerability.
[1] https://gitweb.gentoo.org/fork/cpython.git/
| Martin Weinelt | 2021-02-20 | 2 | -0/+184 |
| | * | | | python37: 3.7.9 -> 3.7.10 | Frederik Rietdijk | 2021-02-20 | 1 | -2/+2 |
| | * | | | python38: 3.8.7 -> 3.8.8 | Frederik Rietdijk | 2021-02-20 | 1 | -2/+2 |
| | * | | | python39: 3.9.1 -> 3.9.2 | Frederik Rietdijk | 2021-02-20 | 1 | -2/+2 |
| | * | | | Merge branch 'staging-next' into staging•••Resolved the following conflicts:
- kernel flags between 09176d28a0ebbd8bae35f92406a48cded78ac9f7 and 2b28822d8dec38fd62ef17643ec71da3bb488619
- clojure-lsp between 3fa00685ce21fb1a4218d444d0862ebcb2b99706 and e03c068af5c9ca950214cd6c3b5cfe67f595da88
| Jan Tojnar | 2021-02-19 | 1 | -2/+20 |
| | |\| | |
|
| | | * | | python.tests: test overriding functions | Frederik Rietdijk | 2021-02-19 | 1 | -2/+20 |
| | * | | | pytestCheckHook: add support for disabling arbitrary paths•••Renames `disabledTestFiles` to the more genereric `disabledTestPaths` to
reflect that change.
| Martin Weinelt | 2021-02-15 | 1 | -5/+5 |
| | |/ / |
|
| | * | | Merge master into staging-next | github-actions[bot] | 2021-02-13 | 4 | -16/+17 |
| | |\| |
|
| | * | | Merge master into staging-next | github-actions[bot] | 2021-02-13 | 1 | -0/+10 |
| | |\ \ |
|
| | * | | | pytestCheckHook: Fix support for multiple files.•••Quoting here will lead to the shell treating them as a single item.
| Martin Weinelt | 2021-01-24 | 1 | -1/+1 |
| | * | | | pytestCheckHook: Fix support for spaces in disabled file paths | Martin Weinelt | 2021-01-24 | 1 | -1/+1 |
| * | | | | Merge remote-tracking branch 'upstream/master' into structured-attrs | Robin Gloster | 2021-02-28 | 37 | -309/+1243 |
| |\ \ \ \
| | |_|/
| |/| | |
|
