674f5b0 · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Better support for source-repository-packages, only include planned components and pick latest packages (#1166)

This change updates to the latest `nix-tools` to get the following fixes (there are 3 PRs in nix-tools, but just the one in haskell.nix to avoid having to update the materialized files multiple times): ## Better support for source repository packages * https://github.com/input-output-hk/nix-tools/pull/107 Currently these are replaced by the `cabalProject` functions with regular `packages:` before running cabal configure. Cabal does not treat these the same (the setting of `tests:` and `benchmarks:` in the `cabal.project` file): * The plan found by `cabalProject` may not match the one used when running `cabal`. * The performance of the solver may not be consistent with running `cabal`. This change replaces `source-repository-package` with another `source-repository-package` pointing at a minimal git repo. ## Only include planned components * https://github.com/input-output-hk/nix-tools/pull/108 Only the components in the `plan.json` are now included in the haskell.nix cabal projects. This avoids missing dependencies attempting to build components that were not in the plan. Should fix #993. ## Pick latest packages * https://github.com/input-output-hk/nix-tools/pull/109 When the same package occurs more than once in a `plan.json` file (perhaps because it is needed both by the project itself and by one of the `setup` dependencies or `build-tool-dependencies` of the project) the latest version will now be the one picked by haskell.nix. This is a work around for a common issue with `cabal-doctest` when cross compiling to windows (an old version of Win32 is used even if a newer one was required by the projects `constraints`).

commit674f5b0a3db404a612a9e5ca49d059319c59c14f authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateFri 23 Jul 2021, 14:27 (5 years ago) parent971014b

93 files changed+5813−1979

compare with iko/ghcjs-patch-master

unifiedsplit

changelog.md+13

@@ -1,6 +1,19 @@

11This file contains a summary of changes to Haskell.nix and `nix-tools`

22that will impact users.

4+## Jul 23, 2021

5+* `source-repository-package` references in `cabal.project` files are now

6+ left as a `source-repository-package` when calculating the the `plan-nix` for

7+ `cabalProject` based functions.

8+ This makes haskell.nix match the behaviour of `cabal` better.

9+ Materialized files for projects that use `source-repository-package`

10+ references will need to be updated.

11+* Only planned components are included in a haskell.nix cabal project.

12+ If cabal solver does not include the component in the `plan.json` file it

13+ will not be present in `hsPkgs.pkg.components`.

14+* When the same package occurs more than once in a plan.json file

15+ the latest version is picked by haskell.nix.

16+

417## Apr 8, 2021

518* Project arguments are now validated with the Nix module system.

619 If unexpected argments are passed to a project function this may now

lib/cabal-project-parser.nix+8−11

@@ -74,17 +74,14 @@ let

7474 # --shar256: 003lm3pm0000hbfmii7xcdd9v20000flxf7gdl2pyxia7p014i8z

7575 # will be trated like a field and returned here

7676 # (used in call-cabal-project-to-nix.nix to create a fixed-output derivation)

77− extractRepoData = cabalProjectFileName: lookupSha256: repo:

78− builtins.map (subdir:

79− {

80− url = repo.location;

81− ref = repo.tag;

82− sha256 = repo."--sha256" or (lookupSha256 repo);

83− inherit subdir;

84− })

85− (if repo ? subdir

86− then pkgs.lib.filter (x: x != "") (pkgs.lib.splitString " " repo.subdir)

87− else ["."]);

77+ extractRepoData = cabalProjectFileName: lookupSha256: repo: {

78+ url = repo.location;

79+ ref = repo.tag;

80+ sha256 = repo."--sha256" or (lookupSha256 repo);

81+ subdirs = if repo ? subdir

82+ then pkgs.lib.filter (x: x != "") (pkgs.lib.splitString " " repo.subdir)

83+ else ["."];

84+ };

8885

8986 # Parse a source-repository-package and return data of `type: git` repositories

9087 parseBlock = cabalProjectFileName: lookupSha256: block:

lib/call-cabal-project-to-nix.nix+49−21

@@ -184,12 +184,29 @@ let

184184 in __trace "WARNING: No sha256 found for source-repository-package ${repoData.url} ${repoData.ref} download may fail in restricted mode (hydra)"

185185 (__trace "Consider adding `--sha256: ${hashPath drv}` to the ${cabalProjectFileName} file or passing in a lookupSha256 argument"

186186 drv);

187− in fetched + (if repoData.subdir == "." then "" else "/" + repoData.subdir);

187+ in {

188+ # Download the source-repository-package commit and add it to a minimal git

189+ # repository that `cabal` will be able to access from a non fixed output derivation.

190+ location = pkgs.evalPackages.runCommand "source-repository-package" {

191+ nativeBuildInputs = [ pkgs.evalPackages.rsync pkgs.evalPackages.git ];

192+ } ''

193+ mkdir $out

194+ rsync -a --prune-empty-dirs "${fetched}/" "$out/"

195+ cd $out

196+ chmod -R +w .

197+ git init -b minimal

198+ git add .

199+ GIT_COMMITTER_NAME='No One' GIT_COMMITTER_EMAIL= git commit -m "Minimal Repo For Haskell.Nix" --author 'No One <>'

200+ '';

201+ inherit (repoData) subdirs;

202+ inherit fetched;

203+ tag = "minimal";

204+ };

188205

189206 blocks = pkgs.lib.splitString "\nsource-repository-package\n" ("\n" + projectFile);

190207 initialText = pkgs.lib.lists.take 1 blocks;

191208 repoBlocks = builtins.map (pkgs.haskell-nix.haskellLib.parseBlock cabalProjectFileName lookupSha256) (pkgs.lib.lists.drop 1 blocks);

192− sourceRepoData = pkgs.lib.lists.concatMap (x: x.sourceRepo) repoBlocks;

209+ sourceRepoData = pkgs.lib.lists.map (x: x.sourceRepo) repoBlocks;

193210 otherText = pkgs.evalPackages.writeText "cabal.project" (pkgs.lib.strings.concatStringsSep "\n" (

194211 initialText

195212 ++ (builtins.map (x: x.otherText) repoBlocks)));

@@ -203,35 +220,47 @@ let

203220 # on the target system would use, so that the derivation is unaffected

204221 # and, say, a linux release build job can identify the derivation

205222 # as built by a darwin builder, and fetch it from a cache

206− sourceReposEval = builtins.map (fetchRepo pkgs.evalPackages.fetchgit) sourceRepoData ;

207− sourceReposBuild = builtins.map (fetchRepo pkgs.fetchgit) sourceRepoData;

223+ sourceReposEval = builtins.map (fetchRepo pkgs.evalPackages.fetchgit) sourceRepoData;

224+ sourceReposBuild = builtins.map (x: (fetchRepo pkgs.fetchgit x).fetched) sourceRepoData;

208225 in {

209226 sourceRepos = sourceReposBuild;

210227 makeFixedProjectFile = ''

211228 cp -f ${otherText} ./cabal.project

229+ '' +

230+ pkgs.lib.optionalString (builtins.length sourceReposEval != 0) (''

212231 chmod +w -R ./cabal.project

213232 # The newline here is important in case cabal.project does not have one at the end

214− printf "\npackages:" >> ./cabal.project

215− mkdir -p ./.source-repository-packages

233+ echo >> ./cabal.project

216234 '' +

217− ( pkgs.lib.strings.concatStrings (

235+ # Add replacement `source-repository-package` blocks pointing to the minimal git repos

236+ ( pkgs.lib.strings.concatMapStrings (f: ''

237+ echo "source-repository-package" >> ./cabal.project

238+ echo " type: git" >> ./cabal.project

239+ echo " location: file://${f.location}" >> ./cabal.project

240+ echo " subdir: ${builtins.concatStringsSep " " f.subdirs}" >> ./cabal.project

241+ echo " tag: ${f.tag}" >> ./cabal.project

242+ '') sourceReposEval

243+ ));

244+ # This will be used to replace refernces to the minimal git repos with just the index

245+ # of the repo. The index will be used in lib/import-and-filter-project.nix to

246+ # lookup the correct repository in `sourceReposBuild`. This avoids having

247+ # `/nix/store` paths in the `plan-nix` output so that it can be materialized safely.

248+ replaceLocations = pkgs.lib.strings.concatStrings (

218249 pkgs.lib.lists.zipListsWith (n: f: ''

219− mkdir -p ./.source-repository-packages/${builtins.toString n}

220− rsync -a --prune-empty-dirs \

221− --include '*/' --include '*.cabal' --include 'package.yaml' \

222− --exclude '*' \

223− "${f}/" "./.source-repository-packages/${builtins.toString n}/"

224− echo " ./.source-repository-packages/${builtins.toString n}" >> ./cabal.project

250+ (cd $out${subDir'}

251+ substituteInPlace $tmp${subDir'}/dist-newstyle/cache/plan.json --replace file://${f.location} ${builtins.toString n}

252+ for a in $(grep -rl file://${f.location} .plan.nix/*.nix); do

253+ substituteInPlace $a --replace file://${f.location} ${builtins.toString n}

254+ done)

225255 '')

226256 (pkgs.lib.lists.range 0 ((builtins.length sourceReposEval) - 1))

227257 sourceReposEval

228− )

229− );

258+ );

230259 };

231260

232261 fixedProject =

233262 if rawCabalProject == null

234− then { sourceRepos = []; makeFixedProjectFile = ""; }

263+ then { sourceRepos = []; makeFixedProjectFile = ""; replaceLocations = ""; }

235264 else replaceSoureRepos rawCabalProject;

236265

237266 # The use of the actual GHC can cause significant problems:

@@ -388,7 +417,7 @@ let

388417 } // pkgs.lib.optionalAttrs (checkMaterialization != null) {

389418 inherit checkMaterialization;

390419 }) (pkgs.evalPackages.runCommand (nameAndSuffix "plan-to-nix-pkgs") {

391− nativeBuildInputs = [ nix-tools dummy-ghc dummy-ghc-pkg cabal-install pkgs.evalPackages.rsync ];

420+ nativeBuildInputs = [ nix-tools dummy-ghc dummy-ghc-pkg cabal-install pkgs.evalPackages.rsync pkgs.evalPackages.git ];

392421 # Needed or stack-to-nix will die on unicode inputs

393422 LOCALE_ARCHIVE = pkgs.lib.optionalString (pkgs.evalPackages.stdenv.buildPlatform.libc == "glibc") "${pkgs.evalPackages.glibcLocales}/lib/locale/locale-archive";

394423 LANG = "en_US.UTF-8";

@@ -519,16 +548,15 @@ let

519548 # proper relative paths.

520549 (cd $out${subDir'} && plan-to-nix --full --plan-json $tmp${subDir'}/dist-newstyle/cache/plan.json -o .)

521550

551+ # Replace the /nix/store paths to minimal git repos with indexes (that will work with materialization).

552+ ${fixedProject.replaceLocations}

553+

522554 # Make the plan.json file available in case we need to debug plan-to-nix

523555 cp $tmp${subDir'}/dist-newstyle/cache/plan.json $maybeJson

524556

525557 # Remove the non nix files ".project" ".cabal" "package.yaml" files

526558 # as they should not be in the output hash (they may change slightly

527559 # without affecting the nix).

528− if [ -d $out${subDir'}/.source-repository-packages ]; then

529− chmod +w -R $out${subDir'}/.source-repository-packages

530− rm -rf $out${subDir'}/.source-repository-packages

531− fi

532560 find $out $ -type f -or -type l $ ! -name '*.nix' -delete

533561 # Remove empty dirs

534562 find $out -type d -empty -delete

lib/default.nix+3−3

@@ -73,8 +73,8 @@ in {

7373 comps = config.components;

7474 applyLibrary = cname: f { cname = config.package.identifier.name; ctype = "lib"; };

7575 applySubComp = ctype: cname: f { inherit cname; ctype = componentPrefix.${ctype} or (throw "Missing component mapping for ${ctype}."); };

76− buildableAttrs = lib.filterAttrs (n: comp: comp.buildable or true);

77− libComp = if comps.library == null || !(comps.library.buildable or true)

76+ buildableAttrs = lib.filterAttrs (n: comp: comp.buildable or true && comp.planned);

77+ libComp = if comps.library == null || !(comps.library.buildable or true && comps.library.planned)

7878 then {}

7979 else lib.mapAttrs applyLibrary (removeAttrs comps (subComponentTypes ++ [ "setup" ]));

8080 subComps = lib.mapAttrs

@@ -198,7 +198,7 @@ in {

198198 cleanGit = import ./clean-git.nix {

199199 inherit lib cleanSourceWith;

200200 git = gitMinimal;

201− inherit (pkgs.evalPackages) runCommand;

201+ inherit (pkgs) runCommand;

202202 };

203203

204204 # Some times it is handy to temporarily use a relative path between git

lib/import-and-filter-project.nix+10−13

@@ -27,31 +27,28 @@ in project // {

2727 else {...}@args: with pkgs.lib.strings;

2828 let

2929 oldPkg = import value args;

30− # When the package src is in the project dir, this is the subDir it is in.

31− subDir = removePrefix "/" (removePrefix (toString projectNix)

32− (toString oldPkg.src.content));

33− srcRepoPrefix = projectSubDir'' + ".source-repository-packages/";

34−

3530 packageInfo =

36− if !hasPrefix (toString projectNix) (toString oldPkg.src.content)

31+ if oldPkg.src ? url

3732 then {

38− # Source location does not match project prefix

33+ # The source is from a source-repository-package in a cabal.project file

34+ # and lib/call-cabal-project-to-nix.nix should have replaced the url with

35+ # an index into the sourceRepos list.

3936 isProject = false;

40− packageSrc = toString oldPkg.src.content;

37+ packageSrc = pkgs.lib.lists.elemAt sourceRepos (toInt oldPkg.src.url);

4138 }

42− else if hasPrefix srcRepoPrefix subDir

39+ else if !hasPrefix (toString projectNix) (toString oldPkg.src.content)

4340 then {

44− # The source is from a source repository

41+ # Source location does not match project prefix

4542 isProject = false;

46− packageSrc = pkgs.lib.lists.elemAt sourceRepos (

47− toInt (removePrefix srcRepoPrefix subDir));

43+ packageSrc = toString oldPkg.src.content;

4844 }

4945 else {

5046 # Source does match project prefix and it is not from a source repository

5147 isProject = true;

5248 packageSrc = haskellLib.appendSubDir {

5349 src = srcRoot;

54− inherit subDir;

50+ subDir = removePrefix "/" (removePrefix (toString projectNix)

51+ (toString oldPkg.src.content));

5552 includeSiblings = true; # Filtering sibling dirs of the package dir is done in the

5653 # component builder so that relative paths can be used to

5754 # reference project directories not in the package subDir.

materialized/bootstrap/ghc844/alex/default.nix+34−18

@@ -3,36 +3,34 @@

33 {

44 packages = {

55 "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;

6− "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

7− "rts".revision = (((hackage."rts")."1.0").revisions).default;

8− "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;

9− "directory".revision = (((hackage."directory")."1.3.1.5").revisions).default;

10− "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;

11− "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;

6+ "array".revision = (((hackage."array")."0.5.2.0").revisions).default;

7+ "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

128 "base".revision = (((hackage."base")."4.11.1.0").revisions).default;

9+ "rts".revision = (((hackage."rts")."1.0").revisions).default;

1310 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;

11+ "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

12+ "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;

13+ "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;

14+ "directory".revision = (((hackage."directory")."1.3.1.5").revisions).default;

1415 "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;

15− "process".revision = (((hackage."process")."1.6.3.0").revisions).default;

16− "array".revision = (((hackage."array")."0.5.2.0").revisions).default;

17− "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

16+ "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;

1817 };

1918 compiler = {

2019 version = "8.4.4";

2120 nix-name = "ghc844";

2221 packages = {

2322 "ghc-prim" = "0.5.2.0";

24− "unix" = "2.7.2.2";

25− "rts" = "1.0";

26− "deepseq" = "1.4.3.0";

27− "directory" = "1.3.1.5";

28− "containers" = "0.5.11.0";

29− "bytestring" = "0.10.8.2";

23+ "array" = "0.5.2.0";

24+ "integer-gmp" = "1.0.2.0";

3025 "base" = "4.11.1.0";

26+ "rts" = "1.0";

3127 "time" = "1.8.0.2";

28+ "unix" = "2.7.2.2";

29+ "bytestring" = "0.10.8.2";

30+ "containers" = "0.5.11.0";

31+ "directory" = "1.3.1.5";

3232 "filepath" = "1.4.2";

33− "process" = "1.6.3.0";

34− "array" = "0.5.2.0";

35− "integer-gmp" = "1.0.2.0";

33+ "deepseq" = "1.4.3.0";

3634 };

3735 };

3836 };

@@ -45,5 +43,23 @@

4543 "alex" = { flags = { "small_base" = lib.mkOverride 900 true; }; };

4644 };

4745 })

46+ ({ lib, ... }:

47+ {

48+ packages = {

49+ "containers".components.library.planned = lib.mkOverride 900 true;

50+ "ghc-prim".components.library.planned = lib.mkOverride 900 true;

51+ "integer-gmp".components.library.planned = lib.mkOverride 900 true;

52+ "array".components.library.planned = lib.mkOverride 900 true;

53+ "bytestring".components.library.planned = lib.mkOverride 900 true;

54+ "unix".components.library.planned = lib.mkOverride 900 true;

55+ "alex".components.exes."alex".planned = lib.mkOverride 900 true;

56+ "base".components.library.planned = lib.mkOverride 900 true;

57+ "rts".components.library.planned = lib.mkOverride 900 true;

58+ "time".components.library.planned = lib.mkOverride 900 true;

59+ "deepseq".components.library.planned = lib.mkOverride 900 true;

60+ "filepath".components.library.planned = lib.mkOverride 900 true;

61+ "directory".components.library.planned = lib.mkOverride 900 true;

62+ };

63+ })

4864 ];

4965 }

materialized/bootstrap/ghc844/happy-1.19.11/.plan.nix/happy.nix+1−1

@@ -30,7 +30,7 @@

3030 ];

3131 detailLevel = "FullDetails";

3232 licenseFiles = [ "LICENSE" ];

33− dataDir = "";

33+ dataDir = ".";

3434 dataFiles = [];

3535 extraSrcFiles = [

3636 "ANNOUNCE"

materialized/bootstrap/ghc844/happy-1.19.11/default.nix+55−28

@@ -4,24 +4,24 @@

44 packages = {

55 "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;

66 "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;

7− "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

8− "mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;

7+ "array".revision = (((hackage."array")."0.5.2.0").revisions).default;

8+ "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

9+ "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;

10+ "process".revision = (((hackage."process")."1.6.3.0").revisions).default;

11+ "base".revision = (((hackage."base")."4.11.1.0").revisions).default;

912 "rts".revision = (((hackage."rts")."1.0").revisions).default;

10− "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;

11− "parsec".revision = (((hackage."parsec")."3.1.13.0").revisions).default;

12− "directory".revision = (((hackage."directory")."1.3.1.5").revisions).default;

13− "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;

14− "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;

1513 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;

16− "Cabal".revision = (((hackage."Cabal")."2.2.0.1").revisions).default;

17− "base".revision = (((hackage."base")."4.11.1.0").revisions).default;

14+ "mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;

1815 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;

19− "transformers".revision = (((hackage."transformers")."0.5.5.0").revisions).default;

16+ "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

17+ "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;

18+ "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;

19+ "directory".revision = (((hackage."directory")."1.3.1.5").revisions).default;

20+ "parsec".revision = (((hackage."parsec")."3.1.13.0").revisions).default;

2021 "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;

21− "process".revision = (((hackage."process")."1.6.3.0").revisions).default;

22− "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;

23− "array".revision = (((hackage."array")."0.5.2.0").revisions).default;

24− "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

22+ "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;

23+ "transformers".revision = (((hackage."transformers")."0.5.5.0").revisions).default;

24+ "Cabal".revision = (((hackage."Cabal")."2.2.0.1").revisions).default;

2525 };

2626 compiler = {

2727 version = "8.4.4";

@@ -29,24 +29,24 @@

2929 packages = {

3030 "binary" = "0.8.5.1";

3131 "ghc-prim" = "0.5.2.0";

32− "unix" = "2.7.2.2";

33− "mtl" = "2.2.2";

32+ "array" = "0.5.2.0";

33+ "integer-gmp" = "1.0.2.0";

34+ "pretty" = "1.1.3.6";

35+ "process" = "1.6.3.0";

36+ "base" = "4.11.1.0";

3437 "rts" = "1.0";

35− "deepseq" = "1.4.3.0";

36− "parsec" = "3.1.13.0";

37− "directory" = "1.3.1.5";

38− "containers" = "0.5.11.0";

39− "bytestring" = "0.10.8.2";

4038 "text" = "1.2.3.1";

41− "Cabal" = "2.2.0.1";

42− "base" = "4.11.1.0";

39+ "mtl" = "2.2.2";

4340 "time" = "1.8.0.2";

44− "transformers" = "0.5.5.0";

41+ "unix" = "2.7.2.2";

42+ "bytestring" = "0.10.8.2";

43+ "containers" = "0.5.11.0";

44+ "directory" = "1.3.1.5";

45+ "parsec" = "3.1.13.0";

4546 "filepath" = "1.4.2";

46− "process" = "1.6.3.0";

47− "pretty" = "1.1.3.6";

48− "array" = "0.5.2.0";

49− "integer-gmp" = "1.0.2.0";

47+ "deepseq" = "1.4.3.0";

48+ "transformers" = "0.5.5.0";

49+ "Cabal" = "2.2.0.1";

5050 };

5151 };

5252 };

@@ -59,5 +59,32 @@

5959 "happy" = { flags = { "small_base" = lib.mkOverride 900 true; }; };

6060 };

6161 })

62+ ({ lib, ... }:

63+ {

64+ packages = {

65+ "containers".components.library.planned = lib.mkOverride 900 true;

66+ "binary".components.library.planned = lib.mkOverride 900 true;

67+ "ghc-prim".components.library.planned = lib.mkOverride 900 true;

68+ "happy".components.exes."happy".planned = lib.mkOverride 900 true;

69+ "Cabal".components.library.planned = lib.mkOverride 900 true;

70+ "transformers".components.library.planned = lib.mkOverride 900 true;

71+ "process".components.library.planned = lib.mkOverride 900 true;

72+ "pretty".components.library.planned = lib.mkOverride 900 true;

73+ "integer-gmp".components.library.planned = lib.mkOverride 900 true;

74+ "array".components.library.planned = lib.mkOverride 900 true;

75+ "bytestring".components.library.planned = lib.mkOverride 900 true;

76+ "unix".components.library.planned = lib.mkOverride 900 true;

77+ "text".components.library.planned = lib.mkOverride 900 true;

78+ "base".components.library.planned = lib.mkOverride 900 true;

79+ "rts".components.library.planned = lib.mkOverride 900 true;

80+ "mtl".components.library.planned = lib.mkOverride 900 true;

81+ "time".components.library.planned = lib.mkOverride 900 true;

82+ "happy".components.setup.planned = lib.mkOverride 900 true;

83+ "deepseq".components.library.planned = lib.mkOverride 900 true;

84+ "filepath".components.library.planned = lib.mkOverride 900 true;

85+ "parsec".components.library.planned = lib.mkOverride 900 true;

86+ "directory".components.library.planned = lib.mkOverride 900 true;

87+ };

88+ })

6289 ];

6390 }

materialized/bootstrap/ghc844/happy-1.19.12/default.nix+25−22

@@ -3,40 +3,28 @@

33 {

44 packages = {

55 "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;

6− "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

7− "mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;

6+ "array".revision = (((hackage."array")."0.5.2.0").revisions).default;

7+ "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

8+ "base".revision = (((hackage."base")."4.11.1.0").revisions).default;

89 "rts".revision = (((hackage."rts")."1.0").revisions).default;

9− "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;

10− "directory".revision = (((hackage."directory")."1.3.1.5").revisions).default;

10+ "mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;

1111 "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;

12− "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;

13− "base".revision = (((hackage."base")."4.11.1.0").revisions).default;

14− "time".revision = (((hackage."time")."1.8.0.2").revisions).default;

12+ "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;

1513 "transformers".revision = (((hackage."transformers")."0.5.5.0").revisions).default;

16− "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;

17− "process".revision = (((hackage."process")."1.6.3.0").revisions).default;

18− "array".revision = (((hackage."array")."0.5.2.0").revisions).default;

19− "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

2014 };

2115 compiler = {

2216 version = "8.4.4";

2317 nix-name = "ghc844";

2418 packages = {

2519 "ghc-prim" = "0.5.2.0";

26− "unix" = "2.7.2.2";

27− "mtl" = "2.2.2";

20+ "array" = "0.5.2.0";

21+ "integer-gmp" = "1.0.2.0";

22+ "base" = "4.11.1.0";

2823 "rts" = "1.0";

29− "deepseq" = "1.4.3.0";

30− "directory" = "1.3.1.5";

24+ "mtl" = "2.2.2";

3125 "containers" = "0.5.11.0";

32− "bytestring" = "0.10.8.2";

33− "base" = "4.11.1.0";

34− "time" = "1.8.0.2";

26+ "deepseq" = "1.4.3.0";

3527 "transformers" = "0.5.5.0";

36− "filepath" = "1.4.2";

37− "process" = "1.6.3.0";

38− "array" = "0.5.2.0";

39− "integer-gmp" = "1.0.2.0";

4028 };

4129 };

4230 };

@@ -49,5 +37,20 @@

4937 "happy" = { flags = { "small_base" = lib.mkOverride 900 true; }; };

5038 };

