ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

Update nixpkgs, fix manual build

Browse source
This commit is contained in:
Zhaofeng Li 2022-01-01 16:41:35 -08:00
parent 06804e3715
commit d74df64826
3 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -18,11 +18,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1638397275, "lastModified": 1640418986,
"narHash": "sha256-2Jos1CJFTMO9IbulbM4PTKn24nISIDQCAG/AqYQ8rmg=", "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "391f93a83c3a486475d60eb4a569bb6afbf306ad", "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -29,10 +29,10 @@
}; };
deploymentOptionsMd = (pkgs.nixosOptionsDoc { deploymentOptionsMd = (pkgs.nixosOptionsDoc {
options = evalNix.docs.deploymentOptions pkgs; options = evalNix.docs.deploymentOptions pkgs;
}).optionsMDDoc; }).optionsCommonMark;
metaOptionsMd = (pkgs.nixosOptionsDoc { metaOptionsMd = (pkgs.nixosOptionsDoc {
options = evalNix.docs.metaOptions pkgs; options = evalNix.docs.metaOptions pkgs;
}).optionsMDDoc; }).optionsCommonMark;
in pkgs.callPackage ./manual { in pkgs.callPackage ./manual {
inherit colmena deploymentOptionsMd metaOptionsMd; inherit colmena deploymentOptionsMd metaOptionsMd;
}; };

21
manual/default.nix
View file

@ -1,10 +1,6 @@
let
notFound = typ: "<span style=\"color: red;\">Error: No ${typ} passed to the builder</span>";
in
{ lib, stdenv, nix-gitignore, mdbook, python3, writeScript { lib, stdenv, nix-gitignore, mdbook, python3, writeScript
, deploymentOptionsMd ? notFound "deployment options text" , deploymentOptionsMd ? null
, metaOptionsMd ? notFound "meta options text" , metaOptionsMd ? null
, colmena ? null , colmena ? null
# Full version # Full version
@ -59,8 +55,17 @@ in stdenv.mkDerivation {
echo "Error: No colmena executable passed to the builder" >> src/reference/cli.md echo "Error: No colmena executable passed to the builder" >> src/reference/cli.md
fi fi
echo "$deploymentOptionsMd" >> src/reference/deployment.md if [[ -n "$deploymentOptionsMd" ]]; then
echo "$metaOptionsMd" >> src/reference/meta.md cat "$deploymentOptionsMd" >> src/reference/deployment.md
else
echo "No deployment options text passed the the builder" >> src/reference/deployment.md
fi
if [[ -n "$metaOptionsMd" ]]; then
cat "$metaOptionsMd" >> src/reference/meta.md
else
echo "No meta options text passed the the builder" >> src/reference/meta.md
fi
mdbook build -d $out mdbook build -d $out