This is version two of the patch series, removing a 'pk' that I added for debugging, and also fixing 'wrap-script' and 'wrap-program'. To fix 'wrap-script' and 'wrap-program', I added a required 'inputs' argument. All callers have been adjusted to pass it. Perhaps 'patch-shebang' can be fixed and needs to be fixed, but I don't have investigated that closely yet. ('patch-shebangs' (with a #\s) works properly IIUC). Greetings, Maxime.