Merge branch 'master' into stdenv-updates

Conflicts (relatively simple): pkgs/development/interpreters/python/2.7/default.nix pkgs/development/libraries/dbus/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +02:00
parent b08e12b37a 2cfbe7b292
commit 842420c3e1
222 changed files with 4706 additions and 2345 deletions
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
    homepage = "http://www.gnu.org/software/groff/";
    description = "GNU Troff, a typesetting package that reads plain text and produces formatted output";
    license = "GPLv3+";
+    platforms = stdenv.lib.platforms.all;

    longDescription = ''
      groff is the GNU implementation of troff, a document formatting