git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix #742 : packages in `additional` in `shellFor` are indeed added and displayed by ghc-pkg list as per documentation specification (#743)
7fec2a1Guillaume Desforges
builder/shell-for.nix+6−5
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -35,11 +35,12 @@ let
35 removeSelectedInputs = lib.filter
35 removeSelectedInputs = lib.filter
36 (input: lib.all (cfg: input != cfg.components.library or null) selected);
36 (input: lib.all (cfg: input != cfg.components.library or null) selected);
37
37
38+ packageInputs =
38− packageInputs = removeSelected
39+ removeSelected
39− (lib.concatMap (cfg: cfg.depends) selectedConfigs
40+ (lib.concatMap (cfg: cfg.depends) selectedConfigs
40− ++ additionalSelected
41− ++ lib.concatMap (cfg: cfg.setup.config.depends or []) selected
41+ ++ lib.concatMap (cfg: cfg.setup.config.depends or []) selected
42− );
42+ )
43+ ++ additionalSelected;
43
44
44 # Add the system libraries and build tools of the selected haskell
45 # Add the system libraries and build tools of the selected haskell
45 # packages to the shell.
46 # packages to the shell.