diff options
author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
---|---|---|
committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/wdiff.scm | |
parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/wdiff.scm')
-rw-r--r-- | gnu/packages/wdiff.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/wdiff.scm b/gnu/packages/wdiff.scm index 20fc0bc06f..ec0769447f 100644 --- a/gnu/packages/wdiff.scm +++ b/gnu/packages/wdiff.scm @@ -47,9 +47,9 @@ (("#! /bin/sh") (string-append "#!" (which "sh"))))))))) (native-inputs - `(("which" ,which) - ;; For some reason wdiff.info gets rebuilt. - ("texinfo" ,texinfo))) + (list which + ;; For some reason wdiff.info gets rebuilt. + texinfo)) (home-page "https://www.gnu.org/software/wdiff/") (synopsis "Word difference finder") (description |