diff --git a/overlay.nix b/overlay.nix index 5e52891..0389975 100644 --- a/overlay.nix +++ b/overlay.nix @@ -35,7 +35,6 @@ let ovni = callPackage ./pkgs/ovni/default.nix { }; ovniGit = final.ovni.override { useGit = true; }; paraverKernel = callPackage ./pkgs/paraver/kernel.nix { }; - #paraverKernelFast = callPackage ./pkgs/paraver/kernel-fast.nix { }; # Outdated #pscom = callPackage ./pkgs/parastation/pscom.nix { }; # Unmaintaned #psmpi = callPackage ./pkgs/parastation/psmpi.nix { }; # Unmaintaned sonar = callPackage ./pkgs/sonar/default.nix { }; @@ -46,7 +45,6 @@ let tagaspi = callPackage ./pkgs/tagaspi/default.nix { }; tampi = callPackage ./pkgs/tampi/default.nix { }; wxparaver = callPackage ./pkgs/paraver/default.nix { }; - #wxparaverFast = callPackage ./pkgs/paraver/wxparaver-fast.nix { }; # Outdated }; in bscPkgs // { diff --git a/pkgs/paraver/kernel-fast.nix b/pkgs/paraver/kernel-fast.nix deleted file mode 100644 index cf2a3f3..0000000 --- a/pkgs/paraver/kernel-fast.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - stdenv -, autoreconfHook -, boost -, libxml2 -, xml2 -, wxpropgrid -, wxGTK28 -, autoconf -, automake -}: - -let - wx = wxGTK28; -in -stdenv.mkDerivation rec { - pname = "paraverKernelFast"; - version = "${src.shortRev}"; - - src = builtins.fetchGit { - url = "git@bscpm03.bsc.es:rpenacob/paraver-kernel.git"; - rev = "76f508095c35528ad89078473dc70b9600e507ff"; - ref = "fast"; - }; - - hardeningDisable = [ "all" ]; - enableParallelBuilding = true; - - dontStrip = true; - - preConfigure = '' - export CFLAGS="-O3 -DPARALLEL_ENABLED" - export CXXFLAGS="-std=c++17 -O3 -DPARALLEL_ENABLED" - ''; - - configureFlags = [ - "--with-boost=${boost}" - "--enable-openmp" - ]; - - buildInputs = [ - autoreconfHook - boost - libxml2.dev - xml2 - autoconf - automake - ]; -} diff --git a/pkgs/paraver/wxparaver-fast.nix b/pkgs/paraver/wxparaver-fast.nix deleted file mode 100644 index 37c84b1..0000000 --- a/pkgs/paraver/wxparaver-fast.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - stdenv -, autoreconfHook -, boost -, libxml2 -, xml2 -, wxpropgrid -, wxGTK28 -, autoconf -, automake -, paraverKernelFast -, openssl -}: - -let - wx = wxGTK28; -in -stdenv.mkDerivation rec { - pname = "paraverFast"; - version = "${src.shortRev}"; - - src = builtins.fetchGit { - url = "https://github.com/bsc-performance-tools/wxparaver.git"; - rev = "9fc61decb6d8d9b1cacb50639c3b2c85788b2292"; - ref = "master"; - }; - - hardeningDisable = [ "all" ]; - - patches = [ ./wxparaver-fast.patch ]; - - # Fix the PARAVER_HOME variable - postPatch = '' - sed -i 's@^PARAVER_HOME=.*$@PARAVER_HOME='$out'@g' docs/wxparaver - ''; - - dontStrip = true; - enableParallelBuilding = true; - - preConfigure = '' - export CFLAGS="-O3" - export CXXFLAGS="-std=c++17 -O3" - ''; - - configureFlags = [ - "--with-boost=${boost}" - "--with-wx-config=${wx}/bin/wx-config" - "--with-wxpropgrid-dir=${wxpropgrid}" - "--with-paraver=${paraverKernelFast}" - "--with-openssl=${openssl.dev}" - ]; - - buildInputs = [ - autoreconfHook - boost - libxml2.dev - xml2 - wxpropgrid - wx - autoconf - automake - paraverKernelFast - openssl.dev - ]; - - postInstall = '' - mkdir -p $out/include - mkdir -p $out/lib/paraver-kernel - mkdir -p $out/share/filters-config - cp -p ${paraverKernelFast}/bin/* $out/bin - # cp -p ${paraverKernelFast}/include/* $out/include - cp -a ${paraverKernelFast}/lib/paraver-kernel $out/lib/paraver-kernel - cp -p ${paraverKernelFast}/share/filters-config/* $out/share/filters-config - ''; -} diff --git a/pkgs/paraver/wxparaver-fast.patch b/pkgs/paraver/wxparaver-fast.patch deleted file mode 100644 index ae41cc7..0000000 --- a/pkgs/paraver/wxparaver-fast.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/docs/wxparaver 1970-01-01 01:00:01.000000000 +0100 -+++ b/docs/wxparaver 2021-11-02 12:08:54.670700017 +0100 -@@ -31,5 +31,10 @@ - - @inst_LOGIN_NODE_DETECTION@ - -+echo "WARNING: Using paraver fast, the trace must be ordered!" >&2 -+export PARAVER_FAST=1 -+ -+export LANG=C -+ - LD_LIBRARY_PATH="@inst_BOOST_LIBDIR@${PARAVER_HOME}/${LIB_DIR}/paraver-kernel:@inst_WXWIDGETS_LIBDIR@@inst_WXPROPGRID_LIB_PATH@@inst_LIBSSL_LIBDIR@${PARAVER_HOME}/${LIB_DIR}/wxparaver:$LD_LIBRARY_PATH" "${PARAVER_HOME}/bin/wxparaver.bin" "$@" -