diff --git a/packages/doc-locations-json/default.nix b/packages/doc-locations-json/default.nix index a748502..e060172 100644 --- a/packages/doc-locations-json/default.nix +++ b/packages/doc-locations-json/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let revision = pkgs.lib.trivial.revisionWithDefault (pkgs.rev or "master"); @@ -22,7 +22,7 @@ let builtins.map (subsetname: { subsetname = subsetname; functions = libDefPos [ ] toplib.${subsetname}; - }) (builtins.map (x: x.name) pkgs.libsets); + }) (builtins.map (x: x.name) lib.amg.libsets); nixpkgsLib = pkgs.lib; diff --git a/packages/md-manual/default.nix b/packages/md-manual/default.nix index 23e38b6..b17215b 100644 --- a/packages/md-manual/default.nix +++ b/packages/md-manual/default.nix @@ -25,10 +25,10 @@ stdenvNoCC.mkDerivation { ''; postPatch = '' - ln -s ${pkgs.options-doc.optionsJSON}/share/doc/nixos/options.json ./config-options.json + ln -s ${pkgs.amg.options-doc.optionsJSON}/share/doc/nixos/options.json ./config-options.json ''; - pythonInterpreterTable = pkgs.python-interp-table; + pythonInterpreterTable = lib.amg.python-interp-table; passAsFile = [ "pythonInterpreterTable" ]; @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation { cat \ ./functions/library.md.in \ - ${pkgs.lib-docs}/index.md \ + ${pkgs.amg.lib-docs}/index.md \ > ./functions/library.md substitute ./manual.md.in ./manual.md \ --replace-fail '@MANUAL_VERSION@' '${lib.version}' @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation { mkdir out mkdir out/assets - cp ${pkgs.manual-assets}/* out/assets/ + cp ${pkgs.amg.manual-assets}/* out/assets/ mv preface.chapter.md out/index.md mv build-helpers out/build-helpers @@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation { mv hooks out/hooks mv languages-frameworks out/languages-frameworks mkdir out/lib - cp ${pkgs.lib-docs}/*.md out/lib/ + cp ${pkgs.amg.lib-docs}/*.md out/lib/ rm out/lib/index.md mv module-system out/module-system mv packages out/packages