summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-07-05 18:04:15 +0200
committerGitHub <noreply@github.com>2021-07-05 18:04:15 +0200
commit0928f8b0d3e2d8f4719d5e8b056801daf0a50f78 (patch)
tree576ee60febd59d5bbe884fbd1933adc66b2fefae /pkgs
parentbf498746d3e378248cb25cb2610432e24daa06ce (diff)
parentd41e86c67ff65b898be3952bf66f803a121cd083 (diff)
downloadnixpkgs-0928f8b0d3e2d8f4719d5e8b056801daf0a50f78.tar
nixpkgs-0928f8b0d3e2d8f4719d5e8b056801daf0a50f78.tar.gz
nixpkgs-0928f8b0d3e2d8f4719d5e8b056801daf0a50f78.tar.bz2
nixpkgs-0928f8b0d3e2d8f4719d5e8b056801daf0a50f78.tar.lz
nixpkgs-0928f8b0d3e2d8f4719d5e8b056801daf0a50f78.tar.xz
nixpkgs-0928f8b0d3e2d8f4719d5e8b056801daf0a50f78.tar.zst
nixpkgs-0928f8b0d3e2d8f4719d5e8b056801daf0a50f78.zip
Merge pull request #129239 from LeSuisse/trafficserver-9.0.2
trafficserver: 9.0.1 -> 9.0.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/http/trafficserver/default.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix
index 4a7f9854d18..e7ce72e086e 100644
--- a/pkgs/servers/http/trafficserver/default.nix
+++ b/pkgs/servers/http/trafficserver/default.nix
@@ -49,11 +49,11 @@
 
 stdenv.mkDerivation rec {
   pname = "trafficserver";
-  version = "9.0.1";
+  version = "9.0.2";
 
   src = fetchurl {
     url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";
-    sha256 = "1q164pvfmbqh3gzy3bqy96lwd0fdbhz78r06pd92p7rmkqwx005z";
+    sha256 = "0r05iqmnnjq259nsibncgfrfsr0l4h3hsafizvgfl9zgmrkm6izz";
   };
 
   patches = [
@@ -63,13 +63,6 @@ stdenv.mkDerivation rec {
       url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff";
       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,