Merge branch 'master' of bscpm02.bsc.es:rarias/bsc-nixpkgs

This commit is contained in:
Rodrigo Arias 2020-07-27 15:24:26 +02:00
commit ea81c34f31
3 changed files with 20 additions and 2 deletions

View File

@ -0,0 +1,18 @@
{
stdenv
, branch ? null
, srcPath ? null
}:
#assert if srcPath == null then branch != null else true;
stdenv.mkDerivation rec {
name = "dummy";
src = (if srcPath != null then srcPath else
builtins.fetchGit {
url = "ssh://git@bscpm02.bsc.es/rarias/dummy.git";
ref = "${branch}";
}
);
}

View File

@ -8,7 +8,7 @@
}:
stdenv.mkDerivation rec {
name = "gauss-seidel";
name = "heat";
src = builtins.fetchGit {
url = "ssh://git@bscpm02.bsc.es/benchmarks/ompss-2/heat-conflict-kevin.git";

View File

@ -124,7 +124,7 @@ let
tampi = tampi;
};
gauss-seidel = callPackage ./bsc/apps/gauss-seidel/default.nix {
heat = callPackage ./bsc/apps/heat/default.nix {
stdenv = pkgs.gcc7Stdenv;
mpi = intel-mpi;
tampi = tampi;