diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
| commit | 5effa4e0f98b317fe4607b1a6548811017c3325d (patch) | |
| tree | d62ab19ccca3b0c6409595074b637eeb3d4371dc /lib/systems | |
| parent | ca2edf79f75ad2a43a5af5c1283db9f0f843680a (diff) | |
| parent | 8f58e00226e3192994050b12aa9ed119be0220f3 (diff) | |
Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
Diffstat (limited to 'lib/systems')
| -rw-r--r-- | lib/systems/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 9b25052ab88d..77f200952958 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -58,6 +58,7 @@ rec { "netbsd" = "NetBSD"; "freebsd" = "FreeBSD"; "openbsd" = "OpenBSD"; + "wasm" = "Wasm"; }.${final.parsed.kernel.name} or null; # uname -p |