From b2d7f4b1ba937951fefdd026314512ab0be91508 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2015 21:56:04 +0200 Subject: 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. --- pkgs/data/fonts/terminus-font/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/data/fonts/terminus-font/default.nix') diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index fa9eb0ac42d5..6dab322b056c 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -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; }; } -- cgit 1.4.1