From e12f7ef2da758eedb322306b1b9e6e9b9e2a8fea Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 30 Jun 2024 18:10:42 -0400 Subject: [PATCH] fix build --- packages/md-manual/default.nix | 8 ++------ {lib => packages/md-manual}/python-interp-table.nix | 10 ++++++++-- 2 files changed, 10 insertions(+), 8 deletions(-) rename {lib => packages/md-manual}/python-interp-table.nix (94%) diff --git a/packages/md-manual/default.nix b/packages/md-manual/default.nix index b17215b..59257a6 100644 --- a/packages/md-manual/default.nix +++ b/packages/md-manual/default.nix @@ -28,17 +28,14 @@ stdenvNoCC.mkDerivation { ln -s ${pkgs.amg.options-doc.optionsJSON}/share/doc/nixos/options.json ./config-options.json ''; - pythonInterpreterTable = lib.amg.python-interp-table; + pythonInterpreterTable = pkgs.callPackage ./python-interp-table.nix { }; passAsFile = [ "pythonInterpreterTable" ]; buildPhase = '' substituteInPlace ./languages-frameworks/python.section.md --subst-var-by python-interpreter-table "$(<"$pythonInterpreterTablePath")" - cat \ - ./functions/library.md.in \ - ${pkgs.amg.lib-docs}/index.md \ - > ./functions/library.md + mv ./functions/library.md.in ./functions/library.md substitute ./manual.md.in ./manual.md \ --replace-fail '@MANUAL_VERSION@' '${lib.version}' @@ -58,7 +55,6 @@ stdenvNoCC.mkDerivation { mv languages-frameworks out/languages-frameworks mkdir 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 mv stdenv out/stdenv diff --git a/lib/python-interp-table.nix b/packages/md-manual/python-interp-table.nix similarity index 94% rename from lib/python-interp-table.nix rename to packages/md-manual/python-interp-table.nix index c8efe32..5c6222d 100644 --- a/lib/python-interp-table.nix +++ b/packages/md-manual/python-interp-table.nix @@ -1,6 +1,12 @@ -{ inputs }: +{ + pkgs ? ( + import ../.. { + config = { }; + overlays = [ ]; + } + ), +}: let - pkgs = inputs.nixpkgs; lib = pkgs.lib; inherit (lib.attrsets) attrNames filterAttrs; inherit (lib.lists)