[PATCH 0/2] two more packages

[PATCH 0/2] two more packages

[Efraim Flashner]

Going through my GUIX_PACKAGE_PATH, I've pulled out two packages that should be
ready to send upstream. More to follow, hopefully very soon.

Efraim Flashner (2):
  gnu: Add edi.
  gnu: Add libhdate.

 gnu/packages/calendar.scm      | 21 +++++++++++++++++++++
 gnu/packages/enlightenment.scm | 26 ++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

-- 
2.10.0

[PATCH 1/2] gnu: Add edi.

[Efraim Flashner]

* gnu/packages/enlightenment.scm (edi): New variable.
---
 gnu/packages/enlightenment.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 7cd11b5..a0c5a83 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -275,3 +275,29 @@ Libraries stack (eo, evas, ecore, edje, emotion, ethumb and elementary).")
 
 (define-public python2-efl
   (package-with-python2 python-efl))
+
+(define-public edi
+  (package
+    (name "edi")
+    (version "0.4.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (list
+               (string-append "https://download.enlightenment.org/rel/apps/edi"
+                              "/edi-" version ".tar.bz2")
+               (string-append "https://github.com/ajwillia-ms/edi/releases/"
+                              "download/v" version "/edi-" version ".tar.bz2")))
+        (sha256
+         (base32
+          "02d8hplcviayri8fxws56n362k6zqsf62v8pbn5sbgwrmkqwybhc"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("efl" ,efl)))
+    (home-page "https://www.enlightenment.org/about-edi")
+    (synopsis "Development environment using the EFL")
+    (description "EDI is a development environment designed for and built using
+the EFL.  It's aim is to create a new, native development environment for Linux
+that trys to lower the barrier to getting involved in Enlightenment development
+and in creating apps based on the EFL suite.")
+    (license license:gpl2)))
-- 
2.10.0

Re: [PATCH 1/2] gnu: Add edi.

[Eric Bavier]

On Thu,  8 Sep 2016 13:44:38 +0300
Efraim Flashner <efraim@flashner.co.il> wrote:

> * gnu/packages/enlightenment.scm (edi): New variable.
> ---
>  gnu/packages/enlightenment.scm | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 
> diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
> index 7cd11b5..a0c5a83 100644
> --- a/gnu/packages/enlightenment.scm
> +++ b/gnu/packages/enlightenment.scm
> @@ -275,3 +275,29 @@ Libraries stack (eo, evas, ecore, edje, emotion, ethumb and elementary).")
>  
>  (define-public python2-efl
>    (package-with-python2 python-efl))
> +
> +(define-public edi
> +  (package
> +    (name "edi")
> +    (version "0.4.0")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (list
> +               (string-append "https://download.enlightenment.org/rel/apps/edi"
> +                              "/edi-" version ".tar.bz2")
> +               (string-append "https://github.com/ajwillia-ms/edi/releases/"
> +                              "download/v" version "/edi-" version ".tar.bz2")))
> +        (sha256
> +         (base32
> +          "02d8hplcviayri8fxws56n362k6zqsf62v8pbn5sbgwrmkqwybhc"))))
> +    (build-system gnu-build-system)
> +    (native-inputs `(("pkg-config" ,pkg-config)))
> +    (inputs `(("efl" ,efl)))

Apparently EDI can use libclang for syntax highlighting.  Would that be
useful enough to add clang as an input?

> +    (home-page "https://www.enlightenment.org/about-edi")
> +    (synopsis "Development environment using the EFL")

I think its best (and the guix manual suggests) to avoid acronyms in
the package synopsis.  Maybe: "Development environment for
Enlightenment"?

> +    (description "EDI is a development environment designed for and built using
> +the EFL.  It's aim is to create a new, native development environment for Linux
> +that trys to lower the barrier to getting involved in Enlightenment development
        ^^^^
"tries"

> +and in creating apps based on the EFL suite.")
                   ^^^^
That word makes me cringe every time.

> +    (license license:gpl2)))

According to COPYING, the code in 'data/extra/skeleton' is
public-domain.  The other GPLv2 source doesn't appear to contain
license headers, so I think we're allowed to say gpl2+.  There's also a
COPYING.LGPL file, the header of which say it applies to "Elm_Code",
but I can't seem to find where that code lives.  And then the
edi/packaging/pkgbuild/PKGBUILD file has "license=('WTFPL')" in it.  I
haven't looked at the other enlightenment software, do they all have
license situations like this?

Could you look into it some more and get some clarification?

