[bug#30798] [PATCH 2/2] gnu: Add emacs-deft

[bug#30798] [PATCH 2/2] gnu: Add emacs-deft

[Konrad Hinsen]

* gnu/packages/emacs.scm (emacs-deft): New variable.
---
 gnu/packages/emacs.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 9c9c399fd..07ac1f0fe 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -7389,3 +7389,26 @@ to inherit a login shell's environment variables.  It also allows other
 environment variables to be retrieved from the shell, so that Emacs will
 see the same values you get in a terminal.")
     (license license:gpl3+)))
+
+(define-public emacs-deft
+  (package
+    (name "emacs-deft")
+    (version "0.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://stable.melpa.org/packages/deft-"
+             version
+             ".el"))
+       (sha256
+        (base32
+         "1vb9cjxskc7c0yyf9pvxy1fzypg1vrcgwnjz0m3hslinsgdyig58"))))
+    (build-system emacs-build-system)
+    (home-page "https://jblevins.org/projects/deft/")
+    (synopsis
+     "Quickly browse, filter, and edit plain text notes")
+    (description
+     "Deft is an Emacs mode for quickly browsing, filtering, and editing
+directories of plain text notes, inspired by Notational Velocity.")
+    (license license:gpl3+)))
-- 
2.16.2

[bug#30798] [PATCH 2/2] gnu: Add emacs-deft

[Oleg Pykhalov]

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

Hello Konrad,

First of all thank you for your contribution!

Konrad Hinsen <konrad.hinsen@fastmail.net> writes:

> * gnu/packages/emacs.scm (emacs-deft): New variable.
> ---
>  gnu/packages/emacs.scm | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 9c9c399fd..07ac1f0fe 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -7389,3 +7389,26 @@ to inherit a login shell's environment variables.  It also allows other
>  environment variables to be retrieved from the shell, so that Emacs will
>  see the same values you get in a terminal.")
>      (license license:gpl3+)))
> +
> +(define-public emacs-deft
> +  (package
> +    (name "emacs-deft")
> +    (version "0.8")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "http://stable.melpa.org/packages/deft-"
> +             version
> +             ".el"))

Unfortunately, we can't use sources from MELPA.  The problem is: when a
repository get a new commit, the old tarball is *REPLACED* with the new
one on MELPA, so the package could never be built anymore, since the
source disappeared.  That's why we use tarballs directly from source.

You could use Deft source tarball https://github.com/jrblevin/deft/tags


BTW, to make a recipe more polished you could remove unnecessary new
lines, for example:

       (uri (string-append "http://stable.melpa.org/packages/deft-"
             version ".el"))

> +       (sha256
> +        (base32
> +         "1vb9cjxskc7c0yyf9pvxy1fzypg1vrcgwnjz0m3hslinsgdyig58"))))
> +    (build-system emacs-build-system)
> +    (home-page "https://jblevins.org/projects/deft/")
> +    (synopsis
> +     "Quickly browse, filter, and edit plain text notes")

Likewise, unnecessary new line.

> +    (description
> +     "Deft is an Emacs mode for quickly browsing, filtering, and editing
> +directories of plain text notes, inspired by Notational Velocity.")
> +    (license license:gpl3+)))

The home page says Deft is licensed under BSD license.  Could you check
it, please?

Oleg.

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

