diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
| commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
| tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/lib/modules.nix | |
| parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
| parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
| download | nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip | |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/lib/modules.nix')
| -rw-r--r-- | pkgs/lib/modules.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 4af87ec68448..08c26e72f72e 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -341,7 +341,7 @@ rec { else if isAttrs options && lib.attrNames m.options != [] then all (name: lib.addErrorContext "${eol - }while checking the attribute '${addName name}'.${eol + }while checking the attribute `${addName name}':${eol }" (checkModule (addName name) (selectModule name m)) ) (lib.attrNames m.config) else |