rarias/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update extrae to 4.0.1

Browse Source
This commit is contained in:
Rodrigo Arias 2023-03-02 11:43:35 +01:00
parent 20c5446743
commit c28618b95c
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bsc/extrae/default.nix
View File

@ -18,20 +18,29 @@
, autoreconfHook , autoreconfHook
, python37Packages , python37Packages
, installShellFiles , installShellFiles
, symlinkJoin
}: }:
let
libdwarfBundle = symlinkJoin {
name = "libdwarfBundle";
paths = [ libdwarf.dev libdwarf.lib libdwarf.out ];
};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "extrae"; pname = "extrae";
version = "3.8.3"; version = "4.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bsc-performance-tools"; owner = "bsc-performance-tools";
repo = "extrae"; repo = "extrae";
rev = "${version}"; 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 ]; patches = [ ./use-command.patch ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -59,7 +68,7 @@ stdenv.mkDerivation rec {
configureFlagsArray=( configureFlagsArray=(
--enable-posix-clock --enable-posix-clock
--with-binutils="${binutils-unwrapped} ${libiberty}" --with-binutils="${binutils-unwrapped} ${libiberty}"
--with-dwarf=${libdwarf} --with-dwarf=${libdwarfBundle}
--with-elf=${libelf} --with-elf=${libelf}
--with-boost=${boost.dev} --with-boost=${boost.dev}
--enable-instrument-io --enable-instrument-io

16
overlay.nix
View File

@ -171,7 +171,9 @@ let
enableDebugging = true; enableDebugging = true;
}); });
extrae = callPackage ./bsc/extrae/default.nix { }; extrae = callPackage ./bsc/extrae/default.nix {
libdwarf = super.libdwarf_20210528;
};
otf = callPackage ./bsc/otf/default.nix { }; otf = callPackage ./bsc/otf/default.nix { };
vite = self.qt5.callPackage ./bsc/vite/default.nix { }; vite = self.qt5.callPackage ./bsc/vite/default.nix { };
babeltrace = callPackage ./bsc/babeltrace/default.nix { }; babeltrace = callPackage ./bsc/babeltrace/default.nix { };
@ -216,18 +218,6 @@ let
# Patched from upstream # 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 { }; groff = callPackage ./bsc/groff/default.nix { };
fftw = callPackage ./bsc/fftw/default.nix { }; fftw = callPackage ./bsc/fftw/default.nix { };
vtk = callPackage ./bsc/vtk/default.nix { vtk = callPackage ./bsc/vtk/default.nix {