From 33d15c2e095988d743a53e8c5b204e3ecfc37278 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 10 Feb 2023 09:42:54 +0100 Subject: [PATCH] texinfo: 6.8 -> 7.0.2 Change default texinfo to 7 --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ pkgs/development/tools/misc/texinfo/7.0.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/misc/texinfo/7.0.nix diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 3f4fff353a93c..32a88cdfbe425 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -97,6 +97,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Calling `makeSetupHook` without passing a `name` argument is deprecated. +- Texinfo has been updated to 7.0.2 + - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually. - The [services.wordpress.sites.<name>.plugins](#opt-services.wordpress.sites._name_.plugins) and [services.wordpress.sites.<name>.themes](#opt-services.wordpress.sites._name_.themes) options have been converted from sets to attribute sets to allow for consumers to specify explicit install paths via attribute name. diff --git a/pkgs/development/tools/misc/texinfo/7.0.nix b/pkgs/development/tools/misc/texinfo/7.0.nix new file mode 100644 index 0000000000000..8214999bbc773 --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/7.0.nix @@ -0,0 +1,7 @@ +import ./common.nix { + version = "7.0.2"; + sha256 = "sha256-8hHsMmE4PhqJ5FVak7nQF/6Ae5w5kvst/0hx2ubaVK0="; + postPatch = '' + patchShebangs tp/maintain + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bd7c40e5ac61..d016cff65ffda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18667,7 +18667,8 @@ with pkgs; texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro texinfo6_7 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; # needed for gpm, iksemel and fwknop texinfo6 = callPackage ../development/tools/misc/texinfo/6.8.nix { }; - texinfo = texinfo6; + texinfo7 = callPackage ../development/tools/misc/texinfo/7.0.nix { }; + texinfo = texinfo7; texinfoInteractive = texinfo.override { interactive = true; }; texi2html = callPackage ../development/tools/misc/texi2html { };