summary refs log tree commit diff
path: root/nixos/modules/services/hardware
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2016-10-01 17:57:45 +0200
committerGitHub <noreply@github.com>2016-10-01 17:57:45 +0200
commit7e80c42b0ead918defafb92893c605983319e418 (patch)
tree057bf37267cf75493af45cf9e92f3337b5b55e80 /nixos/modules/services/hardware
parent46693bd6e824ead3cf46c3deace190969a249010 (diff)
parentf9239053465d06a823268c962505d3327049f12a (diff)
downloadnixlib-7e80c42b0ead918defafb92893c605983319e418.tar
nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.gz
nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.bz2
nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.lz
nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.xz
nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.zst
nixlib-7e80c42b0ead918defafb92893c605983319e418.zip
Merge pull request #18511 from ericsagnes/feat/remove-optionSet
modules: optionSet -> submodule
Diffstat (limited to 'nixos/modules/services/hardware')
-rw-r--r--nixos/modules/services/hardware/sane_extra_backends/brscan4.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
index 3ec74458cd29..1923addeb3ac 100644
--- a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
+++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
@@ -81,12 +81,11 @@ in
         { office1 = { model = "MFC-7860DW"; ip = "192.168.1.2"; };
           office2 = { model = "MFC-7860DW"; nodename = "BRW0080927AFBCE"; };
         };
-      type = types.loaOf types.optionSet;
+      type = with types; loaOf (submodule netDeviceOpts);
       description = ''
         The list of network devices that will be registered against the brscan4
         sane backend.
       '';
-      options = [ netDeviceOpts ];
     };
   };
 
@@ -113,4 +112,4 @@ in
     ];
 
   };
-}
\ No newline at end of file
+}