diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 10:04:02 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 10:04:02 +0200 |
commit | e51f73652d38d5c53b331b7bcae2e2483e1b8afe (patch) | |
tree | 9126d3fd0737db3a0d57cda866d96c377fc0e452 /lib | |
parent | a283bec71cec60c2b9c84ea9af320fc8df0dfd5f (diff) | |
parent | 4e0d2706f174bb893378a8241df7bd2055901b9e (diff) | |
download | nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.gz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.bz2 nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.lz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.xz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.zst nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.zip |
Merge recent master into staging
Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/licenses.nix | 10 | ||||
-rw-r--r-- | lib/maintainers.nix | 8 | ||||
-rw-r--r-- | lib/sources.nix | 6 | ||||
-rw-r--r-- | lib/strings.nix | 3 |
4 files changed, 24 insertions, 3 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 02618f1c6ca7..812592c74f27 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -62,6 +62,11 @@ rec { fullName = ''BSD 4-clause "Original" or "Old" License''; }; + cc0 = spdx { + shortName = "CC0-1.0"; + fullName = ''Creative Commons Zero v1.0 Universal''; + }; + cc-by-30 = spdx { shortName = "CC-BY-3.0"; fullName = "Creative Commons Attribution 3.0"; @@ -210,6 +215,11 @@ rec { url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt"; }; + ncsa = spdx { + shortName = "NCSA"; + fullName = "University of Illinois/NCSA Open Source License"; + }; + ofl = spdx { shortName = "OFL-1.1"; fullName = "SIL Open Font License 1.1"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 184fd7036a0f..3de82db1cd98 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -19,21 +19,25 @@ astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>"; aszlig = "aszlig <aszlig@redmoonstudios.org>"; auntie = "Jonathan Glines <auntieNeo@gmail.com>"; + aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>"; bbenoist = "Baptist BENOIST <return_0@live.com>"; bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>"; berdario = "Dario Bertini <berdario@gmail.com>"; + bergey = "Daniel Bergey <bergey@teallabs.org>"; bjg = "Brian Gough <bjg@gnu.org>"; bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>"; bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>"; bodil = "Bodil Stokke <nix@bodil.org>"; bosu = "Boris Sukholitko <boriss@gmail.com>"; calrama = "Moritz Maxeiner <moritz@ucworks.org>"; + campadrenalin = "Philip Horger <campadrenalin@gmail.com>"; cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>"; chaoflow = "Florian Friesdorf <flo@chaoflow.net>"; coconnor = "Corey O'Connor <coreyoconnor@gmail.com>"; coroa = "Jonas Hörsch <jonas@chaoflow.net>"; cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>"; DamienCassou = "Damien Cassou <damien.cassou@gmail.com>"; + doublec = "Chris Double <chris.double@double.co.nz>"; ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>"; edwtjo = "Edward Tjörnhammar <ed@cflags.cc>"; eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>"; @@ -41,6 +45,7 @@ ertes = "Ertugrul Söylemez <ertesx@gmx.de>"; falsifian = "James Cook <james.cook@utoronto.ca>"; flosse = "Markus Kohlhase <mail@markus-kohlhase.de>"; + funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>"; fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>"; garbas = "Rok Garbas <rok@garbas.si>"; goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>"; @@ -58,15 +63,18 @@ kkallio = "Karn Kallio <tierpluspluslists@gmail.com>"; ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>"; lethalman = "Luca Bruno <lucabru@src.gnome.org>"; + lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>"; linquize = "Linquize <linquize@yahoo.com.hk>"; lovek323 = "Jason O'Conal <jason@oconal.id.au>"; ludo = "Ludovic Courtès <ludo@gnu.org>"; madjar = "Georges Dubus <georges.dubus@compiletoi.net>"; + manveru = "Michael Fellinger <m.fellinger@gmail.com>"; marcweber = "Marc Weber <marco-oweber@gmx.de>"; matejc = "Matej Cotman <cotman.matej@gmail.com>"; meisternu = "Matt Miemiec <meister@krutt.org>"; modulistic = "Pablo Costa <modulistic@gmail.com>"; mornfall = "Petr Ročkai <me@mornfall.net>"; + MP2E = "Cray Elliott <MP2E@archlinux.us>"; msackman = "Matthew Sackman <matthew@wellquite.org>"; nathan-gs = "Nathan Bijnens <nathan@nathan.gs>"; notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>"; diff --git a/lib/sources.nix b/lib/sources.nix index a80e4397d6a4..4ed16d65d2b7 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -21,12 +21,12 @@ rec { # Get all files ending with the specified suffices from the given - # directory. E.g. `sourceFilesBySuffices ./dir [".xml" ".c"]'. + # directory or its descendants. E.g. `sourceFilesBySuffices ./dir + # [".xml" ".c"]'. sourceFilesBySuffices = path: exts: let filter = name: type: let base = baseNameOf (toString name); - in type != "directory" && lib.any (ext: lib.hasSuffix ext base) exts; + in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts; in builtins.filterSource filter path; - } diff --git a/lib/strings.nix b/lib/strings.nix index efdc265465f3..31b0f56e09b0 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -34,6 +34,9 @@ rec { concatStringsSep = separator: list: concatStrings (intersperse separator list); + concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list); + concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap f list); + # Construct a Unix-style search path consisting of each `subDir" # directory of the given list of packages. For example, |