From c28618b95c0cf809e1071fc1d2edc939618df343 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Thu, 2 Mar 2023 11:43:35 +0100
Subject: [PATCH] Update extrae to 4.0.1

---
 bsc/extrae/default.nix | 19 ++++++++++++++-----
 overlay.nix            | 16 +++-------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/bsc/extrae/default.nix b/bsc/extrae/default.nix
index 88a2f42..26f7124 100644
--- a/bsc/extrae/default.nix
+++ b/bsc/extrae/default.nix
@@ -18,20 +18,29 @@
 , autoreconfHook
 , python37Packages
 , installShellFiles
+, symlinkJoin
 }:
 
+let
+  libdwarfBundle = symlinkJoin {
+    name = "libdwarfBundle";
+    paths = [ libdwarf.dev libdwarf.lib libdwarf.out ];
+  };
+in
+
 stdenv.mkDerivation rec {
   pname = "extrae";
-  version = "3.8.3";
-
+  version = "4.0.1";
   src = fetchFromGitHub {
     owner = "bsc-performance-tools";
     repo = "extrae";
     rev = "${version}";
-    sha256 = "08ghd14zb3bgqb1smb824d621pqqww4q01n3pyws0vp3xi0kavf4";
+    sha256 = "SlMYxNQXJ0Xg90HmpnotUR3tEPVVBXhk1NtEBJwGBR4=";
   };
 
-  # FIXME: Waiting for German to merge this patch
+  # FIXME: Waiting for German to merge this patch. Still not in master, merged
+  # on 2023-03-01 in devel branch (after 3 years), see:
+  # https://github.com/bsc-performance-tools/extrae/pull/45
   patches = [ ./use-command.patch ];
 
   enableParallelBuilding = true;
@@ -59,7 +68,7 @@ stdenv.mkDerivation rec {
     configureFlagsArray=(
       --enable-posix-clock
       --with-binutils="${binutils-unwrapped} ${libiberty}"
-      --with-dwarf=${libdwarf}
+      --with-dwarf=${libdwarfBundle}
       --with-elf=${libelf}
       --with-boost=${boost.dev}
       --enable-instrument-io
diff --git a/overlay.nix b/overlay.nix
index 3e26961..20fbd94 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -171,7 +171,9 @@ let
       enableDebugging = true;
     });
 
-    extrae = callPackage ./bsc/extrae/default.nix { };
+    extrae = callPackage ./bsc/extrae/default.nix {
+      libdwarf = super.libdwarf_20210528;
+    };
     otf = callPackage ./bsc/otf/default.nix { };
     vite = self.qt5.callPackage ./bsc/vite/default.nix { };
     babeltrace = callPackage ./bsc/babeltrace/default.nix { };
@@ -216,18 +218,6 @@ let
     #  Patched from upstream
     # =================================================================
 
-    #libdwarf_insecure = super.libdwarf.overrideAttrs (old: {
-    #  knownVulnerabilities = null;
-    #});
-    libdwarf = super.symlinkJoin {
-      name = "libdwarf";
-      paths = [
-        self.libdwarf.dev
-        self.libdwarf.lib
-        self.libdwarf.out
-      ];
-    };
-
     groff = callPackage ./bsc/groff/default.nix { };
     fftw = callPackage ./bsc/fftw/default.nix { };
     vtk = callPackage ./bsc/vtk/default.nix {