Merge branch 'master' into nitrogen. Added maintainer and license.

Conflicts: pkgs/tools/X11/nitrogen/default.nix
2014-06-13 11:54:19 -06:00
parent c977673bb5 13befa3979
commit 2784866ffd
378 changed files with 4407 additions and 1637 deletions
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
  meta = {
    description = "A background browser and setter for X windows";
    homepage = http://projects.l3ib.org/nitrogen/;
+    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.linux;
+    maintainer = [ stdenv.lib.maintainers.auntie ];
  };
 }