cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Revert "Add a separate manual job"

Browse source 
This reverts commit 5e3ad1dde0. Manual
generation now depends on the 'nix' command.
This commit is contained in:
Eelco Dolstra 2020-08-19 21:00:57 +02:00
parent c3e20d8c28
commit b4ef3d7078
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.nix
View file

@ -144,6 +144,11 @@
installFlags = "sysconfdir=$(out)/etc"; 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; doInstallCheck = true;
installCheckFlags = "sysconfdir=$(out)/etc"; installCheckFlags = "sysconfdir=$(out)/etc";
@ -210,25 +215,6 @@
# Perl bindings for various platforms. # Perl bindings for various platforms.
perlBindings = nixpkgs.lib.genAttrs systems (system: nixpkgsFor.${system}.nix.perl-bindings); 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 # Binary tarball for various platforms, containing a Nix store
# with the closure of 'nix' package, and the second half of # with the closure of 'nix' package, and the second half of
# the installation script. # the installation script.