From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Robst Subject: Re: [PATCH] gnu: Add hdf4 Date: Tue, 24 May 2016 14:20:08 +0100 (BST) Message-ID: References: <20160523181719.GA11083@jasmine> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5CFx-0002qV-F4 for guix-devel@gnu.org; Tue, 24 May 2016 09:20:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5CFt-00074m-7F for guix-devel@gnu.org; Tue, 24 May 2016 09:20:21 -0400 Received: from smtp-out6.electric.net ([192.162.217.191]:56980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5CFt-00073a-0Q for guix-devel@gnu.org; Tue, 24 May 2016 09:20:17 -0400 Received: from 1b5CFm-0001Qa-Vm by out6c.electric.net with emc1-ok (Exim 4.87) (envelope-from ) id 1b5CFn-0001SM-TY for guix-devel@gnu.org; Tue, 24 May 2016 06:20:11 -0700 Received: from [192.171.137.70] (helo=bsmail.nerc-bas.ac.uk) by out6c.electric.net with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.87) (envelope-from ) id 1b5CFm-0001Qa-Vm for guix-devel@gnu.org; Tue, 24 May 2016 06:20:10 -0700 Received: from ams3.nerc-bas.ac.uk (ams3 [10.2.1.142]) by bsmail.nerc-bas.ac.uk (8.13.8/8.13.8) with ESMTP id u4ODKA5H026270 for ; Tue, 24 May 2016 14:20:10 +0100 Received: from [10.14.1.90] (helo=jpro.nerc-bas.ac.uk) by ams3.nerc-bas.ac.uk with esmtp (Exim 4.63) (envelope-from ) id 1b5CFl-0006rB-EL for guix-devel@gnu.org; Tue, 24 May 2016 13:20:09 +0000 In-Reply-To: <20160523181719.GA11083@jasmine> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Hi, I could apply the previous patch, but I've created a new one (below) that handles the tests (I think). >> + (license (license:x11-style >> + "https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/unpacked/COPYING")))) > > To me, this looks more like a variation on the BSD license than the x11 > license. Perhaps non-copyleft is a more appropriate choice. Can you look > at some of our packages using non-copyleft and report back? I've changed the license to non-copyleft, which I think is closer. I was copying the hdf5 license definition, which is very similar and probably should also be changed. The definition for hdf4 still isn't quite right though, it doesn't generate a reproducible build - the hdf4 configure script generates a file lib/libhdf4.settings (from libhdf4.settings.in) which includes the config time, user, system information, which obviously changes from build to build or system to system. What's the best way to resolve this ? Thanks Jeremy -- jpro@bas.ac.uk | (work) 01223 221402 (fax) 01223 362616 Unix System Administrator - British Antarctic Survey #include >From 857fb05c7dcc8f19dc7d4cf04039743137f4f0ae Mon Sep 17 00:00:00 2001 From: Jeremy Robst Date: Mon, 23 May 2016 17:59:00 +0100 Subject: [PATCH] gnu: Add hdf4 * gnu/packages/maths.scm (hdf4): New variable --- gnu/packages/maths.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 19ed44f..00c0310 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -408,6 +408,49 @@ plotting engine by third-party applications like Octave.") (license (license:fsf-free "http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright")))) +(define-public hdf4 + (package + (name "hdf4") + (version "4.2.11") + (source + (origin + (method url-fetch) + (uri (string-append + "http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-" + version + ".tar.bz2")) + (sha256 + (base32 + "16yr50j845zlfx20skmw3y75ww77akk9gg0affjqkg66ih5r03mv")))) + (build-system gnu-build-system) + (native-inputs + `(("gfortran" ,gfortran) + ("bison" ,bison) + ("flex" ,flex))) + (inputs + `(("zlib" ,zlib) + ("libjpeg" ,libjpeg))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-configure + (lambda _ + (substitute* '("mfhdf/hdfimport/testutil.sh.in" "hdf/util/testutil.sh.in") + (("/bin/rm") "rm") + (("/bin/mkdir") "mkdir")) + #t))))) + + (home-page "https://www.hdfgroup.org/products/hdf4/") + (synopsis + "Library and multi-object file format for storing and managing data.") + (description "At its lowest level, HDF is a physical file format for +storing scientific data. At its highest level, HDF is a collection of +utilities and applications for manipulating, viewing, and analyzing data +in HDF files. Between these levels, HDF is a software library that provides +high-level APIs and a low-level data interface. ") + (license (license:non-copyleft + "https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/unpacked/COPYING")))) + (define-public hdf5 (package (name "hdf5") -- 1.7.10.4