From 13dca33cdc43f4557ee2f53615f2dcbc8f01ac9d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 17:58:07 +0100 Subject: [PATCH] neuron-mpi: remove appendToName to have a consistent package name for repology --- pkgs/applications/science/biology/neuron/default.nix | 2 +- pkgs/top-level/all-packages.nix | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 804407968e1c..4dc850f50627 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - pname = "neuron"; + pname = "neuron${lib.optionalString useMpi "-mpi"}"; version = "7.5"; nativeBuildInputs = [ which pkg-config automake autoconf libtool ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69c3984bff08..d149641a1870 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31968,13 +31968,9 @@ with pkgs; n3 = callPackage ../applications/science/biology/N3 { }; - neuron = callPackage ../applications/science/biology/neuron { - python = null; - }; + neuron = callPackage ../applications/science/biology/neuron { python = null; }; - neuron-mpi = appendToName "mpi" (neuron.override { - useMpi = true; - }); + neuron-mpi = neuron.override {useMpi = true; }; neuron-full = neuron-mpi.override { python = python2; };