git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Rename executable-profiling flag as suggested by Cabal (#1136)
0e2ae92Javier Sagredo
builder/comp-builder.nix+4−4
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -61,7 +61,7 @@ let self =
61
61
62# Profiling
62# Profiling
63, enableLibraryProfiling ? component.enableLibraryProfiling
63, enableLibraryProfiling ? component.enableLibraryProfiling
64−, enableExecutableProfiling ? component.enableExecutableProfiling
64+, enableProfiling ? component.enableProfiling
65, profilingDetail ? component.profilingDetail
65, profilingDetail ? component.profilingDetail
66
66
67# Coverage
67# Coverage
@@ -129,7 +129,7 @@ let
129
129
130 fullName = "${nameOnly}-${package.identifier.version}";
130 fullName = "${nameOnly}-${package.identifier.version}";
131
131
132− needsProfiling = enableExecutableProfiling || enableLibraryProfiling;
132+ needsProfiling = enableProfiling || enableLibraryProfiling;
133
133
134 configFiles = makeConfigFiles {
134 configFiles = makeConfigFiles {
135 component = componentForSetup;
135 component = componentForSetup;
@@ -193,7 +193,7 @@ let
193 (disableFeature dontStrip "executable-stripping")
193 (disableFeature dontStrip "executable-stripping")
194 (disableFeature dontStrip "library-stripping")
194 (disableFeature dontStrip "library-stripping")
195 (enableFeature enableLibraryProfiling "library-profiling")
195 (enableFeature enableLibraryProfiling "library-profiling")
196− (enableFeature enableExecutableProfiling "executable-profiling")
196+ (enableFeature enableProfiling "profiling")
197 (enableFeature enableStatic "static")
197 (enableFeature enableStatic "static")
198 (enableFeature enableShared "shared")
198 (enableFeature enableShared "shared")
199 (enableFeature doCoverage "coverage")
199 (enableFeature doCoverage "coverage")
@@ -207,7 +207,7 @@ let
207 "--ghc-option=-optl=-pthread"
207 "--ghc-option=-optl=-pthread"
208 "--ghc-option=-optl=-static"
208 "--ghc-option=-optl=-static"
209 ] ++ lib.optional enableSeparateDataOutput "--datadir=$data/share/${ghc.name}"
209 ] ++ lib.optional enableSeparateDataOutput "--datadir=$data/share/${ghc.name}"
210− ++ lib.optional (enableLibraryProfiling || enableExecutableProfiling) "--profiling-detail=${profilingDetail}"
210+ ++ lib.optional (enableLibraryProfiling || enableProfiling) "--profiling-detail=${profilingDetail}"
211 ++ lib.optional stdenv.hostPlatform.isLinux (enableFeature enableDeadCodeElimination "split-sections")
211 ++ lib.optional stdenv.hostPlatform.isLinux (enableFeature enableDeadCodeElimination "split-sections")
212 ++ lib.optionals haskellLib.isCrossHost (
212 ++ lib.optionals haskellLib.isCrossHost (
213 map (arg: "--hsc2hs-option=" + arg) (["--cross-compile"] ++ lib.optionals (stdenv.hostPlatform.isWindows) ["--via-asm"])
213 map (arg: "--hsc2hs-option=" + arg) (["--cross-compile"] ++ lib.optionals (stdenv.hostPlatform.isWindows) ["--via-asm"])
modules/plan.nix+2−2
@@ -158,9 +158,9 @@ let
158 default = (def.enableSeparateDataOutput or false);
158 default = (def.enableSeparateDataOutput or false);
159 };
159 };
160
160
161− enableExecutableProfiling = mkOption {
161+ enableProfiling = mkOption {
162 type = bool;
162 type = bool;
163− default = (def.enableExecutableProfiling or false);
163+ default = (def.enableProfiling or false);
164 };
164 };
165
165
166 profilingDetail = mkOption {
166 profilingDetail = mkOption {
overlays/mingw_w64.nix+1−1
@@ -46,7 +46,7 @@ let
46 unset configureFlags
46 unset configureFlags
47 PORT=$((5000 + $RANDOM % 5000))
47 PORT=$((5000 + $RANDOM % 5000))
48 (>&2 echo "---> Starting remote-iserv on port $PORT")
48 (>&2 echo "---> Starting remote-iserv on port $PORT")
49− WINEDLLOVERRIDES="winemac.drv=d" WINEDEBUG=warn-all,fixme-all,-menubuilder,-mscoree,-ole,-secur32,-winediag WINEPREFIX=$TMP ${wine}/bin/wine64 ${remote-iserv.override { enableExecutableProfiling = true; }}/bin/remote-iserv.exe tmp $PORT &
49+ WINEDLLOVERRIDES="winemac.drv=d" WINEDEBUG=warn-all,fixme-all,-menubuilder,-mscoree,-ole,-secur32,-winediag WINEPREFIX=$TMP ${wine}/bin/wine64 ${remote-iserv.override { enableProfiling = true; }}/bin/remote-iserv.exe tmp $PORT &
50 (>&2 echo "---| remote-iserv should have started on $PORT")
50 (>&2 echo "---| remote-iserv should have started on $PORT")
51 RISERV_PID="$!"
51 RISERV_PID="$!"
52 ${iserv-proxy}/bin/iserv-proxy $@ 127.0.0.1 "$PORT"
52 ${iserv-proxy}/bin/iserv-proxy $@ 127.0.0.1 "$PORT"
test/cabal-simple-prof/default.nix+1−1
@@ -9,7 +9,7 @@ let
9 # Package has no exposed modules which causes
9 # Package has no exposed modules which causes
10 # haddock: No input file(s)
10 # haddock: No input file(s)
11 packages.cabal-simple.doHaddock = false;
11 packages.cabal-simple.doHaddock = false;
12− packages.cabal-simple.enableExecutableProfiling = true;
12+ packages.cabal-simple.enableProfiling = true;
13 enableLibraryProfiling = true;
13 enableLibraryProfiling = true;
14 # executableProfiling = false;
14 # executableProfiling = false;
15 }
15 }