Fix mpich cross compilation (disable fortran)

Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>

m/common/base.nix

@@ -18,6 +18,5 @@
     ./base/users.nix
     ./base/watchdog.nix
     ./base/zsh.nix
-    ./base/fish.nix
   ];
 }

m/common/base/env.nix

@@ -5,8 +5,6 @@
     vim wget git htop tmux pciutils tcpdump ripgrep nix-index nixos-option
     nix-diff ipmitool freeipmi ethtool lm_sensors cmake gnumake file tree
     ncdu config.boot.kernelPackages.perf ldns pv
-    nix-output-monitor
-    nixfmt-rfc-style
     # From bsckgs overlay
     osumb
   ];

m/common/base/fish.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.fish.enable = true;
-}

m/common/base/users.nix

@@ -87,12 +87,6 @@
         openssh.authorizedKeys.keys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIIFiqXqt88VuUfyANkZyLJNiuroIITaGlOOTMhVDKjf abonerib@bsc"
         ];
-        shell = pkgs.fish;
-        packages = with pkgs; [
-          starship
-          jujutsu
-          neovim
-        ];
       };
 
       vlopez = {

m/weasel/configuration.nix

@@ -1,11 +1,9 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
     ../common/ssf.nix
     ../module/hut-substituter.nix
-    ./virtualization.nix
-    ./hydra.nix
   ];
 
   # Select this using the ID to avoid mismatches
@@ -32,23 +30,4 @@
       prefixLength = 24;
     } ];
   };
-
-  services.nix-serve = {
-    enable = true;
-    bindAddress = "0.0.0.0";
-    port = 5000;
-    package = pkgs.haskell.lib.overrideSrc (pkgs.haskell.packages.ghc96.nix-serve-ng.override { nix = pkgs.nixVersions.nix_2_28; }) {
-      src = pkgs.fetchgit {
-        url = "https://jungle.bsc.es/git/abonerib/nix-serve-ng.git";
-        rev = "9c056641300a826db66b66d7e584b2541d38927a";
-        hash = "sha256-y69ZchFiZOU71eyeljcQgLxkLk5JUzZfanq8Yzw4MkI=";
-      };
-      version = "unstable";
-    };
-
-    secretKeyFile = "/var/cache-priv-key.pem";
-    # Public key:
-    # 10.0.40.6:8jBhIdXEBap+Qo+vc1/fnV9vj43A2oDk839EEheRr/U=
-  };
-
 }

m/weasel/hydra.nix

@@ -1,52 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  services.hydra = {
-    enable = true;
-
-    # Wrap hydra so it puts quiet flag every time... This is dumb and annoying,
-    # but i can't override the systemd ExecStart without running into infinite
-    # recursion.
-    package = pkgs.symlinkJoin {
-      name = "hydra-quiet";
-      paths = [ pkgs.hydra ];
-      postBuild = ''
-        for prog in hydra-queue-runner hydra-evaluator ; do
-          prev=$(realpath $out/bin/$prog)
-          rm $out/bin/$prog
-          cat >$out/bin/$prog <<EOF
-        #!/bin/sh
-        args=()
-        for arg in "\$@"; do
-          if [ "\$arg" != "-v" ]; then
-            args+=("\$arg")
-          fi
-        done
-        exec $prev --quiet "\''${args[@]}"
-        EOF
-
-          chmod +x $out/bin/$prog
-        done
-      '';
-    };
-
-    hydraURL = "http://localhost:3001"; # 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
-  };
-
-  systemd.services.hydra-send-stats.enable = lib.mkForce false;
-
-  networking.firewall.allowedTCPPorts = [ config.services.hydra.port ];
-
-  nix.settings.extra-allowed-uris = [
-    "git+ssh://git@bscpm04.bsc.es"
-    "git+ssh://git@gitlab-internal.bsc.es"
-    "https://github.com"
-    "git+ssh://github.com"
-  ];
-}

m/weasel/virtualization.nix

@@ -1,40 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-
-{
-  # Enable common container config files in /etc/containers
-  virtualisation.containers.enable = true;
-  virtualisation = {
-    podman = {
-      enable = true;
-
-      # Required for containers under podman-compose to be able to talk to each other.
-      defaultNetwork.settings.dns_enabled = true;
-    };
-  };
-
-  # We cannot use /home since nfs does not support fileattrs needed by podman
-  systemd.tmpfiles.settings = {
-    "podman-users" = lib.mapAttrs' (
-      name: value:
-      lib.nameValuePair ("/var/lib/podman-users/" + name) {
-        d = {
-          group = value.group;
-          mode = value.homeMode;
-          user = name;
-        };
-      }
-    ) (lib.filterAttrs (_: x: x.isNormalUser) config.users.users);
-  };
-
-  # Useful other development tools
-  environment.systemPackages = with pkgs; [
-    dive # look into docker image layers
-    podman-tui # status of containers in the terminal
-    podman-compose # start group of containers for dev
-  ];
-}

