From 3149d748cb2fc82ec877d4e79f0427712afe2cdb Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 13 May 2022 10:14:54 +0200
Subject: [PATCH] Fix docbook syntax and literalExample deprecation

---
 modules/apps.nix           | 4 ++--
 modules/devShells.nix      | 6 +++---
 modules/legacyPackages.nix | 4 ++--
 modules/packages.nix       | 6 +++---
 modules/perSystem.nix      | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/apps.nix b/modules/apps.nix
index 357c6ec..a72b4fe 100644
--- a/modules/apps.nix
+++ b/modules/apps.nix
@@ -48,7 +48,7 @@ in
         description = ''
           Programs runnable with nix run <literal>.#&lt;name></literal>.
         '';
-        example = lib.literalExample ''
+        example = lib.literalExpression or lib.literalExample ''
           {
             x86_64-linux.default.program = "''${config.packages.hello}/bin/hello";
           }
@@ -79,7 +79,7 @@ in
           description = ''
             Programs runnable with nix run <literal>.#&lt;name></literal>.
           '';
-          example = lib.literalExample ''
+          example = lib.literalExpression or lib.literalExample ''
             {
               default.program = "''${config.packages.hello}/bin/hello";
             }
diff --git a/modules/devShells.nix b/modules/devShells.nix
index 21a79e5..28e28a7 100644
--- a/modules/devShells.nix
+++ b/modules/devShells.nix
@@ -19,7 +19,7 @@ in
         default = { };
         description = ''
           Per system an attribute set of packages used as shells.
-          nix develop .#<name> will run devShells.<system>.<name>.
+          <literal>nix develop .#&lt;name></literal> will run <literal>devShells.&lt;system>.&lt;name></literal>.
         '';
       };
     };
@@ -45,8 +45,8 @@ in
           type = types.lazyAttrsOf types.package;
           default = { };
           description = ''
-            An attribute set of packages to be built by nix develop .#<name>.
-            nix build .#<name> will run devShells.<name>.
+            An attribute set of packages to be built by <literal>nix develop .#&lt;name></literal>.
+            <literal>nix build .#&lt;name></literal> will run <literal>devShells.&lt;name></literal>.
           '';
         };
       };
diff --git a/modules/legacyPackages.nix b/modules/legacyPackages.nix
index 1c66b31..b2c9381 100644
--- a/modules/legacyPackages.nix
+++ b/modules/legacyPackages.nix
@@ -18,7 +18,7 @@ in
         type = types.lazyAttrsOf (types.lazyAttrsOf types.anything);
         default = { };
         description = ''
-          Per system, an attribute set of anything. This is also used by nix build .#<attrpath>.
+          Per system, an attribute set of anything. This is also used by <literal>nix build .#&lt;attrpath></literal>.
         '';
       };
     };
@@ -44,7 +44,7 @@ in
           type = types.lazyAttrsOf types.anything;
           default = { };
           description = ''
-            An attribute set of anything. This is also used by nix build .#<attrpath>.
+            An attribute set of anything. This is also used by <literal>nix build .#&lt;attrpath></literal>.
           '';
         };
       };
diff --git a/modules/packages.nix b/modules/packages.nix
index d3352fb..1d46f59 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -19,7 +19,7 @@ in
         default = { };
         description = ''
           Per system an attribute set of packages.
-          nix build .#<name> will build packages.<system>.<name>.
+          <literal>nix build .#&lt;name></literal> will build <literal>packages.&lt;system>.&lt;name></literal>.
         '';
       };
     };
@@ -45,8 +45,8 @@ in
           type = types.lazyAttrsOf types.package;
           default = { };
           description = ''
-            An attribute set of packages to be built by nix build .#<name>.
-            nix build .#<name> will build packages.<name>.
+            An attribute set of packages to be built by <literal>nix build .#&lt;name></literal>.
+            <literal>nix build .#&lt;name></literal> will build <literal>packages.&lt;name></literal>.
           '';
         };
       };
diff --git a/modules/perSystem.nix b/modules/perSystem.nix
index b5e2cab..ab781a4 100644
--- a/modules/perSystem.nix
+++ b/modules/perSystem.nix
@@ -21,7 +21,7 @@ in
     };
 
     perInput = mkOption {
-      description = "Function from system to function from flake to system-specific attributes.";
+      description = "Function from system to function from flake to <literal>system</literal>-specific attributes.";
       type = types.functionTo (types.functionTo (types.lazyAttrsOf types.unspecified));
     };