From 2ff821ed779db5540932238fc273f52cc538ac74 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 23 Feb 2021 04:20:00 +0000 Subject: [PATCH 1/3] redis: 6.0.10 -> 6.2.0 https://github.com/redis/redis/blob/6.2.0/00-RELEASENOTES --- pkgs/servers/nosql/redis/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 9eac9e2f256..d4b4dd94878 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, lua, pkg-config, systemd, jemalloc, nixosTests +{ lib, stdenv, fetchurl, lua, pkg-config, systemd, nixosTests , tlsSupport ? true, openssl }: stdenv.mkDerivation rec { - version = "6.0.10"; pname = "redis"; + version = "6.2.0"; src = fetchurl { - url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "1gc529nfh8frk4pynyjlnmzvwa0j9r5cmqwyd7537sywz6abifvr"; + url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; + sha256 = "1jnv6acjlljvrlxmz0mqarsx1fl5vwss24l8zy5dcawnbp129mk7"; }; # Cross-compiling fixes @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-std=c11" ]; + doCheck = false; # needs tcl passthru.tests.redis = nixosTests.redis; From b5d02a4182dd6e840b8a023dad11cd8b0e06bef9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 23 Feb 2021 04:20:00 +0000 Subject: [PATCH 2/3] redis: update meta --- pkgs/servers/nosql/redis/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index d4b4dd94878..b685a6f2127 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -46,7 +46,8 @@ stdenv.mkDerivation rec { homepage = "https://redis.io"; description = "An open source, advanced key-value store"; license = licenses.bsd3; - platforms = platforms.unix; + platforms = platforms.all; + changelog = "https://github.com/redis/redis/raw/${version}/00-RELEASENOTES"; maintainers = with maintainers; [ berdario globin ]; }; } From 806a797463587fcf06de069e27cce43c362b3b95 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 23 Feb 2021 04:20:00 +0000 Subject: [PATCH 3/3] redis: add marsam to maintainers --- pkgs/servers/nosql/redis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index b685a6f2127..e35aac3be1b 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; changelog = "https://github.com/redis/redis/raw/${version}/00-RELEASENOTES"; - maintainers = with maintainers; [ berdario globin ]; + maintainers = with maintainers; [ berdario globin marsam ]; }; }