Merge master into staging-next

2021-04-15 12:06:13 +00:00
parent 8b35f0c117 081b9423d4
commit 9c190d28df
22 changed files with 218 additions and 97 deletions
@@ -250,8 +250,7 @@ rec {

  # BSDs

-  # Deprecate
-  amd64-netbsd = x86_64-netbsd;
+  amd64-netbsd = lib.warn "The amd64-netbsd system example is deprecated. Use x86_64-netbsd instead." x86_64-netbsd;

  x86_64-netbsd = {
    config = "x86_64-unknown-netbsd";