diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3454dc71997..d007f03ac44 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6529,12 +6529,6 @@ githubId = 3359345; name = "obadz"; }; - ocharles = { - email = "ollie@ocharles.org.uk"; - github = "ocharles"; - githubId = 20878; - name = "Oliver Charles"; - }; odi = { email = "oliver.dunkl@gmail.com"; github = "odi"; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 19ebedf1ea3..9858f04d7dd 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -140,6 +140,6 @@ stdenv.mkDerivation rec { description = "A cross-desktop display manager"; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ ocharles worldofpeace ]; + maintainers = with maintainers; [ worldofpeace ]; }; } diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index ab7dd90801c..a89e2b07113 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://launchpad.net/lightdm-gtk-greeter"; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index 95cbdd9c19b..37cf8fc18af 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.andreas-diesner.de/garminplugin"; license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.ocharles ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index c3161ed875a..362ba4a3a12 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -72,7 +72,7 @@ in mkDerivation rec { meta = with stdenv.lib; { description = "Performance software for cyclists, runners and triathletes"; platforms = platforms.linux; - maintainers = [ maintainers.ocharles ]; + maintainers = [ ]; license = licenses.gpl3; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index a0dbf98f276..953cfed3c66 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Synchronize maildirs and notmuch databases"; homepage = "http://www.muchsync.org/"; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ocharles ]; + maintainers = with stdenv.lib.maintainers; []; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix index aa6ebfd3395..97449d944ec 100644 --- a/pkgs/development/libraries/garmintools/default.nix +++ b/pkgs/development/libraries/garmintools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface"; homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.ocharles ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index d19d05276e2..c092da73585 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { ''; homepage = "https://gtimelog.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ocharles oxzi ]; + maintainers = with maintainers; [ oxzi ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix index 4d316410365..b093a8008da 100644 --- a/pkgs/development/web/xmlindent/default.nix +++ b/pkgs/development/web/xmlindent/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "http://xmlindent.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.ocharles ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 915a481ad0f..07dadd7a635 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -20,7 +20,7 @@ buildGoPackage { description = "Prometheus exporter for RabbitMQ"; homepage = "https://github.com/kbudde/rabbitmq_exporter"; license = licenses.mit; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 7ec59c6873b..ed3fe43faeb 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -148,7 +148,7 @@ let homepage = "https://www.postgresql.org"; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintainers; [ ocharles thoughtpolice danbst globin marsam ]; + maintainers = with maintainers; [ thoughtpolice danbst globin marsam ]; platforms = platforms.unix; knownVulnerabilities = optional (!atLeast "9.4") "PostgreSQL versions older than 9.4 are not maintained anymore!"; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index eabed40e8eb..0811d43eb6a 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -203,7 +203,7 @@ let homepage = "http://fishshell.com/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ ocharles cole-h ]; + maintainers = with maintainers; [ cole-h ]; }; passthru = { diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index a2702f993a6..f3c415f3cd0 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -27,6 +27,6 @@ buildGoModule rec { homepage = "https://github.com/wal-g/wal-g"; license = licenses.asl20; description = "An archival restoration tool for PostgreSQL"; - maintainers = with maintainers; [ ocharles marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 5429ecea2c6..ed80f620318 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "http://opentsdb.net"; license = licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ maintainers.ocharles ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 7e85973cbdb..4df008364d0 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HTTP load tester"; - maintainers = with maintainers; [ ocharles raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; license = licenses.gpl2Plus; };