Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ rec {
# CLI
cli = pkgs.callPackage ./devshell { };

# Get the modules documentation from an empty evaluation
modules-docs = (eval { configuration = { }; }).config.modules-docs;

# Docs
docs = pkgs.callPackage ./docs { };
docs = pkgs.callPackage ./docs { inherit modules-docs; };

# Evaluate the devshell module
eval = import ./modules pkgs;
Expand Down
2 changes: 1 addition & 1 deletion devshell.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ packages = [
"go",
"goreleaser",
"mdbook",
"mdsh",
"webfs",
]

# Use this section to set environment variables to have in the environment.
Expand Down
2 changes: 2 additions & 0 deletions docs/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ mdbook
, modules-docs
, stdenv
}:
let
Expand All @@ -16,6 +17,7 @@ stdenv.mkDerivation {
};

buildPhase = ''
cp ${modules-docs.markdown} devshell.toml.md
mdbook build
'';

Expand Down
55 changes: 0 additions & 55 deletions docs/devshell.toml

This file was deleted.

99 changes: 0 additions & 99 deletions docs/devshell.toml.md

This file was deleted.

4 changes: 4 additions & 0 deletions docs/serve.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build and serve the docs for local development
set -euo pipefail
webfsd -d -r "$(nix-build "$(dirname "$0")/.." -A docs)"
2 changes: 0 additions & 2 deletions modules/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,5 @@ in

activationPackage = module.config.devshell.activationPackage;

docs = module.config.devshell.docs;

shell = module.config.devshell.shell;
}
2 changes: 2 additions & 0 deletions modules/devshell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,10 @@ in
{
options.devshell = {
bashPackage = mkOption {
internal = true;
type = strOrPackage;
default = pkgs.bashInteractive;
defaultText = "pkgs.bashInteractive";
description = "Version of bash to use in the project";
};

Expand Down
Loading