[bug#28805] [PATCH] gnu: Add emacs-org-plus-contrib.

[Ludovic Courtès]

Hi!

Christopher Baines <address@hidden> skribis:

> On Fri, 13 Oct 2017 23:42:34 +0200
> address@hidden (Ludovic Courtès) wrote:

[...]

>> I’m sorry to ask ;-), but would it be an option to have a separate
>> ‘emacs-contrib’ package instead?  That way people could install
>> emacs-org, and optionally emacs-contrib on top of it.
>
> No problem, I had a similar thought when I was first figuring out what
> this contrib thing was.
>
> I've attached my attempt at making an emacs-org-contrib package. Which
> binds it to the emacs-org package, propagates emacs-org, as well as
> deleting all the files included within the emacs-org package.

[...]

> From 2c5b66bf198ae77047e7c3d4e5631b10e90981eb Mon Sep 17 00:00:00 2001
> From: Christopher Baines <address@hidden>
> Date: Wed, 11 Oct 2017 14:46:47 +0100
> Subject: [PATCH] gnu: Add emacs-org-contrib.
>
> * gnu/packages/emacs.scm (emacs-org-contrib): New variable.
> ---
>  gnu/packages/emacs.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 43 insertions(+)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 7661855a8..7a97a5471 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -4099,6 +4099,49 @@ also is an authoring system with unique support for 
> literate programming and
>  reproducible research.")
>      (license license:gpl3+)))
>  
> +(define-public emacs-org-contrib
> +  (package
> +    (inherit emacs-org)
> +    (name "emacs-org-contrib")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "http://orgmode.org/elpa/org-plus-contrib-";
> +                                  (package-version emacs-org) ".tar"))
> +              (sha256
> +               (base32
> +                "1ya4kah8kg13ka3gpsw8hn6y8358843g986p1bgw5w77n9bgbwsl"))))
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'install 'delete-org-files
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (use-modules (ice-9 ftw))

Please use #:modules instead of this inner ‘use-modules’ form (it has
wacky semantic and could be deprecated in the future.)

> +             (let ((out (assoc-ref outputs "out")))
> +               (for-each
> +                (lambda (file)
> +                  (if (and (not (string-prefix? "." file))
> +                           (file-exists? file))
> +                      (delete-file
> +                       (string-append
> +                        out
> +                        "/share/emacs/site-lisp/guix.d/org-contrib-"
> +                        ,(package-version emacs-org)
> +                        "/"
> +                        file))))
> +                (scandir
> +                 (string-append
> +                  (assoc-ref inputs "emacs-org")
> +                  "/share/emacs/site-lisp/guix.d/org-"
> +                  ,(package-version emacs-org))))))))))

For clarity, what about first buildign up the list of files to delete,
and then actually deleting them?

  (let* (…
         (org+contrib (map basename (find-files out)))
         (org         (map basename (find-files org)))
         (duplicates  (lset-intersection string=? org+contrib org)))
    (with-directory-excursion (string-append out …)
      (for-each delete-file duplicates))
    #t)

WDYT?

Thanks,
Ludo’.