alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

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

Browse source 
varnish: 7.0.2 -> 7.1.0
This commit is contained in:
Robert Scott 2022-03-23 22:42:00 +00:00 committed by GitHub
parent 754b633e5c 733068d254
commit 0c31adefdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,15 +51,8 @@ in
version = "6.0.10";
sha256 = "1sr60wg5mzjb14y75cga836f19sbmmpgh13mwc4alyg3irsbz1bb";
};
varnish70 = (common {
version = "7.0.2";
sha256 = "0q9z1iilqwbh5flfy9pl18kxv0yjs5z91c4j81z5pgyjd9d4jjjj";
}).overrideAttrs (oA: {
patches = [
(fetchpatch {
url = "https://github.com/varnishcache/varnish-cache/commit/20e007a5b17c1f68f70ab42080de384f9e192900.patch";
sha256 = "0vvihbjknb0skdv2ksn2lz89pwmn4f2rjmb6q65cvgnnjfj46s82";
})
];
});
varnish71 = common {
version = "7.1.0";
sha256 = "1flyqr212jamqpwafdil170vc966r1mbb7n3ngjn8xk6hn3bhjpm";
};
}

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

@ -1,4 +1,4 @@
{ callPackages, callPackage, varnish60, varnish70, fetchFromGitHub }: {
{ callPackages, callPackage, varnish60, varnish71, fetchFromGitHub }: {
varnish60Packages = rec {
varnish = varnish60;
modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
@ -13,8 +13,8 @@
sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
};
};
varnish70Packages = rec {
varnish = varnish70;
varnish71Packages = rec {
varnish = varnish71;
modules = (callPackages ./modules.nix { inherit varnish; }).modules19;
digest = callPackage ./digest.nix {
inherit varnish;

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

@ -1263,6 +1263,7 @@ mapAliases ({
varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26
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
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
vimbWrapper = throw "'vimbWrapper' has been renamed to/replaced by 'vimb'"; # Converted to throw 2022-02-22

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

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