rethinkdb: 2.3.4 -> 2.3.5

This commit is contained in:
rushmorem 2016-08-31 13:31:04 +02:00
parent 5d61c42d6b
commit ac26d8ff43
2 changed files with 27 additions and 3 deletions

View File

@ -1,14 +1,15 @@
{ stdenv, fetchurl, which, m4, python { stdenv, fetchurl, which, m4, python
, protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool , protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool
, pythonPackages, makeWrapper
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rethinkdb-${version}"; name = "rethinkdb-${version}";
version = "2.3.4"; version = "2.3.5";
src = fetchurl { src = fetchurl {
url = "https://download.rethinkdb.com/dist/${name}.tgz"; url = "https://download.rethinkdb.com/dist/${name}.tgz";
sha256 = "19z1m4r1mqnbia207q0nvs39rn7jk8zsr2rvps2d11fp3ryr59wk"; sha256 = "047fz3r0rn95mqr5p1xfdprf0hq4avq2a1q8zsdifxxid7hyx2nx";
}; };
postPatch = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
"--lib-path=${jemalloc}/lib" "--lib-path=${jemalloc}/lib"
]; ];
buildInputs = [ protobuf boost zlib curl openssl icu ] buildInputs = [ protobuf boost zlib curl openssl icu makeWrapper ]
++ stdenv.lib.optional (!stdenv.isDarwin) jemalloc ++ stdenv.lib.optional (!stdenv.isDarwin) jemalloc
++ stdenv.lib.optional stdenv.isDarwin libtool; ++ stdenv.lib.optional stdenv.isDarwin libtool;
@ -36,6 +37,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = ''
wrapProgram $out/bin/rethinkdb \
--prefix PATH ":" "${pythonPackages.rethinkdb}/bin"
'';
meta = { meta = {
description = "An open-source distributed database built with love"; description = "An open-source distributed database built with love";
longDescription = '' longDescription = ''

View File

@ -8365,6 +8365,24 @@ in modules // {
}; };
}; };
rethinkdb = buildPythonPackage rec {
name = "rethinkdb-${version}";
version = "2.3.0.post6";
src = pkgs.fetchurl {
url = "mirror://pypi/r/rethinkdb/${name}.tar.gz";
sha256 = "05qwkmq6kn437ywyjs02jxbry720gw39q4z4jdb0cnbbi76lwddm";
};
doCheck = false;
meta = {
description = "Python driver library for the RethinkDB database server";
homepage = "https://pypi.python.org/pypi/rethinkdb";
license = licenses.agpl3;
};
};
roman = buildPythonPackage rec { roman = buildPythonPackage rec {
version = "2.0.0"; version = "2.0.0";
name = "roman-${version}"; name = "roman-${version}";