Merge branch 'staging'

Hydra is only half-finished, but we'd better get secure glibc fast.
2016-05-16 10:15:28 +02:00
parent d15fedbcc0 4cf524e588
commit e5d40c6fa3
15 changed files with 912 additions and 14 deletions
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "help2man-1.47.3";
+  name = "help2man-1.47.4";

  src = fetchurl {
    url = "mirror://gnu/help2man/${name}.tar.xz";