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: de9c97c0c872
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ab9c602fd4cf
Choose a head ref
  • 5 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 20, 2018

  1. pypy: Change libPrefix from pypy5.10 to pypy2.7 

    To avoid conflicting with pypy3, as per
#34066 (comment).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Nov 20, 2018
    Copy the full SHA
    f96349c View commit details
    Browse the repository at this point in the history

  2. pypy: Remove redundant --withmod-* flags 

    --allworkingmodules is already the default.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Nov 20, 2018
    Copy the full SHA
    91333c1 View commit details
    Browse the repository at this point in the history

  3. pypy: Reenable tests fixed upstream 

    Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Nov 20, 2018
    Copy the full SHA
    8b80dec View commit details
    Browse the repository at this point in the history

  4. pypy: Set isPy2, isPy27 

    Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Nov 20, 2018
    Copy the full SHA
    6d80927 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2018

  1. Merge pull request #40459 from andersk/pypy 

    pypy: 5.10.0 -> 6.0.0
    @Mic92
    Mic92 committed Dec 18, 2018
    Copy the full SHA
    ab9c602 View commit details
    Browse the repository at this point in the history