git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Add hooks to all components (#158)
commit26c5b7be766b00811738cae1be07d2879841ce18 authorRupert Horlick <rupert.horlick@iohk.io> dateSun 2 Jun 2019, 14:13 (7 years ago) parent7e894f3
3 files changed+7−23
compare with iko/ghcjs-patch-master
unifiedsplit
builder/comp-builder.nix+6−6 builder/hspkg-builder.nix−16 modules/package.nix+1−1
builder/comp-builder.nix+6−6
@@ -12,12 +12,12 @@
1212, cabal-generator
1313, patches ? []
1414
15−, preUnpack ? null, postUnpack ? null
16−, preConfigure ? null, postConfigure ? null
17−, preBuild ? null, postBuild ? null
18−, preCheck ? null, postCheck ? null
19−, preInstall ? null, postInstall ? null
20−, preHaddock ? null, postHaddock ? null
15+, preUnpack ? component.preUnpack, postUnpack ? component.postUnpack
16+, preConfigure ? component.preConfigure, postConfigure ? component.postConfigure
17+, preBuild ? component.preBuild , postBuild ? component.postBuild
18+, preCheck ? component.preCheck , postCheck ? component.postCheck
19+, preInstall ? component.preInstall , postInstall ? component.postInstall
20+, preHaddock ? component.preHaddock , postHaddock ? component.postHaddock
2121, shellHook ? ""
2222
2323, doCheck ? component.doCheck || haskellLib.isTest componentId
builder/hspkg-builder.nix−16
@@ -13,19 +13,6 @@
1313, revisionSha256
1414, patches
1515
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−
2916, shellHook
3017
3118, ...
@@ -75,9 +62,6 @@ let
7562
7663 buildComp = componentId: component: comp-builder {
7764 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
8165 shellHook
8266 ;
8367 };
modules/package.nix+1−1
@@ -87,7 +87,7 @@ with types;
8787 components = let
8888 componentType = submodule {
8989 # add the shared componentOptions
90− options = (componentOptions config) // {
90+ options = (packageOptions config) // {
9191 depends = mkOption {
9292 type = listOfFilteringNulls unspecified;
9393 default = [];