From d71184f8a5c33c970ba0f50e9ca16b271da301b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 03:25:44 +0100 Subject: gnu: perl-xml-libxml: Update to 2.0134. * gnu/packages/xml.scm (perl-xml-libxml): Update to 2.0134. --- 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 52f1533699..51f3871218 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -404,7 +404,7 @@ combination with @code{XML::Parser}, PerlSAX, @code{XML::DOM}, (define-public perl-xml-libxml (package (name "perl-xml-libxml") - (version "2.0132") + (version "2.0134") (source (origin (method url-fetch) @@ -412,7 +412,7 @@ combination with @code{XML::Parser}, PerlSAX, @code{XML::DOM}, "XML-LibXML-" version ".tar.gz")) (sha256 (base32 - "0xnl281hb590i287fxpl947f1s4zl9dnvc4ajvsqi89w23im453j")))) + "1ks69xymv6zkj7hvaymjvb78ch81abri7kg4zrwxhdfsqb8a9g7h")))) (build-system perl-build-system) (propagated-inputs `(("perl-xml-namespacesupport" ,perl-xml-namespacesupport) -- cgit v1.2.3 From f8be928760b390409293b49d276c0de95730f17c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 02:22:45 +0100 Subject: gnu: libxls: Expand synopsis & description. * gnu/packages/xml.scm (libxls)[synopsis, description]: Expand. --- gnu/packages/xml.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 51f3871218..30b5a25661 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1280,10 +1280,12 @@ files. It is designed to be fast and to handle large input files.") ("automake" ,automake) ("libtool" ,libtool))) (home-page "http://libxls.sourceforge.net/") - (synopsis "Read Excel files") + (synopsis "Read binary (.xls) Excel spreadsheet files") (description - "libxls is a C library which can read Excel (xls) files since Excel 97 (the BIFF8 format). -libxls cannot write Excel files.") + "libxls is a C library to read .xls spreadsheet files in the binary OLE +BIFF8 format as created by Excel 97 and later versions. It cannot write them. + +This package also provides @command{xls2csv} to export Excel files to CSV.") (license license:bsd-2))) (define-public freexl -- cgit v1.2.3 From 9b069c15e07145b9c23f1f8e56b3f107ee579c53 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 02:25:45 +0100 Subject: gnu: libxls: Update to 1.5.0 [security fixes]. * gnu/packages/xml.scm (libxls): Update to 1.5.0. [source, home-page]: Update home page. [arguments, native-inputs]: Remove all of them. --- gnu/packages/xml.scm | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 30b5a25661..9803193bf9 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1257,29 +1257,16 @@ files. It is designed to be fast and to handle large input files.") (define-public libxls (package (name "libxls") - (version "1.4.0") - (source (origin - (method url-fetch) - (uri (string-append "https://sourceforge.net/projects/" - name "/files/" name "-" - version ".zip")) - (sha256 - (base32 - "1g8ds7wbhsa4hdcn77xc2c0l3vvz5bx2hx9ng9c9n7aii92ymfnk")))) + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/libxls/libxls/releases/download/" + "v" version "/libxls-" version ".tar.gz")) + (sha256 + (base32 "00j2lrcvvhclmh3z9vy7myqq1br1jnnqkz2wzgk4a1gbg8c5afn5")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; Bootstrapping is required in order to fix the test driver script. - (replace 'bootstrap - (lambda _ - (invoke "bash" "bootstrap")))))) - (native-inputs - `(("unzip" ,unzip) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) - (home-page "http://libxls.sourceforge.net/") + (home-page "https://github.com/libxls/libxls") (synopsis "Read binary (.xls) Excel spreadsheet files") (description "libxls is a C library to read .xls spreadsheet files in the binary OLE -- cgit v1.2.3 From cd4b2e78c59223ddcd0fd8c561b4ff42f87570dc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 02:32:22 +0100 Subject: gnu: libxls: Move to (gnu packages statistics). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It has nothing to do with XML. * gnu/packages/xml.scm (libxls): Move from here… * gnu/packages/statistics.scm (libxls): …to here. --- gnu/packages/statistics.scm | 23 ++++++++++++++++++++++- gnu/packages/xml.scm | 21 --------------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 04b49def54..e1f48db22d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016, 2017 Raoul Bonnal ;;; Copyright © 2017 Kyle Meyer -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Alex Kost ;;; Copyright © 2018 Alex Branham ;;; @@ -150,6 +150,27 @@ simulation not wholly unlike BUGS. JAGS was written with three aims in mind: @end enumerate\n") (license license:gpl2))) +(define-public libxls + (package + (name "libxls") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/libxls/libxls/releases/download/" + "v" version "/libxls-" version ".tar.gz")) + (sha256 + (base32 "00j2lrcvvhclmh3z9vy7myqq1br1jnnqkz2wzgk4a1gbg8c5afn5")))) + (build-system gnu-build-system) + (home-page "https://github.com/libxls/libxls") + (synopsis "Read binary (.xls) Excel spreadsheet files") + (description + "libxls is a C library to read .xls spreadsheet files in the binary OLE +BIFF8 format as created by Excel 97 and later versions. It cannot write them. + +This package also provides @command{xls2csv} to export Excel files to CSV.") + (license license:bsd-2))) + ;; Update this package together with the set of recommended packages: r-boot, ;; r-class, r-cluster, r-codetools, r-foreign, r-kernsmooth, r-lattice, ;; r-mass, r-matrix, r-mgcv, r-nlme, r-nnet, r-rpart, r-spatial, r-survival. diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9803193bf9..c80dfb1eac 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1254,27 +1254,6 @@ files. It is designed to be fast and to handle large input files.") (define-public python2-defusedxml (package-with-python2 python-defusedxml)) -(define-public libxls - (package - (name "libxls") - (version "1.5.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/libxls/libxls/releases/download/" - "v" version "/libxls-" version ".tar.gz")) - (sha256 - (base32 "00j2lrcvvhclmh3z9vy7myqq1br1jnnqkz2wzgk4a1gbg8c5afn5")))) - (build-system gnu-build-system) - (home-page "https://github.com/libxls/libxls") - (synopsis "Read binary (.xls) Excel spreadsheet files") - (description - "libxls is a C library to read .xls spreadsheet files in the binary OLE -BIFF8 format as created by Excel 97 and later versions. It cannot write them. - -This package also provides @command{xls2csv} to export Excel files to CSV.") - (license license:bsd-2))) - (define-public freexl (package (name "freexl") -- cgit v1.2.3