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

Merge pull request #141099 from roberth/nixos-21.05-compat-136909 

[21.05] lib.{literalExpression, literalDocBook}: init as shims
This commit is contained in:
Silvan Mosberger 2021-10-12 18:18:33 +02:00 committed by GitHub
parent f134749c7e dcfdb79b09
commit d50679e56e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/default.nix
View File

@ -123,8 +123,8 @@ let
inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions
mergeDefaultOption mergeOneOption mergeEqualOption getValues mergeDefaultOption mergeOneOption mergeEqualOption getValues
getFiles optionAttrSetToDocList optionAttrSetToDocList' getFiles optionAttrSetToDocList optionAttrSetToDocList'
scrubOptionValue literalExample showOption showFiles scrubOptionValue literalExpression literalExample literalDocBook
unknownModule mkOption; showOption showFiles unknownModule mkOption;
inherit (self.types) isType setType defaultTypeMerge defaultFunctor inherit (self.types) isType setType defaultTypeMerge defaultFunctor
isOptionType mkOptionType; isOptionType mkOptionType;
inherit (self.asserts) inherit (self.asserts)

4
lib/options.nix
View File

@ -217,6 +217,10 @@ rec {
*/ */
literalExample = text: { _type = "literalExample"; inherit text; }; literalExample = text: { _type = "literalExample"; inherit text; };
# Compatibility shims for https://github.com/NixOS/nixpkgs/pull/136909
literalExpression = literalExample;
literalDocBook = literalExample;
# Helper functions. # Helper functions.
/* Convert an option, described as a list of the option parts in to a /* Convert an option, described as a list of the option parts in to a