Skip to content
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

Dhall 1.23 #102

Merged
merged 2 commits into from
May 15, 2019
Merged

Dhall 1.23 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb28a24
Bump up dhall-to-etlas version with compile errors
jneira May 13, 2019
ee19c35
Adapt code to new dhall api
jneira May 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dhall-to-etlas
Open in desktop
Submodule dhall-to-etlas updated 57 files
+14 −0 Changelog.md
+16 −0 QuickCheck.nix
+9 −5 README.md
+15 −0 base-compat-batteries.nix
+9 −10 dhall-to-etlas.cabal
+13 −16 dhall-to-etlas.dhall
+16 −16 dhall.nix
+2 −2 dhall/defaults/BuildInfo.dhall
+2 −2 dhall/defaults/Package.dhall
+1 −1 dhall/defaults/SourceRepo.dhall
+16 −35 dhall/types/Arch.dhall
+2 −11 dhall/types/BuildType.dhall
+11 −22 dhall/types/Compiler.dhall
+3 −3 dhall/types/ForeignLibrary.dhall
+1 −1 dhall/types/Language.dhall
+11 −18 dhall/types/License.dhall
+1 −7 dhall/types/ModuleRenaming.dhall
+16 −32 dhall/types/OS.dhall
+1 −1 dhall/types/RepoKind.dhall
+8 −16 dhall/types/RepoType.dhall
+32 −64 dhall/types/SPDX/LicenseExceptionId.dhall
+349 −698 dhall/types/SPDX/LicenseId.dhall
+1 −1 dhall/types/Scope.dhall
+1 −1 dhall/utils/GitHub-project.dhall
+1 −1 dhall/utils/GitHubTag-project.dhall
+35 −17 exe/Main.hs
+3 −3 golden-tests/cabal-to-dhall/SPDX.dhall.skip
+3 −3 golden-tests/cabal-to-dhall/conditional-dependencies.dhall
+3 −3 golden-tests/cabal-to-dhall/dhall-to-etlas.dhall
+7 −7 golden-tests/cabal-to-dhall/gh-36.dhall
+4 −4 golden-tests/cabal-to-dhall/mixins-no-signatures.dhall
+3 −7 golden-tests/cabal-to-dhall/sourcerepo-defaults.dhall
+3 −3 golden-tests/dhall-to-cabal/SPDX.dhall.skip
+1 −1 golden-tests/dhall-to-cabal/allrightsreserved-2.0.dhall
+1 −1 golden-tests/dhall-to-cabal/allrightsreserved-2.2.dhall
+1 −1 golden-tests/dhall-to-cabal/compiler-options-order.dhall
+1 −1 golden-tests/dhall-to-cabal/conditional-dependencies.dhall
+1 −1 golden-tests/dhall-to-cabal/dhall-eta.dhall
+44 −82 golden-tests/dhall-to-cabal/dhall-to-etlas.cabal
+46 −83 golden-tests/dhall-to-cabal/dhall-to-etlas.dhall
+1 −1 golden-tests/dhall-to-cabal/gh-53.dhall
+1 −1 golden-tests/dhall-to-cabal/gh-55.dhall
+1 −1 golden-tests/dhall-to-cabal/map-source-repo.dhall
+4 −4 golden-tests/dhall-to-cabal/mixins-no-signatures.dhall
+2 −2 golden-tests/dhall-to-cabal/nested-conditions.dhall
+3 −3 golden-tests/dhall-to-cabal/wai-servlet-handler-jetty.dhall
+4 −4 golden-tests/dhall-to-cabal/wai-servlet.dhall
+84 −102 lib/CabalToDhall.hs
+1 −22 lib/Dhall/Extra.hs
+0 −2 lib/DhallLocation.hs
+68 −122 lib/DhallToCabal.hs
+23 −0 quickcheck-instances.nix
+10 −0 release.nix
+7 −4 repline.nix
+19 −0 splitmix.nix
+15 −7 stack.yaml
+10 −0 transformers-compat.nix
4 changes: 2 additions & 2 deletions etlas/Distribution/Client/PackageDescription/Dhall.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,9 @@ writeAndFreezeCabalToDhall verbosity path cabal = do
info verbosity $ "Writing dhall file: " ++ path
StrictText.writeFile path ( cabalToDhall cabal )
info verbosity $ "Formatting dhall file..."
Dhall.format Dhall.Unicode ( Just path )
Dhall.format (Dhall.Format Dhall.Unicode ( Dhall.Modify ( Just path ) ))
info verbosity $ "Freezing dhall file..."
Dhall.freeze ( Just path ) Dhall.defaultStandardVersion
Dhall.freeze ( Just path ) True Dhall.Unicode Dhall.defaultStandardVersion

cabalToDhall :: String -> Dhall.Text
cabalToDhall cabal = Dhall.pretty dhallExpr
Expand Down
2 changes: 1 addition & 1 deletion etlas/etlas.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ library
bytestring >= 0.9 && < 1,
cryptonite >= 0.23 && < 1.0,
etlas-cabal >= 1.0,
dhall >= 1.20.1 && < 1.21,
dhall >= 1.23.0 && < 1.24,
dhall-to-etlas >= 1.4,
containers >= 0.4 && < 0.6,
cryptohash-sha256 >= 0.11 && < 0.12,
Expand Down
19 changes: 11 additions & 8 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ extra-deps:
- echo-0.1.3
- ed25519-0.0.5.0
- mintty-0.1.1
- parsec-3.1.13.0
- dhall-1.20.1
# dhall-to-etlas
- dhall-1.23.0
- ansi-terminal-0.7.1.1
- ansi-wl-pprint-0.6.8.2
- cryptonite-0.24
- formatting-6.3.2
- megaparsec-7.0.4
- parser-combinators-1.0.0
- optparse-generic-1.3.0
- optparse-applicative-0.14.0.0
- optparse-applicative-0.14.3.0
- Only-0.1
- memory-0.14.14
- basement-0.0.6
Expand All @@ -21,18 +21,19 @@ extra-deps:
- directory-1.2.7.1
- foundation-0.0.19
- process-1.2.3.0
- repline-0.2.0.0
- repline-0.2.1.0
- haskeline-0.7.4.2
- aeson-1.2.3.0
- th-abstraction-0.2.6.0
- hashable-1.2.7.0
- Diff-0.3.4
- cborg-0.2.0.0
- serialise-0.2.0.0
- cborg-0.2.1.0
- serialise-0.2.1.0
- shell-escape-0.2.0
- cborg-json-0.2.1.0
- dotgen-0.4.2
- aeson-pretty-0.8.7
- transformers-compat-0.6.4
- exceptions-0.10.1
- parsec-3.1.13.0
resolver: lts-6.27
flags:
etlas-cabal:
Expand All @@ -41,6 +42,8 @@ flags:
parsec: true
mintty:
win32-2-5: false
transformers-compat:
four: true
packages:
- etlas-cabal/
- dhall-to-etlas/
Expand Down