summary refs log tree commit diff
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-08-30 20:32:45 -0400
committerGraham Christensen <graham@grahamc.com>2017-08-30 20:32:45 -0400
commit9d2777a5a5f861a727d09c3ecdeffd8c72c143b7 (patch)
treea16b24826785793cc5769d971434c76adae3bf82
parent1b68193167af1f19502689708223fa16f8e31f50 (diff)
downloadnixpkgs-9d2777a5a5f861a727d09c3ecdeffd8c72c143b7.tar
nixpkgs-9d2777a5a5f861a727d09c3ecdeffd8c72c143b7.tar.gz
nixpkgs-9d2777a5a5f861a727d09c3ecdeffd8c72c143b7.tar.bz2
nixpkgs-9d2777a5a5f861a727d09c3ecdeffd8c72c143b7.tar.lz
nixpkgs-9d2777a5a5f861a727d09c3ecdeffd8c72c143b7.tar.xz
nixpkgs-9d2777a5a5f861a727d09c3ecdeffd8c72c143b7.tar.zst
nixpkgs-9d2777a5a5f861a727d09c3ecdeffd8c72c143b7.zip
Mark synaptics as deprecated
-rw-r--r--nixos/doc/manual/release-notes/rl-1709.xml8
-rw-r--r--nixos/modules/services/x11/hardware/synaptics.nix2
2 files changed, 9 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 91681cc6949..88b28c29118 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -176,6 +176,14 @@ rmdir /var/lib/ipfs/.ipfs
       removed. The system support had been broken for several years.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      Touchpad support should now be enabled through
+      <literal>libinput</literal> as <literal>synaptics</literal> is
+      now deprecated. See the option
+      <literal>services.xserver.libinput.enable</literal>.
+    </para>
+  </listitem>
 </itemizedlist>
 
 <para>Other notable improvements:</para>
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index 54454c736c1..f032c593885 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -29,7 +29,7 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = "Whether to enable touchpad support.";
+        description = "Whether to enable touchpad support. Deprecated: Consider services.xserver.libinput.enable.";
       };
 
       dev = mkOption {