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: 855c7fb6da93
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 54d42c22b7d9
Choose a head ref
  • 4 commits
  • 1 file changed
  • 3 contributors

Commits on Oct 7, 2020

  1. python3Packages.nipype: remove Python 2 support (dependency nibabel a… 

    …lready unsupported)
    @bcdarwin
    bcdarwin committed Oct 7, 2020
    Copy the full SHA
    921b15e View commit details

  2. python3Packages.nipype: avoid use of neurdflib by default since it ca… 

    …uses a package collision when rdflib is in the closure
    @bcdarwin
    bcdarwin committed Oct 7, 2020
    Copy the full SHA
    f31be2e View commit details

Commits on Nov 27, 2020

  1. Merge pull request #99971 from bcdarwin/nipype-disable-neurdflib-by-d… 

    …efault
    @SuperSandro2000
    SuperSandro2000 authored Nov 27, 2020
    Copy the full SHA
    d26aa32 View commit details

  2. Merge pull request #104424 from NixOS/haskell-updates 

    Update Haskell package set to Stackage Nightly 2020-11-23 (plus other fixes)
    @peti
    peti authored Nov 27, 2020
    Copy the full SHA
    54d42c2 View commit details
Showing with 8 additions and 13 deletions.
  1. +8 −13 pkgs/development/python-modules/nipype/default.nix
21 changes: 8 additions & 13 deletions pkgs/development/python-modules/nipype/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, isPy38
, isPy27
# python dependencies
, click
, configparser ? null
, dateutil
, etelemetry
, filelock
, funcsigs
, future
, futures
, mock
, networkx
, nibabel
, numpy
, packaging
, pathlib2
, prov
, psutil
, pybids
, pydot
, pytest
, pytest_xdist
, pytest-forked
, rdflib
, scipy
, simplejson
, traits
@@ -37,10 +34,12 @@
, bash
, glibcLocales
, callPackage
# causes Python packaging conflict with any package requiring rdflib,
# so use the unpatched rdflib by default (disables Nipype provenance tracking);
# see https://github.com/nipy/nipype/issues/2888:
, useNeurdflib ? false
}:

assert !isPy3k -> configparser != null;

let

# This is a temporary convenience package for changes waiting to be merged into the primary rdflib repo.
@@ -51,6 +50,7 @@ in
buildPythonPackage rec {
pname = "nipype";
version = "1.5.1";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
@@ -74,7 +74,6 @@ buildPythonPackage rec {
funcsigs
future
networkx
neurdflib
nibabel
numpy
packaging
@@ -85,11 +84,7 @@ buildPythonPackage rec {
simplejson
traits
xvfbwrapper
] ++ stdenv.lib.optionals (!isPy3k) [
configparser
futures
pathlib2 # darwin doesn't receive this transitively, but it is in install_requires
];
] ++ [ (if useNeurdflib then neurdflib else rdflib) ];

checkInputs = [
pybids