From 43a1b25c2338a8c7a2cd44501e1158fc69accf31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 23 Jul 2025 10:43:33 +0200 Subject: [PATCH 1/2] Set strictDeps=true on our top level packages --- overlay.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/overlay.nix b/overlay.nix index 6d2af14b..df21edfa 100644 --- a/overlay.nix +++ b/overlay.nix @@ -6,7 +6,11 @@ with final.lib; let 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 { }; -- 2.49.0 From 7e7b5c59bf6fbdc12a48cc6c1215bdff98471f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Tue, 7 Oct 2025 17:27:28 +0200 Subject: [PATCH 2/2] Fix infinite recursion evaluating lib --- overlay.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/overlay.nix b/overlay.nix index df21edfa..e889d0e7 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,9 +1,11 @@ final: /* Future last stage */ prev: /* Previous stage */ -with final.lib; - let + + inherit (prev) lib; + inherit (lib) collect filterAttrs isDerivation mapAttrs; + callPackage = final.callPackage; mkStrict = drv: if (isDerivation drv && drv ? overrideAttrs && !(drv ? strictDeps)) -- 2.49.0