dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

varnish65*: drop because it is EOL upstream

Browse Source 
varnish66 could be introduced, but I don't think it's worth the effort
This commit is contained in:
ajs124 2021-09-15 22:48:24 +02:00
parent 83261624ae
commit 145f628f69
6 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -1002,8 +1002,8 @@ Superuser created successfully.
<listitem> <listitem>
<para> <para>
The <literal>varnish</literal> package was upgraded from 6.3.x The <literal>varnish</literal> package was upgraded from 6.3.x
to 6.5.x. <literal>varnish60</literal> for the last LTS to 7.x. <literal>varnish60</literal> for the last LTS release
release is also still available. is also still available.
</para> </para>
</listitem> </listitem>
<listitem> <listitem>

2
nixos/doc/manual/release-notes/rl-2111.section.md
View File

@ -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`. 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. 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. - The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used.

4
pkgs/servers/varnish/default.nix
View File

@ -50,10 +50,6 @@ in
version = "6.0.8"; version = "6.0.8";
sha256 = "1zk83hfxgjq1d0n4zx86q3f05y9f2zc6a1miz1zcvfa052q4bljx"; sha256 = "1zk83hfxgjq1d0n4zx86q3f05y9f2zc6a1miz1zcvfa052q4bljx";
}; };
varnish65 = common {
version = "6.5.2";
sha256 = "041gc22h8cwsb8jw7zdv6yk5h8xg2q0g655m5zhi5jxq35f2sljx";
};
varnish70 = common { varnish70 = common {
version = "7.0.0"; version = "7.0.0";
sha256 = "11z0pa618lh925ih67wmp1gqk7i46l486j4spjy71g1n3w5mqylc"; sha256 = "11z0pa618lh925ih67wmp1gqk7i46l486j4spjy71g1n3w5mqylc";

15
pkgs/servers/varnish/packages.nix
View File

@ -1,4 +1,4 @@
{ callPackage, varnish60, varnish65, varnish70, fetchFromGitHub }: { { callPackage, varnish60, varnish70, fetchFromGitHub }: {
varnish60Packages = rec { varnish60Packages = rec {
varnish = varnish60; varnish = varnish60;
digest = callPackage ./digest.nix { digest = callPackage ./digest.nix {
@ -12,19 +12,6 @@
sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; 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 { varnish70Packages = rec {
varnish = varnish70; varnish = varnish70;
digest = callPackage ./digest.nix { digest = callPackage ./digest.nix {

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

@ -969,6 +969,7 @@ mapAliases ({
vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 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 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 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 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 vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
vimbWrapper = vimb; # added 2015-01 vimbWrapper = vimb; # added 2015-01

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

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