diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:35:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:40:51 +0200 |
commit | d1df28f8e5b98be01417ffc1032020415390f2a0 (patch) | |
tree | 0e2024acd74c6ce3fb4614eadb04abe632835f71 /lib | |
parent | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (diff) | |
parent | c55cfe0cb3425fb926219cf7dde8714f3d143744 (diff) | |
download | nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.gz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.bz2 nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.lz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.xz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.zst nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.zip |
Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
Diffstat (limited to 'lib')
-rw-r--r-- | lib/maintainers.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 12c8c2369b4..ae97005c655 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -51,6 +51,7 @@ bdimcheff = "Brandon Dimcheff <brandon@dimcheff.com>"; benley = "Benjamin Staffin <benley@gmail.com>"; bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>"; + benwbooth = "Ben Booth <benwbooth@gmail.com>"; berdario = "Dario Bertini <berdario@gmail.com>"; bergey = "Daniel Bergey <bergey@teallabs.org>"; bjg = "Brian Gough <bjg@gnu.org>"; |