From 293589065dd0f6bbfd6f83fcdc4f2d74543337c9 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sat, 9 Nov 2024 20:51:18 +1100 Subject: [PATCH 1/2] ci: fix manual not being regenerated when non-Nix files are updated This also fixes the README not being updated on the website as well --- .github/workflows/update-manual.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/update-manual.yml b/.github/workflows/update-manual.yml index 42ee21e5..8d2af53b 100644 --- a/.github/workflows/update-manual.yml +++ b/.github/workflows/update-manual.yml @@ -3,8 +3,6 @@ on: push: branches: - master - paths: - - '**.nix' jobs: update-manual: From 534ca06930039a616934b6d9dd8316e8df799622 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sat, 9 Nov 2024 20:51:18 +1100 Subject: [PATCH 2/2] docs: use `nix-darwin` instead of `Darwin` --- doc/manual/default.nix | 8 ++++---- doc/manual/manual.md | 2 +- modules/examples/flake/flake.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/manual/default.nix b/doc/manual/default.nix index abe126b7..deada0a4 100644 --- a/doc/manual/default.nix +++ b/doc/manual/default.nix @@ -118,18 +118,18 @@ in rec { # TODO: get these parameterized in upstream nixos-render-docs sed -i -e ' - /^\.TH / s|NixOS|Darwin|g + /^\.TH / s|NixOS|nix-darwin|g /^\.SH "NAME"$/ { N - s|NixOS|Darwin|g + s|NixOS|nix-darwin|g } /^\.SH "DESCRIPTION"$/ { N; N s|/etc/nixos/configuration|configuration|g - s|NixOS|Darwin|g - s|nixos|darwin|g + s|NixOS|nix-darwin|g + s|nixos|nix-darwin|g } /\.SH "AUTHORS"$/ { diff --git a/doc/manual/manual.md b/doc/manual/manual.md index 131df7d2..bacba03f 100644 --- a/doc/manual/manual.md +++ b/doc/manual/manual.md @@ -1,4 +1,4 @@ -# Darwin Configuration Options {#book-darwin-manual} +# nix-darwin Configuration Options {#book-darwin-manual} ## Version @DARWIN_VERSION@ ```{=include=} options diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix index e6eaefc7..bd733bd9 100644 --- a/modules/examples/flake/flake.nix +++ b/modules/examples/flake/flake.nix @@ -1,5 +1,5 @@ { - description = "Example Darwin system flake"; + description = "Example nix-darwin system flake"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";