diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-09 18:07:00 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-09 18:07:52 +0200 |
| commit | bfb7ef86f3f2417b6866c704b7423c33bc33286c (patch) | |
| tree | c466dc1a8c5e41bc2be1b349ac93ed4fd5a5a0d2 /lib | |
| parent | d10c3cc5eedf58e80e270d7c912cf68ea1a822e4 (diff) | |
| parent | 466e7e23c6f71ebed7050802d377102002fc2a0d (diff) | |
| download | nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.tar nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.tar.gz nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.tar.bz2 nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.tar.lz nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.tar.xz nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.tar.zst nixlib-bfb7ef86f3f2417b6866c704b7423c33bc33286c.zip | |
Merge branch 'master' into staging
Mass rebuilds incoming. The mass-rebuild situation got really messy this weekend.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/lists.nix | 8 | ||||
| -rw-r--r-- | lib/maintainers.nix | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/lists.nix b/lib/lists.nix index a04b1b278935..6a8fd8a18408 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -477,4 +477,12 @@ rec { */ subtractLists = e: filter (x: !(elem x e)); + /* Test if two lists have no common element. + It should be slightly more efficient than (intersectLists a b == []) + */ + mutuallyExclusive = a: b: + (builtins.length a) == 0 || + (!(builtins.elem (builtins.head a) b) && + mutuallyExclusive (builtins.tail a) b); + } diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 69bb69c8e201..142e7ff78698 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -43,6 +43,7 @@ andrewrk = "Andrew Kelley <superjoe30@gmail.com>"; andsild = "Anders Sildnes <andsild@gmail.com>"; aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>"; + ankhers = "Justin Wood <justin.k.wood@gmail.com>"; antono = "Antono Vasiljev <self@antono.info>"; apeschar = "Albert Peschar <albert@peschar.net>"; apeyroux = "Alexandre Peyroux <alex@px.io>"; @@ -62,6 +63,7 @@ bachp = "Pascal Bach <pascal.bach@nextrem.ch>"; badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>"; balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>"; + barrucadu = "Michael Walker <mike@barrucadu.co.uk>"; basvandijk = "Bas van Dijk <v.dijk.bas@gmail.com>"; Baughn = "Svein Ove Aas <sveina@gmail.com>"; bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>"; @@ -155,6 +157,7 @@ drewkett = "Andrew Burkett <burkett.andrew@gmail.com>"; dsferruzza = "David Sferruzza <david.sferruzza@gmail.com>"; dtzWill = "Will Dietz <nix@wdtz.org>"; + dywedir = "Vladyslav M. <dywedir@protonmail.ch>"; e-user = "Alexander Kahl <nixos@sodosopa.io>"; ebzzry = "Rommel Martinez <ebzzry@gmail.com>"; edanaher = "Evan Danaher <nixos@edanaher.net>"; @@ -224,6 +227,7 @@ havvy = "Ryan Scheel <ryan.havvy@gmail.com>"; hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>"; hce = "Hans-Christian Esperer <hc@hcesperer.org>"; + hectorj = "Hector Jusforgues <hector.jusforgues+nixos@gmail.com>"; heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>"; henrytill = "Henry Till <henrytill@gmail.com>"; hinton = "Tom Hinton <t@larkery.com>"; @@ -315,6 +319,7 @@ luispedro = "Luis Pedro Coelho <luis@luispedro.org>"; lukego = "Luke Gorrie <luke@snabb.co>"; lw = "Sergey Sofeychuk <lw@fmap.me>"; + lyt = "Tim Liou <wheatdoge@gmail.com>"; m3tti = "Mathaeus Sander <mathaeus.peter.sander@gmail.com>"; ma27 = "Maximilian Bosch <maximilian@mbosch.me>"; madjar = "Georges Dubus <georges.dubus@compiletoi.net>"; @@ -564,6 +569,7 @@ tv = "Tomislav Viljetić <tv@shackspace.de>"; tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>"; tvorog = "Marsel Zaripov <marszaripov@gmail.com>"; + tweber = "Thorsten Weber <tw+nixpkgs@360vier.de>"; twey = "James ‘Twey’ Kay <twey@twey.co.uk>"; uralbash = "Svintsov Dmitry <root@uralbash.ru>"; utdemir = "Utku Demir <me@utdemir.com>"; |