Skip to content

Conversation

@JordanMartinez
Copy link
Contributor

@JordanMartinez JordanMartinez commented Jun 28, 2020

Description of the change

Fixes #659

Checklist:

  • Added the change to the "Unreleased" section of the changelog
  • Added some example of the new feature to the README
  • Added a test for the contribution (if applicable)

P.S.: the above checks are not compulsory to get a change merged, so you may skip them. However, taking care of them will result in less work for the maintainers and will be much appreciated 😊

Copy link
Member

@f-f f-f left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a small comment, but otherwise looks great, thanks! 👏

@f-f
Copy link
Member

f-f commented Jul 1, 2020

This is good to go, but it looks like there's a test failing - I suspect we have fixtures trying to match on the content of the template

@JordanMartinez
Copy link
Contributor Author

JordanMartinez commented Jul 1, 2020

It's caused by this line:

-      dhallSource `shouldSatisfy` (Text.isInfixOf "let overrides =") -- some dhall stuff is present
+      dhallSource `shouldSatisfy` (Text.isInfixOf "let upstream") -- some dhall stuff is present

@f-f f-f merged commit eb9e0b8 into purescript:master Jul 2, 2020
@f-f
Copy link
Member

f-f commented Jul 2, 2020

Thank you! 💯

let upstream = -- <package set URL here>
in upstream
with simple-json.repo = "https://github.com/my-user/purescript-simple-json.git"
with simple-json.verison = "701f3e44aafb1a6459281714858fadf2c4c2a977"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo here -- version

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dah! I'm pretty sure my fingers have muscle memory now in spelling this word wrong!

Copy link
Contributor Author

@JordanMartinez JordanMartinez Jul 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixing in #663

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Use new Dhall syntax for overrides

3 participants