Merge branch 'master' into staging

2019-09-02 23:25:24 +02:00
parent b291f2a995 12ae04518b
commit f21211ebfe
277 changed files with 4766 additions and 1895 deletions
@@ -88,7 +88,7 @@ in
    };

    hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkOption {
-      type = lib.types.string;
+      type = lib.types.str;
      default = "";
      example = "PCI:1:0:0";
      description = ''
@@ -98,7 +98,7 @@ in
    };

    hardware.nvidia.optimus_prime.intelBusId = lib.mkOption {
-      type = lib.types.string;
+      type = lib.types.str;
      default = "";
      example = "PCI:0:2:0";
      description = ''