Thanks for accepting! I have some comments/questions below.
Björn On Sat, 21 Jan 2017 14:08:12 +0100 Marius Bakke <mba...@fastmail.com> wrote: > Björn Höfling <bjoern.hoefl...@bjoernhoefling.de> writes: > > > * gnu/packages/geo.scm (geos): New variable. > > Thanks for this! I've applied it with some minor changes, described > below: > > > +(define-public geos > > + (package > > + (name "geos") > > + (version "3.6.1") > > + (source (origin > > + (method url-fetch) > > + (uri (string-append > > "http://download.osgeo.org/geos/geos-" > > + version > > + ".tar.bz2")) > > + (sha256 > > + (base32 > > + > > "1icz31kd5sml2kdxhjznvmv33zfr6nig9l0i6bdcz9q9g8x4wbja")))) > > + (build-system gnu-build-system) > > + (arguments `(#:phases > > + (modify-phases %standard-phases > > + (add-after > > + 'unpack 'patch-test-shebangs > > + (lambda _ > > + (substitute* > > '("tests/xmltester/testrunner.sh" > > + > > "tests/geostest/testrunner.sh") > > + (("/bin/sh") (which "bash"))) > > Bash behaves differently based on whether it's invoked as 'bash' or > 'sh', so I changed this to (which "sh") to be safe. I thought I found that sh-> "bash" substitution quite often, for example here in nginx: http://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/web.scm#n148 > > > + #t))))) > > + (inputs > > + `(("glib" ,glib))) > > + (home-page "https://geos.osgeo.org/") > > + (synopsis "Geometry Engine - Open Source") > > We try to avoid terms like "open source" or "free software" since it's > implied in the context of Guix. OK, maybe that synopsis was a bit short, because "Geometry Engine - Open Source" is just the long name of GEOS. > > > + (description > > + "GEOS (Geometry Engine - Open Source) is a C++ port of the > > +Java Topology Suite (JTS). As such, it aims to contain the > > complete +functionality of JTS in C++. This includes all the > > OpenGIS Simple Features +for SQL spatial predicate functions and > > spatial operators, +as well as specific JTS enhanced topology > > functions.") > > I took inspiration from Debians description of this package and > tweaked it a little. > > > + (license license:lgpl2.1))) > > The files do not mention whether it's 2.1 only or later versions so we > default to "or later". Also found a few files with other licenses. I also found no mentioning of "later" or not, so I thought to stick with the mentioned license version. What makes you use the "or later" version? > > Pushed as 252611c7c4e72577cd0c91a41e10176f37ac318b !