cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #129239 from LeSuisse/trafficserver-9.0.2

Browse source 
trafficserver: 9.0.1 -> 9.0.2
This commit is contained in:
Sandro 2021-07-05 18:04:15 +02:00 committed by GitHub
commit 0928f8b0d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/tests/trafficserver.nix
View file

@ -104,6 +104,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
ats.wait_for_open_port(80) ats.wait_for_open_port(80)
httpbin.wait_for_unit("httpbin") httpbin.wait_for_unit("httpbin")
httpbin.wait_for_open_port(80) httpbin.wait_for_open_port(80)
client.wait_for_unit("network-online.target")
with subtest("Traffic Server is running"): with subtest("Traffic Server is running"):
out = ats.succeed("traffic_ctl server status") out = ats.succeed("traffic_ctl server status")

11
pkgs/servers/http/trafficserver/default.nix
View file

@ -49,11 +49,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "trafficserver"; pname = "trafficserver";
version = "9.0.1"; version = "9.0.2";
src = fetchurl { src = fetchurl {
url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";
sha256 = "1q164pvfmbqh3gzy3bqy96lwd0fdbhz78r06pd92p7rmkqwx005z"; sha256 = "0r05iqmnnjq259nsibncgfrfsr0l4h3hsafizvgfl9zgmrkm6izz";
}; };
patches = [ patches = [
@ -63,13 +63,6 @@ stdenv.mkDerivation rec {
url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff"; url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff";
sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150"; sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150";
}) })
# Fixes a bug in tspush which pushes incorrect contents to cache
# https://github.com/apache/trafficserver/pull/7696
(fetchpatch {
url = "https://github.com/apache/trafficserver/commit/b08215272872f452787915cd3a8e0b0ea0b88385.diff";
sha256 = "0axk8x1xvd8wvpgcxgyqqg7kgxyxwfgwmisq3xnk1da0cqv9cx9f";
})
]; ];
# NOTE: The upstream README indicates that flex is needed for some features, # NOTE: The upstream README indicates that flex is needed for some features,