diff options
author | Will Fancher <elvishjerricco@gmail.com> | 2017-08-26 11:39:13 -0400 |
---|---|---|
committer | Will Fancher <elvishjerricco@gmail.com> | 2017-08-26 11:39:13 -0400 |
commit | 4d860389d88d35a702f79c0567cb4c6b1ec0deda (patch) | |
tree | 55ab20bfaf5e227ec2ff09317fcf74a11289c8bf /lib | |
parent | 05f9db601abd582be51f096affbb97eff49f2ccb (diff) | |
parent | 58dc4a85691343a200c1c4495c1bd839b84c2824 (diff) | |
download | nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.gz nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.bz2 nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.lz nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.xz nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.zst nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.zip |
Merge branch 'master' into improved-make-overridable
Diffstat (limited to 'lib')
-rw-r--r-- | lib/deprecated.nix | 42 | ||||
-rw-r--r-- | lib/licenses.nix | 4 | ||||
-rw-r--r-- | lib/maintainers.nix | 31 | ||||
-rw-r--r-- | lib/minver.nix | 2 | ||||
-rw-r--r-- | lib/systems/platforms.nix | 4 |
5 files changed, 36 insertions, 47 deletions
diff --git a/lib/deprecated.nix b/lib/deprecated.nix index d4e78c39250c..8cdfab381baf 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -309,48 +309,6 @@ rec { mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; }; mergeAttrsByFuncDefaultsClean = list: removeAttrs (mergeAttrsByFuncDefaults list) ["mergeAttrBy"]; - # merge attrs based on version key into mkDerivation args, see mergeAttrBy to learn about smart merge defaults - # - # This function is best explained by an example: - # - # {version ? "2.x"}: - # - # mkDerivation (mergeAttrsByVersion "package-name" version - # { # version specific settings - # "git" = { src = ..; preConfigre = "autogen.sh"; buildInputs = [automake autoconf libtool]; }; - # "2.x" = { src = ..; }; - # } - # { // shared settings - # buildInputs = [ common build inputs ]; - # meta = { .. } - # } - # ) - # - # Please note that e.g. Eelco Dolstra usually prefers having one file for - # each version. On the other hand there are valuable additional design goals - # - readability - # - do it once only - # - try to avoid duplication - # - # Marc Weber and Michael Raskin sometimes prefer keeping older - # versions around for testing and regression tests - as long as its cheap to - # do so. - # - # Very often it just happens that the "shared" code is the bigger part. - # Then using this function might be appropriate. - # - # Be aware that its easy to cause recompilations in all versions when using - # this function - also if derivations get too complex splitting into multiple - # files is the way to go. - # - # See misc.nix -> versionedDerivation - # discussion: nixpkgs: pull/310 - mergeAttrsByVersion = name: version: attrsByVersion: base: - mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; } - base - (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion) - ]; - # sane defaults (same name as attr name so that inherit can be used) mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; } listToAttrs (map (n: nameValuePair n lib.concat) diff --git a/lib/licenses.nix b/lib/licenses.nix index 8dd1c210b7fa..552874325d41 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -546,12 +546,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "zlib License"; }; - zpt20 = spdx { # FIXME: why zpt* instead of zpl* + zpl20 = spdx { spdxId = "ZPL-2.0"; fullName = "Zope Public License 2.0"; }; - zpt21 = spdx { + zpl21 = spdx { spdxId = "ZPL-2.1"; fullName = "Zope Public License 2.1"; }; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e80fb20929a7..7fd33f3b396d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -33,6 +33,7 @@ algorith = "Dries Van Daele <dries_van_daele@telenet.be>"; alibabzo = "Alistair Bill <alistair.bill@gmail.com>"; all = "Nix Committers <nix-commits@lists.science.uu.nl>"; + alunduil = "Alex Brandt <alunduil@alunduil.com>"; ambrop72 = "Ambroz Bizjak <ambrop7@gmail.com>"; amiddelk = "Arie Middelkoop <amiddelk@gmail.com>"; amiloradovsky = "Andrew Miloradovsky <miloradovsky@gmail.com>"; @@ -75,6 +76,7 @@ berdario = "Dario Bertini <berdario@gmail.com>"; bergey = "Daniel Bergey <bergey@teallabs.org>"; bhipple = "Benjamin Hipple <bhipple@protonmail.com>"; + binarin = "Alexey Lebedeff <binarin@binarin.ru>"; bjg = "Brian Gough <bjg@gnu.org>"; bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>"; bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>"; @@ -88,11 +90,13 @@ bstrik = "Berno Strik <dutchman55@gmx.com>"; bzizou = "Bruno Bzeznik <Bruno@bzizou.net>"; c0dehero = "CodeHero <codehero@nerdpol.ch>"; + calbrecht = "Christian Albrecht <christian.albrecht@mayflower.de>"; calrama = "Moritz Maxeiner <moritz@ucworks.org>"; calvertvl = "Victor Calvert <calvertvl@gmail.com>"; campadrenalin = "Philip Horger <campadrenalin@gmail.com>"; canndrew = "Andrew Cann <shum@canndrew.org>"; carlsverre = "Carl Sverre <accounts@carlsverre.com>"; + casey = "Casey Rodarmor <casey@rodarmor.net>"; cdepillabout = "Dennis Gosnell <cdep.illabout@gmail.com>"; cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>"; changlinli = "Changlin Li <mail@changlinli.com>"; @@ -135,12 +139,14 @@ dbrock = "Daniel Brockman <daniel@brockman.se>"; deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>"; demin-dmitriy = "Dmitriy Demin <demindf@gmail.com>"; + derchris = "Christian Gerbrandt <derchris@me.com>"; DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>"; dermetfan = "Robin Stumm <serverkorken@gmail.com>"; DerTim1 = "Tim Digel <tim.digel@active-group.de>"; desiderius = "Didier J. Devroye <didier@devroye.name>"; devhell = "devhell <\"^\"@regexmail.net>"; dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>"; + dfordivam = "Divam <dfordivam+nixpkgs@gmail.com>"; dfoxfranke = "Daniel Fox Franke <dfoxfranke@gmail.com>"; dgonyeo = "Derek Gonyeo <derek@gonyeo.com>"; dipinhora = "Dipin Hora <dipinhora+github@gmail.com>"; @@ -172,6 +178,7 @@ ekleog = "Leo Gaspard <leo@gaspard.io>"; elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>"; eleanor = "Dejan Lukan <dejan@proteansec.com>"; + elijahcaine = "Elijah Caine <elijahcainemv@gmail.com>"; elitak = "Eric Litak <elitak@gmail.com>"; ellis = "Ellis Whitehead <nixos@ellisw.net>"; eperuffo = "Emanuele Peruffo <info@emanueleperuffo.com>"; @@ -208,10 +215,12 @@ garrison = "Jim Garrison <jim@garrison.cc>"; gavin = "Gavin Rogers <gavin@praxeology.co.uk>"; gebner = "Gabriel Ebner <gebner@gebner.org>"; + geistesk = "Alvar Penning <post@0x21.biz>"; georgewhewell = "George Whewell <georgerw@gmail.com>"; gilligan = "Tobias Pflug <tobias.pflug@gmail.com>"; giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; gleber = "Gleb Peregud <gleber.p@gmail.com>"; + glenns = "Glenn Searby <glenn.searby@gmail.com>"; globin = "Robin Gloster <mail@glob.in>"; gnidorah = "Alex Ivanov <yourbestfriend@opmbx.org>"; goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>"; @@ -219,6 +228,7 @@ goodrone = "Andrew Trachenko <goodrone@gmail.com>"; gpyh = "Yacine Hmito <yacine.hmito@gmail.com>"; grahamc = "Graham Christensen <graham@grahamc.com>"; + grburst = "Julius Elias <grburst@openmailbox.org>"; gridaphobe = "Eric Seidel <eric@seidel.io>"; guibert = "David Guibert <david.guibert@gmail.com>"; guillaumekoenig = "Guillaume Koenig <guillaume.edward.koenig@gmail.com>"; @@ -230,6 +240,7 @@ hectorj = "Hector Jusforgues <hector.jusforgues+nixos@gmail.com>"; heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>"; henrytill = "Henry Till <henrytill@gmail.com>"; + hhm = "hhm <heehooman+nixpkgs@gmail.com>"; hinton = "Tom Hinton <t@larkery.com>"; hodapp = "Chris Hodapp <hodapp87@gmail.com>"; hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>"; @@ -238,14 +249,14 @@ ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>"; igsha = "Igor Sharonov <igor.sharonov@gmail.com>"; ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>"; - infinisil = "Silvan Mosberger <infinisil@icloud.com"; + infinisil = "Silvan Mosberger <infinisil@icloud.com>"; ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>"; j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>"; jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>"; jammerful = "jammerful <jammerful@gmail.com>"; jansol = "Jan Solanti <jan.solanti@paivola.fi>"; javaguirre = "Javier Aguirre <contacto@javaguirre.net>"; - jb55 = "William Casarin <bill@casarin.me>"; + jb55 = "William Casarin <jb55@jb55.com>"; jbedo = "Justin Bedő <cu@cua0.org>"; jcumming = "Jack Cummings <jack@mudshark.org>"; jdagilliland = "Jason Gilliland <jdagilliland@gmail.com>"; @@ -286,8 +297,10 @@ khumba = "Bryan Gardiner <bog@khumba.net>"; KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>"; kierdavis = "Kier Davis <kierdavis@gmail.com>"; + kiloreux = "Kiloreux Emperex <kiloreux@gmail.com>"; kkallio = "Karn Kallio <tierpluspluslists@gmail.com>"; knedlsepp = "Josef Kemetmüller <josef.kemetmueller@gmail.com>"; + konimex = "Muhammad Herdiansyah <herdiansyah@openmailbox.org>"; koral = "Koral <koral@mailoo.org>"; kovirobi = "Kovacsics Robert <kovirobi@gmail.com>"; kragniz = "Louis Taylor <louis@kragniz.eu>"; @@ -308,6 +321,7 @@ lihop = "Leroy Hopson <nixos@leroy.geek.nz>"; linquize = "Linquize <linquize@yahoo.com.hk>"; linus = "Linus Arver <linusarver@gmail.com>"; + lluchs = "Lukas Werling <lukas.werling@gmail.com>"; lnl7 = "Daiderd Jordan <daiderd@gmail.com>"; loskutov = "Ignat Loskutov <ignat.loskutov@gmail.com>"; lovek323 = "Jason O'Conal <jason@oconal.id.au>"; @@ -371,6 +385,7 @@ MostAwesomeDude = "Corbin Simpson <cds@corbinsimpson.com>"; mounium = "Katona László <muoniurn@gmail.com>"; MP2E = "Cray Elliott <MP2E@archlinux.us>"; + mpcsh = "Mark Cohen <m@mpc.sh>"; mpscholten = "Marc Scholten <marc@mpscholten.de>"; mpsyco = "Francis St-Amour <fr.st-amour@gmail.com>"; msackman = "Matthew Sackman <matthew@wellquite.org>"; @@ -402,6 +417,7 @@ np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>"; nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>"; nthorne = "Niklas Thörne <notrupertthorne@gmail.com>"; + nyarly = "Judson Lester <nyarly@gmail.com>"; obadz = "obadz <obadz-nixos@obadz.com>"; ocharles = "Oliver Charles <ollie@ocharles.org.uk>"; odi = "Oliver Dunkl <oliver.dunkl@gmail.com>"; @@ -496,6 +512,7 @@ ryanartecona = "Ryan Artecona <ryanartecona@gmail.com>"; ryansydnor = "Ryan Sydnor <ryan.t.sydnor@gmail.com>"; ryantm = "Ryan Mulligan <ryan@ryantm.com>"; + rybern = "Ryan Bernstein <ryan.bernstein@columbia.edu>"; rycee = "Robert Helgesson <robert@rycee.net>"; ryneeverett = "Ryne Everett <ryneeverett@gmail.com>"; rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>"; @@ -503,10 +520,12 @@ samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; sargon = "Daniel Ehlers <danielehlers@mindeye.net>"; + sauyon = "Sauyon Lee <s@uyon.co>"; schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>"; schneefux = "schneefux <schneefux+nixos_pkg@schneefux.xyz>"; schristo = "Scott Christopher <schristopher@konputa.com>"; scolobb = "Sergiu Ivanov <sivanov@colimite.fr>"; + sdll = "Sasha Illarionov <sasha.delly@gmail.com>"; sepi = "Raffael Mancini <raffael@mancini.lu>"; seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>"; shanemikel = "Shane Pearlman <shanemikel1@gmail.com>"; @@ -560,9 +579,11 @@ thoughtpolice = "Austin Seipp <aseipp@pobox.com>"; timbertson = "Tim Cuthbertson <tim@gfxmonk.net>"; titanous = "Jonathan Rudenberg <jonathan@titanous.com>"; + tnias = "Philipp Bartsch <phil@grmr.de>"; tohl = "Tomas Hlavaty <tom@logand.com>"; tokudan = "Daniel Frank <git@danielfrank.net>"; tomberek = "Thomas Bereknyei <tomberek@gmail.com>"; + tomsmeets = "Tom Smeets <tom@tsmeets.nl>"; travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>"; trevorj = "Trevor Joynson <nix@trevor.joynson.io>"; trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>"; @@ -577,7 +598,9 @@ utdemir = "Utku Demir <me@utdemir.com>"; #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012 uwap = "uwap <me@uwap.name>"; + vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>"; vandenoever = "Jos van den Oever <jos@vandenoever.info>"; + vanschelven = "Klaas van Schelven <klaas@vanschelven.com>"; vanzef = "Ivan Solyankin <vanzef@gmail.com>"; vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>"; vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>"; @@ -585,6 +608,7 @@ vdemeester = "Vincent Demeester <vincent@sbr.pm>"; veprbl = "Dmitry Kalinkin <veprbl@gmail.com>"; vifino = "Adrian Pistol <vifino@tty.sh>"; + vinymeuh = "VinyMeuh <vinymeuh@gmail.com>"; viric = "Lluís Batlle i Rossell <viric@viric.name>"; vizanto = "Danny Wilson <danny@prime.vc>"; vklquevs = "vklquevs <vklquevs@gmail.com>"; @@ -596,7 +620,9 @@ volth = "Jaroslavas Pocepko <jaroslavas@volth.com>"; vozz = "Oliver Hunt <oliver.huntuk@gmail.com>"; vrthra = "Rahul Gopinath <rahul@gopinath.org>"; + vyp = "vyp <elisp.vim@gmail.com>"; wedens = "wedens <kirill.wedens@gmail.com>"; + willibutz = "Willi Butz <willibutz@posteo.de>"; willtim = "Tim Philip Williams <tim.williams.public@gmail.com>"; winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>"; wizeman = "Ricardo M. Correia <rcorreia@wizy.org>"; @@ -621,6 +647,7 @@ zauberpony = "Elmar Athmer <elmar@athmer.org>"; zef = "Zef Hemel <zef@zef.me>"; zimbatm = "zimbatm <zimbatm@zimbatm.com>"; + Zimmi48 = "Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>"; zohl = "Al Zohali <zohl@fmap.me>"; zoomulator = "Kim Simmons <zoomulator@gmail.com>"; zraexy = "David Mell <zraexy@gmail.com>"; diff --git a/lib/minver.nix b/lib/minver.nix index 4f448266d06a..2147820c0e49 100644 --- a/lib/minver.nix +++ b/lib/minver.nix @@ -1,2 +1,2 @@ # Expose the minimum required version for evaluating Nixpkgs -"1.10" +"1.11" diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index ae4fc355c71d..54ed8f3c12c1 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -543,6 +543,10 @@ rec { # Cavium ThunderX stuff. PCI_HOST_THUNDER_ECAM y + + # The default (=y) forces us to have the XHCI firmware available in initrd, + # which our initrd builder can't currently do easily. + USB_XHCI_TEGRA m ''; uboot = null; kernelTarget = "Image"; |