public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34414 from dotlambda/postfix

Browse Source 
postfix: Correct license
This commit is contained in:
Franz Pletz 2018-02-01 08:34:33 +00:00 committed by GitHub
commit c7885866e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/licenses.nix
View File

@ -200,6 +200,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Eclipse Public License 1.0"; fullName = "Eclipse Public License 1.0";
}; };
epl20 = spdx {
spdxId = "EPL-2.0";
fullName = "Eclipse Public License 2.0";
};
epson = { epson = {
fullName = "Seiko Epson Corporation Software License Agreement for Linux"; fullName = "Seiko Epson Corporation Software License Agreement for Linux";
url = https://download.ebz.epson.net/dsc/du/02/eula/global/LINUX_EN.html; url = https://download.ebz.epson.net/dsc/du/02/eula/global/LINUX_EN.html;

2
pkgs/servers/mail/postfix/default.nix
View File

@ -90,7 +90,7 @@ in stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.postfix.org/; homepage = http://www.postfix.org/;
description = "A fast, easy to administer, and secure mail server"; description = "A fast, easy to administer, and secure mail server";
license = lib.licenses.bsdOriginal; license = with lib.licenses; [ ipl10 epl20 ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.rickynils ]; maintainers = [ lib.maintainers.rickynils ];
}; };