Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

maintainers: remove marsam #306702

Merged
merged 1 commit into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,6 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius @ma27
/pkgs/applications/science/math/R @jbedo
/pkgs/development/r-modules @jbedo

# Ruby
/pkgs/development/interpreters/ruby @marsam
/pkgs/development/ruby-modules @marsam

# Rust
/pkgs/development/compilers/rust @Mic92 @zowoq @winterqt @figsoda
/pkgs/build-support/rust @zowoq @winterqt @figsoda
Expand Down Expand Up @@ -198,7 +194,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel

# PostgreSQL and related stuff
/pkgs/servers/sql/postgresql @thoughtpolice @marsam
/pkgs/servers/sql/postgresql @thoughtpolice
/nixos/modules/services/databases/postgresql.xml @thoughtpolice
/nixos/modules/services/databases/postgresql.nix @thoughtpolice
/nixos/tests/postgresql.nix @thoughtpolice
Expand Down
5 changes: 0 additions & 5 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12388,11 +12388,6 @@
githubId = 1709273;
name = "Robin Hack";
};
marsam = {
github = "marsam";
githubId = 65531;
name = "Mario Rodas";
};
marsupialgutz = {
email = "[email protected]";
github = "pupbrained";
Expand Down
4 changes: 2 additions & 2 deletions maintainers/scripts/luarocks-packages.csv
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ argparse,,,,,,
basexx,,,,,,
binaryheap,,,,,,vcunat
busted,,,,,,
cassowary,,,,,,marsam alerque
cassowary,,,,,,alerque
cldr,,,,,,alerque
compat53,,,,,,vcunat
commons.nvim,,,,,,mrcjkb
cosmo,,,,,,marsam
cosmo,,,,,,
coxpcall,,,,1.17.0-1,,
cqueues,,,,,,vcunat
cyan,,,,,,
Expand Down
3 changes: 0 additions & 3 deletions maintainers/team-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ with lib.maintainers; {
bazel = {
members = [
mboes
marsam
uri-canva
cbley
olebedev
Expand Down Expand Up @@ -736,7 +735,6 @@ with lib.maintainers; {
node = {
members = [
lilyinstarlight
marsam
winter
];
scope = "Maintain Node.js runtimes and build tooling.";
Expand Down Expand Up @@ -906,7 +904,6 @@ with lib.maintainers; {

ruby = {
members = [
marsam
];
scope = "Maintain the Ruby interpreter and related packages.";
shortName = "Ruby";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/music-player/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/tsirysndr/music-player";
changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
mainProgram = "music-player";
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/audio/ncspot/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/hrkfdn/ncspot";
changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}";
license = licenses.bsd2;
maintainers = with maintainers; [ marsam liff ];
maintainers = with maintainers; [ liff ];
mainProgram = "ncspot";
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/audio/spotifyd/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ rustPackages.rustPlatform.buildRustPackage rec {
homepage = "https://spotifyd.rs/";
changelog = "https://github.com/Spotifyd/spotifyd/blob/${src.rev}/CHANGELOG.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ];
maintainers = with maintainers; [ anderslundstedt Br1ght0ne ];
platforms = platforms.unix;
mainProgram = "spotifyd";
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ let
homepage = "https://github.com/zbelial/lspce";
description = "LSP Client for Emacs implemented as a module using rust";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.marsam ];
maintainers = [ ];
inherit (emacs.meta) platforms;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://git.sr.ht/~casouri/xapian-lite";
description = "A minimal Emacs dynamic module for Xapian";
maintainers = [ lib.maintainers.marsam ];
maintainers = [ ];
license = lib.licenses.gpl3Plus;
inherit (emacs.meta) platforms;
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/1password/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ stdenv.mkDerivation {
description = "1Password command-line tool";
homepage = "https://developer.1password.com/docs/cli/";
downloadPage = "https://app-updates.agilebits.com/product_history/CLI2";
maintainers = with maintainers; [ joelburget marsam ];
maintainers = with maintainers; [ joelburget ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
inherit mainProgram platforms;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/cointop/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ buildGoModule rec {
The interface is inspired by htop and shortcut keys are inspired by vim.
'';
homepage = "https://cointop.sh";
maintainers = [ maintainers.marsam ];
maintainers = [ ];
license = licenses.asl20;
mainProgram = "cointop";
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/gallery-dl/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ buildPythonApplication rec {
changelog = "https://github.com/mikf/gallery-dl/blob/v${version}/CHANGELOG.md";
license = licenses.gpl2Only;
mainProgram = "gallery-dl";
maintainers = with maintainers; [ dawidsowa marsam ];
maintainers = with maintainers; [ dawidsowa ];
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/misc/pueue/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ rustPlatform.buildRustPackage rec {
'';
changelog = "https://github.com/Nukesor/pueue/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ marsam ];
maintainers = with maintainers; [ ];
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/misc/sqls/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ buildGoModule rec {
description = "SQL language server written in Go";
mainProgram = "sqls";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/misc/twitch-chat-downloader/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ buildPythonApplication rec {
mainProgram = "tcd";
homepage = "https://github.com/TheDrHax/Twitch-Chat-Downloader";
license = licenses.mit;
maintainers = with maintainers; [ marsam ];
maintainers = with maintainers; [ ];
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/networking/dsvpn/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
description = "A Dead Simple VPN";
homepage = "https://github.com/jedisct1/dsvpn";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
platforms = platforms.unix;
mainProgram = "dsvpn";
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/flexget/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,6 @@ python3.pkgs.buildPythonApplication rec {
changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}";
description = "Multipurpose automation tool for all of your media";
license = licenses.mit;
maintainers = with maintainers; [ marsam ];
maintainers = with maintainers; [ ];
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/networking/ids/zeek/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.zeek.org";
changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES";
license = licenses.bsd3;
maintainers = with maintainers; [ pSub marsam tobim ];
maintainers = with maintainers; [ pSub tobim ];
platforms = platforms.unix;
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/networking/p2p/storrent/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ buildGoModule rec {
mainProgram = "storrent";
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/networking/sync/rclone/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ buildGoModule rec {
changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md";
license = licenses.mit;
mainProgram = "rclone";
maintainers = with maintainers; [ marsam SuperSandro2000 ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/science/logic/cedille/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
description = "An interactive theorem-prover and dependently typed programming language, based on extrinsic (aka Curry-style) type theory";
homepage = "https://cedille.github.io/";
license = licenses.mit;
maintainers = with maintainers; [ marsam mpickering ];
maintainers = with maintainers; [ mpickering ];
platforms = platforms.unix;

# Broken due to Agda update. See
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/science/logic/lean4/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://github.com/leanprover/lean4/blob/${finalAttrs.src.rev}/RELEASES.md";
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ marsam ];
maintainers = with maintainers; [ ];
mainProgram = "lean";
};
})
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/delta/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
description = "A syntax-highlighting pager for git";
changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ marsam zowoq SuperSandro2000 figsoda ];
maintainers = with maintainers; [ zowoq SuperSandro2000 figsoda ];
mainProgram = "delta";
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/tummychow/git-absorb";
description = "git commit --fixup, but automatic";
license = [ licenses.bsd3 ];
maintainers = [ maintainers.marsam ];
maintainers = [ ];
mainProgram = "git-absorb";
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/jsdw/git-backup";
description = "A tool to help you backup your git repositories from services like GitHub";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
mainProgram = "git-backup";
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/git-gone/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/swsnr/git-gone";
changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
mainProgram = "git-gone";
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/git-lfs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ buildGoModule rec {
homepage = "https://git-lfs.github.com/";
changelog = "https://github.com/git-lfs/git-lfs/raw/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ twey marsam ];
maintainers = with maintainers; [ twey ];
mainProgram = "git-lfs";
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
inherit (src.meta) homepage;
description = "Git command to recommit HEAD with a new set of parents";
maintainers = [ maintainers.marsam ];
maintainers = [ ];
license = licenses.gpl2;
platforms = platforms.unix;
mainProgram = "git-reparent";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
description = "Recall what you did on the last working day";
homepage = "https://github.com/kamranahmedse/git-standup";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
platforms = platforms.all;
mainProgram = "git-standup";
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildGoModule rec {
description = "Keep the content for your git submodules all in one place: the parent repo";
homepage = "https://github.com/apenwarr/git-subtrac";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
mainProgram = "git-subtrac";
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/git-test/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Test your commits";
homepage = "https://github.com/spotify/git-test";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
platforms = platforms.all;
mainProgram = "git-test";
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/git-trim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
description = "Automatically trims your branches whose tracking remote refs are merged or gone";
homepage = "https://github.com/foriequal0/git-trim";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
mainProgram = "git-trim";
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/lab/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ buildGoModule rec {
description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
homepage = "https://zaquestion.github.io/lab";
license = licenses.cc0;
maintainers = with maintainers; [ marsam dtzWill ];
maintainers = with maintainers; [ dtzWill ];
mainProgram = "lab";
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/video/go-chromecast/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildGoModule rec {
homepage = "https://github.com/vishen/go-chromecast";
description = "CLI for Google Chromecast, Home devices and Cast Groups";
license = licenses.asl20;
maintainers = with maintainers; [ marsam ];
maintainers = with maintainers; [ ];
mainProgram = "go-chromecast";
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/docker-slim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ buildGoModule rec {
homepage = "https://slimtoolkit.org/";
changelog = "https://github.com/slimtoolkit/slim/raw/${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ];
maintainers = with maintainers; [ Br1ght0ne mbrgm ];
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/dumb-init/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
description = "A minimal init system for Linux containers";
homepage = "https://github.com/Yelp/dumb-init";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
platforms = platforms.linux;
mainProgram = "dumb-init";
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/podman/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ buildGoModule rec {
'';
changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md";
license = licenses.asl20;
maintainers = with maintainers; [ marsam ] ++ teams.podman.members;
maintainers = with maintainers; [ ] ++ teams.podman.members;
mainProgram = "podman";
};
}
2 changes: 1 addition & 1 deletion pkgs/by-name/ab/ab-av1/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/alexheretic/ab-av1";
changelog = "https://github.com/alexheretic/ab-av1/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
mainProgram = "ab-av1";
};
}
2 changes: 1 addition & 1 deletion pkgs/by-name/in/integresql/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ buildGoModule rec {
homepage = "https://github.com/allaboutapps/integresql";
changelog = "https://github.com/allaboutapps/integresql/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
mainProgram = "integresql";
};
}
2 changes: 1 addition & 1 deletion pkgs/by-name/ir/iredis/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication rec {
changelog = "https://github.com/laixintao/iredis/blob/${src.rev}/CHANGELOG.md";
homepage = "https://iredis.xbin.io/";
license = licenses.bsd3;
maintainers = with maintainers; [ marsam ];
maintainers = with maintainers; [ ];
mainProgram = "iredis";
};
}
2 changes: 1 addition & 1 deletion pkgs/by-name/ji/jigmo/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
description = "Japanese Kanji font set which is the official successor to Hanazono Mincho";
homepage = "https://kamichikoichi.github.io/jigmo/";
license = licenses.cc0;
maintainers = [ maintainers.marsam ];
maintainers = [ ];
platforms = platforms.all;
};
}
Loading