git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Add hooks to all components (#158)
26c5b7bRupert Horlick
builder/comp-builder.nix+6−6
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -12,12 +12,12 @@
12, cabal-generator
12, cabal-generator
13, patches ? []
13, patches ? []
14
14
15−, preUnpack ? null, postUnpack ? null
15+, preUnpack ? component.preUnpack, postUnpack ? component.postUnpack
16−, preConfigure ? null, postConfigure ? null
16+, preConfigure ? component.preConfigure, postConfigure ? component.postConfigure
17−, preBuild ? null, postBuild ? null
17+, preBuild ? component.preBuild , postBuild ? component.postBuild
18−, preCheck ? null, postCheck ? null
18+, preCheck ? component.preCheck , postCheck ? component.postCheck
19−, preInstall ? null, postInstall ? null
19+, preInstall ? component.preInstall , postInstall ? component.postInstall
20−, preHaddock ? null, postHaddock ? null
20+, preHaddock ? component.preHaddock , postHaddock ? component.postHaddock
21, shellHook ? ""
21, shellHook ? ""
22
22
23, doCheck ? component.doCheck || haskellLib.isTest componentId
23, doCheck ? component.doCheck || haskellLib.isTest componentId
builder/hspkg-builder.nix−16
@@ -13,19 +13,6 @@
13, revisionSha256
13, revisionSha256
14, patches
14, patches
15
15
16−, preUnpack
17−, postUnpack
18−, preConfigure
19−, postConfigure
20−, preBuild
21−, postBuild
22−, preCheck
23−, postCheck
24−, preInstall
25−, postInstall
26−, preHaddock
27−, postHaddock
28−
29, shellHook
16, shellHook
30
17
31, ...
18, ...
@@ -75,9 +62,6 @@ let
75
62
76 buildComp = componentId: component: comp-builder {
63 buildComp = componentId: component: comp-builder {
77 inherit componentId component package name src flags setup cabalFile cabal-generator patches revision
64 inherit componentId component package name src flags setup cabalFile cabal-generator patches revision
78− preUnpack postUnpack preConfigure postConfigure
79− preBuild postBuild preCheck postCheck
80− preInstall postInstall preHaddock postHaddock
81 shellHook
65 shellHook
82 ;
66 ;
83 };
67 };
modules/package.nix+1−1
@@ -87,7 +87,7 @@ with types;
87 components = let
87 components = let
88 componentType = submodule {
88 componentType = submodule {
89 # add the shared componentOptions
89 # add the shared componentOptions
90− options = (componentOptions config) // {
90+ options = (packageOptions config) // {
91 depends = mkOption {
91 depends = mkOption {
92 type = listOfFilteringNulls unspecified;
92 type = listOfFilteringNulls unspecified;
93 default = [];
93 default = [];