Thanks,
`~Eric

Re: [PATCH 1/2] gnu: Add edi.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 3902 bytes --]

On Thu, Sep 08, 2016 at 11:41:27PM -0500, Eric Bavier wrote:
> On Thu,  8 Sep 2016 13:44:38 +0300
> Efraim Flashner <efraim@flashner.co.il> wrote:
> 
> > * gnu/packages/enlightenment.scm (edi): New variable.
> > ---
> >  gnu/packages/enlightenment.scm | 26 ++++++++++++++++++++++++++
> >  1 file changed, 26 insertions(+)
> > 
> > diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
> > index 7cd11b5..a0c5a83 100644
> > --- a/gnu/packages/enlightenment.scm
> > +++ b/gnu/packages/enlightenment.scm
> > @@ -275,3 +275,29 @@ Libraries stack (eo, evas, ecore, edje, emotion, ethumb and elementary).")
> >  
> >  (define-public python2-efl
> >    (package-with-python2 python-efl))
> > +
> > +(define-public edi
> > +  (package
> > +    (name "edi")
> > +    (version "0.4.0")
> > +    (source
> > +      (origin
> > +        (method url-fetch)
> > +        (uri (list
> > +               (string-append "https://download.enlightenment.org/rel/apps/edi"
> > +                              "/edi-" version ".tar.bz2")
> > +               (string-append "https://github.com/ajwillia-ms/edi/releases/"
> > +                              "download/v" version "/edi-" version ".tar.bz2")))
> > +        (sha256
> > +         (base32
> > +          "02d8hplcviayri8fxws56n362k6zqsf62v8pbn5sbgwrmkqwybhc"))))
> > +    (build-system gnu-build-system)
> > +    (native-inputs `(("pkg-config" ,pkg-config)))
> > +    (inputs `(("efl" ,efl)))
> 
> Apparently EDI can use libclang for syntax highlighting.  Would that be
> useful enough to add clang as an input?

It would. I was worried about how big clang is compared to the rest of
the package, but with the shared libraries bringing its size down it
should be good.

> 
> > +    (home-page "https://www.enlightenment.org/about-edi")
> > +    (synopsis "Development environment using the EFL")
> 
> I think its best (and the guix manual suggests) to avoid acronyms in
> the package synopsis.  Maybe: "Development environment for
> Enlightenment"?
> 

They try to draw (somewhat of) a distinction beween the libraries and
the desktop, but considering the description blurs it again this sounds
good.

> > +    (description "EDI is a development environment designed for and built using
> > +the EFL.  It's aim is to create a new, native development environment for Linux
> > +that trys to lower the barrier to getting involved in Enlightenment development
>         ^^^^
> "tries"
> 
> > +and in creating apps based on the EFL suite.")
>                    ^^^^
> That word makes me cringe every time.
> 
> > +    (license license:gpl2)))
> 
> According to COPYING, the code in 'data/extra/skeleton' is
> public-domain.  The other GPLv2 source doesn't appear to contain
> license headers, so I think we're allowed to say gpl2+.  There's also a
> COPYING.LGPL file, the header of which say it applies to "Elm_Code",
> but I can't seem to find where that code lives.  And then the
> edi/packaging/pkgbuild/PKGBUILD file has "license=('WTFPL')" in it.  I
> haven't looked at the other enlightenment software, do they all have
> license situations like this?
> 
> Could you look into it some more and get some clarification?
> 

elm_code got removed after 0.3.0 but the license wasn't. the skeleton i
believe is for if you just want a new, "default" EFL package, so while
it gets included in the install, to me it seems more like text than
code. Then again its there so I should mention it. I'm not sure why it
says WTFPL in their PKGBUILD file but I'll ask about it. Most of their
programs are light in license headers.

> Thanks,
> `~Eric

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 2/2] gnu: Add libhdate.

[Efraim Flashner]

* gnu/packages/calendar.scm (libhdate): New variable.
---
 gnu/packages/calendar.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index cf85899..0c37caa 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -166,3 +166,24 @@ program to be executed.  It also features: sophisticated date calculation,
 moon phases, sunrise/sunset, Hebrew calendar, alarms, PostScript output and
 proper handling of holidays.")
     (license gpl2)))
+
+(define-public libhdate
+  (package
+    (name "libhdate")
+    (version "1.6.02")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "mirror://sourceforge/libhdate/libhdate/libhdate-"
+                            version "/" name "-" version ".tar.bz2"))
+        (sha256
+         (base32
+          "0qkpq412p78znw8gckwcx3l0wcss9s0dgw1pvjb1ih2pxf6hm4rw"))))
+    (build-system gnu-build-system)
+    (home-page "http://libhdate.sourceforge.net/")
+    (synopsis "Library to use Hebrew dates")
+    (description "LibHdate is a small library for the Hebrew calendar and times
+of day, written in C, and including bindings for C++, pascal, perl, php, python,
+and ruby.  It includes two illustrative command-line programs, @code{hcal} and
+@code{hdate}, and some snippets and scripts written in the binding languages.")
+    (license gpl3+)))
-- 
2.10.0

Re: [PATCH 2/2] gnu: Add libhdate.

[Eric Bavier]

On Thu,  8 Sep 2016 13:44:39 +0300
Efraim Flashner <efraim@flashner.co.il> wrote:

> * gnu/packages/calendar.scm (libhdate): New variable.
> ---
>  gnu/packages/calendar.scm | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
> 
> diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
> index cf85899..0c37caa 100644
> --- a/gnu/packages/calendar.scm
> +++ b/gnu/packages/calendar.scm
> @@ -166,3 +166,24 @@ program to be executed.  It also features: sophisticated date calculation,
>  moon phases, sunrise/sunset, Hebrew calendar, alarms, PostScript output and
>  proper handling of holidays.")
>      (license gpl2)))
> +
> +(define-public libhdate
> +  (package
> +    (name "libhdate")
> +    (version "1.6.02")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (string-append "mirror://sourceforge/libhdate/libhdate/libhdate-"
> +                            version "/" name "-" version ".tar.bz2"))
> +        (sha256
> +         (base32
> +          "0qkpq412p78znw8gckwcx3l0wcss9s0dgw1pvjb1ih2pxf6hm4rw"))))
> +    (build-system gnu-build-system)
> +    (home-page "http://libhdate.sourceforge.net/")
> +    (synopsis "Library to use Hebrew dates")
> +    (description "LibHdate is a small library for the Hebrew calendar and times
> +of day, written in C, and including bindings for C++, pascal, perl, php, python,
> +and ruby.  It includes two illustrative command-line programs, @code{hcal} and
> +@code{hdate}, and some snippets and scripts written in the binding languages.")
> +    (license gpl3+)))

LGTM!

`~Eric