Merge branch 'master' into fix/ansible-ec2

This commit is contained in:
Paulus Esterhazy
2015-05-04 08:57:57 +02:00
263 changed files with 4320 additions and 1313 deletions

View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig readline libxml2 ];
meta = with stdenv.lib; {
description = "Configuration editing tool.";
description = "Configuration editing tool";
license = licenses.lgpl2;
homepage = http://augeas.net/;
maintainers = with maintainers; [offline];

View File

@@ -20,7 +20,7 @@ let honcho = buildPythonPackage rec {
doCheck = false;
meta = with stdenv.lib; {
description = "A Python clone of Foreman, a tool for managing Procfile-based applications.";
description = "A Python clone of Foreman, a tool for managing Procfile-based applications";
license = licenses.mit;
homepage = https://github.com/nickstenning/honcho;
maintainers = with maintainers; [ benley ];