From f2c6a3cb1557926efce3cf075d60e25daffbc87c Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Wed, 30 Jun 2021 16:33:51 +0200
Subject: [PATCH] nanos6: update 2.5.1 -> 2.6

---
 bsc/nanos6/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/bsc/nanos6/default.nix b/bsc/nanos6/default.nix
index 5d0feb1..844bd9c 100644
--- a/bsc/nanos6/default.nix
+++ b/bsc/nanos6/default.nix
@@ -11,6 +11,7 @@
 , papi
 , extrae
 , boost
+, babeltrace2
 , enableJemalloc ? true
 , jemalloc ? null
 , cachelineBytes ? 64
@@ -23,31 +24,28 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "nanos6";
-  version = "2.5.1";
+  version = "2.6";
 
   src = fetchFromGitHub {
     owner = "bsc-pm";
     repo = "nanos6";
     rev = "version-${version}";
-    sha256 = "17z6gr122cw0l4lsp0qdrdbcl1zcls4i0haxqpj3g60fvjx3fznp";
+    sha256 = "0rnbcjgsczqs4qqbm5w761f8h7fs1cw36akhjlbfazs5l92f0ac5";
   };
 
-  patches = [ ./clock-monotonic.patch ];
-
   prePatch = ''
     patchShebangs scripts/generate_config.sh
   '';
 
   enableParallelBuilding = true;
-  dontStrip = true;
 
   preConfigure = ''
     export CACHELINE_WIDTH=${toString cachelineBytes}
   '';
 
-  configureFlags = [] ++
-    optional enableJemalloc "--with-jemalloc=${jemalloc}" ++
-    optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG";
+  configureFlags = [ "--with-babeltrace2=${babeltrace2}" ] ++
+    (optional enableJemalloc "--with-jemalloc=${jemalloc}") ++
+    (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
 
   # The "bindnow" flags are incompatible with ifunc resolution mechanism. We
   # disable all by default, which includes bindnow.
@@ -62,7 +60,8 @@ stdenv.mkDerivation rec {
     boost
     numactl
     hwloc
-    papi ]
-    ++ (if (extrae != null) then [extrae] else []);
+    papi
+    babeltrace2
+  ] ++ (if (extrae != null) then [extrae] else []);
 
 }