From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d36tW-0007C4-UT for guix-patches@gnu.org; Tue, 25 Apr 2017 16:17:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d36tS-0003v3-Sc for guix-patches@gnu.org; Tue, 25 Apr 2017 16:17:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:41928) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d36tS-0003uv-Q2 for guix-patches@gnu.org; Tue, 25 Apr 2017 16:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d36tS-00032P-IQ for guix-patches@gnu.org; Tue, 25 Apr 2017 16:17:02 -0400 Subject: bug#26622: [PATCH] Add freexl Resent-To: guix-patches@gnu.org Resent-Message-ID: References: From: Ricardo Wurmus In-reply-to: Date: Tue, 25 Apr 2017 22:16:18 +0200 Message-ID: <87vapsqm3x.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Catonano Cc: 26622-done@debbugs.gnu.org Catonano writes: > Another xls files reading library. > > The home page of Freexl says > > FreeXL is licensed under the MPL tri-license terms; you are free to choose > the best-fit license between: > > the MPL 1.1 > the GPL v2.0 or any subsequent version > the LGPL v2.1 or any subsequent version > > I'm not sure what this means for Guix This means that we write something like this: ;; Any of these licenses may be chosen. (license (list license:mpl1.1 license:gpl2+ license:lgpl2.1+)) > Subject: [PATCH 1/1] gnu: Add freexl > > * gnu/packages/xml.scm (freexl): New variable. > --- > gnu/packages/xml.scm | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm > index 7460b5d85..02ae00514 100644 > --- a/gnu/packages/xml.scm > +++ b/gnu/packages/xml.scm > @@ -1122,3 +1122,23 @@ files. It is designed to be fast and to handle large input files.") > "libxls is a C library which can read Excel (xls) files since Excel 97 (the BIFF8 format). > libxls cannot write Excel files.") > (license license:bsd-2))) > + > +(define-public freexl > + (package > + (name "freexl") > + (version "1.0.2") > + (source (origin > + (method url-fetch) > + (uri (string-append "http://www.gaia-gis.it/gaia-sins/" > + name "-" > + version ".tar.gz")) I’d join these two lines. > + (sha256 > + (base32 > + "17a0yrjb0gln7819j0vp7y25imhvwpil2b0rm44mwgzml0a4i6mk")))) > + (build-system gnu-build-system) > + (home-page "https://www.gaia-gis.it/fossil/freexl/index") > + (synopsis "Read Excel files") > + (description > + "FreeXL is an open source library to extract valid data > +from within an Excel (.xls) spreadsheet.") Please don’t use the term “open source”; besides, all software in Guix is free software anyway. Just “FreeXL is a C library to extract …” is sufficient. Pushed with these changes to master with commit 623fb4d16. Thanks! -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net