• rebased onto master for final appimagetools that was merged
• switched to functionArgs, seems okay but take a look please
• I previously dropped inherit name extraPkgs in wrapType1 which I've restored, not sure what that's about.

re:third point maybe that isn't needed since args is merged in anyway, shrug.

(added commit removing the inherit in both variants, FWIW)

@GrahamcOfBorg eval

Look okay re:appimagetools changes, @tilpner ? :)

Thanks for adding this one @dtzWill. Really looking forward to it getting merged :)

Oh, sorry, I forgot about this one. Yes, looks fine!

It's up to 1.4.12 fwiw, I have that commit ready but can submit in a follow-up :). But it's just a bump and hashfix happily.

@GrahamcOfBorg eval

I had one remaining suspicion about at which levels extraPkgs is optional now. As it is now, this breaks #54696 with called without required argument 'extraPkgs.

This is because defaults are only bound locally, the captured args don't have them.

let f = args@{ x ? 42 }: args; in f {}
=> {} (and not { x = 42; })

To fix this, move the defaulting of extraPkgs to wrapAppImage.

Locally merging the linked standardnotes PR results in a tree that evaluates standardnotes without that error, AFAICT. I think maybe 58ce19e fixed that, if unintentionally :). Can you confirm, or have any ideas why I can't reproduce? Thanks!

I'm not sure. I checked out standardnotes-appimagetools and picked all Appimage-related commits (g cherry-pick 6dcdf27 056d827 58ce19e).

I think 58ce19e097a9bc099bf86b45ca9317fddb59ccd0 is the one breaking it, not fixing it.

~/dev/nixpkgs test > g reset --hard dtz/feature/minetime
HEAD is now at acf3067fda7 minetime: 1.4.11 -> 1.4.12
~/dev/nixpkgs test > g merge --no-edit tilpner/standardnotes-appimagetools
Merge made by the 'recursive' strategy.
 pkgs/applications/editors/standardnotes/default.nix | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)
~/dev/nixpkgs test > nix-instantiate -A standardnotes
error: 'wrapAppImage' at /home/till/dev/nixpkgs/pkgs/build-support/appimage/default.nix:36:18 called without required argument 'extraPkgs', at /home/till/dev/nixpkgs/pkgs/build-support/appimage/default.nix:55:62
~/dev/nixpkgs test > g revert --no-edit 58ce19e097a9bc0
[test a71c178fec5] Revert "appimageTools: small simplification"
 Date: Wed Mar 27 10:32:18 2019 +0100
 1 file changed, 2 insertions(+)
~/dev/nixpkgs test > nix-instantiate -A standardnotes
warning: you did not specify '--add-root'; the result might be removed by the garbage collector
/nix/store/ks7aw47l6zac25150jfnpwhjmap1c2dn-standardnotes-2.3.12.drv

@GrahamcOfBorg build minetime standardnotes joplin-desktop

Well regardless rebase + some new changes and all is well re:eval.

\o/

Look good, @tilpner ? :)

I think 58ce19e is the one breaking it, not fixing it.

Sorry about this, you're right. See comments on #54696, just pushed the revert.