diff --git a/cabal.project b/cabal.project index ebf8868c16..5af921b115 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-03-15T22:05:53Z - , cardano-haskell-packages 2024-03-21T15:31:54Z + , hackage.haskell.org 2024-03-24T23:16:24Z + , cardano-haskell-packages 2024-03-24T23:54:54Z packages: cardano-cli @@ -43,4 +43,3 @@ write-ghc-environment-files: always -- 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/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 5983866ca1..a7d72b8a4b 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -201,7 +201,7 @@ library , cardano-crypto-class ^>= 2.1.2 , cardano-crypto-wrapper ^>= 1.5.1 , cardano-data >= 1.1 - , cardano-git-rev ^>= 0.2.1 + , cardano-git-rev ^>= 0.2.2 , cardano-ledger-byron >= 1.0.0.2 , cardano-ping ^>= 0.2.0.13 , cardano-prelude diff --git a/flake.lock b/flake.lock index 3114e588b1..991932cce7 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1711036055, - "narHash": "sha256-Yc/YJn1TE/XjHnVHKc+1Zdxehd6Yffs8iGReamDbZU0=", + "lastModified": 1711325252, + "narHash": "sha256-EsfeiMBkJapk5LnPTG0hJCvTTAH3FmZpVE9Upji23FI=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "3e48c9145ce1e826068a110c6ceaa8073aa60bff", + "rev": "8266a425ea940ce8dd813973c61544ced6f4e5da", "type": "github" }, "original": { @@ -170,33 +170,33 @@ "type": "github" } }, - "ghc98X": { + "ghc910X": { "flake": false, "locked": { - "lastModified": 1696643148, - "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", - "ref": "ghc-9.8", - "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", - "revCount": 61642, + "lastModified": 1709693152, + "narHash": "sha256-j7K/oZLy1ZZIpOsjq101IF7cz/i/UxY1ofIeNUfuuXc=", + "ref": "ghc-9.10", + "rev": "21e3f3250e88640087a1a60bee2cc113bf04509f", + "revCount": 62524, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" }, "original": { - "ref": "ghc-9.8", + "ref": "ghc-9.10", "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" } }, - "ghc99": { + "ghc911": { "flake": false, "locked": { - "lastModified": 1701580282, - "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", + "lastModified": 1710286031, + "narHash": "sha256-fz71zsU/ZukFMUsRNk2Ro3xTNMKsNrpvQtRtPqRI60c=", "ref": "refs/heads/master", - "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", - "revCount": 62197, + "rev": "e6bfb85c842edca36754bb8914e725fbaa1a83a6", + "revCount": 62586, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -210,11 +210,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1709598119, - "narHash": "sha256-yKBRMToGWyUEsr5aKosZq4l+vYTuYH5fsf0bVM3LZBQ=", + "lastModified": 1711326208, + "narHash": "sha256-1yKfIKSwjo38ZiMoX0nxQ3xu5gROd2qk79vqYrSn7zI=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "128827568c267832bf838781ad373fa1158ec21a", + "rev": "50beb0a0ad21b5aa68a444482fbab71135525be6", "type": "github" }, "original": { @@ -232,8 +232,8 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc98X": "ghc98X", - "ghc99": "ghc99", + "ghc910X": "ghc910X", + "ghc911": "ghc911", "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", @@ -262,11 +262,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1708911681, - "narHash": "sha256-QGkzPN1HUYxgMU2EwiwjMvR2gQF0ffUdxALq1+bOdcY=", + "lastModified": 1711327801, + "narHash": "sha256-u1c7y+ksx0Er8C1s5tnoHDhhkG9eXskVOnKtzHUqQIw=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "5031fa0b8346fcc533c33073530ca87b8390add3", + "rev": "11337f2fb85cd606630929f8fce485160d343cdc", "type": "github" }, "original": { @@ -475,18 +475,18 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1691634696, - "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", - "ref": "hkm/remote-iserv", - "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", - "revCount": 14, - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + "lastModified": 1708894040, + "narHash": "sha256-Rv+PajrnuJ6AeyhtqzMN+bcR8z9+aEnrUass+N951CQ=", + "owner": "stable-haskell", + "repo": "iserv-proxy", + "rev": "2f2a318fd8837f8063a0d91f329aeae29055fba9", + "type": "github" }, "original": { - "ref": "hkm/remote-iserv", - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + "owner": "stable-haskell", + "ref": "iserv-syms", + "repo": "iserv-proxy", + "type": "github" } }, "lowdown-src": { @@ -801,11 +801,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1708906175, - "narHash": "sha256-KJDF0CO077Jx4GjjPK6pNkx6NkY7p1x5RMPfaIe8nl4=", + "lastModified": 1711325399, + "narHash": "sha256-Tx+/n9tBfnTgXj1TbBxgbceqB1TKdYY94BRNF6qSwJY=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "bfa4778050cf69fe50f91d39dcefbb9005d6d0d0", + "rev": "81b2725cbf27a23d7e292448072dc1bff976351a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ce209abca2..8b5c5c7873 100644 --- a/flake.nix +++ b/flake.nix @@ -69,7 +69,7 @@ # tools we want in our shell, from hackage shell.tools = { - cabal = "3.10.2.0"; + cabal = "3.10.3.0"; ghcid = "0.8.8"; } // lib.optionalAttrs (config.compiler-nix-name == defaultCompiler) {