5139 })

40+ ({ lib, ... }:

41+ {

42+ packages = {

43+ "containers".components.library.planned = lib.mkOverride 900 true;

44+ "ghc-prim".components.library.planned = lib.mkOverride 900 true;

45+ "happy".components.exes."happy".planned = lib.mkOverride 900 true;

46+ "transformers".components.library.planned = lib.mkOverride 900 true;

47+ "integer-gmp".components.library.planned = lib.mkOverride 900 true;

48+ "array".components.library.planned = lib.mkOverride 900 true;

49+ "base".components.library.planned = lib.mkOverride 900 true;

50+ "rts".components.library.planned = lib.mkOverride 900 true;

51+ "mtl".components.library.planned = lib.mkOverride 900 true;

52+ "deepseq".components.library.planned = lib.mkOverride 900 true;

53+ };

54+ })

5255 ];

5356 }

materialized/bootstrap/ghc844/hscolour/default.nix+22−8

@@ -3,24 +3,24 @@

33 {

44 packages = {

55 "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;

6− "rts".revision = (((hackage."rts")."1.0").revisions).default;

7− "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;

8− "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;

9− "base".revision = (((hackage."base")."4.11.1.0").revisions).default;

106 "array".revision = (((hackage."array")."0.5.2.0").revisions).default;

117 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

8+ "base".revision = (((hackage."base")."4.11.1.0").revisions).default;

9+ "rts".revision = (((hackage."rts")."1.0").revisions).default;

10+ "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;

11+ "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;

1212 };

1313 compiler = {

1414 version = "8.4.4";

1515 nix-name = "ghc844";

1616 packages = {

1717 "ghc-prim" = "0.5.2.0";

18− "rts" = "1.0";

19− "deepseq" = "1.4.3.0";

20− "containers" = "0.5.11.0";

21− "base" = "4.11.1.0";

2218 "array" = "0.5.2.0";

2319 "integer-gmp" = "1.0.2.0";

20+ "base" = "4.11.1.0";

21+ "rts" = "1.0";

22+ "containers" = "0.5.11.0";

23+ "deepseq" = "1.4.3.0";

2424 };

2525 };

2626 };

