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

Merge branch 'master' into staging-next

Browse Source 
Hydra: ?compare=1474536
This commit is contained in:
Vladimír Čunát
2018-08-20 09:15:33 +02:00
parent ae2cf7c008 6755ab8b34
commit 153a19df05
187 changed files with 3389 additions and 1528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/sql/mariadb/default.nix
+2 -2
View File
@@ -22,14 +22,14 @@ galeraLibs = buildEnv {
};
common = rec { # attributes common to both builds
version = "10.2.16";
version = "10.2.17";
src = fetchurl {
urls = [
"https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
"https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
];
sha256 = "1i2dwpp96ywjk147qqpcad8vqcy4rxmfbv2cb8ww3sffpa9yx0n1";
sha256 = "09xy6mgnz22mz8zgqlnddn8nzgs9xlz8lai4a7aa8x78in7hgcz7";
name = "mariadb-${version}.tar.gz";
};
pkgs/servers/sql/pgbouncer/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pgbouncer-${version}";
version = "1.8.1";
version = "1.9.0";
src = fetchurl {
url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz";
sha256 = "1j4d7rkivg3vg27pvirigq9cy4v7pi48x7w57baq131c5lmdx2zs";
sha256 = "012zh9l68r1ramrd66yam6y3al0i85dvvg4wwwkn6qwq6dhskv1r";
};
buildInputs = [ libevent openssl ];
pkgs/servers/sql/postgresql/pgroonga/default.nix
+4 -4
View File
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, pkgconfig, postgresql, libmsgpack, groonga }:
{ stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }:
stdenv.mkDerivation rec {
name = "pgroonga-${version}";
version = "2.0.6";
version = "2.0.9";
src = fetchurl {
url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz";
sha256 = "1hfmz3d0xwhsa4vw8i08s15i7pfd0h0smi2rv663x3cjjjn40i68";
sha256 = "0dfkhl2im4cn2lczbsvb8zyylrzlm0vqk9ixjsalcaqxgxph2dpz";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ postgresql libmsgpack groonga ];
buildInputs = [ postgresql msgpack groonga ];
makeFlags = [ "HAVE_MSGPACK=1" ];