From a581f72f222043936e78d1fe8ad09380c46bfa53 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 29 Jan 2016 15:58:03 +0100 Subject: [PATCH] nixos-manual: Fix stripping declaration prefixes 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 --- nixos/doc/manual/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index eb2ceb7fd021..5a4d36d9dcc0 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -33,7 +33,7 @@ let prefixesToStrip = [ herePrefix ] ++ extraSources; stripAnyPrefixes = fn: - flip (flip fold fn) prefixesToStrip (fn: prefix: + flip (flip fold fn) prefixesToStrip (prefix: fn: if substring 0 (stringLength prefix) fn == prefix then substring (stringLength prefix + 1) 1000 fn else