git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Drop the overlay stuff
40351aaMoritz Angermann
modules/plan.nix+1−5
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -40,10 +40,6 @@ with types;
40 };
40 };
41 };
41 };
42
42
43− overlay = mkOption {
44− type = unspecified; # Ignored. TODO: Remove and use the module system instead
45− };
46−
47 plan.pkg-def = mkOption {
43 plan.pkg-def = mkOption {
48 type = unspecified;
44 type = unspecified;
49 visible = false;
45 visible = false;
@@ -52,7 +48,7 @@ with types;
52 };
48 };
53
49
54 config = let module = config.plan.pkg-def config.hackage.configs; in {
50 config = let module = config.plan.pkg-def config.hackage.configs; in {
55− inherit (module) compiler overlay;
51+ inherit (module) compiler;
56 packages = lib.mapAttrs (name: { revision, ... }@revArgs: { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }@modArgs:
52 packages = lib.mapAttrs (name: { revision, ... }@revArgs: { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }@modArgs:
57
53
58 let m = if revision == null
54 let m = if revision == null