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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5e206092be91
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 30236aceaf55
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 11, 2020

  1. nixos/doas: default rule should be first 

    In /etc/doas.conf, the last-matched rule will override all
previously-matched rules. Thus, make the default rule show up first (but
still allow some wiggle room for a user to `mkBefore` it), before any
user-defined rules.
    @cole-h
    cole-h committed May 11, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    GPG key ID: B37E0F2371016A4C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    01b645e View commit details

Commits on May 12, 2020

  1. Merge pull request #87581 from cole-h/doas 

    nixos/doas: default rule should be first
    @adisbladis
    adisbladis authored May 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    30236ac View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/security/doas.nix
2 changes: 1 addition & 1 deletion nixos/modules/security/doas.nix
View file
Original file line number Diff line number Diff line change
@@ -223,7 +223,7 @@ in

config = mkIf cfg.enable {

security.doas.extraRules = [
security.doas.extraRules = mkOrder 600 [
{
groups = [ "wheel" ];
noPass = !cfg.wheelNeedsPassword;