@@ -29,5 +29,19 @@

2929 modules = [

3030 ({ lib, ... }:

3131 { packages = { "hscolour" = { flags = {}; }; }; })

32+ ({ lib, ... }:

33+ {

34+ packages = {

35+ "containers".components.library.planned = lib.mkOverride 900 true;

36+ "ghc-prim".components.library.planned = lib.mkOverride 900 true;

37+ "hscolour".components.exes."HsColour".planned = lib.mkOverride 900 true;

38+ "hscolour".components.library.planned = lib.mkOverride 900 true;

39+ "integer-gmp".components.library.planned = lib.mkOverride 900 true;

40+ "array".components.library.planned = lib.mkOverride 900 true;

41+ "base".components.library.planned = lib.mkOverride 900 true;

42+ "rts".components.library.planned = lib.mkOverride 900 true;

43+ "deepseq".components.library.planned = lib.mkOverride 900 true;

44+ };

45+ })

3246 ];

3347 }

materialized/dummy-ghc/ghc-8.8.2-x86_64-linux/ghc-pkg/dump-global+4−2

@@ -814,6 +814,7 @@ library-dirs:

814814dynamic-library-dirs:

815815data-dir:

816816hs-libraries: HSghc-prim-0.5.3

817+include-dirs:

817818depends: rts

