From 5f8642ea6ae675d0fb5b06e616064458433087d3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 15:40:21 +0200 Subject: gnu: libxml2: Move static library to separate output. * gnu/packages/xml.scm (libxml2)[outputs, arguments]: New fields. --- gnu/packages/xml.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 1bf99f2fe5..85fd553b40 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -129,6 +129,20 @@ hierarchical form with variable field lengths.") (base32 "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b")))) (build-system gnu-build-system) + (outputs '("out" "static")) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'install 'move-static-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((src (string-append (assoc-ref outputs "out") "/lib")) + (dst (string-append (assoc-ref outputs "static") + "/lib"))) + (mkdir-p dst) + (for-each (lambda (ar) + (rename-file ar (string-append dst "/" + (basename ar)))) + (find-files src "\\.a$")) + #t)))))) (home-page "http://www.xmlsoft.org/") (synopsis "C parser for XML") (propagated-inputs `(("zlib" ,zlib))) ; libxml2.la says '-lz'. -- cgit v1.2.3 From 7ba79d5d76327054f96f66625c314e365d5d9fd9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 15:47:24 +0200 Subject: gnu: libxml2: Add explicit dependency on XZ. * gnu/packages/xml.scm (libxml2)[inputs]: New field. --- gnu/packages/xml.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 85fd553b40..644753ff53 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -145,6 +145,7 @@ hierarchical form with variable field lengths.") #t)))))) (home-page "http://www.xmlsoft.org/") (synopsis "C parser for XML") + (inputs `(("xz" ,xz))) (propagated-inputs `(("zlib" ,zlib))) ; libxml2.la says '-lz'. (native-inputs `(("perl" ,perl))) ;; $XML_CATALOG_FILES lists 'catalog.xml' files found in under the 'xml' -- cgit v1.2.3 From d3028f5b273d50a490a790fba94f49494f0c7b4c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 14:55:40 +0200 Subject: gnu: python-libxml2: Do not build static output. This is a follow-up to commit 5f8642ea6ae675d0fb5b06e616064458433087d3. * gnu/packages/xml.scm (python-libxml2)[outputs]: Don't inherit from libxml2. --- gnu/packages/xml.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 644753ff53..26810773ce 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -166,6 +166,7 @@ project (but it is usable outside of the Gnome platform).") (package/inherit libxml2 (name "python-libxml2") (build-system python-build-system) + (outputs '("out")) (arguments `(;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'. #:tests? #f -- cgit v1.2.3 From 1c61a086bcb2644e6d6c6fc714dde498402cc561 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:55:14 +0200 Subject: gnu: expat: Update to 2.2.6. * gnu/packages/xml.scm (expat): Update to 2.2.6. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 26810773ce..e4284333bc 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -64,14 +64,14 @@ (define-public expat (package (name "expat") - (version "2.2.5") + (version "2.2.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/expat/expat/" version "/expat-" version ".tar.bz2")) (sha256 (base32 - "1xpd78sp7m34jqrw5x13bz7kgz0n6aj15wn4zj4gfx3ypbpk5p6r")))) + "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p")))) (build-system gnu-build-system) (home-page "https://libexpat.github.io/") (synopsis "Stream-oriented XML parser library written in C") -- cgit v1.2.3 From aa6f87a2b984039229abbaba08c06415a782badc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 Jun 2018 21:13:52 -0400 Subject: gnu: xml: Return #t from all phases. * gnu/packages/xml.scm (python-libxml2, perl-xml-sax, xlsx2csv, libxls) (java-kxml2): Return #t from all phases. --- gnu/packages/xml.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 7f7ff6fc38..3ac01133e5 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -187,7 +187,8 @@ project (but it is usable outside of the Gnome platform).") (format #f "ROOT = r'~a'" libxml2)) ;; For 'iconv.h'. (("/opt/include") - (string-append glibc "/include"))))))))) + (string-append glibc "/include")))) + #t))))) (inputs `(("libxml2" ,libxml2))) (synopsis "Python bindings for the libxml2 library"))) @@ -552,7 +553,8 @@ that allow you to generate HTML from an RSS, convert between 0.9, 0.91, and (setenv "PERL5LIB" (string-append (getenv "PERL5LIB") ":" (assoc-ref outputs "out") - "/lib/perl5/site_perl"))))))) + "/lib/perl5/site_perl")) + #t))))) (home-page "https://metacpan.org/release/XML-SAX") (synopsis "Perl API for XML") (description "XML::SAX consists of several framework classes for using and @@ -1220,7 +1222,7 @@ elements to their parents (substitute* "test/run" ;; Run tests with `python' only (("^(PYTHON_VERSIONS = ).*" all m) (string-append m "['']"))) - (zero? (system* "test/run"))))))) + (invoke "test/run")))))) (home-page "https://github.com/dilshod/xlsx2csv") (synopsis "XLSX to CSV converter") (description @@ -1269,7 +1271,7 @@ files. It is designed to be fast and to handle large input files.") ;; Bootstrapping is required in order to fix the test driver script. (replace 'bootstrap (lambda _ - (zero? (system* "bash" "bootstrap"))))))) + (invoke "bash" "bootstrap")))))) (native-inputs `(("unzip" ,unzip) ("autoconf" ,autoconf) @@ -1870,7 +1872,8 @@ low memory footprint.") (modify-phases %standard-phases (add-before 'build 'copy-resources (lambda _ - (copy-recursively "src/main/resources" "build/classes")))))) + (copy-recursively "src/main/resources" "build/classes") + #t))))) (inputs `(("java-xpp3" ,java-xpp3))) (native-inputs -- cgit v1.2.3