diff options
| author | Kier Davis <kierdavis@gmail.com> | 2018-05-06 19:26:37 +0100 |
|---|---|---|
| committer | Kier Davis <kierdavis@gmail.com> | 2018-10-22 13:23:30 +0100 |
| commit | 81178785c95e130160ee25673bec10888f662acc (patch) | |
| tree | fe4713c1382968a3405ff67fc5c41414a387bd0f /nixos | |
| parent | 8069b09d057489089257e4790ef5896761e3024c (diff) | |
| download | nixlib-81178785c95e130160ee25673bec10888f662acc.tar nixlib-81178785c95e130160ee25673bec10888f662acc.tar.gz nixlib-81178785c95e130160ee25673bec10888f662acc.tar.bz2 nixlib-81178785c95e130160ee25673bec10888f662acc.tar.lz nixlib-81178785c95e130160ee25673bec10888f662acc.tar.xz nixlib-81178785c95e130160ee25673bec10888f662acc.tar.zst nixlib-81178785c95e130160ee25673bec10888f662acc.zip | |
ckb, ckb module: rename to ckb-next
The upstream package has officially changed its name to ckb-next.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1903.xml | 7 | ||||
| -rw-r--r-- | nixos/modules/hardware/ckb-next.nix (renamed from nixos/modules/hardware/ckb.nix) | 15 | ||||
| -rw-r--r-- | nixos/modules/module-list.nix | 2 |
3 files changed, 18 insertions, 6 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 839d75b53bd1..3cef0fb1c1d9 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 <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> diff --git a/nixos/modules/hardware/ckb.nix b/nixos/modules/hardware/ckb-next.nix index 8c0cdbd24d47..0316d7cf4119 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 fb6b4262568e..5158fcac492a 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 |