diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index be43c70..c604b45 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,9 +10,9 @@ jobs: - uses: actions/checkout@v2 - uses: haskell-actions/setup@v2 with: - ghc-version: '9.2.8' + ghc-version: '9.12.2' enable-stack: true - - uses: actions/cache@v1 + - uses: actions/cache@v4 with: path: ~/.stack key: ${{ runner.os }}-stack-${{ hashFiles('hsaml2.cabal') }}-${{ hashFiles('stack.yaml') }} @@ -20,7 +20,6 @@ jobs: ${{ runner.os }}-stack- ${{ runner.os }}- - name: build - run: stack build --system-ghc --flag hsaml2:-crypton + run: stack build --system-ghc - name: test - run: stack test --system-ghc --flag hsaml2:-crypton - + run: stack test --system-ghc diff --git a/hsaml2.cabal b/hsaml2.cabal index d96f186..9741581 100644 --- a/hsaml2.cabal +++ b/hsaml2.cabal @@ -69,20 +69,12 @@ library SAML2.Bindings.Internal c-sources: SAML2/XML/libxml2_stub.c - if flag(crypton) - build-depends: - crypton, - crypton-x509, - crypton-asn1-types, - crypton-asn1-encoding, - ram - else - build-depends: - cryptonite, - x509, - asn1-types >= 0.2, - asn1-encoding, - memory + build-depends: + crypton >=1.0.6 && <1.1, + crypton-x509, + crypton-asn1-types, + crypton-asn1-encoding, + memory build-depends: base >=4.8 && <5, base64-bytestring, @@ -122,14 +114,9 @@ test-suite tests XML.Signature default-language: Haskell2010 ghc-options: -Wall - if flag(crypton) - build-depends: - crypton, - crypton-x509 - else - build-depends: - cryptonite, - x509 + build-depends: + crypton, + crypton-x509 build-depends: base, base64-bytestring, diff --git a/stack.yaml b/stack.yaml index 014d746..70c6d3c 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,6 +1,11 @@ -resolver: lts-20.26 +resolver: nightly-2026-01-19 packages: - . extra-deps: +- crypton-1.0.6 +- crypton-x509-1.8.0 +- crypton-asn1-types-0.4.1 +- crypton-asn1-encoding-0.10.0 +- crypton-asn1-parse-0.10.0 - invertible-0.2.0.8 - invertible-hxt-0.1 diff --git a/stack.yaml.lock b/stack.yaml.lock index bd8f7dc..d6e6e1e 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -4,6 +4,13 @@ # https://docs.haskellstack.org/en/stable/lock_files packages: +- completed: + hackage: crypton-1.0.6@sha256:6686b3517a065530a5b10fd7b186055815d79b30b15c5eb27cb87a1794595ddd,16653 + pantry-tree: + sha256: a610b645a866c77dfc947af400685930b191e681e73280466451e46448960cfe + size: 23412 + original: + hackage: crypton-1.0.6 - completed: hackage: invertible-0.2.0.8@sha256:a6bfbf7e48a1744716134d8c73b3dec2d668ee13ba2c7cffce73621a275d559f,3628 pantry-tree: @@ -20,7 +27,7 @@ packages: hackage: invertible-hxt-0.1 snapshots: - completed: - sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2 - size: 650475 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml - original: lts-20.26 + sha256: daa0c3bbf71e6cfdfde7638457b6657b7ec96a242261b70dc261d255ad80462f + size: 719997 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2026/1/19.yaml + original: nightly-2026-01-19