Skip to content

Commit dac970d

Browse files
authored
Merge pull request #5029 from IntersectMBO/aniketd/remove-ghc810-from-dev-env-and-ci
Remove GHC 8.10 from nix-flake and GHA
2 parents f5ab505 + 8829c53 commit dac970d

File tree

3 files changed

+41
-61
lines changed

3 files changed

+41
-61
lines changed

.github/workflows/haskell.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
build:
3737
strategy:
3838
matrix:
39-
ghc: ["8.10.7", "9.2.8", "9.6.7", "9.8.4", "9.10.1", "9.12.1"]
39+
ghc: ["9.2.8", "9.6.7", "9.8.4", "9.10.1", "9.12.1"]
4040
os: [ubuntu-latest]
4141
fail-fast: false
4242

@@ -213,7 +213,7 @@ jobs:
213213
- set-algebra
214214
- small-steps
215215
- vector-map
216-
ghc: ["8.10.7", "9.2.8", "9.6.7", "9.8.4", "9.10.1", "9.12.1"]
216+
ghc: ["9.2.8", "9.6.7", "9.8.4", "9.10.1", "9.12.1"]
217217
os: [ubuntu-latest]
218218
fail-fast: false
219219

flake.lock

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

flake.nix

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,21 @@
33

44
inputs = {
55

6-
# Remove this once we no longer need GHC 8.10.7.
6+
###########################################################################
7+
# We pin the versions of haskell.nix and hackage.nix because
8+
# - Cross compilation for windows is broken in newer versions.
9+
# - plutus-preprocessor is a non-buildable package and it seems to be treated differently in newer versions.
10+
# We should unpin this once we no longer need it by specifying only haskell.nix and let it use its own default hackage.nix
11+
# haskellNix.url = "github:input-output-hk/haskell.nix";
712
hackageNix = {
813
url = "github:input-output-hk/hackage.nix?ref=for-stackage";
914
flake = false;
1015
};
1116
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.
1417
url = "github:input-output-hk/haskell.nix/a0283c855a38ed70ba521f7a9290e78488ddf11b";
1518
inputs.hackage.follows = "hackageNix";
1619
};
20+
###########################################################################
1721

1822
nixpkgs.follows = "haskellNix/nixpkgs-unstable";
1923
iohkNix.url = "github:input-output-hk/iohk-nix";
@@ -201,7 +205,7 @@
201205
cabalProject.flake (
202206
lib.optionalAttrs (system == "x86_64-linux") {
203207
# on linux, build/test other supported compilers
204-
variants = lib.genAttrs ["ghc8107" "ghc9121"] (compiler-nix-name: {
208+
variants = lib.genAttrs ["ghc928" "ghc9121"] (compiler-nix-name: {
205209
inherit compiler-nix-name;
206210
});
207211
}
@@ -282,7 +286,7 @@
282286
};
283287
in
284288
mkDevShells cabalProject
285-
# Additional shells for every GHC version supported by haskell.nix, eg. `nix develop .#ghc8107`
289+
# Additional shells for every GHC version supported by haskell.nix, eg. `nix develop .#ghc9121`
286290
// lib.mapAttrs (compiler-nix-name: _: let
287291
p = cabalProject.appendModule {inherit compiler-nix-name;};
288292
in

0 commit comments

Comments
 (0)