From e353138f86f62a047ff0ab1685727631480b38e7 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 26 Apr 2025 22:28:04 -0300 Subject: [PATCH 1/2] varnish60Packages.{digest,dynamic,modules}: fix meta inheritance Another edge case of #400458. Reported-by: jopejoe1 Signed-off-by: Fernando Rodrigues --- pkgs/servers/varnish/digest.nix | 2 +- pkgs/servers/varnish/dynamic.nix | 2 +- pkgs/servers/varnish/modules.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 763e534a5697..21a307b0b4ba 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Digest and HMAC vmod"; homepage = "https://github.com/varnish/libvmod-digest"; - inherit (varnish.meta) license platforms maintainers; + inherit (varnish.meta) license platforms teams; }; } diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index da1df5fc50a6..c98d9f0fb0b2 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { meta = with lib; { description = "Dynamic director similar to the DNS director from Varnish 3"; homepage = "https://github.com/nigoroll/libvmod-dynamic"; - inherit (varnish.meta) license platforms maintainers; + inherit (varnish.meta) license platforms teams; }; } diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index c1cdb0277016..ad0b47915810 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -46,7 +46,7 @@ let meta = with lib; { description = "Collection of Varnish Cache modules (vmods) by Varnish Software"; homepage = "https://github.com/varnish/varnish-modules"; - inherit (varnish.meta) license platforms maintainers; + inherit (varnish.meta) license platforms teams; }; }; in From b052fd58435b3564c2984210f212a5dc88ddf788 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 26 Apr 2025 22:30:42 -0300 Subject: [PATCH 2/2] fetchnextcloudapp: fix meta inheritance Another edge case of #400458. Reported-by: jopejoe1 Signed-off-by: Fernando Rodrigues --- pkgs/build-support/fetchnextcloudapp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix index ccc079b70204..31f35c0568d3 100644 --- a/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -16,6 +16,7 @@ description ? null, homepage ? null, maintainers ? [ ], + teams ? [ ], unpack ? false, # whether to use fetchzip rather than fetchurl }: applyPatches ( @@ -27,7 +28,7 @@ applyPatches ( { license = lib.licenses.${license}; longDescription = description; - inherit homepage maintainers; + inherit homepage maintainers teams; } // lib.optionalAttrs (description != null) { longDescription = description;