Skip to content

Commit a3950bc

Browse files
committed
reinstallable lib:ghc
1 parent 8ee6fcf commit a3950bc

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

default.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ let
1313
# up much later on hackage; but are not installable
1414
# anyway. Therefore we just strip them out of the
1515
# pkg-def's packages.
16-
boot-pkgs = [ "rts" "ghc" "ghci" "ghc-boot" "ghc-boot-th"
16+
#
17+
# Note: these will need to be provided by alternative
18+
# means outside of hackage.
19+
boot-pkgs = [ "rts" "ghc" "ghc-boot-th" "ghc-boot" "ghci"
1720
"ghc-heap" # since ghc 8.6.
1821
];
1922
strip-pkg-def = pkgs: pkg-def: hackage: with pkgs.lib;

modules/component-driver.nix

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,27 @@ in
2323
type = lib.types.listOf lib.types.str;
2424
};
2525

26+
# Dependencies
27+
#
28+
# .--------. .------------------.
29+
# | pretty | < ------- | template-haskell |
30+
# '--------' '------------------'
31+
# v |
32+
# .---------. .-------. |
33+
# | deepseq | - > | array | |
34+
# '---------' '-------' v
35+
# v v .-------------.
36+
# .----------. .----------. .------. .- | ghc-boot-th |
37+
# | ghc-heap | | ghc-prim | | base |< -' '-------------'
38+
# '----------' '----------' '------' .----------------.
39+
# | v | | | integer-simple |
40+
# | .-----. | '-- > |-------or-------|
41+
# '---- > | rts | < -----' | integer-gmp |
42+
# '-----' '----------------'
43+
2644
config.nonReinstallablePkgs =
27-
[ "rts" "ghc" "ghc-prim" "integer-gmp" "integer-simple" "base"
28-
"array" "deepseq" "pretty" "ghc-boot-th" "template-haskell" "ghc-heap" ];
45+
[ "rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base"
46+
"deepseq" "array" "ghc-boot-th" "pretty" "template-haskell" ];
2947

3048
options.hsPkgs = lib.mkOption {
3149
type = lib.types.unspecified;

0 commit comments

Comments
 (0)