small fixups

This commit is contained in:
Pyrox 2024-06-30 18:00:37 -04:00
parent dffb62de95
commit fd6eb5ec36
Signed by untrusted user: pyrox
GPG key ID: 8CDF3F7CAA53A0F5
2 changed files with 7 additions and 7 deletions

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, lib, ... }:
let let
revision = pkgs.lib.trivial.revisionWithDefault (pkgs.rev or "master"); revision = pkgs.lib.trivial.revisionWithDefault (pkgs.rev or "master");
@ -22,7 +22,7 @@ let
builtins.map (subsetname: { builtins.map (subsetname: {
subsetname = subsetname; subsetname = subsetname;
functions = libDefPos [ ] toplib.${subsetname}; functions = libDefPos [ ] toplib.${subsetname};
}) (builtins.map (x: x.name) pkgs.libsets); }) (builtins.map (x: x.name) lib.amg.libsets);
nixpkgsLib = pkgs.lib; nixpkgsLib = pkgs.lib;

View file

@ -25,10 +25,10 @@ stdenvNoCC.mkDerivation {
''; '';
postPatch = '' 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" ]; passAsFile = [ "pythonInterpreterTable" ];
@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation {
cat \ cat \
./functions/library.md.in \ ./functions/library.md.in \
${pkgs.lib-docs}/index.md \ ${pkgs.amg.lib-docs}/index.md \
> ./functions/library.md > ./functions/library.md
substitute ./manual.md.in ./manual.md \ substitute ./manual.md.in ./manual.md \
--replace-fail '@MANUAL_VERSION@' '${lib.version}' --replace-fail '@MANUAL_VERSION@' '${lib.version}'
@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation {
mkdir out mkdir out
mkdir out/assets mkdir out/assets
cp ${pkgs.manual-assets}/* out/assets/ cp ${pkgs.amg.manual-assets}/* out/assets/
mv preface.chapter.md out/index.md mv preface.chapter.md out/index.md
mv build-helpers out/build-helpers mv build-helpers out/build-helpers
@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation {
mv hooks out/hooks mv hooks out/hooks
mv languages-frameworks out/languages-frameworks mv languages-frameworks out/languages-frameworks
mkdir out/lib mkdir out/lib
cp ${pkgs.lib-docs}/*.md out/lib/ cp ${pkgs.amg.lib-docs}/*.md out/lib/
rm out/lib/index.md rm out/lib/index.md
mv module-system out/module-system mv module-system out/module-system
mv packages out/packages mv packages out/packages