From e8d722ff6401d5746069e519643fc4d3c0a63474 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 15:47:18 +0100 Subject: [PATCH] highfive-mpi: remove appendToName to have a consistent package name for repology --- pkgs/development/libraries/highfive/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix index 1a8ea5c1ae5..5eb6ceb204e 100644 --- a/pkgs/development/libraries/highfive/default.nix +++ b/pkgs/development/libraries/highfive/default.nix @@ -11,7 +11,7 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { - pname = "highfive"; + pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; version = "2.3.1"; src = fetchFromGitHub { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b2e1689fae..a0c96a84d74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17273,9 +17273,7 @@ with pkgs; highfive = callPackage ../development/libraries/highfive { }; - highfive-mpi = appendToName "mpi" (highfive.override { - hdf5 = hdf5-mpi; - }); + highfive-mpi = highfive.override { hdf5 = hdf5-mpi; }; hiredis = callPackage ../development/libraries/hiredis { };