diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-02 15:40:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 15:40:38 -0500 |
| commit | eeb016e8f0d8934dc33db7666d841e4b85713c9a (patch) | |
| tree | 4a99561053ba51db60a75389e483784543b105ff /pkgs/servers/sql | |
| parent | b4d9113fbf7ad3a09f5caa8f8fc4a9229128f1e5 (diff) | |
| parent | 3513034208aac88004e4798020cb66540a77ddad (diff) | |
| download | nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.gz nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.bz2 nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.lz nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.xz nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.zst nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.zip | |
Merge branch 'staging' into fix-ncurses-darwin-extensions
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a9de5508371a..63425fbb28c2 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -167,11 +167,11 @@ everything = stdenv.mkDerivation (common // { connector-c = stdenv.mkDerivation rec { name = "mariadb-connector-c-${version}"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "1g1sq5knarxkfhpkcczr6qxmq12pid65cdkqnhnfs94av89hbswb"; + sha256 = "0vvlfs56hxin130vh8pcs5w7jpv1yc6g76bhpzg88hnp4v1z8frg"; name = "mariadb-connector-c-${version}-src.tar.gz"; }; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a2093962ea93..5d348c129437 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -75,6 +75,8 @@ let wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin ''; + doInstallCheck = false; # needs a running daemon? + disallowedReferences = [ stdenv.cc ]; passthru = { |