From cafc67d107459dd090fa4311e811ae70ad5ab301 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Tue, 20 Apr 2021 18:12:17 +0200
Subject: [PATCH] hpcg: add gitTable

---
 garlic/apps/hpcg/default.nix   | 50 ++++++++++++++++++----------------
 garlic/apps/hpcg/git-table.nix | 18 ++++++++++++
 garlic/apps/index.nix          |  4 +--
 3 files changed, 45 insertions(+), 27 deletions(-)
 create mode 100644 garlic/apps/hpcg/git-table.nix

diff --git a/garlic/apps/hpcg/default.nix b/garlic/apps/hpcg/default.nix
index 7a69a72..25faa87 100644
--- a/garlic/apps/hpcg/default.nix
+++ b/garlic/apps/hpcg/default.nix
@@ -5,37 +5,39 @@
 , mcxx
 , mpi
 , tampi
-, gitBranch
+, gitBranch ? "garlic/seq"
+, gitCommit ? null
+, garlicTools
 }:
 
-stdenv.mkDerivation rec {
-  name = "hpcg";
-
-  src = builtins.fetchGit {
-    url = "ssh://git@bscpm03.bsc.es/rpenacob/garlic-hpcg.git";
-    ref = "${gitBranch}";
+let
+  gitSource = garlicTools.fetchGarlicApp {
+    appName = "hpcg";
+    inherit gitCommit gitBranch;
+    gitTable = import ./git-table.nix;
   };
+in
+  stdenv.mkDerivation rec {
+    name = "hpcg";
 
-  # prePatch = ''
-  #   #export NIX_DEBUG=6
-  # '';
+    inherit (gitSource) src gitBranch gitCommit;
 
-  buildInputs = [
-    cc nanos6 mcxx mpi tampi
-  ];
+    buildInputs = [
+      cc nanos6 mcxx mpi tampi
+    ];
 
-  makeFlags = [
-    "CC=${cc.CC}"
-    "CXX=${cc.CXX}"
-  ];
+    makeFlags = [
+      "CC=${cc.CC}"
+      "CXX=${cc.CXX}"
+    ];
 
-  enableParallelBuilding = true;
+    enableParallelBuilding = true;
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/* $out/bin/
-  '';
+    installPhase = ''
+      mkdir -p $out/bin
+      cp bin/* $out/bin/
+    '';
 
-  programPath = "/bin/xhpcg";
+    programPath = "/bin/xhpcg";
 
-}
+  }
diff --git a/garlic/apps/hpcg/git-table.nix b/garlic/apps/hpcg/git-table.nix
new file mode 100644
index 0000000..0aa1fc8
--- /dev/null
+++ b/garlic/apps/hpcg/git-table.nix
@@ -0,0 +1,18 @@
+{
+  # Auto-generated with garlic-git-table on 2021-04-20 for repo:
+  # ssh://git@bscpm03.bsc.es/garlic/apps/hpcg.git
+
+  "garlic/mpi"                  = "8c94ccfd97518ed947bd6be3386260b72fdcdff2";
+  "garlic/mpi+SAVEMAT"          = "5dd2ad9eba13dba67086f46c6e8519804d837383";
+  "garlic/mpi+omp"              = "d24c372dd9fda584e711efb612f172e5c3602804";
+  "garlic/mpi+oss"              = "519a867bb3a3e07440df05e60a62abad764524e5";
+  "garlic/mpi+send+omp+fork"    = "a08d31aedbc108e1c0081cdc5021827ac9022688";
+  "garlic/omp"                  = "dcc8a40831cda884b9240af47e883ac997150ed3";
+  "garlic/omp+SAVEMAT"          = "40dbac86c905e192ecc8146e0e65e4c3a3c6dbf8";
+  "garlic/omp+fork"             = "042752b3dbcd9b0f4db524b6cdc911278ee1a51b";
+  "garlic/omp+initsplit"        = "5370e7ee26fb72ef100a79624f73ed2baa6bcc79";
+  "garlic/oss"                  = "7e6e2d969b7904572f2475bf471e637651337761";
+  "garlic/oss+task"             = "034940756ccab88876609c3cba4dea0a0f5c944b";
+  "garlic/seq"                  = "dee225571ab2572d7aa51df9846b01237ee941a1";
+  "garlic/tampi+isend+oss+task" = "449a3980a767f91ca65d429490080961dcfba498";
+}
diff --git a/garlic/apps/index.nix b/garlic/apps/index.nix
index f691c94..c0e2d4d 100644
--- a/garlic/apps/index.nix
+++ b/garlic/apps/index.nix
@@ -22,9 +22,7 @@
 
   creamsInput = callPackage ./creams/input.nix { };
 
-  hpcg = callPackage ./hpcg/default.nix {
-    gitBranch = "garlic/tampi+isend+oss+task";
-  };
+  hpcg = callPackage ./hpcg/default.nix { };
 
   bigsort = {
     sort = callPackage ./bigsort/default.nix {