Use common licence attributes from lib/licenses.nix

Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
This commit is contained in:
Tobias Geerinckx-Rice
2015-05-27 21:56:04 +02:00
parent 87fd373aac
commit b2d7f4b1ba
73 changed files with 269 additions and 234 deletions

View File

@@ -41,7 +41,7 @@ stdenv.mkDerivation {
cp -v *.jar "$out/share/java"
'';
meta = {
meta = with stdenv.lib; {
description = "An implementation of JavaScript written in Java";
longDescription =
@@ -52,6 +52,6 @@ stdenv.mkDerivation {
homepage = http://www.mozilla.org/rhino/;
license = [ "MPLv1.1" /* or */ "GPLv2+" ];
license = with licenses; [ mpl11 /* or */ gpl2Plus ];
};
}