Skip to content

Commit bcd966d

Browse files
committed
Update doc tests to use GHC 9.6
1 parent de1dd86 commit bcd966d

File tree

7 files changed

+16
-40
lines changed

7 files changed

+16
-40
lines changed

docs/tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pushd tutorials
55

66
## Getting started
77
pushd getting-started
8-
nix-build
8+
nix-build -A hsPkgs.hello.components.exes.hello
99
nix-shell --pure --run "cabal build hello"
1010
popd
1111

@@ -50,4 +50,4 @@ pushd iohk-nix
5050
nix build --accept-flake-config
5151
popd
5252

53-
popd
53+
popd

docs/tutorials/development/default.nix

Lines changed: 1 addition & 1 deletion
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 = "ghc92"; # Not required for `stack.yaml` based projects.
29+
compiler-nix-name = "ghc96"; # Not required for `stack.yaml` based projects.
3030
}

docs/tutorials/development/nix/sources.json

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,10 @@
55
"homepage": "https://input-output-hk.github.io/haskell.nix",
66
"owner": "input-output-hk",
77
"repo": "haskell.nix",
8-
"rev": "d61a3f429425e57108ca2b5355f10df94dafe39d",
9-
"sha256": "1fra8grb1jzfb794vm9kw090bb5kiq5g11xmb3nkm2lk60yixjx3",
8+
"rev": "faab397be774447638b6e8a18d429fc8e733648d",
9+
"sha256": "10hxhd43fsgq7i9cw2qbyjzhwp2v6wmpnsllf3fg4iq2xwczld8h",
1010
"type": "tarball",
11-
"url": "https://github.com/input-output-hk/haskell.nix/archive/d61a3f429425e57108ca2b5355f10df94dafe39d.tar.gz",
12-
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
13-
},
14-
"nixpkgs": {
15-
"branch": "release-22.11",
16-
"description": "Nix Packages collection",
17-
"homepage": "",
18-
"owner": "NixOS",
19-
"repo": "nixpkgs",
20-
"rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f",
21-
"sha256": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=",
22-
"type": "tarball",
23-
"url": "https://github.com/NixOS/nixpkgs/archive/b7ce17b1ebf600a72178f6302c77b6382d09323f.tar.gz",
11+
"url": "https://github.com/input-output-hk/haskell.nix/archive/faab397be774447638b6e8a18d429fc8e733648d.tar.gz",
2412
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2513
}
2614
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
helloProject =
1313
final.haskell-nix.project' {
1414
src = ./.;
15-
compiler-nix-name = "ghc92";
15+
compiler-nix-name = "ghc96";
1616
# This is used by `nix develop .` to open a shell for use with
1717
# `cabal`, `hlint` and `haskell-language-server`
1818
shell.tools = {
1919
cabal = {};
20-
hlint = {};
21-
haskell-language-server = {};
20+
# hlint = {};
21+
# haskell-language-server = {};
2222
};
2323
# Non-Haskell shell tools go here
2424
shell.buildInputs = with pkgs; [

docs/tutorials/getting-started/default.nix

Lines changed: 1 addition & 1 deletion
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 = "ghc92"; # Not required for `stack.yaml` based projects.
29+
compiler-nix-name = "ghc96"; # Not required for `stack.yaml` based projects.
3030
}

docs/tutorials/getting-started/nix/sources.json

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,10 @@
55
"homepage": "https://input-output-hk.github.io/haskell.nix",
66
"owner": "input-output-hk",
77
"repo": "haskell.nix",
8-
"rev": "d61a3f429425e57108ca2b5355f10df94dafe39d",
9-
"sha256": "1fra8grb1jzfb794vm9kw090bb5kiq5g11xmb3nkm2lk60yixjx3",
8+
"rev": "faab397be774447638b6e8a18d429fc8e733648d",
9+
"sha256": "10hxhd43fsgq7i9cw2qbyjzhwp2v6wmpnsllf3fg4iq2xwczld8h",
1010
"type": "tarball",
11-
"url": "https://github.com/input-output-hk/haskell.nix/archive/d61a3f429425e57108ca2b5355f10df94dafe39d.tar.gz",
12-
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
13-
},
14-
"nixpkgs": {
15-
"branch": "release-21.05",
16-
"description": "Nix Packages collection",
17-
"homepage": "",
18-
"owner": "NixOS",
19-
"repo": "nixpkgs",
20-
"rev": "5f244caea76105b63d826911b2a1563d33ff1cdc",
21-
"sha256": "1xlgynfw9svy7nvh9nkxsxdzncv9hg99gbvbwv3gmrhmzc3sar75",
22-
"type": "tarball",
23-
"url": "https://github.com/NixOS/nixpkgs/archive/5f244caea76105b63d826911b2a1563d33ff1cdc.tar.gz",
11+
"url": "https://github.com/input-output-hk/haskell.nix/archive/faab397be774447638b6e8a18d429fc8e733648d.tar.gz",
2412
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2513
}
2614
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(import ./default.nix).shellFor {
22
tools = {
33
cabal = "latest";
4-
hlint = "latest";
5-
haskell-language-server = "latest";
4+
# hlint = "latest";
5+
# haskell-language-server = "latest";
66
};
7-
}
7+
}

0 commit comments

Comments
 (0)