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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7e40287d00e3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 64a924a96b56
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 22, 2017

  1. cython: build on 32-bit ARM

    @rimmington
    rimmington committed May 22, 2017
    Copy the full SHA
    c46c3fa View commit details

  2. Merge pull request #25981 from rimmington/cython-arm-pr 

    cython: build on 32-bit ARM
    @FRidh
    FRidh authored May 22, 2017
    Copy the full SHA
    64a924a View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/top-level/python-packages.nix
6 changes: 3 additions & 3 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -4253,11 +4253,11 @@ in {
sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi";
};

# On i686-linux and Python 2.x this test fails because the result is "3L"
# instead of "3", so let's fix it in-place.
# With Python 2.x on i686-linux or 32-bit ARM this test fails because the
# result is "3L" instead of "3", so let's fix it in-place.
#
# Upstream issue: https://github.com/cython/cython/issues/1548
postPatch = optionalString (stdenv.isi686 && !isPy3k) ''
postPatch = optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) ''
sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \
tests/run/cpdef_enums.pyx
'';