Merge remote-tracking branch 'origin/master' into staging-next

Conflicts: pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
parent 563389a7fd 6543c61311
commit 11a9ac00fc
157 changed files with 1479 additions and 591 deletions
@@ -50,7 +50,7 @@ buildPythonApplication rec {
    description = "A simple wrapper for running Winetricks commands for Proton-enabled games";
    homepage = "https://github.com/Matoking/protontricks";
    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ metadark ];
+    maintainers = with maintainers; [ kira-bruneau ];
    platforms = platforms.linux;
  };
 }