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 staging

Browse source
This commit is contained in:
Marius Bakke 2018-06-21 15:52:26 +02:00
commit 4dfea1010a
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
34 changed files with 1127 additions and 396 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/java.scm
View file

@ -3625,7 +3625,7 @@ complex transformations and code analysis tools.")
`(("java-aqute-bndlib" ,java-aqute-bndlib-bootstrap)
("java-aqute-libg" ,java-aqute-libg-bootstrap)
,@(delete `("java-aqute-bndlib" ,java-aqute-bndlib)
(delete `("java-aqute-libg", java-aqute-libg)
(delete `("java-aqute-libg" ,java-aqute-libg)
(package-inputs java-asm)))))))
(define-public java-cglib