818819haddock-interfaces:

819820haddock-html:

@@ -842,6 +843,7 @@ library-dirs:

842843dynamic-library-dirs:

843844data-dir:

844845hs-libraries: HSghci-8.8.2

846+include-dirs:

845847depends:

846848 array-0.5.4.0 base-4.13.0.0 binary-0.8.7.0 bytestring-0.10.10.0

847849 containers-0.6.2.1 deepseq-1.4.4.0 filepath-1.4.2.1 ghc-boot-8.8.2

@@ -1523,8 +1525,8 @@ license: BSD-3-Clause

15231525maintainer: glasgow-haskell-users@haskell.org

15241526exposed: True

15251527library-dirs:

1526−hs-libraries: HSrts Cffi

1527−extra-libraries: m rt dl pthread

1528+hs-libraries: HSrts

1529+extra-libraries: m rt dl ffi numa pthread

15281530include-dirs:

15291531includes: Stg.h

15301532ld-options:

materialized/dummy-ghc/ghc-8.8.2-x86_64-linux/ghc/info−5

@@ -1,21 +1,16 @@

11 [("Project name","The Glorious Glasgow Haskell Compilation System")

22 ,("GCC extra via C opts"," -fwrapv -fno-builtin")

3− ,("C compiler command","gcc")

43 ,("C compiler flags","")

54 ,("C compiler link flags"," ")

65 ,("C compiler supports -no-pie","YES")

7− ,("Haskell CPP command","gcc")

86 ,("Haskell CPP flags","-E -undef -traditional")

9− ,("ld command","ld")

107 ,("ld flags","")

118 ,("ld supports compact unwind","YES")

129 ,("ld supports build-id","YES")

1310 ,("ld supports filelist","NO")

1411 ,("ld is GNU ld","YES")

15− ,("ar command","ar")

1612 ,("ar flags","q")

1713 ,("ar supports at file","YES")

18− ,("ranlib command","ranlib")

1914 ,("touch command","touch")

2015 ,("dllwrap command","/bin/false")

2116 ,("windres command","/bin/false")

materialized/ghc-extra-projects/cross/ghc8102/default.nix+76−42

@@ -4,86 +4,120 @@

44 packages = {

55 "binary".revision = (((hackage."binary")."0.8.8.0").revisions).default;

66 "ghc-prim".revision = (((hackage."ghc-prim")."0.6.1").revisions).default;

7− "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

8− "ghc-heap".revision = (((hackage."ghc-heap")."8.10.2").revisions).default;

9− "rts".revision = (((hackage."rts")."1.0").revisions).default;

10− "deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;

11− "network".revision = (((hackage."network")."2.8.0.1").revisions).default;

12− "directory".revision = (((hackage."directory")."1.3.6.1").revisions).default;

7+ "array".revision = (((hackage."array")."0.5.4.0").revisions).default;

8+ "integer-gmp".revision = (((hackage."integer-gmp")."1.0.3.0").revisions).default;

139 "template-haskell".revision = (((hackage."template-haskell")."2.16.0.0").revisions).default;

14− "containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;

10+ "network".revision = (((hackage."network")."2.8.0.1").revisions).default;

11+ "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;

12+ "process".revision = (((hackage."process")."1.6.11.0").revisions).default;

1513 "base".revision = (((hackage."base")."4.14.1.0").revisions).default;

14+ "rts".revision = (((hackage."rts")."1.0").revisions).default;

1615 "time".revision = (((hackage."time")."1.9.3").revisions).default;

17− "terminfo".revision = (((hackage."terminfo")."0.4.1.4").revisions).default;

18− "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;

19− "filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;

20− "process".revision = (((hackage."process")."1.6.11.0").revisions).default;

21− "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;

16+ "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

17+ "containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;

18+ "directory".revision = (((hackage."directory")."1.3.6.2").revisions).default;

2219 "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.10.2").revisions).default;