pkgs/extrae/default.nix

@@ -20,6 +20,7 @@
 #, python3Packages
 , installShellFiles
 , symlinkJoin
+, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
 }:
 
 let
@@ -87,7 +88,7 @@ stdenv.mkDerivation rec {
       --enable-sampling
       --with-unwind=${libunwind.dev}
       --with-xml-prefix=${libxml2.dev}
-      --with-papi=${papi}
+      ${lib.optionalString enablePapi "--with-papi=${papi}"}
       ${if (mpi != null) then ''--with-mpi=${mpi}''
         else ''--without-mpi''}
       --without-dyninst)

pkgs/lmbench/default.nix

@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
       CFLAGS=-Wno-implicit-int
       CPPFLAGS=-I${libtirpc.dev}/include/tirpc
       LDFLAGS=-ltirpc
+      CC=$CC
+      AR=$AR
     )
   '';
 

pkgs/mpich/default.nix

@@ -6,6 +6,12 @@
 , pmix
 , gfortran
 , symlinkJoin
+# Disabled when cross-compiling
+# To fix cross compilation, we should fill the values in:
+# https://github.com/pmodels/mpich/blob/main/maint/fcrosscompile/cross_values.txt.in
+# For each arch
+, enableFortran ? stdenv.hostPlatform == stdenv.buildPlatform
+, perl
 }:
 
 let
@@ -15,10 +21,13 @@ let
     paths = [ pmix.dev pmix.out ];
   };
 in mpich.overrideAttrs (old: {
-  buildInput = old.buildInputs ++ [
+  buildInputs = old.buildInputs ++ [
     libfabric
     pmixAll
   ];
+  nativeBuildInputs = old.nativeBuildInputs ++ [
+    perl
+  ];
   configureFlags = [
     "--enable-shared"
     "--enable-sharedlib"
@@ -31,6 +40,17 @@ in mpich.overrideAttrs (old: {
   ] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [
     "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300
     "FCFLAGS=-fallow-argument-mismatch"
+  ] ++ lib.optionals (!enableFortran) [
+    "--disable-fortran"
   ];
+
+  preFixup = ''
+    # Ensure the default compilers are the ones mpich was built with
+    sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc
+    sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx
+  '' + lib.optionalString enableFortran ''
+    sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort
+  '';
+
   hardeningDisable = [ "all" ];
 })

pkgs/nanos6/default.nix

@@ -16,6 +16,7 @@
 , jemallocNanos6 ? null
 , cachelineBytes ? 64
 , enableGlibcxxDebug ? false
+, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
 , gitBranch ? "master"
@@ -47,6 +48,8 @@ let
   };
 
   source = if (useGit) then git else release;
+
+  isCross = stdenv.hostPlatform != stdenv.buildPlatform;
 in
   stdenv.mkDerivation (source // {
     pname = "nanos6";
@@ -71,9 +74,13 @@ in
       "--disable-all-instrumentations"
       "--enable-ovni-instrumentation"
       "--with-ovni=${ovni}"
+      "--with-boost=${boost.dev}"
     ] ++
       (optional enableJemalloc "--with-jemalloc=${jemallocNanos6}") ++
-      (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
+      (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG") ++
+      # Most nanos6 api symbols are resolved at runtime, so prefer
+      # ifunc by default
+      (optional isCross "--with-symbol-resolution=ifunc");
 
     postConfigure = lib.optionalString (!enableDebug) ''
       # Disable debug
@@ -97,16 +104,14 @@ in
       # TODO: papi_version is needed for configure:
       # ./configure: line 27378: papi_version: command not found
       # This probably breaks cross-compilation
-      papi
-    ];
+    ] ++ lib.optionals enablePapi [ papi ];
 
     buildInputs = [
       boost
       numactl
       hwloc
-      papi
       ovni
-    ];
+    ] ++ lib.optionals enablePapi [ papi ];
 
     # Create a script that sets NANOS6_HOME
     postInstall = ''

pkgs/nosv/default.nix

@@ -7,7 +7,7 @@
 , numactl
 , hwloc
 , papi
-, enablePapi ? true
+, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
 , cacheline ? 64 # bits
 , ovni ? null
 , useGit ? false