b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #200201 from helsinki-systems/upd/varnish

Browse source 
varnish: updates
This commit is contained in:
ajs124 2022-11-09 01:40:41 +01:00 committed by GitHub
parent 0408daacca f9c4148be7
commit c79f431491
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/tests/all-tests.nix
View file

@ -671,7 +671,6 @@ in {
uwsgi = handleTest ./uwsgi.nix {};
v2ray = handleTest ./v2ray.nix {};
varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };
varnish71 = handleTest ./varnish.nix { package = pkgs.varnish71; };
varnish72 = handleTest ./varnish.nix { package = pkgs.varnish72; };
vault = handleTest ./vault.nix {};
vault-dev = handleTest ./vault-dev.nix {};

13
pkgs/servers/varnish/default.nix
View file

@ -53,17 +53,12 @@ in
{
# EOL TBA
varnish60 = common {
version = "6.0.10";
hash = "sha256-a4W/dI7jeaoI43UE+G6tS6fgzEDqsXI8CUv+Wh4HJus=";
};
# EOL 2023-03-15. TODO: remove ahead of 22.11 release? if not, remove for 23.05
varnish71 = common {
version = "7.1.1";
hash = "sha256-LK++JZDn1Yp7rIrZm+kuRA/k04raaBbdiDbyL6UToZA=";
version = "6.0.11";
hash = "sha256-UVkA2+tH/9MOs5BlyuAzFnmD7Pm9A6lDWic2B+HRKNs=";
};
# EOL 2023-09-15
varnish72 = common {
version = "7.2.0";
hash = "sha256-HaipftX3t9TV4E/FyW/JqFyzog0HbrorGJUfSzBsloY=";
version = "7.2.1";
hash = "sha256-TZN9FyCo7BnFM/ly2TA6HJiJt7/KdDeJOuXCfPIEqUA=";
};
}

16
pkgs/servers/varnish/packages.nix
View file

@ -1,4 +1,4 @@
{ callPackages, callPackage, varnish60, varnish71, varnish72, fetchFromGitHub }: {
{ callPackages, callPackage, varnish60, varnish72, fetchFromGitHub }: {
varnish60Packages = rec {
varnish = varnish60;
modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
@ -13,20 +13,6 @@
sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
};
};
varnish71Packages = rec {
varnish = varnish71;
modules = (callPackages ./modules.nix { inherit varnish; }).modules20;
digest = callPackage ./digest.nix {
inherit varnish;
version = "6.6";
sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn";
};
dynamic = callPackage ./dynamic.nix {
inherit varnish;
version = "2.4.0";
sha256 = "1g53zblyxi1jivwppmpdqhi5xnzapsfib453sxyqbc5dfs7fijxr";
};
};
varnish72Packages = rec {
varnish = varnish72;
modules = (callPackages ./modules.nix { inherit varnish; }).modules20;

1
pkgs/top-level/aliases.nix
View file

@ -1528,6 +1528,7 @@ mapAliases ({
varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26
varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-09-15
varnish70 = throw "varnish70 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-03-17
varnish71 = throw "varnish71 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-11-08
vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05
vgo2nix = throw "vgo2nix has been removed, because it was deprecated. Consider using gomod2nix instead"; # added 2022-08-24

6
pkgs/top-level/all-packages.nix
View file

@ -12832,11 +12832,11 @@ with pkgs;
valum = callPackage ../development/web/valum { };
inherit (callPackages ../servers/varnish { })
varnish60 varnish71 varnish72;
varnish60 varnish72;
inherit (callPackages ../servers/varnish/packages.nix { })
varnish60Packages varnish71Packages varnish72Packages;
varnish60Packages varnish72Packages;
varnishPackages = varnish71Packages;
varnishPackages = varnish72Packages;
varnish = varnishPackages.varnish;
hitch = callPackage ../servers/hitch { };