From 5cffe9e7b75adc9566f1de9690afb3b70f50dde7 Mon Sep 17 00:00:00 2001 From: JackKelly-Bellroy <64521034+JackKelly-Bellroy@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:08:35 +1000 Subject: [PATCH] Package updates 2024 08 (#21) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * flake.lock: Update Flake lock file updates: • Updated input 'bellroy-nix-foss': 'github:bellroy/bellroy-nix-foss/b6c032e0c9aeb1886538d9db10809bc441dd2bac?narHash=sha256-7pEJ5a%2BhbpeCmKqRt%2BN5ddhsBD8IwDRenMN8WPnB8MQ%3D' (2024-06-25) → 'github:bellroy/bellroy-nix-foss/e0c388f67e4821a3a3526e0a8547711c1de772f0?narHash=sha256-9Pw2PSOhLLr%2BM2pwd04RuYvem7l88g/Mh9kJNyKhyno%3D' (2024-06-28) * Update to latest bellroy-nix-foss * Raise GHC tested-with and regenerate CI --- .github/workflows/haskell-ci.yml | 24 ++++++++++++------------ .gitignore | 1 + cached-io.cabal | 2 +- cached-io.nix | 13 ------------- flake.lock | 6 +++--- flake.nix | 7 +------ 6 files changed, 18 insertions(+), 35 deletions(-) delete mode 100644 cached-io.nix diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index b8588da..890ae2a 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.18.1 +# version: 0.19.20240708 # -# REGENDATA ("0.18.1",["github","cached-io.cabal"]) +# REGENDATA ("0.19.20240708",["github","cached-io.cabal"]) # name: Haskell-CI on: @@ -23,7 +23,7 @@ jobs: timeout-minutes: 60 container: - image: buildpack-deps:bionic + image: buildpack-deps:jammy continue-on-error: ${{ matrix.allow-failure }} strategy: matrix: @@ -33,9 +33,9 @@ jobs: compilerVersion: 9.8.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.4 + - compiler: ghc-9.6.6 compilerKind: ghc - compilerVersion: 9.6.4 + compilerVersion: 9.6.6 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.5 @@ -65,10 +65,10 @@ jobs: apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -86,7 +86,7 @@ jobs: echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" @@ -143,7 +143,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan cabal-plan --version - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: source - name: initial cabal.project for sdist @@ -171,7 +171,7 @@ jobs: echo " ghc-options: -Werror=missing-methods" >> cabal.project cat >> cabal.project <> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(cached-io)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan @@ -179,7 +179,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all cabal-plan - name: restore cache - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store @@ -206,7 +206,7 @@ jobs: rm -f cabal.project.local $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - name: save cache - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 if: always() with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} diff --git a/.gitignore b/.gitignore index d670381..62694d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.*~ .direnv .envrc +.pre-commit-config.yaml /.cabal-sandbox /.stack-work /cabal.sandbox.config diff --git a/cached-io.cabal b/cached-io.cabal index e0d0b28..dc7508d 100644 --- a/cached-io.cabal +++ b/cached-io.cabal @@ -12,7 +12,7 @@ author: SumAll, Inc. maintainer: Bellroy Tech Team category: Development build-type: Simple -tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.5 || ==9.6.4 || ==9.8.2 +tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.5 || ==9.6.6 || ==9.8.2 extra-doc-files: CHANGELOG.md README.md diff --git a/cached-io.nix b/cached-io.nix deleted file mode 100644 index beea4b7..0000000 --- a/cached-io.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ mkDerivation, base, exceptions, lib, stm, time, transformers }: -mkDerivation { - pname = "cached-io"; - version = "1.3.0.0"; - src = ./.; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base exceptions stm time transformers ]; - executableHaskellDepends = [ base ]; - description = "A simple library to cache IO actions"; - license = lib.licenses.asl20; - mainProgram = "test-cachedIO"; -} diff --git a/flake.lock b/flake.lock index 5d002bd..21fc4f0 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1719276333, - "narHash": "sha256-7pEJ5a+hbpeCmKqRt+N5ddhsBD8IwDRenMN8WPnB8MQ=", + "lastModified": 1719540486, + "narHash": "sha256-9Pw2PSOhLLr+M2pwd04RuYvem7l88g/Mh9kJNyKhyno=", "owner": "bellroy", "repo": "bellroy-nix-foss", - "rev": "b6c032e0c9aeb1886538d9db10809bc441dd2bac", + "rev": "e0c388f67e4821a3a3526e0a8547711c1de772f0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e607675..4df47c4 100644 --- a/flake.nix +++ b/flake.nix @@ -7,12 +7,7 @@ outputs = inputs: inputs.bellroy-nix-foss.lib.haskellProject { - cabalPackages = [ - { - name = "cached-io"; - path = ./cached-io.nix; - } - ]; + src = ./.; supportedCompilers = [ "ghc810" "ghc90"