Skip to content

Commit f344fb2

Browse files
iohk-bors[bot]iohk-bors[bot]
authored
Try #1605:
2 parents 5545098 + c744c1e commit f344fb2

18 files changed

+309
-231
lines changed

‎builder/comp-builder.nix

+19-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs, stdenv, buildPackages, ghc, lib, gobject-introspection ? null, haskellLib, makeConfigFiles, haddockBuilder, ghcForComponent, hsPkgs, compiler, runCommand, libffi, gmp, zlib, ncurses, nodejs }@defaults:
1+
{ pkgs, stdenv, buildPackages, ghc, lib, gobject-introspection ? null, haskellLib, makeConfigFiles, haddockBuilder, ghcForComponent, hsPkgs, compiler, runCommand, libffi, gmp, zlib, ncurses, nodejs, nonReinstallablePkgs }@defaults:
22
lib.makeOverridable (
33
let self =
44
{ componentId
@@ -162,7 +162,7 @@ let
162162
if configureAllComponents
163163
then ["--enable-tests" "--enable-benchmarks"]
164164
else ["${haskellLib.componentTarget componentId}"]
165-
) ++ [ "$(cat ${configFiles}/configure-flags)"
165+
) ++ [ "$(cat $configFiles/configure-flags)"
166166
] ++ commonConfigureFlags);
167167

168168
# From nixpkgs 20.09, the pkg-config exe has a prefix matching the ghc one
@@ -337,9 +337,9 @@ let
337337
config = component;
338338
srcSubDir = cleanSrc.subDir;
339339
srcSubDirPath = cleanSrc.root + cleanSrc.subDir;
340-
inherit configFiles executableToolDepends exeName enableDWARF;
340+
inherit executableToolDepends exeName enableDWARF;
341341
exePath = drv + "/bin/${exeName}";
342-
env = shellWrappers;
342+
env = shellWrappers.drv;
343343
profiled = self (drvArgs // { enableLibraryProfiling = true; });
344344
dwarf = self (drvArgs // { enableDWARF = true; });
345345
} // lib.optionalAttrs (haskellLib.isLibrary componentId) ({
@@ -371,19 +371,18 @@ let
371371
# Not sure why pkgconfig needs to be propagatedBuildInputs but
372372
# for gi-gtk-hs it seems to help.
373373
++ builtins.concatLists pkgconfig
374+
++ configFiles.libDeps
374375
++ lib.optionals (stdenv.hostPlatform.isWindows)
375-
(lib.flatten component.libs
376-
++ map haskellLib.dependToLib component.depends);
376+
(lib.flatten component.libs);
377377

378378
buildInputs = lib.optionals (!stdenv.hostPlatform.isWindows)
379-
(lib.flatten component.libs
380-
++ map haskellLib.dependToLib component.depends);
379+
(lib.flatten component.libs);
381380

382381
nativeBuildInputs =
383-
[shellWrappers buildPackages.removeReferencesTo]
382+
[ghc buildPackages.removeReferencesTo]
384383
++ executableToolDepends;
385384

386-
outputs = ["out" ]
385+
outputs = ["out" "configFiles" "ghc"]
387386
++ (lib.optional enableSeparateDataOutput "data")
388387
++ (lib.optional keepSource "source")
389388
++ (lib.optional writeHieFiles "hie");
@@ -403,6 +402,13 @@ let
403402
'') + commonAttrs.prePatch;
404403

