diff --git a/hosts/nixos/noximilien/configuration.nix b/hosts/nixos/noximilien/configuration.nix index 012cb3f..68ad380 100644 --- a/hosts/nixos/noximilien/configuration.nix +++ b/hosts/nixos/noximilien/configuration.nix @@ -73,9 +73,9 @@ ../../../profiles/http/docs ../../../profiles/http/docs/pdoc.nix ../../../profiles/http/docs/python-docs.nix - #../../../profiles/http/docs/nixpkgs.nix # TODO: fix + ../../../profiles/http/docs/nixpkgs.nix ../../../profiles/http/docs/home-manager.nix - #../../../profiles/http/docs/linux-docs.nix # TODO: fix + ../../../profiles/http/docs/linux-docs.nix # TODO: fix ../../../profiles/http/docs/programs.nix ../../../profiles/http/docs/yagcd.nix /**/ diff --git a/profiles/http/docs/home-manager.nix b/profiles/http/docs/home-manager.nix index 96b39a4..ca0166a 100644 --- a/profiles/http/docs/home-manager.nix +++ b/profiles/http/docs/home-manager.nix @@ -4,6 +4,7 @@ { dirname = "home-manager-manual"; path = "${inputs.home-manager.packages.${config.nixpkgs.system}.docs-html}/share/doc/home-manager"; + basename= "index.xhtml"; desc = "Home-Manager - a user environment configurator"; } ]; diff --git a/profiles/http/docs/nixpkgs.nix b/profiles/http/docs/nixpkgs.nix index 1596c7e..aeac44d 100644 --- a/profiles/http/docs/nixpkgs.nix +++ b/profiles/http/docs/nixpkgs.nix @@ -3,9 +3,15 @@ let # https://stackoverflow.com/a/60232211 system = config.nixpkgs.system; - #mk-nixpkgs-manual = input: import "${input}/doc" { pkgs = import input { inherit system; }; }; - mk-nixpkgs-manual = input: (import "${input}/pkgs/top-level/release.nix" { nixpkgs = import input { inherit system; }; }).manual; - mk-nixos-manual = input: (import "${input}/nixos/release.nix" { nixpkgs = import input { inherit system; }; }).manualHTML.${system}; + mk-nixpkgs-manual = input: + input.legacyPackages.${system}.nixpkgs-manual or + (import "${input}/pkgs/top-level/release.nix" { nixpkgs = import input { inherit system; }; }).manual; + mk-nixos-manual = input: + let + release = (import "${input}/nixos/release.nix" { nixpkgs = import input { inherit system; }; }); + in release.nixos.manual.${system} + or release.manualHTML.${system} + or release.manualHTML; in { @@ -28,10 +34,28 @@ in } # == Old Nixpkgs manuals == /** / + { + dirname = "nixpkgs-manual-24.11"; + basename= "manual.html"; + path = "${mk-nixpkgs-manual inputs.nixpkgs-2411}/share/doc/nixpkgs"; + desc = "Official Nixpkgs 24.11 manual"; + } + { + dirname = "nixpkgs-manual-24.05"; + basename= "manual.html"; + path = "${mk-nixpkgs-manual inputs.nixpkgs-2405}/share/doc/nixpkgs"; + desc = "Official Nixpkgs 24.05 manual"; + } + { + dirname = "nixpkgs-manual-23.11"; + basename= "manual.html"; + path = "${mk-nixpkgs-manual inputs.nixpkgs-2311}/share/doc/nixpkgs"; + desc = "Official Nixpkgs 23.11 manual"; + } { dirname = "nixpkgs-manual-23.05"; basename= "manual.html"; - path = "${mk-nixpkgs-manual inputs.nixpkgs-2213}05share/doc/nixpkgs"; + path = "${mk-nixpkgs-manual inputs.nixpkgs-2305}/share/doc/nixpkgs"; desc = "Official Nixpkgs 23.05 manual"; } {