Merge master into haskell-updates

2 files changed, 8 insertions, 0 deletions

diff --git a/doc/hooks/bmake.section.md b/doc/hooks/bmake.section.md
new file mode 100644
index 0000000000000..6b40ac13e8b95
--- /dev/null
+++ b/doc/hooks/bmake.section.md
@@ -0,0 +1,7 @@
+# bmake {#bmake-hook}
+
+[bmake](https://www.crufty.net/help/sjg/bmake.html) is the portable variant of
+NetBSD make utility.
+
+In Nixpkgs, `bmake` comes with a hook that overrides the default build, check,
+install and dist phases.
diff --git a/doc/hooks/index.md b/doc/hooks/index.md
index 8100e91c8b481..363d627e52582 100644
--- a/doc/hooks/index.md
+++ b/doc/hooks/index.md
@@ -8,6 +8,7 @@ The stdenv built-in hooks are documented in [](#ssec-setup-hooks).
 autoconf.section.md
 automake.section.md
 autopatchelf.section.md
+bmake.section.md
 breakpoint.section.md
 cmake.section.md
 gdk-pixbuf.section.md