From 03c725676757d91983c331aa24aed03a993f536d Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Tue, 11 Apr 2023 20:32:49 +0200
Subject: [PATCH] Disable extrae as is broken

---
 bsc/extrae/default.nix | 6 ++++--
 bsc/nanos6/default.nix | 6 +-----
 bsc/nanos6/git.nix     | 4 +---
 test/ci.nix            | 2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/bsc/extrae/default.nix b/bsc/extrae/default.nix
index 1f92de7..2ceec91 100644
--- a/bsc/extrae/default.nix
+++ b/bsc/extrae/default.nix
@@ -12,11 +12,12 @@
 , gfortran
 , xml2
 , which
+, libbfd
 , mpi ? null
 , cuda ? null
 , llvmPackages
 , autoreconfHook
-, python37Packages
+#, python3Packages
 , installShellFiles
 , symlinkJoin
 }:
@@ -64,7 +65,8 @@ stdenv.mkDerivation rec {
     xml2
     which
     libxml2.dev
-    #python37Packages.sphinx
+    libbfd
+    #python3Packages.sphinx
   ]
   ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
     
diff --git a/bsc/nanos6/default.nix b/bsc/nanos6/default.nix
index c67d280..faf2767 100644
--- a/bsc/nanos6/default.nix
+++ b/bsc/nanos6/default.nix
@@ -10,9 +10,7 @@
 , numactl
 , hwloc
 , papi
-, extrae
 , boost
-, babeltrace2
 , ovni
 , enableJemalloc ? true
 , jemalloc ? null
@@ -48,7 +46,6 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--with-babeltrace2=${babeltrace2}"
     "--with-ovni=${ovni}"
   ] ++
     (optional enableJemalloc "--with-jemalloc=${jemalloc}") ++
@@ -71,8 +68,7 @@ stdenv.mkDerivation rec {
     numactl
     hwloc
     papi
-    babeltrace2
     ovni
-  ] ++ (if (extrae != null) then [extrae] else []);
+  ];
 
 }
diff --git a/bsc/nanos6/git.nix b/bsc/nanos6/git.nix
index 794f9fa..1e2cc09 100644
--- a/bsc/nanos6/git.nix
+++ b/bsc/nanos6/git.nix
@@ -9,7 +9,6 @@
 , numactl
 , hwloc
 , papi
-, extrae
 , boost
 , autoreconfHook
 , enableJemalloc ? true
@@ -61,6 +60,5 @@ stdenv.mkDerivation rec {
     boost
     numactl
     hwloc
-    papi ]
-    ++ (if (extrae != null) then [extrae] else []);
+    papi ];
 }
diff --git a/test/ci.nix b/test/ci.nix
index 827be63..a523982 100644
--- a/test/ci.nix
+++ b/test/ci.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     tampi
     # Tools
     ovni
-    extrae
+    # extrae # Broken
     wxparaver
     # Runtimes
     nanos6