From b4ef3d7078133d6c31c77da45a991bfe2210623a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Aug 2020 21:00:57 +0200 Subject: [PATCH] Revert "Add a separate manual job" This reverts commit 5e3ad1dde0a03b3bd094e1d4ecc0f4fc7abdaa5c. Manual generation now depends on the 'nix' command. --- flake.nix | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index 8f5a3055c..f97197cce 100644 --- a/flake.nix +++ b/flake.nix @@ -144,6 +144,11 @@ installFlags = "sysconfdir=$(out)/etc"; + postInstall = '' + mkdir -p $doc/nix-support + echo "doc manual $doc/share/doc/nix/manual" >> $doc/nix-support/hydra-build-products + ''; + doInstallCheck = true; installCheckFlags = "sysconfdir=$(out)/etc"; @@ -210,25 +215,6 @@ # Perl bindings for various platforms. perlBindings = nixpkgs.lib.genAttrs systems (system: nixpkgsFor.${system}.nix.perl-bindings); - # Separate build for just the manual. - manual = - with nixpkgsFor.x86_64-linux; - stdenv.mkDerivation { - name = "nix-manual-${version}"; - src = self; - buildInputs = [ mdbook ]; - configurePhase = ":"; - buildPhase = ":"; - installPhase = - '' - touch Makefile.config - docdir=$out/share/doc/nix - make docdir=$docdir doc_generate=yes $docdir/manual/index.html - mkdir -p $out/nix-support - echo "doc manual $docdir/manual" >> $out/nix-support/hydra-build-products - ''; - }; - # Binary tarball for various platforms, containing a Nix store # with the closure of 'nix' package, and the second half of # the installation script.