public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' into fix-ncurses-darwin-extensions

Browse Source
This commit is contained in:
Matthew Justin Bauer
2018-05-02 15:40:38 -05:00
committed by GitHub
parent b4d9113fbf 3513034208
commit eeb016e8f0
251 changed files with 2068 additions and 1387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/sql/mariadb/default.nix
View File

@@ -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";
};

2
pkgs/servers/sql/postgresql/default.nix
View File

@@ -75,6 +75,8 @@ let
wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
'';
doInstallCheck = false; # needs a running daemon?
disallowedReferences = [ stdenv.cc ];
passthru = {