[bug#30798] [PATCH 2/2] gnu: Add emacs-deft

[Konrad Hinsen]

Hi Oleg,

> Unfortunately, we can't use sources from MELPA.  The problem is: when a
> repository get a new commit, the old tarball is *REPLACED* with the new
> one on MELPA, so the package could never be built anymore, since the
> source disappeared.  That's why we use tarballs directly from source.

Are you sure this also applies to *stable* MELPA?

Konrad.

[bug#30798] [PATCH 2/2] gnu: Add emacs-deft

[Oleg Pykhalov]

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

Konrad Hinsen <konrad.hinsen@fastmail.net> writes:

>> Unfortunately, we can't use sources from MELPA.  The problem is: when a
>> repository get a new commit, the old tarball is *REPLACED* with the new
>> one on MELPA, so the package could never be built anymore, since the
>> source disappeared.  That's why we use tarballs directly from source.
>
> Are you sure this also applies to *stable* MELPA?

I'm not sure about *stable* MELPA.  I see more package pulled from MELPA
stable in ‘emacs.scm’ and think we could stick to MELPA stable here.

Then, change URL to *https*, please.

Oleg.

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

[bug#30798] [PATCH 2/2] gnu: Add emacs-deft

[Konrad Hinsen]

* gnu/packages/emacs.scm (emacs-deft): New variable.
---
 gnu/packages/emacs.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 35acfdd20..f51f696fd 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -7386,3 +7386,26 @@ inherit a login shell's environment variables.  It also allows other
 environment variables to be retrieved from the shell, so that Emacs will see
 the same values you get in a terminal.")
     (license license:gpl3+)))
+
+(define-public emacs-deft
+  (package
+    (name "emacs-deft")
+    (version "0.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://stable.melpa.org/packages/deft-"
+                           version ".el"))
+       (sha256
+        (base32
+         "1vb9cjxskc7c0yyf9pvxy1fzypg1vrcgwnjz0m3hslinsgdyig58"))))
+    (build-system emacs-build-system)
+    (home-page "https://jblevins.org/projects/deft/")
+    (synopsis "Quickly browse, filter, and edit plain text notes")
+    (description
+     "Deft is an Emacs mode for quickly browsing, filtering, and editing
+directories of plain text notes, inspired by Notational Velocity.")
+    ;; A comment in the code says "may be freely distributed and modified
+    ;; under the BSD license". I take this to mean the original
+    ;; BSD license, called bsd-4 in Guix.
+    (license license:bsd-4)))
-- 
2.16.2

bug#30798: [PATCH 2/2] gnu: Add emacs-deft

[Oleg Pykhalov]

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

Konrad Hinsen <konrad.hinsen@fastmail.net> writes:

> * gnu/packages/emacs.scm (emacs-deft): New variable.
> ---
>  gnu/packages/emacs.scm | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 35acfdd20..f51f696fd 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -7386,3 +7386,26 @@ inherit a login shell's environment variables.  It also allows other
>  environment variables to be retrieved from the shell, so that Emacs will see
>  the same values you get in a terminal.")
>      (license license:gpl3+)))
> +

[…]

> +    ;; A comment in the code says "may be freely distributed and modified
> +    ;; under the BSD license". I take this to mean the original
> +    ;; BSD license, called bsd-4 in Guix.
> +    (license license:bsd-4)))

Thank you for investigation, but it's a BSD 3-Clause license.  It's easy
to check, because there are *3 clauses* in the license text:

    ;; Redistribution and use in source and binary forms, with or
    ;; without modification, are permitted provided that the following
    ;; conditions are met:
    ;; 1. Redistributions of source code must retain the above copyright
    ;;    notice, this list of conditions and the following disclaimer.
    ;; 2. Redistributions in binary form must reproduce the above
    ;;    copyright notice, this list of conditions and the following
    ;;    disclaimer in the documentation and/or other materials
    ;;    provided with the distribution.
    ;; 3. Neither the names of the copyright holders nor the names of
    ;;    any contributors may be used to endorse or promote products
    ;;    derived from this software without specific prior written
    ;;    permission.


As a tip,  we have a ‘licensecheck’ program in Guix package collection,
which could parse a source code file and tell a license.


Also don't forget a dot at the end in commit message.


Pushed with changes above as 5d818b3557cc3b546d5bd0639359c14c7c0ab685

I'll close the bug report.

Thanks,
Oleg.

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

[bug#30798] [PATCH 2/2] gnu: Add emacs-deft

[Konrad Hinsen]

Hi Oleg,

> Thank you for investigation, but it's a BSD 3-Clause license.  It's easy
> to check, because there are *3 clauses* in the license text:

Makes sense - but it isn't exactly obvious either to
non-lawyers. Therefore...

> As a tip,  we have a ‘licensecheck’ program in Guix package collection,
> which could parse a source code file and tell a license.

... this looks like a nice tool to have. Installed :-)

> Pushed with changes above as 5d818b3557cc3b546d5bd0639359c14c7c0ab685
>
> I'll close the bug report.

Ok, thanks!

Konrad.