From 2aa523e189423fb5d6bad46453b6c11b1de1b7d5 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Mon, 27 May 2024 14:09:23 +0200 Subject: [PATCH] Update CHaP & hackage indices --- cabal.project | 8 +++- flake.lock | 126 ++++++++++++++++++++++++++++---------------------- flake.nix | 2 +- 3 files changed, 79 insertions(+), 57 deletions(-) diff --git a/cabal.project b/cabal.project index 70c0208760..8120fc833a 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-18T13:14:14Z - , cardano-haskell-packages 2024-05-14T00:00:00Z + , hackage.haskell.org 2024-05-24T12:49:48Z + , cardano-haskell-packages 2024-05-24T09:29:56Z packages: cardano-api @@ -28,6 +28,10 @@ package cryptonite -- generation is dubious. Set the flag so we use /dev/urandom by default. flags: -support_rdrand +constraints: + -- io-classes-mtl-0.1.2.0 is not buildable + io-classes-mtl < 0.1.2.0 + tests: True test-show-details: direct diff --git a/flake.lock b/flake.lock index 5c75557f4a..cc3893f458 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1715635762, - "narHash": "sha256-d5zfz+wE6Om29BI+wzNwA6VduNGHhJa+WPKct8hte50=", + "lastModified": 1716544578, + "narHash": "sha256-Z9J23IQjRu4gKOI+jj6Rm8Bnza3CYHXLRLhNNg7QVkU=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "2b6bac886a8236cf1c0b7353a88a2f10887f53f3", + "rev": "19b29505e8d0a5bdd264db8911f88fcaa8a93090", "type": "github" }, "original": { @@ -202,33 +202,33 @@ "type": "github" } }, - "ghc98X": { + "ghc910X": { "flake": false, "locked": { - "lastModified": 1696643148, - "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", - "ref": "ghc-9.8", - "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", - "revCount": 61642, + "lastModified": 1714520650, + "narHash": "sha256-4uz6RA1hRr0RheGNDM49a/B3jszqNNU8iHIow4mSyso=", + "ref": "ghc-9.10", + "rev": "2c6375b9a804ac7fca1e82eb6fcfc8594c67c5f5", + "revCount": 62663, "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": 1714817013, + "narHash": "sha256-m2je4UvWfkgepMeUIiXHMwE6W+iVfUY38VDGkMzjCcc=", "ref": "refs/heads/master", - "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", - "revCount": 62197, + "rev": "fc24c5cf6c62ca9e3c8d236656e139676df65034", + "revCount": 62816, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -242,11 +242,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1710721411, - "narHash": "sha256-0B1YATLPUKKOexhhfSFkTQlZH6o4yWJ/0WJeyZMxBKg=", + "lastModified": 1716770092, + "narHash": "sha256-N4YGGedV+OfpVPQNqjBfZYfCjBjbWfZ5pdHcapVOScg=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "99719945242bc0c965560ed708868aa088748524", + "rev": "179e52b7d49e43ffc2f1826a01e0c1b750db6073", "type": "github" }, "original": { @@ -264,8 +264,8 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat_2", "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", @@ -274,10 +274,11 @@ "hls-2.4": "hls-2.4", "hls-2.5": "hls-2.5", "hls-2.6": "hls-2.6", + "hls-2.7": "hls-2.7", + "hls-2.8": "hls-2.8", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", - "nix-tools-static": "nix-tools-static", "nixpkgs": [ "haskellNix", "nixpkgs-unstable" @@ -294,11 +295,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1708649400, - "narHash": "sha256-iDwTrACFFetPuTc0efdZ5pukmMMj/e9rPIYAUJxSo1E=", + "lastModified": 1716771027, + "narHash": "sha256-rWtqMkpEDcF1901KEm/Y+hL+y1SidBJA/KdnAePae5c=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "a3e36bb1cc1f4ab1dbe1b12d5bf68220ba3daf64", + "rev": "200be01f6c0390da8044fbd2998dc7b1e49121a3", "type": "github" }, "original": { @@ -426,6 +427,40 @@ "type": "github" } }, + "hls-2.7": { + "flake": false, + "locked": { + "lastModified": 1708965829, + "narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.7.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.8": { + "flake": false, + "locked": { + "lastModified": 1715153580, + "narHash": "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "dd1be1beb16700de59e0d6801957290bcf956a0a", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.8.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -489,18 +524,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": 1710581758, + "narHash": "sha256-UNUXGiKLGUv1TuQumV70rfjCJERP4w8KZEDxsMG0RHc=", + "owner": "stable-haskell", + "repo": "iserv-proxy", + "rev": "50ea210590ab0519149bfd163d5ba199be925fb6", + "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": { @@ -540,23 +575,6 @@ "type": "github" } }, - "nix-tools-static": { - "flake": false, - "locked": { - "lastModified": 1706266250, - "narHash": "sha256-9t+GRk3eO9muCtKdNAwBtNBZ5dH1xHcnS17WaQyftwA=", - "owner": "input-output-hk", - "repo": "haskell-nix-example", - "rev": "580cb6db546a7777dad3b9c0fa487a366c045c4e", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "haskell-nix-example", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1657693803, @@ -801,11 +819,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1708646943, - "narHash": "sha256-2yKh9HEWW+QvmUClepBuEQY0hgcPvCVoVHgrl3QPg8k=", + "lastModified": 1716769250, + "narHash": "sha256-oTWTrrliw5GMe1qh27WWY7ToN3nfmPieZUYgSyR2uaM=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "6cd41c982e508c0ea3bb872ebccfdd7a65a58b2b", + "rev": "d250d0a37d4c8ce39052eeb0174bcea64bc7be33", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e9652cc1b8..ec14ec98f2 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,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) {