Add pins and materialization for ghc-boot-packages and ghc-extra-packages #546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

hamishmack merged 31 commits into master from hkm/fix-pins

Apr 20, 2020

Collaborator

hamishmack commented Apr 15, 2020

This might help with caching issues, but it is also a useful
first step if we want to materialize these.

hamishmack added 2 commits

April 15, 2020 17:10


          Include tests in path for cross compiled tests

a5bc3df


          Add ghc-boot-packages-nix to haskellNixRoots

7c80acd

Collaborator

michaelpj commented Apr 15, 2020

👍 for materializing, or at least pinning the sha256!

hamishmack added 7 commits

April 16, 2020 01:01


          Fix warning message

8d7ad1f


          Fix naming warnings in tests sources

9c1734f

This also uses a single cleanGit call for all the tests in case that
has an impact on performance.


          Move things deeper in release.nix to prevent

7670bda

This seems to prevent unwanted evals


          Add memoize code for ghc-boot and ghc-extra pkgs

3237eb6


          Memoize ghc-boot and ghc-extra pkgs nix

c001066


          Fix eval error

a9f3f9e


          Fix more eval issues

4bceab0

hamishmack commented

View reviewed changes

lib/call-cabal-project-to-nix.nix Show resolved Hide resolved

hamishmack commented

View reviewed changes

lib/call-cabal-project-to-nix.nix Show resolved Hide resolved

hamishmack commented

View reviewed changes

ci.nix Outdated Show resolved Hide resolved

hamishmack commented

View reviewed changes

ci.nix Show resolved Hide resolved

hamishmack commented

View reviewed changes

lib/call-stack-to-nix.nix Show resolved Hide resolved

hamishmack commented

View reviewed changes

lib/clean-source-with.nix Show resolved Hide resolved

hamishmack commented

View reviewed changes

overlays/ghc-packages.nix Show resolved Hide resolved

hamishmack commented

View reviewed changes

overlays/ghc-packages.nix Outdated Show resolved Hide resolved

hamishmack added 2 commits

April 17, 2020 12:12


          Add comments

01f09cd


          Tidy up and add comment

561fb70

hamishmack changed the title ~~Add pins for ghc-boot-packages~~ Add pins and materialization for ghc-boot-packages and ghc-extra-packages

hamishmack requested a review from angerman

April 17, 2020 00:24

michaelpj approved these changes

View reviewed changes

Collaborator

michaelpj left a comment

Looks good! Do we need both the foo.nix and the .plan-nix/foo.nix files?

Would be great to have some instructions for updating things too.

overlays/ghc-packages.nix Outdated Show resolved Hide resolved

overlays/ghc-packages.nix Outdated Show resolved Hide resolved

overlays/ghc-packages.nix Outdated Show resolved Hide resolved

overlays/ghc-packages.nix Outdated Show resolved Hide resolved

overlays/ghc-packages.nix Show resolved Hide resolved

overlays/ghc-packages.nix Outdated Show resolved Hide resolved

overlays/ghc-packages.nix Outdated Show resolved Hide resolved

overlays/ghc-packages.nix Outdated Show resolved Hide resolved

hamishmack and others added 7 commits

April 17, 2020 23:18


          Update overlays/ghc-packages.nix

8a28805

Co-Authored-By: Michael Peyton Jones <michael.peyton-jones@iohk.io>


          Update overlays/ghc-packages.nix

6e593f7

Co-Authored-By: Michael Peyton Jones <michael.peyton-jones@iohk.io>


          Update overlays/ghc-packages.nix

29c4068

Co-Authored-By: Michael Peyton Jones <michael.peyton-jones@iohk.io>


          Nicer errors when materialized path does not exist

1ebaa04


          Let materialize function check for path existence

65ad655


          Fix comment

d19bbd3


          Add internalHackageIndexState

3eabc22

hamishmack added 8 commits

April 18, 2020 16:28


          Windows materialization fixes

68cebe3


          Turn checkMaterialization back off

8083fcd


          Fix release.nix being more strict than ci.nix

e75f4af


          In filterAttrsOnlyR... hide recurseForDerivations

67d3767


          Make sure we recurse at least one level

db43a05


          Alternative version of filterAttrsOnlyRecursive

08f6e4d


          Avoid strictness issues by setting attrs to {}

6f16c1e


          Add comment

45b326e

hamishmack commented

View reviewed changes

ci-lib.nix Show resolved Hide resolved

michaelpj approved these changes

View reviewed changes

lib/materialize.nix Outdated Show resolved Hide resolved

overlays/haskell.nix Show resolved Hide resolved

overlays/ghc-packages.nix Outdated Show resolved Hide resolved

hamishmack added 3 commits

April 19, 2020 18:09


          Materialization fixes and docs

1cec3dc


          Better comment

fb82f17


          Improve materialization check and update docs

945c331

angerman approved these changes

View reviewed changes

Collaborator

angerman left a comment

Is there a way to regenerate all the materialisations (e.g. a script) for all the boot and extra packages?

ci-lib.nix Show resolved Hide resolved

ci.nix Outdated Show resolved Hide resolved

ci.nix Outdated Show resolved Hide resolved

lib/call-stack-to-nix.nix Outdated Show resolved Hide resolved

hamishmack and others added 2 commits

April 20, 2020 12:55


          Update lib/call-stack-to-nix.nix

a65e75f

Co-Authored-By: Moritz Angermann <moritz.angermann@gmail.com>


          Remove sanity-checks level (fixed in ci-lib.nix)

c0a97a4

hamishmack merged commit d1102d3 into master

iohk-bors bot deleted the hkm/fix-pins branch

April 20, 2020 01:27

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet