Skip to content

Commit

Permalink
ghc: 965 -> 966
Browse files Browse the repository at this point in the history
Update cabal indicies
Add upper bound on hspec-junit-formatter
Stop using patched hls
  • Loading branch information
locallycompact committed Jul 10, 2024
1 parent f2ef4c7 commit 402f91c
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 77 deletions.
4 changes: 2 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ repository cardano-haskell-packages

-- See CONTRIBUTING.md for information about when and how to update these.
index-state:
, hackage.haskell.org 2024-05-19T19:07:04Z
, cardano-haskell-packages 2024-05-19T19:04:02Z
, hackage.haskell.org 2024-07-09T19:07:04Z
, cardano-haskell-packages 2024-07-09T19:04:02Z

packages:
cardano-api-classy
Expand Down
118 changes: 48 additions & 70 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@
url = "github:IntersectMBO/cardano-haskell-packages?ref=repo";
flake = false;
};
# Use a patched 2.6.0.0 as we are also affected by
# https://github.com/haskell/haskell-language-server/issues/4046
hls = {
url = "github:cardano-scaling/haskell-language-server?ref=2.6-patched";
url = "github:haskell/haskell-language-server";
flake = false;
};
cardano-node.url = "github:intersectmbo/cardano-node/8.11.0-pre";
Expand All @@ -39,7 +37,7 @@
];
perSystem = { pkgs, config, lib, system, ... }:
let
compiler = "ghc965";
compiler = "ghc966";

# nixpkgs enhanced with haskell.nix and crypto libs as used by iohk

Expand Down
2 changes: 1 addition & 1 deletion hydra-test-utils/hydra-test-utils.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ library
, hspec
, hspec-api
, hspec-core
, hspec-junit-formatter
, hspec-junit-formatter <1.1.1
, HUnit
, hydra-cardano-api
, hydra-prelude
Expand Down

0 comments on commit 402f91c

Please sign in to comment.