public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55138 from oxij/tree/random-fixes

Browse Source 
random cleanups and a tiny fix
This commit is contained in:
Michael Raskin 2019-02-13 20:16:07 +00:00 committed by GitHub
commit f539a6a70e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 173 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/languages-frameworks/haskell.section.md
View File

@ -352,9 +352,9 @@ you want them to come from. Add the following to `configuration.nix`.
```nix ```nix
services.hoogle = { services.hoogle = {
enable = true; enable = true;
packages = (hpkgs: with hpkgs; [text cryptonite]); packages = (hpkgs: with hpkgs; [text cryptonite]);
haskellPackages = pkgs.haskellPackages; haskellPackages = pkgs.haskellPackages;
}; };
``` ```

4
nixos/modules/misc/version.nix
View File

@ -36,14 +36,14 @@ in
nixos.revision = mkOption { nixos.revision = mkOption {
internal = true; internal = true;
type = types.str; type = types.str;
default = lib.trivial.revisionWithDefault "master"; default = trivial.revisionWithDefault "master";
description = "The Git revision from which this NixOS configuration was built."; description = "The Git revision from which this NixOS configuration was built.";
}; };
nixos.codeName = mkOption { nixos.codeName = mkOption {
readOnly = true; readOnly = true;
type = types.str; type = types.str;
default = lib.trivial.codeName; default = trivial.codeName;
description = "The NixOS release code name (e.g. <literal>Emu</literal>)."; description = "The NixOS release code name (e.g. <literal>Emu</literal>).";
}; };

2
nixos/modules/services/misc/rippled.nix
View File

@ -175,7 +175,7 @@ let
onlineDelete = mkOption { onlineDelete = mkOption {
description = "Enable automatic purging of older ledger information."; description = "Enable automatic purging of older ledger information.";
type = types.addCheck (types.nullOr types.int) (v: v > 256); type = types.nullOr (types.addCheck types.int (v: v > 256));
default = cfg.ledgerHistory; default = cfg.ledgerHistory;
}; };