diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:57:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:58:19 +0100 |
commit | 09af15654f0c8091f1b9e0bbb2e523cdee194442 (patch) | |
tree | e648edef1ce4c64c533f2593aa22b8015cf0e506 /lib | |
parent | f306e67e15bdbe9a8358c9f81319fc4fcbadc2eb (diff) | |
parent | 0ee75214f336474e127c2e3546c0406a0c4d5fa7 (diff) |
Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/licenses.nix | 5 | ||||
-rw-r--r-- | lib/maintainers.nix | 61 | ||||
-rw-r--r-- | lib/platforms.nix | 29 | ||||
-rw-r--r-- | lib/systems.nix | 4 | ||||
-rw-r--r-- | lib/tests/release.nix | 10 | ||||
-rw-r--r-- | lib/trivial.nix | 21 | ||||
-rw-r--r-- | lib/types.nix | 2 |
7 files changed, 90 insertions, 42 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 4703587ed565..64ba63b146a2 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -155,6 +155,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Common Public License 1.0"; }; + doc = spdx { + spdxId = "DOC"; + fullName = "DOC License"; + }; + efl10 = spdx { spdxId = "EFL-1.0"; fullName = "Eiffel Forum License v1.0"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 808d78d499de..b908ec3115ab 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -1,19 +1,21 @@ -/* -*- coding: utf-8; -*- */ +/* List of NixOS maintainers. The format is: -{ - /* Add your name and email address here. - Keep the list alphabetically sorted. - Prefer the same attrname as your github username, please, - so it's easy to ping a package @maintainer. - */ + handle = "Real Name <address@example.org>"; - aaronschif = "Aaron Schif <aaronschif@gmail.com>"; + where <handle> is preferred to be your GitHub username (so it's easy + to ping a package @<handle>), and <Real Name> is your real name, not + a pseudonym. Please keep the list alphabetically sorted. */ +{ a1russell = "Adam Russell <adamlr6+pub@gmail.com>"; + aaronschif = "Aaron Schif <aaronschif@gmail.com>"; abaldeau = "Andreas Baldeau <andreas@baldeau.net>"; abbradar = "Nikolay Amiantov <ab@fmap.me>"; - adev = "Adrien Devresse <adev@adev.name>"; - aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>"; + aboseley = "Adam Boseley <adam.boseley@gmail.com>"; + adev = "Adrien Devresse <adev@adev.name>"; + aespinosa = "Allan Espinosa <allan.espinosa@outlook.com>"; aflatter = "Alexander Flatter <flatter@fastmail.fm>"; + aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>"; + afranchuk = "Alex Franchuk <alex.franchuk@gmail.com>"; aherrmann = "Andreas Herrmann <andreash87@gmx.ch>"; ak = "Alexander Kjeldaas <ak@formalprivacy.com>"; akaWolf = "Artjom Vejsel <akawolf0@gmail.com>"; @@ -32,6 +34,7 @@ ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>"; aristid = "Aristid Breitkreuz <aristidb@gmail.com>"; arobyn = "Alexei Robyn <shados@shados.net>"; + artuuge = "Artur E. Ruuge <artuuge@gmail.com>"; asppsa = "Alastair Pharo <asppsa@gmail.com>"; astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>"; aszlig = "aszlig <aszlig@redmoonstudios.org>"; @@ -45,8 +48,8 @@ bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>"; bcdarwin = "Ben Darwin <bcdarwin@gmail.com>"; bdimcheff = "Brandon Dimcheff <brandon@dimcheff.com>"; - bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>"; benley = "Benjamin Staffin <benley@gmail.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>"; @@ -58,6 +61,7 @@ bosu = "Boris Sukholitko <boriss@gmail.com>"; bramd = "Bram Duvigneau <bram@bramd.nl>"; bstrik = "Berno Strik <dutchman55@gmx.com>"; + bzizou = "Bruno Bzeznik <Bruno@bzizou.net>"; c0dehero = "CodeHero <codehero@nerdpol.ch>"; calrama = "Moritz Maxeiner <moritz@ucworks.org>"; campadrenalin = "Philip Horger <campadrenalin@gmail.com>"; @@ -66,21 +70,24 @@ chaoflow = "Florian Friesdorf <flo@chaoflow.net>"; chattered = "Phil Scott <me@philscotted.com>"; christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>"; + cleverca22 = "Michael Bishop <cleverca22@gmail.com>"; coconnor = "Corey O'Connor <coreyoconnor@gmail.com>"; codsl = "codsl <codsl@riseup.net>"; codyopel = "Cody Opel <codyopel@gmail.com>"; + colemickens = "Cole Mickens <cole.mickens@gmail.com>"; copumpkin = "Dan Peebles <pumpkingod@gmail.com>"; coroa = "Jonas Hörsch <jonas@chaoflow.net>"; couchemar = "Andrey Pavlov <couchemar@yandex.ru>"; cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>"; cwoac = "Oliver Matthews <oliver@codersoffortune.net>"; DamienCassou = "Damien Cassou <damien@cassou.me>"; + dasuxullebt = "Christoph-Simon Senjak <christoph.senjak@googlemail.com>"; davidak = "David Kleuker <post@davidak.de>"; davidrusu = "David Rusu <davidrusu.me@gmail.com>"; dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>"; - DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>"; deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>"; demin-dmitriy = "Dmitriy Demin <demindf@gmail.com>"; + DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>"; desiderius = "Didier J. Devroye <didier@devroye.name>"; devhell = "devhell <\"^\"@regexmail.net>"; dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>"; @@ -94,6 +101,7 @@ eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>"; edwtjo = "Edward Tjörnhammar <ed@cflags.cc>"; eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>"; + ehegnes = "Eric Hegnes <eric.hegnes@gmail.com>"; ehmry = "Emery Hemingway <emery@vfemail.net>"; eikek = "Eike Kettner <eike.kettner@posteo.de>"; elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>"; @@ -119,6 +127,7 @@ ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>"; funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>"; fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>"; + fxfactorial = "Edgar Aroutiounian <edgar.factorial@gmail.com>"; gal_bolle = "Florent Becker <florent.becker@ens-lyon.org>"; garbas = "Rok Garbas <rok@garbas.si>"; garrison = "Jim Garrison <jim@garrison.cc>"; @@ -129,6 +138,7 @@ gleber = "Gleb Peregud <gleber.p@gmail.com>"; globin = "Robin Gloster <mail@glob.in>"; goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>"; + Gonzih = "Max Gonzih <gonzih@gmail.com>"; gridaphobe = "Eric Seidel <eric@seidel.io>"; guibert = "David Guibert <david.guibert@gmail.com>"; havvy = "Ryan Scheel <ryan.havvy@gmail.com>"; @@ -140,6 +150,7 @@ iand675 = "Ian Duncan <ian@iankduncan.com>"; ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>"; iElectric = "Domen Kozar <domen@dev.si>"; + igsha = "Igor Sharonov <igor.sharonov@gmail.com>"; ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>"; iyzsong = "Song Wenwu <iyzsong@gmail.com>"; j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>"; @@ -157,6 +168,7 @@ joelmo = "Joel Moberg <joel.moberg@gmail.com>"; joelteon = "Joel Taylor <me@joelt.io>"; jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>"; + jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>"; jwiegley = "John Wiegley <johnw@newartisans.com>"; jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>"; jzellner = "Jeff Zellner <jeffz@eml.cc>"; @@ -172,6 +184,7 @@ lassulus = "Lassulus <lassulus@gmail.com>"; layus = "Guillaume Maudoux <layus.on@gmail.com>"; lebastr = "Alexander Lebedev <lebastr@gmail.com>"; + leenaars = "Michiel Leenaars <ml.software@leenaa.rs>"; leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>"; lethalman = "Luca Bruno <lucabru@src.gnome.org>"; lewo = "Antoine Eiche <lewo@abesis.fr>"; @@ -184,8 +197,9 @@ lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>"; lsix = "Lancelot SIX <lsix@lancelotsix.com>"; ludo = "Ludovic Courtès <ludo@gnu.org>"; - lukego = "Luke Gorrie <luke@snabb.co>"; luispedro = "Luis Pedro Coelho <luis@luispedro.org>"; + lukasepple = "Lukas Epple <post@lukasepple.de>"; + lukego = "Luke Gorrie <luke@snabb.co>"; lw = "Sergey Sofeychuk <lw@fmap.me>"; madjar = "Georges Dubus <georges.dubus@compiletoi.net>"; magnetophon = "Bart Brouns <bart@magnetophon.nl>"; @@ -195,24 +209,26 @@ manveru = "Michael Fellinger <m.fellinger@gmail.com>"; marcweber = "Marc Weber <marco-oweber@gmx.de>"; markWot = "Markus Wotringer <markus@wotringer.de>"; - maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>"; matejc = "Matej Cotman <cotman.matej@gmail.com>"; mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>"; matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>"; + maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>"; mbakke = "Marius Bakke <ymse@tuta.io>"; mbe = "Brandon Edens <brandonedens@gmail.com>"; + mboes = "Mathieu Boespflug <mboes@tweag.net>"; mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>"; meditans = "Carlo Nucera <meditans@gmail.com>"; meisternu = "Matt Miemiec <meister@krutt.org>"; - michelk = "Michel Kuhlmann <michel@kuhlmanns.info>"; michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>"; + michelk = "Michel Kuhlmann <michel@kuhlmanns.info>"; + mingchuan = "Ming Chuan <ming@culpring.com>"; mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>"; - mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>"; modulistic = "Pablo Costa <modulistic@gmail.com>"; mog = "Matthew O'Gorman <mog-lists@rldn.net>"; mornfall = "Petr Ročkai <me@mornfall.net>"; MP2E = "Cray Elliott <MP2E@archlinux.us>"; msackman = "Matthew Sackman <matthew@wellquite.org>"; + mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>"; msteen = "Matthijs Steen <emailmatthijs@gmail.com>"; mtreskin = "Max Treskin <zerthurd@gmail.com>"; mudri = "James Wood <lamudri@gmail.com>"; @@ -220,6 +236,7 @@ nathan-gs = "Nathan Bijnens <nathan@nathan.gs>"; nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>"; nequissimus = "Tim Steinbach <tim@nequissimus.com>"; + nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>"; nico202 = "Nicolò Balzarotti <anothersms@gmail.com>"; notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>"; np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>"; @@ -238,8 +255,9 @@ palo = "Ingolf Wanger <palipalo9@googlemail.com>"; pashev = "Igor Pashev <pashev.igor@gmail.com>"; pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>"; - phile314 = "Philipp Hausmann <nix@314.ch>"; philandstuff = "Philip Potter <philip.g.potter@gmail.com>"; + phile314 = "Philipp Hausmann <nix@314.ch>"; + Phlogistique = "Noé Rubinstein <noe.rubinstein@gmail.com>"; phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>"; phunehehe = "Hoang Xuan Phu <phunehehe@gmail.com>"; pierron = "Nicolas B. Pierron <nixos@nbp.name>"; @@ -248,7 +266,6 @@ pjones = "Peter Jones <pjones@devalot.com>"; pkmx = "Chih-Mao Chen <pkmx.tw@gmail.com>"; plcplc = "Philip Lykke Carlsen <plcplc@gmail.com>"; - Phlogistique = "Noé Rubinstein <noe.rubinstein@gmail.com>"; pmahoney = "Patrick Mahoney <pat@polycrystal.org>"; pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>"; prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>"; @@ -276,6 +293,7 @@ rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>"; rvl = "Rodney Lorrimar <dev+nix@rodney.id.au>"; rvlander = "Gaëtan André <rvlander@gaetanandre.eu>"; + ryantm = "Ryan Mulligan <ryan@ryantm.com>"; rycee = "Robert Helgesson <robert@rycee.net>"; samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; @@ -291,6 +309,8 @@ sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>"; sjourdois = "Stéphane ‘kwisatz’ Jourdois <sjourdois@gmail.com>"; skeidel = "Sven Keidel <svenkeidel@gmail.com>"; + skrzyp = "Jakub Skrzypnik <jot.skrzyp@gmail.com>"; + sleexyz = "Sean Lee <freshdried@gmail.com>"; smironov = "Sergey Mironov <ierton@gmail.com>"; spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>"; spencerjanssen = "Spencer Janssen <spencerjanssen@gmail.com>"; @@ -317,7 +337,7 @@ tomberek = "Thomas Bereknyei <tomberek@gmail.com>"; travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>"; trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>"; - tstrobel = "Thomas Strobel <ts468@cam.ac.uk>"; + tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>"; ttuegel = "Thomas Tuegel <ttuegel@gmail.com>"; tv = "Tomislav Viljetić <tv@shackspace.de>"; tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>"; @@ -338,9 +358,9 @@ winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>"; wizeman = "Ricardo M. Correia <rcorreia@wizy.org>"; wjlroe = "William Roe <willroe@gmail.com>"; - womfoo = "Kranium Gikos Mendoza <kranium@gikos.net>"; wkennington = "William A. Kennington III <william@wkennington.com>"; wmertens = "Wout Mertens <Wout.Mertens@gmail.com>"; + womfoo = "Kranium Gikos Mendoza <kranium@gikos.net>"; wscott = "Wayne Scott <wsc9tt@gmail.com>"; wyvie = "Elijah Rum <elijahrum@gmail.com>"; yarr = "Dmitry V. <savraz@gmail.com>"; @@ -350,5 +370,4 @@ zimbatm = "zimbatm <zimbatm@zimbatm.com>"; zohl = "Al Zohali <zohl@fmap.me>"; zoomulator = "Kim Simmons <zoomulator@gmail.com>"; - Gonzih = "Max Gonzih <gonzih@gmail.com>"; } diff --git a/lib/platforms.nix b/lib/platforms.nix index 750829da3751..b068d080e752 100644 --- a/lib/platforms.nix +++ b/lib/platforms.nix @@ -1,21 +1,24 @@ let lists = import ./lists.nix; in rec { - gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ - linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "mips64el-linux"]; - darwin = ["x86_64-darwin"]; - freebsd = ["i686-freebsd" "x86_64-freebsd"]; - openbsd = ["i686-openbsd" "x86_64-openbsd"]; - netbsd = ["i686-netbsd" "x86_64-netbsd"]; - cygwin = ["i686-cygwin" "x86_64-cygwin"]; - illumos = ["x86_64-solaris"]; - unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; - none = []; allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"]; - x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"]; - i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"]; + none = []; + arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; + i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"]; mips = [ "mips64el-linux" ]; + x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"]; + + cygwin = ["i686-cygwin" "x86_64-cygwin"]; + darwin = ["x86_64-darwin"]; + freebsd = ["i686-freebsd" "x86_64-freebsd"]; + gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ + illumos = ["x86_64-solaris"]; + linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "mips64el-linux"]; + netbsd = ["i686-netbsd" "x86_64-netbsd"]; + openbsd = ["i686-openbsd" "x86_64-openbsd"]; + unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; + + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux"]; } diff --git a/lib/systems.nix b/lib/systems.nix index 25a83e9d14fa..92d8bdf892b4 100644 --- a/lib/systems.nix +++ b/lib/systems.nix @@ -84,10 +84,10 @@ rec { }; + is64Bit = matchAttrs { cpu = { bits = 64; }; }; isDarwin = matchAttrs { kernel = kernels.darwin; }; - isLinux = matchAttrs { kernel = kernels.linux; }; isi686 = matchAttrs { cpu = cpuTypes.i686; }; - is64Bit = matchAttrs { cpu = { bits = 64; }; }; + isLinux = matchAttrs { kernel = kernels.linux; }; # This should revert the job done by config.guess from the gcc compiler. diff --git a/lib/tests/release.nix b/lib/tests/release.nix index e7fb52f67665..093e9bcbf104 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation { buildCommand = '' datadir="${nix}/share" export TEST_ROOT=$(pwd)/test-tmp - export NIX_STORE_DIR=$TEST_ROOT/store + export NIX_BUILD_HOOK= + export NIX_CONF_DIR=$TEST_ROOT/etc + export NIX_DB_DIR=$TEST_ROOT/db export NIX_LOCALSTATE_DIR=$TEST_ROOT/var export NIX_LOG_DIR=$TEST_ROOT/var/log/nix - export NIX_STATE_DIR=$TEST_ROOT/var/nix - export NIX_DB_DIR=$TEST_ROOT/db - export NIX_CONF_DIR=$TEST_ROOT/etc export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests - export NIX_BUILD_HOOK= + export NIX_STATE_DIR=$TEST_ROOT/var/nix + export NIX_STORE_DIR=$TEST_ROOT/store export PAGER=cat cacheDir=$TEST_ROOT/binary-cache nix-store --init diff --git a/lib/trivial.nix b/lib/trivial.nix index cda8aa08a205..9821e3c138dd 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -75,4 +75,25 @@ rec { min = x: y: if x < y then x else y; max = x: y: if x > y then x else y; + /* Reads a JSON file. It is useful to import pure data into other nix + expressions. + + Example: + + mkDerivation { + src = fetchgit (importJSON ./repo.json) + #... + } + + where repo.json contains: + + { + "url": "git://some-domain/some/repo", + "rev": "265de7283488964f44f0257a8b4a055ad8af984d", + "sha256": "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h" + } + + */ + importJSON = path: + builtins.fromJSON (builtins.readFile path); } diff --git a/lib/types.nix b/lib/types.nix index b833417e73d4..b4d29ac84d28 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -93,7 +93,7 @@ rec { # derivation is a reserved keyword. package = mkOptionType { - name = "derivation"; + name = "package"; check = x: isDerivation x || isStorePath x; merge = loc: defs: let res = mergeOneOption loc defs; |