Merge pull request #1 from krakrjak/merge-hpack-pr185-iss169

Merge hpack pr185 iss169

.travis.yml

@@ -1,6 +1,6 @@
 sudo: false
 
-language: c
+language: generic
 
 matrix:
   include:
@@ -13,11 +13,14 @@ matrix:
     - env: BUILD=tinc CABALVER=1.24 GHCVER=8.0.1
       compiler: ": #tinc 8.0.1"
       addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1,happy-1.19.5], sources: [hvr-ghc]}}
-    - env: BUILD=stack GHCVER=7.10.3 STACK_YAML=stack.yaml
-      compiler: ": #stack 7.10.3"
-      addons: {apt: {packages: [ghc-7.10.3,happy-1.19.5], sources: [hvr-ghc]}}
+    - env: BUILD=tinc CABALVER=2.0 GHCVER=8.2.1
+      compiler: ": #tinc 8.2.1"
+      addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1,happy-1.19.5], sources: [hvr-ghc]}}
+    - env: BUILD=stack GHCVER=8.2.1 STACK_YAML=stack.yaml
+      compiler: ": #stack 8.2.1"
+      addons: {apt: {packages: [ghc-8.2.1,happy-1.19.5], sources: [hvr-ghc]}}
     - env: BUILD=stack STACK_YAML=stack.yaml
-      compiler: ": #stack 7.10.3 osx"
+      compiler: ": #stack 8.2.1 osx"
       os: osx
 
 before_install:

CHANGELOG.md

