From 145f628f69224b9393b831ca2749b6a86ed0a9ff Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Sep 2021 22:48:24 +0200 Subject: varnish65*: drop because it is EOL upstream varnish66 could be introduced, but I don't think it's worth the effort --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 4 ++-- nixos/doc/manual/release-notes/rl-2111.section.md | 2 +- pkgs/servers/varnish/default.nix | 4 ---- pkgs/servers/varnish/packages.nix | 15 +-------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 +++--- 6 files changed, 8 insertions(+), 24 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 0688de77af6..98fe3513e25 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1002,8 +1002,8 @@ Superuser created successfully. The varnish package was upgraded from 6.3.x - to 6.5.x. varnish60 for the last LTS - release is also still available. + to 7.x. varnish60 for the last LTS release + is also still available. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 56babf8ac00..fef42ec52c9 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -310,7 +310,7 @@ In addition to numerous new and upgraded packages, this release has the followin configures the address and port the web UI is listening, it defaults to `:9001`. To be able to access the web UI this port needs to be opened in the firewall. -- The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available. +- The `varnish` package was upgraded from 6.3.x to 7.x. `varnish60` for the last LTS release is also still available. - The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used. diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 70ef8ab0fa0..f975fd5c7fd 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -50,10 +50,6 @@ in version = "6.0.8"; sha256 = "1zk83hfxgjq1d0n4zx86q3f05y9f2zc6a1miz1zcvfa052q4bljx"; }; - varnish65 = common { - version = "6.5.2"; - sha256 = "041gc22h8cwsb8jw7zdv6yk5h8xg2q0g655m5zhi5jxq35f2sljx"; - }; varnish70 = common { version = "7.0.0"; sha256 = "11z0pa618lh925ih67wmp1gqk7i46l486j4spjy71g1n3w5mqylc"; diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index f83b8ee090e..48cc1f67b18 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackage, varnish60, varnish65, varnish70, fetchFromGitHub }: { +{ callPackage, varnish60, varnish70, fetchFromGitHub }: { varnish60Packages = rec { varnish = varnish60; digest = callPackage ./digest.nix { @@ -12,19 +12,6 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish65Packages = rec { - varnish = varnish65; - digest = callPackage ./digest.nix { - inherit varnish; - version = "6.6"; - sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn"; - }; - dynamic = callPackage ./dynamic.nix { - inherit varnish; - version = "2.3.1"; - sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88"; - }; - }; varnish70Packages = rec { varnish = varnish70; digest = callPackage ./digest.nix { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c81ee814bc7..d63dbdfa46f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -969,6 +969,7 @@ mapAliases ({ vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 + varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-09-15 venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05 vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 vimbWrapper = vimb; # added 2015-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e229cae85a..bdc0b625a07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10406,11 +10406,11 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish65 varnish70; + varnish60 varnish70; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages varnish65Packages varnish70Packages; + varnish60Packages varnish70Packages; - varnishPackages = varnish65Packages; + varnishPackages = varnish70Packages; varnish = varnishPackages.varnish; hitch = callPackage ../servers/hitch { }; -- cgit 1.4.1