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: 97afec420e56
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a2c57c533612
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 31, 2018

  1. pythonPackage.nipype: fix build 

    `pythonPackages.prov` has been bumped to `1.5.2`, however `nipype`
pinned `prov` to `1.5.0`. Patching `nipype/info.py` fixes this issue by
bumping to the current `prov` version in nixpkgs.

See https://hydra.nixos.org/build/71817962/log
See ticket #36453

(cherry picked from commit db0fa06)
    @Ma27
    Ma27 authored and Robert Schütz committed Mar 31, 2018
    Configuration menu
    Copy the full SHA
    a7c0fdb View commit details
    Browse the repository at this point in the history

  2. pythonPackages.nipype: enable tests 

    (cherry picked from commit ee1896d)
    Robert Schütz committed Mar 31, 2018
    Configuration menu
    Copy the full SHA
    a2c57c5 View commit details
    Browse the repository at this point in the history