summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-01-30 12:23:47 +0100
committerRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-01-30 13:15:41 +0100
commitdff396484db868845d5a794e2a96574b7a17ceaf (patch)
tree0962a0882f9d676c050bfe26ffabd56f8377de9b
parentadd22af0952cf71911f478c7636c4699b204e286 (diff)
downloadnixpkgs-dff396484db868845d5a794e2a96574b7a17ceaf.tar
nixpkgs-dff396484db868845d5a794e2a96574b7a17ceaf.tar.gz
nixpkgs-dff396484db868845d5a794e2a96574b7a17ceaf.tar.bz2
nixpkgs-dff396484db868845d5a794e2a96574b7a17ceaf.tar.lz
nixpkgs-dff396484db868845d5a794e2a96574b7a17ceaf.tar.xz
nixpkgs-dff396484db868845d5a794e2a96574b7a17ceaf.tar.zst
nixpkgs-dff396484db868845d5a794e2a96574b7a17ceaf.zip
postfix: Correct license
-rw-r--r--lib/licenses.nix5
-rw-r--r--pkgs/servers/mail/postfix/default.nix2
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 1fdcc15fd72..0086bd63ebd 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -200,6 +200,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Eclipse Public License 1.0";
   };
 
+  epl20 = spdx {
+    spdxId = "EPL-2.0";
+    fullName = "Eclipse Public License 2.0";
+  };
+
   epson = {
     fullName = "Seiko Epson Corporation Software License Agreement for Linux";
     url = https://download.ebz.epson.net/dsc/du/02/eula/global/LINUX_EN.html;
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index bf1c16acfeb..f8b36e816e0 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -90,7 +90,7 @@ in stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.postfix.org/;
     description = "A fast, easy to administer, and secure mail server";
-    license = lib.licenses.bsdOriginal;
+    license = with lib.licenses; [ ipl10 epl20 ];
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.rickynils ];
   };