Fix missing which in nodes checkPhase

The check still works, but it pollutes the logs with errors

m/common/base/users.nix

@@ -180,19 +180,6 @@
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFmMqKqPg4uocNOr3O41kLbZMOMJn3m2ZdN1JvTR96z3 bsccns@arnau-bsc"
         ];
       };
-
-      aaguirre = {
-        uid = 9655;
-        isNormalUser = true;
-        home = "/home/Computational/aaguirre";
-        description = "Alejandro Aguirre";
-        group = "Computational";
-        hosts = [ "apex" "hut" ];
-        hashedPassword = "$6$TXRXQT6jjBvxkxU6$E.sh5KspAm1qeG5Ct7OPHpo8REmbGDwjFGvqeGgTVz3GASGOAnPL7UMZsMAsAKBoahOw.v8LNno6XGrTEPzZH1";
-        openssh.authorizedKeys.keys = [
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOlRX7ZCnqtUJYCxKgWmgSrFCYuA2LHY96rVwqxXPl86 aaguirre@BSC-8488184117"
-        ];
-      };
     };
 
     groups = {

m/hut/configuration.nix

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

m/hut/gitea.nix

@@ -29,9 +29,6 @@
     };
   };
 
-  # Allow gitea user to send mail
-  users.users.gitea.extraGroups = [ "mail-robot" ];
-
   services.gitea-actions-runner.instances = {
     runrun = {
       enable = true;

m/hut/msmtp.nix

@@ -1,11 +1,8 @@
 { config, lib, ... }:
 {
-  # Robot user that can see the password to send mail from jungle-robot
-  users.groups.mail-robot = {};
-
   age.secrets.jungleRobotPassword = {
     file = ../../secrets/jungle-robot-password.age;
-    group = "mail-robot";
+    group = "gitea";
     mode = "440";
   };
 

m/hut/nginx.nix

@@ -4,8 +4,8 @@ let
     name = "jungle-web";
     src = pkgs.fetchgit {
       url = "https://jungle.bsc.es/git/rarias/jungle-website.git";
-      rev = "52abaf4d71652a9ef77a0b098db14ca33bffff4c";
+      rev = "739bf0175a7f05380fe7ad7023ff1d60db1710e1";
-      hash = "sha256-/ul9GazbOrOkmlvSgDz/+2W+V+ir5725Y7mVLc3rb0M=";
+      hash = "sha256-ea5DzhYTzZ9TmqD+x95rdNdLbxPnBluqlYH2NmBYmc4=";
     };
     buildInputs = [ pkgs.hugo ];
     buildPhase = ''

m/hut/ompss2-timer.nix

@@ -1,85 +0,0 @@
-{ config, pkgs, ... }:
-{
-  systemd.timers = {
-    "ompss2-closing" = {
-      wantedBy = [ "timers.target" ];
-      timerConfig = {
-        Unit = "ompss2-closing.service";
-        OnCalendar = [ "*-03-15 07:00:00" "*-09-15 07:00:00"];
-      };
-    };
-    "ompss2-freeze" = {
-      wantedBy = [ "timers.target" ];
-      timerConfig = {
-        Unit = "ompss2-freeze.service";
-        OnCalendar = [ "*-04-15 07:00:00" "*-10-15 07:00:00" ];
-      };
-    };
-    "ompss2-release" = {
-      wantedBy = [ "timers.target" ];
-      timerConfig = {
-        Unit = "ompss2-release.service";
-        OnCalendar = [ "*-05-15 07:00:00" "*-11-15 07:00:00" ];
-      };
-    };
-  };
-
-  systemd.services =
-  let
-    closing = pkgs.writeText "closing.txt"
-    ''
-      Subject: OmpSs-2 release enters closing period
-
-      Hi,
-
-      You have one month to merge the remaining features for the next OmpSs-2
-      release. Please, identify what needs to be merged and discuss it in the next
-      OmpSs-2 meeting.
-
-      Thanks!,
-      Jungle robot
-    '';
-    freeze = pkgs.writeText "freeze.txt"
-    ''
-      Subject: OmpSs-2 release enters freeze period
-
-      Hi,
-
-      The period to introduce new features or breaking changes is over, only bug
-      fixes are allowed now. During this time, please prepare the release notes
-      to be included in the next OmpSs-2 release.
-
-      Thanks!,
-      Jungle robot
-    '';
-    release = pkgs.writeText "release.txt"
-    ''
-      Subject: OmpSs-2 release now
-
-      Hi,
-
-      The period to introduce bug fixes is now over. Please, proceed to do the
-      OmpSs-2 release.
-
-      Thanks!,
-      Jungle robot
-    '';
-    mkServ = name: mail: {
-      "ompss2-${name}" = {
-        script = ''
-          set -eu
-          set -o pipefail
-          cat ${mail} | ${config.security.wrapperDir}/sendmail star@bsc.es
-        '';
-        serviceConfig = {
-          Type = "oneshot";
-          DynamicUser = true;
-          Group = "mail-robot";
-        };
-      };
-    };
-  in
-    (mkServ "closing" closing) //
-    (mkServ "freeze" freeze) //
-    (mkServ "release" release);
-}

m/module/slurm-common.nix

@@ -86,7 +86,9 @@ in {
       # when a task runs (srun) so we can ssh early.
       PrologFlags=Alloc,Contain,X11
 
-      LaunchParameters=use_interactive_step
+      # LaunchParameters=ulimit_pam_adopt will set RLIMIT_RSS in processes
+      # adopted by the external step, similar to tasks running in regular steps
+      # LaunchParameters=ulimit_pam_adopt
       SlurmdDebug=debug5
       #DebugFlags=Protocol,Cgroup
     '';

m/tent/nginx.nix

@@ -4,8 +4,8 @@ let
     name = "jungle-web";
     src = pkgs.fetchgit {
       url = "https://jungle.bsc.es/git/rarias/jungle-website.git";
-      rev = "52abaf4d71652a9ef77a0b098db14ca33bffff4c";
+      rev = "739bf0175a7f05380fe7ad7023ff1d60db1710e1";
-      hash = "sha256-/ul9GazbOrOkmlvSgDz/+2W+V+ir5725Y7mVLc3rb0M=";
+      hash = "sha256-ea5DzhYTzZ9TmqD+x95rdNdLbxPnBluqlYH2NmBYmc4=";
     };
     buildInputs = [ pkgs.hugo ];
     buildPhase = ''

overlay.nix

@@ -51,7 +51,6 @@ let
     prometheus-slurm-exporter = prev.callPackage ./pkgs/slurm-exporter/default.nix { };
     #pscom = callPackage ./pkgs/parastation/pscom.nix { }; # Unmaintaned
     #psmpi = callPackage ./pkgs/parastation/psmpi.nix { }; # Unmaintaned
-    slurm = import ./pkgs/slurm/default.nix { slurm = prev.slurm; };
     sonar = callPackage ./pkgs/sonar/default.nix { };
     stdenvClangOmpss2 = final.stdenv.override { cc = final.clangOmpss2; allowedRequisites = null; };
     stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; };

pkgs/paraver/default.nix

@@ -1,4 +1,5 @@
-{ stdenv
+{
+  stdenv
 , lib
 , fetchFromGitHub
 , autoreconfHook
@@ -12,17 +13,14 @@
 , openssl
 , glibcLocales
 , wrapGAppsHook
-
-, enableDebug ? false
 }:
 
 let
   wx = wxGTK32;
-  version = "4.12.0";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "wxparaver";
-  inherit version;
+  version = "4.12.0";
 
   src = fetchFromGitHub {
     owner = "bsc-performance-tools";
@@ -39,26 +37,21 @@ stdenv.mkDerivation {
     ./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;
 
-  hardeningDisable = [ "all" ];
+  preConfigure = ''
-
+    export CFLAGS="-O3"
-  dontStrip = true;
+    export CXXFLAGS="-O3"
-
+  '';
-  env =
-    let
-      flags = if enableDebug then "-ggdb -Og" else "-O3";
-    in
-    {
-      CFLAGS = flags;
-      CXXFLAGS = flags;
-    };
 
   configureFlags = [
     "--with-boost=${boost}"
@@ -76,11 +69,11 @@ stdenv.mkDerivation {
 
   buildInputs = [
     boost
-    libxml2
+    libxml2.dev
     xml2
     wx
     paraverKernel
-    openssl
+    openssl.dev
   ];
 
   postInstall = ''

pkgs/paraver/kernel.nix

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