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

Merge pull request #6272 from NixOS/types-path-better-error

Browse Source 
types.nix: better error message for non-paths
This commit is contained in:
Benno Fünfstück 2015-08-15 13:16:00 +02:00
commit e6f1e1e5db
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/types.nix
View File

@ -103,7 +103,8 @@ rec {
path = mkOptionType { path = mkOptionType {
name = "path"; name = "path";
# Hacky: there is no ‘isPath’ primop. # Hacky: there is no ‘isPath’ primop.
check = x: builtins.substring 0 1 (toString x) == "/"; # need to check isString first because otherwise toString throws an error.
check = x: builtins.isString x && builtins.substring 0 1 (toString x) == "/";
merge = mergeOneOption; merge = mergeOneOption;
}; };

2
nixos/modules/config/system-path.nix
View File

@ -57,7 +57,7 @@ in
environment = { environment = {
systemPackages = mkOption { systemPackages = mkOption {
type = types.listOf types.path; type = types.listOf types.package;
default = []; default = [];
example = literalExample "[ pkgs.firefox pkgs.thunderbird ]"; example = literalExample "[ pkgs.firefox pkgs.thunderbird ]";
description = '' description = ''