From 4b5e21db21c398966364d33c16cdc88f8ed34750 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 22 Feb 2024 07:49:09 +0000 Subject: [PATCH] unixODBCDrivers.mariadb: 3.1.14 -> 3.1.20 Without the change build fails on clang as: $ nix build --no-link --impure --expr 'with import ./. {}; unixODBCDrivers.mariadb.override { stdenv = clangStdenv; }' -L ... /build/source/test/connstring.c:65:17: error: call to undeclared function 'iswspace'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] while (Str && iswspace(Str[0])) ^ /build/source/test/connstring.c:65:17: note: did you mean 'isspace'? --- pkgs/development/libraries/unixODBCDrivers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index d1b52fc5694c..ad6db095b753 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -43,13 +43,13 @@ mariadb = stdenv.mkDerivation rec { pname = "mariadb-connector-odbc"; - version = "3.1.14"; + version = "3.1.20"; src = fetchFromGitHub { owner = "mariadb-corporation"; repo = "mariadb-connector-odbc"; rev = version; - sha256 = "0wvy6m9qfvjii3kanf2d1rhfaww32kg0d7m57643f79qb05gd6vg"; + hash = "sha256-l+HlS7/A0shwsEXYKDhi+QCmwHaMTeKrtcvo9yYpYws="; # this driver only seems to build correctly when built against the mariadb-connect-c subrepo # (see https://github.com/NixOS/nixpkgs/issues/73258) fetchSubmodules = true;