BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

diffutils: 3.8 -> 3.9

Browse source 
Changes: https://savannah.gnu.org/forum/forum.php?forum_id=10282
This commit is contained in:
Sergei Trofimovich 2023-01-29 18:51:22 +00:00
parent 2be9646b90
commit cdf6a42301
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/tools/text/diffutils/default.nix
View file

@ -7,13 +7,25 @@
stdenv.mkDerivation rec {
pname = "diffutils";
version = "3.8";
version = "3.9";
src = fetchurl {
url = "mirror://gnu/diffutils/diffutils-${version}.tar.xz";
sha256 = "sha256-pr3X0bMSZtEcT03mwbdI1GB6sCMa9RiPwlM9CuJDj+w=";
hash = "sha256-2A076QogGGjeg9eNrTQTrYgWDMU7zDbrnq98INvwI/E=";
};
patches = [
# Backport of a fix for 'diff -D' output.
# TODO: remove when updating to 3.10.
./fix-diff-D.patch
];
postPatch = ''
# avoid the need for help2man
# TODO: can be removed when fix-diff-D.patch is removed.
touch man/diff.1
'';
outputs = [ "out" "info" ];
nativeBuildInputs = [ xz.bin ];

15
pkgs/tools/text/diffutils/fix-diff-D.patch Normal file
View file

@ -0,0 +1,15 @@
https://git.savannah.gnu.org/cgit/diffutils.git/patch/?id=ba08fbbb0ca5da455bf695236c57bc50e7faed50
https://github.com/NixOS/nixpkgs/pull/213421#issuecomment-1407749912
Fix 'diff -D' regression
--- a/src/diff.c
+++ b/src/diff.c
@@ -416,7 +416,7 @@ main (int argc, char **argv)
char *base = b;
int changes = 0;
- for (i = 0; i < sizeof sizeof C_ifdef_group_formats; i++)
+ for (i = 0; i < sizeof C_ifdef_group_formats; i++)
{
char ch = C_ifdef_group_formats[i];
switch (ch)