Merge remote-tracking branch 'origin/staging-next' into staging

Conflicts: pkgs/development/compilers/go/2-dev.nix
2022-04-07 22:12:13 +10:00
parent cc774b5792 d9f9d5787f
commit 3a70d5dc83
40 changed files with 315 additions and 280 deletions
@@ -85,6 +85,8 @@ buildPythonPackage rec {
    # aarch64-only (?) failure, unknown reason so far
    # https://github.com/adobe-type-tools/afdko/issues/1425
    "test_spec"
+  ] ++ lib.optionals (stdenv.hostPlatform.isi686) [
+    "test_type1mm_inputs"
  ];

  passthru.tests = {