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 branch 'master' into core-updates-frozen

Browse source 
Conflicts:
	gnu/packages/bioinformatics.scm
	gnu/packages/cmake.scm
	gnu/packages/curl.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/gpodder.scm
	gnu/packages/music.scm
	gnu/packages/patches/glibc-bootstrap-system.patch
	gnu/packages/python-xyz.scm
	gnu/packages/shells.scm
	gnu/packages/statistics.scm
This commit is contained in:
Marius Bakke 2021-07-29 22:34:57 +02:00
commit b029be2ee0
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
100 changed files with 5664 additions and 43929 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/java.scm
View file

@ -7955,14 +7955,14 @@ This is a part of the Apache Commons Project.")
(define-public java-commons-codec
(package
(name "java-commons-codec")
(version "1.14")
(version "1.15")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/commons/codec/source/"
"commons-codec-" version "-src.tar.gz"))
(sha256
(base32
"11xr0agckkhm91pb5akf2mbk84yd54gyr178wj57gsm97fi7nkh9"))))
"01z9qmg8fd8d7p7xxipwj1vi9bmvpgqyi29kldjz2x6vzwm171jj"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "java-commons-codec.jar"
@ -7974,13 +7974,19 @@ This is a part of the Apache Commons Project.")
(add-before 'build 'copy-resources
(lambda _
(copy-recursively "src/main/resources"
"build/classes")
#t))
"build/classes")))
(add-before 'check 'copy-test-resources
(lambda _
(copy-recursively "src/test/resources"
"build/test-classes")
#t))
"build/test-classes")))
(add-before 'check 'skip-ravenous-test
(lambda _
;; This test admits to being "memory hungry", but reliably fails
;; even on a machine that should have plenty (12 GiB). Skip it.
(substitute*
"src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java"
(("\\bassertEnsureBufferSizeExpandsToMaxBufferSize.*;")
"return;"))))
(replace 'install (install-from-pom "pom.xml")))))
(native-inputs
`(("java-commons-lang3" ,java-commons-lang3)