Merge pull request #96404 from matthewbauer/gcc-cross

Fix cycle detected in Darwin->Linux cross GCC
2020-08-26 16:17:14 -05:00
parent deced30f9a 0b8312660a
commit 25ac498482
89 changed files with 1519 additions and 943 deletions
@@ -641,7 +641,7 @@ in
            credential = mkOption {
              default = null;
              example = "f1d00200d8dc783f7fb1e10ace8da27f8312d72692abfca2f7e4960a73f48e82e1f7571f6ebfcee9fb434f9886ccc8fcc52a6614d8d2";
-              type = types.str;
+              type = types.nullOr types.str;
              description = "The FIDO2 credential ID.";
            };