Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.11] redict: 7.3.0 -> 7.3.2 #374779

Merged
merged 1 commit into from
Jan 19, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions pkgs/by-name/re/redict/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@

stdenv.mkDerivation (finalAttrs: {
pname = "redict";
version = "7.3.0";
version = "7.3.2";

src = fetchFromGitea {
domain = "codeberg.org";
owner = "redict";
repo = "redict";
rev = finalAttrs.version;
hash = "sha256-vtDb+VqDAtrce6dpDRnPO6N9Z6dFfy8fUUqNeiZ+r5c=";
hash = "sha256-MY4OWoYQ4a5efqcUTN6lNL/kd1VrJ/OBqKw27cQ5WC8=";
};

patches = lib.optionals useSystemJemalloc [
Expand All @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals tlsSupport [ openssl ];

preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/Makefile --replace "-flto" ""
substituteInPlace src/Makefile --replace-fail "-flto" ""
'';

# More cross-compiling fixes.
Expand All @@ -73,21 +73,23 @@ stdenv.mkDerivation (finalAttrs: {

# darwin currently lacks a pure `pgrep` which is extensively used here
doCheck = !stdenv.hostPlatform.isDarwin;

nativeCheckInputs = [
which
tcl
ps
] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ];

checkPhase = ''
runHook preCheck
# disable test "Connect multiple replicas at the same time": even
# upstream find this test too timing-sensitive
substituteInPlace tests/integration/replication.tcl \
--replace 'foreach mdl {no yes}' 'foreach mdl {}'
--replace-fail "foreach mdl {no yes}" "foreach mdl {}"
substituteInPlace tests/support/server.tcl \
--replace 'exec /usr/bin/env' 'exec env'
--replace-fail "exec /usr/bin/env" "exec env"
sed -i '/^proc wait_load_handlers_disconnected/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \
tests/support/util.tcl
Expand All @@ -104,13 +106,13 @@ stdenv.mkDerivation (finalAttrs: {

passthru.tests.redict = nixosTests.redict;

meta = with lib; {
meta = {
homepage = "https://redict.io";
description = "Distributed key/value store";
license = licenses.lgpl3Only;
platforms = platforms.all;
license = lib.licenses.lgpl3Only;
platforms = lib.platforms.all;
changelog = "https://codeberg.org/redict/redict/releases/tag/${finalAttrs.version}";
maintainers = with maintainers; [ yuka ];
maintainers = with lib.maintainers; [ yuka ];
mainProgram = "redict-cli";
};
})