From 8240421b95dfb794797101a1d0aedfc6b1a68346 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Wed, 25 Sep 2024 20:47:38 +0100 Subject: [PATCH 1/2] Change website icon logo Context: * https://github.com/Templarian/MaterialDesign/issues/6602 * https://pictogrammers.com/library/mdi/icon/language-haskell/ (flagged as deprecated) --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index e8d2a86058..9b89bf03d1 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -12,7 +12,7 @@ theme: primary: 'deep purple' accent: 'deep purple' icon: - logo: material/language-haskell + logo: simple/haskell features: - content.code.annotate - content.code.copy From 2b3d21b750d2da97bfae6eaa876100ff18c173ff Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Mon, 30 Sep 2024 15:03:47 +0100 Subject: [PATCH 2/2] Add cross-references to documentation --- doc/configure/yaml/non-project.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/configure/yaml/non-project.md b/doc/configure/yaml/non-project.md index 87d8b8ea9f..0030ac0737 100644 --- a/doc/configure/yaml/non-project.md +++ b/doc/configure/yaml/non-project.md @@ -433,9 +433,10 @@ build with this compiler depends on such global packages because Stack may not be able to find versions of those packages (on Hackage, etc.) that are compatible with the compiler. -The easiest way to deal with this issue is to drop the offending packages as -follows. Instead of using the packages specified in the snapshot, the global -packages bundled with GHC will be used. +The easiest way to deal with this issue is to use the +[`drop-packages`](project.md#drop-packages) project-specific configuration +option to drop the offending packages as follows. Instead of using the packages +specified in the snapshot, the global packages bundled with GHC will be used. ~~~yaml drop-packages: @@ -444,8 +445,9 @@ drop-packages: ~~~ Another way to deal with this issue is to add the relevant packages as -`extra-deps` built from source. To avoid mismatching versions, you can use -exactly the same commit id you used to build GHC as follows: +[`extra-deps`](project.md#extra-deps) built from source. To avoid mismatching +versions, you can use exactly the same commit id you used to build GHC as +follows: ~~~ extra-deps: