summary refs log tree commit diff
path: root/pkgs/servers/nosql
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-05-02 22:58:02 +0000
committerRobin Gloster <mail@glob.in>2016-05-02 22:58:02 +0000
commitc92bca56f8ea5623cf01952621455db308d0f330 (patch)
treef940e6e4fabd8e58b91fe885f9541205258023b2 /pkgs/servers/nosql
parent0fdde5efd08c036fe9d73b4e65f2ba9797053d0f (diff)
parent94520a25adc6b6bee799ec9dab344cfdad3f7180 (diff)
downloadnixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar
nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.gz
nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.bz2
nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.lz
nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.xz
nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.zst
nixlib-c92bca56f8ea5623cf01952621455db308d0f330.zip
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/servers/nosql')
-rw-r--r--pkgs/servers/nosql/cassandra/2.1.nix4
-rw-r--r--pkgs/servers/nosql/redis/default.nix3
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index d0f70a554f7e..6c09c977d29c 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -11,8 +11,8 @@
 
 let
 
-  version = "2.1.13";
-  sha256 = "09b3vf5jsv70xlfimj30v8l1zw7c5xdgpw5fpmn6jh8n3gigybqh";
+  version = "2.1.14";
+  sha256 = "168rg8gg1dhcjfjsr1jbfx4zj3zyqn0xi2z1j2c8jn6054486ybg";
 
 in
 
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 04bb9fc2bbde..16a2ec210794 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
   version = "3.0.7";
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "08vzfdr67gp3lvk770qpax2c5g2sx8hn6p64jn3jddrvxb2939xj";
   };
 
+  buildInputs = [ lua ];
   makeFlags = "PREFIX=$(out)";
 
   enableParallelBuilding = true;