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

flake-info: render longDescription for flake packages (#607)

Browse source
This commit is contained in:
Naïm Favier 2023-02-05 10:24:26 +01:00 committed by GitHub
parent 188d618859
commit eb9fa64c33
Failed to generate hash of commit
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
flake-info/assets/commands/flake_info.nix
View file

@ -29,8 +29,9 @@ let
# paths = builtins.listToAttrs ( map (output: {name = output; value = drv.${output};}) drv.outputs ); # paths = builtins.listToAttrs ( map (output: {name = output; value = drv.${output};}) drv.outputs );
default_output = drv.outputName; default_output = drv.outputName;
} }
// lib.optionalAttrs (drv ? meta && drv.meta ? description) { inherit (drv.meta) description; } // lib.optionalAttrs (drv ? meta.description) { inherit (drv.meta) description; }
// lib.optionalAttrs (drv ? meta && drv.meta ? license) { inherit (drv.meta) license; } // lib.optionalAttrs (drv ? meta.longDescription) { inherit (drv.meta) longDescription; }
// lib.optionalAttrs (drv ? meta.license) { inherit (drv.meta) license; }
) )
) (validPkgs drvs); ) (validPkgs drvs);
readApps = system: apps: lib.mapAttrsToList ( readApps = system: apps: lib.mapAttrsToList (

7
flake-info/src/data/export.rs
View file

@ -115,6 +115,7 @@ impl TryFrom<(import::FlakeEntry, super::Flake)> for Derivation {
outputs, outputs,
default_output, default_output,
description, description,
long_description,
license, license,
} => { } => {
let package_attr_set: Vec<_> = attribute_name.split(".").collect(); let package_attr_set: Vec<_> = attribute_name.split(".").collect();
@ -125,6 +126,8 @@ impl TryFrom<(import::FlakeEntry, super::Flake)> for Derivation {
}) })
.into(); .into();
let long_description = long_description.map(|s| s.render_markdown()).transpose()?;
let package_license: Vec<License> = license let package_license: Vec<License> = license
.map(OneOrMany::into_list) .map(OneOrMany::into_list)
.unwrap_or_default() .unwrap_or_default()
@ -152,7 +155,7 @@ impl TryFrom<(import::FlakeEntry, super::Flake)> for Derivation {
package_description: description.clone(), package_description: description.clone(),
package_maintainers: vec![maintainer.clone()], package_maintainers: vec![maintainer.clone()],
package_maintainers_set: maintainer.name.map_or(vec![], |n| vec![n]), package_maintainers_set: maintainer.name.map_or(vec![], |n| vec![n]),
package_longDescription: None, package_longDescription: long_description,
package_hydra: (), package_hydra: (),
package_system: String::new(), package_system: String::new(),
package_homepage: Vec::new(), package_homepage: Vec::new(),
@ -251,7 +254,7 @@ impl TryFrom<import::NixpkgsEntry> for Derivation {
package_maintainers, package_maintainers,
package_maintainers_set, package_maintainers_set,
package_description: package.meta.description.clone(), package_description: package.meta.description.clone(),
package_longDescription: long_description.clone(), package_longDescription: long_description,
package_hydra: (), package_hydra: (),
package_system: package.system, package_system: package.system,
package_homepage: package package_homepage: package

2
flake-info/src/data/import.rs
View file

@ -30,6 +30,8 @@ pub enum FlakeEntry {
outputs: Vec<String>, outputs: Vec<String>,
default_output: String, default_output: String,
description: Option<String>, description: Option<String>,
#[serde(rename = "longDescription")]
long_description: Option<String>,
license: Option<OneOrMany<StringOrStruct<License>>>, license: Option<OneOrMany<StringOrStruct<License>>>,
}, },
/// An "application" that can be called using nix run <..> /// An "application" that can be called using nix run <..>