Remove dependency on wx from paraver kernel

Fix boost >=1.87 in wxparaver
Add patch to paraver to prevent focus stealing
2025-07-21 18:34:18 +02:00 · 2025-07-21 18:34:10 +02:00 · 2025-07-21 18:33:49 +02:00 · 2025-07-21 18:33:49 +02:00
5 changed files with 3 additions and 29 deletions
--- a/overlay.nix
+++ b/overlay.nix
@@ -18,7 +18,7 @@ let
    clangOmpss2NodesOmpv = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmpv; };
    clangOmpss2Unwrapped = callPackage ./pkgs/llvm-ompss2/clang.nix { };
    #extrae = callPackage ./pkgs/extrae/default.nix { }; # Broken and outdated
-    gpi-2 = callPackage ./pkgs/gpi-2/default.nix { };
+    #gpi-2 = callPackage ./pkgs/gpi-2/default.nix { }; # Broken: https://jungle.bsc.es/git/rarias/bscpkgs/issues/7
    intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { };
    jemallocNanos6 = callPackage ./pkgs/nanos6/jemalloc.nix { };
    lmbench = callPackage ./pkgs/lmbench/default.nix { };
@@ -44,7 +44,7 @@ let
    stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; };
    stdenvClangOmpss2Nodes = final.stdenv.override { cc = final.clangOmpss2Nodes; allowedRequisites = null; };
    stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; };
-    tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
+    #tagaspi = callPackage ./pkgs/tagaspi/default.nix { }; # Broken due gpi-2
    tampi = callPackage ./pkgs/tampi/default.nix { };
    wxparaver = callPackage ./pkgs/paraver/default.nix { };
  };
--- a/pkgs/gpi-2/default.nix
+++ b/pkgs/gpi-2/default.nix
@@ -34,8 +34,6 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  patches = [ ./rdma-core.patch ./max-mem.patch ];
-
  preConfigure = ''
    patchShebangs autogen.sh
    ./autogen.sh
--- a/pkgs/gpi-2/max-mem.patch
+++ b/pkgs/gpi-2/max-mem.patch
@@ -1,10 +0,0 @@
--- a/tests/tests/segments/max_mem.c	2025-09-12 13:30:53.449353591 +0200
-+++ b/tests/tests/segments/max_mem.c	2025-09-12 13:33:49.750352401 +0200
-@@ -1,5 +1,7 @@
- #include <test_utils.h>
- 
-+gaspi_size_t gaspi_get_system_mem (void);
-+
- /* Test allocates 45% of system memory and creates a segment that
-    large or if several ranks per node exist, divided among that
-    number */
--- a/pkgs/gpi-2/rdma-core.patch
+++ b/pkgs/gpi-2/rdma-core.patch
@@ -1,12 +0,0 @@
--- a/src/devices/ib/GPI2_IB.h	2025-09-12 13:25:31.564181121 +0200
-+++ b/src/devices/ib/GPI2_IB.h	2025-09-12 13:24:49.105422150 +0200
-@@ -26,6 +26,9 @@ along with GPI-2. If not, see <http://ww
- 
- #include "GPI2_Dev.h"
- 
-+/* Missing prototype as driver.h is now private */
-+int ibv_read_sysfs_file(const char *dir, const char *file, char *buf, size_t size);
-+
- #define GASPI_GID_INDEX   (0)
- #define PORT_LINK_UP      (5)
- #define MAX_INLINE_BYTES  (128)
--- a/pkgs/nosv/default.nix
+++ b/pkgs/nosv/default.nix
@@ -6,8 +6,6 @@
 , pkg-config
 , numactl
 , hwloc
-, papi
-, enablePapi ? true
 , cacheline ? 64 # bits
 , ovni ? null
 , useGit ? false
@@ -58,5 +56,5 @@ in
      numactl
      hwloc
      ovni
-    ] ++ lib.optionals enablePapi [ papi ];
+    ];
  }
Author	SHA1	Message	Date
Aleix Boné	7b0433320a	Remove dependency on wx from paraver kernel	2025-07-21 18:34:18 +02:00
Aleix Boné	ec7b8befe3	Fix boost >=1.87 in wxparaver	2025-07-21 18:34:10 +02:00
Aleix Boné	e23b5003f5	Add patch to paraver to prevent focus stealing https://github.com/bsc-performance-tools/wxparaver/issues/18	2025-07-21 18:33:49 +02:00
Aleix Boné	c6bc7771d0	Update paraver to 4.12.0 Adds a new patch to fix libxml2: the m4 AM_PATH_XML2 macro has been deprecated and is no longer included in the latest nixpkgs unstable. Upstream recommends using `PKG_CHECK_MODULES` instead.	2025-07-21 18:33:49 +02:00