f056dd3 · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Fix the way ExeDependency is handled (#1036)

See https://github.com/input-output-hk/nix-tools/pull/101 We should look up hsPkgs.${pkg-name}.components.exe.${component-name} instead of including the package as a dependency. Adding `hsPkgs.${pkg-name}` a tool it is not clear which executable in the package `haskell.nix` should choose. Haskell.nix did not deal with this well and in fact it could lead to `nix-shell` crashing. For instance using `shellFor` to make a shell for building `haskell-language-server` with `cabal build` crashed as a dependency on `ghcide` the executable (by the `ghcide-bench` executable) caused infinite recursion. Allowing `ghcide-bench` to correctly depend just on `components.exes.ghcide` fixes this. This PR also includes: * Updated materialized files built with the new nix-tools and latest index-state * Small update to GHCJS (pins happy) to fix issue that showed up when the materialization was updated * A fix for the infinite recursion issue when updating materialized files (by adding ghc-boot-packages-unchecked). * Performance fix for shellFor (checks just the names of component derivations when filtering).

commitf056dd34cd40ed95086ace76ebc0d33a10c4119e authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateFri 12 Feb 2021, 10:45 (6 years ago) parent7ea4746

146 files changed+451−461

compare with iko/ghcjs-patch-master

unifiedsplit

builder/shell-for.nix+2−2

@@ -59,8 +59,8 @@ let

5959 # Given a list of derivations, removes those which are components of packages which were selected as part of the shell.

6060 removeSelectedInputs =

6161 # All the components of the selected packages: we shouldn't add any of these as dependencies

62− let selectedPackageComponents = lib.concatMap haskellLib.getAllComponents selectedPackages;

63− in lib.filter (input: !(builtins.elem input selectedPackageComponents));

62+ let selectedPackageComponents = map (x: x.name) (lib.concatMap haskellLib.getAllComponents selectedPackages);

63+ in lib.filter (input: !(builtins.elem input.name selectedPackageComponents));

6464

6565 # We need to remove any dependencies which are selected packages (see above).

6666 # `depends` contains packages so we use 'removeSelectedPackages`.

ci.nix+1−1

@@ -43,7 +43,7 @@

4343 # We need to use the actual nixpkgs version we're working with here, since the values

4444 # of 'lib.systems.examples' are not understood between all versions

4545 let lib = nixpkgs.lib;

46− in lib.optionalAttrs (nixpkgsName == "R2009" && (__elem compiler-nix-name ["ghc865" "ghc884"])) {

46+ in lib.optionalAttrs (nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc865" "ghc884"])) {

4747 inherit (lib.systems.examples) ghcjs;

4848 } // lib.optionalAttrs (system == "x86_64-linux" && (

4949 (nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc810220201118"])

compiler/ghcjs/ghcjs88-src.json+2−2

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

11{

22 "url": "https://github.com/ghcjs/ghcjs",

3− "rev": "1193ead2c760bab1e2ab461458ec771237ccf9b5",

4− "sha256": "1h7gaq1lhf61b5x693phgpm2z0w393b1sbkxrd9mxzz9xxlyrhkl",

3+ "rev": "23e75593937dc15eaee73bed1443450fc68bd277",

4+ "sha256": "1cj4q2rx3xs8zfkpjjwfdfadidg0wgn3qisffiikxmgf41b4a760",

55 "fetchSubmodules": true

66}

lib/materialize.nix+8−1

@@ -56,7 +56,14 @@ let

5656 builtins.trace sha256message (builtins.trace materializeMessage calculateNoHash);

5757

5858 # Build fully and check the hash and materialized versions

59− checked = runCommand name {} (''

59+ checked =

60+ # Let the user know what we are checking. This is useful for debugging issues

61+ # where materialization fails to prevent infinite recurstion when:

62+ # checkMaterialization = true;

63+ (if materialized != null

64+ then __trace "Checking materialization in ${toString materialized}"

65+ else x: x)

66+ runCommand name {} (''

6067 ERR=$(mktemp -d)/errors.txt

6168 ''

6269 + (pkgs.lib.optionalString (sha256 != null) ''

materialized/bootstrap/ghc844/alex/.plan.nix/alex.nix+1−1

@@ -150,7 +150,7 @@

150150 (hsPkgs."process" or (errorHandler.buildDepError "process"))

151151 ];

152152 build-tools = [

153− (hsPkgs.buildPackages.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex")))

153+ (hsPkgs.buildPackages.alex.components.exes.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex:alex")))

154154 ];

155155 buildable = true;

156156 mainPath = [ "test.hs" ];

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

@@ -23,10 +23,10 @@

2323 buildType = "Custom";

2424 isLocal = true;

2525 setup-depends = [

26− (hsPkgs.buildPackages.Cabal or (pkgs.buildPackages.Cabal or (errorHandler.buildToolDepError "Cabal")))

27− (hsPkgs.buildPackages.base or (pkgs.buildPackages.base or (errorHandler.buildToolDepError "base")))

28− (hsPkgs.buildPackages.directory or (pkgs.buildPackages.directory or (errorHandler.buildToolDepError "directory")))

29− (hsPkgs.buildPackages.filepath or (pkgs.buildPackages.filepath or (errorHandler.buildToolDepError "filepath")))

26+ (hsPkgs.buildPackages.Cabal or (pkgs.buildPackages.Cabal or (errorHandler.setupDepError "Cabal")))

27+ (hsPkgs.buildPackages.base or (pkgs.buildPackages.base or (errorHandler.setupDepError "base")))

28+ (hsPkgs.buildPackages.directory or (pkgs.buildPackages.directory or (errorHandler.setupDepError "directory")))

29+ (hsPkgs.buildPackages.filepath or (pkgs.buildPackages.filepath or (errorHandler.setupDepError "filepath")))

3030 ];

3131 detailLevel = "FullDetails";

3232 licenseFiles = [ "LICENSE" ];

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

@@ -190,7 +190,7 @@

190190 (hsPkgs."process" or (errorHandler.buildDepError "process"))

191191 ];

192192 build-tools = [

193− (hsPkgs.buildPackages.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy")))

193+ (hsPkgs.buildPackages.happy.components.exes.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy:happy")))

194194 ];

195195 buildable = true;

196196 mainPath = [ "test.hs" ];

materialized/bootstrap/ghc844/hscolour/.plan.nix/hscolour.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENCE-LGPL" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [ "hscolour.css" "data/rgb24-example-.hscolour" ];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.3-x86_64-linux/ghc-pkg/dump-global+1−1

@@ -735,7 +735,7 @@ library-dirs:

735735dynamic-library-dirs:

736736data-dir:

737737hs-libraries: HSghc-prim-0.6.1

738−extra-libraries: c m

738+extra-libraries: gcc c m

739739depends: rts

740740haddock-interfaces:

741741haddock-html:

materialized/dummy-ghc/ghc-8.4.4-x86_64-darwin/ghc-pkg/dump-global+88−115

@@ -157,21 +157,21 @@ depends:

157157 time-1.8.0.2 transformers-0.5.5.0 mtl-2.2.2 text-1.2.3.1

158158 parsec-3.1.13.0 directory-1.3.1.5 binary-0.8.5.1 unix-2.7.2.2

159159abi-depends: array-0.5.2.0=03a64bb9d4be6771406b73145e6e58e1

160− base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

161− bytestring-0.10.8.2=6b29c2a8aec4937efcd3db3c8129fb1f

162− containers-0.5.11.0=35ebbdc04fdff8693d557eac5fd1cb0d

163− deepseq-1.4.3.0=011951b161142d1ecd2f936f724b0c4a

160+ base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

161+ bytestring-0.10.8.2=9dd6632a6071c728fe550d499c942f0c

162+ containers-0.5.11.0=3a03e29a933c27106de8caad6a8dba89

163+ deepseq-1.4.3.0=c2f0913f017a74ecf59e88ba8e164f77

164164 filepath-1.4.2=27f5ec6358f0ec240d827eaa0860b2af

165− pretty-1.1.3.6=0b29f432a127f89dd19124c8bd17d5f8

165+ pretty-1.1.3.6=a22b26e5f7ddf72bac19d7d229502dac

166166 process-1.6.3.0=030e21e561f9c3486a49333f2057b804

167− time-1.8.0.2=7e7497056e79bf3d1e061b9c2ef21593

167+ time-1.8.0.2=fe7eb2e843def3e5fe89f1dd11e7c8ec

168168 transformers-0.5.5.0=b5d2f6cdac279ec17c0fad50f5348c4f

169169 mtl-2.2.2=28a8b7973060d82dd465f14029339d4f

170− text-1.2.3.1=ce9e85f0d4840d83f3d554b4f833c06b

171− parsec-3.1.13.0=c0d805958bf8b152ca104100a7cfe789

172− directory-1.3.1.5=9554b535b4324fb4915ea3cde0ada9e3

173− binary-0.8.5.1=102c321854f769bea022b84f469deee1

174− unix-2.7.2.2=e6bcb93db14b690e7f0b0b39cdb6668a

170+ text-1.2.3.1=e0d7b65ba8d31007e57ce45ddef7efb8

171+ parsec-3.1.13.0=3835800e76890791d7511c6b90d6c22c

172+ directory-1.3.1.5=fbc4e348e0c18c2b80ca9368e0275d72

173+ binary-0.8.5.1=246ff363717242ac7a7a3d37e6daabb8

174+ unix-2.7.2.2=1b1470032d7c086b787322282a984f1c

175175---

176176name: array

177177version: 0.5.2.0

@@ -197,7 +197,7 @@ exposed-modules:

197197hs-libraries: HSarray-0.5.2.0

198198depends:

199199 base-4.11.1.0

200−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

200+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

201201---

202202name: base

203203version: 4.11.1.0

@@ -316,9 +316,9 @@ hidden-modules: Data.Binary.Class Data.Binary.Internal

316316hs-libraries: HSbinary-0.8.5.1

317317depends:

318318 base-4.11.1.0 bytestring-0.10.8.2 containers-0.5.11.0 array-0.5.2.0

319−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

320− bytestring-0.10.8.2=6b29c2a8aec4937efcd3db3c8129fb1f

321− containers-0.5.11.0=35ebbdc04fdff8693d557eac5fd1cb0d

319+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

320+ bytestring-0.10.8.2=9dd6632a6071c728fe550d499c942f0c

321+ containers-0.5.11.0=3a03e29a933c27106de8caad6a8dba89

322322 array-0.5.2.0=03a64bb9d4be6771406b73145e6e58e1

323323---

324324name: bytestring

@@ -396,9 +396,9 @@ includes:

396396 fpstring.h

397397depends:

398398 base-4.11.1.0 ghc-prim-0.5.2.0 deepseq-1.4.3.0 integer-gmp-1.0.2.0

399−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

399+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

400400 ghc-prim-0.5.2.0=0a2596c0f516eb6cbf13841c1f06715e

401− deepseq-1.4.3.0=011951b161142d1ecd2f936f724b0c4a

401+ deepseq-1.4.3.0=c2f0913f017a74ecf59e88ba8e164f77

402402 integer-gmp-1.0.2.0=28d9d8fbabb28cc19fc92446ffd9b739

403403---

404404name: containers

@@ -443,9 +443,9 @@ hidden-modules: Utils.Containers.Internal.State

443443hs-libraries: HScontainers-0.5.11.0

444444depends:

445445 base-4.11.1.0 array-0.5.2.0 deepseq-1.4.3.0 ghc-prim-0.5.2.0

446−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

446+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

447447 array-0.5.2.0=03a64bb9d4be6771406b73145e6e58e1

448− deepseq-1.4.3.0=011951b161142d1ecd2f936f724b0c4a

448+ deepseq-1.4.3.0=c2f0913f017a74ecf59e88ba8e164f77

449449 ghc-prim-0.5.2.0=0a2596c0f516eb6cbf13841c1f06715e

450450---

451451name: deepseq

@@ -476,7 +476,7 @@ hidden-modules: Control.DeepSeq.BackDoor

476476hs-libraries: HSdeepseq-1.4.3.0

477477depends:

478478 base-4.11.1.0 array-0.5.2.0

479−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

479+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

480480 array-0.5.2.0=03a64bb9d4be6771406b73145e6e58e1

481481---

482482name: directory

@@ -500,10 +500,10 @@ hidden-modules: System.Directory.Internal.C_utimensat

500500hs-libraries: HSdirectory-1.3.1.5

501501depends:

502502 base-4.11.1.0 time-1.8.0.2 filepath-1.4.2 unix-2.7.2.2

503−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

504− time-1.8.0.2=7e7497056e79bf3d1e061b9c2ef21593

503+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

504+ time-1.8.0.2=fe7eb2e843def3e5fe89f1dd11e7c8ec

505505 filepath-1.4.2=27f5ec6358f0ec240d827eaa0860b2af

506− unix-2.7.2.2=e6bcb93db14b690e7f0b0b39cdb6668a

506+ unix-2.7.2.2=1b1470032d7c086b787322282a984f1c

507507---

508508name: filepath

509509version: 1.4.2

@@ -532,7 +532,7 @@ exposed-modules:

532532hs-libraries: HSfilepath-1.4.2

533533depends:

534534 base-4.11.1.0

535−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

535+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

536536---

537537name: ghc

538538version: 8.4.4

@@ -649,23 +649,23 @@ depends:

649649 array-0.5.2.0 filepath-1.4.2 template-haskell-2.13.0.0 hpc-0.6.0.3

650650 transformers-0.5.5.0 ghc-boot-8.4.4 ghc-boot-th-8.4.4 ghci-8.4.4

651651 unix-2.7.2.2 terminfo-0.4.1.1

652−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

653− deepseq-1.4.3.0=011951b161142d1ecd2f936f724b0c4a

654− directory-1.3.1.5=9554b535b4324fb4915ea3cde0ada9e3

652+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

653+ deepseq-1.4.3.0=c2f0913f017a74ecf59e88ba8e164f77

654+ directory-1.3.1.5=fbc4e348e0c18c2b80ca9368e0275d72

655655 process-1.6.3.0=030e21e561f9c3486a49333f2057b804

656− bytestring-0.10.8.2=6b29c2a8aec4937efcd3db3c8129fb1f

657− binary-0.8.5.1=102c321854f769bea022b84f469deee1

658− time-1.8.0.2=7e7497056e79bf3d1e061b9c2ef21593

659− containers-0.5.11.0=35ebbdc04fdff8693d557eac5fd1cb0d

656+ bytestring-0.10.8.2=9dd6632a6071c728fe550d499c942f0c

657+ binary-0.8.5.1=246ff363717242ac7a7a3d37e6daabb8

658+ time-1.8.0.2=fe7eb2e843def3e5fe89f1dd11e7c8ec

659+ containers-0.5.11.0=3a03e29a933c27106de8caad6a8dba89

660660 array-0.5.2.0=03a64bb9d4be6771406b73145e6e58e1

661661 filepath-1.4.2=27f5ec6358f0ec240d827eaa0860b2af

662− template-haskell-2.13.0.0=1cd284a671c37a37df2a49fb7fd0890a

663− hpc-0.6.0.3=6e2db4efb0614fc998c1f7d00c73f88c

662+ template-haskell-2.13.0.0=cc07ddc07c24e039684589af2cb62998

663+ hpc-0.6.0.3=a05c4ea52ff6193f9d9d777595585331

664664 transformers-0.5.5.0=b5d2f6cdac279ec17c0fad50f5348c4f

665− ghc-boot-8.4.4=d05e518b62e6b7572c47874b61acb43e

665+ ghc-boot-8.4.4=5acbbd06b980c0291be2a5ab76d8128f

666666 ghc-boot-th-8.4.4=d8bd507419aa2dc5daee657f9d2838de

667− ghci-8.4.4=b1b3407d52f67288e1441195bdbf1680

668− unix-2.7.2.2=e6bcb93db14b690e7f0b0b39cdb6668a

667+ ghci-8.4.4=73515bf3025d79d8c363ccbbaa51e635

668+ unix-2.7.2.2=1b1470032d7c086b787322282a984f1c

669669 terminfo-0.4.1.1=7c97c2b70b9b909e033361885d99c5fd

670670---

671671name: ghc-boot

@@ -697,10 +697,10 @@ hs-libraries: HSghc-boot-8.4.4

697697depends:

698698 base-4.11.1.0 binary-0.8.5.1 bytestring-0.10.8.2 directory-1.3.1.5

699699 filepath-1.4.2 ghc-boot-th-8.4.4

700−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

701− binary-0.8.5.1=102c321854f769bea022b84f469deee1

702− bytestring-0.10.8.2=6b29c2a8aec4937efcd3db3c8129fb1f

703− directory-1.3.1.5=9554b535b4324fb4915ea3cde0ada9e3

700+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

701+ binary-0.8.5.1=246ff363717242ac7a7a3d37e6daabb8

702+ bytestring-0.10.8.2=9dd6632a6071c728fe550d499c942f0c

703+ directory-1.3.1.5=fbc4e348e0c18c2b80ca9368e0275d72

704704 filepath-1.4.2=27f5ec6358f0ec240d827eaa0860b2af

705705 ghc-boot-th-8.4.4=d8bd507419aa2dc5daee657f9d2838de

706706---

@@ -726,7 +726,7 @@ exposed-modules:

726726hs-libraries: HSghc-boot-th-8.4.4

727727depends:

728728 base-4.11.1.0

729−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

729+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

730730---

731731name: ghc-compact

732732version: 0.1.0.0

@@ -754,8 +754,8 @@ hs-libraries: HSghc-compact-0.1.0.0

754754depends:

755755 ghc-prim-0.5.2.0 base-4.11.1.0 bytestring-0.10.8.2

756756abi-depends: ghc-prim-0.5.2.0=0a2596c0f516eb6cbf13841c1f06715e

757− base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

758− bytestring-0.10.8.2=6b29c2a8aec4937efcd3db3c8129fb1f

757+ base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

758+ bytestring-0.10.8.2=9dd6632a6071c728fe550d499c942f0c

759759---

760760name: ghc-prim

761761version: 0.5.2.0

@@ -801,17 +801,17 @@ depends:

801801 ghc-boot-th-8.4.4 template-haskell-2.13.0.0 transformers-0.5.5.0

802802 unix-2.7.2.2

803803abi-depends: array-0.5.2.0=03a64bb9d4be6771406b73145e6e58e1

804− base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

805− binary-0.8.5.1=102c321854f769bea022b84f469deee1

806− bytestring-0.10.8.2=6b29c2a8aec4937efcd3db3c8129fb1f

807− containers-0.5.11.0=35ebbdc04fdff8693d557eac5fd1cb0d

808− deepseq-1.4.3.0=011951b161142d1ecd2f936f724b0c4a

804+ base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

805+ binary-0.8.5.1=246ff363717242ac7a7a3d37e6daabb8

806+ bytestring-0.10.8.2=9dd6632a6071c728fe550d499c942f0c

807+ containers-0.5.11.0=3a03e29a933c27106de8caad6a8dba89

808+ deepseq-1.4.3.0=c2f0913f017a74ecf59e88ba8e164f77

809809 filepath-1.4.2=27f5ec6358f0ec240d827eaa0860b2af

810− ghc-boot-8.4.4=d05e518b62e6b7572c47874b61acb43e

810+ ghc-boot-8.4.4=5acbbd06b980c0291be2a5ab76d8128f

811811 ghc-boot-th-8.4.4=d8bd507419aa2dc5daee657f9d2838de

812− template-haskell-2.13.0.0=1cd284a671c37a37df2a49fb7fd0890a

812+ template-haskell-2.13.0.0=cc07ddc07c24e039684589af2cb62998

813813 transformers-0.5.5.0=b5d2f6cdac279ec17c0fad50f5348c4f

814− unix-2.7.2.2=e6bcb93db14b690e7f0b0b39cdb6668a

814+ unix-2.7.2.2=1b1470032d7c086b787322282a984f1c

815815---

816816name: haskeline

817817version: 0.7.4.2

@@ -858,15 +858,15 @@ depends:

858858 base-4.11.1.0 containers-0.5.11.0 directory-1.3.1.5

859859 bytestring-0.10.8.2 filepath-1.4.2 transformers-0.5.5.0

860860 process-1.6.3.0 stm-2.4.5.1 unix-2.7.2.2 terminfo-0.4.1.1

861−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

862− containers-0.5.11.0=35ebbdc04fdff8693d557eac5fd1cb0d

863− directory-1.3.1.5=9554b535b4324fb4915ea3cde0ada9e3

864− bytestring-0.10.8.2=6b29c2a8aec4937efcd3db3c8129fb1f

861+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

862+ containers-0.5.11.0=3a03e29a933c27106de8caad6a8dba89

863+ directory-1.3.1.5=fbc4e348e0c18c2b80ca9368e0275d72

864+ bytestring-0.10.8.2=9dd6632a6071c728fe550d499c942f0c

865865 filepath-1.4.2=27f5ec6358f0ec240d827eaa0860b2af

866866 transformers-0.5.5.0=b5d2f6cdac279ec17c0fad50f5348c4f

867867 process-1.6.3.0=030e21e561f9c3486a49333f2057b804

868868 stm-2.4.5.1=e1689617987db6dbcec99141fd7e70d8

869− unix-2.7.2.2=e6bcb93db14b690e7f0b0b39cdb6668a

869+ unix-2.7.2.2=1b1470032d7c086b787322282a984f1c

870870 terminfo-0.4.1.1=7c97c2b70b9b909e033361885d99c5fd

871871---

872872name: hpc

@@ -890,11 +890,11 @@ hs-libraries: HShpc-0.6.0.3

890890depends:

891891 base-4.11.1.0 containers-0.5.11.0 directory-1.3.1.5 filepath-1.4.2

892892 time-1.8.0.2

893−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

894− containers-0.5.11.0=35ebbdc04fdff8693d557eac5fd1cb0d

895− directory-1.3.1.5=9554b535b4324fb4915ea3cde0ada9e3

893+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

894+ containers-0.5.11.0=3a03e29a933c27106de8caad6a8dba89

895+ directory-1.3.1.5=fbc4e348e0c18c2b80ca9368e0275d72

896896 filepath-1.4.2=27f5ec6358f0ec240d827eaa0860b2af

897− time-1.8.0.2=7e7497056e79bf3d1e061b9c2ef21593

897+ time-1.8.0.2=fe7eb2e843def3e5fe89f1dd11e7c8ec

898898---

899899name: integer-gmp

900900version: 1.0.2.0

@@ -911,37 +911,10 @@ exposed-modules:

911911 GHC.Integer.Logarithms.Internals

912912hidden-modules: GHC.Integer.Type

913913hs-libraries: HSinteger-gmp-1.0.2.0

914−extra-libraries:

915− gmp

916914depends:

917915 ghc-prim-0.5.2.0

918916abi-depends: ghc-prim-0.5.2.0=0a2596c0f516eb6cbf13841c1f06715e

919917---

920−name: libiserv

921−version: 8.4.4

922−id: libiserv-8.4.4

923−key: libiserv-8.4.4

924−license: BSD-3-Clause

925−copyright: XXX

926−maintainer: XXX

927−author: XXX

928−synopsis: Provides shared functionality between iserv and iserv-proxy

929−category: Development

930−exposed: True

931−exposed-modules:

932− GHCi.Utils Lib

933−hs-libraries: HSlibiserv-8.4.4

934−depends:

935− base-4.11.1.0 binary-0.8.5.1 bytestring-0.10.8.2

936− containers-0.5.11.0 deepseq-1.4.3.0 ghci-8.4.4 unix-2.7.2.2

937−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

938− binary-0.8.5.1=102c321854f769bea022b84f469deee1

939− bytestring-0.10.8.2=6b29c2a8aec4937efcd3db3c8129fb1f

940− containers-0.5.11.0=35ebbdc04fdff8693d557eac5fd1cb0d

941− deepseq-1.4.3.0=011951b161142d1ecd2f936f724b0c4a

942− ghci-8.4.4=b1b3407d52f67288e1441195bdbf1680

943− unix-2.7.2.2=e6bcb93db14b690e7f0b0b39cdb6668a

944−---

945918name: mtl

946919version: 2.2.2

947920id: mtl-2.2.2

@@ -973,7 +946,7 @@ exposed-modules:

973946hs-libraries: HSmtl-2.2.2

974947depends:

975948 base-4.11.1.0 transformers-0.5.5.0

976−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

949+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

977950 transformers-0.5.5.0=b5d2f6cdac279ec17c0fad50f5348c4f

978951---

979952name: parsec

@@ -1019,10 +992,10 @@ exposed-modules:

1019992hs-libraries: HSparsec-3.1.13.0

1020993depends:

1021994 base-4.11.1.0 mtl-2.2.2 bytestring-0.10.8.2 text-1.2.3.1

1022−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

995+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

1023996 mtl-2.2.2=28a8b7973060d82dd465f14029339d4f

1024− bytestring-0.10.8.2=6b29c2a8aec4937efcd3db3c8129fb1f

1025− text-1.2.3.1=ce9e85f0d4840d83f3d554b4f833c06b

997+ bytestring-0.10.8.2=9dd6632a6071c728fe550d499c942f0c

998+ text-1.2.3.1=e0d7b65ba8d31007e57ce45ddef7efb8

1026999---

10271000name: pretty

10281001version: 1.1.3.6

@@ -1051,8 +1024,8 @@ exposed-modules:

10511024hs-libraries: HSpretty-1.1.3.6

10521025depends:

10531026 base-4.11.1.0 deepseq-1.4.3.0 ghc-prim-0.5.2.0

1054−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

1055− deepseq-1.4.3.0=011951b161142d1ecd2f936f724b0c4a

1027+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

1028+ deepseq-1.4.3.0=c2f0913f017a74ecf59e88ba8e164f77

10561029 ghc-prim-0.5.2.0=0a2596c0f516eb6cbf13841c1f06715e

10571030---

10581031name: process

@@ -1081,11 +1054,11 @@ includes:

10811054depends:

10821055 base-4.11.1.0 directory-1.3.1.5 filepath-1.4.2 deepseq-1.4.3.0

10831056 unix-2.7.2.2

1084−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

1085− directory-1.3.1.5=9554b535b4324fb4915ea3cde0ada9e3

1057+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

1058+ directory-1.3.1.5=fbc4e348e0c18c2b80ca9368e0275d72

10861059 filepath-1.4.2=27f5ec6358f0ec240d827eaa0860b2af

1087− deepseq-1.4.3.0=011951b161142d1ecd2f936f724b0c4a

1088− unix-2.7.2.2=e6bcb93db14b690e7f0b0b39cdb6668a

1060+ deepseq-1.4.3.0=c2f0913f017a74ecf59e88ba8e164f77

1061+ unix-2.7.2.2=1b1470032d7c086b787322282a984f1c

10891062---

10901063name: rts

10911064version: 1.0

@@ -1094,9 +1067,9 @@ key: rts

10941067license: BSD-3-Clause

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

10961069exposed: True

1097−hs-libraries: HSrts

1070+hs-libraries: HSrts Cffi

10981071extra-libraries:

1099− m dl ffi

1072+ m dl

11001073includes:

11011074 Stg.h

11021075ld-options: "-Wl,-u,_base_GHCziTopHandler_runIO_closure"

@@ -1188,7 +1161,7 @@ hidden-modules: Control.Sequential.STM

11881161hs-libraries: HSstm-2.4.5.1

11891162depends:

11901163 base-4.11.1.0 array-0.5.2.0

1191−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

1164+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

11921165 array-0.5.2.0=03a64bb9d4be6771406b73145e6e58e1

11931166---

11941167name: template-haskell

@@ -1215,9 +1188,9 @@ hidden-modules: Language.Haskell.TH.Lib.Map

12151188hs-libraries: HStemplate-haskell-2.13.0.0

12161189depends:

12171190 base-4.11.1.0 ghc-boot-th-8.4.4 pretty-1.1.3.6

1218−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

1191+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

12191192 ghc-boot-th-8.4.4=d8bd507419aa2dc5daee657f9d2838de

1220− pretty-1.1.3.6=0b29f432a127f89dd19124c8bd17d5f8

1193+ pretty-1.1.3.6=a22b26e5f7ddf72bac19d7d229502dac

12211194---

12221195name: terminfo

12231196version: 0.4.1.1

@@ -1243,10 +1216,10 @@ exposed-modules:

12431216 System.Console.Terminfo.Keys

12441217hs-libraries: HSterminfo-0.4.1.1

12451218extra-libraries:

1246− tinfo

1219+ ncurses

12471220depends:

12481221 base-4.11.1.0

1249−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

1222+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

12501223---

12511224name: text

12521225version: 1.2.3.1

@@ -1319,11 +1292,11 @@ depends:

13191292 array-0.5.2.0 base-4.11.1.0 binary-0.8.5.1 deepseq-1.4.3.0

13201293 ghc-prim-0.5.2.0 bytestring-0.10.8.2 integer-gmp-1.0.2.0

13211294abi-depends: array-0.5.2.0=03a64bb9d4be6771406b73145e6e58e1

1322− base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

1323− binary-0.8.5.1=102c321854f769bea022b84f469deee1

1324− deepseq-1.4.3.0=011951b161142d1ecd2f936f724b0c4a

1295+ base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

1296+ binary-0.8.5.1=246ff363717242ac7a7a3d37e6daabb8

1297+ deepseq-1.4.3.0=c2f0913f017a74ecf59e88ba8e164f77

13251298 ghc-prim-0.5.2.0=0a2596c0f516eb6cbf13841c1f06715e

1326− bytestring-0.10.8.2=6b29c2a8aec4937efcd3db3c8129fb1f

1299+ bytestring-0.10.8.2=9dd6632a6071c728fe550d499c942f0c

13271300 integer-gmp-1.0.2.0=28d9d8fbabb28cc19fc92446ffd9b739

13281301---

13291302name: time

@@ -1364,8 +1337,8 @@ hidden-modules: Data.Time.Calendar.Private Data.Time.Calendar.Days

13641337hs-libraries: HStime-1.8.0.2

13651338depends:

13661339 base-4.11.1.0 deepseq-1.4.3.0

1367−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

1368− deepseq-1.4.3.0=011951b161142d1ecd2f936f724b0c4a

1340+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

1341+ deepseq-1.4.3.0=c2f0913f017a74ecf59e88ba8e164f77

13691342---

13701343name: transformers

13711344version: 0.5.5.0

@@ -1414,7 +1387,7 @@ exposed-modules:

14141387hs-libraries: HStransformers-0.5.5.0

14151388depends:

14161389 base-4.11.1.0

1417−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

1390+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

14181391---

14191392name: unix

14201393version: 2.7.2.2

@@ -1460,9 +1433,9 @@ includes:

14601433 HsUnix.h execvpe.h

14611434depends:

14621435 base-4.11.1.0 bytestring-0.10.8.2 time-1.8.0.2

1463−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

1464− bytestring-0.10.8.2=6b29c2a8aec4937efcd3db3c8129fb1f

1465− time-1.8.0.2=7e7497056e79bf3d1e061b9c2ef21593

1436+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

1437+ bytestring-0.10.8.2=9dd6632a6071c728fe550d499c942f0c

1438+ time-1.8.0.2=fe7eb2e843def3e5fe89f1dd11e7c8ec

14661439---

14671440name: xhtml

14681441version: 3000.2.2.1

@@ -1493,4 +1466,4 @@ hidden-modules: Text.XHtml.Strict.Attributes

14931466hs-libraries: HSxhtml-3000.2.2.1

14941467depends:

14951468 base-4.11.1.0

1496−abi-depends: base-4.11.1.0=8be57ed6746733bb4b1ce881f827d7bd

1469+abi-depends: base-4.11.1.0=b368cab58fa51949d1638013a72f7adf

materialized/dummy-ghc/ghc-8.4.4-x86_64-darwin/ghc/info+7−2

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

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

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

3+ ,("C compiler command","clang")

34 ,("C compiler flags"," -fno-stack-protector")

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

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

7+ ,("Haskell CPP command","clang")

68 ,("Haskell CPP flags","-E -undef -traditional -Wno-invalid-pp-token -Wno-unicode -Wno-trigraphs")

9+ ,("ld command","ld")

710 ,("ld flags","")

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

912 ,("ld supports build-id","NO")

1013 ,("ld supports filelist","YES")

1114 ,("ld is GNU ld","NO")

15+ ,("ar command","ar")

1216 ,("ar flags","qcls")

1317 ,("ar supports at file","NO")

18+ ,("ranlib command","ranlib")

1419 ,("touch command","touch")

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

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

@@ -28,8 +33,8 @@

2833 ,("LLVM opt command","opt")

2934 ,("LLVM clang command","clang")

3035 ,("Project version","8.4.4")

31− ,("Project Git commit id","-n 39e711436400ecde05961224fa37759f2c2ff862")

32− ,("Booter version","8.4.4")

36+ ,("Project Git commit id","3bed09b2efd3df678c5d0752d2cdfba20d7c4863")

37+ ,("Booter version","8.4.3")

3338 ,("Stage","2")

3439 ,("Build platform","x86_64-apple-darwin")

3540 ,("Host platform","x86_64-apple-darwin")

materialized/dummy-ghc/ghc-8.4.4-x86_64-linux/ghc-pkg/dump-global+5−30

@@ -657,12 +657,12 @@ abi-depends: base-4.11.1.0=5dd741007d6cdd784ac4032dc52ae6cd

657657 containers-0.5.11.0=e0faa336d346ac4d4359e1f41cd5c793

658658 array-0.5.2.0=03a64bb9d4be6771406b73145e6e58e1

659659 filepath-1.4.2=27f5ec6358f0ec240d827eaa0860b2af

660− template-haskell-2.13.0.0=5403c6ee814a9f714bb46b8713d84769

660+ template-haskell-2.13.0.0=87d935369842db0114b18a4f5cccd520

661661 hpc-0.6.0.3=b0226a6fb3c6681995359ece2929495f

662662 transformers-0.5.5.0=b5d2f6cdac279ec17c0fad50f5348c4f

663663 ghc-boot-8.4.4=17a9f8091d49597104125d406bbf74ae

664664 ghc-boot-th-8.4.4=d8bd507419aa2dc5daee657f9d2838de

665− ghci-8.4.4=fa97ba583df9728c74ddeb01f64277f3

665+ ghci-8.4.4=973ae1f70f738efadae73c1d6af83b15

666666 unix-2.7.2.2=fe53d1beb580ee5f786dd05bcc179784

667667 terminfo-0.4.1.1=7c97c2b70b9b909e033361885d99c5fd

668668---

@@ -807,7 +807,7 @@ abi-depends: array-0.5.2.0=03a64bb9d4be6771406b73145e6e58e1

807807 filepath-1.4.2=27f5ec6358f0ec240d827eaa0860b2af

808808 ghc-boot-8.4.4=17a9f8091d49597104125d406bbf74ae

809809 ghc-boot-th-8.4.4=d8bd507419aa2dc5daee657f9d2838de

810− template-haskell-2.13.0.0=5403c6ee814a9f714bb46b8713d84769

810+ template-haskell-2.13.0.0=87d935369842db0114b18a4f5cccd520

811811 transformers-0.5.5.0=b5d2f6cdac279ec17c0fad50f5348c4f

812812 unix-2.7.2.2=fe53d1beb580ee5f786dd05bcc179784

813813---

@@ -915,31 +915,6 @@ depends:

915915 ghc-prim-0.5.2.0

916916abi-depends: ghc-prim-0.5.2.0=0a2596c0f516eb6cbf13841c1f06715e

917917---

918−name: libiserv

919−version: 8.4.4

920−id: libiserv-8.4.4

921−key: libiserv-8.4.4

922−license: BSD-3-Clause

923−copyright: XXX

924−maintainer: XXX

925−author: XXX

926−synopsis: Provides shared functionality between iserv and iserv-proxy

927−category: Development

928−exposed: True

929−exposed-modules:

930− GHCi.Utils Lib

931−hs-libraries: HSlibiserv-8.4.4

932−depends:

933− base-4.11.1.0 binary-0.8.5.1 bytestring-0.10.8.2

934− containers-0.5.11.0 deepseq-1.4.3.0 ghci-8.4.4 unix-2.7.2.2

935−abi-depends: base-4.11.1.0=5dd741007d6cdd784ac4032dc52ae6cd

936− binary-0.8.5.1=24ea694af446178c140cf5fd8325d353

937− bytestring-0.10.8.2=76891e933d92454fc24dbda9667e7672

938− containers-0.5.11.0=e0faa336d346ac4d4359e1f41cd5c793

939− deepseq-1.4.3.0=17e4fcaae52d394a15cfa6f2abc91bb0

940− ghci-8.4.4=fa97ba583df9728c74ddeb01f64277f3

941− unix-2.7.2.2=fe53d1beb580ee5f786dd05bcc179784

942−---

943918name: mtl

944919version: 2.2.2

945920id: mtl-2.2.2

@@ -1092,9 +1067,9 @@ key: rts

10921067license: BSD-3-Clause

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

10941069exposed: True

1095−hs-libraries: HSrts

1070+hs-libraries: HSrts Cffi

10961071extra-libraries:

1097− m rt dl ffi numa pthread

1072+ m rt dl pthread

10981073includes:

10991074 Stg.h

11001075ld-options: "-Wl,-u,base_GHCziTopHandler_runIO_closure"

materialized/dummy-ghc/ghc-8.4.4-x86_64-linux/ghc/info+7−2

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

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

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

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

34 ,("C compiler flags"," -fno-stack-protector")

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

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

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

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

9+ ,("ld command","ld")

710 ,("ld flags","")

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

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

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

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

15+ ,("ar command","ar")

1216 ,("ar flags","q")

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

18+ ,("ranlib command","ranlib")

1419 ,("touch command","touch")

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

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

@@ -28,8 +33,8 @@

2833 ,("LLVM opt command","opt")

2934 ,("LLVM clang command","clang")

3035 ,("Project version","8.4.4")

31− ,("Project Git commit id","-n 39e711436400ecde05961224fa37759f2c2ff862")

32− ,("Booter version","8.4.4")

36+ ,("Project Git commit id","3bed09b2efd3df678c5d0752d2cdfba20d7c4863")

37+ ,("Booter version","8.0.2")

3338 ,("Stage","2")

3439 ,("Build platform","x86_64-unknown-linux")

3540 ,("Host platform","x86_64-unknown-linux")

materialized/ghc-boot-packages-nix/ghc884/ghc.nix+2−2

@@ -56,8 +56,8 @@

5656 (hsPkgs."unix" or (errorHandler.buildDepError "unix"))

5757 ] ++ (pkgs.lib).optional (flags.terminfo) (hsPkgs."terminfo" or (errorHandler.buildDepError "terminfo")))) ++ (pkgs.lib).optional (flags.integer-gmp && flags.integer-simple) (hsPkgs."invalid-cabal-flag-settings" or (errorHandler.buildDepError "invalid-cabal-flag-settings"))) ++ (pkgs.lib).optional (flags.integer-gmp) (hsPkgs."integer-gmp" or (errorHandler.buildDepError "integer-gmp"))) ++ (pkgs.lib).optional (flags.integer-simple) (hsPkgs."integer-simple" or (errorHandler.buildDepError "integer-simple"));

5858 build-tools = [

59− (hsPkgs.buildPackages.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex")))

60− (hsPkgs.buildPackages.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy")))

59+ (hsPkgs.buildPackages.alex.components.exes.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex:alex")))

60+ (hsPkgs.buildPackages.happy.components.exes.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy:happy")))

6161 ];

6262 buildable = true;

6363 };

materialized/ghc-extra-projects/cross/ghc8101/default.nix+1−1

@@ -17,7 +17,7 @@

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

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

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

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

20+ "process".revision = (((hackage."process")."1.6.10.0").revisions).default;

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

2222 "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.10.1").revisions).default;

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

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

@@ -17,7 +17,7 @@

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

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

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

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

20+ "process".revision = (((hackage."process")."1.6.10.0").revisions).default;

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

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

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

materialized/ghc-extra-projects/cross/ghc865/.plan.nix/bytestring.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [ "README.md" "Changelog.md" ];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc865/.plan.nix/ghc-boot.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [ "changelog.md" ];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc865/.plan.nix/ghc.nix+3−3

@@ -31,7 +31,7 @@

3131 isLocal = true;

3232 detailLevel = "FullDetails";

3333 licenseFiles = [ "LICENSE" ];

34− dataDir = "";

34+ dataDir = ".";

3535 dataFiles = [];

3636 extraSrcFiles = [

3737 "utils/md5.h"

@@ -68,8 +68,8 @@

6868 (hsPkgs."unix" or (errorHandler.buildDepError "unix"))

6969 ] ++ (pkgs.lib).optional (flags.terminfo) (hsPkgs."terminfo" or (errorHandler.buildDepError "terminfo")));

7070 build-tools = [

71− (hsPkgs.buildPackages.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex")))

72− (hsPkgs.buildPackages.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy")))

71+ (hsPkgs.buildPackages.alex.components.exes.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex:alex")))

72+ (hsPkgs.buildPackages.happy.components.exes.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy:happy")))

7373 ];

7474 buildable = true;

7575 modules = [

materialized/ghc-extra-projects/cross/ghc865/.plan.nix/ghci.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [ "changelog.md" ];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc865/.plan.nix/hpc.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [ "changelog.md" ];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc865/.plan.nix/iserv-proxy.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc865/.plan.nix/iserv.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc865/.plan.nix/libiserv.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc865/.plan.nix/remote-iserv.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc865/default.nix+3−4

@@ -8,7 +8,7 @@

88 "ghc-heap".revision = (((hackage."ghc-heap")."8.6.5").revisions).default;

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

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

11− "alex".revision = (((hackage."alex")."3.2.5").revisions).default;

11+ "alex".revision = (((hackage."alex")."3.2.6").revisions).default;

1212 "alex".flags.small_base = true;

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

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

@@ -19,10 +19,9 @@

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

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

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

22− "happy".revision = (((hackage."happy")."1.19.12").revisions).default;

23− "happy".flags.small_base = true;

22+ "happy".revision = (((hackage."happy")."1.20.0").revisions).default;

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

25− "process".revision = (((hackage."process")."1.6.9.0").revisions).default;

24+ "process".revision = (((hackage."process")."1.6.10.0").revisions).default;

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

2726 "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.6.5").revisions).default;

2827 "array".revision = (((hackage."array")."0.5.3.0").revisions).default;

materialized/ghc-extra-projects/cross/ghc883/.plan.nix/bytestring.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [ "README.md" "Changelog.md" ];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc883/.plan.nix/ghc-boot.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [ "changelog.md" ];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc883/.plan.nix/ghc.nix+3−3

@@ -32,7 +32,7 @@

3232 isLocal = true;

3333 detailLevel = "FullDetails";

3434 licenseFiles = [ "LICENSE" ];

35− dataDir = "";

35+ dataDir = ".";

3636 dataFiles = [];

3737 extraSrcFiles = [

3838 "utils/md5.h"

@@ -69,8 +69,8 @@

6969 (hsPkgs."unix" or (errorHandler.buildDepError "unix"))

7070 ] ++ (pkgs.lib).optional (flags.terminfo) (hsPkgs."terminfo" or (errorHandler.buildDepError "terminfo")))) ++ (pkgs.lib).optional (flags.integer-gmp && flags.integer-simple) (hsPkgs."invalid-cabal-flag-settings" or (errorHandler.buildDepError "invalid-cabal-flag-settings"))) ++ (pkgs.lib).optional (flags.integer-gmp) (hsPkgs."integer-gmp" or (errorHandler.buildDepError "integer-gmp"))) ++ (pkgs.lib).optional (flags.integer-simple) (hsPkgs."integer-simple" or (errorHandler.buildDepError "integer-simple"));

7171 build-tools = [

72− (hsPkgs.buildPackages.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex")))

73− (hsPkgs.buildPackages.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy")))

72+ (hsPkgs.buildPackages.alex.components.exes.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex:alex")))

73+ (hsPkgs.buildPackages.happy.components.exes.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy:happy")))

7474 ];

7575 buildable = true;

7676 modules = [

materialized/ghc-extra-projects/cross/ghc883/.plan.nix/ghci.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [ "changelog.md" ];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc883/.plan.nix/hpc.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [ "changelog.md" ];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc883/.plan.nix/iserv-proxy.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc883/.plan.nix/iserv.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc883/.plan.nix/libiserv.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc883/.plan.nix/remote-iserv.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc883/default.nix+3−4

@@ -8,7 +8,7 @@

88 "ghc-heap".revision = (((hackage."ghc-heap")."8.8.3").revisions).default;

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

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

11− "alex".revision = (((hackage."alex")."3.2.5").revisions).default;

11+ "alex".revision = (((hackage."alex")."3.2.6").revisions).default;

1212 "alex".flags.small_base = true;

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

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

@@ -19,10 +19,9 @@

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

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

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

22− "happy".revision = (((hackage."happy")."1.19.12").revisions).default;

23− "happy".flags.small_base = true;

22+ "happy".revision = (((hackage."happy")."1.20.0").revisions).default;

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

25− "process".revision = (((hackage."process")."1.6.9.0").revisions).default;

24+ "process".revision = (((hackage."process")."1.6.10.0").revisions).default;

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

2726 "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.8.3").revisions).default;

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

materialized/ghc-extra-projects/cross/ghc884/.plan.nix/bytestring.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [ "README.md" "Changelog.md" ];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc884/.plan.nix/ghc-boot.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [ "changelog.md" ];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc884/.plan.nix/ghc.nix+3−3

@@ -32,7 +32,7 @@

3232 isLocal = true;

3333 detailLevel = "FullDetails";

3434 licenseFiles = [ "LICENSE" ];

35− dataDir = "";

35+ dataDir = ".";

3636 dataFiles = [];

3737 extraSrcFiles = [

3838 "utils/md5.h"

@@ -69,8 +69,8 @@

6969 (hsPkgs."unix" or (errorHandler.buildDepError "unix"))

7171 build-tools = [

72− (hsPkgs.buildPackages.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex")))

73− (hsPkgs.buildPackages.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy")))

72+ (hsPkgs.buildPackages.alex.components.exes.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex:alex")))

73+ (hsPkgs.buildPackages.happy.components.exes.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy:happy")))

7474 ];

7575 buildable = true;

7676 modules = [

materialized/ghc-extra-projects/cross/ghc884/.plan.nix/ghci.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [ "changelog.md" ];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc884/.plan.nix/hpc.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [ "changelog.md" ];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc884/.plan.nix/iserv-proxy.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc884/.plan.nix/iserv.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc884/.plan.nix/libiserv.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENSE" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc884/.plan.nix/remote-iserv.nix+1−1

@@ -24,7 +24,7 @@

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/ghc-extra-projects/cross/ghc884/default.nix+3−4

@@ -8,7 +8,7 @@

88 "ghc-heap".revision = (((hackage."ghc-heap")."8.8.4").revisions).default;

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

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

11− "alex".revision = (((hackage."alex")."3.2.5").revisions).default;

11+ "alex".revision = (((hackage."alex")."3.2.6").revisions).default;

1212 "alex".flags.small_base = true;

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

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

@@ -19,10 +19,9 @@

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

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

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

22− "happy".revision = (((hackage."happy")."1.19.12").revisions).default;

23− "happy".flags.small_base = true;

22+ "happy".revision = (((hackage."happy")."1.20.0").revisions).default;

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

25− "process".revision = (((hackage."process")."1.6.9.0").revisions).default;

24+ "process".revision = (((hackage."process")."1.6.10.0").revisions).default;

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

2726 "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.8.4").revisions).default;

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

materialized/ghc-extra-projects/default/ghc8101/default.nix+1−1