@@ -1,8 +1,28 @@
-## next
+## Changes in 0.20.0
+  - Accept section-specific fields in conditionals (see #175, thanks to Scott
+    Fleischman)
+  - New section: `internal-libraries`, for Cabal 2's internal libraries (see #200).
+
+## Changes in 0.19.3
+  - Add support for `frameworks` and `extra-frameworks-dirs`
+
+## Changes in 0.19.2
+ - Compatibility with `Glob >= 0.9.0`
+
+## Changes in 0.19.1
+  - Add `IsList` instance for `Dependencies`
+
+## Changes in 0.19.0
+  - Add Paths_* module to executables (see #195, for GHC 8.2.1 compatibility)
+  - Allow specifying dependencies as a hash (see #198)
+
+## Changes in 0.18.1
   - Output generated cabal file to `stdout` when `-` is given as a command-line
     option (see #113)
+  - Recognize `.chs`, `.y`, `.ly` and `.x` as Haskell modules when inferring
+    modules for
 
-## Change in 0.18.0
+## Changes in 0.18.0
   - Make `executable` a shortcut of `executables: { package-name: ... }`
   - Add support for `ghcjs-options` and `js-sources` (see #161)
   - Allow `license-file` to be a list

README.md

@@ -53,6 +53,7 @@ existing cabal file into a `package.yaml`.
 | `custom-setup` | · | | See [Custom setup](#custom-setup) | | |
 | `flags`  | `flag <name>` | | Map from flag name to flag (see [Flags](#flags)) | | |
 | `library` | · | | See [Library fields](#library-fields) | | |
+| `internal-libraries` | `library <name>` | | Map from internal library name to a dict of [library fields](#library-fields) and global top-level fields. | | `0.20.0` |
 | `executables` | `executable <name>` | | Map from executable name to executable (see [Executable fields](#executable-fields)) | | |
 | `executable` | `executable <package-name>` | | Shortcut for `executables: { package-name: ... }` | | `0.18.0` |
 | `tests` | `test-suite <name>` | | Map from test name to test (see [Test fields](#test-fields)) | | |
@@ -84,6 +85,8 @@ These fields are merged with all library, executable, test, and benchmark compon
 | `extra-libraries` | · | | |
 | `include-dirs` | · | | |
 | `install-includes` | · | | |
+| `frameworks` | · | | |
+| `extra-frameworks-dirs` | · | | |
 | `ld-options` | · | | |
 | `buildable` | · | | May be overridden by later stanza |
 | `dependencies` | `build-depends` | | |

hpack.cabal

@@ -1,9 +1,9 @@
--- This file has been generated from package.yaml by hpack version 0.18.0.
+-- This file has been generated from package.yaml by hpack version 0.19.1.
 --
 -- see: https://github.com/sol/hpack
 
 name:           hpack
-version:        0.18.0
+version:        0.19.3
 synopsis:       An alternative format for Haskell packages
 description:    See README at <https://github.com/sol/hpack#readme>
 category:       Development
@@ -27,24 +27,28 @@ library
       src
   ghc-options: -Wall
   build-depends:
-      base >= 4.7 && < 5
-    , base-compat >= 0.8
+      Cabal
+    , Glob
+    , aeson >=0.11
+    , base >=4.7 && <5
+    , base-compat >=0.8
+    , bifunctors
     , bytestring
+    , containers
     , deepseq
     , directory
     , filepath
-    , Glob
+    , pretty
     , text
-    , containers
     , unordered-containers
     , yaml
-    , aeson >= 0.11
   exposed-modules:
       Hpack
       Hpack.Config
       Hpack.Run
       Hpack.Yaml
   other-modules:
+      Hpack.Dependency
       Hpack.FormattingHints
       Hpack.GenericsUtil
       Hpack.Haskell
@@ -60,19 +64,24 @@ executable hpack
       driver
   ghc-options: -Wall
   build-depends:
-      base >= 4.7 && < 5
-    , base-compat >= 0.8
+      Cabal
+    , Glob
+    , aeson >=0.11
+    , base >=4.7 && <5
+    , base-compat >=0.8
+    , bifunctors
     , bytestring
+    , containers
     , deepseq
     , directory
     , filepath
-    , Glob
+    , hpack
+    , pretty
     , text
-    , containers
     , unordered-containers
     , yaml
-    , aeson >= 0.11
-    , hpack
+  other-modules:
+      Paths_hpack
   default-language: Haskell2010
 
 test-suite spec
@@ -84,27 +93,32 @@ test-suite spec
   ghc-options: -Wall
   cpp-options: -DTEST
   build-depends:
-      base >= 4.7 && < 5
-    , base-compat >= 0.8
+      Cabal
+    , Glob
+    , HUnit >=1.6.0.0
+    , QuickCheck
+    , aeson >=0.11
+    , base >=4.7 && <5
+    , base-compat >=0.8
+    , bifunctors
     , bytestring
+    , containers
     , deepseq
     , directory
     , filepath
-    , Glob
+    , hspec ==2.*
+    , interpolate
+    , mockery >=0.3
+    , pretty
+    , temporary
     , text
-    , containers
     , unordered-containers
     , yaml
-    , aeson >= 0.11
-    , hspec == 2.*
-    , QuickCheck
-    , temporary
-    , mockery >= 0.3
-    , interpolate
-    , aeson-qq
   other-modules:
+      EndToEndSpec
       Helper
       Hpack.ConfigSpec
+      Hpack.DependencySpec
       Hpack.FormattingHintsSpec
       Hpack.GenericsUtilSpec
       Hpack.HaskellSpec
@@ -115,6 +129,7 @@ test-suite spec
       HpackSpec
       Hpack
       Hpack.Config
+      Hpack.Dependency
       Hpack.FormattingHints
       Hpack.GenericsUtil
       Hpack.Haskell
@@ -123,4 +138,5 @@ test-suite spec
       Hpack.Run
       Hpack.Util
       Hpack.Yaml
+      Paths_hpack
   default-language: Haskell2010

package.yaml

@@ -1,5 +1,5 @@
 name: hpack
-version: 0.18.0
+version: 0.19.3
 synopsis: An alternative format for Haskell packages
 description: See README at <https://github.com/sol/hpack#readme>
 maintainer: Simon Hengel <sol@typeful.net>
@@ -24,6 +24,9 @@ dependencies:
   - unordered-containers
   - yaml
   - aeson >= 0.11
+  - Cabal
+  - pretty
+  - bifunctors
 
 library:
   source-dirs: src
@@ -48,8 +51,8 @@ tests:
       - src
     dependencies:
       - hspec == 2.*
+      - HUnit >= 1.6.0.0
       - QuickCheck
       - temporary
       - mockery >= 0.3
       - interpolate
-      - aeson-qq