Merge branch 'master' into staging

2015-05-29 14:52:51 -07:00
parent c4f1011cab be5f4082fd
commit e5bf20a6c6
443 changed files with 8079 additions and 1223 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     = 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 = 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 = 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;
         };
 }