From 53c098d9219a1845caf5c6d5d7d65053adb260fd Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Thu, 1 Apr 2021 18:07:13 +0200
Subject: [PATCH] heat: split the git table and use fetchGarlicApp

---
 garlic/apps/heat/default.nix   | 28 +++++-----------------------
 garlic/apps/heat/git-table.nix |  9 +++++++++
 2 files changed, 14 insertions(+), 23 deletions(-)
 create mode 100644 garlic/apps/heat/git-table.nix

diff --git a/garlic/apps/heat/default.nix b/garlic/apps/heat/default.nix
index fe5ea17..e922322 100644
--- a/garlic/apps/heat/default.nix
+++ b/garlic/apps/heat/default.nix
@@ -9,34 +9,17 @@
 }:
 
 let
-  gitTable = {
-    # Auto-generated with garlic-git-table on 2021-03-31
-    "garlic/mpi+send+oss+task"    = "947c80070d4c53e441df54b8bfac8928b10c5fb2";
-    "garlic/mpi+send+seq"         = "f41e1433808d0cbecd88a869b451c927747e5d42";
-    "garlic/tampi+isend+oss+task" = "b1273f9b4db32ba6e15e3d41343e67407ce2f54f";
-    "garlic/tampi+send+oss+task"  = "554bec249f9aa23dd92edcfa2ada1e03e05e121d";
+  gitSource = garlicTools.fetchGarlicApp {
+    appName = "heat";
+    inherit gitCommit gitBranch;
+    gitTable = import ./git-table.nix;
   };
-
-  # Find the actual commit
-  _gitCommit = garlicTools.findCommit {
-    inherit gitCommit gitTable gitBranch;
-  };
-  _gitBranch = gitBranch;
-
 in
-
   stdenv.mkDerivation rec {
 
     name = "heat";
 
-    src = builtins.fetchGit {
-      url = "ssh://git@bscpm03.bsc.es/garlic/apps/heat.git";
-      ref = _gitBranch;
-      rev = _gitCommit;
-    };
-
-    gitBranch = _gitBranch;
-    gitCommit = _gitCommit;
+    inherit (gitSource) src gitBranch gitCommit;
 
     patches = [ ./print-times.patch ];
 
@@ -51,5 +34,4 @@ in
       mkdir -p $out/etc
       cp heat.conf $out/etc/
     '';
-
   }
diff --git a/garlic/apps/heat/git-table.nix b/garlic/apps/heat/git-table.nix
new file mode 100644
index 0000000..c7670ac
--- /dev/null
+++ b/garlic/apps/heat/git-table.nix
@@ -0,0 +1,9 @@
+{
+  # Auto-generated with garlic-git-table on 2021-04-01 for repo:
+  # ssh://git@bscpm03.bsc.es/garlic/apps/heat.git
+
+  "garlic/mpi+send+oss+task"    = "947c80070d4c53e441df54b8bfac8928b10c5fb2";
+  "garlic/mpi+send+seq"         = "f41e1433808d0cbecd88a869b451c927747e5d42";
+  "garlic/tampi+isend+oss+task" = "b1273f9b4db32ba6e15e3d41343e67407ce2f54f";
+  "garlic/tampi+send+oss+task"  = "554bec249f9aa23dd92edcfa2ada1e03e05e121d";
+}