Merge branch 'staging-next' into staging

Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
parent 98df4f6351 5b0398dc36
commit ded9a4b1aa
368 changed files with 5460 additions and 6226 deletions
@@ -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 ];