From c16dbf2230873e2d30cf73de95569f1fd4c89c38 Mon Sep 17 00:00:00 2001 From: Torsten Schmits Date: Tue, 29 Sep 2026 02:19:38 +0200 Subject: [PATCH] cli: Drop trailing slashes on ghci search paths GHC fails to find modules otherwise in 9.14 --- packages/hix/lib/Hix/Ghci.hs | 2 +- packages/hix/test/Hix/Test/GhciTest.hs | 2 +- test/internal/hackage.nix | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/hix/lib/Hix/Ghci.hs b/packages/hix/lib/Hix/Ghci.hs index 4295db06..31a168b6 100644 --- a/packages/hix/lib/Hix/Ghci.hs +++ b/packages/hix/lib/Hix/Ghci.hs @@ -190,7 +190,7 @@ searchPathArg :: NonEmpty (Path Abs Dir) -> Text searchPathArg paths = [exon|-i#{colonSeparated}|] where - colonSeparated = Text.intercalate ":" (pathText <$> toList paths) + colonSeparated = Text.intercalate ":" (Text.dropWhileEnd (== '/') . pathText <$> toList paths) ghciCmdline :: GhciTest -> diff --git a/packages/hix/test/Hix/Test/GhciTest.hs b/packages/hix/test/Hix/Test/GhciTest.hs index fd11289c..a99e7ee7 100644 --- a/packages/hix/test/Hix/Test/GhciTest.hs +++ b/packages/hix/test/Hix/Test/GhciTest.hs @@ -147,7 +147,7 @@ options = searchPath :: Text -> [Text] -> Text searchPath dir subs = - Text.intercalate ":" [[exon|#{dir}packages/#{sub}/|] | sub <- subs] + Text.intercalate ":" [[exon|#{dir}packages/#{sub}|] | sub <- subs] ghcidTarget :: Path Abs Dir -> diff --git a/test/internal/hackage.nix b/test/internal/hackage.nix index aed02fda..8a0014e0 100644 --- a/test/internal/hackage.nix +++ b/test/internal/hackage.nix @@ -14,6 +14,10 @@ in { describe 'Build the integration executable' step nix build path:$hix_dir#env.integration-exe.integration + describe 'Run the integration executable with --help' + output_ignore + step nix run path:$hix_dir#integration-hackage -- --help + output_ignore error_ignore step_develop which cabal