From 160ac2f709a9aeb2a746646dacea24e5533b99a2 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Mon, 1 Jul 2024 16:44:01 -0400 Subject: [PATCH] lib-docs -> nixpkgs-lib-docs --- packages/{lib-docs => nixpkgs-lib-docs}/default.nix | 7 +++---- .../default.nix => nixpkgs-lib-docs/locations-json.nix} | 0 packages/nixpkgs-manual/default.nix | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) rename packages/{lib-docs => nixpkgs-lib-docs}/default.nix (76%) rename packages/{doc-locations-json/default.nix => nixpkgs-lib-docs/locations-json.nix} (100%) diff --git a/packages/lib-docs/default.nix b/packages/nixpkgs-lib-docs/default.nix similarity index 76% rename from packages/lib-docs/default.nix rename to packages/nixpkgs-lib-docs/default.nix index b5f04ca..3b95b39 100644 --- a/packages/lib-docs/default.nix +++ b/packages/nixpkgs-lib-docs/default.nix @@ -6,9 +6,8 @@ ... }: let - inherit (pkgs) stdenv nixdoc; - + locations-json = pkgs.callPackage ./locations-json.nix { inherit lib; }; in stdenv.mkDerivation { name = "nixpkgs-lib-docs"; @@ -22,9 +21,9 @@ stdenv.mkDerivation { description=$3 # TODO: wrap lib.$name in , make nixdoc not escape it if [[ -e "../lib/$baseName.nix" ]]; then - nixdoc -c "$name" -d "lib.$name: $description" -l ${pkgs.amg.doc-locations-json} -f "$baseName.nix" > "$out/$name.md" + nixdoc -c "$name" -d "lib.$name: $description" -l ${locations-json} -f "$baseName.nix" > "$out/$name.md" else - nixdoc -c "$name" -d "lib.$name: $description" -l ${pkgs.amg.doc-locations-json} -f "$baseName/default.nix" > "$out/$name.md" + nixdoc -c "$name" -d "lib.$name: $description" -l ${locations-json} -f "$baseName/default.nix" > "$out/$name.md" fi } diff --git a/packages/doc-locations-json/default.nix b/packages/nixpkgs-lib-docs/locations-json.nix similarity index 100% rename from packages/doc-locations-json/default.nix rename to packages/nixpkgs-lib-docs/locations-json.nix diff --git a/packages/nixpkgs-manual/default.nix b/packages/nixpkgs-manual/default.nix index 1509772..519e40e 100644 --- a/packages/nixpkgs-manual/default.nix +++ b/packages/nixpkgs-manual/default.nix @@ -81,7 +81,7 @@ stdenvNoCC.mkDerivation { mv hooks out/hooks mv languages-frameworks out/languages-and-frameworks mkdir out/library-reference - cp ${pkgs.amg.lib-docs}/*.md out/library-reference/ + cp ${pkgs.amg.nixpkgs-lib-docs}/*.md out/library-reference/ mv module-system out/module-system mv packages out/packages mv stdenv out/stdenv