Merge pull request #262 from Pacman99/simplify-mkflakedoc

move mkFlakeDoc to packages output also drop jobs

flake.lock

@@ -81,7 +81,7 @@
         "utils": "utils_2"
       },
       "locked": {
-        "narHash": "sha256-LvO5VwFNFzb2xbmgw+fWhkrRY1KMlp5vxqQU/BqS0H8=",
+        "narHash": "sha256-7Y6SqdLWr/g8tqNjqakRbS0KVIA/yzRm3D/RnoTAuzE=",
         "path": "./lib",
         "type": "path"
       },

lib/flake.nix

@@ -54,13 +54,9 @@
         }
       );
 
-      jobs = import ./jobs { inherit nixpkgs; lib = nixpkgs.lib // lib; };
-
     in
 
     {
-      inherit jobs;
-
       lib = utils.lib // {
         inherit (lib)
           mkFlake;
@@ -81,6 +77,14 @@
             lib = nixpkgs.lib // lib;
           };
         };
+        packages = {
+          mkFlakeDoc = pkgs.writeText "mkFlakeOptions.md"
+            (
+              pkgs.nixosOptionsDoc {
+                inherit (lib.mkFlake.evalArgs { nixos = "nixos"; args = { }; }) options;
+              }
+            ).optionsMDDoc;
+        };
       }
     );
 

lib/jobs/default.nix

@@ -1,7 +0,0 @@
-{ nixpkgs, lib, system ? "x86_64-linux" }:
-let
-  pkgs = import nixpkgs { inherit system; overlays = [ ]; config = { }; };
-in
-{
-  mkFlakeDoc = import ./mkFlakeDoc.nix { inherit pkgs lib; };
-}

lib/jobs/mkFlakeDoc.nix

@@ -1,33 +0,0 @@
-{ pkgs, lib, ... }:
-let
-  singleDoc = name: value: ''
-    ## ${name}
-    ${value.description}
-    ${lib.optionalString (value ? type) ''
-      *_Type_*:
-      ${value.type}
-    ''}
-    ${lib.optionalString (value ? default) ''
-      *_Default_*
-      ```
-      ${builtins.toJSON value.default}
-      ```
-    ''}
-    ${lib.optionalString (value ? example) ''
-      *_Example_*
-      ```
-      ${value.example}
-      ```
-    ''}
-  '';
-
-  options = (
-    lib.mkFlake.evalArgs { nixos = "nixos"; args = { }; }
-  ).options;
-
-  processedOptions = (pkgs.nixosOptionsDoc { inherit options; }).optionsNix;
-
-  fullDoc = lib.concatStringsSep "" (lib.mapAttrsToList singleDoc processedOptions);
-in
-pkgs.writeText "devosOptions.md" fullDoc
-