Skip to content

Commit

Permalink
Merge pull request #1529 from cachix/docs-fix-haskell
Browse files Browse the repository at this point in the history
docs: fix haskell defaults
  • Loading branch information
domenkozar authored Oct 16, 2024
2 parents 67004f3 + 51ea365 commit 9803535
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions docs/reference/options.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions docs/supported-languages/haskell.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ package


*Default:*
` "pkgs.ghc" `
` pkgs.ghc `



Expand All @@ -56,7 +56,7 @@ null or package


*Default:*
` "pkgs.haskell-language-server" `
` pkgs.haskell-language-server `



Expand All @@ -74,4 +74,4 @@ null or package


*Default:*
` "pkgs.stack" `
` pkgs.stack `
6 changes: 3 additions & 3 deletions src/modules/languages/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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.
'';
Expand All @@ -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.
'';
Expand All @@ -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.
'';
Expand Down

0 comments on commit 9803535

Please sign in to comment.