summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2021-05-22 18:19:10 -0700
committerJonathan Ringer <jonringer117@gmail.com>2021-05-22 18:19:10 -0700
commit11a9ac00fc34ca9948ae05c034fa730163626e40 (patch)
tree90b3ed6837b3f97239f6efbe763929cdaaa5795b /pkgs/tools/package-management
parent563389a7fdd85b1ca1d4c6590785df62f52c8d6d (diff)
parent6543c61311c0397775253dd3d7f1f41154fc6189 (diff)
downloadnixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar
nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.gz
nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.bz2
nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.lz
nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.xz
nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.zst
nixpkgs-11a9ac00fc34ca9948ae05c034fa730163626e40.zip
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/tools/networking/xh/default.nix
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/protontricks/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix
index 0934ef1028d..f82dc0e4bc0 100644
--- a/pkgs/tools/package-management/protontricks/default.nix
+++ b/pkgs/tools/package-management/protontricks/default.nix
@@ -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;
   };
 }