Force hydra to use IPv4 only

m/hut/configuration.nix

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

m/hut/hydra.nix

@@ -0,0 +1,15 @@
+{ ... }:
+{
+  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,6 +48,17 @@ 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/extrae/default.nix

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

pkgs/lmbench/default.nix

@@ -22,11 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ libtirpc ];
-  patches = [
-    ./fix-install.patch
-    ./gcc-14.patch
-    ./fix-cross.patch
-  ];
+  patches = [ ./fix-install.patch ./gcc-14.patch ];
 
   hardeningDisable = [ "all" ];
 
@@ -39,8 +35,6 @@ stdenv.mkDerivation rec {
       CFLAGS=-Wno-implicit-int
       CPPFLAGS=-I${libtirpc.dev}/include/tirpc
       LDFLAGS=-ltirpc
-      CC=${stdenv.cc.targetPrefix}cc
-      AR=${stdenv.cc.targetPrefix}ar
     )
   '';
 

pkgs/lmbench/fix-cross.patch

@@ -1,13 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 2555014..356eeb3 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -36,7 +36,7 @@ SHELL=/bin/sh
- 
- CC=`../scripts/compiler`
- MAKE=`../scripts/make`
--AR=ar
-+AR?=ar
- ARCREATE=cr
- 
- # base of installation location

pkgs/nanos6/default.nix

@@ -16,7 +16,6 @@
 , 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"
@@ -48,8 +47,6 @@ let
   };
 
   source = if (useGit) then git else release;
-
-  isCross = stdenv.hostPlatform != stdenv.buildPlatform;
 in
   stdenv.mkDerivation (source // {
     pname = "nanos6";
@@ -74,11 +71,9 @@ 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 isCross "--with-symbol-resolution=ifunc");
+      (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
 
     postConfigure = lib.optionalString (!enableDebug) ''
       # Disable debug
@@ -102,14 +97,16 @@ in
       # TODO: papi_version is needed for configure:
       # ./configure: line 27378: papi_version: command not found
       # This probably breaks cross-compilation
-    ] ++ lib.optionals enablePapi [ papi ];
+      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 ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
+, enablePapi ? true
 , cacheline ? 64 # bits
 , ovni ? null
 , useGit ? false