Use gcc13 for intel compiler

New apt list does not have Package: as the first entry for all packages

pkgs/nosv/default.nix

@@ -6,6 +6,8 @@
 , pkg-config
 , numactl
 , hwloc
+, papi
+, enablePapi ? true
 , cacheline ? 64 # bits
 , ovni ? null
 , useGit ? false
@@ -56,5 +58,5 @@ in
       numactl
       hwloc
       ovni
-    ];
+    ] ++ lib.optionals enablePapi [ papi ];
   }

pkgs/paraver/default.nix

@@ -1,7 +1,8 @@
 {
   stdenv
+, fetchFromGitHub
 , autoreconfHook
-, boost186
+, boost
 , libxml2
 , xml2
 , wxGTK32
@@ -15,18 +16,26 @@
 
 let
   wx = wxGTK32;
-  boost = boost186;
 in
 stdenv.mkDerivation rec {
   pname = "wxparaver";
-  version = "4.11.2";
+  version = "4.12.0";
 
-  src = builtins.fetchGit {
-    url = "https://github.com/bsc-performance-tools/wxparaver.git";
-    rev = "129e6b4a4f061e5a319049db8db1620f5de3bd70"; # v4.11.2 (missing tag)
-    ref = "master";
+  src = fetchFromGitHub {
+    owner = "bsc-performance-tools";
+    repo = "wxparaver";
+    rev = "v${version}";
+    sha256 = "sha256-YsO5gsuEFQdki3lQudEqgo5WXOt/fPdvNw5OxZQ86Zo=";
   };
 
+  patches = [
+    ./do-not-steal-focus-on-redraw.patch
+
+    # Fix for boost >=1.87 (thanks to gamezelda)
+    # https://aur.archlinux.org/cgit/aur.git/commit/?h=wxparaver&id=b0dcd08c472536e0a1a3cc1dfbc4c77d9f5e0d47
+    ./fix-boost-87.patch
+  ];
+
   hardeningDisable = [ "all" ];
 
   # Fix the PARAVER_HOME variable

pkgs/paraver/do-not-steal-focus-on-redraw.patch

@@ -0,0 +1,26 @@
+From 2b185e1b5ce52808b3026334851dbcd5a640ed4d Mon Sep 17 00:00:00 2001
+From: aleixbonerib <aleix.boneribo@bsc.es>
+Date: Mon, 10 Jun 2024 20:59:45 +0200
+Subject: [PATCH] fix: do not set focus on redraw
+
+Some wm can change the window size without focusing. Right now, when the
+plot is resized it takes back focus.
+---
+ src/gtimeline.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/gtimeline.cpp b/src/gtimeline.cpp
+index 23ebef2..a896066 100644
+--- a/src/gtimeline.cpp
++++ b/src/gtimeline.cpp
+@@ -899,7 +899,6 @@ void gTimeline::redraw()
+ 
+   drawZone->Refresh();
+ 
+-  SetFocus();
+ }
+ 
+ 
+-- 
+2.44.1
+

pkgs/paraver/dont-expand-colors.patch

@@ -11,7 +11,7 @@ diff --git a/api/semanticcolor.cpp b/api/semanticcolor.cpp
 index 9f86960..22859eb 100644
 --- a/api/semanticcolor.cpp
 +++ b/api/semanticcolor.cpp
-@@ -232,8 +232,9 @@ rgb CodeColor::getColor( PRV_UINT32 pos ) const
+@@ -295,8 +295,9 @@ rgb SemanticColor::getColor( PRV_UINT32 pos ) const
  {
    if( pos == 0 && ParaverConfig::getInstance()->getColorsTimelineUseZero() )
      return ParaverConfig::getInstance()->getColorsTimelineColorZero();
@@ -22,26 +22,26 @@ index 9f86960..22859eb 100644
 +  return colors[ pos + 1 ];
  }
  
- void CodeColor::setColor( PRV_UINT32 whichPos, rgb whichColor )
-@@ -250,6 +251,12 @@ void CodeColor::setColor( PRV_UINT32 whichPos, rgb whichColor )
+ void SemanticColor::setColor( PRV_UINT32 whichPos, rgb whichColor )
+@@ -314,6 +315,12 @@ void SemanticColor::setColor( PRV_UINT32 whichPos, rgb whichColor )
    colors[ whichPos ] = whichColor;
  }
  
-+void CodeColor::cutAfter( PRV_UINT32 pos )
++void SemanticColor::cutAfter( PRV_UINT32 pos )
 +{
 +  if ( pos < colors.size() )
 +    colors.erase( colors.begin() + pos, colors.end() );
 +}
 +
- void CodeColor::setCustomColor( TSemanticValue whichValue, rgb color ) 
+ void SemanticColor::setCustomColor( TSemanticValue whichValue, rgb color ) 
  {
    customPalette[ whichValue ] = color;
 diff --git a/api/semanticcolor.h b/api/semanticcolor.h
 index a079556..bddf3d8 100644
 --- a/api/semanticcolor.h
 +++ b/api/semanticcolor.h
-@@ -98,6 +98,7 @@ class CodeColor: public SemanticColor
- 
+@@ -114,6 +114,7 @@ class SemanticColor
+     // Code Color methods
      PRV_UINT32 getNumColors() const;
      void setColor( PRV_UINT32 pos, rgb color );
 +    void cutAfter( PRV_UINT32 pos );
@@ -61,7 +61,7 @@ index b0d2050..ee2ab69 100644
    for ( auto it : semanticColors )
    {
      std::tie( tmpColor.red, tmpColor.green, tmpColor.blue ) = it.second;
-     myCodeColor.setColor( it.first, tmpColor );
+     mySemanticColor.setColor( it.first, tmpColor );
 +	if (it.first > maxValue)
 +      maxValue = it.first;
    }
@@ -69,7 +69,7 @@ index b0d2050..ee2ab69 100644
 +  // Cut the palette after the highest defined value, so there are no
 +  // extra expanded values
 +  if ( !pcfParser.expandColors )
-+	myCodeColor.cutAfter(maxValue);
++	mySemanticColor.cutAfter(maxValue);
 +
    myEventLabels = EventLabels( pcfParser );
    myStateLabels = StateLabels( pcfParser );

pkgs/paraver/fix-boost-87.patch

@@ -0,0 +1,87 @@
+From 7ecd888e2ebb9e8c5582851d3c50bff61022708e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= <joanbrugueram@gmail.com>
+Date: Sat, 29 Mar 2025 18:14:25 +0000
+Subject: [PATCH] tutorialsdownload: Fix Boost ASIO 1.87.0 removals
+
+---
+ src/tutorialsdownload.cpp | 25 ++++++++++++-------------
+ 1 file changed, 12 insertions(+), 13 deletions(-)
+
+diff --git a/src/tutorialsdownload.cpp b/src/tutorialsdownload.cpp
+index a1921fd..6ce9dc2 100644
+--- a/src/tutorialsdownload.cpp
++++ b/src/tutorialsdownload.cpp
+@@ -121,13 +121,13 @@ void TutorialsProgress::updateInstall( int whichValue )
+ class client
+ {
+   public:
+-    client( boost::asio::io_service& io_service,
++    client( boost::asio::io_context& io_context,
+             boost::asio::ssl::context& context,
+             const std::string& server, const std::string& path,
+             ofstream& storeFile,
+             TutorialsProgress *progress )
+-            : resolver_( io_service ),
+-              socket_( io_service, context ),
++            : resolver_( io_context ),
++              socket_( io_context, context ),
+               store_( storeFile ),
+               progress_( progress )
+     {
+@@ -143,8 +143,7 @@ class client
+ 
+         // Start an asynchronous resolve to translate the server and service names
+         // into a list of endpoints.
+-        tcp::resolver::query query( server, "https" );
+-        resolver_.async_resolve( query,
++        resolver_.async_resolve( server, "https",
+                                  boost::bind( &client::handle_resolve,
+                                               this,
+                                               boost::asio::placeholders::error,
+@@ -154,7 +153,7 @@ class client
+   private:
+ 
+     void handle_resolve( const boost::system::error_code& err,
+-                         tcp::resolver::iterator endpoint_iterator )
++                         const tcp::resolver::results_type& endpoints )
+     {
+       if ( !err )
+       {
+@@ -162,7 +161,7 @@ class client
+         socket_.set_verify_callback( boost::bind( &client::verify_certificate, this, _1, _2 ) );
+ 
+         boost::asio::async_connect( socket_.lowest_layer(), 
+-                                    endpoint_iterator,
++                                    endpoints,
+                                     boost::bind( &client::handle_connect, 
+                                                  this,
+                                                  boost::asio::placeholders::error ) );
+@@ -536,9 +535,9 @@ bool TutorialsDownload::downloadTutorialsList() const
+     boost::asio::ssl::context ctx( boost::asio::ssl::context::sslv23 );
+     ctx.set_default_verify_paths();
+ 
+-    boost::asio::io_service io_service;
+-    client c( io_service, ctx, server, path, storeFile, nullptr );
+-    io_service.run();
++    boost::asio::io_context io_context;
++    client c( io_context, ctx, server, path, storeFile, nullptr );
++    io_context.run();
+ 
+     doneDownload = true;
+   }
+@@ -580,9 +579,9 @@ bool TutorialsDownload::download( const TutorialData& whichTutorial, string& tut
+     boost::asio::ssl::context ctx( boost::asio::ssl::context::sslv23 );
+     ctx.set_default_verify_paths();
+ 
+-    boost::asio::io_service io_service;
+-    client c( io_service, ctx, std::string( server.mb_str() ), std::string( path.mb_str() ), storeFile, &progress );
+-    io_service.run();
++    boost::asio::io_context io_context;
++    client c( io_context, ctx, std::string( server.mb_str() ), std::string( path.mb_str() ), storeFile, &progress );
++    io_context.run();
+   }
+   catch ( ParaverKernelException& e )
+   {
+-- 
+2.49.0
+

pkgs/paraver/fix-libxml2-deprecation.patch

@@ -0,0 +1,23 @@
+commit 60aa3ffa05f6b40db191a880e9e622d608744c1f
+Author: Aleix Boné <aleix.boneribo@bsc.es>
+Date:   Sun Jul 21 12:11:30 2025 +0200
+
+    fix libxml2 deprecated macro
+
+diff --git a/configure.ac b/configure.ac
+index 7fe1876..3ce1091 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,7 +46,10 @@ AC_PROG_CPP
+ AC_PROG_CXXCPP
+ AC_PROG_SED
+ 
+-AM_PATH_XML2
++PKG_PROG_PKG_CONFIG
++PKG_CHECK_MODULES([XML], [libxml-2.0])
++
++AC_SUBST(XML_CPPFLAGS, $XML_CFLAGS)
+ 
+ AX_BOOST_BASE(1.36)
+ AX_BOOST_SERIALIZATION
+

pkgs/paraver/kernel.nix

@@ -1,32 +1,32 @@
 {
   stdenv
+, fetchFromGitHub
 , autoreconfHook
 , boost
 , libxml2
 , xml2
-, wxGTK32
 , autoconf
 , automake
 , pkg-config
 , zlib
 }:
 
-let
-  wx = wxGTK32;
-in
 stdenv.mkDerivation rec {
   pname = "paraver-kernel";
-  version = "${src.shortRev}";
+  version = "4.12.0";
 
-  src = builtins.fetchGit {
-    url = "https://github.com/bsc-performance-tools/paraver-kernel.git";
-    rev = "2e167da3cee78ca11e31b74faefb23f12bac2b8c"; # master (missing tag)
-    ref = "master";
+  src = fetchFromGitHub {
+    owner = "bsc-performance-tools";
+    repo = "paraver-kernel";
+    rev = "v${version}";
+    sha256 = "sha256-Xs7g8ITZhPt00v7o2WlTddbou8C8Rc9kBMFpl2WsCS4=";
   };
 
   patches = [
     # https://github.com/bsc-performance-tools/paraver-kernel/pull/11
-    ./dont-expand-colors.patch
+    # TODO: add this back if it's still relevant
+    # ./dont-expand-colors.patch
+    ./fix-libxml2-deprecation.patch
   ];
 
   hardeningDisable = [ "all" ];