From 684f08166c8c80f824cdf8ea428b48dab74b87e2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Sep 2016 12:02:42 +0200 Subject: [PATCH] fixup --- pkgs/applications/science/biology/neuron/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 71abe614a0c..b7616e7e763 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { export prefix="''${prefix} --exec-prefix=''${out}" ''; - configureFlags = with stdenv.lib; - [ "--without-x" "--with-readline=${readline}" ] + configureFlags = with stdenv.lib; + [ "--without-x" "--with-readline=${readline}" ] ++ optionals (python != null) [ "--with-nrnpython=${python.interpreter}" ] ++ (if mpi != null then ["--with-mpi" "--with-paranrn"] else ["--without-mpi"]); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa60859f251..f327d17601c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16455,8 +16455,8 @@ in igv = callPackage ../applications/science/biology/igv { }; - neuron = callPackage ../applications/science/biology/neuron { - python = null; + neuron = callPackage ../applications/science/biology/neuron { + python = null; }; neuron-mpi = appendToName "mpi" (neuron.override { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5aee075b913..574cff47122 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -242,11 +242,11 @@ in modules // { }; neuron = pkgs.neuron.override { - inherit python; + inherit python; }; neuron-mpi = pkgs.neuron-mpi.override { - inherit python; + inherit python; }; nixpart = callPackage ../tools/filesystems/nixpart { };