Merge #29311: texinfo: 6.3 -> 6.5

This commit is contained in:
Vladimír Čunát 2017-09-17 08:46:00 +02:00
commit 96647a6985
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 3 additions and 3 deletions

View File

@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "texinfo-6.3";
name = "texinfo-6.5";
src = fetchurl {
url = "mirror://gnu/texinfo/${name}.tar.xz";
sha256 = "0fpr9kdjjl6nj2pc50k2zr7134hvqz8bi8pfqa7131a9lpzz6v14";
sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
};
buildInputs = [ perl xz ]

View File

@ -7466,7 +7466,7 @@ with pkgs;
texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
texinfo4 = texinfo413;
texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
texinfo6 = callPackage ../development/tools/misc/texinfo/6.3.nix { };
texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { };
texinfo = texinfo6;
texinfoInteractive = appendToName "interactive" (
texinfo.override { interactive = true; }