Unverified Commit 8528f327 authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

varnish75: init at 7.5.0 (#308604) 

Changes: https://varnish-cache.org/docs/7.5/whats-new/changes-7.5.html
parent aa5879d2

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -994,6 +994,7 @@ in { 
  v2ray = handleTest ./v2ray.nix {};

  varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };

  varnish74 = handleTest ./varnish.nix { package = pkgs.varnish74; };

  varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; };

  vault = handleTest ./vault.nix {};

  vault-agent = handleTest ./vault-agent.nix {};

  vault-dev = handleTest ./vault-dev.nix {};

pkgs/servers/varnish/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -61,4 +61,9 @@ in 
    version = "7.4.3";

    hash = "sha256-655DUH+Dbu8uMoAtRt08+S7KPVR7pLZA/aWbQHzbG4g=";

  };

  # EOL 2025-03-15

  varnish75 = common {

    version = "7.5.0";

    hash = "sha256-/KYbmDE54arGHEVG0SoaOrmAfbsdgxRXHjFIyT/3K10=";

  };

}

pkgs/servers/varnish/modules.nix

+8 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, docutils, removeReferencesTo }:

let

  common = { version, sha256, extraNativeBuildInputs ? [] }:

  common = { version, hash, extraNativeBuildInputs ? [] }:

    stdenv.mkDerivation rec {

      pname = "${varnish.name}-modules";

      inherit version;
@@ -9,7 +9,7 @@ let 
        owner = "varnish";

        repo = "varnish-modules";

        rev = version;

        inherit sha256;

        inherit hash;

      };



      nativeBuildInputs = [
@@ -39,10 +39,14 @@ in 
{

  modules15 = common {

    version = "0.15.1";

    sha256 = "1lwgjhgr5yw0d17kbqwlaj5pkn70wvaqqjpa1i0n459nx5cf5pqj";

    hash = "1lwgjhgr5yw0d17kbqwlaj5pkn70wvaqqjpa1i0n459nx5cf5pqj";

  };

  modules23 = common {

    version = "0.23.0";

    sha256 = "sha256-Dd1pLMmRC59iRRpReDeQJ8Sv00ojb8InvaMrb+iRv4I=";

    hash = "sha256-Dd1pLMmRC59iRRpReDeQJ8Sv00ojb8InvaMrb+iRv4I=";

  };

  modules24 = common {

    version = "0.24.0";

    hash = "sha256-2MfcrhhkBz9GyQxEWzjipdn1CBEqnCvC3t1G2YSauak=";

  };

}

pkgs/servers/varnish/packages.nix

+5 −1
Original line number Diff line number Diff line 
{ callPackages, callPackage, varnish60, varnish74, fetchFromGitHub }: {

{ callPackages, callPackage, varnish60, varnish74, varnish75, fetchFromGitHub }: {

  varnish60Packages = rec {

    varnish = varnish60;

    modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
@@ -17,4 +17,8 @@ 
    varnish = varnish74;

    modules = (callPackages ./modules.nix { inherit varnish; }).modules23;

  };

  varnish75Packages = rec {

    varnish = varnish75;

    modules = (callPackages ./modules.nix { inherit varnish; }).modules24;

  };

}

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -14618,9 +14618,9 @@ with pkgs; 
  valum = callPackage ../development/web/valum { };















  inherit (callPackages ../servers/varnish { })













    varnish60 varnish74;













    varnish60 varnish74 varnish75;















  inherit (callPackages ../servers/varnish/packages.nix { })













    varnish60Packages varnish74Packages;













    varnish60Packages varnish74Packages varnish75Packages;





























  varnishPackages = varnish74Packages;















  varnish = varnishPackages.varnish;