diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2020-05-17 00:12:49 +0200 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2020-07-17 04:12:43 +0200 |
| commit | 02ed96dccf4764dc707bcfcb523b24cf31ed2a79 (patch) | |
| tree | be643141bc9445f0eae3aea07ef9295e2e2bbddd /gnu/packages/java-compression.scm | |
| parent | ae9130964209d8051adf56bcce22173c54516488 (diff) | |
| download | guix-patches-02ed96dccf4764dc707bcfcb523b24cf31ed2a79.tar guix-patches-02ed96dccf4764dc707bcfcb523b24cf31ed2a79.tar.gz | |
gnu: java-plexus-archiver: Update to 4.2.2.
* gnu/packages/java.scm (java-plexus-archiver): Update to 4.2.2.
(java-plexus-container-default, java-commons-compress)
(java-geronimo-xbean-reflect): Install from pom file.
(java-guava): Install from pom
[source]: Use git source instead of generated source jar.
* gnu/packages/java-compression.scm (java-xz, java-iq80-snappy): Install
from pom.
Diffstat (limited to 'gnu/packages/java-compression.scm')
| -rw-r--r-- | gnu/packages/java-compression.scm | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index b1d3ae7060..3abc0ea071 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -207,7 +207,6 @@ compressor/decompressor.") `(#:jar-name "iq80-snappy.jar" #:source-dir "src/main/java" #:test-dir "src/test" - #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases (replace 'check @@ -228,7 +227,8 @@ compressor/decompressor.") ;; We don't have hadoop (delete-file "src/main/java/org/iq80/snappy/HadoopSnappyCodec.java") (delete-file "src/test/java/org/iq80/snappy/TestHadoopSnappyCodec.java") - #t))))) + #t)) + (replace 'install (install-from-pom "pom.xml"))))) (home-page "https://github.com/dain/snappy") (native-inputs `(("guava" ,java-guava) @@ -303,14 +303,21 @@ It can be used as a replacement for the Apache @code{CBZip2InputStream} / ;; the package is not contained in a subdirectory (chdir "..") #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - ;; Do we want to install *Demo.jar? - (install-file "build/jar/xz.jar" - (string-append - (assoc-ref outputs "out") - "/share/java/xz.jar")) - #t))))) + (add-before 'install 'generate-pom + (lambda _ + (copy-file "maven/pom_template.xml" "pom.xml") + (substitute* "pom.xml" + (("@VERSION@") ,version) + (("@TITLE@") "XZ data compression") + (("@HOMEPAGE@") "http://tukaani.org/xz/java.html")) + #t)) + (add-before 'install 'rename-jar + (lambda _ + (rename-file "build/jar/xz.jar" + (string-append "build/jar/xz-" ,version ".jar")) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) (native-inputs `(("unzip" ,unzip))) (home-page "https://tukaani.org") |