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

bsc/apps/dummy/default.nix

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

bsc/apps/heat/default.nix

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

default.nix

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