Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: f11591afd9ee
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 29ee864e93fe
Choose a head ref
  • 6 commits
  • 30 files changed
  • 2 contributors

Commits on Jan 4, 2019

  1. CPython: merge expressions of interpreters

    Each time a new major/minor version of CPython was released, a new
    expression would be written, typically copied from the previous release.
    Often fixes are only made in the current/latest release. By merging the
    expressions it's more likely that modifications end up in all versions,
    as is likely intended.
    
    This commit introduces one expression for Python 3, and another for 2.7.
    These two may also be merged, but it will result in a lot of extra
    conditionals making the expression harder to follow.
    
    A common passthru is introduced for CPython and PyPy.
    
    python 2.7: use common passthru
    FRidh committed Jan 4, 2019
    Copy the full SHA
    efbe87f View commit details
    Browse the repository at this point in the history
  2. pypy: merge 2.7 and 3.5 into a single expression

    This commit merges the two expressions in a single one, using
    the passthru function that is shared with CPython.
    FRidh committed Jan 4, 2019
    Copy the full SHA
    613498a View commit details
    Browse the repository at this point in the history
  3. Python: improve cross-compilation

    This changeset allows for cross-compilation of Python packages. Packages
    built with buildPythonPackage are not allowed to refer to the build
    machine. Executables that have shebangs will refer to the host.
    FRidh committed Jan 4, 2019
    3
    Copy the full SHA
    f665828 View commit details
    Browse the repository at this point in the history
  4. Python: drop python.majorVersion

    Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`.
    For implementation version, use `python.sourceVersion`.
    
    Some expressions were broken. Those that were identified were fixed.
    
    fixup major
    FRidh committed Jan 4, 2019
    Copy the full SHA
    0a2caa4 View commit details
    Browse the repository at this point in the history
  5. pythonInterpreters.pypy{27,35}_prebuilt: init at 6.0.0

    These interpreters are prebuilt by upstream and patched using patchelf.
    They are primarily added for testing purposes and development on the
    non-prebuilt PyPy interpreters as it can speed up translation
    significantly.
    FRidh committed Jan 4, 2019
    Copy the full SHA
    d91b496 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #53123 from FRidh/singlecpython

    Python: merge expressions of interpreters
    FRidh committed Jan 4, 2019
    Copy the full SHA
    29ee864 View commit details
    Browse the repository at this point in the history