summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Fancher <elvishjerricco@gmail.com>2018-04-01 03:57:38 -0400
committerWill Fancher <elvishjerricco@gmail.com>2018-04-01 03:58:45 -0400
commitc6a9e3a911e59f7b687b5378e0c58ef1dd0625c2 (patch)
tree25fb4d5535c403a440e5ef0ab6c40e58582d1d13
parent7a33e5727b01e6e48aa2894277c960c39f6dec00 (diff)
downloadnixpkgs-c6a9e3a911e59f7b687b5378e0c58ef1dd0625c2.tar
nixpkgs-c6a9e3a911e59f7b687b5378e0c58ef1dd0625c2.tar.gz
nixpkgs-c6a9e3a911e59f7b687b5378e0c58ef1dd0625c2.tar.bz2
nixpkgs-c6a9e3a911e59f7b687b5378e0c58ef1dd0625c2.tar.lz
nixpkgs-c6a9e3a911e59f7b687b5378e0c58ef1dd0625c2.tar.xz
nixpkgs-c6a9e3a911e59f7b687b5378e0c58ef1dd0625c2.tar.zst
nixpkgs-c6a9e3a911e59f7b687b5378e0c58ef1dd0625c2.zip
Added ElvishJerricco to GHCJS maintainers
-rw-r--r--maintainers/maintainer-list.nix5
-rw-r--r--pkgs/development/compilers/ghcjs/base.nix2
2 files changed, 6 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ff567e6ca0d..54aba9cac3b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1176,6 +1176,11 @@
     github = "ellis";
     name = "Ellis Whitehead";
   };
+  elvishjerricco = {
+    email = "elvishjerricco@gmail.com";
+    github = "ElvishJerricco";
+    name = "Will Fancher";
+  };
   enzime = {
     email = "enzime@users.noreply.github.com";
     github = "enzime";
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index 3aac2d70e13..07662d32d25 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -189,7 +189,7 @@ in mkDerivation (rec {
   description = "A Haskell to JavaScript compiler that uses the GHC API";
   license = stdenv.lib.licenses.bsd3;
   platforms = ghc.meta.platforms;
-  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio ];
+  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio elvishjerricco ];
   hydraPlatforms = if broken then [] else ghc.meta.platforms;
   inherit broken;
 })