Merge remote-tracking branch 'origin/develop' into no-group

Author: Ericson2314

.github/workflows/haskell.yml

@@ -0,0 +1,45 @@
+name: github-action
+
+on: [push, pull_request] 
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        ghc: ['8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.2']
+        os: ['ubuntu-latest', 'macos-latest']
+        exclude:
+          # There are some linker warnings in 802 on darwin that
+          # cause compilation to fail
+          # See https://github.com/NixOS/nixpkgs/issues/25139
+          - ghc: '8.0.2'
+            os: 'macos-latest'
+    runs-on: ${{ matrix.os }}
+
+    name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-haskell@v1
+      with:
+        ghc-version: ${{ matrix.ghc }}
+    - name: Cache
+      uses: actions/cache@v1
+      env:
+        cache-name: cache-cabal
+      with:
+        path: ~/.cabal
+        key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-
+          ${{ runner.os }}-${{ matrix.ghc }}-build-
+          ${{ runner.os }}-${{ matrix.ghc }}-
+          ${{ runner.os }}
+
+    - name: Install dependencies
+      run: |
+        cabal update
+        cabal build --only-dependencies --enable-tests --enable-benchmarks
+    - name: Build
+      run: cabal build --enable-tests --enable-benchmarks all
+    - name: Run tests
+      run: cabal test all

ChangeLog.md

@@ -18,6 +18,10 @@
 * `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported
   from `Data.Patch` for compatability.
 
+## 0.0.4.0
+
+* Enable PolyKinds
+
 ## 0.0.3.2
 
 * Update version bounds

patch.cabal

@@ -28,7 +28,7 @@ tested-with:
 library
   hs-source-dirs: src
   default-language: Haskell2010
-  build-depends: base >= 4.9 && < 4.14
+  build-depends: base >= 4.9 && < 4.15
                , constraints-extras >= 0.3 && < 0.4
                , containers >= 0.6 && < 0.7
                , dependent-map >= 0.3 && < 0.5
@@ -55,6 +55,7 @@ library
                  , Data.Semigroup.Additive
 
   ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs
+  default-extensions: PolyKinds
 
 test-suite hlint
   default-language: Haskell2010
@@ -65,7 +66,7 @@ test-suite hlint
                , directory
                , filepath
                , filemanip
-               , hlint (< 2.1 || >= 2.2.2) && < 3
+               , hlint (< 2.1 || >= 2.2.2) && < 3.3
   if impl(ghcjs)
     buildable: False
 

src/Data/Patch/Class.hs

@@ -30,7 +30,7 @@ instance Patch (Identity a) where
   apply (Identity a) _ = Just a
 
 -- | 'Proxy' can be used as a 'Patch' that does nothing.
-instance Patch (Proxy a) where
+instance Patch (Proxy (a :: *)) where
   type PatchTarget (Proxy a) = a
   apply ~Proxy _ = Nothing