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

[21.05] lib.{literalExpression, literalDocBook}: init as shims
2021-10-12 18:18:33 +02:00 · 2021-10-12 18:18:33 +02:00 · d50679e56e
parent f134749c7e dcfdb79b09
commit d50679e56e
2 changed files with 6 additions and 2 deletions
--- a/lib/default.nix
+++ b/lib/default.nix
@ -123,8 +123,8 @@ let
    inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions
      mergeDefaultOption mergeOneOption mergeEqualOption getValues
      getFiles optionAttrSetToDocList optionAttrSetToDocList'
-      scrubOptionValue literalExample showOption showFiles
-      unknownModule mkOption;
+      scrubOptionValue literalExpression literalExample literalDocBook
+      showOption showFiles unknownModule mkOption;
    inherit (self.types) isType setType defaultTypeMerge defaultFunctor
      isOptionType mkOptionType;
    inherit (self.asserts)
--- a/lib/options.nix
+++ b/lib/options.nix
@ -217,6 +217,10 @@ rec {
  */
  literalExample = text: { _type = "literalExample"; inherit text; };

+  # Compatibility shims for https://github.com/NixOS/nixpkgs/pull/136909
+  literalExpression = literalExample;
+  literalDocBook = literalExample;
+
  # Helper functions.

  /* Convert an option, described as a list of the option parts in to a