Skip to content
This repository has been archived by the owner on Nov 24, 2018. It is now read-only.

Adapt to new Dhall.Map #63

Merged
merged 5 commits into from
Oct 12, 2018
Merged

Adapt to new Dhall.Map #63

merged 5 commits into from
Oct 12, 2018

Conversation

jneira
Copy link
Collaborator

@jneira jneira commented Oct 11, 2018

@jneira jneira mentioned this pull request Oct 11, 2018
@jneira
Copy link
Collaborator Author

jneira commented Oct 11, 2018

The nix build has failed, as i am on windows dont know if i am able to compute the sha of the dhall-haskell commit to update nix/dhall.nix 🤔

@jneira
Copy link
Collaborator Author

jneira commented Oct 11, 2018

I've added a cabal.project to make it buildable with cabal-2.4.0.0, after the release we should remove the source-repository-package stanza (however i would keep cabal.project)

@Gabriella439
Copy link
Collaborator

@jneira: Oh, whoops. I actually already did the work to build against the new Dhall.Map but I forgot to open a pull request for. I can open a pull request with the changes I had in my local repository

@Gabriella439
Copy link
Collaborator

Actually, the two branches are close enough that I can just open a pull request against your pull request

@Gabriella439
Copy link
Collaborator

@jneira: Alright, I have a pull request open against your branch here: https://github.com/jneira/dhall-json/pull/1

Once you merge that then this pull request will pass

This also includes some cosmetic changes from my own branch
@jneira
Copy link
Collaborator Author

jneira commented Oct 12, 2018

Merged!

@jneira jneira merged commit 0c2398a into dhall-lang:master Oct 12, 2018
@jneira jneira deleted the dhall-new-map branch October 16, 2018 19:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants