Unverified Commit bfc5d57d authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #259886 from RaitoBezarius/drop-varnish

parents ebcece91 6e45bee3

nixos/doc/manual/release-notes/rl-2311.section.md

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ 


- `odoo` now defaults to 16, updated from 15.



- `varnish` was upgraded from 7.2.x to 7.4.x, see https://varnish-cache.org/docs/7.3/whats-new/upgrading-7.3.html and https://varnish-cache.org/docs/7.4/whats-new/upgrading-7.4.html for upgrade notes. The current LTS version is still offered as `varnish60`.



- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.



- `services.keyd` changed API. Now you can create multiple configuration files.

nixos/tests/all-tests.nix

+1 −2
Original line number Diff line number Diff line
@@ -856,8 +856,7 @@ in { 
  uwsgi = handleTest ./uwsgi.nix {};

  v2ray = handleTest ./v2ray.nix {};

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

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

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

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

  vault = handleTest ./vault.nix {};

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

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

pkgs/servers/varnish/default.nix

+5 −10
Original line number Diff line number Diff line
@@ -51,19 +51,14 @@ let 
    };

in

{

  # EOL TBA

  # EOL (LTS) TBA

  varnish60 = common {

    version = "6.0.11";

    hash = "sha256-UVkA2+tH/9MOs5BlyuAzFnmD7Pm9A6lDWic2B+HRKNs=";

  };

  # EOL 2023-09-15

  varnish72 = common {

    version = "7.2.1";

    hash = "sha256-TZN9FyCo7BnFM/ly2TA6HJiJt7/KdDeJOuXCfPIEqUA=";

  };

  # EOL 2024-03-15

  varnish73 = common {

    version = "7.3.0";

    hash = "sha256-4tu7DsJwqQZHw4aGbm4iaZOu1G5I3nUacruBlzfxSuc=";

  # EOL 2024-09-15

  varnish74 = common {

    version = "7.4.1";

    hash = "sha256-h02Deq9JuPJxjLYLjIx5AOnqEMJk8hjIjNZy1Zb0uJ8=";

  };

}

pkgs/servers/varnish/modules.nix

+3 −7
Original line number Diff line number Diff line
@@ -41,12 +41,8 @@ in 
    version = "0.15.1";

    sha256 = "1lwgjhgr5yw0d17kbqwlaj5pkn70wvaqqjpa1i0n459nx5cf5pqj";

  };

  modules20 = common {

    version = "0.20.0";

    sha256 = "sha256-3eH3qCa24rWqYXsTTDmm/9LjBMxcxUuozuRzZ3e8cUo=";

  };

  modules22 = common {

    version = "0.22.0";

    sha256 = "sha256-eoa6i6AuOS4pxQKA/lbJnwFc39cRiLqnBSpPM4Oitrc=";

  modules23 = common {

    version = "0.23.0";

    sha256 = "sha256-Dd1pLMmRC59iRRpReDeQJ8Sv00ojb8InvaMrb+iRv4I=";

  };

}

pkgs/servers/varnish/packages.nix

+4 −8
Original line number Diff line number Diff line 
{ callPackages, callPackage, varnish60, varnish72, varnish73, fetchFromGitHub }: {

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

  varnish60Packages = rec {

    varnish = varnish60;

    modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
@@ -13,12 +13,8 @@ 
      sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";

    };

  };

  varnish72Packages = rec {

    varnish = varnish72;

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

  };

  varnish73Packages = rec {

    varnish = varnish73;

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

  varnish74Packages = rec {

    varnish = varnish74;

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

  };

}