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

Commits on Jul 10, 2020

  1. python27Packages.pillow: fix build on darwin

    @marsam
    marsam committed Jul 10, 2020
    Copy the full SHA
    33873da View commit details

Commits on Jul 11, 2020

  1. Merge pull request #92905 from marsam/fix-pillow-darwin 

    python27Packages.pillow: fix build on darwin
    @marsam
    marsam authored Jul 11, 2020
    Copy the full SHA
    b6b8f39 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/python-modules/pillow/6.nix
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/pillow/6.nix
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ buildPythonPackage rec {

checkPhase = ''
runHook preCheck
python -m pytest -v -x -W always
python -m pytest -v -x -W always${stdenv.lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"}
runHook postCheck
'';