From eaa78111043c898f26e870668593299526ae5db1 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 11:47:32 -0700 Subject: [PATCH] nixpkgs-manual: move shell to package --- doc/doc-support/package.nix | 5 +++++ doc/shell.nix | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index c0213bad4c27..ec9f524df436 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -99,6 +99,11 @@ stdenvNoCC.mkDerivation ( pythonInterpreterTable = callPackage ./python-interpreter-table.nix { }; + shell = callPackage ../../pkgs/tools/nix/web-devmode.nix { + buildArgs = "./."; + open = "/${common.outputPath}/${common.indexPath}"; + }; + tests.manpage-urls = callPackage ../tests/manpage-urls.nix { }; }; } diff --git a/doc/shell.nix b/doc/shell.nix index d0d05d7ee4c4..3aad697742b2 100644 --- a/doc/shell.nix +++ b/doc/shell.nix @@ -3,11 +3,5 @@ let config = { }; overlays = [ ]; }; - - common = import ./common.nix; - inherit (common) outputPath indexPath; in -pkgs.callPackage ../pkgs/tools/nix/web-devmode.nix { - buildArgs = "./."; - open = "/${outputPath}/${indexPath}"; -} +pkgs.nixpkgs-manual.shell