Unverified Commit 487489f5 authored by Morgan Jones's avatar Morgan Jones Committed by GitHub
Browse files

{fetchnextcloudapp,varnish60Packages}: fix meta inheritance (#402180)

parents 76bcf4eb b052fd58

pkgs/build-support/fetchnextcloudapp/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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;

pkgs/servers/varnish/digest.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

  };

}

pkgs/servers/varnish/dynamic.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

  };

}

pkgs/servers/varnish/modules.nix

+1 −1
Original line number Diff line number Diff line
@@ -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