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: 1c2c7a976c0d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 10e029514b9b
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Mar 30, 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
    @Ma27
    Ma27 committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    db0fa06 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2018

  1. pythonPackages.nipype: enable tests

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

  2. Merge pull request #37952 from Ma27/fix-nipype 

    pythonPackage.nipype: fix build
    @dotlambda
    dotlambda committed Mar 31, 2018
    Configuration menu
    Copy the full SHA
    10e0295 View commit details
    Browse the repository at this point in the history