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: 00064c21cc32
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2b6144d1ad53
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 10, 2018

  1. pythonPackages.mahotas: fix build, move expression 

    See https://hydra.nixos.org/build/80828287

Moves `mahotas` out of `python-packages.nix` into its own file and fixes
broken test cases by skipping them using nosetest's `@nottest`
annotation.

These tests broke from time to time in a sandbox and are therefore
considered impure.

Addresses #45960
    @Ma27
    Ma27 committed Sep 10, 2018
    Configuration menu
    Copy the full SHA
    ee897b6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #46368 from Ma27/fix-mahotas 

    pythonPackages.mahotas: fix build, move expression
    @timokau
    timokau committed Sep 10, 2018
    Configuration menu
    Copy the full SHA
    2b6144d View commit details
    Browse the repository at this point in the history