diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/licenses.nix | 8 | ||||
-rw-r--r-- | lib/maintainers.nix | 4 | ||||
-rw-r--r-- | lib/systems/default.nix | 3 | ||||
-rw-r--r-- | lib/systems/examples.nix | 17 | ||||
-rw-r--r-- | lib/systems/inspect.nix | 2 | ||||
-rw-r--r-- | lib/systems/parse.nix | 3 | ||||
-rw-r--r-- | lib/systems/platforms.nix | 9 |
7 files changed, 28 insertions, 18 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 2262ae9ebbcf2..e03ed38eb5ebf 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -2,7 +2,7 @@ let spdx = lic: lic // { - url = "http://spdx.org/licenses/${lic.spdxId}"; + url = "http://spdx.org/licenses/${lic.spdxId}.html"; }; in @@ -580,6 +580,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Vovida Software License v1.0"; }; + watcom = spdx { + spdxId = "Watcom-1.0"; + fullName = "Sybase Open Watcom Public License 1.0"; + }; + w3c = spdx { spdxId = "W3C"; fullName = "W3C Software Notice and License"; @@ -614,5 +619,4 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { spdxId = "ZPL-2.1"; fullName = "Zope Public License 2.1"; }; - } diff --git a/lib/maintainers.nix b/lib/maintainers.nix index eb5bec505b08f..e72e320d41b1e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -370,6 +370,7 @@ kristoff3r = "Kristoffer Søholm <k.soeholm@gmail.com>"; ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>"; kuznero = "Roman Kuznetsov <roman@kuznero.com>"; + lasandell = "Luke Sandell <lasandell@gmail.com>"; lassulus = "Lassulus <lassulus@gmail.com>"; layus = "Guillaume Maudoux <layus.on@gmail.com>"; ldesgoui = "Lucas Desgouilles <ldesgoui@gmail.com>"; @@ -479,6 +480,7 @@ mudri = "James Wood <lamudri@gmail.com>"; muflax = "Stefan Dorn <mail@muflax.com>"; myrl = "Myrl Hex <myrl.0xf@gmail.com>"; + nadrieril = "Nadrieril Feneanar <nadrieril@gmail.com>"; namore = "Roman Naumann <namor@hemio.de>"; nand0p = "Fernando Jose Pando <nando@hex7.com>"; Nate-Devv = "Nathan Moore <natedevv@gmail.com>"; @@ -663,6 +665,7 @@ sternenseemann = "Lukas Epple <post@lukasepple.de>"; stesie = "Stefan Siegl <stesie@brokenpipe.de>"; steveej = "Stefan Junker <mail@stefanjunker.de>"; + StijnDW = "Stijn DW <stekke@airmail.cc>"; StillerHarpo = "Florian Engel <florianengel39@gmail.com>"; stumoss = "Stuart Moss <samoss@gmail.com>"; SuprDewd = "Bjarki Ágúst Guðmundsson <suprdewd@gmail.com>"; @@ -672,6 +675,7 @@ symphorien = "Guillaume Girol <symphorien_nixpkgs@xlumurb.eu>"; szczyp = "Szczyp <qb@szczyp.com>"; sztupi = "Attila Sztupak <attila.sztupak@gmail.com>"; + tadfisher = "Tad Fisher <tadfisher@gmail.com>"; taeer = "Taeer Bar-Yam <taeer@necsi.edu>"; tailhook = "Paul Colomiets <paul@colomiets.name>"; taketwo = "Sergey Alexandrov <alexandrov88@gmail.com>"; diff --git a/lib/systems/default.nix b/lib/systems/default.nix index b1036b80c4dba..0729cc7ef2935 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -26,7 +26,8 @@ rec { libc = /**/ if final.isDarwin then "libSystem" else if final.isMinGW then "msvcrt" - else if final.isLinux then "glibc" + else if final.isMusl then "musl" + else if final.isLinux /* default */ then "glibc" # TODO(@Ericson2314) think more about other operating systems else "native/impure"; extensions = { diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 5fc36c5b056ad..f5562e28a09d2 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -13,7 +13,6 @@ rec { config = "armv5tel-unknown-linux-gnueabi"; arch = "armv5tel"; float = "soft"; - libc = "glibc"; platform = platforms.sheevaplug; }; @@ -22,7 +21,6 @@ rec { arch = "armv6l"; float = "hard"; fpu = "vfp"; - libc = "glibc"; platform = platforms.raspberrypi; }; @@ -31,14 +29,12 @@ rec { arch = "armv7-a"; float = "hard"; fpu = "vfpv3-d16"; - libc = "glibc"; platform = platforms.armv7l-hf-multiplatform; }; aarch64-multiplatform = rec { config = "aarch64-unknown-linux-gnu"; arch = "aarch64"; - libc = "glibc"; platform = platforms.aarch64-multiplatform; }; @@ -51,7 +47,6 @@ rec { arch = "armv5tel"; config = "armv5tel-unknown-linux-gnueabi"; float = "soft"; - libc = "glibc"; platform = platforms.pogoplug4; }; @@ -59,10 +54,20 @@ rec { config = "mips64el-unknown-linux-gnu"; arch = "mips"; float = "hard"; - libc = "glibc"; platform = platforms.fuloong2f_n32; }; + muslpi = raspberryPi // { + config = "armv6l-unknown-linux-musleabihf"; + }; + + aarch64-multiplatform-musl = aarch64-multiplatform // { + config = "aarch64-unknown-linux-musl"; + }; + + musl64 = { config = "x86_64-unknown-linux-musl"; }; + musl32 = { config = "i686-unknown-linux-musl"; }; + # # Darwin # diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 3f0335a0adf5f..0fce5254dcb47 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -33,6 +33,8 @@ rec { Windows = { kernel = kernels.windows; }; Cygwin = { kernel = kernels.windows; abi = abis.cygnus; }; MinGW = { kernel = kernels.windows; abi = abis.gnu; }; + + Musl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; }; matchAnyAttrs = patterns: diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 37a8c848c5d0e..95759b93ae080 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -180,6 +180,9 @@ rec { androideabi = {}; gnueabi = {}; gnueabihf = {}; + musleabi = {}; + musleabihf = {}; + musl = {}; unknown = {}; }; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 282fb0994b58a..58a7afa7679d1 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -2,7 +2,6 @@ rec { pcBase = { name = "pc"; - kernelHeadersBaseConfig = "defconfig"; kernelBaseConfig = "defconfig"; # Build whatever possible as a module, if not stated in the extra config. kernelAutoModules = true; @@ -30,7 +29,6 @@ rec { }; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "multi_v5_defconfig"; kernelBaseConfig = "multi_v5_defconfig"; kernelArch = "arm"; kernelAutoModules = false; @@ -54,7 +52,6 @@ rec { sheevaplug = { name = "sheevaplug"; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "multi_v5_defconfig"; kernelBaseConfig = "multi_v5_defconfig"; kernelArch = "arm"; kernelAutoModules = false; @@ -168,7 +165,6 @@ rec { raspberrypi = { name = "raspberrypi"; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "bcm2835_defconfig"; kernelBaseConfig = "bcmrpi_defconfig"; kernelDTB = true; kernelArch = "arm"; @@ -347,7 +343,6 @@ rec { utilite = { name = "utilite"; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "multi_v7_defconfig"; kernelBaseConfig = "multi_v7_defconfig"; kernelArch = "arm"; kernelAutoModules = false; @@ -379,13 +374,11 @@ rec { # patch. kernelBaseConfig = "guruplug_defconfig"; - #kernelHeadersBaseConfig = "guruplug_defconfig"; }; fuloong2f_n32 = { name = "fuloong2f_n32"; kernelMajor = "2.6"; - kernelHeadersBaseConfig = "fuloong2e_defconfig"; kernelBaseConfig = "lemote2f_defconfig"; kernelArch = "mips"; kernelAutoModules = false; @@ -471,7 +464,6 @@ rec { armv7l-hf-multiplatform = { name = "armv7l-hf-multiplatform"; kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. - kernelHeadersBaseConfig = "multi_v7_defconfig"; kernelBaseConfig = "multi_v7_defconfig"; kernelArch = "arm"; kernelDTB = true; @@ -517,7 +509,6 @@ rec { aarch64-multiplatform = { name = "aarch64-multiplatform"; kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. - kernelHeadersBaseConfig = "defconfig"; kernelBaseConfig = "defconfig"; kernelArch = "arm64"; kernelDTB = true; |