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

Release Dhall 1.3.2.0 #148

Merged
merged 2 commits into from
Feb 12, 2019
Merged

Release Dhall 1.3.2.0 #148

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
f8e98b9
Release Dhall 1.3.2.0
ocharles Feb 12, 2019
e456607
Merge branch 'master' into release-1.3.2.0
ocharles Feb 12, 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
7 changes: 6 additions & 1 deletion Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# dhall-to-cabal change log

## Next
## 1.3.2.0 -- 2019-02-12

* Use `dhall` version 1.20.1.

* `prelude.dhall` no longer provides types (as this isn't supported in
Dhall 1.20.1). Instead, there is now a new `types.dhall` file.

* `dhall-to-cabal` now accepts`--output-stdout`, `--output-dir-cwd
DIR`, and `--output-dir-input DIR` flags control the destination of
Expand Down
2 changes: 1 addition & 1 deletion dhall-to-cabal.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cabal-version: 2.4
-- 'dhall-to-cabal -- dhall-to-cabal.dhall'.
-- * * * * * * * * * * * * WARNING * * * * * * * * * * * *
name: dhall-to-cabal
version: 1.3.1.0
version: 1.3.2.0
license: MIT
license-file: LICENSE
maintainer: ollie@ocharles.org.uk
Expand Down
25 changes: 10 additions & 15 deletions dhall-to-cabal.dhall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ let v = prelude.v

let anyVersion = prelude.anyVersion

let OS = types.OS

let package =
λ(package : Text)
→ λ(version-range : types.VersionRange)
Expand Down Expand Up @@ -88,9 +86,8 @@ in prelude.utils.GitHub-project
''
, category =
"Distribution"
-- build-type simple is needed to allow tools compatible with cabal < 2.2 build the package
, build-type =
Some ( types.BuildType.Simple {=} )
Some (types.BuildType.Simple {=})
, maintainer =
"ollie@ocharles.org.uk"
, author =
Expand Down Expand Up @@ -178,7 +175,7 @@ in prelude.utils.GitHub-project
, license-files =
[ "LICENSE" ]
, version =
v "1.3.1.0"
v "1.3.2.0"
, library =
prelude.unconditional.library
( prelude.defaults.Library
Expand Down Expand Up @@ -223,7 +220,7 @@ in prelude.utils.GitHub-project
, "Paths_dhall_to_cabal"
]
, default-language =
Some ( types.Language.Haskell2010 {=} )
Some (types.Language.Haskell2010 {=})
}
)
, executables =
Expand Down Expand Up @@ -256,7 +253,7 @@ in prelude.utils.GitHub-project
, autogen-modules =
[ "Paths_dhall_to_cabal" ]
, default-language =
Some ( types.Language.Haskell2010 {=} )
Some (types.Language.Haskell2010 {=})
}
)
, prelude.unconditional.executable
Expand Down Expand Up @@ -284,7 +281,7 @@ in prelude.utils.GitHub-project
, autogen-modules =
[ "Paths_dhall_to_cabal" ]
, default-language =
Some ( types.Language.Haskell2010 {=} )
Some (types.Language.Haskell2010 {=})
}
)
, prelude.unconditional.executable
Expand All @@ -304,7 +301,7 @@ in prelude.utils.GitHub-project
, hs-source-dirs =
[ "meta" ]
, default-language =
Some ( types.Language.Haskell2010 {=} )
Some (types.Language.Haskell2010 {=})
, compiler-options =
prelude.defaults.CompilerOptions ⫽ { GHC = warning-options }
, main-is =
Expand Down Expand Up @@ -335,10 +332,9 @@ in prelude.utils.GitHub-project
, hs-source-dirs =
[ "golden-tests" ]
, type =
types.TestType.exitcode-stdio
{ main-is = "GoldenTests.hs" }
types.TestType.exitcode-stdio { main-is = "GoldenTests.hs" }
, default-language =
Some ( types.Language.Haskell2010 {=} )
Some (types.Language.Haskell2010 {=})
}
)
, prelude.unconditional.test-suite
Expand All @@ -358,10 +354,9 @@ in prelude.utils.GitHub-project
, hs-source-dirs =
[ "tests" ]
, type =
types.TestType.exitcode-stdio
{ main-is = "Tests.hs" }
types.TestType.exitcode-stdio { main-is = "Tests.hs" }
, default-language =
Some ( types.Language.Haskell2010 {=} )
Some (types.Language.Haskell2010 {=})
, other-modules =
[ "DhallToCabal.Tests" ]
}
Expand Down