Unverified Commit 2b6a58a6 authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

Merge pull request #208014 from LeSuisse/trafficserver-9.1.4 

trafficserver: 9.1.3 -> 9.1.4
parents e58a7747 ede90bb8

nixos/tests/trafficserver.nix

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { 
        assert re.fullmatch(expected, out) is not None, "no matching logs"



        out = json.loads(ats.succeed(f"traffic_logstats -jf {access_log_path}"))

        assert isinstance(out, dict)

        assert out["total"]["error.total"]["req"] == "0", "unexpected log stat"

  '';

})

pkgs/servers/http/trafficserver/default.nix

+2 −9
Original line number Diff line number Diff line
@@ -50,11 +50,11 @@ 


stdenv.mkDerivation rec {

  pname = "trafficserver";

  version = "9.1.3";

  version = "9.1.4";



  src = fetchzip {

    url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";

    sha256 = "sha256-Ihhsbn4PvIjWskmbWKajThIwtuiEyldBpmtuQ8RdyHA=";

    sha256 = "sha256-+iq+z+1JE6JE6OLcUwRRAe2/EISqb6Ax6pNm8GcB7bc=";

  };



  patches = [
@@ -107,10 +107,6 @@ stdenv.mkDerivation rec { 
      tools/check-unused-dependencies



    substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file'



    # TODO: remove after the following change has been released

    # https://github.com/apache/trafficserver/pull/8683

    cp ${catch2}/include/catch2/catch.hpp tests/include/catch.hpp

  '' + lib.optionalString stdenv.isLinux ''

    substituteInPlace configure \

      --replace '/usr/include/linux' '${linuxHeaders}/include/linux'
@@ -125,9 +121,6 @@ stdenv.mkDerivation rec { 
    "--enable-experimental-plugins"

    (lib.enableFeature enableWCCP "wccp")



    # the configure script can't auto-locate the following from buildInputs

    "--with-lzma=${xz.dev}"

    "--with-zlib=${zlib.dev}"

    (lib.withFeatureAs withHiredis "hiredis" hiredis)

  ];