Skip to content

Commit c435c91

Browse files
committed
Remove ghc-packages overlay
1 parent f3276d1 commit c435c91

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

flake.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/pkgconf-nixpkgs-map.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2167,7 +2167,6 @@ pkgs:
21672167
"gdkmm-3.0" = [ "gtkmm3" ];
21682168
"gtkmm-3.0" = [ "gtkmm3" ];
21692169
"gtkmm-4.0" = [ "gtkmm4" ];
2170-
"libgtkpod-1.1.0" = [ "gtkpod" ];
21712170
# "gtksourceview-3.0" = [ "gtksourceview" ];
21722171
"gtksourceview-3.0" = [ "gtksourceview3" ];
21732172
"gtksourceview-4" = [ "gtksourceview4" ];

overlays/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ let
110110
bootstrap
111111
compiler-llvm
112112
# ghc
113-
ghc-packages
113+
# ghc-packages
114114
darwin
115115
windows
116116
armv6l-linux

overlays/haskell.nix

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,10 @@ final: prev: {
9191
# "ghc8102-experimental").
9292
excludeBootPackages = compiler-nix-name: pkg-def: hackage:
9393
let original = pkg-def hackage;
94-
bootPkgNames = final.lib.attrNames
95-
final.ghc-boot-packages.${
96-
if compiler-nix-name != null
97-
then compiler-nix-name
98-
else (pkg-def hackage).compiler.nix-name};
94+
bootPkgNames = [ "base" "bytestring" "deepseq" "deriveConstants" "genprimopcode" "ghc"
95+
"ghc-bignum" "ghc-boot" "ghc-heap" "ghc-prim" "ghci" "hpc"
96+
"integer-gmp" "iserv" "parsec" "pretty" "remote-iserv" "template-haskell"
97+
];
9998
in original // {
10099
packages = final.lib.filterAttrs (n: _: final.lib.all (b: n != b) bootPkgNames)
101100
original.packages;
@@ -150,7 +149,7 @@ final: prev: {
150149
if compiler-nix-name != null
151150
then compiler-nix-name
152151
else ((plan-pkgs.extras hackage).compiler or (plan-pkgs.pkgs hackage).compiler).nix-name;
153-
pkg-def = excludeBootPackages compiler-nix-name plan-pkgs.pkgs;
152+
pkg-def = plan-pkgs.pkgs;
154153
patchesModule = ghcHackagePatches.${compiler-nix-name'} or {};
155154
package.compiler-nix-name.version = (compilerSelection final.buildPackages).${compiler-nix-name'}.version;
156155
plan.compiler-nix-name.version = (compilerSelection final.buildPackages).${(plan-pkgs.pkgs hackage).compiler.nix-name}.version;
@@ -169,7 +168,7 @@ final: prev: {
169168
pkg-def-extras = [ plan-pkgs.extras
170169
# Using the -unchecked version here to avoid infinite
171170
# recursion issues when checkMaterialization = true
172-
final.ghc-boot-packages-unchecked.${compiler-nix-name'}
171+
# final.ghc-boot-packages-unchecked.${compiler-nix-name'}
173172
]
174173
++ pkg-def-extras;
175174
# set doExactConfig = true, as we trust cabals resolution for

0 commit comments

Comments
 (0)