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

Revert "lib/options: Use escapeNixIdentifier for showOption"

Browse Source 
This is used in in the manual generation for option identifiers that can
be linked. This, unike what the example describes, doesn't preserve
quotes which is needed for these identifiers to be valid.

This reverts commit 124cccbe3b.
This commit is contained in:
Daiderd Jordan
2020-04-14 20:34:07 +02:00
parent 1c951b1484
commit 31a03daa72
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/options.nix
+8 -7
View File
@@ -200,13 +200,14 @@ rec {
Unlike attributes, options can also start with numbers: Unlike attributes, options can also start with numbers:
(showOption ["windowManager" "2bwm" "enable"]) == "windowManager.2bwm.enable" (showOption ["windowManager" "2bwm" "enable"]) == "windowManager.2bwm.enable"
*/ */
showOption = parts: showOption = parts: let
let escapeOptionPart = part:
escapeOptionPart = part: let
if part == "*" || builtins.match "<.+>" part != null || builtins.match "[a-zA-Z0-9_][a-zA-Z0-9_'-]+" part != null escaped = lib.strings.escapeNixString part;
then part in if escaped == "\"${part}\""
else escapeNixIdentifier part; then part
in concatMapStringsSep "." escapeOptionPart parts; else escaped;
in (concatStringsSep ".") (map escapeOptionPart parts);
showFiles = files: concatStringsSep " and " (map (f: "`${f}'") files); showFiles = files: concatStringsSep " and " (map (f: "`${f}'") files);
unknownModule = "<unknown-file>"; unknownModule = "<unknown-file>";