xss-lock: improve locker options passing #61311
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @Ma27 who is listed maintainer of the |
Ma27
reviewed
May 11, 2019
- allow locker options without hacks - add extraOptions
turboMaCk
force-pushed
the
xss-lock-locker-options
branch
from
a482f7a
to
7fef2e3
Compare
|
@GrahamcOfBorg test xss-lock |
|
Bt win case another maintainer sees this: I'd like to add a simple testcase for the example provided above before merging this, but I'm slightly busy with other stuff now, so it would be great if you could be patient until I've pushed that :) |
|
I really appreciate how responsive (and fast) you were. There's no need to rush this imo. Better right than right now. Also, let me know if I should change or do something extra here. I'm interested in learning how to work with nixpkgs so I can contribute more in the future. |
turboMaCk
commented
May 11, 2019
* Don't use `literalExample`, raw Nix values can directly be specified as an option example which provides support for highlighting in the manual as well. * Escape shell args for `extraOptions`: I.e. the `-n` option might be problematic as a longer notification command might be misinterpreted.
|
@GrahamcOfBorg test xss-lock |
|
@turboMaCk thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Noob alert: This is my first PR to nixpkgs.
Motivation for this change
Currently, command line arguments can't be passed in
lockereasily without workarounds.This is because xss-lock doesn't recognize these are locker arguments.
Things done
In short:
Locker is now separated by
--. Because of this one can no longer abuselockeroption to pass arguments toxss-lockand therefore new optionextraOptionswas added to pass options toxss-lockThis is a breaking change for configurations which used workaround described
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)