Merge branch 'master' into staging-next

Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
parent e7cccdbb13 ed54a5b51d
commit cdf426488b
247 changed files with 3153 additions and 2159 deletions
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
    curlOpts = "--user-agent 'Mozilla/5.0'";
  };

-  # Optionally, it can use GTK+.
+  # Optionally, it can use GTK.
  buildInputs = [ pam libX11 libXext libXinerama libXdmcp libXt ];

  # Don't try to install `xlock' setuid. Password authentication works