diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 839d75b53bd..3cef0fb1c1d 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -137,6 +137,13 @@
make sure to update your configuration if you want to keep proglodyte-wasm
+
+
+ Package ckb is renamed to ckb-next,
+ and options hardware.ckb.* are renamed to
+ hardware.ckb-next.*.
+
+
diff --git a/nixos/modules/hardware/ckb.nix b/nixos/modules/hardware/ckb-next.nix
similarity index 66%
rename from nixos/modules/hardware/ckb.nix
rename to nixos/modules/hardware/ckb-next.nix
index 8c0cdbd24d4..0316d7cf411 100644
--- a/nixos/modules/hardware/ckb.nix
+++ b/nixos/modules/hardware/ckb-next.nix
@@ -3,17 +3,22 @@
with lib;
let
- cfg = config.hardware.ckb;
+ cfg = config.hardware.ckb-next;
in
{
- options.hardware.ckb = {
+ imports = [
+ (mkRenamedOptionModule ["hardware" "ckb" "enable"] ["hardware" "ckb-next" "enable"])
+ (mkRenamedOptionModule ["hardware" "ckb" "package"] ["hardware" "ckb-next" "package"])
+ ];
+
+ options.hardware.ckb-next = {
enable = mkEnableOption "the Corsair keyboard/mouse driver";
package = mkOption {
type = types.package;
- default = pkgs.ckb;
- defaultText = "pkgs.ckb";
+ default = pkgs.ckb-next;
+ defaultText = "pkgs.ckb-next";
description = ''
The package implementing the Corsair keyboard/mouse driver.
'';
@@ -23,7 +28,7 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
- systemd.services.ckb = {
+ systemd.services.ckb-next = {
description = "Corsair Keyboards and Mice Daemon";
wantedBy = ["multi-user.target"];
script = "${cfg.package}/bin/ckb-next-daemon";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index fb6b4262568..5158fcac492 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -34,7 +34,7 @@
./config/zram.nix
./hardware/all-firmware.nix
./hardware/brightnessctl.nix
- ./hardware/ckb.nix
+ ./hardware/ckb-next.nix
./hardware/cpu/amd-microcode.nix
./hardware/cpu/intel-microcode.nix
./hardware/digitalbitbox.nix
diff --git a/pkgs/tools/misc/ckb/ckb-modprobe.patch b/pkgs/tools/misc/ckb-next/ckb-modprobe.patch
similarity index 100%
rename from pkgs/tools/misc/ckb/ckb-modprobe.patch
rename to pkgs/tools/misc/ckb-next/ckb-modprobe.patch
diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb-next/default.nix
similarity index 100%
rename from pkgs/tools/misc/ckb/default.nix
rename to pkgs/tools/misc/ckb-next/default.nix
diff --git a/pkgs/tools/misc/ckb/install-dirs.patch b/pkgs/tools/misc/ckb-next/install-dirs.patch
similarity index 100%
rename from pkgs/tools/misc/ckb/install-dirs.patch
rename to pkgs/tools/misc/ckb-next/install-dirs.patch
diff --git a/pkgs/tools/misc/ckb/systemd-service.patch b/pkgs/tools/misc/ckb-next/systemd-service.patch
similarity index 100%
rename from pkgs/tools/misc/ckb/systemd-service.patch
rename to pkgs/tools/misc/ckb-next/systemd-service.patch
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a0f611dd961..728fd6b71b8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -59,6 +59,7 @@ mapAliases ({
cantarell_fonts = cantarell-fonts; # added 2018-03-03
checkbashism = checkbashisms; # added 2016-08-16
cifs_utils = cifs-utils; # added 2016-08
+ ckb = ckb-next; # added 2018-10-21
clangAnalyzer = clang-analyzer; # added 2015-02-20
clawsMail = claws-mail; # added 2016-04-29
clutter_gtk = clutter-gtk; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfbc6687f9d..0f3c36d00f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1987,7 +1987,7 @@ with pkgs;
checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
- ckb = libsForQt5.callPackage ../tools/misc/ckb { };
+ ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { };
clamav = callPackage ../tools/security/clamav { };