diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix index e8a819232581..293021dd868f 100644 --- a/nixos/modules/config/unix-odbc-drivers.nix +++ b/nixos/modules/config/unix-odbc-drivers.nix @@ -17,7 +17,7 @@ in environment.unixODBCDrivers = lib.mkOption { type = lib.types.listOf lib.types.package; default = [ ]; - example = lib.literalExpression "with pkgs.unixODBCDrivers; [ sqlite psql ]"; + example = lib.literalExpression "with pkgs.unixodbcDrivers; [ sqlite psql ]"; description = '' Specifies Unix ODBC drivers to be registered in {file}`/etc/odbcinst.ini`. You may also want to diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 4fde995efb1b..d195d42a6d56 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -66,7 +66,7 @@ zlib, at-spi2-core, unixodbc, - unixODBCDrivers, + unixodbcDrivers, libGL, # darwin moltenvk, @@ -129,9 +129,9 @@ stdenv.mkDerivation { glib # unixodbc drivers unixodbc - unixODBCDrivers.psql - unixODBCDrivers.sqlite - unixODBCDrivers.mariadb + unixodbcDrivers.psql + unixodbcDrivers.sqlite + unixodbcDrivers.mariadb ] ++ lib.optionals systemdSupport [ systemd diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 33c91b7f4ad5..2cc05aa87349 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -368,5 +368,5 @@ }; } // lib.optionalAttrs config.allowAliases { - mysql = throw "unixODBCDrivers.mysql has been removed because it has been marked as broken since 2016."; # Added 2025-10-11 + mysql = throw "unixodbcDrivers.mysql has been removed because it has been marked as broken since 2016."; # Added 2025-10-11 } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f4d7c677e5e2..f144c0c2a6d8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1963,6 +1963,7 @@ mapAliases { unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17 unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27 unixODBC = warnAlias "'unixODBC' has been renamed to 'unixodbc'" unixodbc; # Added 2026-02-12 + unixODBCDrivers = warnAlias "'unixODBCDrivers' has been renamed to 'unixodbcDrivers'" unixodbcDrivers; # Added 2026-02-12 unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24 usync = throw "'usync' has been removed as it is unused and unmaintained upstream"; # Added 2025-12-18 util-linuxCurses = throw "'util-linuxCurses' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6304954b4209..18490cad7c35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7618,7 +7618,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { }); + unixodbcDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { }); valeStyles = recurseIntoAttrs (callPackages ../by-name/va/vale/styles.nix { });