23− "array".revision = (((hackage."array")."0.5.4.0").revisions).default;

24− "integer-gmp".revision = (((hackage."integer-gmp")."1.0.3.0").revisions).default;

20+ "filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;

21+ "deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;

22+ "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;

23+ "terminfo".revision = (((hackage."terminfo")."0.4.1.4").revisions).default;

24+ "ghc-heap".revision = (((hackage."ghc-heap")."8.10.2").revisions).default;

2525 };

2626 compiler = {

2727 version = "8.10.2";

2828 nix-name = "ghc8102";

2929 packages = {

3030 "ghc-prim" = "0.6.1";

31− "ghc-heap" = "8.10.2";

32− "rts" = "1.0";

33− "deepseq" = "1.4.4.0";

31+ "array" = "0.5.4.0";

32+ "integer-gmp" = "1.0.3.0";

3433 "template-haskell" = "2.16.0.0";

35− "containers" = "0.6.2.1";

34+ "pretty" = "1.1.3.6";

3635 "base" = "4.14.1.0";

36+ "rts" = "1.0";

3737 "time" = "1.9.3";

38− "transformers" = "0.5.6.2";

39− "filepath" = "1.4.2.1";

40− "pretty" = "1.1.3.6";

38+ "containers" = "0.6.2.1";

4139 "ghc-boot-th" = "8.10.2";

42− "array" = "0.5.4.0";

43− "integer-gmp" = "1.0.3.0";

40+ "filepath" = "1.4.2.1";

41+ "deepseq" = "1.4.4.0";

42+ "transformers" = "0.5.6.2";

43+ "ghc-heap" = "8.10.2";

4444 };

4545 };

