From ac5f147afca56a7fb4c9b21dcc28134661b923f0 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Sun, 3 Mar 2024 22:37:55 +0100 Subject: [PATCH] fix `nix help-stores` the crash when calling `nix help-stores` was probably introduced an artifact from a prior untangling of merge conflicts. that said, `nix help-stores` should eventually cease to exist in favor of dedicated `--help` outputs and `man` pages for the various store types. --- doc/manual/generate-manpage.nix | 2 +- doc/manual/generate-settings.nix | 2 +- doc/manual/generate-store-info.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/manual/generate-manpage.nix b/doc/manual/generate-manpage.nix index 14136016d..f799d393e 100644 --- a/doc/manual/generate-manpage.nix +++ b/doc/manual/generate-manpage.nix @@ -3,7 +3,7 @@ let attrNames attrValues fromJSON listToAttrs mapAttrs groupBy concatStringsSep concatMap length lessThan replaceStrings sort; inherit (import ) attrsToList concatStrings optionalString filterAttrs trim squash unique; - showStoreDocs = import ./generate-store-info.nix; + showStoreDocs = import ; in inlineHTML: commandDump: diff --git a/doc/manual/generate-settings.nix b/doc/manual/generate-settings.nix index 8736bb793..3add10075 100644 --- a/doc/manual/generate-settings.nix +++ b/doc/manual/generate-settings.nix @@ -1,6 +1,6 @@ let inherit (builtins) attrValues concatStringsSep isAttrs isBool mapAttrs; - inherit (import ./utils.nix) concatStrings indent optionalString squash; + inherit (import ) concatStrings indent optionalString squash; in # `inlineHTML` is a hack to accommodate inconsistent output from `lowdown` diff --git a/doc/manual/generate-store-info.nix b/doc/manual/generate-store-info.nix index 36215aadf..73defcb71 100644 --- a/doc/manual/generate-store-info.nix +++ b/doc/manual/generate-store-info.nix @@ -1,7 +1,7 @@ let inherit (builtins) attrValues mapAttrs; - inherit (import ./utils.nix) concatStrings optionalString; - showSettings = import ./generate-settings.nix; + inherit (import ) concatStrings optionalString; + showSettings = import ; in inlineHTML: storesInfo: