summary refs log tree commit diff
diff options
context:
space:
mode:
authorPamplemousse <xav.maso@gmail.com>2022-01-26 21:55:25 +0100
committerPamplemousse <xav.maso@gmail.com>2022-01-26 21:56:11 +0100
commit5148813e179418be1a0317a3920c612e2e4d9f22 (patch)
tree2dd6d9a3af5e168f8972d1938a393313bfe96c29
parentb54751a22183647b2467df863ab4b364792b51af (diff)
downloadnixpkgs-5148813e179418be1a0317a3920c612e2e4d9f22.tar
nixpkgs-5148813e179418be1a0317a3920c612e2e4d9f22.tar.gz
nixpkgs-5148813e179418be1a0317a3920c612e2e4d9f22.tar.bz2
nixpkgs-5148813e179418be1a0317a3920c612e2e4d9f22.tar.lz
nixpkgs-5148813e179418be1a0317a3920c612e2e4d9f22.tar.xz
nixpkgs-5148813e179418be1a0317a3920c612e2e4d9f22.tar.zst
nixpkgs-5148813e179418be1a0317a3920c612e2e4d9f22.zip
modules/taskserver: Minor update
  * documentation
    - update link
    - minor consistency update
  * make tests pass
-rw-r--r--nixos/modules/services/misc/taskserver/default.nix11
-rw-r--r--nixos/modules/services/misc/taskserver/doc.xml2
2 files changed, 7 insertions, 6 deletions
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index a894caed1a3..ff63c41e193 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -106,7 +106,7 @@ let
 
   certtool = "${pkgs.gnutls.bin}/bin/certtool";
 
-  nixos-taskserver = pkgs.pythonPackages.buildPythonApplication {
+  nixos-taskserver = with pkgs.python2.pkgs; buildPythonApplication {
     name = "nixos-taskserver";
 
     src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } ''
@@ -129,7 +129,7 @@ let
       EOF
     '';
 
-    propagatedBuildInputs = [ pkgs.pythonPackages.click ];
+    propagatedBuildInputs = [ click ];
   };
 
 in {
@@ -138,12 +138,13 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = ''
+        description = let
+          url = "https://nixos.org/manual/nixos/stable/index.html#module-services-taskserver";
+        in ''
           Whether to enable the Taskwarrior server.
 
           More instructions about NixOS in conjuction with Taskserver can be
-          found in the NixOS manual at
-          <olink targetdoc="manual" targetptr="module-taskserver"/>.
+          found <link xlink:href="${url}">in the NixOS manual</link>.
         '';
       };
 
diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml
index 5656bb85b37..f6ead7c3785 100644
--- a/nixos/modules/services/misc/taskserver/doc.xml
+++ b/nixos/modules/services/misc/taskserver/doc.xml
@@ -1,7 +1,7 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xlink="http://www.w3.org/1999/xlink"
     version="5.0"
-    xml:id="module-taskserver">
+    xml:id="module-services-taskserver">
  <title>Taskserver</title>
  <para>
   Taskserver is the server component of