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

@@ -24,7 +24,7 @@ let version = "5.18"; in
#doCheck = true; # 2 tests fail because of missing /dev/tty
meta = {
meta = with stdenv.lib; {
description = "Automated text and program generation tool";
longDescription = ''
@@ -46,7 +46,7 @@ let version = "5.18"; in
documentation of program options.
'';
license = ["GPLv3+" "LGPLv3+" ];
license = with licenses; [ gpl3Plus lgpl3Plus ];
homepage = http://www.gnu.org/software/autogen/;

View File

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A secure tunneling app for executing tests securely when testing behind firewalls";
license = "unfree";
license = with licenses; unfree;
homepage = https://docs.saucelabs.com/reference/sauce-connect/;
maintainers = with maintainers; [offline];
platforms = with platforms; platforms.linux;