amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into core-updates

Browse source
This commit is contained in:
Andreas Enge 2023-03-20 18:21:47 +01:00
commit ccb62d8feb
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
341 changed files with 302900 additions and 224714 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/diffoscope.scm
View file

@ -74,7 +74,7 @@
(define-public diffoscope
(package
(name "diffoscope")
(version "233")
(version "238")
(source
(origin
(method git-fetch)
@ -83,7 +83,7 @@
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1m6fc7k8cd7ahra05vqccw1fdbjj6d20vr3q8v67ynnyih5nmbnb"))))
(base32 "11bib2h149b4jzxqhdi3dwivk6m4rvzjl8kg2n68sykgwa2fv24p"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -194,7 +194,7 @@
openssh
openssl
pgpdump
poppler
poppler-next
python-jsbeautifier
r-minimal
rpm
@ -239,7 +239,7 @@ install.")
(define-public reprotest
(package
(name "reprotest")
(version "0.7.22")
(version "0.7.23")
(source
(origin
(method git-fetch)
@ -248,7 +248,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
@ -272,9 +272,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))