Commit da682172 authored by Oliver Schmidt's avatar Oliver Schmidt
Browse files

varnish[Packages]80: init at 8.0.1 

uses varnish-modules 0.27
parent a4b3c269

nixos/tests/all-tests.nix

+4 −0
Original line number Diff line number Diff line
@@ -1729,6 +1729,10 @@ in 
    imports = [ ./varnish.nix ];

    _module.args.package = pkgs.varnish77;

  };

  varnish80 = runTest {

    imports = [ ./varnish.nix ];

    _module.args.package = pkgs.varnish80;

  };

  vault = runTest ./vault.nix;

  vault-agent = runTest ./vault-agent.nix;

  vault-dev = runTest ./vault-dev.nix;

pkgs/servers/varnish/default.nix

+26 −14
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ let 
      buildFlags = [ "localstatedir=/var/run" ];



      patches =

        lib.optionals (stdenv.isDarwin && lib.versionAtLeast version "7.7") [

        lib.optionals

          (stdenv.isDarwin && lib.versionAtLeast version "7.7" && lib.versionOlder version "8.0")

          [

            # Fix VMOD section attribute on macOS

            # Unreleased commit on master

            (fetchpatch2 {
@@ -85,8 +87,12 @@ let 
          ./patches/0002-fix-duplicate-os-code-definitions-on-macos.patch

        ];



      postPatch = ''

      postPatch =

        lib.optionalString (lib.versionOlder version "8.0") ''

          substituteInPlace bin/varnishtest/vtc_main.c --replace-fail /bin/rm "${coreutils}/bin/rm"

        ''

        + lib.optionalString (lib.versionAtLeast version "8.0") ''

          substituteInPlace bin/varnishtest/vtest2/src/vtc_main.c --replace-fail /bin/rm "${coreutils}/bin/rm"

        '';



      postConfigure = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
@@ -144,6 +150,7 @@ let 
        knownVulnerabilities = lib.optionals (lib.versions.major version == "7") [

          "VSV00018: https://vinyl-cache.org/security/VSV00018.html"

        ];

        broken = stdenv.isDarwin && version == "8.0.1"; # https://github.com/NixOS/nixpkgs/issues/495368

      };

    };

in
@@ -158,4 +165,9 @@ in 
    version = "7.7.3";

    hash = "sha256-6W7q/Ez+KlWO0vtU8eIr46PZlfRvjADaVF1YOq74AjY=";

  };

  # EOL 2026-09-15

  varnish80 = common {

    version = "8.0.1";

    hash = "sha256-n1oi1YrNvqw3GhY9683TYSG+XuS8hKoYfrfNDDGP5oI=";

  };

}

pkgs/servers/varnish/modules.nix

+5 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ let 
      src = fetchFromGitHub {

        owner = "varnish";

        repo = "varnish-modules";

        rev = version;

        tag = version;

        inherit hash;

      };
@@ -59,4 +59,8 @@ in 
    version = "0.26.0";

    hash = "sha256-xKMOkqm6/GoBve0AhPqyVMQv/oh5Rtj6uCeg/yId7BU=";

  };

  modules27 = common {

    version = "0.27.0";

    hash = "sha256-1hE+AKsC6Td+Al7LFN6bgPicU8dtWd3A8PP7VKZLvYM=";

  };

}

pkgs/servers/varnish/packages.nix

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  callPackage,

  varnish60,

  varnish77,

  varnish80,

  lib,

}:

{
@@ -24,4 +25,8 @@ 
    varnish = varnish77;

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

  };

  varnish80Packages = lib.recurseIntoAttrs rec {

    varnish = varnish80;

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

  };

}

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -3600,10 +3600,12 @@ with pkgs; 
  inherit (callPackages ../servers/varnish { })

    varnish60

    varnish77

    varnish80

    ;

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

    varnish60Packages

    varnish77Packages

    varnish80Packages

    ;

  varnishPackages = varnish77Packages;

  varnish = varnishPackages.varnish;