diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2024-01-15 19:21:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-15 19:21:54 +0100 |
| commit | 31e067a257eababde09b5b991ee31cf0fd20d6f7 (patch) | |
| tree | 2eab383dcdb7a4c3e392b331d831741c3f96d370 /pkgs/servers/nosql | |
| parent | 9544e59093c220a6c66dddaff32ab8b278c98625 (diff) | |
| parent | 5cd9b0a6ba85d41061779de6b11d0d079cda0804 (diff) | |
| download | nixlib-31e067a257eababde09b5b991ee31cf0fd20d6f7.tar nixlib-31e067a257eababde09b5b991ee31cf0fd20d6f7.tar.gz nixlib-31e067a257eababde09b5b991ee31cf0fd20d6f7.tar.bz2 nixlib-31e067a257eababde09b5b991ee31cf0fd20d6f7.tar.lz nixlib-31e067a257eababde09b5b991ee31cf0fd20d6f7.tar.xz nixlib-31e067a257eababde09b5b991ee31cf0fd20d6f7.tar.zst nixlib-31e067a257eababde09b5b991ee31cf0fd20d6f7.zip | |
Merge pull request #281035 from SuperSandro2000/redis
redis: fix oom-score-adj test due to no permission
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 8fd23ae186c4..923de9126b5f 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, lua, jemalloc, pkg-config, nixosTests +{ lib, stdenv, fetchurl, fetchpatch, lua, jemalloc, pkg-config, nixosTests , tcl, which, ps, getconf , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd # dependency ordering is broken at the moment when building with openssl @@ -19,7 +19,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-jRBMJqFUsp/WfWVotPN1ISISrUHgwsqj1mSA5429O1k="; }; - patches = lib.optionals useSystemJemalloc [ + patches = [ + # fixes: make test [exception]: Executing test client: permission denied + # https://github.com/redis/redis/issues/12792 + (fetchpatch { + url = "https://github.com/redis/redis/pull/12887.diff"; + hash = "sha256-VZEMShW7Ckn5hLJHffQvE94Uly41WZW1bwvxny+Y3W8="; + }) + ] ++ lib.optionals useSystemJemalloc [ # use system jemalloc (fetchurl { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch"; |