Fix infinite recursion evaluating lib

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://;

overlay.nix

@@ -1,12 +1,18 @@
 final: /* Future last stage */
 prev:  /* Previous stage */
 
-with final.lib;
-
 let
+
+  inherit (prev) lib;
+  inherit (lib) collect filterAttrs isDerivation mapAttrs;
+
   callPackage = final.callPackage;
 
-  bscPkgs = {
+  mkStrict = drv: if (isDerivation drv && drv ? overrideAttrs && !(drv ? strictDeps))
+    then drv.overrideAttrs { strictDeps = true; }
+    else drv;
+
+  bscPkgs = mapAttrs (_: mkStrict) {
     amd-uprof = prev.callPackage ./pkgs/amd-uprof/default.nix { };
     bench6 = callPackage ./pkgs/bench6/default.nix { };
     bigotes = callPackage ./pkgs/bigotes/default.nix { };