From b44ad3bd58950ef2159dad3c568454647dd151b2 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 13 Dec 2025 00:01:20 +0100 Subject: [PATCH 1/2] xf86-input-cmt: rename from xf86_input_cmt to fit package naming conventions --- nixos/modules/services/x11/hardware/cmt.nix | 2 +- pkgs/by-name/xf/{xf86_input_cmt => xf86-input-cmt}/package.nix | 0 pkgs/top-level/aliases.nix | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/by-name/xf/{xf86_input_cmt => xf86-input-cmt}/package.nix (100%) diff --git a/nixos/modules/services/x11/hardware/cmt.nix b/nixos/modules/services/x11/hardware/cmt.nix index 23f07e5de06e..ca636fdb73fe 100644 --- a/nixos/modules/services/x11/hardware/cmt.nix +++ b/nixos/modules/services/x11/hardware/cmt.nix @@ -85,7 +85,7 @@ in config = mkIf cfg.enable { - services.xserver.modules = [ pkgs.xf86_input_cmt ]; + services.xserver.modules = [ pkgs.xf86-input-cmt ]; environment.etc = { "${etcPath}/40-touchpad-cmt.conf" = { diff --git a/pkgs/by-name/xf/xf86_input_cmt/package.nix b/pkgs/by-name/xf/xf86-input-cmt/package.nix similarity index 100% rename from pkgs/by-name/xf/xf86_input_cmt/package.nix rename to pkgs/by-name/xf/xf86-input-cmt/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 55ae9d9c4cbc..6889d161b128 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1696,6 +1696,7 @@ mapAliases { xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28 xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12 xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27 + xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12 xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22 xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22 xinput_calibrator = xinput-calibrator; # Added 2025-08-28 From 20956b3a27a1975f8faeb83c6497cb4c380ab877 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 13 Dec 2025 00:01:56 +0100 Subject: [PATCH 2/2] xf86-input-wacom: rename from xf86_input_wacom to fit package naming conventions --- nixos/modules/services/x11/hardware/wacom.nix | 8 ++++---- nixos/modules/services/x11/xserver.nix | 2 +- .../xf/{xf86_input_wacom => xf86-input-wacom}/package.nix | 0 pkgs/kde/plasma/wacomtablet/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + 5 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/by-name/xf/{xf86_input_wacom => xf86-input-wacom}/package.nix (100%) diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix index 3707b7f41575..56959f3334e6 100644 --- a/nixos/modules/services/x11/hardware/wacom.nix +++ b/nixos/modules/services/x11/hardware/wacom.nix @@ -39,14 +39,14 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.xf86_input_wacom ]; # provides xsetwacom + environment.systemPackages = [ pkgs.xf86-input-wacom ]; # provides xsetwacom - services.xserver.modules = [ pkgs.xf86_input_wacom ]; + services.xserver.modules = [ pkgs.xf86-input-wacom ]; - services.udev.packages = [ pkgs.xf86_input_wacom ]; + services.udev.packages = [ pkgs.xf86-input-wacom ]; environment.etc."X11/xorg.conf.d/70-wacom.conf".source = - "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/70-wacom.conf"; + "${pkgs.xf86-input-wacom}/share/X11/xorg.conf.d/70-wacom.conf"; }; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 517305daab25..33343b5b54fd 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -365,7 +365,7 @@ in modules = mkOption { type = types.listOf types.path; default = [ ]; - example = literalExpression "[ pkgs.xf86_input_wacom ]"; + example = literalExpression "[ pkgs.xf86-input-wacom ]"; description = "Packages to be added to the module search path of the X server."; }; diff --git a/pkgs/by-name/xf/xf86_input_wacom/package.nix b/pkgs/by-name/xf/xf86-input-wacom/package.nix similarity index 100% rename from pkgs/by-name/xf/xf86_input_wacom/package.nix rename to pkgs/by-name/xf/xf86-input-wacom/package.nix diff --git a/pkgs/kde/plasma/wacomtablet/default.nix b/pkgs/kde/plasma/wacomtablet/default.nix index c4482a689606..59f9cfe04906 100644 --- a/pkgs/kde/plasma/wacomtablet/default.nix +++ b/pkgs/kde/plasma/wacomtablet/default.nix @@ -2,7 +2,7 @@ mkKdeDerivation, pkg-config, libwacom, - xf86_input_wacom, + xf86-input-wacom, }: mkKdeDerivation { pname = "wacomtablet"; @@ -10,7 +10,7 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ libwacom - xf86_input_wacom + xf86-input-wacom ]; meta.mainProgram = "kde_wacom_tabletfinder"; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6889d161b128..11fa22d1e4ec 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1697,6 +1697,7 @@ mapAliases { xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12 xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27 xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12 + xf86_input_wacom = xf86-input-wacom; # Added 2025-12-12 xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22 xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22 xinput_calibrator = xinput-calibrator; # Added 2025-08-28