about summary refs log tree commit diff
path: root/pkgs/servers/http/trafficserver
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2021-11-19 09:07:35 +0000
committerSergei Trofimovich <slyich@gmail.com>2021-11-19 09:14:08 +0000
commit2ea5321fb97433503844e40aa96b7d4d5ca9f5b6 (patch)
treeb3e59308c00b34d6265044b7f3ee7b76372cfe45 /pkgs/servers/http/trafficserver
parent293e6f0ce5e0db0cbc7ba783c0b3ff31293f3d8f (diff)
downloadnixlib-2ea5321fb97433503844e40aa96b7d4d5ca9f5b6.tar
nixlib-2ea5321fb97433503844e40aa96b7d4d5ca9f5b6.tar.gz
nixlib-2ea5321fb97433503844e40aa96b7d4d5ca9f5b6.tar.bz2
nixlib-2ea5321fb97433503844e40aa96b7d4d5ca9f5b6.tar.lz
nixlib-2ea5321fb97433503844e40aa96b7d4d5ca9f5b6.tar.xz
nixlib-2ea5321fb97433503844e40aa96b7d4d5ca9f5b6.tar.zst
nixlib-2ea5321fb97433503844e40aa96b7d4d5ca9f5b6.zip
trafficserver: pull upstream fix for ncurses-6.3
Without this change the build fails on ncurses-6.3 as:

    traffic_top/traffic_top.cc:146:13:
        error: format not a string literal and no format arguments [-Werror=format-security]
      146 |     mvprintw(my_y, x, prettyName.c_str());
          |     ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Diffstat (limited to 'pkgs/servers/http/trafficserver')
-rw-r--r--pkgs/servers/http/trafficserver/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix
index e7ce72e086e1..eb4af7bf4918 100644
--- a/pkgs/servers/http/trafficserver/default.nix
+++ b/pkgs/servers/http/trafficserver/default.nix
@@ -63,6 +63,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff";
       sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150";
     })
+
+    # Fix build against ncurses-6.3:
+    #  https://github.com/apache/trafficserver/pull/8437
+    (fetchpatch {
+      url = "https://github.com/apache/trafficserver/commit/66c86c6b082903a92b9db33c60e3ed947e77d540.patch";
+      sha256 = "1hgpp80xnnjr4k5i6gcllrb7dw4q4xcdrkwxpc1xk2np5cbyxd16";
+    })
   ];
 
   # NOTE: The upstream README indicates that flex is needed for some features,