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

@@ -27,7 +27,7 @@ stdenv.mkDerivation {
longDescription = ''
Pre-patched and adjusted fonts for usage with the Powerline plugin.
'';
license = "asl20 free ofl";
license = with licenses; [ asl20 free ofl ];
platforms = platforms.all;
maintainer = with maintainers; [ malyn ];
};

View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
make install fontdir
'';
meta = {
meta = with stdenv.lib; {
description = "A clean fixed width font";
longDescription = ''
Terminus Font is designed for long (8 and more hours per day) work
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
EGA/VGA-bold for 8x14 and 8x16.
'';
homepage = http://www.is-vn.bg/hamster/;
license = [ "GPLv2+" ];
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
platforms = with stdenv.lib.platforms; linux;
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ astsmtl ];
platforms = with platforms; linux;
};
}