Skip to content

Commit f685e2e

Browse files
authored
Merge pull request #4987 from IntersectMBO/nm/update-ghc-variants
Update upper-bound ghc variant to 9.12.1
2 parents 496ce57 + d846c8e commit f685e2e

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

flake.lock

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,19 @@
22
description = "cardano-ledger";
33

44
inputs = {
5-
haskellNix.url = "github:input-output-hk/haskell.nix";
5+
6+
# Remove this once we no longer need GHC 8.10.7.
7+
hackageNix = {
8+
url = "github:input-output-hk/hackage.nix?ref=for-stackage";
9+
flake = false;
10+
};
11+
haskellNix = {
12+
# GHC 8.10.7 cross compilation for windows is broken in newer versions of haskell.nix.
13+
# Unpin this once we no longer need GHC 8.10.7.
14+
url = "github:input-output-hk/haskell.nix/a0283c855a38ed70ba521f7a9290e78488ddf11b";
15+
inputs.hackage.follows = "hackageNix";
16+
};
17+
618
nixpkgs.follows = "haskellNix/nixpkgs-unstable";
719
iohkNix.url = "github:input-output-hk/iohk-nix";
820
flake-utils.url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs";
@@ -189,7 +201,7 @@
189201
cabalProject.flake (
190202
lib.optionalAttrs (system == "x86_64-linux") {
191203
# on linux, build/test other supported compilers
192-
variants = lib.genAttrs ["ghc8107" "ghc984"] (compiler-nix-name: {
204+
variants = lib.genAttrs ["ghc8107" "ghc9121"] (compiler-nix-name: {
193205
inherit compiler-nix-name;
194206
});
195207
}

0 commit comments

Comments
 (0)