diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix index ea0ab2785e8e..e8a819232581 100644 --- a/nixos/modules/config/unix-odbc-drivers.nix +++ b/nixos/modules/config/unix-odbc-drivers.nix @@ -1,5 +1,5 @@ { config, lib, ... }: -# unixODBC drivers (this solution is not perfect.. Because the user has to +# unixodbc drivers (this solution is not perfect.. Because the user has to # ask the admin to add a driver.. but it's simple and works let @@ -21,7 +21,7 @@ in description = '' Specifies Unix ODBC drivers to be registered in {file}`/etc/odbcinst.ini`. You may also want to - add `pkgs.unixODBC` to the system path to get + add `pkgs.unixodbc` to the system path to get a command line client to connect to ODBC databases. ''; }; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index db34318d5545..683299930db7 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation ( ++ lib.optional cupsSupport pkgs.cups ++ lib.optional dbusSupport pkgs.dbus ++ lib.optional cairoSupport pkgs.cairo - ++ lib.optional odbcSupport pkgs.unixODBC + ++ lib.optional odbcSupport pkgs.unixodbc ++ lib.optional netapiSupport pkgs.samba4 ++ lib.optional cursesSupport pkgs.ncurses ++ lib.optional vaSupport pkgs.libva diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 49fc1a56eb19..bb04a21dda1b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -77,7 +77,7 @@ clucene-core_2, libcdr, lcms2, - unixODBC, + unixodbc, sane-backends, mythes, libexttextcat, @@ -491,7 +491,7 @@ stdenv.mkDerivation (finalAttrs: { libpq python3 sane-backends - unixODBC + unixodbc util-linux which xmlsec diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index abbb0ce62309..ebb625b56c3e 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -13,7 +13,7 @@ libsecret, openjdk, sqlite, - unixODBC, + unixodbc, gtk2, libxtst, glibcLocales, @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk2 sqlite - unixODBC + unixodbc libxtst glibcLocales ]; diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index 13ae237970a1..e8a83f45b3d7 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -14,7 +14,7 @@ ncurses, opencv4, openssl, - unixODBC, + unixodbc, xkeyboard_config, libxtst, libxrender, @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { opencv4 openssl (lib.getLib stdenv.cc.cc) - unixODBC + unixodbc xkeyboard_config libxml2 libuuid diff --git a/pkgs/by-name/cp/cppdb/package.nix b/pkgs/by-name/cp/cppdb/package.nix index 77b8eee75245..b1e15a57757e 100644 --- a/pkgs/by-name/cp/cppdb/package.nix +++ b/pkgs/by-name/cp/cppdb/package.nix @@ -6,7 +6,7 @@ sqlite, libmysqlclient, libpq, - unixODBC, + unixodbc, }: stdenv.mkDerivation (finalAttrs: { @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { sqlite libmysqlclient libpq - unixODBC + unixodbc ]; cmakeFlags = [ "--no-warn-unused-cli" ]; diff --git a/pkgs/by-name/du/duckdb/package.nix b/pkgs/by-name/du/duckdb/package.nix index 2319a5576467..9849e2f7e01b 100644 --- a/pkgs/by-name/du/duckdb/package.nix +++ b/pkgs/by-name/du/duckdb/package.nix @@ -7,7 +7,7 @@ openssl, openjdk11, python3, - unixODBC, + unixodbc, withJdbc ? false, withOdbc ? false, versionCheckHook, @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { openssl ] ++ lib.optionals withJdbc [ openjdk11 ] - ++ lib.optionals withOdbc [ unixODBC ]; + ++ lib.optionals withOdbc [ unixodbc ]; cmakeFlags = [ (lib.cmakeFeature "DUCKDB_EXTENSION_CONFIGS" "${finalAttrs.src}/.github/config/in_tree_extensions.cmake") diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 3764ffa7f438..b972d23e5365 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -22,7 +22,7 @@ nss, htmlRendererSupport ? false, - unixODBC, + unixodbc, sqaplSupport ? false, zeroFootprintRideSupport ? false, @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { libgbm nss ] - ++ lib.optional sqaplSupport unixODBC; + ++ lib.optional sqaplSupport unixodbc; # See which files are not really important: `https://github.com/Dyalog/DyalogDocker/blob/master/rmfiles.sh` installPhase = '' diff --git a/pkgs/by-name/fr/freetds/package.nix b/pkgs/by-name/fr/freetds/package.nix index dc9d87f2fd4d..8cb3422685b1 100644 --- a/pkgs/by-name/fr/freetds/package.nix +++ b/pkgs/by-name/fr/freetds/package.nix @@ -6,10 +6,10 @@ pkg-config, openssl, odbcSupport ? true, - unixODBC ? null, + unixodbc ? null, }: -assert odbcSupport -> unixODBC != null; +assert odbcSupport -> unixodbc != null; # Work is in progress to move to cmake so revisit that later @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl ] - ++ lib.optional odbcSupport unixODBC; + ++ lib.optional odbcSupport unixodbc; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/by-name/ir/irods/package.nix b/pkgs/by-name/ir/irods/package.nix index 8c2055ec406e..bee151186570 100644 --- a/pkgs/by-name/ir/irods/package.nix +++ b/pkgs/by-name/ir/irods/package.nix @@ -8,7 +8,7 @@ flex, libarchive, pam, - unixODBC, + unixodbc, jsoncons, curl, systemdLibs, @@ -41,7 +41,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { buildInputs = [ libarchive pam - unixODBC + unixodbc jsoncons curl systemdLibs diff --git a/pkgs/by-name/ki/kicad/base.nix b/pkgs/by-name/ki/kicad/base.nix index ebc51c125c9c..c12d0a648a20 100644 --- a/pkgs/by-name/ki/kicad/base.nix +++ b/pkgs/by-name/ki/kicad/base.nix @@ -20,7 +20,7 @@ graphviz, libpthread-stubs, libxdmcp, - unixODBC, + unixodbc, libgit2, libsecret, libgcrypt, @@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: { boost swig python - unixODBC + unixodbc libdeflate opencascade-occt protobuf_29 diff --git a/pkgs/by-name/lu/lutris/package.nix b/pkgs/by-name/lu/lutris/package.nix index 7798d2c7ed17..d40cd205f224 100644 --- a/pkgs/by-name/lu/lutris/package.nix +++ b/pkgs/by-name/lu/lutris/package.nix @@ -274,7 +274,7 @@ buildFHSEnv { lcms2 mpg123 cairo - unixODBC + unixodbc samba4 sane-backends openldap diff --git a/pkgs/by-name/ma/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix index d9be4633e5cb..295ff27a5409 100644 --- a/pkgs/by-name/ma/mathematica/generic.nix +++ b/pkgs/by-name/ma/mathematica/generic.nix @@ -41,7 +41,7 @@ openssl, pciutils, tre, - unixODBC, + unixodbc, libxcb-image, libxcb-keysyms, xkeyboard_config, @@ -126,7 +126,7 @@ stdenv.mkDerivation { openssl pciutils tre - unixODBC + unixodbc libxcb-image libxcb-keysyms xkeyboard_config diff --git a/pkgs/by-name/na/nanodbc/package.nix b/pkgs/by-name/na/nanodbc/package.nix index be46b432ca9f..b8016acb9509 100644 --- a/pkgs/by-name/na/nanodbc/package.nix +++ b/pkgs/by-name/na/nanodbc/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, catch2, cmake, - unixODBC, + unixodbc, }: stdenv.mkDerivation (finalAttrs: { @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ unixODBC ]; + buildInputs = [ unixodbc ]; cmakeFlags = if (stdenv.hostPlatform.isStatic) then diff --git a/pkgs/by-name/or/oracle-instantclient/package.nix b/pkgs/by-name/or/oracle-instantclient/package.nix index 0e8b01560975..6cd1c5d2829a 100644 --- a/pkgs/by-name/or/oracle-instantclient/package.nix +++ b/pkgs/by-name/or/oracle-instantclient/package.nix @@ -9,10 +9,10 @@ libaio, makeWrapper, odbcSupport ? true, - unixODBC, + unixodbc, }: -assert odbcSupport -> unixODBC != null; +assert odbcSupport -> unixodbc != null; let inherit (lib) optional optionals optionalString; @@ -147,7 +147,7 @@ stdenv.mkDerivation { (lib.getLib stdenv.cc.cc) ] ++ optional stdenv.hostPlatform.isLinux libaio - ++ optional odbcSupport unixODBC; + ++ optional odbcSupport unixodbc; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix index f46aa1021013..211e9eb5ae8c 100644 --- a/pkgs/by-name/pd/pdns/package.nix +++ b/pkgs/by-name/pd/pdns/package.nix @@ -17,7 +17,7 @@ openldap, geoip, curl, - unixODBC, + unixodbc, lmdb, tinycdb, }: @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { yaml-cpp libsodium curl - unixODBC + unixodbc openssl systemd lmdb diff --git a/pkgs/by-name/po/poco/package.nix b/pkgs/by-name/po/poco/package.nix index fd6eb26914f9..9475a681a1d0 100644 --- a/pkgs/by-name/po/poco/package.nix +++ b/pkgs/by-name/po/poco/package.nix @@ -11,7 +11,7 @@ expat, sqlite, openssl, - unixODBC, + unixodbc, libmysqlclient, writableTmpDirAsHomeHook, }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - unixODBC + unixodbc libmysqlclient ]; diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix index 64428c0ba552..64b1bd712211 100644 --- a/pkgs/by-name/ps/psqlodbc/package.nix +++ b/pkgs/by-name/ps/psqlodbc/package.nix @@ -11,7 +11,7 @@ libiodbc, withUnixODBC ? true, - unixODBC, + unixodbc, }: assert lib.xor withLibiodbc withUnixODBC; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { openssl ] ++ lib.optional withLibiodbc libiodbc - ++ lib.optional withUnixODBC unixODBC; + ++ lib.optional withUnixODBC unixodbc; nativeBuildInputs = [ autoreconfHook @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-libpq=${lib.getDev libpq}" ] ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}" - ++ lib.optional withUnixODBC "--with-unixodbc=${unixODBC}"; + ++ lib.optional withUnixODBC "--with-unixodbc=${unixodbc}"; passthru = { updateScript = nix-update-script { diff --git a/pkgs/by-name/qu/quartus-prime-lite/package.nix b/pkgs/by-name/qu/quartus-prime-lite/package.nix index 85bfe90885e4..074a3652d9a2 100644 --- a/pkgs/by-name/qu/quartus-prime-lite/package.nix +++ b/pkgs/by-name/qu/quartus-prime-lite/package.nix @@ -84,7 +84,7 @@ buildFHSEnv rec { # questa requirements libxml2 ncurses5 - unixODBC + unixodbc libxft # common requirements freetype diff --git a/pkgs/by-name/ra/racket/package.nix b/pkgs/by-name/ra/racket/package.nix index 03ed6377f94d..5d89ad05801d 100644 --- a/pkgs/by-name/ra/racket/package.nix +++ b/pkgs/by-name/ra/racket/package.nix @@ -15,7 +15,7 @@ libpng, makeFontsConf, pango, - unixODBC, + unixodbc, wrapGAppsHook3, disableDocs ? false, @@ -38,7 +38,7 @@ minimal.overrideAttrs ( }; buildInputs = prevAttrs.buildInputs ++ [ - (if isDarwin then libiodbc else unixODBC) + (if isDarwin then libiodbc else unixodbc) cairo fontconfig.lib glib diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 7d105488af7f..772387f18395 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -36,7 +36,7 @@ netcdf, poppler, sqlite, - unixODBC, + unixodbc, cudaSupport ? config.cudaSupport, }: @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { netcdf poppler sqlite - unixODBC + unixodbc ]; cmakeFlags = [ diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix index f6231a08b016..3ba4e45a181d 100644 --- a/pkgs/by-name/sq/sqlpage/package.nix +++ b/pkgs/by-name/sq/sqlpage/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pkg-config, sqlite, - unixODBC, + unixodbc, zstd, fetchurl, }: @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ sqlite - unixODBC + unixodbc zstd ]; diff --git a/pkgs/by-name/sw/swi-prolog/package.nix b/pkgs/by-name/sw/swi-prolog/package.nix index 7f7b1aa295c6..748f0699c8a3 100644 --- a/pkgs/by-name/sw/swi-prolog/package.nix +++ b/pkgs/by-name/sw/swi-prolog/package.nix @@ -22,7 +22,7 @@ jdk, withOdbc ? true, - unixODBC, + unixodbc, withPcre ? true, pcre2, @@ -97,7 +97,7 @@ let [ ] ++ (lib.optional withDb db) ++ (lib.optional withJava jdk) - ++ (lib.optional withOdbc unixODBC) + ++ (lib.optional withOdbc unixodbc) ++ (lib.optional withPcre pcre2) ++ (lib.optional withPython python3) ++ (lib.optional withYaml libyaml) diff --git a/pkgs/by-name/un/unixODBC/package.nix b/pkgs/by-name/un/unixodbc/package.nix similarity index 61% rename from pkgs/by-name/un/unixODBC/package.nix rename to pkgs/by-name/un/unixodbc/package.nix index 15393de858d5..9048b27d4ab8 100644 --- a/pkgs/by-name/un/unixODBC/package.nix +++ b/pkgs/by-name/un/unixodbc/package.nix @@ -4,14 +4,15 @@ fetchurl, }: -stdenv.mkDerivation rec { - pname = "unixODBC"; +stdenv.mkDerivation (finalAttrs: { + pname = "unixobcd"; version = "2.3.12"; + # TODO: build from source https://github.com/lurcher/unixODBC src = fetchurl { urls = [ - "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz" - "https://www.unixodbc.org/${pname}-${version}.tar.gz" + "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-${finalAttrs.version}.tar.gz" + "https://www.unixodbc.org/unixODBC-${finalAttrs.version}.tar.gz" ]; sha256 = "sha256-8hBQFEXOIb9ge6Ue+MEl4Q4i3/3/7Dd2RkYt9fAZFew="; }; @@ -27,4 +28,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index ce8de7742161..a810a9d84125 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, buildGoModule, - unixODBC, + unixodbc, icu, nix-update-script, testers, @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { }; buildInputs = [ - unixODBC + unixodbc icu ]; diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix index d2d2c5d24d51..ddd5d48aab28 100644 --- a/pkgs/by-name/wp/wpsoffice-cn/package.nix +++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix @@ -19,7 +19,7 @@ gtk3, libgbm, libusb1, - unixODBC, + unixodbc, libmysqlclient, libsForQt5, libxv, @@ -145,7 +145,7 @@ else gtk3 libgbm libusb1 - unixODBC + unixodbc libsForQt5.qtbase libxdamage libxtst diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c9844fc81fdb..74c23e34ba65 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17685,7 +17685,7 @@ self: { HDBC, mtl, time, - unixODBC, + unixodbc, utf8-string, }: mkDerivation { @@ -17703,11 +17703,11 @@ self: { time utf8-string ]; - librarySystemDepends = [ unixODBC ]; + librarySystemDepends = [ unixodbc ]; description = "ODBC driver for HDBC"; license = lib.licenses.bsd3; } - ) { inherit (pkgs) unixODBC; }; + ) { inherit (pkgs) unixodbc; }; HDBC-postgresql = callPackage ( { @@ -362150,7 +362150,7 @@ self: { base, hsql, old-time, - unixODBC, + unixodbc, }: mkDerivation { pname = "hsql-odbc"; @@ -362161,12 +362161,12 @@ self: { hsql old-time ]; - librarySystemDepends = [ unixODBC ]; + librarySystemDepends = [ unixodbc ]; description = "A Haskell Interface to ODBC"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; } - ) { inherit (pkgs) unixODBC; }; + ) { inherit (pkgs) unixodbc; }; hsql-postgresql = callPackage ( { @@ -495147,7 +495147,7 @@ self: { text, time, transformers, - unixODBC, + unixodbc, unliftio-core, weigh, }: @@ -495174,7 +495174,7 @@ self: { transformers unliftio-core ]; - librarySystemDepends = [ unixODBC ]; + librarySystemDepends = [ unixodbc ]; executableHaskellDepends = [ base bytestring @@ -495201,7 +495201,7 @@ self: { license = lib.licenses.bsd3; mainProgram = "odbc"; } - ) { inherit (pkgs) unixODBC; }; + ) { inherit (pkgs) unixodbc; }; odd-jobs = callPackage ( { @@ -640694,7 +640694,7 @@ self: { logging, text, transformers, - unixODBC, + unixodbc, }: mkDerivation { pname = "sqlcli"; @@ -640706,13 +640706,13 @@ self: { text transformers ]; - librarySystemDepends = [ unixODBC ]; + librarySystemDepends = [ unixodbc ]; description = "Bindings for SQL/CLI (ODBC) C API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; } - ) { inherit (pkgs) unixODBC; }; + ) { inherit (pkgs) unixodbc; }; sqlcli-odbc = callPackage ( { diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 5d6b0f3eb699..7521fbcf8612 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -38,7 +38,7 @@ runtimeShell, stdenv, systemd, - unixODBC, + unixodbc, wrapGAppsHook3, wxGTK32, libx11, @@ -107,7 +107,7 @@ stdenv.mkDerivation { zlib ] ++ optionals wxSupport wxPackages2 - ++ optionals odbcSupport [ unixODBC ] + ++ optionals odbcSupport [ unixodbc ] ++ optionals javacSupport [ openjdk11 ] ++ optionals enableSystemd [ systemd ]; @@ -130,7 +130,7 @@ stdenv.mkDerivation { ++ optional enableKernelPoll "--enable-kernel-poll" ++ optional enableHipe "--enable-hipe" ++ optional javacSupport "--with-javac" - ++ optional odbcSupport "--with-odbc=${unixODBC}" + ++ optional odbcSupport "--with-odbc=${unixodbc}" ++ optional wxSupport "--enable-wx" ++ optional enableSystemd "--enable-systemd" ++ optional stdenv.hostPlatform.isDarwin "--enable-darwin-64bit" diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 710c572ac59c..4fde995efb1b 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -65,7 +65,7 @@ libxcb-wm, zlib, at-spi2-core, - unixODBC, + unixodbc, unixODBCDrivers, libGL, # darwin @@ -127,8 +127,8 @@ stdenv.mkDerivation { libproxy dbus glib - # unixODBC drivers - unixODBC + # unixodbc drivers + unixodbc unixODBCDrivers.psql unixODBCDrivers.sqlite unixODBCDrivers.mariadb diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index a7e93cfedf10..33c91b7f4ad5 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -3,7 +3,7 @@ fetchpatch, fetchurl, stdenv, - unixODBC, + unixodbc, cmake, mariadb, sqlite, @@ -73,7 +73,7 @@ nativeBuildInputs = [ cmake ]; buildInputs = [ - unixODBC + unixodbc openssl libiconv zlib @@ -82,10 +82,10 @@ cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" - "-DODBC_LIB_DIR=${lib.getLib unixODBC}/lib" - "-DODBC_INCLUDE_DIR=${lib.getDev unixODBC}/include" + "-DODBC_LIB_DIR=${lib.getLib unixodbc}/lib" + "-DODBC_INCLUDE_DIR=${lib.getDev unixodbc}/include" "-DWITH_OPENSSL=ON" - # on darwin this defaults to ON but we want to build against unixODBC + # on darwin this defaults to ON but we want to build against unixodbc "-DWITH_IODBC=OFF" ]; @@ -130,14 +130,14 @@ ]; buildInputs = [ - unixODBC + unixodbc sqlite zlib libxml2 ]; configureFlags = [ - "--with-odbc=${unixODBC}" + "--with-odbc=${unixodbc}" "--with-sqlite3=${sqlite.dev}" ]; @@ -195,7 +195,7 @@ postFixup = '' patchelf --set-rpath ${ lib.makeLibraryPath [ - unixODBC + unixodbc openssl libkrb5 libuuid @@ -283,14 +283,14 @@ fixupPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' ${stdenv.cc.bintools.targetPrefix}install_name_tool \ -change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib \ - -change /opt/homebrew/lib/libodbcinst.2.dylib ${unixODBC}/lib/libodbcinst.2.dylib \ + -change /opt/homebrew/lib/libodbcinst.2.dylib ${unixodbc}/lib/libodbcinst.2.dylib \ $out/${finalAttrs.passthru.driver} ''; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath ${ lib.makeLibraryPath [ - unixODBC + unixodbc openssl libkrb5 libuuid @@ -337,18 +337,18 @@ cd src ''; - # `unixODBC` is loaded with `dlopen`, so `autoPatchElfHook` cannot see it, and `patchELF` phase would strip the manual patchelf. Thus: + # `unixodbc` is loaded with `dlopen`, so `autoPatchElfHook` cannot see it, and `patchELF` phase would strip the manual patchelf. Thus: # - Manually patchelf with `unixODCB` libraries # - Disable automatic `patchELF` phase installPhase = '' mkdir -p $out/lib cp opt/amazon/redshiftodbc/lib/64/* $out/lib - patchelf --set-rpath ${unixODBC}/lib/ $out/lib/libamazonredshiftodbc64.so + patchelf --set-rpath ${unixodbc}/lib/ $out/lib/libamazonredshiftodbc64.so ''; dontPatchELF = true; - buildInputs = [ unixODBC ]; + buildInputs = [ unixodbc ]; # see the top of the file for an explanation passthru = { diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 4ee650fb3a38..58d44b858662 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -50,7 +50,7 @@ imath, openvdb, c-blosc, - unixODBC, + unixodbc, libpq, libmysqlclient, ffmpeg, @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { alembic imath c-blosc - unixODBC + unixodbc libpq libmysqlclient ffmpeg diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index 451942fe5604..947e14216d53 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -3,7 +3,7 @@ buildPecl, lib, libiconv, - unixODBC, + unixodbc, php, }: @@ -15,7 +15,7 @@ buildPecl { internalDeps = [ php.extensions.pdo ]; - buildInputs = [ unixODBC ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + buildInputs = [ unixodbc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = { description = "Microsoft Drivers for PHP for SQL Server"; diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix index 605451d94ac2..7aa6f0047bae 100644 --- a/pkgs/development/php-packages/sqlsrv/default.nix +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -2,7 +2,7 @@ stdenv, buildPecl, lib, - unixODBC, + unixodbc, libiconv, }: @@ -12,7 +12,7 @@ buildPecl { version = "5.12.0"; sha256 = "sha256-qeu4gLKlWNPWaE9uaALFPFv/pJ4e5g0Uc6cST8nLcq0="; - buildInputs = [ unixODBC ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + buildInputs = [ unixodbc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = { description = "Microsoft Drivers for PHP for SQL Server"; diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 59a6d9aebeb4..3a40b65bc182 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, isPyPy, - unixODBC, + unixodbc, }: buildPythonPackage rec { @@ -19,10 +19,10 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - unixODBC # for odbc_config + unixodbc # for odbc_config ]; - buildInputs = [ unixODBC ]; + buildInputs = [ unixodbc ]; # Tests require a database server doCheck = false; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index fb5bc3e25fc1..c52741b3b415 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -695,7 +695,7 @@ let pkg-config ]; n1qn1 = [ pkgs.gfortran ]; - odbc = [ pkgs.unixODBC ]; + odbc = [ pkgs.unixodbc ]; opencv = [ pkgs.pkg-config ]; pak = [ pkgs.curl.dev ]; pander = with pkgs; [ diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 0abcc99803e7..688524e6f3ec 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -12,7 +12,7 @@ zlib, buildPackages, odbcSupport ? true, - unixODBC, + unixodbc, snmpSupport ? stdenv.buildPlatform == stdenv.hostPlatform, net-snmp, sshSupport ? true, @@ -67,7 +67,7 @@ import ./versions.nix ( (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre) zlib ] - ++ optional odbcSupport unixODBC + ++ optional odbcSupport unixodbc ++ optional snmpSupport net-snmp ++ optional sqliteSupport sqlite ++ optional sshSupport libssh2 diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 369d34a5de9f..9a01605a6238 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -17,7 +17,7 @@ ldapSupport ? true, openldap, odbcSupport ? true, - unixODBC, + unixodbc, snmpSupport ? true, net-snmp, sshSupport ? true, @@ -64,7 +64,7 @@ import ./versions.nix ( (if lib.versionAtLeast version "7.4" then pcre2 else pcre) zlib ] - ++ optional odbcSupport unixODBC + ++ optional odbcSupport unixodbc ++ optional jabberSupport iksemel ++ optional ldapSupport openldap ++ optional snmpSupport net-snmp diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5fd39cb8884d..f4d7c677e5e2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1962,6 +1962,7 @@ mapAliases { ue4demos = throw "'ue4demos' has been removed because it is unmaintained"; # Added 2026-02-07 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 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/php-packages.nix b/pkgs/top-level/php-packages.nix index 9f6229359de5..1a438f6400aa 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -39,7 +39,7 @@ readline, rsync, sqlite, - unixODBC, + unixodbc, uwimap, valgrind, zlib, @@ -609,8 +609,8 @@ lib.makeScope pkgs.newScope ( { name = "pdo_odbc"; internalDeps = [ php.extensions.pdo ]; - buildInputs = [ unixODBC ]; - configureFlags = [ "--with-pdo-odbc=unixODBC,${unixODBC}" ]; + buildInputs = [ unixodbc ]; + configureFlags = [ "--with-pdo-odbc=unixODBC,${unixodbc}" ]; doCheck = false; } { diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index cde30a93938c..1218479881a0 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -673,7 +673,7 @@ }, "odbc": { "attrPath": [ - "unixODBC" + "unixodbc" ] }, "ompi": { @@ -901,4 +901,4 @@ ] } } -} +} \ No newline at end of file