diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/diffoscope.scm | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/diffoscope.scm')
| -rw-r--r-- | gnu/packages/diffoscope.scm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 0dda89d860..c03f17cae8 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -75,7 +75,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "233") + (version "239") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1m6fc7k8cd7ahra05vqccw1fdbjj6d20vr3q8v67ynnyih5nmbnb")))) + (base32 "1awxazbrqqzqr5x50kam50ibmnjvidynkzp2158rdx5gy5lmnwcy")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -244,7 +244,7 @@ install.") (define-public reprotest (package (name "reprotest") - (version "0.7.22") + (version "0.7.23") (source (origin (method git-fetch) @@ -253,7 +253,7 @@ install.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0qpjg37x2ha7lb113fb5cic5if3zv30zqijsmkq91ld909x30ggd")))) + (base32 "0hkzh4i3c5hrbvdkhbmwm5vmb4msnlm5rvhjin6h2ni40kix69g0")))) (inputs (list python-debian python-distro python-libarchive-c python-rstr)) (native-inputs @@ -277,9 +277,7 @@ install.") (add-after 'unpack 'adjust-locales (lambda _ (substitute* "reprotest/build.py" - (("'C.UTF-8'") "'en_US.UTF-8'") - (("'ru_RU.CP1251'") "'ru_RU.KOI8-R'") - (("'kk_KZ.RK1048'") "'kk_KZ'")) + (("'C.UTF-8'") "'en_US.UTF-8'")) (substitute* "reprotest/lib/adt_testbed.py" (("export LANG=C.UTF-8") "export LANG=en_US.UTF-8")) #t)) |