puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #9502 from fricklerhandwerk/internal-lookup-paths

Browse source 
use lookup paths in helper expressions consistently
This commit is contained in:
John Ericson 2023-11-30 16:23:24 -05:00 committed by GitHub
parent 7cc2aa799e d5ffc94f33
commit 2fe7e009bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/generate-builtin-constants.nix
View file

@ -1,6 +1,6 @@
let let
inherit (builtins) concatStringsSep attrValues mapAttrs; inherit (builtins) concatStringsSep attrValues mapAttrs;
inherit (import ./utils.nix) optionalString squash; inherit (import <nix/utils.nix>) optionalString squash;
in in
builtinsInfo: builtinsInfo:

2
doc/manual/generate-builtins.nix
View file

@ -1,6 +1,6 @@
let let
inherit (builtins) concatStringsSep attrValues mapAttrs; inherit (builtins) concatStringsSep attrValues mapAttrs;
inherit (import ./utils.nix) optionalString squash; inherit (import <nix/utils.nix>) optionalString squash;
in in
builtinsInfo: builtinsInfo:

30
doc/manual/generate-manpage.nix
View file

@ -1,9 +1,29 @@
let let
inherit (builtins) inherit (builtins)
attrNames attrValues fromJSON listToAttrs mapAttrs groupBy attrNames
concatStringsSep concatMap length lessThan replaceStrings sort; attrValues
inherit (import <nix/utils.nix>) attrsToList concatStrings optionalString filterAttrs trim squash unique; concatMap
showStoreDocs = import ./generate-store-info.nix; concatStringsSep
fromJSON
groupBy
length
lessThan
listToAttrs
mapAttrs
match
replaceStrings
sort
;
inherit (import <nix/utils.nix>)
attrsToList
concatStrings
filterAttrs
optionalString
squash
trim
unique
;
showStoreDocs = import <nix/generate-store-info.nix>;
in in
inlineHTML: commandDump: inlineHTML: commandDump:
@ -97,7 +117,7 @@ let
${optionalString (cat != "") "## ${cat}"} ${optionalString (cat != "") "## ${cat}"}
${concatStringsSep "\n" (attrValues (mapAttrs showOption opts))} ${concatStringsSep "\n" (attrValues (mapAttrs showOption opts))}
''; '';
showOption = name: option: showOption = name: option:
let let
result = trim '' result = trim ''

2
doc/manual/generate-settings.nix
View file

@ -1,6 +1,6 @@
let let
inherit (builtins) attrValues concatStringsSep isAttrs isBool mapAttrs; inherit (builtins) attrValues concatStringsSep isAttrs isBool mapAttrs;
inherit (import ./utils.nix) concatStrings indent optionalString squash; inherit (import <nix/utils.nix>) concatStrings indent optionalString squash;
in in
# `inlineHTML` is a hack to accommodate inconsistent output from `lowdown` # `inlineHTML` is a hack to accommodate inconsistent output from `lowdown`

4
doc/manual/generate-store-info.nix
View file

@ -1,7 +1,7 @@
let let
inherit (builtins) attrValues mapAttrs; inherit (builtins) attrValues mapAttrs;
inherit (import ./utils.nix) concatStrings optionalString; inherit (import <nix/utils.nix>) concatStrings optionalString;
showSettings = import ./generate-settings.nix; showSettings = import <nix/generate-settings.nix>;
in in
inlineHTML: storesInfo: inlineHTML: storesInfo:

2
doc/manual/generate-xp-features-shortlist.nix
View file

@ -1,5 +1,5 @@
with builtins; with builtins;
with import ./utils.nix; with import <nix/utils.nix>;
let let
showExperimentalFeature = name: doc: showExperimentalFeature = name: doc:

2
doc/manual/generate-xp-features.nix
View file

@ -1,5 +1,5 @@
with builtins; with builtins;
with import ./utils.nix; with import <nix/utils.nix>;
let let
showExperimentalFeature = name: doc: showExperimentalFeature = name: doc: