From 7301f5b7d27c1ded589dfd743e071f42e1b89cfe Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Sep 2024 21:05:36 +0200 Subject: [PATCH 1/3] hpcg: cleanup, add runHooks to InstallPhase --- pkgs/tools/misc/hpcg/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/tools/misc/hpcg/default.nix index 3ae5e7e1404a..705b095b1d80 100644 --- a/pkgs/tools/misc/hpcg/default.nix +++ b/pkgs/tools/misc/hpcg/default.nix @@ -9,19 +9,23 @@ stdenv.mkDerivation rec { sha256 = "197lw2nwmzsmfsbvgvi8z7kj69n374kgfzzp8pkmk7mp2vkk991k"; }; - dontConfigure = true; - - enableParallelBuilding = true; - buildInputs = [ mpi ]; makeFlags = [ "arch=Linux_MPI" ]; + enableParallelBuilding = true; + + dontConfigure = true; + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/hpcg cp bin/xhpcg $out/bin cp bin/hpcg.dat $out/share/hpcg + + runHook postInstall ''; meta = with lib; { From 21377a28765e05791188e72810aa672a695851d4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Sep 2024 21:18:51 +0200 Subject: [PATCH 2/3] hpcg: move to pkgs/by-name --- .../misc/hpcg/default.nix => by-name/hp/hpcg/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/hpcg/default.nix => by-name/hp/hpcg/package.nix} (100%) diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/by-name/hp/hpcg/package.nix similarity index 100% rename from pkgs/tools/misc/hpcg/default.nix rename to pkgs/by-name/hp/hpcg/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36909331c849..b37faed71576 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30180,8 +30180,6 @@ with pkgs; hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack; - hpcg = callPackage ../tools/misc/hpcg { }; - hpl = callPackage ../tools/misc/hpl { }; hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { }; From 077fedc902d0bb0d64f27ed278faa598289025b8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Sep 2024 22:32:41 +0200 Subject: [PATCH 3/3] hpcg: apply nixfmt --- pkgs/by-name/hp/hpcg/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hp/hpcg/package.nix b/pkgs/by-name/hp/hpcg/package.nix index 705b095b1d80..7a02f5adad8f 100644 --- a/pkgs/by-name/hp/hpcg/package.nix +++ b/pkgs/by-name/hp/hpcg/package.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, mpi } : +{ + lib, + stdenv, + fetchurl, + mpi, +}: stdenv.mkDerivation rec { pname = "hpcg"; @@ -37,4 +42,3 @@ stdenv.mkDerivation rec { mainProgram = "xhpcg"; }; } -