Merge staging-next into staging

2021-05-03 12:26:48 +00:00
parent cdbc90b67a 4373197059
commit a4c3a2d732
54 changed files with 5375 additions and 722 deletions
@@ -414,6 +414,7 @@ in
  # traefik test relies on docker-containers
  trac = handleTest ./trac.nix {};
  traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {};
+  trafficserver = handleTest ./trafficserver.nix {};
  transmission = handleTest ./transmission.nix {};
  trezord = handleTest ./trezord.nix {};
  trickster = handleTest ./trickster.nix {};