diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 05efcff7c..0659eeda1 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["8.10.7", "9.6", "9.8", "9.10"] + ghc: ["8.10.7", "9.6", "9.10"] cabal: ["3.12"] sys: - { os: windows-latest, shell: 'C:/msys64/usr/bin/bash.exe -e {0}' } diff --git a/cabal.project b/cabal.project index b153a635a..0225472b9 100644 --- a/cabal.project +++ b/cabal.project @@ -13,8 +13,8 @@ repository cardano-haskell-packages -- See CONTRIBUTING for information about these, including some Nix commands -- you need to run if you change them index-state: - , hackage.haskell.org 2024-07-30T01:49:10Z - , cardano-haskell-packages 2024-07-30T02:20:18Z + , hackage.haskell.org 2024-08-15T08:53:32Z + , cardano-haskell-packages 2024-08-15T10:40:33Z packages: cardano-api @@ -45,17 +45,6 @@ test-show-details: direct -- Always write GHC env files, because they are needed for ghci. write-ghc-environment-files: always -constraints: - , plutus-ledger-api ^>= 1.31 - -allow-newer: - -- These are required due to the above. - , cardano-ledger-alonzo:plutus-ledger-api - , cardano-ledger-alonzo-test:plutus-ledger-api - , cardano-ledger-babbage:plutus-ledger-api - , cardano-ledger-binary:plutus-ledger-api - , cardano-ledger-conway:plutus-ledger-api - -- IMPORTANT -- Do NOT add more source-repository-package stanzas here unless they are strictly -- temporary! Please read the section in CONTRIBUTING about updating dependencies. diff --git a/flake.lock b/flake.lock index b9774bb1b..cc25bff50 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1722231085, - "narHash": "sha256-IwLw5BCQNLIp9CJgtnGU5wrQ5dr1zZ5UhOFJTZPx3w8=", + "lastModified": 1723719216, + "narHash": "sha256-0RCMUZu1YthjOJUT6JHCfwxLZVobhTzx17nK7U745/I=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "843c3f288a53dd3f4f773413fc50201e003e0096", + "rev": "e4cfce4c4612111b0b51567cb4445a7740303f0e", "type": "github" }, "original": { @@ -205,11 +205,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1722817668, - "narHash": "sha256-J3K7hqhtwKZrMoXRsN+ENl5+REW3UlIaLsalIa0kDVE=", + "lastModified": 1723681836, + "narHash": "sha256-xM2vL6GdCRnBvxUbQrDjTfCbFKrtX+b/Uy0Eg3Z+XHg=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "ee1d3454c8fd8124c1de1fb3df18c7d8bbf8ab61", + "rev": "227179361e9c1b2738aebab640fdf91e8846590b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e071a1d95..06b610a4d 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,7 @@ ]; # see flake `variants` below for alternative compilers - defaultCompiler = "ghc982"; + defaultCompiler = "ghc101"; haddockShellCompiler = defaultCompiler; mingwCompiler = "ghc966";