Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next

2019-12-30 10:14:18 -08:00
parent 99de1a8ebb 97da2d22fe
commit 446fec8c2d
45 changed files with 806 additions and 180 deletions
@@ -10,11 +10,12 @@
 let
  # See https://mesonbuild.com/Reference-tables.html#cpu-families
  cpuFamilies = {
-    aarch64 = "aarch64";
-    armv6l  = "arm";
-    armv7l  = "arm";
-    i686    = "x86";
-    x86_64  = "x86_64";
+    aarch64  = "aarch64";
+    armv5tel = "arm";
+    armv6l   = "arm";
+    armv7l   = "arm";
+    i686     = "x86";
+    x86_64   = "x86_64";
  };
 in
 python3Packages.buildPythonApplication rec {