diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 315c653..480a96d 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -13,17 +13,17 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["8.10.7", "9.2.8", "9.6.2"] + ghc: ["8.10.7", "9.2.8", "9.6.2", "9.8.1"] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 - - uses: haskell/actions/setup@v1 + - uses: haskell-actions/setup@v2 id: setup-haskell with: ghc-version: ${{ matrix.ghc }} - cabal-version: 3.10.1.0 + cabal-version: latest - name: Haskell versions run: | @@ -41,7 +41,7 @@ jobs: cat dist-newstyle/cache/plan.json | jq -r '."install-plan"[].id' | sort | uniq > dependencies.txt - name: Set cache version - run: echo "CACHE_VERSION=9w76Z3Q" >> $GITHUB_ENV + run: echo "CACHE_VERSION=9w76Z3Qx" >> $GITHUB_ENV - uses: actions/cache@v2 name: Cache cabal store diff --git a/cabal.project b/cabal.project index 3306fdf..d9581ce 100644 --- a/cabal.project +++ b/cabal.project @@ -1,17 +1,9 @@ -- See CONTRIBUTING for Nix commands you need to run if you change it: -index-state: 2023-05-18T20:27:48Z +index-state: 2023-11-15T16:30:04Z packages: cardano-prelude cardano-prelude-test -if impl(ghc >= 9.6) - allow-newer: - , *:base - , *:ghc-prim - , protolude:binary - , protolude:bytestring - , protolude:text - test-show-details: direct diff --git a/cardano-prelude/cardano-prelude.cabal b/cardano-prelude/cardano-prelude.cabal index e44b062..c2b2ece 100644 --- a/cardano-prelude/cardano-prelude.cabal +++ b/cardano-prelude/cardano-prelude.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: cardano-prelude -version: 0.1.0.3 +version: 0.1.0.4 synopsis: A Prelude replacement for the Cardano project description: A Prelude replacement for the Cardano project author: IOHK @@ -40,8 +40,8 @@ library Cardano.Prelude.Orphans Cardano.Prelude.Strict - build-depends: base >= 4.14 && < 4.19 - , aeson + build-depends: base >= 4.14 && < 5 + , aeson >= 2.0 , base16-bytestring >= 1 , bytestring , canonical-json >= 0.6.0.1 diff --git a/flake.lock b/flake.lock index 260f390..df1bcea 100644 --- a/flake.lock +++ b/flake.lock @@ -166,22 +166,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1679360468, - "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", - "owner": "hamishmack", - "repo": "flake-utils", - "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", - "type": "github" - }, - "original": { - "owner": "hamishmack", - "ref": "hkm/nested-hydraJobs", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -213,14 +197,51 @@ "type": "github" } }, + "ghc98X": { + "flake": false, + "locked": { + "lastModified": 1696643148, + "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", + "ref": "ghc-9.8", + "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", + "revCount": 61642, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "ref": "ghc-9.8", + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, + "ghc99": { + "flake": false, + "locked": { + "lastModified": 1697054644, + "narHash": "sha256-kKarOuXUaAH3QWv7ASx+gGFMHaHKe0pK5Zu37ky2AL4=", + "ref": "refs/heads/master", + "rev": "f383a242c76f90bcca8a4d7ee001dcb49c172a9a", + "revCount": 62040, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, "hackage": { "flake": false, "locked": { - "lastModified": 1691714311, - "narHash": "sha256-CK+aHUSxJS+i4qYrjJOY2LglRCEFhDA7c6KQKA4m62E=", + "lastModified": 1700007731, + "narHash": "sha256-tsgvIfkvKujhymW2EWAME1FHEmdiyvUbWS9r7Cdqnfw=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "b58e354fb6dfa897775e555326fb6c0f4f0bfbe1", + "rev": "f7760ad0bc4014d7fb0786326d14842e9ebd0641", "type": "github" }, "original": { @@ -237,13 +258,17 @@ "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", "flake-compat": "flake-compat", - "flake-utils": "flake-utils", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", + "ghc98X": "ghc98X", + "ghc99": "ghc99", "hackage": [ "hackage" ], "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", + "hls-2.2": "hls-2.2", + "hls-2.3": "hls-2.3", + "hls-2.4": "hls-2.4", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -262,11 +287,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1691974241, - "narHash": "sha256-SpeS/lPy5pxCszTQyGf8WozKEWIA4xGrHFtr/TguZjU=", + "lastModified": 1700009422, + "narHash": "sha256-dC61gAwIdAdvM0aQaDS0cyGLftPahBA2/5dFleZ94aE=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "71f026dc5e42931c7d517ee30e79292670c3ac34", + "rev": "711f9f20e4bfa7105c5ce0129b3586778068e568", "type": "github" }, "original": { @@ -309,6 +334,57 @@ "type": "github" } }, + "hls-2.2": { + "flake": false, + "locked": { + "lastModified": 1693064058, + "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.2.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.3": { + "flake": false, + "locked": { + "lastModified": 1695910642, + "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.3.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.4": { + "flake": false, + "locked": { + "lastModified": 1696939266, + "narHash": "sha256-VOMf5+kyOeOmfXTHlv4LNFJuDGa7G3pDnOxtzYR40IU=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "362fdd1293efb4b82410b676ab1273479f6d17ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -392,11 +468,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1688517130, - "narHash": "sha256-hUqfxSlo+ffqVdkSZ1EDoB7/ILCL25eYkcCXW9/P3Wc=", + "lastModified": 1691634696, + "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", "ref": "hkm/remote-iserv", - "rev": "9151db2a9a61d7f5fe52ff8836f18bbd0fd8933c", - "revCount": 13, + "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", + "revCount": 14, "type": "git", "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" }, @@ -595,11 +671,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1690680713, - "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", + "lastModified": 1695416179, + "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", + "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6", "type": "github" }, "original": { @@ -627,11 +703,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1690720142, - "narHash": "sha256-GywuiZjBKfFkntQwpNQfL+Ksa2iGjPprBGL0/psgRZM=", + "lastModified": 1695318763, + "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3acb5c4264c490e7714d503c7166a3fde0c51324", + "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", "type": "github" }, "original": { @@ -704,11 +780,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1691971763, - "narHash": "sha256-P98EuYKYhKLRTwHQTW7vvpNtHxEDwc7T5EUEMgoWH14=", + "lastModified": 1700006966, + "narHash": "sha256-CMaxgsyYGTtZNeLXIud8YgEiqm0gfievAYFAD9dVcAk=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "4f3ebb68981d7bec84f010a950a85bd360d7b3af", + "rev": "842af7f9bbfd34de8e3b776ea200f93060d53364", "type": "github" }, "original": { @@ -726,7 +802,7 @@ "blank": "blank", "devshell": "devshell", "dmerge": "dmerge", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "incl": "incl", "makes": [ "std",