diff options
| author | Dario Bertini <dario.bertini@nccgroup.trust> | 2015-06-22 12:20:02 +0100 |
|---|---|---|
| committer | Dario Bertini <dario.bertini@nccgroup.trust> | 2015-06-22 12:20:02 +0100 |
| commit | 1e40c2347abec5d087ecdfc0eb6f792473e6c0d9 (patch) | |
| tree | 9fe34a3033a987d0ebbe0261d146f8b096f38003 /pkgs/servers/nosql | |
| parent | 0ed91e1c4dc37b74943a076b972be33a58d13c18 (diff) | |
| parent | 88f4b75a00855c878624e465e1a83930aaa92858 (diff) | |
| download | nixlib-1e40c2347abec5d087ecdfc0eb6f792473e6c0d9.tar nixlib-1e40c2347abec5d087ecdfc0eb6f792473e6c0d9.tar.gz nixlib-1e40c2347abec5d087ecdfc0eb6f792473e6c0d9.tar.bz2 nixlib-1e40c2347abec5d087ecdfc0eb6f792473e6c0d9.tar.lz nixlib-1e40c2347abec5d087ecdfc0eb6f792473e6c0d9.tar.xz nixlib-1e40c2347abec5d087ecdfc0eb6f792473e6c0d9.tar.zst nixlib-1e40c2347abec5d087ecdfc0eb6f792473e6c0d9.zip | |
Fix conflict, Merge branch 'master' of github.com:NixOS/nixpkgs into redis-3.0.2
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/cassandra/2.0.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/nosql/cassandra/2.1.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/nosql/mongodb/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/nosql/rethinkdb/default.nix | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix index a0392d0f95ab..4f27452a0653 100644 --- a/pkgs/servers/nosql/cassandra/2.0.nix +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir $out diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index bbac243c7a02..94f920ffe11d 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -10,8 +10,8 @@ let - version = "2.1.5"; - sha256 = "1zrnmwyxcrdphcbi82ps0qp81yrn1gny4iv2wa4n4mwwp8pqwxid"; + version = "2.1.6"; + sha256 = "1xq96h33f4xmld114mrd57z396f9ykcj0xy50fnnhy5mhafkn4n2"; in @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir $out diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index a465d1c4a592..153f2f584d1e 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; -let version = "3.0.3"; +let version = "3.0.4"; system-libraries = [ "pcre" "wiredtiger" @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "01q8fas8afch50h4kjdrdrcrb1qx243wafz6zdsbc2waq60mlxjp"; + sha256 = "0q23hvi0axc14s1ah1p67rxvi36skw34kj9ahpijx2dd2a5smrvd"; }; nativeBuildInputs = [ scons ]; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 79343b044836..2f47d542d00e 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "rethinkdb-${version}"; - version = "2.0.0-1"; + version = "2.0.3"; src = fetchurl { url = "http://download.rethinkdb.com/dist/${name}.tgz"; - sha256 = "0fbxs6gmlmgkbfrmi0f4xyr3vqwylr6i7fa4p68y12qy6kv7q9pc"; + sha256 = "1580h5clkw8kprdb9waaf8al3wa2vj5d2l2m394r91fq45ss23sd"; }; preConfigure = '' |