diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2021-02-26 10:25:13 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2021-02-26 10:25:13 +0100 |
| commit | c456a2512f7a7558cbe25328a423762033822cc0 (patch) | |
| tree | d64f521751037012a1c4d05fedeb485eeee39b05 /pkgs/servers/nosql | |
| parent | babf9d6100c3e5dcdbbbe8850de99d3fe2b3cf86 (diff) | |
| parent | 6d7128414cf2763ab14f31365c21c6cec3547dac (diff) | |
| download | nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.gz nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.bz2 nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.lz nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.xz nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.zst nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 9eac9e2f256..e35aac3be1b 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; @@ -44,7 +46,8 @@ stdenv.mkDerivation rec { homepage = "https://redis.io"; description = "An open source, advanced key-value store"; license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ berdario globin ]; + platforms = platforms.all; + changelog = "https://github.com/redis/redis/raw/${version}/00-RELEASENOTES"; + maintainers = with maintainers; [ berdario globin marsam ]; }; } |