diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/.mailmap | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/.mailmap')
| -rw-r--r-- | nixpkgs/.mailmap | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/nixpkgs/.mailmap b/nixpkgs/.mailmap new file mode 100644 index 000000000000..d2bf6d0e4769 --- /dev/null +++ b/nixpkgs/.mailmap @@ -0,0 +1,14 @@ +ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com> +Anderson Torres <torres.anderson.85@protonmail.com> +Daniel Løvbrøtte Olsen <me@dandellion.xyz> <daniel.olsen99@gmail.com> +Fabian Affolter <mail@fabian-affolter.ch> <fabian@affolter-engineering.ch> +Janne Heß <janne@hess.ooo> <dasJ@users.noreply.github.com> +Jörg Thalheim <joerg@thalheim.io> <Mic92@users.noreply.github.com> +Martin Weinelt <hexa@darmstadt.ccc.de> <mweinelt@users.noreply.github.com> +R. RyanTM <ryantm-bot@ryantm.com> +Robert Hensing <robert@roberthensing.nl> <roberth@users.noreply.github.com> +Sandro Jäckel <sandro.jaeckel@gmail.com> +Sandro Jäckel <sandro.jaeckel@gmail.com> <sandro.jaeckel@sap.com> +superherointj <5861043+superherointj@users.noreply.github.com> +Vladimír Čunát <v@cunat.cz> <vcunat@gmail.com> +Vladimír Čunát <v@cunat.cz> <vladimir.cunat@nic.cz> |