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: 48dd117b24a0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 64cf1e79dd77
Choose a head ref
  • 2 commits
  • 4 files changed
  • 3 contributors

Commits on Jun 23, 2020

  1. small treewide: his -> theirs/its

    SJW brigade represent. ;)
    
    Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
    Profpatsch and jtojnar committed Jun 23, 2020
    Copy the full SHA
    517be84 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    64cf1e7 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 nixos/modules/config/users-groups.nix
  2. +1 −1 nixos/modules/services/networking/3proxy.nix
  3. +1 −1 nixos/tests/sudo.nix
  4. +1 −1 pkgs/applications/audio/pamixer/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/config/users-groups.nix
Original file line number Diff line number Diff line change
@@ -626,7 +626,7 @@ in {
then
''
The password hash of user "${name}" may be invalid. You must set a
valid hash or the user will be locked out of his account. Please
valid hash or the user will be locked out of their account. Please
check the value of option `users.users."${name}".hashedPassword`.
''
else null
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/3proxy.nix
Original file line number Diff line number Diff line change
@@ -124,7 +124,7 @@ in {
<literal>"iponly"</literal>: specifies no authentication. ACLs authorization is used.
</para></listitem>
<listitem><para>
<literal>"strong"</literal>: authentication by username/password. If user is not registered his access is denied regardless of ACLs.
<literal>"strong"</literal>: authentication by username/password. If user is not registered their access is denied regardless of ACLs.
</para></listitem>
</itemizedlist>
2 changes: 1 addition & 1 deletion nixos/tests/sudo.nix
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ in
with subtest("test5 user should not be able to run commands under root"):
machine.fail("sudo -u test5 sudo -n -u root true")
with subtest("test5 user should be able to keep his environment"):
with subtest("test5 user should be able to keep their environment"):
machine.succeed("sudo -u test5 sudo -n -E -u test1 true")
with subtest("users in group 'barfoo' should not be able to keep their environment"):
2 changes: 1 addition & 1 deletion pkgs/applications/audio/pamixer/default.nix
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
description = "Pulseaudio command line mixer";
longDescription = ''
Features:
- Get the current volume of the default sink, the default source or a selected one by his id
- Get the current volume of the default sink, the default source or a selected one by its id
- Set the volume for the default sink, the default source or any other device
- List the sinks
- List the sources