From b0e3635e0a4fbc605ecbcf2afc76f3111a1afe42 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 31 May 2014 15:25:49 +0200 Subject: gnu: Move libarchive to (gnu packages backup). * gnu/packages/compression.scm (libarchive): Move to... * gnu/packages/backup.scm (libarchive): ... here. Import (guix licenses) with #:renamer to avoid conflicting 'zlib' bindings. --- gnu/packages/compression.scm | 56 -------------------------------------------- 1 file changed, 56 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 31b04302e6..6887ba6167 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2,7 +2,6 @@ ;;; Copyright © 2012, 2013 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014 Mark H Weaver -;;; Copyright © 2014 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,8 +24,6 @@ (define-module (gnu packages compression) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (gnu packages nettle) - #:use-module (gnu packages xml) #:use-module (gnu packages which)) (define-public zlib @@ -319,56 +316,3 @@ (define-public sharutils This package is mostly for compatibility and historical interest.") (license license:gpl3+))) -(define-public libarchive - (package - (name "libarchive") - (version "3.1.2") - (source - (origin - (method url-fetch) - (uri (string-append "http://libarchive.org/downloads/libarchive-" - version ".tar.gz")) - (sha256 - (base32 - "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb")))) - (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib) - ("nettle" ,nettle) - ("lzo" ,lzo) - ("bzip2" ,bzip2) - ("libxml2" ,libxml2) - ("xz" ,xz))) - (arguments - `(#:phases - (alist-cons-before - 'build 'patch-pwd - (lambda _ - (substitute* "Makefile" - (("/bin/pwd") (which "pwd")))) - (alist-replace - 'check - (lambda _ - ;; XXX: The test_owner_parse, test_read_disk, and - ;; test_write_disk_lookup tests expect user 'root' to exist, but - ;; the chroot's /etc/passwd doesn't have it. Turn off those tests. - ;; - ;; The tests allow one to disable tests matching a globbing pattern. - (and (zero? (system* "make" - "libarchive_test" "bsdcpio_test" "bsdtar_test")) - ;; XXX: This glob disables too much. - (zero? (system* "./libarchive_test" "^test_*_disk*")) - (zero? (system* "./bsdcpio_test" "^test_owner_parse")) - (zero? (system* "./bsdtar_test")))) - %standard-phases)))) - (home-page "http://libarchive.org/") - (synopsis "Multi-format archive and compression library") - (description - "Libarchive provides a flexible interface for reading and writing -archives in various formats such as tar and cpio. Libarchive also supports -reading and writing archives compressed using various compression filters such -as gzip and bzip2. The library is inherently stream-oriented; readers -serially iterate through the archive, writers serially add things to the -archive. In particular, note that there is currently no built-in support for -random access nor for in-place modification.") - (license license:bsd-2))) -- cgit v1.2.3