Bump up dhall-to-etlas version

jneira · Nov 30, 2018 · d9364f5 · d9364f5
1 parent b22e5f7
commit d9364f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/dhall-to-etlas b/dhall-to-etlas
diff --git a/etlas/etlas.cabal b/etlas/etlas.cabal
@@ -201,7 +201,7 @@ library
         binary     >= 0.5      && < 0.9,
         bytestring >= 0.9      && < 1,
         etlas-cabal >= 1.0,
-        dhall      >= 1.18.0   && < 1.19,         
+        dhall      >= 1.19.0   && < 1.20,         
         dhall-to-etlas >= 1.3,
         containers >= 0.4      && < 0.6,
         cryptohash-sha256 >= 0.11 && < 0.12,

diff --git a/stack.yaml b/stack.yaml
@@ -4,12 +4,12 @@ extra-deps:
 - ed25519-0.0.5.0
 - mintty-0.1.1
 - parsec-3.1.13.0
-- dhall-1.18.0
+- dhall-1.19.1
 - ansi-terminal-0.7.1.1
 - ansi-wl-pprint-0.6.8.2
 - cryptonite-0.24
 - formatting-6.3.2
-- megaparsec-7.0.1
+- megaparsec-7.0.4
 - parser-combinators-1.0.0
 - optparse-generic-1.3.0
 - optparse-applicative-0.14.0.0
@@ -29,6 +29,7 @@ extra-deps:
 - Diff-0.3.4
 - cborg-0.2.0.0
 - serialise-0.2.0.0
+- dotgen-0.4.2
 resolver: lts-6.27
 flags:
   etlas-cabal:
+7 −0		cabal.project
+1 −1		dhall-to-cabal.nix
+8 −8		dhall-to-etlas.cabal
+91 −93		dhall-to-etlas.dhall
+11 −10		dhall.nix
+2 −2		dhall/SPDX/and.dhall
+2 −2		dhall/SPDX/license.dhall
+2 −2		dhall/SPDX/licenseVersionOrLater.dhall
+2 −2		dhall/SPDX/or.dhall
+2 −2		dhall/SPDX/ref.dhall
+2 −2		dhall/SPDX/refWithFile.dhall
+2 −2		dhall/defaults/BuildInfo.dhall
+1 −1		dhall/defaults/CompilerOptions.dhall
+2 −2		dhall/defaults/Executable.dhall
+1 −1		dhall/defaults/Library.dhall
+6 −6		dhall/defaults/Package.dhall
+10 −9		dhall/defaults/SourceRepo.dhall
+2 −30		dhall/prelude.dhall
+2 −2		dhall/types/SPDX.dhall
+38 −39		dhall/unconditional.dhall
+21 −23		dhall/utils/GitHub-project.dhall
+45 −48		dhall/utils/majorVersions.dhall
+18 −18		dhall/utils/mapSourceRepos.dhall
+18 −12		exe/Main.hs
+28 −14		golden-tests/GoldenTests.hs
+7 −9		golden-tests/cabal-to-dhall/SPDX.dhall.skip
+3 −3		golden-tests/cabal-to-dhall/benchmark.dhall
+6 −6		golden-tests/cabal-to-dhall/conditional-dependencies.dhall
+3 −3		golden-tests/cabal-to-dhall/default-license-2.2.dhall
+3 −3		golden-tests/cabal-to-dhall/executable.dhall
+10 −10		golden-tests/cabal-to-dhall/gh-36.dhall
+10 −10		golden-tests/cabal-to-dhall/mixins-no-signatures.dhall
+4 −4		golden-tests/cabal-to-dhall/otheros.dhall
+3 −3		golden-tests/cabal-to-dhall/simple.dhall
+7 −7		golden-tests/cabal-to-dhall/sourcerepo-defaults.dhall
+5 −5		golden-tests/dhall-to-cabal/SPDX.dhall.skip
+3 −3		golden-tests/dhall-to-cabal/allrightsreserved-2.0.dhall
+3 −3		golden-tests/dhall-to-cabal/allrightsreserved-2.2.dhall
+50 −40		golden-tests/dhall-to-cabal/compiler-options-order.dhall
+32 −28		golden-tests/dhall-to-cabal/conditional-dependencies.dhall
+14 −8		golden-tests/dhall-to-cabal/default-license-2.2.dhall
+257 −0		golden-tests/dhall-to-cabal/dhall-to-cabal.dhall
+84 −89		golden-tests/dhall-to-cabal/dhall-to-etlas.dhall
+17 −22		golden-tests/dhall-to-cabal/gh-53.dhall
+34 −28		golden-tests/dhall-to-cabal/gh-55.dhall
+16 −17		golden-tests/dhall-to-cabal/map-source-repo.dhall
+9 −9		golden-tests/dhall-to-cabal/mixins-no-signatures.dhall
+5 −5		golden-tests/dhall-to-cabal/nested-conditions.dhall
+28 −34		golden-tests/dhall-to-cabal/wai-servlet-handler-jetty.dhall
+22 −29		golden-tests/dhall-to-cabal/wai-servlet.dhall
+200 −200		lib/CabalToDhall.hs
+1 −100		lib/DhallToCabal/ConfigTree.hs
+3 −8		meta/Main.hs
+3 −2		stack.yaml