diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
| commit | ded9a4b1aa68b8645271a63e9543ef56177ae642 (patch) | |
| tree | d351102a17ab05c6e263e970f43ab3b30561112e /pkgs/servers/nosql | |
| parent | 98df4f635136e63644cb0ab646b55d60cbb444a4 (diff) | |
| parent | 5b0398dc36ce5746d8d54e04a1dfcab25939484a (diff) | |
| download | nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.gz nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.bz2 nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.lz nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.xz nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.zst nixlib-ded9a4b1aa68b8645271a63e9543ef56177ae642.zip | |
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/nosql/riak/2.2.0.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 51df7c18a1e6..ab2ff85939f6 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.10"; + version = "4.0.11"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "194cydhv3hf4v95ifvjvsqrs4jn3ffrkg5lvxj5d3y04lwsp9dhx"; + sha256 = "1fqvxlpaxr80iykyvpf1fia8rxh4zz8paf5nnjncsssqwwxfflzw"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index b041aa9f35fc..a09b4543cbbe 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -92,5 +92,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cstrahan mdaiter ]; description = "Dynamo inspired NoSQL DB by Basho"; platforms = [ "x86_64-linux" ]; + license = licenses.asl20; }; } |