Skip to content

Commit

Permalink
devmode: move to pkgs/by-name
Browse files Browse the repository at this point in the history
now one can use `devmode` from anywhere Nixpkgs is available:

    devmode = pkgs.devmode.override {
      buildArgs = toString ./.;
      open = "/index.html";
    };
  • Loading branch information
fricklerhandwerk committed Nov 12, 2024
1 parent b94f54b commit 50ff833
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions doc/doc-support/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
lib,
stdenvNoCC,
callPackage,
devmode,
mkShellNoCC,
documentation-highlighter,
nixos-render-docs,
Expand Down Expand Up @@ -98,12 +99,12 @@ stdenvNoCC.mkDerivation (

shell =
let
devmode = callPackage ../../pkgs/tools/nix/web-devmode.nix {
devmode' = devmode.override {
buildArgs = "./.";
open = "/share/doc/nixpkgs/manual.html";
};
in
mkShellNoCC { packages = [ devmode ]; };
mkShellNoCC { packages = [ devmode' ]; };

tests.manpage-urls = callPackage ../tests/manpage-urls.nix { };
};
Expand Down
2 changes: 1 addition & 1 deletion nixos/doc/manual/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let

common = import ./common.nix;
inherit (common) outputPath indexPath;
devmode = pkgs.callPackage ../../../pkgs/tools/nix/web-devmode.nix {
devmode = pkgs.devmode.override {
buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}";
open = "/${outputPath}/${indexPath}";
};
Expand Down
File renamed without changes.

0 comments on commit 50ff833

Please sign in to comment.