Clean up paraver derivations

m/hut/configuration.nix

@@ -17,7 +17,6 @@
     ./postgresql.nix
     ./nginx.nix
     ./p.nix
-    ./hydra.nix
     #./pxe.nix
   ];
 

m/hut/hydra.nix

@@ -1,15 +0,0 @@
-{ ... }:
-{
-  services.hydra = {
-    enable = true;
-    hydraURL = "http://jungle.bsc.es/hydra"; # externally visible URL
-    notificationSender = "hydra@jungle.bsc.es"; # e-mail of Hydra service
-    port = 3001;
-    # a standalone Hydra will require you to unset the buildMachinesFiles list to avoid using a nonexistant /etc/nix/machines
-    buildMachinesFiles = [];
-    # you will probably also want, otherwise *everything* will be built from scratch
-    useSubstitutes = true;
-
-    listenHost = "0.0.0.0"; # Force IPv4
-  };
-}

m/hut/nginx.nix

@@ -48,17 +48,6 @@ in
           proxy_pass http://127.0.0.1:5000;
           proxy_redirect http:// $scheme://;
         }
-        location /hydra {
-          rewrite ^/hydra/(.*) /$1 break;
-          proxy_pass http://127.0.0.1:3001;
-          proxy_redirect http:// $scheme://;
-
-          proxy_set_header  Host              $host;
-          proxy_set_header  X-Real-IP         $remote_addr;
-          proxy_set_header  X-Forwarded-For   $proxy_add_x_forwarded_for;
-          proxy_set_header  X-Forwarded-Proto $scheme;
-          proxy_set_header  X-Request-Base    /hydra;
-        }
         location /lists {
           proxy_pass http://127.0.0.1:8081;
           proxy_redirect http:// $scheme://;

pkgs/paraver/default.nix

@@ -1,5 +1,4 @@
-{
-  stdenv
+{ stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -12,14 +11,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";
@@ -36,21 +38,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 = ''
-    export CFLAGS="-O3"
-    export CXXFLAGS="-O3"
-  '';
+  hardeningDisable = [ "all" ];
+
+  dontStrip = true;
+
+  env =
+    let
+      flags = if enableDebug then "-ggdb -Og" else "-O3";
+    in
+    {
+      CFLAGS = flags;
+      CXXFLAGS = flags;
+    };
 
   configureFlags = [
     "--with-boost=${boost}"
@@ -68,11 +75,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
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -9,11 +8,16 @@
 , automake
 , pkg-config
 , zlib
+
+, enableDebug ? false
 }:
 
-stdenv.mkDerivation rec {
-  pname = "paraver-kernel";
+let
   version = "4.12.0";
+in
+stdenv.mkDerivation {
+  pname = "paraver-kernel";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "bsc-performance-tools";
@@ -34,10 +38,14 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  preConfigure = ''
-    export CFLAGS="-O3 -DPARALLEL_ENABLED"
-    export CXXFLAGS="-O3 -DPARALLEL_ENABLED"
-  '';
+  env =
+    let
+      flags = "-DPARALLEL_ENABLED " + (if enableDebug then "-ggdb -Og" else "-O3");
+    in
+    {
+      CFLAGS = flags;
+      CXXFLAGS = flags;
+    };
 
   configureFlags = [
     "--with-boost=${boost}"