From 8d6c7456ab16aede5679f7b6590ac9c8cdb2b909 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Nov 2017 12:01:21 +0100 Subject: gnu: libzip: Use new libzip.org home page. * gnu/packages/compression.scm (libzip)[home-page]: Update. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 748c75a743..c24118c709 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1731,7 +1731,7 @@ manipulate, read, and write Zip archive files.") (source (origin (method url-fetch) (uri (string-append - "https://nih.at/libzip/libzip-" version ".tar.xz")) + "https://libzip.org/download/" name "-" version ".tar.xz")) (sha256 (base32 "0wykw0q9dwdzx0gssi2dpgckx9ggr2spzc1amjnff6wi6kz6x4xa")))) @@ -1750,7 +1750,7 @@ manipulate, read, and write Zip archive files.") (inputs `(("zlib" ,zlib))) (build-system gnu-build-system) - (home-page "https://nih.at/libzip/index.html") + (home-page "https://libzip.org") (synopsis "C library for reading, creating, and modifying zip archives") (description "Libzip is a C library for reading, creating, and modifying zip archives. Files can be added from data buffers, files, or compressed data -- cgit 1.4.1 From 77e62ee0aaba163f354405b3ed6639cc6f5807b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Nov 2017 15:34:28 +0100 Subject: gnu: libzip: Update to 1.3.2. * gnu/packages/compression.scm (libzip): Update to 1.3.2. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index c24118c709..fbfe6f18a9 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1727,14 +1727,14 @@ manipulate, read, and write Zip archive files.") (define-public libzip (package (name "libzip") - (version "1.3.0") + (version "1.3.2") (source (origin (method url-fetch) (uri (string-append "https://libzip.org/download/" name "-" version ".tar.xz")) (sha256 (base32 - "0wykw0q9dwdzx0gssi2dpgckx9ggr2spzc1amjnff6wi6kz6x4xa")))) + "11g1hvm2bxa2v5plakfzcwyk5hb5fz4kgrkp38l0xhnv21888xv2")))) (arguments '(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 933ad809f13ce8fa9bb32c43f68510bb942e5d88 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Nov 2017 23:56:50 +0100 Subject: gnu: Add java-snappy-1. * gnu/packages/compression.scm (java-snappy-1): New variable. --- gnu/packages/compression.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index fbfe6f18a9..f6d4c12e0c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1206,6 +1206,64 @@ install: libbitshuffle.so compresser/decompresser.") (license license:asl2.0))) +(define-public java-snappy-1 + (package + (inherit java-snappy) + (version "1.0.3-rc3") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/xerial/snappy-java/archive/" + "snappy-java-" version ".tar.gz")) + (sha256 + (base32 + "08hsxlqidiqck0q57fshwyv3ynyxy18vmhrai9fyc8mz17m7gsa3")))) + (arguments + `(#:jar-name "snappy.jar" + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'remove-binaries + (lambda _ + (delete-file "lib/org/xerial/snappy/OSInfo.class") + (delete-file-recursively "src/main/resources/org/xerial/snappy/native") + #t)) + (add-before 'build 'build-jni + (lambda _ + ;; Rebuild one of the binaries we removed earlier + (system* "javac" "src/main/java/org/xerial/snappy/OSInfo.java" + "-d" "lib") + ;; Link to the dynamic snappy, not the static ones + (substitute* "Makefile.common" + (("-shared") "-shared -lsnappy")) + (substitute* "Makefile" + ;; Don't download the sources here. + (("\\$\\(SNAPPY_UNPACKED\\) ") "") + ((": \\$\\(SNAPPY_UNPACKED\\) ") ":") + ;; What we actually want to build + (("SNAPPY_OBJ:=.*") + "SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/, SnappyNative.o)\n") + ;; Since we removed the directory structure in "native" during + ;; the previous phase, we need to recreate it. + (("NAME\\): \\$\\(SNAPPY_OBJ\\)") + "NAME): $(SNAPPY_OBJ)\n\t@mkdir -p $(@D)")) + ;; Finally we can run the Makefile to build the dynamic library. + (zero? (system* "make" "native")))) + ;; Once we have built the shared library, we need to place it in the + ;; "build" directory so it can be added to the jar file. + (add-after 'build-jni 'copy-jni + (lambda _ + (copy-recursively "src/main/resources/org/xerial/snappy/native" + "build/classes/org/xerial/snappy/native") + #t)) + (add-before 'check 'fix-tests + (lambda _ + (mkdir-p "src/test/resources/org/xerial/snappy/") + (copy-recursively "src/test/java/org/xerial/snappy/testdata" + "src/test/resources/org/xerial/snappy/testdata") + (install-file "src/test/java/org/xerial/snappy/alice29.txt" + "src/test/resources/org/xerial/snappy/") + #t))))))) + (define-public java-iq80-snappy (package (name "java-iq80-snappy") -- cgit 1.4.1 From 776d2fb1bff1279b68e3eaab08f858264e79ae79 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Nov 2017 15:44:48 +0100 Subject: gnu: Add java-jbzip2. * gnu/packages/compression.scm (java-jbzip2): New variable. --- gnu/packages/compression.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index f6d4c12e0c..1dd98d5ea4 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1314,6 +1314,46 @@ Java. This compression code produces a byte-for-byte exact copy of the output created by the original C++ code, and extremely fast.") (license license:asl2.0))) +(define-public java-jbzip2 + (package + (name "java-jbzip2") + (version "0.9.1") + (source (origin + (method url-fetch) + (uri (string-append "https://storage.googleapis.com/" + "google-code-archive-source/v2/" + "code.google.com/jbzip2/" + "source-archive.zip")) + (file-name (string-append name "-" version ".zip")) + (sha256 + (base32 + "0ncmhlqmrfmj96nqf6p77b9ws35lcfsvpfxzwxi2asissc83z1l3")))) + (build-system ant-build-system) + (native-inputs + `(("unzip" ,unzip) + ("java-junit" ,java-junit))) + (arguments + `(#:tests? #f ; no tests + #:jar-name "jbzip2.jar" + #:source-dir "tags/release-0.9.1/src" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-encoding-problems + (lambda _ + ;; Some of the files we're patching are + ;; ISO-8859-1-encoded, so choose it as the default + ;; encoding so the byte encoding is preserved. + (with-fluids ((%default-port-encoding #f)) + (substitute* "tags/release-0.9.1/src/org/itadaki/bzip2/HuffmanAllocator.java" + (("Milidi.") "Milidiu"))) + #t))))) + (home-page "https://code.google.com/archive/p/jbzip2/") + (synopsis "Java bzip2 compression/decompression library") + (description "Jbzip2 is a Java bzip2 compression/decompression library. +It can be used as a replacement for the Apache @code{CBZip2InputStream} / +@code{CBZip2OutputStream} classes.") + (license license:expat))) + (define-public p7zip (package (name "p7zip") -- cgit 1.4.1 From 26ff9cb3706d91049f0d95fc6fbc498111392540 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 27 Nov 2017 16:16:20 +0100 Subject: gnu: libzip: Run all tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/compression.scm (libzip)[arguments]: Delete ‘remove-failing-stest’ phase. --- gnu/packages/compression.scm | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 1dd98d5ea4..6b8b28b9ff 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1833,16 +1833,6 @@ manipulate, read, and write Zip archive files.") (sha256 (base32 "11g1hvm2bxa2v5plakfzcwyk5hb5fz4kgrkp38l0xhnv21888xv2")))) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'build 'remove-failing-tests - ;; These tests are known to fail on 32-bit architectures. - ;; see thread: https://nih.at/listarchive/libzip-discuss/msg00713.html - (lambda _ - (substitute* "regress/Makefile" - (("encryption-nonrandom") "#encryption-nonrandom")) - #t))))) (native-inputs `(("perl" ,perl))) (inputs -- cgit 1.4.1