c8h4/aux-search
1
0
Fork 0
Code Issues Pull requests Packages Releases Activity

Support literalExpression and literalDocBook (#368)

Browse source 
* Support literalExpression and literalDocBook

* Use consistent nixpkgs versions in get_nixpkgs_options
This commit is contained in:
Naïm Favier 2021-10-15 10:20:18 +02:00 committed by GitHub
parent 9e018c36da
commit b74147b671
Failed to generate hash of commit
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
flake-info/src/commands/flake_info.nix
View file

@ -82,7 +82,8 @@ let
# Replace functions by the string <function> # Replace functions by the string <function>
substFunction = x: substFunction = x:
if x ? _type && x._type == "literalExample" then x.text if x ? _type && (x._type == "literalExample" || x._type == "literalExpression" || x._type == "literalDocBook") then
x.text
else if builtins.isAttrs x then else if builtins.isAttrs x then
lib.mapAttrs (name: substFunction) x lib.mapAttrs (name: substFunction) x
else if builtins.isList x then else if builtins.isList x then

2
flake-info/src/commands/nixpkgs_info.rs
View file

@ -64,6 +64,8 @@ pub fn get_nixpkgs_options<T: AsRef<str> + Display>(
"--json", "--json",
"-f", "-f",
script_path.to_str().unwrap(), script_path.to_str().unwrap(),
"-I",
format!("nixpkgs={}", nixpkgs_channel.as_ref()).as_str(),
"--arg", "--arg",
"flake", "flake",
nixpkgs_channel.as_ref(), nixpkgs_channel.as_ref(),