git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Rename executable-profiling flag as suggested by Cabal (#1136)
commit0e2ae928e296a68ec16adbed5e7d4f7dca815b14 authorJavier Sagredo <javier.sagredo@iohk.io> dateMon 27 Dec 2021, 08:28 (5 years ago) parent9009a48
4 files changed+8−8
compare with iko/ghcjs-patch-master
unifiedsplit
builder/comp-builder.nix+4−4 modules/plan.nix+2−2 overlays/mingw_w64.nix+1−1 test/cabal-simple-prof/default.nix+1−1
builder/comp-builder.nix+4−4
@@ -61,7 +61,7 @@ let self =
6161
6262# Profiling
6363, enableLibraryProfiling ? component.enableLibraryProfiling
64−, enableExecutableProfiling ? component.enableExecutableProfiling
64+, enableProfiling ? component.enableProfiling
6565, profilingDetail ? component.profilingDetail
6666
6767# Coverage
@@ -129,7 +129,7 @@ let
129129
130130 fullName = "${nameOnly}-${package.identifier.version}";
131131
132− needsProfiling = enableExecutableProfiling || enableLibraryProfiling;
132+ needsProfiling = enableProfiling || enableLibraryProfiling;
133133
134134 configFiles = makeConfigFiles {
135135 component = componentForSetup;
@@ -193,7 +193,7 @@ let
193193 (disableFeature dontStrip "executable-stripping")
194194 (disableFeature dontStrip "library-stripping")
195195 (enableFeature enableLibraryProfiling "library-profiling")
196− (enableFeature enableExecutableProfiling "executable-profiling")
196+ (enableFeature enableProfiling "profiling")
197197 (enableFeature enableStatic "static")
198198 (enableFeature enableShared "shared")
199199 (enableFeature doCoverage "coverage")
@@ -207,7 +207,7 @@ let
207207 "--ghc-option=-optl=-pthread"
208208 "--ghc-option=-optl=-static"
209209 ] ++ lib.optional enableSeparateDataOutput "--datadir=$data/share/${ghc.name}"
210− ++ lib.optional (enableLibraryProfiling || enableExecutableProfiling) "--profiling-detail=${profilingDetail}"
210+ ++ lib.optional (enableLibraryProfiling || enableProfiling) "--profiling-detail=${profilingDetail}"
211211 ++ lib.optional stdenv.hostPlatform.isLinux (enableFeature enableDeadCodeElimination "split-sections")
212212 ++ lib.optionals haskellLib.isCrossHost (
213213 map (arg: "--hsc2hs-option=" + arg) (["--cross-compile"] ++ lib.optionals (stdenv.hostPlatform.isWindows) ["--via-asm"])
modules/plan.nix+2−2
@@ -158,9 +158,9 @@ let
158158 default = (def.enableSeparateDataOutput or false);
159159 };
160160
161− enableExecutableProfiling = mkOption {
161+ enableProfiling = mkOption {
162162 type = bool;
163− default = (def.enableExecutableProfiling or false);
163+ default = (def.enableProfiling or false);
164164 };
165165
166166 profilingDetail = mkOption {
overlays/mingw_w64.nix+1−1
@@ -46,7 +46,7 @@ let
4646 unset configureFlags
4747 PORT=$((5000 + $RANDOM % 5000))
4848 (>&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 &
5050 (>&2 echo "---| remote-iserv should have started on $PORT")
5151 RISERV_PID="$!"
5252 ${iserv-proxy}/bin/iserv-proxy $@ 127.0.0.1 "$PORT"
test/cabal-simple-prof/default.nix+1−1
@@ -9,7 +9,7 @@ let
99 # Package has no exposed modules which causes
1010 # haddock: No input file(s)
1111 packages.cabal-simple.doHaddock = false;
12− packages.cabal-simple.enableExecutableProfiling = true;
12+ packages.cabal-simple.enableProfiling = true;
1313 enableLibraryProfiling = true;
1414 # executableProfiling = false;
1515 }