28a9c6f · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Drop def-pkg-overlay

28a9c6fMoritz Angermann8 years ago

default.nix+1−1

@@ -4,5 +4,5 @@ hackage: let haskell = {

4 # The *new* pkg set is one that build components.

5 # This also uses the module system for much greater extensibility.

6 # 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; });

8}; in haskell

new-package-set.nix+3−13

@@ -1,5 +1,5 @@

1−let f = { hackage, pkgs, pkg-def, pkg-def-overlays ? [], modules ? [] }: let

1+let f = { hackage, pkgs, pkg-def, modules ? [] }: let

2− buildModules = f { inherit hackage pkg-def pkg-def-overlays modules; pkgs = pkgs.buildPackages; };

2+ buildModules = f { inherit hackage pkg-def modules; pkgs = pkgs.buildPackages; };

3in pkgs.lib.evalModules {

4 modules = modules ++ [

5 ({ lib, ... }: {

@@ -22,17 +22,7 @@ in pkgs.lib.evalModules {

22 hackage.db = hackage;

24 # Set the plan for modules/plan.nix

25− plan.pkg-def = hackage: with builtins;

25+ plan.pkg-def = pkg-def;

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−

36 })

26 })

38 # Supplies metadata

28 # Supplies metadata