Navigation Menu

Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 74c841f4ad51
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: fa2c6dc3c231
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on May 11, 2019

  1. xss-locker: improve options passing 

    - allow locker options without hacks
- add extraOptions
    @turboMaCk
    turboMaCk committed May 11, 2019
    Copy the full SHA
    7fef2e3 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2019

  1. nixos/xss-lock: improve module 

    * 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.
    @Ma27
    Ma27 committed May 12, 2019
    Copy the full SHA
    7751461 View commit details
    Browse the repository at this point in the history

  2. nixos/xss-lock: add testcase for lockerCommand with several CLI opt… 

    …ions.
    @Ma27
    Ma27 committed May 12, 2019
    Copy the full SHA
    d27431b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #61311 from turboMaCk/xss-lock-locker-options 

    xss-lock: improve locker options passing
    @Ma27
    Ma27 committed May 12, 2019
    Copy the full SHA
    fa2c6dc View commit details
    Browse the repository at this point in the history