Unverified Commit 045472e0 authored by Félix's avatar Félix Committed by GitHub
Browse files

Merge pull request #266798 from picnoir/pic/change-nick 

maintainers: ninjatrappeur -> picnoir
parents 16b5253c dfa45288

maintainers/maintainer-list.nix

+7 −7
Original line number Diff line number Diff line
@@ -12868,13 +12868,6 @@ 
      fingerprint = "9B1A 7906 5D2F 2B80 6C8A  5A1C 7D2A CDAF 4653 CF28";

    }];

  };

  ninjatrappeur = {

    email = "felix@alternativebit.fr";

    matrix = "@ninjatrappeur:matrix.org";

    github = "NinjaTrappeur";

    githubId = 1219785;

    name = "Félix Baylac-Jacqué";

  };

  nintron = {

    email = "nintron@sent.com";

    github = "Nintron27";
@@ -13979,6 +13972,13 @@ 
    githubId = 627831;

    name = "Hoang Xuan Phu";

  };

  picnoir = {

    email = "felix@alternativebit.fr";

    matrix = "@picnoir:alternativebit.fr";

    github = "picnoir";

    githubId = 1219785;

    name = "Félix Baylac-Jacqué";

  };

  piegames = {

    name = "piegames";

    email = "nix@piegames.de";

nixos/modules/services/networking/pleroma.nix

+1 −1
Original line number Diff line number Diff line
@@ -146,6 +146,6 @@ in { 
    };



  };

  meta.maintainers = with lib.maintainers; [ ninjatrappeur ];

  meta.maintainers = with lib.maintainers; [ picnoir ];

  meta.doc = ./pleroma.md;

}

nixos/tests/systemd-networkd.nix

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { 
in import ./make-test-python.nix ({pkgs, ... }: {

  name = "networkd";

  meta = with pkgs.lib.maintainers; {

    maintainers = [ ninjatrappeur ];

    maintainers = [ picnoir ];

  };

  nodes = {

    node1 = { pkgs, ... }@attrs:

pkgs/applications/networking/ssb-patchwork/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ in 
      '';

      homepage = "https://www.scuttlebutt.nz/";

      license = licenses.agpl3;

      maintainers = with maintainers; [ asymmetric ninjatrappeur cyplo ];

      maintainers = with maintainers; [ asymmetric picnoir cyplo ];

      mainProgram = "ssb-patchwork";

      platforms = [ "x86_64-linux" ];

    };

pkgs/data/fonts/fixedsys-excelsior/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec { 
    description = "Pan-unicode version of Fixedsys, a classic DOS font";

    platforms = lib.platforms.all;

    license = lib.licenses.publicDomain;

    maintainers = [ lib.maintainers.ninjatrappeur ];

    maintainers = [ lib.maintainers.picnoir ];

  };

}