From a9d19e48cdf11ecf65d5dee3f28d0a5a135ce717 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 5 May 2023 14:02:30 +0100 Subject: [PATCH 1/3] Add mdbook to flake.nix Such that it is available in the nix developer environment. --- flake.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flake.nix b/flake.nix index 76243d060129..7351571e61de 100644 --- a/flake.nix +++ b/flake.nix @@ -97,6 +97,9 @@ # Native dependencies for running Complement. olm + + # For building the Synapse documentation website. + mdbook ]; # Install Python and manage a virtualenv with Poetry. From 9ad99faebd7d816e3b6334c0814757cde88905e0 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 5 May 2023 14:04:56 +0100 Subject: [PATCH 2/3] changelog --- changelog.d/15545.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/15545.misc diff --git a/changelog.d/15545.misc b/changelog.d/15545.misc new file mode 100644 index 000000000000..c7c0741f9602 --- /dev/null +++ b/changelog.d/15545.misc @@ -0,0 +1 @@ + Install the `xmlsec` and `mdbook` packages and switch back to the upstream [cachix/devenv](https://github.com/cachix/devenv) repo in the nix development environment. \ No newline at end of file From c220c367d8a7488c189171ef16bb03243b681bf1 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 5 May 2023 14:05:44 +0100 Subject: [PATCH 3/3] Update the changelogs of #15532 and #15533 to match --- changelog.d/15532.misc | 2 +- changelog.d/15533.misc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.d/15532.misc b/changelog.d/15532.misc index e58273f2977d..1ee700f82991 100644 --- a/changelog.d/15532.misc +++ b/changelog.d/15532.misc @@ -1 +1 @@ -Install the `xmlsec` package and switch back to the upstream [cachix/devenv](https://github.com/cachix/devenv) repo in the nix development environment. +Install the `xmlsec` and `mdbook` packages and switch back to the upstream [cachix/devenv](https://github.com/cachix/devenv) repo in the nix development environment. diff --git a/changelog.d/15533.misc b/changelog.d/15533.misc index 8ed23526ef01..1ee700f82991 100644 --- a/changelog.d/15533.misc +++ b/changelog.d/15533.misc @@ -1 +1 @@ -Install the `xmlsec` package and switch back to the upstream [cachix/devenv](https://github.com/cachix/devenv) repo in the nix development environment. \ No newline at end of file +Install the `xmlsec` and `mdbook` packages and switch back to the upstream [cachix/devenv](https://github.com/cachix/devenv) repo in the nix development environment.