Merge branch 'staging' into v/modular

Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
parent 4c3e6a4675 acba6b4da2
commit 8da52a642a
767 changed files with 19114 additions and 13711 deletions
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

  meta = {
    homepage = http://www.gnu.org/software/gzip/;
-    description = "Gzip, the GNU zip compression program";
+    description = "GNU zip compression program";

    longDescription =
      ''gzip (GNU zip) is a popular data compression program written by