Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 58e496e64915
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c48705f537ed
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 23, 2019

  1. mariadb-connector-c: 3.1.2 -> 3.1.4

    @Izorkin
    Izorkin committed Oct 23, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    joshka Josh McKinney
    GPG key ID: 722287396A903BC5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ffae858 View commit details

  2. Merge pull request #71776 from Izorkin/connector-c 

    mariadb-connector-c: 3.1.2 -> 3.1.4
    @globin
    globin authored Oct 23, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    EdJoPaTo
    SSH Key Fingerprint: aOC2f01/jxrnwyhPb8s1zuav5iGwQXpBXFh8yxMGK1Y
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c48705f View commit details
Showing with 4 additions and 7 deletions.
  1. +2 −2 pkgs/servers/sql/mariadb/connector-c/3_1.nix
  2. +2 −5 pkgs/servers/sql/mariadb/connector-c/default.nix
4 changes: 2 additions & 2 deletions pkgs/servers/sql/mariadb/connector-c/3_1.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:

callPackage ./. (args // {
version = "3.1.2";
sha256 = "0pgz8m8d39mvj9wnjll6c83xvdl2h24273b3dkx0g5pxj7ga4shm";
version = "3.1.4";
sha256 = "05jkaq151a45rqpyh0vrn6xcpawayfxyzhwn1w32hk0fw3z746ks";
})
7 changes: 2 additions & 5 deletions pkgs/servers/sql/mariadb/connector-c/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,9 +19,10 @@ stdenv.mkDerivation {
};

cmakeFlags = [
"-DWITH_EXTERNAL_ZLIB=ON"
"-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock"
"-DWITH_CURL=ON"
"-DWITH_EXTERNAL_ZLIB=ON"
"-DWITH_MYSQLCOMPAT=ON"
];

# The cmake setup-hook uses $out/lib by default, this is not the case here.
@@ -39,10 +40,6 @@ stdenv.mkDerivation {
ln -sv mariadb_config $out/bin/mysql_config
ln -sv mariadb $out/lib/mysql
ln -sv mariadb $out/include/mysql
ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a
ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a
ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so
ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so
'';

meta = {