Unverified Commit 1bb6b447 authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

Merge pull request #313769 from yVieta/zsh-completion 

zsh-completions: add licenses
parents ffb99d3e 4e841288

lib/licenses.nix

+10 −4
Original line number Diff line number Diff line
@@ -1278,11 +1278,21 @@ in mkLicense lset) ({ 
    fullName = "xinetd License";

  };



  xskat = {

    spdxId = "XSkat";

    fullName = "XSkat License";

  };



  zlib = {

    spdxId = "Zlib";

    fullName = "zlib License";

  };



  zsh = {

    url = "https://github.com/zsh-users/zsh/blob/master/LICENCE";

    fulllName = "Zsh License";

  };



  zpl20 = {

    spdxId = "ZPL-2.0";

    fullName = "Zope Public License 2.0";
@@ -1293,10 +1303,6 @@ in mkLicense lset) ({ 
    fullName = "Zope Public License 2.1";

  };



  xskat = {

    spdxId = "XSkat";

    fullName = "XSkat License";

  };

} // {

  # TODO: remove legacy aliases

  apsl10 = {

pkgs/shells/zsh/zsh-completions/default.nix

+7 −2
Original line number Diff line number Diff line
@@ -22,8 +22,13 @@ stdenv.mkDerivation rec { 
  meta = {

    description = "Additional completion definitions for zsh";

    homepage = "https://github.com/zsh-users/zsh-completions";

    license = lib.licenses.free;



    license = with lib.licenses; [

      asl20

      bsd3

      isc

      mit

      zsh

    ];

    platforms = lib.platforms.unix;

    maintainers = [ lib.maintainers.olejorgenb ];

  };