Merge master into staging-next

2 files changed, 13 insertions, 0 deletions

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 6eeba6588be13..1408eda523d4c 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -103,6 +103,11 @@ in mkLicense lset) ({
     fullName = "Apache License 2.0";
   };
 
+  bola11 = {
+    url = "https://blitiri.com.ar/p/bola/";
+    fullName = "Buena Onda License Agreement 1.1";
+  };
+
   boost = {
     spdxId = "BSL-1.0";
     fullName = "Boost Software License 1.0";
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 6e494fce69b2c..233174d40831c 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -141,6 +141,14 @@ rec {
           powerpc64le = "ppc64le";
         }.${final.parsed.cpu.name} or final.parsed.cpu.name;
 
+      # Name used by UEFI for architectures.
+      efiArch =
+        if final.isx86_32 then "ia32"
+        else if final.isx86_64 then "x64"
+        else if final.isAarch32 then "arm"
+        else if final.isAarch64 then "aa64"
+        else final.parsed.cpu.name;
+
       darwinArch = {
         armv7a  = "armv7";
         aarch64 = "arm64";