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

Commits on Dec 20, 2016

  1. Copy the full SHA
    6bce0dc View commit details
  2. Merge pull request #21293 from mdaiter/fixNixOpsDarwin

    python-pillow: Disable tests on Darwin
    LnL7 authored Dec 20, 2016
    Copy the full SHA
    405507a View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/top-level/python-packages.nix
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -18871,7 +18871,7 @@ in {
sha256 = "0ee9975c05602e755ff5000232e0335ba30d507f6261922a658ee11b1cec36d1";
};

doCheck = !isPyPy;
doCheck = !stdenv.isDarwin && !isPyPy;

# Disable imagefont tests, because they don't work well with infinality:
# https://github.com/python-pillow/Pillow/issues/1259