diff options
| author | Izorkin <izorkin@elven.pw> | 2023-01-20 16:01:19 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2023-08-15 21:02:23 +0300 |
| commit | d4faf87c9fb20e5869a26b3e76725d7a55a89de7 (patch) | |
| tree | 36f91733074b8b2434169cfacf2b548ebe62c099 | |
| parent | 441043771bba6febfef32adf79e68cf134433e7b (diff) | |
| download | nixpkgs-d4faf87c9fb20e5869a26b3e76725d7a55a89de7.tar nixpkgs-d4faf87c9fb20e5869a26b3e76725d7a55a89de7.tar.gz nixpkgs-d4faf87c9fb20e5869a26b3e76725d7a55a89de7.tar.bz2 nixpkgs-d4faf87c9fb20e5869a26b3e76725d7a55a89de7.tar.lz nixpkgs-d4faf87c9fb20e5869a26b3e76725d7a55a89de7.tar.xz nixpkgs-d4faf87c9fb20e5869a26b3e76725d7a55a89de7.tar.zst nixpkgs-d4faf87c9fb20e5869a26b3e76725d7a55a89de7.zip | |
mariadb-connector-c: init at 3.3.5
| -rw-r--r-- | pkgs/servers/sql/mariadb/connector-c/3_3.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/connector-c/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/servers/sql/mariadb/connector-c/3_3.nix b/pkgs/servers/sql/mariadb/connector-c/3_3.nix new file mode 100644 index 00000000000..ec70d999828 --- /dev/null +++ b/pkgs/servers/sql/mariadb/connector-c/3_3.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./. (args // { + version = "3.3.5"; + hash = "sha256-ynLrJvbbK++nfkj/lm9xvNPLRLM72Lu4ELZebQEcHlw="; +}) diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index 578aad31440..8bcfd361954 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -1,12 +1,15 @@ { lib, stdenv, fetchurl, cmake -, curl, openssl, zlib +, curl, openssl, zlib, zstd , libiconv , version, hash, ... }: with lib; -stdenv.mkDerivation { +let + isVer33 = versionAtLeast version "3.3"; + +in stdenv.mkDerivation { pname = "mariadb-connector-c"; inherit version; @@ -43,7 +46,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ curl openssl zlib ]; + propagatedBuildInputs = [ curl openssl zlib ] ++ optional isVer33 zstd; buildInputs = [ libiconv ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66efa060df6..2c5ce62bae6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26770,9 +26770,11 @@ with pkgs; libmysqlclient = libmysqlclient_3_2; libmysqlclient_3_1 = mariadb-connector-c_3_1; libmysqlclient_3_2 = mariadb-connector-c_3_2; + libmysqlclient_3_3 = mariadb-connector-c_3_3; mariadb-connector-c = mariadb-connector-c_3_2; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; mariadb-connector-c_3_2 = callPackage ../servers/sql/mariadb/connector-c/3_2.nix { }; + mariadb-connector-c_3_3 = callPackage ../servers/sql/mariadb/connector-c/3_3.nix { }; mariadb-galera = callPackage ../servers/sql/mariadb/galera { }; |