Unverified Commit f7dcbd94 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #307583 from Artturin/retiremp2e 

maintainers: retire inactive `MP2E`
parents 3438be8f 79aa1b21

maintainers/maintainer-list.nix

+0 −6
Original line number Diff line number Diff line
@@ -13582,12 +13582,6 @@ 
    githubId = 20026143;

    name = "Katona László";

  };

  MP2E = {

    email = "MP2E@archlinux.us";

    github = "MP2E";

    githubId = 167708;

    name = "Cray Elliott";

  };

  mpcsh = {

    email = "m@mpc.sh";

    github = "mpcsh";

maintainers/team-list.nix

+0 −1
Original line number Diff line number Diff line
@@ -524,7 +524,6 @@ with lib.maintainers; { 
    members = [

      aanderse

      edwtjo

      MP2E

      thiagokokada

    ];

    scope = "Maintain Libretro, RetroArch and related packages.";

pkgs/applications/emulators/dolphin-emu/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ stdenv.mkDerivation rec { 
    license = licenses.gpl2Plus;

    platforms = platforms.unix;

    maintainers = with maintainers; [

      MP2E

      ashkitten

      ivar

    ];

pkgs/applications/emulators/dolphin-emu/primehack.nix

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ stdenv.mkDerivation rec { 
    homepage = "https://github.com/shiiion/dolphin";

    description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ MP2E ashkitten Madouura ];

    maintainers = with maintainers; [ ashkitten Madouura ];

    broken = stdenv.isDarwin;

    platforms = platforms.unix;

  };

pkgs/applications/networking/instant-messengers/discord/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ let 
    downloadPage = "https://discordapp.com/download";

    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

    license = licenses.unfree;

    maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ];

    maintainers = with maintainers; [ Scrumplex artturin infinidoge jopejoe1 ];

    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];

    mainProgram = "discord";

  };