Skip to content

Fix terminfo dep in dummy ghc for haskeline #2360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 15, 2025
Merged

Fix terminfo dep in dummy ghc for haskeline #2360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5366b03
Fix terminfo dep in dummy ghc for haskeline
hamishmack May 14, 2025
7693c14
Also fix Win32:filepath
hamishmack May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/ghc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
'';

passthru = {
inherit bootPkgs targetPrefix libDir llvmPackages enableShared useLLVM hadrian hadrianProject;
inherit bootPkgs targetPrefix libDir llvmPackages enableShared enableTerminfo useLLVM hadrian hadrianProject;

# Our Cabal compiler name
haskellCompilerName = "ghc-${version}";
Expand Down
12 changes: 11 additions & 1 deletion lib/call-cabal-project-to-nix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,17 @@ let
''}
${pkgs.lib.optionalString (!pkgs.stdenv.targetPlatform.isWindows) ''
deps+=" $(jq -r '.components.lib."build-depends"[]|select(._if.not.os == "windows")|._then[]|.package' $json_cabal_file)"
''}
''
# Fix problem with `haskeline` using a `terminfo` flag
# For haskell-nix ghc we can use ghc.enableTerminfo to get the flag setting
+ pkgs.lib.optionalString (name == "haskeline" && !pkgs.stdenv.targetPlatform.isWindows && ghc.enableTerminfo or true) ''
deps+=" terminfo"
''
# Similar issue for Win32:filepath build-depends (hidden behind `if impl(ghc >= 8.0)`)
+ pkgs.lib.optionalString (name == "Win32" && pkgs.stdenv.targetPlatform.isWindows) ''
deps+=" filepath"
''
}
DEPS_${varname name}="$(tr '\n' ' ' <<< "$deps")"
VER_${varname name}="$(jq -r '.version' $json_cabal_file)"
PKGS+=" ${name}"
Expand Down
Loading