Merge remote-tracking branch 'origin/master' into core-updates

 Conflicts:
	gnu/local.mk
	gnu/packages/boost.scm
	gnu/packages/chez.scm
	gnu/packages/compression.scm
	gnu/packages/crates-io.scm
	gnu/packages/docbook.scm
	gnu/packages/engineering.scm
	gnu/packages/gcc.scm
	gnu/packages/gl.scm
	gnu/packages/gtk.scm
	gnu/packages/nettle.scm
	gnu/packages/python-check.scm
	gnu/packages/python-xyz.scm
	gnu/packages/radio.scm
	gnu/packages/rust.scm
	gnu/packages/sqlite.scm
	guix/build-system/node.scm

1 files changed, 0 insertions, 9 deletions

diff --git a/nix/nix-daemon/shared.hh b/nix/nix-daemon/shared.hh
index b45e9f0cfd..98ec97410b 100644
--- a/nix/nix-daemon/shared.hh
+++ b/nix/nix-daemon/shared.hh
@@ -20,18 +20,9 @@
 
 #pragma once
 
-#include <string>
-
 #include <stdlib.h>
 #include <signal.h>
 
-static inline void
-showManPage (const char *name)
-{
-  /* This idea is evil.  Abort.  */
-  abort ();
-}
-
 extern volatile ::sig_atomic_t blockInt;
 
 extern char **argvSaved;