From c4d5efa780571d02c49dc4079ae42b9663bcdf6b Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sun, 6 Aug 2023 19:21:25 +0100 Subject: [PATCH] Fix #4 Move to `crypton` Also moves CI from Azure to GitHub Actions and updates GHC versions. --- .azure/azure-linux-template.yml | 110 ------------------------------ .azure/azure-osx-template.yml | 31 --------- .azure/azure-pipelines.yml | 30 -------- .azure/azure-windows-template.yml | 19 ------ .github/workflows/unit-tests.yml | 52 ++++++++++++++ .gitignore | 5 +- ChangeLog.md | 4 ++ LICENSE | 2 +- http-download.cabal | 75 ++++++++++++++++++++ package.yaml | 8 +-- stack-ghc-9.2.8.yaml | 17 +++++ stack-ghc-9.4.5.yaml | 17 +++++ stack-ghc-9.6.2.yaml | 2 + stack-lts-12.yaml | 9 --- stack-lts-12.yaml.lock | 54 --------------- stack-lts-13.yaml | 7 -- stack-lts-13.yaml.lock | 40 ----------- stack.yaml | 2 +- stack.yaml.lock | 24 +++++-- 19 files changed, 195 insertions(+), 313 deletions(-) delete mode 100644 .azure/azure-linux-template.yml delete mode 100644 .azure/azure-osx-template.yml delete mode 100644 .azure/azure-pipelines.yml delete mode 100644 .azure/azure-windows-template.yml create mode 100644 .github/workflows/unit-tests.yml create mode 100644 http-download.cabal create mode 100644 stack-ghc-9.2.8.yaml create mode 100644 stack-ghc-9.4.5.yaml create mode 100644 stack-ghc-9.6.2.yaml delete mode 100644 stack-lts-12.yaml delete mode 100644 stack-lts-12.yaml.lock delete mode 100644 stack-lts-13.yaml delete mode 100644 stack-lts-13.yaml.lock diff --git a/.azure/azure-linux-template.yml b/.azure/azure-linux-template.yml deleted file mode 100644 index 7b3553a8..00000000 --- a/.azure/azure-linux-template.yml +++ /dev/null @@ -1,110 +0,0 @@ -jobs: -- job: ${{ parameters.name }} - pool: - vmImage: ${{ parameters.vmImage }} - strategy: - matrix: - stack-def: - BUILD: stack - stack-lts-12: - BUILD: stack - STACK_YAML: stack-lts-12.yaml - ARGS: "--resolver lts-12" - stack-lts-13: - BUILD: stack - STACK_YAML: stack-lts-13.yaml - ARGS: "--resolver lts-13" - cabal-8.4.4: - BUILD: cabal - GHCVER: 8.4.4 - CABALVER: 2.4 - cabal-8.6.5: - BUILD: cabal - GHCVER: 8.6.5 - CABALVER: 2.4 - nightly: - BUILD: stack - ARGS: "--resolver nightly" - style: - BUILD: style - pedantic: - BUILD: pedantic - maxParallel: 6 - steps: - - script: | - export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root; - mkdir -p ~/.local/bin - curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' - case "$BUILD" in - style) - PACKAGE=hlint - echo "Downloading $PACKAGE now ..." - - RELEASES=$(curl --silent https://github.com/ndmitchell/$PACKAGE/releases) - URL=https://github.com/$(echo "$RELEASES" | grep -o '\"[^\"]*-x86_64-linux\.tar\.gz\"' | sed s/\"//g | head -n1) - VERSION=$(echo "$URL" | sed -e 's/.*-\([\.0-9]\+\)-x86_64-linux\.tar\.gz/\1/') - - curl --progress-bar --location -o"$PACKAGE.tar.gz" "$URL" - tar -xzf "$PACKAGE.tar.gz" -C . - mv "$PACKAGE-$VERSION" "$PACKAGE" - export PATH="$(pwd)"/hlint:$PATH - ;; - cabal) - sudo add-apt-repository -y ppa:hvr/ghc - sudo apt-get update - sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER - # See note here: https://github.com/haskell-CI/haskell-ci#alex--happy-with-ghc--78 - if [ "$GHCVER" = "head" ] || [ "${GHCVER%.*}" = "7.8" ] || [ "${GHCVER%.*}" = "7.10" ]; then - sudo apt-get install happy-1.19.4 alex-3.1.3 - export PATH=/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:$PATH - else - sudo apt-get install happy alex - fi - export PATH=$HOME/.local/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH - cabal --version - cabal update - PACKAGES=$(stack --install-ghc query locals | grep '^ *path' | sed 's@^ *path:@@') - cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS $PACKAGES - ;; - *) - export PATH=$HOME/.local/bin:$PATH - stack --install-ghc $ARGS test --bench --only-dependencies - ;; - esac - set -ex - case "$BUILD" in - style) - hlint src/ - ;; - cabal) - cabal install --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS $PACKAGES - - ORIGDIR=$(pwd) - for dir in $PACKAGES - do - cd $dir - cabal check || [ "$CABALVER" == "1.16" ] - cabal sdist - PKGVER=$(cabal info . | awk '{print $2;exit}') - SRC_TGZ=$PKGVER.tar.gz - cd dist - tar zxfv "$SRC_TGZ" - cd "$PKGVER" - cabal configure --enable-tests --ghc-options -O0 - cabal build - if [ "$CABALVER" = "1.16" ] || [ "$CABALVER" = "1.18" ]; then - cabal test - else - cabal test --show-details=streaming - fi - cd $ORIGDIR - done - ;; - *) - stack $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps - ;; - esac - set +ex - env: - OS_NAME: ${{ parameters.os }} - displayName: 'Installation ${{parameters.os}} & Test' diff --git a/.azure/azure-osx-template.yml b/.azure/azure-osx-template.yml deleted file mode 100644 index 7dc5ea70..00000000 --- a/.azure/azure-osx-template.yml +++ /dev/null @@ -1,31 +0,0 @@ -jobs: -- job: ${{ parameters.name }} - pool: - vmImage: ${{ parameters.vmImage }} - strategy: - matrix: - stack-def: - BUILD: stack - stack-lts-13: - BUILD: stack - STACK_YAML: stack-lts-13.yaml - ARGS: "--resolver lts-13" - stack-lts-12: - BUILD: stack - STACK_YAML: stack-lts-12.yaml - ARGS: "--resolver lts-12" - stack-nightly: - BUILD: stack - ARGS: "--resolver nightly" - maxParallel: 6 - steps: - - script: | - export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root; - mkdir -p ~/.local/bin - curl -skL https://get.haskellstack.org/stable/osx-x86_64.tar.gz | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin; - export PATH=$HOME/.local/bin:$PATH - stack --install-ghc $ARGS test --bench --only-dependencies - stack $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps - env: - OS_NAME: ${{ parameters.os }} - displayName: 'Installation ${{parameters.os}} & Test' diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml deleted file mode 100644 index b07cbd63..00000000 --- a/.azure/azure-pipelines.yml +++ /dev/null @@ -1,30 +0,0 @@ -# This is the complex Azure configuration, which is intended for use -# on open source libraries which need compatibility across multiple GHC -# versions, must work with cabal-install, and should be -# cross-platform. For more information and other options, see: -# -# https://docs.haskellstack.org/en/stable/azure_ci/ -# -# Copy these contents into the root directory of your Github project in a file -# named azure-pipelines.yml -# -# For better organization, you split various jobs into seprate parts -# and each of them are controlled via individual file. -jobs: -- template: azure-linux-template.yml - parameters: - name: Linux - vmImage: ubuntu-16.04 - os: linux - -- template: azure-osx-template.yml - parameters: - name: macOS - vmImage: macOS-10.14 - os: osx - -- template: azure-windows-template.yml - parameters: - name: Windows - vmImage: vs2017-win2016 - os: windows diff --git a/.azure/azure-windows-template.yml b/.azure/azure-windows-template.yml deleted file mode 100644 index 8b52ea92..00000000 --- a/.azure/azure-windows-template.yml +++ /dev/null @@ -1,19 +0,0 @@ -jobs: -- job: ${{ parameters.name }} - pool: - vmImage: ${{ parameters.vmImage }} - strategy: - matrix: - stack-def: - BUILD: stack - maxParallel: 6 - steps: - - bash: | - export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root; - curl -sSkL http://www.stackage.org/stack/windows-x86_64 -o /usr/bin/stack.zip - unzip -o /usr/bin/stack.zip -d /usr/bin/ - stack --install-ghc $ARGS test --bench --only-dependencies - stack $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps - env: - OS_NAME: ${{ parameters.os }} - displayName: 'Installation ${{parameters.os}} & Test' diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml new file mode 100644 index 00000000..db3f53b9 --- /dev/null +++ b/.github/workflows/unit-tests.yml @@ -0,0 +1,52 @@ +name: Unit tests + +on: + pull_request: + push: + branches: + - master + workflow_dispatch: + +# As of 6 August 2023, ubuntu-latest, windows-latest and macos-latest come +# with Stack 2.11.1 and GHC 9.6.2. + +jobs: + unit-tests: + name: Unit tests + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + resolver: + - stack-ghc-9.2.8.yaml + - stack-ghc-9.4.5.yaml + - stack-ghc-9.6.2.yaml + include: + - os: windows-latest + resolver: stack-ghc-9.6.2.yaml + - os: macos-latest + resolver: stack-ghc-9.6.2.yaml + steps: + - name: Clone project + uses: actions/checkout@v3 + - name: Cache dependencies on Unix-like OS + if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS') + uses: actions/cache@v3 + with: + path: ~/.stack + key: ${{ runner.os }}-${{ matrix.resolver }} + - name: Cache dependencies on Windows + if: startsWith(runner.os, 'Windows') + uses: actions/cache@v3 + with: + path: | + ~\AppData\Roaming\stack + ~\AppData\Local\Programs\stack + key: ${{ runner.os }}-${{ matrix.resolver }} + - name: Run tests + shell: bash + run: | + set -ex + stack --resolver ${{ matrix.resolver }} test --bench --no-run-benchmarks --haddock --no-haddock-deps diff --git a/.gitignore b/.gitignore index 5bf5c78e..b570e563 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -/.stack-work/ -http-download.cabal *.swp *~ + +# Haskell Tool Stack-related +/.stack-work/ diff --git a/ChangeLog.md b/ChangeLog.md index 34e8ab80..3bea7a42 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,9 @@ # http-download changelog +## 0.2.1.0 + +* Depend on `crypton` instead of `cryptonite`. No changes to API. + ## 0.2.0.0 * Add new field `drForceDownload` to `DownloadRequest` to allow force download even if the file exists diff --git a/LICENSE b/LICENSE index f8dc1e57..957f7e9b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2015-2019, Stack contributors +Copyright (c) 2015-2023, Stack contributors All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/http-download.cabal b/http-download.cabal new file mode 100644 index 00000000..dd14c0b9 --- /dev/null +++ b/http-download.cabal @@ -0,0 +1,75 @@ +cabal-version: 1.12 + +-- This file has been generated from package.yaml by hpack version 0.35.2. +-- +-- see: https://github.com/sol/hpack + +name: http-download +version: 0.2.1.0 +synopsis: Verified downloads with retries +description: Higher level HTTP download APIs include verification of content and retries +category: Development +homepage: https://github.com/commercialhaskell/http-download#readme +bug-reports: https://github.com/commercialhaskell/http-download/issues +author: Michael Snoyman +maintainer: michael@snoyman.com +copyright: 2018-2023 FP Complete +license: BSD3 +license-file: LICENSE +build-type: Simple + +source-repository head + type: git + location: https://github.com/commercialhaskell/http-download + +library + exposed-modules: + Network.HTTP.Download + Network.HTTP.Download.Verified + other-modules: + Paths_http_download + hs-source-dirs: + src/ + build-depends: + base >=4.10 && <5 + , base64-bytestring + , bytestring + , conduit + , conduit-extra + , crypton + , crypton-conduit + , directory + , exceptions + , filepath + , http-client + , http-conduit + , http-types + , memory + , path + , path-io + , retry + , rio + , rio-prettyprint + default-language: Haskell2010 + +test-suite spec + type: exitcode-stdio-1.0 + main-is: Spec.hs + other-modules: + Network.HTTP.Download.VerifiedSpec + Paths_http_download + hs-source-dirs: + test + build-depends: + base >=4.10 && <5 + , crypton + , hspec + , hspec-discover + , http-client + , http-download + , path + , path-io + , retry + , rio + , rio-prettyprint + default-language: Haskell2010 diff --git a/package.yaml b/package.yaml index 6d287749..84e336dd 100644 --- a/package.yaml +++ b/package.yaml @@ -1,17 +1,17 @@ name: http-download -version: 0.2.0.0 +version: 0.2.1.0 synopsis: Verified downloads with retries category: Development author: Michael Snoyman maintainer: michael@snoyman.com -copyright: 2018-2019 FP Complete +copyright: 2018-2023 FP Complete license: BSD3 github: commercialhaskell/http-download description: Higher level HTTP download APIs include verification of content and retries dependencies: - base >=4.10 && < 5 -- cryptonite +- crypton - http-client - path - path-io @@ -26,7 +26,7 @@ library: - bytestring - conduit - conduit-extra - - cryptonite-conduit + - crypton-conduit - directory - exceptions - filepath diff --git a/stack-ghc-9.2.8.yaml b/stack-ghc-9.2.8.yaml new file mode 100644 index 00000000..e36a36a9 --- /dev/null +++ b/stack-ghc-9.2.8.yaml @@ -0,0 +1,17 @@ +# Snapshot specification for GHC 9.2.8. +resolver: lts-20.26 # GHC 9.2.8 + +packages: +- crypton-0.33 +- crypton-conduit-0.2.3 +- crypton-connection-0.3.1 +- crypton-x509-1.7.6 +- crypton-x509-store-1.6.9 +- crypton-x509-system-1.6.7 +- crypton-x509-validation-1.6.12 +- http-client-tls-0.3.6.2 +- tls-1.7.1 + +flags: + ansi-terminal: + win32-2-13-1: false diff --git a/stack-ghc-9.4.5.yaml b/stack-ghc-9.4.5.yaml new file mode 100644 index 00000000..38c5056d --- /dev/null +++ b/stack-ghc-9.4.5.yaml @@ -0,0 +1,17 @@ +# Snapshot specification for GHC 9.4.5. +resolver: lts-21.6 # GHC 9.4.5 + +packages: +- crypton-0.33 +- crypton-conduit-0.2.3 +- crypton-connection-0.3.1 +- crypton-x509-1.7.6 +- crypton-x509-store-1.6.9 +- crypton-x509-system-1.6.7 +- crypton-x509-validation-1.6.12 +- http-client-tls-0.3.6.2 +- tls-1.7.1 + +flags: + ansi-terminal: + win32-2-13-1: false diff --git a/stack-ghc-9.6.2.yaml b/stack-ghc-9.6.2.yaml new file mode 100644 index 00000000..28bff59b --- /dev/null +++ b/stack-ghc-9.6.2.yaml @@ -0,0 +1,2 @@ +# Snapshot specification for GHC 9.6.2. +resolver: nightly-2023-08-06 # GHC 9.6.2 diff --git a/stack-lts-12.yaml b/stack-lts-12.yaml deleted file mode 100644 index 24d55e04..00000000 --- a/stack-lts-12.yaml +++ /dev/null @@ -1,9 +0,0 @@ -resolver: lts-12.26 - -extra-deps: -- rio-prettyprint-0.1.0.0@sha256:764e1a357275c3c62d57c494d038feae01cf745788e7d0e97367ba793c9670c3,1359 -- Cabal-2.4.1.0@sha256:56c858cf85e8756a94aaf930f2be4c2eaee623f067e7c55394194d3741147ab7,21825 -- ansi-terminal-0.9.1@sha256:48f53532d0f365ffa568c8cf0adc84c66f800a7d80d3329e4f04fa75392f4af1,3225 -- rio-0.1.11.0@sha256:3ee5162199e5fc036ffe5b9459b6169471ce1b4fa53fa0bf8dcd1c7d9192728d,3633 -- typed-process-0.2.6.0@sha256:c901c13d491441830eb23132ad6968243a56b98161629d260a26c0b13c735fcd,2136 -- unliftio-0.2.12@sha256:b089fbc2ff2628a963c2c4b12143f2020874e3e5144ffd6c62b25639a0ca1483,3325 diff --git a/stack-lts-12.yaml.lock b/stack-lts-12.yaml.lock deleted file mode 100644 index 3601c230..00000000 --- a/stack-lts-12.yaml.lock +++ /dev/null @@ -1,54 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - hackage: rio-prettyprint-0.1.0.0@sha256:764e1a357275c3c62d57c494d038feae01cf745788e7d0e97367ba793c9670c3,1359 - pantry-tree: - size: 479 - sha256: 42fad9af672080b144bb60eb91af251ab35ce41bb931c44cfb584414648935e5 - original: - hackage: rio-prettyprint-0.1.0.0@sha256:764e1a357275c3c62d57c494d038feae01cf745788e7d0e97367ba793c9670c3,1359 -- completed: - hackage: Cabal-2.4.1.0@sha256:56c858cf85e8756a94aaf930f2be4c2eaee623f067e7c55394194d3741147ab7,21825 - pantry-tree: - size: 31482 - sha256: 841586a64478b5901e6ae45eed93b1c3e672b1cf42c1b37cadd479e4747f1bb5 - original: - hackage: Cabal-2.4.1.0@sha256:56c858cf85e8756a94aaf930f2be4c2eaee623f067e7c55394194d3741147ab7,21825 -- completed: - hackage: ansi-terminal-0.9.1@sha256:48f53532d0f365ffa568c8cf0adc84c66f800a7d80d3329e4f04fa75392f4af1,3225 - pantry-tree: - size: 1461 - sha256: 4686b1fdd2b74598eb83d35f447e4520d58d6534b5277a6f2bfaaa258bf1f833 - original: - hackage: ansi-terminal-0.9.1@sha256:48f53532d0f365ffa568c8cf0adc84c66f800a7d80d3329e4f04fa75392f4af1,3225 -- completed: - hackage: rio-0.1.11.0@sha256:3ee5162199e5fc036ffe5b9459b6169471ce1b4fa53fa0bf8dcd1c7d9192728d,3633 - pantry-tree: - size: 4745 - sha256: 88fcb5cef887a9cf664d3edad27421c37dc9534eb4752f224467d544c61c7fce - original: - hackage: rio-0.1.11.0@sha256:3ee5162199e5fc036ffe5b9459b6169471ce1b4fa53fa0bf8dcd1c7d9192728d,3633 -- completed: - hackage: typed-process-0.2.6.0@sha256:c901c13d491441830eb23132ad6968243a56b98161629d260a26c0b13c735fcd,2136 - pantry-tree: - size: 529 - sha256: 2ef79f15f1f391e49dc522076f6d1584c7b305bf2aaa0dfec4dc0d4b61f31111 - original: - hackage: typed-process-0.2.6.0@sha256:c901c13d491441830eb23132ad6968243a56b98161629d260a26c0b13c735fcd,2136 -- completed: - hackage: unliftio-0.2.12@sha256:b089fbc2ff2628a963c2c4b12143f2020874e3e5144ffd6c62b25639a0ca1483,3325 - pantry-tree: - size: 2229 - sha256: 4971b43f3d473eff868eb1a0c359729b49f1779e78c462ba45ef0d1eda677699 - original: - hackage: unliftio-0.2.12@sha256:b089fbc2ff2628a963c2c4b12143f2020874e3e5144ffd6c62b25639a0ca1483,3325 -snapshots: -- completed: - size: 509471 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/12/26.yaml - sha256: 95f014df58d0679b1c4a2b7bf2b652b61da8d30de5f571abb0d59015ef678646 - original: lts-12.26 diff --git a/stack-lts-13.yaml b/stack-lts-13.yaml deleted file mode 100644 index d261d3eb..00000000 --- a/stack-lts-13.yaml +++ /dev/null @@ -1,7 +0,0 @@ -resolver: lts-13.28 - -extra-deps: -- rio-prettyprint-0.1.0.0@sha256:764e1a357275c3c62d57c494d038feae01cf745788e7d0e97367ba793c9670c3,1359 -- ansi-terminal-0.9.1@sha256:48f53532d0f365ffa568c8cf0adc84c66f800a7d80d3329e4f04fa75392f4af1,3225 -- rio-0.1.11.0@sha256:3ee5162199e5fc036ffe5b9459b6169471ce1b4fa53fa0bf8dcd1c7d9192728d,3633 -- unliftio-0.2.12@sha256:b089fbc2ff2628a963c2c4b12143f2020874e3e5144ffd6c62b25639a0ca1483,3325 diff --git a/stack-lts-13.yaml.lock b/stack-lts-13.yaml.lock deleted file mode 100644 index 4a6e0a83..00000000 --- a/stack-lts-13.yaml.lock +++ /dev/null @@ -1,40 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - hackage: rio-prettyprint-0.1.0.0@sha256:764e1a357275c3c62d57c494d038feae01cf745788e7d0e97367ba793c9670c3,1359 - pantry-tree: - size: 479 - sha256: 42fad9af672080b144bb60eb91af251ab35ce41bb931c44cfb584414648935e5 - original: - hackage: rio-prettyprint-0.1.0.0@sha256:764e1a357275c3c62d57c494d038feae01cf745788e7d0e97367ba793c9670c3,1359 -- completed: - hackage: ansi-terminal-0.9.1@sha256:48f53532d0f365ffa568c8cf0adc84c66f800a7d80d3329e4f04fa75392f4af1,3225 - pantry-tree: - size: 1461 - sha256: 4686b1fdd2b74598eb83d35f447e4520d58d6534b5277a6f2bfaaa258bf1f833 - original: - hackage: ansi-terminal-0.9.1@sha256:48f53532d0f365ffa568c8cf0adc84c66f800a7d80d3329e4f04fa75392f4af1,3225 -- completed: - hackage: rio-0.1.11.0@sha256:3ee5162199e5fc036ffe5b9459b6169471ce1b4fa53fa0bf8dcd1c7d9192728d,3633 - pantry-tree: - size: 4745 - sha256: 88fcb5cef887a9cf664d3edad27421c37dc9534eb4752f224467d544c61c7fce - original: - hackage: rio-0.1.11.0@sha256:3ee5162199e5fc036ffe5b9459b6169471ce1b4fa53fa0bf8dcd1c7d9192728d,3633 -- completed: - hackage: unliftio-0.2.12@sha256:b089fbc2ff2628a963c2c4b12143f2020874e3e5144ffd6c62b25639a0ca1483,3325 - pantry-tree: - size: 2229 - sha256: 4971b43f3d473eff868eb1a0c359729b49f1779e78c462ba45ef0d1eda677699 - original: - hackage: unliftio-0.2.12@sha256:b089fbc2ff2628a963c2c4b12143f2020874e3e5144ffd6c62b25639a0ca1483,3325 -snapshots: -- completed: - size: 500539 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/13/28.yaml - sha256: cdde1bfb38fdee21c6acb73d506e78f7e12e0a73892adbbbe56374ebef4d3adf - original: lts-13.28 diff --git a/stack.yaml b/stack.yaml index 1c86b2a9..149a3416 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1 @@ -resolver: nightly-2019-07-15 +resolver: stack-ghc-9.4.5.yaml diff --git a/stack.yaml.lock b/stack.yaml.lock index a58f87ff..651f01ed 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -3,10 +3,24 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: [] +packages: +- completed: + hackage: crypton-0.33@sha256:5e92f29b9b7104d91fcdda1dec9400c9ad1f1791c231cc41ceebd783fb517dee,18202 + pantry-tree: + sha256: 38809499d7f9775ef45cd29ab5c3dc9b283a813f34c1cdc56681b24f8cf8bb4f + size: 23148 + original: + hackage: crypton-0.33 +- completed: + hackage: crypton-conduit-0.2.3@sha256:31f44243b42f344c65be6cd2c39c07994d9186d19d15988656620d1de85aca37,1946 + pantry-tree: + sha256: 06781001956f2ccfae0e6b4f33c213bd3121c6462f8534e9dca87bf51e4663e0 + size: 592 + original: + hackage: crypton-conduit-0.2.3 snapshots: - completed: - size: 519764 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2019/7/15.yaml - sha256: 3f93a8081b0d3e6ee2b463886b1cc9f60403fae8a2eaeab4701b6e6150dfc98d - original: nightly-2019-07-15 + sha256: 2e7d4a730d8eb5373b2d383fac84efcf7c81e3b7a5fce71b4c2e19a1768f25a6 + size: 640239 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/6.yaml + original: lts-21.6