From fa8b488a053700727820fb7ace4e6407ada1917c Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Thu, 22 Aug 2024 12:43:39 +1000 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'bellroy-nix-foss': 'github:bellroy/bellroy-nix-foss/e0c388f67e4821a3a3526e0a8547711c1de772f0?narHash=sha256-9Pw2PSOhLLr%2BM2pwd04RuYvem7l88g/Mh9kJNyKhyno%3D' (2024-06-28) → 'github:bellroy/bellroy-nix-foss/0966286b1f39ae7601bd6be79dd0405e7267a493?narHash=sha256-08ckkY81cvEbRM6Fvog0leRVvF2yzqFLnEWCDmE1LQM%3D' (2024-08-22) • Removed input 'bellroy-nix-foss/flake-compat' • Added input 'bellroy-nix-foss/haskell-ci': 'github:haskell-ci/haskell-ci/5e5b27d74f90e73905c4f56f4aefe521f97879f0?narHash=sha256-k3YCC4RIVxocXYbNHkmGYvlsoFlv5XZmk1DYfVQMaPs%3D' (2024-07-08) • Updated input 'bellroy-nix-foss/nixpkgs': 'github:NixOS/nixpkgs/9693852a2070b398ee123a329e68f0dab5526681?narHash=sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs%3D' (2024-06-22) → 'github:NixOS/nixpkgs/d13fa5a45a34e7c8be33474f58003914430bdc5a?narHash=sha256-G7Mf9uN9m8FimeP3eMHu/dOC4QS8QAzo0h4ZIlDHcCA%3D' (2024-08-20) • Added input 'bellroy-nix-foss/pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/1064a45e81a4e19cda98741b71219d9f4f136900?narHash=sha256-AddE0u6WbA5R7uxumw1Ka0oG5dv3cTtN0ppO/M/e0cg%3D' (2024-08-20) • Added input 'bellroy-nix-foss/pre-commit-hooks/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04) • Added input 'bellroy-nix-foss/pre-commit-hooks/gitignore': 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394?narHash=sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs%3D' (2024-02-28) • Added input 'bellroy-nix-foss/pre-commit-hooks/gitignore/nixpkgs': follows 'bellroy-nix-foss/pre-commit-hooks/nixpkgs' • Added input 'bellroy-nix-foss/pre-commit-hooks/nixpkgs': follows 'bellroy-nix-foss/nixpkgs' • Added input 'bellroy-nix-foss/pre-commit-hooks/nixpkgs-stable': 'github:NixOS/nixpkgs/194846768975b7ad2c4988bdb82572c00222c0d7?narHash=sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo%3D' (2024-07-07) --- flake.lock | 95 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 87 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 21fc4f0..e9368b2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,17 @@ "nodes": { "bellroy-nix-foss": { "inputs": { - "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "haskell-ci": "haskell-ci", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1719540486, - "narHash": "sha256-9Pw2PSOhLLr+M2pwd04RuYvem7l88g/Mh9kJNyKhyno=", + "lastModified": 1724294608, + "narHash": "sha256-08ckkY81cvEbRM6Fvog0leRVvF2yzqFLnEWCDmE1LQM=", "owner": "bellroy", "repo": "bellroy-nix-foss", - "rev": "e0c388f67e4821a3a3526e0a8547711c1de772f0", + "rev": "0966286b1f39ae7601bd6be79dd0405e7267a493", "type": "github" }, "original": { @@ -54,13 +55,51 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "bellroy-nix-foss", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "haskell-ci": { + "flake": false, + "locked": { + "lastModified": 1720460048, + "narHash": "sha256-k3YCC4RIVxocXYbNHkmGYvlsoFlv5XZmk1DYfVQMaPs=", + "owner": "haskell-ci", + "repo": "haskell-ci", + "rev": "5e5b27d74f90e73905c4f56f4aefe521f97879f0", + "type": "github" + }, + "original": { + "owner": "haskell-ci", + "repo": "haskell-ci", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "lastModified": 1724177844, + "narHash": "sha256-G7Mf9uN9m8FimeP3eMHu/dOC4QS8QAzo0h4ZIlDHcCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "rev": "d13fa5a45a34e7c8be33474f58003914430bdc5a", "type": "github" }, "original": { @@ -69,6 +108,46 @@ "type": "indirect" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "bellroy-nix-foss", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1724159077, + "narHash": "sha256-AddE0u6WbA5R7uxumw1Ka0oG5dv3cTtN0ppO/M/e0cg=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "1064a45e81a4e19cda98741b71219d9f4f136900", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "bellroy-nix-foss": "bellroy-nix-foss" From c74a56470b79aff10a9e5376db5701812e224678 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Thu, 22 Aug 2024 12:42:41 +1000 Subject: [PATCH 2/3] Update for latest bellroy-nix-foss --- .gitignore | 1 + cabal.haskell-ci | 1 - flake.nix | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 cabal.haskell-ci diff --git a/.gitignore b/.gitignore index 8184986..abfd56a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .dir-locals.el +.pre-commit-config.yaml dist-newstyle/ dist/ result diff --git a/cabal.haskell-ci b/cabal.haskell-ci deleted file mode 100644 index 20c4040..0000000 --- a/cabal.haskell-ci +++ /dev/null @@ -1 +0,0 @@ -distribution: jammy diff --git a/flake.nix b/flake.nix index e45d2db..642a91f 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ outputs = inputs: inputs.bellroy-nix-foss.lib.haskellProject { + src = ./.; supportedCompilers = [ "ghc810" "ghc90" From 79d6bb0e817e3321e3b0718c7de9523fb08e45d5 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Thu, 22 Aug 2024 12:43:16 +1000 Subject: [PATCH 3/3] Regenerate CI --- .github/workflows/haskell-ci.yml | 22 +++++++++++----------- servant-activeresource.cabal | 7 +------ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 1323d3e..f43cff0 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","servant-activeresource.cabal"]) +# REGENDATA ("0.19.20240708",["github","servant-activeresource.cabal"]) # name: Haskell-CI on: @@ -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 /^(servant-activeresource)$/; }' >> 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 @@ -209,7 +209,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/servant-activeresource.cabal b/servant-activeresource.cabal index d49796c..65fd9e3 100644 --- a/servant-activeresource.cabal +++ b/servant-activeresource.cabal @@ -24,12 +24,7 @@ extra-doc-files: README.md tested-with: - GHC ==8.10.7 - || ==9.0.2 - || ==9.2.4 - || ==9.4.5 - || ==9.6.4 - || ==9.8.2 + GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.5 || ==9.6.6 || ==9.8.2 source-repository head type: git