diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/maintainers.nix | 11 | ||||
| -rw-r--r-- | lib/strings.nix | 8 | ||||
| -rw-r--r-- | lib/systems/examples.nix | 11 | ||||
| -rw-r--r-- | lib/types.nix | 7 |
4 files changed, 27 insertions, 10 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 471e0143b629..a50dabf99410 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -80,6 +80,7 @@ benley = "Benjamin Staffin <benley@gmail.com>"; bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>"; benwbooth = "Ben Booth <benwbooth@gmail.com>"; + berce = "Bert Moens <bert.moens@gmail.com>"; berdario = "Dario Bertini <berdario@gmail.com>"; bergey = "Daniel Bergey <bergey@teallabs.org>"; bhipple = "Benjamin Hipple <bhipple@protonmail.com>"; @@ -204,6 +205,7 @@ elijahcaine = "Elijah Caine <elijahcainemv@gmail.com>"; elitak = "Eric Litak <elitak@gmail.com>"; ellis = "Ellis Whitehead <nixos@ellisw.net>"; + enzime = "Michael Hoang <enzime@users.noreply.github.com>"; eperuffo = "Emanuele Peruffo <info@emanueleperuffo.com>"; epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>"; eqyiel = "Ruben Maher <r@rkm.id.au>"; @@ -289,6 +291,7 @@ ironpinguin = "Michele Catalano <michele@catalano.de>"; ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>"; ixmatus = "Parnell Springmeyer <parnell@digitalmentat.com>"; + izorkin = "Yurii Izorkin <Izorkin@gmail.com>"; j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>"; jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>"; jammerful = "jammerful <jammerful@gmail.com>"; @@ -390,6 +393,7 @@ manveru = "Michael Fellinger <m.fellinger@gmail.com>"; marcweber = "Marc Weber <marco-oweber@gmx.de>"; markus1189 = "Markus Hauck <markus1189@gmail.com>"; + markuskowa = "Markus Kowalewski <markus.kowalewski@gmail.com>"; markWot = "Markus Wotringer <markus@wotringer.de>"; martijnvermaat = "Martijn Vermaat <martijn@vermaat.name>"; martingms = "Martin Gammelsæter <martin@mg.am>"; @@ -401,6 +405,7 @@ mbakke = "Marius Bakke <mbakke@fastmail.com>"; mbbx6spp = "Susan Potter <me@susanpotter.net>"; mbe = "Brandon Edens <brandonedens@gmail.com>"; + mbode = "Maximilian Bode <maxbode@gmail.com>"; mboes = "Mathieu Boespflug <mboes@tweag.net>"; mbrgm = "Marius Bergmann <marius@yeai.de>"; mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>"; @@ -415,6 +420,7 @@ michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>"; michalrus = "Michal Rus <m@michalrus.com>"; michelk = "Michel Kuhlmann <michel@kuhlmanns.info>"; + mickours = "Michael Mercier <mickours@gmail.com<"; midchildan = "midchildan <midchildan+nix@gmail.com>"; mikefaille = "Michaël Faille <michael@faille.io>"; mikoim = "Eshin Kunishima <ek@esh.ink>"; @@ -423,11 +429,13 @@ mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>"; mirrexagon = "Andrew Abbott <mirrexagon@mirrexagon.com>"; mjanczyk = "Marcin Janczyk <m@dragonvr.pl>"; + mjp = "Mike Playle <mike@mythik.co.uk>"; # github = "MikePlayle"; mlieberman85 = "Michael Lieberman <mlieberman85@gmail.com>"; modulistic = "Pablo Costa <modulistic@gmail.com>"; mog = "Matthew O'Gorman <mog-lists@rldn.net>"; montag451 = "montag451 <montag451@laposte.net>"; moosingin3space = "Nathan Moos <moosingin3space@gmail.com>"; + moredread = "André-Patrick Bubel <code@apb.name>"; moretea = "Maarten Hoogendoorn <maarten@moretea.nl>"; mornfall = "Petr Ročkai <me@mornfall.net>"; MostAwesomeDude = "Corbin Simpson <cds@corbinsimpson.com>"; @@ -436,6 +444,7 @@ mpcsh = "Mark Cohen <m@mpc.sh>"; mpscholten = "Marc Scholten <marc@mpscholten.de>"; mpsyco = "Francis St-Amour <fr.st-amour@gmail.com>"; + mrVanDalo = "Ingolf Wanger <contact@ingolf-wagner.de>"; msackman = "Matthew Sackman <matthew@wellquite.org>"; mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>"; msteen = "Matthijs Steen <emailmatthijs@gmail.com>"; @@ -483,7 +492,6 @@ oxij = "Jan Malakhovski <oxij@oxij.org>"; paholg = "Paho Lurie-Gregg <paho@paholg.com>"; pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>"; - palo = "Ingolf Wanger <palipalo9@googlemail.com>"; panaeon = "Vitalii Voloshyn <vitalii.voloshyn@gmail.com"; paperdigits = "Mica Semrick <mica@silentumbrella.com>"; pashev = "Igor Pashev <pashev.igor@gmail.com>"; @@ -511,6 +519,7 @@ plcplc = "Philip Lykke Carlsen <plcplc@gmail.com>"; plumps = "Maksim Bronsky <maks.bronsky@web.de"; pmahoney = "Patrick Mahoney <pat@polycrystal.org>"; + pmeunier = "Pierre-Étienne Meunier <pierre-etienne.meunier@inria.fr>"; pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>"; polyrod = "Maurizio Di Pietro <dc1mdp@gmail.com>"; pradeepchhetri = "Pradeep Chhetri <pradeep.chhetri89@gmail.com>"; diff --git a/lib/strings.nix b/lib/strings.nix index aca9ef45e615..9cbd1494a2b5 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -219,6 +219,14 @@ rec { */ escapeShellArgs = concatMapStringsSep " " escapeShellArg; + /* Turn a string into a Nix expression representing that string + + Example: + escapeNixString "hello\${}\n" + => "\"hello\\\${}\\n\"" + */ + escapeNixString = s: escape ["$"] (builtins.toJSON s); + /* Obsolete - use replaceStrings instead. */ replaceChars = builtins.replaceStrings or ( del: new: s: diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index ff2273febcb0..90d7e956d2ba 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -18,7 +18,6 @@ rec { libc = "glibc"; platform = platforms.sheevaplug; openssl.system = "linux-generic32"; - inherit (platform) gcc; }; raspberryPi = rec { @@ -31,7 +30,6 @@ rec { libc = "glibc"; platform = platforms.raspberrypi; openssl.system = "linux-generic32"; - inherit (platform) gcc; }; armv7l-hf-multiplatform = rec { @@ -44,7 +42,6 @@ rec { libc = "glibc"; platform = platforms.armv7l-hf-multiplatform; openssl.system = "linux-generic32"; - inherit (platform) gcc; }; aarch64-multiplatform = rec { @@ -54,23 +51,20 @@ rec { withTLS = true; libc = "glibc"; platform = platforms.aarch64-multiplatform; - inherit (platform) gcc; }; scaleway-c1 = armv7l-hf-multiplatform // rec { platform = platforms.scaleway-c1; - inherit (platform) gcc; - inherit (gcc) fpu; + inherit (platform.gcc) fpu; }; pogoplug4 = rec { arch = "armv5tel"; - config = "armv5tel-softfloat-linux-gnueabi"; + config = "armv5tel-unknown-linux-gnueabi"; float = "soft"; platform = platforms.pogoplug4; - inherit (platform) gcc; libc = "glibc"; withTLS = true; @@ -86,7 +80,6 @@ rec { libc = "glibc"; platform = platforms.fuloong2f_n32; openssl.system = "linux-generic32"; - inherit (platform) gcc; }; # diff --git a/lib/types.nix b/lib/types.nix index 46ed05d288f2..88fc90d05970 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -174,6 +174,13 @@ rec { merge = mergeOneOption; }; + strMatching = pattern: mkOptionType { + name = "strMatching ${escapeNixString pattern}"; + description = "string matching the pattern ${pattern}"; + check = x: str.check x && builtins.match pattern x != null; + inherit (str) merge; + }; + # Merge multiple definitions by concatenating them (with the given # separator between the values). separatedString = sep: mkOptionType rec { |