diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
| commit | d4e9fd2a906b5227ae51a522a0708a0b6884ed1c (patch) | |
| tree | ca6bb53bb064b71b5ad9bf94dbcc27c47c2d652c /lib | |
| parent | 5c53f22492511d1d8de46ecd8f11fca20f1287fd (diff) | |
| parent | 2d03fbf75202272f37bf648d06922c2c624f126a (diff) | |
| download | nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.gz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.bz2 nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.lz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.xz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.zst nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.zip | |
Merge recent master into staging
Hydra: ?compare=1148749 Conflicts (easy): nixos/modules/virtualisation/containers.nix
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | lib/types.nix | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b1c3f6bcdd23..184fd7036a0f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -68,6 +68,7 @@ modulistic = "Pablo Costa <modulistic@gmail.com>"; mornfall = "Petr Ročkai <me@mornfall.net>"; msackman = "Matthew Sackman <matthew@wellquite.org>"; + nathan-gs = "Nathan Bijnens <nathan@nathan.gs>"; notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>"; ocharles = "Oliver Charles <ollie@ocharles.org.uk>"; offline = "Jaka Hudoklin <jakahudoklin@gmail.com>"; diff --git a/lib/types.nix b/lib/types.nix index f5700ab0269a..0e2b6515e165 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -200,6 +200,12 @@ rec { merge = mergeOneOption; }; + either = t1: t2: mkOptionType { + name = "${t1.name} or ${t2.name}"; + check = x: t1.check x || t2.check x; + merge = mergeOneOption; + }; + # Obsolete alternative to configOf. It takes its option # declarations from the ‘options’ attribute of containing option # declaration. |