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

Commits on Dec 3, 2016

  1. python/pillow: Only disable failing tests 

    There's no reason to disable ALL tests just because only one particular
test module is failing.

Tested on i686-linux and x86_64-linux against these Python versions:

  Python 2.6: The interpreter itself doesn't build
  Python 2.7: Successful for both architectures
  Python 3.3: Successful for both architectures
  Python 3.4: Successful for both architectures
  Python 3.5: Successful for both architectures
  Python 3.6: One of the dependencies of pillow doesn't build (pytest)

Tests for PyPy still fail, which is why the doCheck attribute is only
set to false if we're building for PyPy.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @desiderius, @goibhniu, @prikhi
    @aszlig
    aszlig committed Dec 3, 2016
    Copy the full SHA
    6343fef View commit details

  2. vimiv: init at 0.7.2 

    Packaging itself is pretty much straightforward, the tests however
revealed a few issues, which I have fixed with a small patch that has
been upstreamed at karlch/vimiv#32.

The other sed-based patches in postPatch are mostly NixOS-specific.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Dec 3, 2016
    Copy the full SHA
    a76f524 View commit details
Loading