aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/shellutils.scm
diff options
context:
space:
mode:
authorLiliana Marie Prikler <liliana.prikler@gmail.com>2023-09-22 23:54:34 +0200
committerLiliana Marie Prikler <liliana.prikler@gmail.com>2023-09-22 23:54:34 +0200
commitcdbd81ce144f17644ceebd3d08723aa244696a05 (patch)
treef2d4c484a5a8880fb32b81ac4330842c88a53e2a /gnu/packages/shellutils.scm
parent10664c0f1c351eae24629127d97fe23f5e18a93c (diff)
parentec130e1a1b7f3b87b1a6e626754f7e7a07f6b717 (diff)
downloadguix-cdbd81ce144f17644ceebd3d08723aa244696a05.tar.gz
guix-cdbd81ce144f17644ceebd3d08723aa244696a05.zip
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/shellutils.scm')
-rw-r--r--gnu/packages/shellutils.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index abcb7c2f2a..671848fd27 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -104,7 +104,7 @@ chart.")
(define-public boxes
(package
(name "boxes")
- (version "2.2.0")
+ (version "2.2.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -113,7 +113,7 @@ chart.")
(file-name (git-file-name name version))
(sha256
(base32
- "0vv2gaav1m4z2xdk0k3ragmv4kcnzv7p3v97lkjl1wbfmk5nhz07"))))
+ "1blni7kjskg6y9ycvhwq3srfvh891xhfnjbh5h2zl0pb5szpllqi"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@@ -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