Clean up paraver derivations

overlay.nix

@@ -19,7 +19,6 @@ let
     cudainfo = prev.callPackage ./pkgs/cudainfo/default.nix { };
     #extrae = callPackage ./pkgs/extrae/default.nix { }; # Broken and outdated
     gpi-2 = callPackage ./pkgs/gpi-2/default.nix { };
-    quickShell = import ./pkgs/quick-shell/default.nix { pkgs = final; };
     intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { };
     jemallocNanos6 = callPackage ./pkgs/nanos6/jemalloc.nix { };
     # FIXME: Extend this to all linuxPackages variants. Open problem, see:

pkgs/paraver/default.nix

@@ -1,5 +1,4 @@
-{
+{ stdenv
-  stdenv
 , lib
 , fetchFromGitHub
 , autoreconfHook
@@ -13,14 +12,17 @@
 , openssl
 , glibcLocales
 , wrapGAppsHook
+
+, enableDebug ? false
 }:
 
 let
   wx = wxGTK32;
-in
-stdenv.mkDerivation rec {
-  pname = "wxparaver";
   version = "4.12.0";
+in
+stdenv.mkDerivation {
+  pname = "wxparaver";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "bsc-performance-tools";
@@ -37,21 +39,26 @@ stdenv.mkDerivation rec {
     ./fix-boost-87.patch
   ];
 
-  hardeningDisable = [ "all" ];
-
   # Fix the PARAVER_HOME variable
   postPatch = ''
     sed -i 's@^PARAVER_HOME=.*$@PARAVER_HOME='$out'@g' docs/wxparaver
     sed -i '1aexport LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"' docs/wxparaver
   '';
 
-  dontStrip = true;
   enableParallelBuilding = true;
 
-  preConfigure = ''
+  hardeningDisable = [ "all" ];
-    export CFLAGS="-O3"
+
-    export CXXFLAGS="-O3"
+  dontStrip = true;
-  '';
+
+  env =
+    let
+      flags = if enableDebug then "-ggdb -Og" else "-O3";
+    in
+    {
+      CFLAGS = flags;
+      CXXFLAGS = flags;
+    };
 
   configureFlags = [
     "--with-boost=${boost}"
@@ -69,11 +76,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     boost
-    libxml2.dev
+    libxml2
     xml2
     wx
     paraverKernel
-    openssl.dev
+    openssl
   ];
 
   postInstall = ''

pkgs/paraver/kernel.nix

@@ -1,5 +1,4 @@
-{
+{ stdenv
-  stdenv
 , lib
 , fetchFromGitHub
 , autoreconfHook
@@ -10,11 +9,16 @@
 , automake
 , pkg-config
 , zlib
+
+, enableDebug ? false
 }:
 
-stdenv.mkDerivation rec {
+let
-  pname = "paraver-kernel";
   version = "4.12.0";
+in
+stdenv.mkDerivation {
+  pname = "paraver-kernel";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "bsc-performance-tools";
@@ -35,10 +39,14 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  preConfigure = ''
+  env =
-    export CFLAGS="-O3 -DPARALLEL_ENABLED"
+    let
-    export CXXFLAGS="-O3 -DPARALLEL_ENABLED"
+      flags = "-DPARALLEL_ENABLED " + (if enableDebug then "-ggdb -Og" else "-O3");
-  '';
+    in
+    {
+      CFLAGS = flags;
+      CXXFLAGS = flags;
+    };
 
   configureFlags = [
     "--with-boost=${boost}"

pkgs/quick-shell/default.nix

@@ -1,76 +0,0 @@
-{ pkgs }:
-
-# This builds devshells using passthru to populate packages and inputsFrom
-# lazily.
-#
-# Packages prefixed with @ are added to inputsFrom and the rest are
-# added to packages. This makes it possible to obtain a devshell with combining
-# inputsFrom and packages from the comand line:
-#
-# $ nix develop .#quickShell.@nosv.clang-tools.ovni.@tampi
-#
-# is equivalent to:
-#
-#   with pkgs; mkShell {
-#     packages = [ clang-tools ovni ];
-#     inputsFrom = [ nosv tampi ];
-#   }
-#
-
-let
-  inherit (builtins) attrNames getAttr listToAttrs;
-  inherit (pkgs) lib;
-
-  # list of all packages' names
-  names = attrNames pkgs;
-
-  # generate a attributes containing the selected packages + all the available
-  # packages in names ("" -> packages and "@" -> inputsFrom)
-  go =
-    selected:
-    let
-      mkAttrs =
-        isInputs:
-        (map (
-          name:
-          let
-            pkg = getAttr name pkgs;
-          in
-          {
-            name = (if isInputs then "@" else "") + name;
-            value = go (
-              if isInputs then
-                {
-                  inherit (selected) packages;
-                  inputsFrom = selected.inputsFrom ++ [ pkg ];
-                }
-              else
-                {
-                  inherit (selected) inputsFrom;
-                  packages = selected.packages ++ [ pkg ];
-                }
-            );
-          }
-        ) names);
-
-      attrs = listToAttrs ((mkAttrs true) ++ (mkAttrs false));
-
-      drv = pkgs.mkShell {
-        inherit (selected) inputsFrom packages;
-        name = # build a label from inputsFrom
-          if (selected.inputsFrom == [ ]) then
-            "nix-quick-shell"
-          else
-            lib.concatStringsSep "-" (map (v: v.pname or v.name or "unknown") selected.inputsFrom);
-      };
-    in
-    drv.overrideAttrs {
-      passthru = attrs // {
-        _passthru = drv.passthru;
-      };
-    };
-in
-go {
-  inputsFrom = [ ];
-  packages = [ ];
-}