diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/nosql/rethinkdb/default.nix | 36 | ||||
-rw-r--r-- | pkgs/servers/squid/squids.nix | 4 |
2 files changed, 38 insertions, 2 deletions
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix new file mode 100644 index 000000000000..e81ccb396322 --- /dev/null +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, which, protobuf, v8, ncurses, gperftools, boost, m4 }: + +stdenv.mkDerivation rec { + name = "rethinkdb-1.11.2"; + + src = fetchurl { + url = "http://download.rethinkdb.com/dist/${name}.tgz"; + sha256 = "04wz07y891vygc5ksrvkk1ch05xj16nahv20bnxwcllkbl4gf9lj"; + }; + + preConfigure = '' + export ALLOW_WARNINGS=1 + patchShebangs . + ''; + + configureFlags = "--lib-path ${gperftools}/lib"; + + buildInputs = [ protobuf v8 ncurses boost ]; + + nativeBuildInputs = [ which m4 ]; + + + meta = { + description = "An open-source distributed database built with love"; + longDescription = '' + RethinkDB is built to store JSON documents, and scale to multiple machines with very little + effort. It has a pleasant query language that supports really useful queries like table joins + and group by, and is easy to setup and learn. + ''; + homepage = http://www.rethinkdb.com; + license = "AGPLv3"; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index a94c05d5627e..a41343c0cf90 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -30,10 +30,10 @@ rec { }; squid32 = squid30.merge rec { - name = "squid-3.2.2"; + name = "squid-3.2.13"; src = args.fetchurl { url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2"; - sha256 = "13jlx3d6rqq7ajxs8bgn8a0mh932jhq6aa8032q205nxnhqs0l4l"; + sha256 = "0dafqv00dr3nyrm9k47d6r7gv2r3f9hjd1ykl3kkvjca11r4n54j"; }; buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2 libtool openssl]; |