4646 };

4747 extras = hackage:

4848 {

4949 packages = {

50− ghc = ./.plan.nix/ghc.nix;

5150 bytestring = ./.plan.nix/bytestring.nix;

51+ iserv = ./.plan.nix/iserv.nix;

52+ ghci = ./.plan.nix/ghci.nix;

5253 remote-iserv = ./.plan.nix/remote-iserv.nix;

53− iserv-proxy = ./.plan.nix/iserv-proxy.nix;

54− hpc = ./.plan.nix/hpc.nix;

55− libiserv = ./.plan.nix/libiserv.nix;

5654 ghc-boot = ./.plan.nix/ghc-boot.nix;

57− ghci = ./.plan.nix/ghci.nix;

58− iserv = ./.plan.nix/iserv.nix;

55+ ghc = ./.plan.nix/ghc.nix;

56+ libiserv = ./.plan.nix/libiserv.nix;

57+ hpc = ./.plan.nix/hpc.nix;

58+ iserv-proxy = ./.plan.nix/iserv-proxy.nix;

5959 };

6060 };

6161 modules = [

6262 ({ lib, ... }:

6363 {

6464 packages = {

65+ "bytestring" = {

66+ flags = { "integer-simple" = lib.mkOverride 900 false; };

67+ };

68+ "iserv" = { flags = {}; };

69+ "ghci" = { flags = { "ghci" = lib.mkOverride 900 true; }; };

70+ "remote-iserv" = { flags = {}; };

71+ "ghc-boot" = { flags = {}; };

6572 "ghc" = {

6673 flags = {

67− "stage1" = lib.mkOverride 900 false;

68− "stage2" = lib.mkOverride 900 false;

69− "integer-gmp" = lib.mkOverride 900 false;

70− "stage3" = lib.mkOverride 900 false;

7174 "dynamic-system-linker" = lib.mkOverride 900 true;

7275 "ghci" = lib.mkOverride 900 true;

7376 "integer-simple" = lib.mkOverride 900 false;

77+ "stage3" = lib.mkOverride 900 false;

78+ "integer-gmp" = lib.mkOverride 900 false;

79+ "stage2" = lib.mkOverride 900 false;

7480 "terminfo" = lib.mkOverride 900 true;

81+ "stage1" = lib.mkOverride 900 false;

7582 };

7683 };

77− "bytestring" = {

78− flags = { "integer-simple" = lib.mkOverride 900 false; };

79− };

80− "remote-iserv" = { flags = {}; };

81− "iserv-proxy" = { flags = {}; };

82− "hpc" = { flags = {}; };

8384 "libiserv" = { flags = { "network" = lib.mkOverride 900 true; }; };

84− "ghc-boot" = { flags = {}; };

85− "ghci" = { flags = { "ghci" = lib.mkOverride 900 true; }; };

86− "iserv" = { flags = {}; };

85+ "hpc" = { flags = {}; };

86+ "iserv-proxy" = { flags = {}; };

87+ };

88+ })

89+ ({ lib, ... }:

90+ {

91+ packages = {

92+ "libiserv".components.library.planned = lib.mkOverride 900 true;

93+ "ghc".components.library.planned = lib.mkOverride 900 true;

94+ "containers".components.library.planned = lib.mkOverride 900 true;

95+ "ghc-boot".components.library.planned = lib.mkOverride 900 true;

96+ "binary".components.library.planned = lib.mkOverride 900 true;

97+ "ghc-prim".components.library.planned = lib.mkOverride 900 true;

98+ "iserv".components.exes."iserv".planned = lib.mkOverride 900 true;

99+ "iserv-proxy".components.exes."iserv-proxy".planned = lib.mkOverride 900 true;

100+ "ghc-heap".components.library.planned = lib.mkOverride 900 true;

101+ "ghci".components.library.planned = lib.mkOverride 900 true;

102+ "terminfo".components.library.planned = lib.mkOverride 900 true;

103+ "transformers".components.library.planned = lib.mkOverride 900 true;

104+ "process".components.library.planned = lib.mkOverride 900 true;

105+ "hpc".components.library.planned = lib.mkOverride 900 true;

106+ "network".components.library.planned = lib.mkOverride 900 true;

107+ "pretty".components.library.planned = lib.mkOverride 900 true;

108+ "template-haskell".components.library.planned = lib.mkOverride 900 true;

109+ "integer-gmp".components.library.planned = lib.mkOverride 900 true;

110+ "array".components.library.planned = lib.mkOverride 900 true;

111+ "bytestring".components.library.planned = lib.mkOverride 900 true;

112+ "remote-iserv".components.exes."remote-iserv".planned = lib.mkOverride 900 true;

113+ "unix".components.library.planned = lib.mkOverride 900 true;

114+ "base".components.library.planned = lib.mkOverride 900 true;

115+ "rts".components.library.planned = lib.mkOverride 900 true;

116+ "time".components.library.planned = lib.mkOverride 900 true;

117+ "deepseq".components.library.planned = lib.mkOverride 900 true;

118+ "filepath".components.library.planned = lib.mkOverride 900 true;

119+ "ghc-boot-th".components.library.planned = lib.mkOverride 900 true;

120+ "directory".components.library.planned = lib.mkOverride 900 true;

87121 };

88122 })

89123 ];

materialized/ghc-extra-projects/cross/ghc8103/default.nix+76−42

@@ -4,86 +4,120 @@

44 packages = {

55 "binary".revision = (((hackage."binary")."0.8.8.0").revisions).default;

66 "ghc-prim".revision = (((hackage."ghc-prim")."0.6.1").revisions).default;

7− "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

8− "ghc-heap".revision = (((hackage."ghc-heap")."8.10.3").revisions).default;