Skip to content

Commit edf2b63

Browse files
Try #1779:
2 parents 3b759d4 + 114c275 commit edf2b63

File tree

206 files changed

+25063
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+25063
-287
lines changed

ci.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454
ghc884 = false; # Native version is used to boot 9.0.1
5555
ghc8107 = true;
5656
ghc902 = false;
57-
ghc924 = true;
57+
ghc924 = false;
58+
ghc925 = true;
5859
}));
5960
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
6061
# We need to use the actual nixpkgs version we're working with here, since the values
@@ -65,10 +66,10 @@
6566
|| (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107"]))) {
6667
inherit (lib.systems.examples) ghcjs;
6768
} // lib.optionalAttrs (nixpkgsName == "unstable"
68-
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc924"])
69+
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc925"])
6970
|| (system == "x86_64-darwin" && __elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
7071
inherit (lib.systems.examples) mingwW64;
71-
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924"]) {
72+
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc925"]) {
7273
# Musl cross only works on linux
7374
# aarch64 cross only works on linux
7475
inherit (lib.systems.examples) musl64 aarch64-multiplatform;

docs/tutorials/development/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ in pkgs.haskell-nix.project {
2626
src = ./.;
2727
};
2828
# Specify the GHC version to use.
29-
compiler-nix-name = "ghc924"; # Not required for `stack.yaml` based projects.
30-
}
29+
compiler-nix-name = "ghc925"; # Not required for `stack.yaml` based projects.
30+
}

docs/tutorials/getting-started-flakes/flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
helloProject =
1313
final.haskell-nix.project' {
1414
src = ./.;
15-
compiler-nix-name = "ghc924";
15+
compiler-nix-name = "ghc925";
1616
# This is used by `nix develop .` to open a shell for use with
1717
# `cabal`, `hlint` and `haskell-language-server`
1818
shell.tools = {
@@ -38,4 +38,4 @@
3838
# Built by `nix build .`
3939
packages.default = flake.packages."hello:exe:hello";
4040
});
41-
}
41+
}

docs/tutorials/getting-started/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ in pkgs.haskell-nix.project {
2626
src = ./.;
2727
};
2828
# Specify the GHC version to use.
29-
compiler-nix-name = "ghc924"; # Not required for `stack.yaml` based projects.
30-
}
29+
compiler-nix-name = "ghc925"; # Not required for `stack.yaml` based projects.
30+
}

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
};
6262

6363
outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2105, nixpkgs-2111, nixpkgs-2205, flake-utils, tullia, ... }@inputs:
64-
let compiler = "ghc924";
64+
let compiler = "ghc925";
6565
config = import ./config.nix;
6666
in {
6767
inherit config;

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-9.2.5-x86_64-linux/ghc-pkg/dump-global

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

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-9.2.5-x86_64-linux/ghc-pkg/version

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-9.2.5-x86_64-linux/ghc/info

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

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-9.2.5-x86_64-linux/ghc/numeric-version

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)