heat: split the git table and use fetchGarlicApp

This commit is contained in:
Rodrigo Arias 2021-04-01 18:07:13 +02:00
parent d2222f6868
commit 53c098d921
2 changed files with 14 additions and 23 deletions

View File

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

View File

@ -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";
}