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 22:00:06 +02:00
parent 87fd373aac
commit b2d7f4b1ba
73 changed files with 269 additions and 234 deletions
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Highly configurable, dynamic window manager for X";
homepage = http://awesome.naquadah.org/;
license = "GPLv2+";
license = with licenses; gpl2Plus;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.linux;
};
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
export makeFlags="PREFIX=$out"
'';
meta = {
meta = with stdenv.lib; {
homepage = http://tools.suckless.org/tabbed;
description = "Simple generic tabbed fronted to xembed aware applications";
license="MIT";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
license = with licenses; mit;
maintainers = with maintainers; [ viric ];
platforms = with platforms; linux;
};
}
@@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm libvterm ];
meta = {
meta = with stdenv.lib; {
homepage = http://vwm.sourceforge.net/;
description = "Dynamic window manager for the console";
license="GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
license = with licenses; gpl2Plus;
maintainers = with maintainers; [ viric ];
platforms = with platforms; linux;
};
}
@@ -30,6 +30,6 @@ args: with args; stdenv.mkDerivation {
";
meta = { homepage = "www.suckless.org";
description = "a really cool window manager which can by driven by keyboard only";
license="MIT";
license = stdenv.lib.licenses.mit;
};
}
@@ -30,6 +30,6 @@ args: with args; stdenv.mkDerivation {
";
meta = { homepage = "www.suckless.org";
description = "One small tool of the wmii window manger to let the user select an item from a list by filtering";
license="MIT";
license = stdenv.lib.licenses.mit;
};
}