diff --git a/lib/licenses.nix b/lib/licenses.nix index e49528f2a2e..ed6a54db550 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 3a66f7a60b3..f2fe38e8e56 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -6,6 +6,7 @@ _1126 = "Christian Lask "; aforemny = "Alexander Foremny "; + ak = "Alexander Kjeldaas "; akc = "Anders Claesson "; algorith = "Dries Van Daele "; all = "Nix Committers "; @@ -37,6 +38,7 @@ emery = "Emery Hemingway "; ertes = "Ertugrul Söylemez "; falsifian = "James Cook "; + flosse = "Markus Kohlhase "; fuuzetsu = "Mateusz Kowalczyk "; garbas = "Rok Garbas "; goibhniu = "Cillian de Róiste "; diff --git a/lib/modules.nix b/lib/modules.nix index 633b6fc05b2..bcaadc7fd97 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 diff --git a/nixos/lib/test-driver/log2html.xsl b/nixos/lib/test-driver/log2html.xsl index 8e907d85ffa..ce8a9c6de2b 100644 --- a/nixos/lib/test-driver/log2html.xsl +++ b/nixos/lib/test-driver/log2html.xsl @@ -9,8 +9,8 @@ - - + +