diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
| commit | 06fc1ec34dbae8bba4673475e64a8241026089f6 (patch) | |
| tree | 3e70796a291acc704ef5382f5af4866cab64e537 /lib | |
| parent | 89f8af55f11b01e68cbfc6d10537413140261721 (diff) | |
| parent | ce623950ada9e1ef721760f05b9e3a14604fd764 (diff) | |
| download | nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.gz nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.bz2 nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.lz nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.xz nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.zst nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/servers/serfdom/default.nix
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/licenses.nix | 14 | ||||
| -rw-r--r-- | lib/maintainers.nix | 2 | ||||
| -rw-r--r-- | lib/modules.nix | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index e49528f2a2e6..ed6a54db550d 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -88,6 +88,8 @@ url = http://www.eclipse.org/legal/epl-v10.html; }; + free = "free"; + gpl2 = { shortName = "GPLv2"; fullName = "GNU General Public License version 2"; @@ -130,6 +132,12 @@ url = http://www.opensource.org/licenses/ISC; }; + ipa = { + shortName = "IPA 1.0"; + fullName = "IPA Font License v1.0"; + url = http://ipafont.ipa.go.jp/ipafont/; + }; + ipl10 = { shortName = "IPL 1.0"; fullName = "IBM Public License Version 1.0"; @@ -243,6 +251,12 @@ unfreeRedistributableFirmware = "unfree-redistributable-firmware"; + wadalab = { + shortName = "wadalab"; + fullName = "Wadalab Font License"; + url = https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab; + }; + zlib = { shortName = "zlib"; fullName = "zlib license"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 3a66f7a60b38..f2fe38e8e56c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -6,6 +6,7 @@ _1126 = "Christian Lask <mail@elfsechsundzwanzig.de>"; aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>"; + ak = "Alexander Kjeldaas <ak@formalprivacy.com>"; akc = "Anders Claesson <akc@akc.is>"; algorith = "Dries Van Daele <dries_van_daele@telenet.be>"; all = "Nix Committers <nix-commits@lists.science.uu.nl>"; @@ -37,6 +38,7 @@ emery = "Emery Hemingway <emery@vfemail.net>"; ertes = "Ertugrul Söylemez <ertesx@gmx.de>"; falsifian = "James Cook <james.cook@utoronto.ca>"; + flosse = "Markus Kohlhase <mail@markus-kohlhase.de>"; fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>"; garbas = "Rok Garbas <rok@garbas.si>"; goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>"; diff --git a/lib/modules.nix b/lib/modules.nix index 633b6fc05b26..bcaadc7fd977 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -194,7 +194,7 @@ rec { is transformed into - [ { boot = set1; } { boot = mkIf cond set2; services mkIf cond set3; } ]. + [ { boot = set1; } { boot = mkIf cond set2; services = mkIf cond set3; } ]. This transform is the critical step that allows mkIf conditions to refer to the full configuration without creating an infinite |