From 3cb2a4875ab89da68427d8b3002d5d6796fc6499 Mon Sep 17 00:00:00 2001 From: Sander Date: Wed, 16 Oct 2024 15:01:51 +0400 Subject: [PATCH 1/3] docs: fix haskell defaults --- src/modules/languages/haskell.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/languages/haskell.nix b/src/modules/languages/haskell.nix index 4cb040903..a1bd106b0 100644 --- a/src/modules/languages/haskell.nix +++ b/src/modules/languages/haskell.nix @@ -12,7 +12,7 @@ in package = lib.mkOption { type = lib.types.package; default = pkgs.ghc; - defaultText = "pkgs.ghc"; + defaultText = lib.literalExpression "pkgs.ghc"; description = '' Haskell compiler to use. ''; @@ -24,7 +24,7 @@ in { supportedGhcVersions = [ ghcVersion ]; }; - defaultText = "pkgs.haskell-language-server"; + defaultText = lib.literalExpression "pkgs.haskell-language-server"; description = '' Haskell language server to use. ''; @@ -33,7 +33,7 @@ in stack = lib.mkOption { type = lib.types.nullOr lib.types.package; default = pkgs.stack; - defaultText = "pkgs.stack"; + defaultText = lib.literalExpression "pkgs.stack"; description = '' Haskell stack to use. ''; From 0f030b7961e3a2de95cec4923b1c02dc1587fe46 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:04:59 +0000 Subject: [PATCH 2/3] Auto generate docs/reference/options.md --- docs/reference/options.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference/options.md b/docs/reference/options.md index faa4b874f..682c6315f 100644 --- a/docs/reference/options.md +++ b/docs/reference/options.md @@ -2783,7 +2783,7 @@ package *Default:* -` "pkgs.ghc" ` +` pkgs.ghc ` *Declared by:* - [https://github.com/cachix/devenv/blob/main/src/modules/languages/haskell.nix](https://github.com/cachix/devenv/blob/main/src/modules/languages/haskell.nix) @@ -2804,7 +2804,7 @@ null or package *Default:* -` "pkgs.haskell-language-server" ` +` pkgs.haskell-language-server ` *Declared by:* - [https://github.com/cachix/devenv/blob/main/src/modules/languages/haskell.nix](https://github.com/cachix/devenv/blob/main/src/modules/languages/haskell.nix) @@ -2825,7 +2825,7 @@ null or package *Default:* -` "pkgs.stack" ` +` pkgs.stack ` *Declared by:* - [https://github.com/cachix/devenv/blob/main/src/modules/languages/haskell.nix](https://github.com/cachix/devenv/blob/main/src/modules/languages/haskell.nix) From 51ea36526ec8199d3acf923333a7dffd95a04a2a Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:05:57 +0000 Subject: [PATCH 3/3] Auto generate docs and examples --- docs/supported-languages/haskell.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/supported-languages/haskell.md b/docs/supported-languages/haskell.md index 2c8da633a..61e0bded3 100644 --- a/docs/supported-languages/haskell.md +++ b/docs/supported-languages/haskell.md @@ -38,7 +38,7 @@ package *Default:* -` "pkgs.ghc" ` +` pkgs.ghc ` @@ -56,7 +56,7 @@ null or package *Default:* -` "pkgs.haskell-language-server" ` +` pkgs.haskell-language-server ` @@ -74,4 +74,4 @@ null or package *Default:* -` "pkgs.stack" ` +` pkgs.stack `