diff --git a/nixos/modules/hardware/pcmcia.nix b/nixos/modules/hardware/pcmcia.nix index 9f289b029463..955a039a3096 100644 --- a/nixos/modules/hardware/pcmcia.nix +++ b/nixos/modules/hardware/pcmcia.nix @@ -5,7 +5,7 @@ ... }: let - pcmciaUtils = pkgs.pcmciaUtils.overrideAttrs { + pcmciautils = pkgs.pcmciautils.overrideAttrs { inherit (config.hardware.pcmcia) firmware config; }; in @@ -48,9 +48,9 @@ in boot.kernelModules = [ "pcmcia" ]; - services.udev.packages = [ pcmciaUtils ]; + services.udev.packages = [ pcmciautils ]; - environment.systemPackages = [ pcmciaUtils ]; + environment.systemPackages = [ pcmciautils ]; }; diff --git a/pkgs/by-name/pc/pcmciaUtils/package.nix b/pkgs/by-name/pc/pcmciautils/package.nix similarity index 86% rename from pkgs/by-name/pc/pcmciaUtils/package.nix rename to pkgs/by-name/pc/pcmciautils/package.nix index 9bdd4c1ecc11..4d6f8f0287da 100644 --- a/pkgs/by-name/pc/pcmciaUtils/package.nix +++ b/pkgs/by-name/pc/pcmciautils/package.nix @@ -9,8 +9,9 @@ kmod, udev, udevCheckHook, - firmware ? config.pcmciaUtils.firmware or [ ], # Special pcmcia cards. - configOpts ? config.pcmciaUtils.config or null, # Special hardware (map memory & port & irq) + # config.pcmciaUtils as backwards compat for renamed package + firmware ? config.pcmcia-utils.firmware or config.pcmciaUtils.firmware or [ ], # Special pcmcia cards. + configOpts ? config.pcmcia-utils.config or config.pcmciaUtils.config or null, # Special hardware (map memory & port & irq) }: # used to generate postInstall script. # FIXME: should add an option to choose between hotplug and udev. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3850a8d8869e..f3fd90ee0159 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1507,6 +1507,7 @@ mapAliases { patchelfStable = throw "'patchelfStable' has been renamed to/replaced by 'patchelf'"; # Converted to throw 2025-10-27 path-of-building = lib.warnOnInstantiate "'path-of-building' has been replaced by 'rusty-path-of-building'" rusty-path-of-building; # Added 2025-10-30 paup = throw "'paup' has been renamed to/replaced by 'paup-cli'"; # Converted to throw 2025-10-27 + pcmciaUtils = warnAlias "'pcmciaUtils' has been renamed to 'pcmciautils'" pcmciautils; # Added 2026-02-12 pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23 pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29 pcsctools = throw "'pcsctools' has been renamed to/replaced by 'pcsc-tools'"; # Converted to throw 2025-10-27