ckb, ckb module: rename to ckb-next

The upstream package has officially changed its name to ckb-next.
This commit is contained in:
Kier Davis 2018-05-06 19:26:37 +01:00
parent 8069b09d05
commit 81178785c9
No known key found for this signature in database
GPG key ID: 66378DA35FF9F0FA
9 changed files with 20 additions and 7 deletions

View file

@ -137,6 +137,13 @@
make sure to update your configuration if you want to keep <literal>proglodyte-wasm</literal>
</para>
</listitem>
<listitem>
<para>
Package <literal>ckb</literal> is renamed to <literal>ckb-next</literal>,
and options <literal>hardware.ckb.*</literal> are renamed to
<literal>hardware.ckb-next.*</literal>.
</para>
</listitem>
</itemizedlist>
</section>

View file

@ -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";

View file

@ -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

View file

@ -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

View file

@ -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 { };