public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos-manual: Fix stripping declaration prefixes

Browse Source 
Regression introduced by e6cd147ae7ae05900ec2ab8ad933bfac7428feac.

This broke all of the installer tests, because they needed to rebuild
the manual within the test machine, while it only has a closure of the
already pre-built system in place.

The problem here was just that the order of the arguments got mixed up
in stripAnyPrefixes, so it was actually trying to strip the path off the
prefix, not the other way around.

So in the end no prefix was stripped at all, so we ended up having full
store paths in the manual, which in turn caused the build within the VM
to fail, because the prefixes differed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2016-01-29 15:58:03 +01:00
parent 718f316f6e
commit a581f72f22
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/default.nix
View File

@ -33,7 +33,7 @@ let
prefixesToStrip = [ herePrefix ] ++ extraSources; prefixesToStrip = [ herePrefix ] ++ extraSources;
stripAnyPrefixes = fn: stripAnyPrefixes = fn:
flip (flip fold fn) prefixesToStrip (fn: prefix: flip (flip fold fn) prefixesToStrip (prefix: fn:
if substring 0 (stringLength prefix) fn == prefix then if substring 0 (stringLength prefix) fn == prefix then
substring (stringLength prefix + 1) 1000 fn substring (stringLength prefix + 1) 1000 fn
else else