Merge pull request #133 from lolepezy/switch-to-8.10.7

Switch to 8.10.7

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: haskell/actions/setup@v1
       with:
-        ghc-version: '8.10.4'
+        ghc-version: '8.10.7'
         enable-stack: true
         stack-version: 'latest'        
     - name: Cache

.github/workflows/static-build.yml

@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: haskell/actions/setup@v1
       with:
-        ghc-version: '8.10.4'
+        ghc-version: '8.10.7'
         enable-stack: true
         stack-version: 'latest'        
     - 

Dockerfile.static-builder

@@ -1,10 +1,11 @@
-FROM utdemir/ghc-musl:v20-ghc8104 as rpki-prover-builder
+# FROM utdemir/ghc-musl:v20-ghc8104 as rpki-prover-builder
+FROM utdemir/ghc-musl:v24-ghc8107 as rpki-prover-builder
 
 RUN apk add --update --no-cache expat-dev lmdb-dev lmdb expat-static lmdb
 
 # There's no statically linked version of LMDB, so we build it from the sources here
-RUN wget https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.29/openldap-LMDB_0.9.29.tar.gz && \
-    tar xzf openldap-LMDB_0.9.29.tar.gz && \
-    cd openldap-LMDB_0.9.29/libraries/liblmdb && \
+RUN wget https://github.com/LMDB/lmdb/archive/refs/tags/LMDB_0.9.29.tar.gz && \
+    tar xzf LMDB_0.9.29.tar.gz && \
+    cd lmdb-LMDB_0.9.29/libraries/liblmdb && \
     make && cp liblmdb.a /usr/lib
 

package.yaml

@@ -168,10 +168,7 @@ tests:
     - -threaded
     - -rtsopts
     - -with-rtsopts=-N
-    # - -static
-    - -O2
-    # cc-options: -static
-    # ld-options: -static -pthread      
+    - -O2  
     dependencies:
     - rpki-prover
     - QuickCheck

src/RPKI/Orphans/Serialise.hs

@@ -109,9 +109,6 @@ deriving instance (Ord a, Serialise a) => Serialise (NESet a)
 
 deriving instance (Ord a, Serialise a, Serialise b) => Serialise (MonoidalMap a b)
 
-deriving instance (Serialise a, Serialise b) => Serialise (These a b)
-
-
 instance (Serialise CPid) where
     encode (CPid i) = encode i
     decode = CPid <$> decode

stack.yaml

@@ -20,7 +20,8 @@
 # resolver: https://example.com/snapshots/2018-01-01.yaml
 # resolver: lts-16.31
 # resolver:  nightly-2022-03-20
-resolver:  lts-18.6
+resolver:  lts-18.28
+# resolver:  lts-18.6
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.