405404
configurePhase = ''
405+
mkdir -p $configFiles
406+
mkdir -p $ghc
407+
wrappedGhc=$ghc
408+
${configFiles.script}
409+
${shellWrappers.script}
410+
PATH=$wrappedGhc/bin:$PATH
411+
406412
runHook preConfigure
407413
echo Configure flags:
408414
printf "%q " ${finalConfigureFlags}
@@ -462,7 +468,7 @@ let
462468
${lib.optionalString (haskellLib.isLibrary componentId) ''
463469
$SETUP_HS register --gen-pkg-config=${name}.conf
464470
${ghc.targetPrefix}ghc-pkg -v0 init $out/package.conf.d
465-
${ghc.targetPrefix}ghc-pkg -v0 --package-db ${configFiles}/${configFiles.packageCfgDir} -f $out/package.conf.d register ${name}.conf
471+
${ghc.targetPrefix}ghc-pkg -v0 --package-db $configFiles/${configFiles.packageCfgDir} -f $out/package.conf.d register ${name}.conf
466472
467473
mkdir -p $out/exactDep
468474
touch $out/exactDep/configure-flags
@@ -494,6 +500,7 @@ let
494500
if id=$(${target-pkg-and-db} field "z-${package.identifier.name}-z-*" id --simple-output); then
495501
name=$(${target-pkg-and-db} field "z-${package.identifier.name}-z-*" name --simple-output)
496502
echo "--dependency=''${name#z-${package.identifier.name}-z-}=$id" >> $out/exactDep/configure-flags
503+
echo "package-id $id" >> $out/envDep
497504
''
498505
# Allow `package-name:sublib-name` to work in `build-depends`
499506
# by adding the same `--dependency` again, but with the package
@@ -579,7 +586,7 @@ let
579586
'';
580587

581588
shellHook = ''
582-
export PATH="${shellWrappers}/bin:$PATH"
589+
export PATH=$ghc/bin:$PATH
583590
${shellHookApplied}
584591
'';
585592
}

‎builder/default.nix

+9-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
let
44
# Builds a single component of a package.
55
comp-builder = haskellLib.weakCallPackage pkgs ./comp-builder.nix {
6-
inherit ghc haskellLib makeConfigFiles haddockBuilder ghcForComponent hsPkgs compiler;
6+
inherit ghc haskellLib makeConfigFiles haddockBuilder ghcForComponent hsPkgs compiler nonReinstallablePkgs;
77
};
88

