From 3fc7faf14bbae9239714044aa8886252b0f9b206 Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Sat, 22 Feb 2025 10:59:29 -0700 Subject: [PATCH] Remove Bash strict mode from cabalProject2nix There is at least one unbound variable in callCabal2Nix that causes strict mode to fail on downsteam repos. --- nix/lib.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nix/lib.nix b/nix/lib.nix index 00a0877..ec82e31 100644 --- a/nix/lib.nix +++ b/nix/lib.nix @@ -109,9 +109,11 @@ in { cabalProject2nix = cabalProject: pkgs: hpkgs: overrides: builtins.mapAttrs (name: path: - pkgs.checkedDrv - ((hpkgs.callCabal2nix name "${builtins.dirOf cabalProject}/${path}" {}) - .overrideAttrs - overrides)) + ## FIXME: This is failing on some downstream packages when we use + ## `checkedDrv` (which adds `-u`, among other things). + pkgs.shellchecked + ((hpkgs.callCabal2nix name "${builtins.dirOf cabalProject}/${path}" {}) + .overrideAttrs + overrides)) (parseCabalProject cabalProject); }