aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/shellutils.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 15e911a619..671848fd27 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -685,7 +685,7 @@ city, state, zip, or area code, it will check out.")
(define-public conflict
(package
(name "conflict")
- (version "20210108")
+ (version "20221002")
(source (origin
(method url-fetch)
(uri (string-append
@@ -693,7 +693,7 @@ city, state, zip, or area code, it will check out.")
version ".tgz"))
(sha256
(base32
- "0mls4climvp7v9hnc3zh01mh270kqcj797ng0xslwb027lipis4h"))))
+ "1z6z61yiss9m45m3agqs92l569r55w9nsqaap56kh568mcy3y64c"))))
(build-system gnu-build-system)
(arguments
`(#:phases
05eebad2895f9857f0'>build-aux: Relax the regexp used to match NEWS sections....Maxim Cournoyer 2021-04-20import: Remove Nix importer....Ludovic Courtès 2021-04-01build-self: Take care of the spinner in the parent process....Ludovic Courtès 2021-04-01build-self: Forward sub-process build output to (current-build-output-port)....Ludovic Courtès 2021-03-19build-self: Silent Guile warnings while computing the derivation....Ludovic Courtès 2021-03-10ci: Remove hydra support....Mathieu Othacehe 2021-02-04channels: Record 'guix' channel metadata in (guix config)....Ludovic Courtès 2021-02-02build: Add a --show-duration option to the SCM test-driver....Maxim Cournoyer 2021-02-01guix package: Add '--export-channels'....Ludovic Courtès 2021-01-31build: test-driver.scm: Allow running as a standalone script....Maxim Cournoyer 2021-01-31build: test-driver.scm: Add a new '--errors-only' option....Maxim Cournoyer 2021-01-31build: test-driver.scm: Add test cases filtering options....Maxim Cournoyer 2021-01-31build: test-driver.scm: Enable colored test results by default....Maxim Cournoyer 2021-01-31build: test-driver.scm: Make output redirection optional....Maxim Cournoyer 2020-11-12maint: update-guix-package: Optionally add sources to store....Maxim Cournoyer 2020-10-25maint: update-guix-package: Include the git.sv.gnu.org alias....Maxim Cournoyer 2020-10-19maint: update-guix-package: Prevent accidentally breaking guix pull....Maxim Cournoyer 2020-10-04cuirass: Add hurd-manifest....Jan (janneke) Nieuwenhuizen 2020-10-01ci: Add log and outputs keys....Mathieu Othacehe 2020-10-01ci: Add nix-name and system keys....Mathieu Othacehe 2020-08-29build: Remove references to the 'nix-hash' program....Ludovic Courtès 2020-08-24Use "guile-zlib" and "guile-lzlib" instead of (guix config)....Mathieu Othacehe