From 4bf7a9f124cf47554ea43cc60c1a6cd03d92091b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Jul 2021 03:22:37 +0200 Subject: [PATCH 1/6] varnish6(2|3): drop --- pkgs/servers/varnish/default.nix | 8 -------- pkgs/servers/varnish/packages.nix | 8 +------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 6 ++---- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 1fbb36257d26..6ee30a701dbe 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -44,12 +44,4 @@ in version = "6.0.7"; sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a"; }; - varnish62 = common { - version = "6.2.3"; - sha256 = "02b6pqh5j1d4n362n42q42bfjzjrngd6x49b13q7wzsy6igd1jsy"; - }; - varnish63 = common { - version = "6.3.2"; - sha256 = "1f5ahzdh3am6fij5jhiybv3knwl11rhc5r3ig1ybzw55ai7788q8"; - }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index a5c5fe868d01..622bd8177b67 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackage, varnish60, varnish62, varnish63 }: +{ callPackage, varnish60 }: { varnish60Packages = { @@ -6,10 +6,4 @@ digest = callPackage ./digest.nix { varnish = varnish60; }; dynamic = callPackage ./dynamic.nix { varnish = varnish60; }; }; - varnish62Packages = { - varnish = varnish62; - }; - varnish63Packages = { - varnish = varnish63; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 87c582987468..1cfda235b6c6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -894,6 +894,8 @@ mapAliases ({ v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; valadoc = throw "valadoc was deprecated on 2019-10-10: valadoc was merged into vala 0.38"; 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 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 85a4be3fbeb8..94a1e6f20f83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10148,11 +10148,9 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish62 varnish63; + varnish60; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages - varnish62Packages - varnish63Packages; + varnish60Packages; varnishPackages = varnish63Packages; varnish = varnishPackages.varnish; From 49df287d208b1b6f222e54fdca389613afbe2fa0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Jul 2021 03:23:40 +0200 Subject: [PATCH 2/6] varnish65: init at 6.5.2 --- pkgs/servers/varnish/default.nix | 4 ++++ pkgs/servers/varnish/packages.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 6ee30a701dbe..68ec4e99eadc 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -44,4 +44,8 @@ in version = "6.0.7"; sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a"; }; + varnish65 = common { + version = "6.5.2"; + sha256 = "041gc22h8cwsb8jw7zdv6yk5h8xg2q0g655m5zhi5jxq35f2sljx"; + }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 622bd8177b67..1932561be8ad 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackage, varnish60 }: +{ callPackage, varnish60, varnish65 }: { varnish60Packages = { @@ -6,4 +6,7 @@ digest = callPackage ./digest.nix { varnish = varnish60; }; dynamic = callPackage ./dynamic.nix { varnish = varnish60; }; }; + varnish65Packages = { + varnish = varnish65; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94a1e6f20f83..78d999341b84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10148,9 +10148,9 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60; + varnish60 varnish65; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages; + varnish60Packages varnish65Packages; varnishPackages = varnish63Packages; varnish = varnishPackages.varnish; From 9c765d4534e8b4a58c61f8fd0175c295a2bb86e4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Jul 2021 03:33:27 +0200 Subject: [PATCH 3/6] varnishPackages.*: fix and update dynamic module --- pkgs/servers/varnish/dynamic.nix | 8 ++++---- pkgs/servers/varnish/packages.nix | 15 +++++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index 637380a5abd4..78fd4d106412 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook269, pkg-config, varnish, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook269, pkg-config, varnish, docutils, version, sha256 }: -stdenv.mkDerivation rec { - version = "0.4"; +stdenv.mkDerivation { pname = "${varnish.name}-dynamic"; + inherit version; src = fetchFromGitHub { owner = "nigoroll"; repo = "libvmod-dynamic"; rev = "v${version}"; - sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; + inherit sha256; }; nativeBuildInputs = [ pkg-config docutils autoreconfHook269 varnish.python ]; diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 1932561be8ad..9876f131ff0d 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,12 +1,19 @@ -{ callPackage, varnish60, varnish65 }: - -{ +{ callPackage, varnish60, varnish65, fetchFromGitHub }: { varnish60Packages = { varnish = varnish60; digest = callPackage ./digest.nix { varnish = varnish60; }; - dynamic = callPackage ./dynamic.nix { varnish = varnish60; }; + dynamic = callPackage ./dynamic.nix { + varnish = varnish60; + version = "0.4"; + sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; + }; }; varnish65Packages = { varnish = varnish65; + dynamic = callPackage ./dynamic.nix { + varnish = varnish65; + version = "2.3.1"; + sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88"; + }; }; } From 881f8b97eb6c2d68be2ffb26631eac2091a6570a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Jul 2021 03:45:00 +0200 Subject: [PATCH 4/6] varnish: fix varnishtest --- pkgs/servers/varnish/default.nix | 6 +++++- pkgs/servers/varnish/digest.nix | 8 ++++---- pkgs/servers/varnish/packages.nix | 11 ++++++++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 68ec4e99eadc..1d4a3276cc09 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit +{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils , python3, makeWrapper }: let @@ -21,6 +21,10 @@ let buildFlags = [ "localstatedir=/var/spool" ]; + postPatch = '' + substituteInPlace bin/varnishtest/vtc_main.c --replace /bin/rm "${coreutils}/bin/rm" + ''; + postInstall = '' wrapProgram "$out/sbin/varnishd" --prefix PATH : "${lib.makeBinPath [ stdenv.cc ]}" ''; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 4511eb3a7245..3f5c6aa43816 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils, version, sha256 }: stdenv.mkDerivation rec { - version = "1.0.2"; pname = "${varnish.name}-digest"; + inherit version; src = fetchFromGitHub { owner = "varnish"; repo = "libvmod-digest"; - rev = "libvmod-digest-${version}"; - sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx"; + rev = version; + inherit sha256; }; nativeBuildInputs = [ autoreconfHook pkg-config docutils ]; diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 9876f131ff0d..c8afc50e4982 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,7 +1,11 @@ { callPackage, varnish60, varnish65, fetchFromGitHub }: { varnish60Packages = { varnish = varnish60; - digest = callPackage ./digest.nix { varnish = varnish60; }; + digest = callPackage ./digest.nix { + varnish = varnish60; + version = "libvmod-digest-1.0.2"; + sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx"; + }; dynamic = callPackage ./dynamic.nix { varnish = varnish60; version = "0.4"; @@ -10,6 +14,11 @@ }; varnish65Packages = { varnish = varnish65; + digest = callPackage ./digest.nix { + varnish = varnish65; + version = "6.6"; + sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn"; + }; dynamic = callPackage ./dynamic.nix { varnish = varnish65; version = "2.3.1"; From d0d171cadc3350a262042767ab06ddd6e7f7c649 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Jul 2021 03:45:14 +0200 Subject: [PATCH 5/6] varnishPackages.*: fix and update digest module --- pkgs/servers/varnish/digest.nix | 2 +- pkgs/servers/varnish/packages.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 3f5c6aa43816..31aaad835bdb 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils, version, sha256 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils, coreutils, version, sha256 }: stdenv.mkDerivation rec { pname = "${varnish.name}-digest"; diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index c8afc50e4982..647247acafd1 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,26 +1,26 @@ { callPackage, varnish60, varnish65, fetchFromGitHub }: { - varnish60Packages = { + varnish60Packages = rec { varnish = varnish60; digest = callPackage ./digest.nix { - varnish = varnish60; + inherit varnish; version = "libvmod-digest-1.0.2"; sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx"; }; dynamic = callPackage ./dynamic.nix { - varnish = varnish60; + inherit varnish; version = "0.4"; sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish65Packages = { + varnish65Packages = rec { varnish = varnish65; digest = callPackage ./digest.nix { - varnish = varnish65; + inherit varnish; version = "6.6"; sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn"; }; dynamic = callPackage ./dynamic.nix { - varnish = varnish65; + inherit varnish; version = "2.3.1"; sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88"; }; From 586ca51a784ad223524ca2dfb71738430feb2c1c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 26 Jul 2021 03:48:23 +0200 Subject: [PATCH 6/6] varnishPackages: update default, because we dropped 6.3.x --- .../manual/from_md/release-notes/rl-2111.section.xml | 12 ++++++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 3 +++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) 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 68d09a778131..8504593e7683 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 @@ -668,6 +668,11 @@ to use wildcards in the source argument. + + + <<<<<<< HEAD + + The openrazer and @@ -703,6 +708,13 @@ 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. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index d7c38056ef61..024ed9c73998 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -171,6 +171,7 @@ pt-services.clipcat.enable). - `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument. +<<<<<<< HEAD - The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group. - The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland. @@ -179,6 +180,8 @@ pt-services.clipcat.enable). 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. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78d999341b84..a5ac430f3cf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10152,7 +10152,7 @@ with pkgs; inherit (callPackages ../servers/varnish/packages.nix { }) varnish60Packages varnish65Packages; - varnishPackages = varnish63Packages; + varnishPackages = varnish65Packages; varnish = varnishPackages.varnish; hitch = callPackage ../servers/hitch { };