99
haddockBuilder = haskellLib.weakCallPackage pkgs ./haddock-builder.nix {
@@ -44,7 +44,11 @@ let
4444

4545

4646
hoogleLocal = let
47-
nixpkgsHoogle = import (pkgs.path + /pkgs/development/haskell-modules/hoogle.nix);
47+
# Use hoogle.nix from at least nixpkgs 22.05
48+
nixpkgs = if lib.versionAtLeast lib.trivial.release "22.05"
49+
then pkgs.path
50+
else pkgs.haskell-nix.sources.nixpkgs-2205;
51+
nixpkgsHoogle = import (nixpkgs + /pkgs/development/haskell-modules/hoogle.nix);
4852
in { packages ? [], hoogle ? pkgs.buildPackages.haskell-nix.tool "ghc8107" "hoogle" {
4953
inherit evalPackages;
5054
version = "5.0.18.3";
@@ -59,11 +63,9 @@ let
5963
else ghc;
6064
inherit packages hoogle;
6165
};
62-
in if lib.versionAtLeast lib.trivial.release "22.05"
63-
then haskellLib.weakCallPackage pkgs nixpkgsHoogle {
64-
inherit haskellPackages;
65-
} (p: p.packages)
66-
else haskellLib.weakCallPackage pkgs nixpkgsHoogle haskellPackages;
66+
in haskellLib.weakCallPackage pkgs nixpkgsHoogle {
67+
inherit haskellPackages;
68+
} (p: p.packages);
6769

6870
# Same as haskellPackages.shellFor in nixpkgs.
6971
shellFor = haskellLib.weakCallPackage pkgs ./shell-for.nix {

‎builder/ghc-for-component-wrapper.nix

+40-29
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,21 @@ let
2020
ghc = if enableDWARF then defaults.ghc.dwarf else defaults.ghc;
2121

2222
inherit (configFiles) targetPrefix ghcCommand ghcCommandCaps packageCfgDir;
23-
libDir = "$out/${configFiles.libDir}";
24-
docDir = "$out/share/doc/ghc/html";
23+
libDir = "$wrappedGhc/${configFiles.libDir}";
24+
docDir = "$wrappedGhc/share/doc/ghc/html";
2525
# For musl we can use haddock from the buildGHC
2626
haddock = if stdenv.hostPlatform.isLinux && stdenv.targetPlatform.isMusl && !haskellLib.isNativeMusl
2727
then ghc.buildGHC
2828
else ghc;
2929

30-
in runCommand "${componentName}-${ghc.name}-env" {
31-
preferLocalBuild = true;
32-
passthru = {
33-
inherit (ghc) version meta;
34-
inherit targetPrefix;
35-
baseGhc = ghc;
36-
};
37-
} (
38-
''
30+
script = ''
3931
. ${makeWrapper}/nix-support/setup-hook
4032
4133
''
4234
# Start with a ghc and remove all of the package directories
4335
+ ''
44-
mkdir -p $out/bin
45-
${lndir}/bin/lndir -silent ${ghc} $out
36+
mkdir -p $wrappedGhc/bin
37+
${lndir}/bin/lndir -silent ${ghc} $wrappedGhc
4638
rm -rf ${libDir}/*/
4739
''
4840
# ... but retain the lib/ghc/bin directory. This contains `unlit' and friends.
@@ -63,7 +55,7 @@ in runCommand "${componentName}-${ghc.name}-env" {
6355
''
6456
# Replace the package database with the one from target package config.
6557
+ ''
66-
ln -s ${configFiles}/${packageCfgDir} $out/${packageCfgDir}
58+
ln -s $configFiles/${packageCfgDir} $wrappedGhc/${packageCfgDir}
6759
6860
''
6961
# Set the GHC_PLUGINS environment variable according to the plugins for the component.
@@ -104,11 +96,11 @@ in runCommand "${componentName}-${ghc.name}-env" {
10496
+ ''
10597
for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
10698
if [[ -x "${ghc}/bin/$prg" ]]; then
107-
rm -f $out/bin/$prg
108-
makeWrapper ${ghc}/bin/$prg $out/bin/$prg \
99+
rm -f $wrappedGhc/bin/$prg
100+
makeWrapper ${ghc}/bin/$prg $wrappedGhc/bin/$prg \
109101
--add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"' \
110-
--set "NIX_${ghcCommandCaps}" "$out/bin/${ghcCommand}" \
111-
--set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \
102+
--set "NIX_${ghcCommandCaps}" "$wrappedGhc/bin/${ghcCommand}" \
103+
--set "NIX_${ghcCommandCaps}PKG" "$wrappedGhc/bin/${ghcCommand}-pkg" \
112104
--set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \
113105
--set "GHC_PLUGINS" "$GHC_PLUGINS" \
114106
--set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
@@ -117,11 +109,11 @@ in runCommand "${componentName}-${ghc.name}-env" {
117109
118110
for prg in "${targetPrefix}runghc" "${targetPrefix}runhaskell"; do
119111
if [[ -x "${ghc}/bin/$prg" ]]; then
120-
rm -f $out/bin/$prg
121-
makeWrapper ${ghc}/bin/$prg $out/bin/$prg \
122-
--add-flags "-f $out/bin/${ghcCommand}" \
123-
--set "NIX_${ghcCommandCaps}" "$out/bin/${ghcCommand}" \
124-
--set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \
112+
rm -f $wrappedGhc/bin/$prg
113+
makeWrapper ${ghc}/bin/$prg $wrappedGhc/bin/$prg \
114+
--add-flags "-f $wrappedGhc/bin/${ghcCommand}" \
115+
--set "NIX_${ghcCommandCaps}" "$wrappedGhc/bin/${ghcCommand}" \
116+
--set "NIX_${ghcCommandCaps}PKG" "$wrappedGhc/bin/${ghcCommand}-pkg" \
125117
--set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \
126118
--set "GHC_PLUGINS" "$GHC_PLUGINS" \
127119
--set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
@@ -132,8 +124,8 @@ in runCommand "${componentName}-${ghc.name}-env" {
132124
# Wrap haddock, if the base GHC provides it.
133125
+ ''
134126
if [[ -x "${haddock}/bin/haddock" ]]; then
135-
rm -f $out/bin/haddock
136-
makeWrapper ${haddock}/bin/haddock $out/bin/haddock \
127+
rm -f $wrappedGhc/bin/haddock
128+
makeWrapper ${haddock}/bin/haddock $wrappedGhc/bin/haddock \
137129
--add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"' \
138130
--set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
139131
fi
@@ -144,11 +136,30 @@ in runCommand "${componentName}-${ghc.name}-env" {
144136
+ ''
145137
for prg in ${ghcCommand}-pkg ${ghcCommand}-pkg-${ghc.version}; do
146138
if [[ -x "${ghc}/bin/$prg" ]]; then
147-
rm -f $out/bin/$prg
148-
makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "--global-package-db=$out/${packageCfgDir}"
139+
rm -f $wrappedGhc/bin/$prg
140+
makeWrapper ${ghc}/bin/$prg $wrappedGhc/bin/$prg --add-flags "--global-package-db=$wrappedGhc/${packageCfgDir}"
149141
fi
150142
done
151143
152144
${postInstall}
153-
''
154-
)
145+
'';
146+
147+
drv = runCommand "${componentName}-${ghc.name}-env" {
148+
preferLocalBuild = true;
149+
passthru = {
150+
inherit script targetPrefix;
151+
inherit (ghc) version meta;
152+
};
153+
propagatedBuildInputs = configFiles.libDeps;
154+
nativeBuildInputs = [ghc];
155+
} (''
156+
mkdir -p $out/configFiles
157+
configFiles=$out/configFiles
158+
${configFiles.script}
159+
wrappedGhc=$out
160+
${script}
161+
'');
162+
in {
163+
inherit script drv targetPrefix;
164+
baseGhc = ghc;
165+
}

‎builder/haddock-builder.nix

+15-10
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ let
4747
finalConfigureFlags = lib.concatStringsSep " " (
4848
[ "--prefix=${componentDrv}"
4949
"${haskellLib.componentTarget componentId}"
50-
"$(cat ${docsConfigFiles}/configure-flags)"
50+
"$(cat $configFiles/configure-flags)"
5151
]
5252
++ commonConfigureFlags
5353
++ lib.optional doHaddock' " --docdir=${docdir "$doc"}");
@@ -63,28 +63,33 @@ let
6363
name = fullName;
6464

6565
passthru = {
66-
configFiles = docsConfigFiles;
67-
6866
# The directory containing the haddock documentation.
69-
haddockDir = if doHaddock' then "${docdir drv.doc}/html" else null;
67+
haddockDir = lib.const (if doHaddock' then "${docdir drv.doc}/html" else null);
7068
};
7169

7270
# `out` contains the `package.conf.d` files used for building the
7371
# haddock files.
7472
# `doc` contains just the haddock output files.
75-
outputs = ["out"]
73+
outputs = ["out" "configFiles" "ghc"]
7674
++ lib.optional doHaddock' "doc";
7775

78-
propagatedBuildInputs = builtins.concatLists pkgconfig;
76+
propagatedBuildInputs =
77+
builtins.concatLists pkgconfig
78+
++ configFiles.libDeps;
7979

80-
buildInputs = component.libs
81-
++ map (d: d.components.library.haddock or d) component.depends;
80+
buildInputs = component.libs;
8281

8382
nativeBuildInputs =
84-
[ shellWrappers buildPackages.removeReferencesTo ]
83+
[ ghc buildPackages.removeReferencesTo ]
8584
++ componentDrv.executableToolDepends;
8685

8786
configurePhase = ''
87+
mkdir -p $configFiles
88+
mkdir -p $ghc
89+
wrappedGhc=$ghc
90+
${docsConfigFiles.script}
91+
${shellWrappers.script}
92+
PATH=$wrappedGhc/bin:$PATH
8893
runHook preConfigure
8994
echo Configure flags:
9095
printf "%q " ${finalConfigureFlags}
@@ -145,7 +150,7 @@ let
145150
# working hyper links.
146151
pkg=$(basename "$i")
147152
sed -e "s|haddock-interfaces:.*|haddock-interfaces: $docdir/html/${componentId.cname}.haddock|" -e "s|haddock-html:.*|haddock-html: $docdir/html/|" "$i" > "$pkg"
148-
${ghc.targetPrefix}ghc-pkg -v0 --package-db ${docsConfigFiles}/${configFiles.packageCfgDir} -f $out/package.conf.d register "$pkg"
153+
${ghc.targetPrefix}ghc-pkg -v0 --package-db $configFiles/${configFiles.packageCfgDir} -f $out/package.conf.d register "$pkg"
149154
done
150155
151156
ln -s ${componentDrv}/exactDep $out/exactDep

0 commit comments

Comments
 (0)