Fix GPI-2 and enable TAGASPI

The rdma-core driver.h include is no longer installed:

 56dd87acd2

So ibv_read_sysfs_file() is not defined. As the symbols is still
distributed, we simply add the missing prototype manually.

Similarly, the gaspi_size_t gaspi_get_system_mem() function is not
available from the gaspi public headers, so we define it in the
max_mem.c test.

Fixes: rarias/bscpkgs#7

flake.nix

@@ -2,25 +2,16 @@
   inputs.nixpkgs.url = "nixpkgs";
 
   outputs = { self, nixpkgs, ...}:
-    let
+  let
+    pkgs = import nixpkgs {
       # For now we only support x86
       system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [ self.overlays.default ];
-      };
-    in
+      overlays = [ self.overlays.default ];
+    };
+  in
     {
       bscOverlay = import ./overlay.nix;
       overlays.default = self.bscOverlay;
-      # full nixpkgs with our overlay applied
-      legacyPackages.${system} = pkgs;
-
-      hydraJobs = {
-        inherit (self.legacyPackages.${system}.bsc-ci) test pkgs;
-      };
-
-      # propagate nixpkgs lib, so we can do bscpkgs.lib
-      inherit (nixpkgs) lib;
+      legacyPackages.x86_64-linux = pkgs;
     };
 }

overlay.nix

@@ -1,19 +1,15 @@
 final: /* Future last stage */
 prev:  /* Previous stage */
 
-let
-  inherit (prev.lib) collect isDerivation mapAttrs;
+with final.lib;
 
-  inherit (final) callPackage;
+let
+  callPackage = final.callPackage;
 
   mkDeps = name: pkgs: final.runCommand name { }
     "printf '%s\n' ${toString (collect (x: x ? outPath) pkgs)} > $out";
 
-  mkStrict = drv: if (isDerivation drv && drv ? overrideAttrs && !(drv ? strictDeps))
-    then drv.overrideAttrs { strictDeps = true; }
-    else drv;
-
-  bscPkgs = mapAttrs (_: mkStrict) {
+  bscPkgs = {
     bench6 = callPackage ./pkgs/bench6/default.nix { };
     bigotes = callPackage ./pkgs/bigotes/default.nix { };
     clangOmpss2 = callPackage ./pkgs/llvm-ompss2/default.nix { };
@@ -92,9 +88,7 @@ in bscPkgs // {
       };
     };
 
-    pkgs = filterAttrs (_: isDerivation) bscPkgs;
-
-    pkgsList = final.runCommand "ci-pkgs" { }
+    pkgs = final.runCommand "ci-pkgs" { }
       "printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";
 
     tests = final.runCommand "ci-tests" { }
@@ -102,7 +96,7 @@ in bscPkgs // {
 
     all = final.runCommand "ci-all" { }
     ''
-      deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}"
+      deps="${toString [ final.bsc-ci.pkgs final.bsc-ci.tests ]}"
       cat $deps
       printf '%s\n' $deps > $out
     '';