Skip to content

Commit addd20e

Browse files
vcunatvcunat
committedNov 28, 2017
Merge branch 'master' into staging
2 parents d70d5c9 + 2e55aec commit addd20e

File tree

56 files changed

+782
-540
lines changed

Some content is hidden

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

56 files changed

+782
-540
lines changed
 

‎doc/languages-frameworks/haskell.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ trouble with packages like `3dmodels` and `4Blocks`, because these names are
4848
invalid identifiers in the Nix language. The issue of how to deal with these
4949
rare corner cases is currently unresolved.)
5050

51-
Haskell packages who's Nix name (second column) begins with a `haskell-` prefix
51+
Haskell packages whose Nix name (second column) begins with a `haskell-` prefix
5252
are packages that provide a library whereas packages without that prefix
5353
provide just executables. Libraries may provide executables too, though: the
5454
package `haskell-pandoc`, for example, installs both a library and an

‎nixos/modules/services/monitoring/grafana.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ in {
111111
type = mkOption {
112112
description = "Database type.";
113113
default = "sqlite3";
114-
type = types.enum ["mysql" "sqlite3" "postgresql"];
114+
type = types.enum ["mysql" "sqlite3" "postgres"];
115115
};
116116

117117
host = mkOption {

0 commit comments

Comments
 (0)