git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Drop def-pkg-overlay
commit28a9c6f3528daa57d506d134e137fb617a947985 authorMoritz Angermann <moritz.angermann@gmail.com> dateFri 9 Nov 2018, 16:02 (8 years ago) parent9e804c6
2 files changed+4−14
compare with iko/ghcjs-patch-master
unifiedsplit
default.nix+1−1 new-package-set.nix+3−13
default.nix+1−1
@@ -4,5 +4,5 @@ hackage: let haskell = {
44 # The *new* pkg set is one that build components.
55 # This also uses the module system for much greater extensibility.
66 # To make extend and override things, pass a modules argument to new-package-set.nix
7− mkNewPkgSet = { pkgs, pkg-def, pkg-def-overlays ? [], modules ? [] }@args: import ./new-package-set.nix (args // { inherit hackage; });
7+ mkNewPkgSet = { pkgs, pkg-def, modules ? [] }@args: import ./new-package-set.nix (args // { inherit hackage; });
88}; in haskell
new-package-set.nix+3−13
@@ -1,5 +1,5 @@
1−let f = { hackage, pkgs, pkg-def, pkg-def-overlays ? [], modules ? [] }: let
2− buildModules = f { inherit hackage pkg-def pkg-def-overlays modules; pkgs = pkgs.buildPackages; };
1+let f = { hackage, pkgs, pkg-def, modules ? [] }: let
2+ buildModules = f { inherit hackage pkg-def modules; pkgs = pkgs.buildPackages; };
33in pkgs.lib.evalModules {
44 modules = modules ++ [
55 ({ lib, ... }: {
@@ -22,17 +22,7 @@ in pkgs.lib.evalModules {
2222 hackage.db = hackage;
2323
2424 # Set the plan for modules/plan.nix
25− plan.pkg-def = hackage: with builtins;
26− # fold any potential `pkg-def-overlays`
27− # onto the `pkg-def`.
28− #
29− # This means you can have a base definition (e.g. stackage)
30− # and augment it with custom packages to your liking.
31− foldl' lib.recursiveUpdate
32− (pkg-def hackage)
33− (map (p: p hackage) pkg-def-overlays)
34− ;
35−
25+ plan.pkg-def = pkg-def;
3626 })
3727
3828 # Supplies metadata