Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sublime-merge: askpass bug fix #90685

Merged
merged 2 commits into from Jun 25, 2020
Merged

sublime-merge: askpass bug fix #90685

merged 2 commits into from Jun 25, 2020

Conversation

zookatron
Copy link
Contributor

Replace ssh-askpass-sublime executable from sublime-merge that is incompatable with the nix package wrapper. Fixes #88600

Motivation for this change

Sublime merge has it's own askpass program that is used when pushing/pulling from a git repo using an ssh key with a passphrase and no ssh-agent. Currently the askpass program doesn't work (askpass dialog is never shown) due to it's custom functionality requiring it to pass a custom argv[0] argument to the sublime-merge binary which doesn't work because of the wrapper bash script added by the Nix build process to set various environment variables needed for it to run.

Things done

I've replaced the askpass program that is distributed with sublime-merge with a simple bash script that has equivalent functionality and works properly with the Nix package.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Replace ssh-askpass-sublime executable from sublime-merge that is incompatable with the nix package wrapper. Fixes NixOS#88600
Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Final nitpick and then it's good to merge, could you change the commit message for the version bump to:

sublime-merge: 2011 -> 2022

@zookatron
Copy link
Contributor Author

Final nitpick and then it's good to merge, could you change the commit message for the version bump to:

sublime-merge: 2011 -> 2022

Absolutely, though is there a preferred way to indicate that it's just the dev version that's updating, not the stable version? Or does it not matter?

@danieldk
Copy link
Contributor

Final nitpick and then it's good to merge, could you change the commit message for the version bump to:

sublime-merge: 2011 -> 2022

Absolutely, though is there a preferred way to indicate that it's just the dev version that's updating, not the stable version? Or does it not matter?

Since sublime-merge-dev is an attribute:

sublime-merge-dev: 2011 -> 2022

Sorry for messing up the example message.

@zookatron
Copy link
Contributor Author

Since sublime-merge-dev is an attribute:

sublime-merge-dev: 2011 -> 2022

Sorry for messing up the example message.

Got it, that makes sense, I've updated the commit message!

Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for making this fix the hash correction!

@danieldk danieldk merged commit 6b09698 into NixOS:master Jun 25, 2020
@zookatron
Copy link
Contributor Author

No problem, thank you for the help and feedback @danieldk !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

sublime-merge cannot push to remote
2 participants