From 37b49e1dd37bf736e83077ad4221284ba55c4f33 Mon Sep 17 00:00:00 2001
From: Rodrigo <rodarima@gmail.com>
Date: Wed, 10 Jun 2020 18:55:30 +0200
Subject: [PATCH] Add nanos6 git version

---
 bsc/nanos6/default.nix |  2 +-
 bsc/nanos6/git.nix     | 56 ++++++++++++++++++++++++++++++++++++++++++
 default.nix            |  6 ++++-
 3 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 bsc/nanos6/git.nix

diff --git a/bsc/nanos6/default.nix b/bsc/nanos6/default.nix
index ac214d9..d849bf0 100644
--- a/bsc/nanos6/default.nix
+++ b/bsc/nanos6/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   version = "2.3.2";
 
   src = fetchurl {
-    url = https://pm.bsc.es/ftp/ompss-2/releases/ompss-2-2019.11.2.tar.gz;
+    url = "https://pm.bsc.es/ftp/ompss-2/releases/ompss-2-2019.11.2.tar.gz";
     sha256 = "03v1kpggdch25m1wfrdjl6crq252dgy6pms8h94d5jwcjh06fbf8";
   };
 
diff --git a/bsc/nanos6/git.nix b/bsc/nanos6/git.nix
new file mode 100644
index 0000000..0aafaf4
--- /dev/null
+++ b/bsc/nanos6/git.nix
@@ -0,0 +1,56 @@
+{
+  stdenv
+, automake
+, autoconf
+, libtool
+, pkg-config
+, numactl
+, hwloc
+, papi
+, extrae
+, boost
+, autoreconfHook
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  pname = "nanos6";
+  version = "2.3.2";
+  branch = "master";
+  cacheline-width = "64";
+
+  src = builtins.fetchGit {
+    url = "git@bscpm02.bsc.es:rarias/nanos6";
+    rev = "17415b8f1064ccd0b7cfcf7097a64e8d2297c81b";
+    ref = branch;
+  };
+
+  enableParallelBuilding = true;
+  patchPhase = ''
+    export NANOS6_GIT_VERSION=${src.rev}
+    export NANOS6_GIT_BRANCH=${branch}
+    scripts/gen-version.sh
+  '';
+
+  preConfigure = ''
+    export CACHELINE_WIDTH=${cacheline-width}
+  '';
+
+  configureFlags = [
+    "--with-symbol-resolution=indirect"
+  ];
+
+  buildInputs = [
+    autoreconfHook
+    autoconf
+    automake
+    libtool
+    pkg-config
+    boost
+    numactl
+    hwloc
+    papi ]
+    ++ (if (extrae != null) then [extrae] else []);
+
+}
diff --git a/default.nix b/default.nix
index a649adc..8201244 100644
--- a/default.nix
+++ b/default.nix
@@ -29,7 +29,11 @@ let
       mpi = mpi;
     };
 
-    nanos6 = callPackage ./bsc/nanos6 {
+    nanos6 = callPackage ./bsc/nanos6/default.nix {
+      extrae = extrae;
+    };
+
+    nanos6-git = callPackage ./bsc/nanos6/git.nix {
       extrae = extrae;
     };