Merge pull request #101 from haskell-cryptography/build-type-simple

Remove Setup.hs

Author: vshabanov

.github/workflows/haskell.yml

@@ -11,10 +11,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Add more elements to this list to run multiple instances of the build in CI.  Increasing the
-        # number instances is a good way to trigger flaky build failures
-        n: [1]
-
         ghc:
         - "8.0.2"
         - "8.2.2"
@@ -26,10 +22,11 @@ jobs:
         - "9.2.8"
         - "9.4.8"
         - "9.6.6"
-        - "9.8.2"
+        - "9.8.4"
         - "9.10.1"
+        - "9.12.1"
         # FIXME: Add windows-latest back to CI once it is passing.
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
 
         # Action fails to install GHC < 8.10 on OSX with a generic error
         # messsage:
@@ -40,19 +37,25 @@ jobs:
         #
         #   Warning: Couldn't figure out LLVM version!
         #            Make sure you have installed LLVM between [9 and 13)
-        exclude:
-          - {ghc: "8.0.2", os: "macos-latest"}
-          - {ghc: "8.2.2", os: "macos-latest"}
-          - {ghc: "8.4.4", os: "macos-latest"}
-          - {ghc: "8.6.5", os: "macos-latest"}
-          - {ghc: "8.8.4", os: "macos-latest"}
-          - {ghc: "8.10.7", os: "macos-latest"}
-          - {ghc: "9.0.2", os: "macos-latest"}
+        include:
+          - {ghc: "8.0.2" , os: "macos-13"}
+          - {ghc: "8.2.2" , os: "macos-13"}
+          - {ghc: "8.4.4" , os: "macos-13"}
+          - {ghc: "8.6.5" , os: "macos-13"}
+          - {ghc: "8.8.4" , os: "macos-13"}
+          - {ghc: "8.10.7", os: "macos-13"}
+          - {ghc: "9.0.2" , os: "macos-13"}
+          - {ghc: "9.2.8" , os: "macos-latest"}
+          - {ghc: "9.4.8" , os: "macos-latest"}
+          - {ghc: "9.6.6" , os: "macos-latest"}
+          - {ghc: "9.8.4" , os: "macos-latest"}
+          - {ghc: "9.10.1", os: "macos-latest"}
+          - {ghc: "9.12.1", os: "macos-latest"}
     env:
       # OpenSSL is installed in a non-standard location in MacOS. See
       # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-latest-Readme.md
       PKG_CONFIG_PATH: ${{ (matrix.os == 'macos-latest' && '/usr/lib/pkgconfig:/usr/local/opt/[email protected]/lib/pkgconfig') || (matrix.os == 'ubuntu-latest' && '/usr/lib/pkgconfig:/usr/local/lib/pkgconfig') || '' }}
-      
+
       # FIXME: this is arguably a bug, and pkg-config should return the right values!
       LD_LIBRARY_PATH: ${{ (matrix.os != 'windows-latest' && '/usr/local/lib') || '' }}
 
@@ -75,7 +78,7 @@ jobs:
             automake `
             libtool `
             make
-  
+
     # this seems to break something. It _must_ come after the pacman setup
     # above. It appears as if PATHEXT is set _after_ ghcup install ghc/cabal, and
     # as such we'd need pacman.exe instead.
@@ -127,7 +130,7 @@ jobs:
       shell: bash
       run: echo '${{ steps.cabal-store.outputs.cabal-store }}'
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: "[PowerShell] Add build script path"
       if: runner.os == 'Windows'
@@ -173,7 +176,7 @@ jobs:
         cat dist-newstyle/cache/plan.json | jq -r '."install-plan"[].id' | sort | uniq > dependencies.txt
 
     - name: Cache Cabal store
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ${{ steps.cabal-store.outputs.cabal-store }}
         key: cache-${{ env.CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('dependencies.txt') }}

HsOpenSSL.cabal

@@ -10,7 +10,7 @@ Description:
     systems and stable. You may also be interested in the @tls@ package,
     <http://hackage.haskell.org/package/tls>, which is a pure Haskell
     implementation of SSL.
-Version:       0.11.7.7
+Version:       0.11.7.9
 License:       PublicDomain
 License-File:  COPYING
 Author:        Adam Langley, Mikhail Vorozhtsov, PHO, Taru Karttunen
@@ -33,11 +33,12 @@ Tested-With:
      || ==9.6.6
      || ==9.8.1
      || ==9.10.1
-Build-Type:    Custom
-Extra-Source-Files:
+Build-Type:    Simple
+Extra-Doc-Files:
     AUTHORS
     ChangeLog
     README.md
+Extra-Source-Files:
     cbits/HsOpenSSL.h
     cbits/mutex.h
     examples/Makefile
@@ -50,7 +51,7 @@ Extra-Source-Files:
 
 Source-Repository head
     Type: git
-    Location: git://github.com/haskell-cryptography/HsOpenSSL.git
+    Location: https://github.com/haskell-cryptography/HsOpenSSL.git
 
 Flag fast-bignum
     Description:
@@ -78,10 +79,6 @@ Flag use-pkg-config
     Manual:
         True
 
-Custom-setup
-    setup-depends: Cabal >= 1.12 && < 4,
-                   base  >= 4.8 && < 5
-
 Library
     Build-Depends:
         base       >= 4.8 && < 5,