From f25709c48acd60923e019467ff8f97a0435b9764 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 29 Aug 2014 01:14:10 +0400 Subject: [PATCH] List NCSA license properly --- lib/licenses.nix | 5 +++++ pkgs/development/compilers/emscripten/default.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 95098aba1f2..812592c74f2 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -215,6 +215,11 @@ rec { url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt"; }; + ncsa = spdx { + shortName = "NCSA"; + fullName = "University of Illinois/NCSA Open Source License"; + }; + ofl = spdx { shortName = "OFL-1.1"; fullName = "SIL Open Font License 1.1"; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index dc81b90b4b9..43f256b58b0 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/kripken/emscripten; description = "An LLVM-to-JavaScript Compiler"; maintainers = with maintainers; [ bosu ]; - license = "MIT and University of Illinois/NCSA Open Source License"; + license = with licenses; ncsa; }; }