Skip to content

Commit dd6432a

Browse files
authored
Merge pull request #182873 from sternenseemann/terminfo-cross
haskellPackages.terminfo: not a core pkg if cross compiling
2 parents 0620844 + f39aee2 commit dd6432a

7 files changed

+14
-6
lines changed

pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ self: super: {
3838
rts = null;
3939
stm = null;
4040
template-haskell = null;
41-
terminfo = null;
41+
# GHC only builds terminfo if it is a native compiler
42+
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
4243
text = null;
4344
time = null;
4445
transformers = null;

pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ self: super: {
3737
rts = null;
3838
stm = null;
3939
template-haskell = null;
40-
terminfo = null;
40+
# GHC only builds terminfo if it is a native compiler
41+
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
4142
text = null;
4243
time = null;
4344
transformers = null;

pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ self: super: {
3737
rts = null;
3838
stm = null;
3939
template-haskell = null;
40-
terminfo = null;
40+
# GHC only builds terminfo if it is a native compiler
41+
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
4142
text = null;
4243
time = null;
4344
transformers = null;

pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ self: super: {
3939
rts = null;
4040
stm = null;
4141
template-haskell = null;
42-
terminfo = null;
42+
# GHC only builds terminfo if it is a native compiler
43+
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
4344
text = null;
4445
time = null;
4546
transformers = null;

pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ self: super: {
3939
rts = null;
4040
stm = null;
4141
template-haskell = null;
42-
terminfo = null;
42+
# GHC only builds terminfo if it is a native compiler
43+
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
4344
text = null;
4445
time = null;
4546
transformers = null;

pkgs/development/haskell-modules/configuration-ghc-head.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ self: super: {
4747
rts = null;
4848
stm = null;
4949
template-haskell = null;
50-
terminfo = null;
50+
# GHC only builds terminfo if it is a native compiler
51+
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
5152
text = null;
5253
time = null;
5354
transformers = null;

pkgs/top-level/release-haskell.nix

+2
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ let
326326
random
327327
QuickCheck
328328
cabal2nix
329+
terminfo # isn't bundled for cross
329330
xhtml # isn't bundled for cross
330331
;
331332
};
@@ -337,6 +338,7 @@ let
337338
random
338339
QuickCheck
339340
cabal2nix
341+
terminfo # isn't bundled for cross
340342
xhtml # isn't bundled for cross
341343
;
342344
};

0 commit comments

Comments
 (0)