[PATCH] gnu: Add emacs-clojure-mode

[PATCH] gnu: Add emacs-clojure-mode

[Catonano]

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



[-- Attachment #1.2: Type: text/html, Size: 26 bytes --]

[-- Attachment #2: 0001-gnu-Add-emacs-clojure-mode.patch --]
[-- Type: text/x-patch, Size: 1893 bytes --]

From 6dc8470baf3493a93da3e3358136e5c9860d4e3a Mon Sep 17 00:00:00 2001
From: humanitiesNerd <catonano@gmail.com>
Date: Wed, 18 May 2016 15:41:47 +0200
Subject: gnu: Add emacs-clojure-mode

* gnu/packages/emacs.scm (emacs-clojure-mode): New variable
---
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 32ed722..fb07bc7 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1612,3 +1612,41 @@ It is built on top of the custom theme support in Emacs 24 or later.")
     (license license:gpl3+)))
 
 
+(define-public emacs-clojure-mode
+  (package
+    (name "emacs-clojure-mode")
+    (version "5.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/clojure-emacs/clojure-mode.git")
+             (commit "8ef7127da214cb7fd4b47fc943462f2a8bfb8f85")))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32
+          "1x7nl5wzcah9hnlj5jfd3y5604w60zcqcw1nn6vw335c2vzzissj"))))
+    (build-system emacs-build-system)
+    (home-page "http://github.com/clojure-emacs/clojure-mode")
+    (synopsis "Major mode for Clojure code")
+    (description
+     "Provides font-lock, indentation, navigation and basic refactoring for the
+Clojure programming language (http://clojure.org).
+
+Using clojure-mode with paredit or smartparens is highly recommended.
+
+Here are some example configurations:
+
+  ;; require or autoload paredit-mode
+  (add-hook 'clojure-mode-hook #'paredit-mode)
+
+  ;; require or autoload smartparens
+  (add-hook 'clojure-mode-hook #'smartparens-strict-mode)
+
+See inf-clojure (http://github.com/clojure-emacs/inf-clojure) for
+basic interaction with Clojure subprocesses.
+
+See CIDER (http://github.com/clojure-emacs/cider) for
+better interaction with subprocesses via nREPL.
+")
+    (license license:gpl3+)))
-- 
2.5.5

Re: [PATCH] gnu: Add emacs-clojure-mode

[Alex Kost]

Catonano (2016-05-18 18:09 +0300) wrote:

> From 6dc8470baf3493a93da3e3358136e5c9860d4e3a Mon Sep 17 00:00:00 2001
> From: humanitiesNerd <catonano@gmail.com>
> Date: Wed, 18 May 2016 15:41:47 +0200
> Subject: gnu: Add emacs-clojure-mode
                                      ^
This is a nitpick of course, but we put a period here...

> * gnu/packages/emacs.scm (emacs-clojure-mode): New variable
                                                             ^
... and here.

> ---
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 32ed722..fb07bc7 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -1612,3 +1612,41 @@ It is built on top of the custom theme support in Emacs 24 or later.")
>      (license license:gpl3+)))
>  
>  
> +(define-public emacs-clojure-mode
> +  (package
> +    (name "emacs-clojure-mode")
> +    (version "5.3.0")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://github.com/clojure-emacs/clojure-mode.git")
> +             (commit "8ef7127da214cb7fd4b47fc943462f2a8bfb8f85")))

Is there a reason to use 'git-fetch'?  I think a usual 'url-fetch' is
fine as there is:
<https://github.com/clojure-emacs/clojure-mode/archive/5.3.0.tar.gz>.

> +       (file-name (string-append name "-" version "-checkout"))
> +       (sha256
> +        (base32
> +          "1x7nl5wzcah9hnlj5jfd3y5604w60zcqcw1nn6vw335c2vzzissj"))))
> +    (build-system emacs-build-system)
> +    (home-page "http://github.com/clojure-emacs/clojure-mode")
> +    (synopsis "Major mode for Clojure code")
> +    (description
> +     "Provides font-lock, indentation, navigation and basic refactoring for the

We use full sentences for descriptions, like this: "This emacs package
provides ..."

> +Clojure programming language (http://clojure.org).

Since we use texinfo to format descriptions, it is better to write:

  @uref{http://clojure.org, Clojure programming language}

> +
> +Using clojure-mode with paredit or smartparens is highly recommended.

I think this description is too verbose.  I would remove all the text
below.

> +
> +Here are some example configurations:
> +
> +  ;; require or autoload paredit-mode
> +  (add-hook 'clojure-mode-hook #'paredit-mode)
> +
> +  ;; require or autoload smartparens
> +  (add-hook 'clojure-mode-hook #'smartparens-strict-mode)
> +
> +See inf-clojure (http://github.com/clojure-emacs/inf-clojure) for
> +basic interaction with Clojure subprocesses.
> +
> +See CIDER (http://github.com/clojure-emacs/cider) for
> +better interaction with subprocesses via nREPL.
> +")
> +    (license license:gpl3+)))

-- 
Alex

Re: [PATCH] gnu: Add emacs-clojure-mode

[Catonano]

[-- Attachment #1.1: Type: text/plain, Size: 2076 bytes --]

2016-05-19 10:54 GMT+02:00 Alex Kost <alezost@gmail.com>:

> > Subject: gnu: Add emacs-clojure-mode
>                                       ^
> This is a nitpick of course, but we put a period here...
>
> > * gnu/packages/emacs.scm (emacs-clojure-mode): New variable
>                                                              ^
> ... and here.
>

Do you mean like this ?

Subject: gnu: Add emacs-clojure-mode.

* gnu/packages/emacs.scm (emacs-clojure-mode): New variable.


> > +(define-public emacs-clojure-mode
> > +  (package
> > +    (name "emacs-clojure-mode")
> > +    (version "5.3.0")
> > +    (source
> > +     (origin
> > +       (method git-fetch)
> > +       (uri (git-reference
> > +             (url "https://github.com/clojure-emacs/clojure-mode.git")
> > +             (commit "8ef7127da214cb7fd4b47fc943462f2a8bfb8f85")))
>
> Is there a reason to use 'git-fetch'?  I think a usual 'url-fetch' is
> fine as there is:
> <https://github.com/clojure-emacs/clojure-mode/archive/5.3.0.tar.gz>.
>

No, there's no specific reason. Fixed it.

> +       (file-name (string-append name "-" version "-checkout"))
> > +       (sha256
> > +        (base32
> > +          "1x7nl5wzcah9hnlj5jfd3y5604w60zcqcw1nn6vw335c2vzzissj"))))
> > +    (build-system emacs-build-system)
> > +    (home-page "http://github.com/clojure-emacs/clojure-mode")
> > +    (synopsis "Major mode for Clojure code")
> > +    (description
> > +     "Provides font-lock, indentation, navigation and basic refactoring
> for the
>
> We use full sentences for descriptions, like this: "This emacs package
> provides ..."
>

Fixed


>
> > +Clojure programming language (http://clojure.org).
>
> Since we use texinfo to format descriptions, it is better to write:
>
>   @uref{http://clojure.org, Clojure programming language}
>

Fixed


>
> > +
> > +Using clojure-mode with paredit or smartparens is highly recommended.
>
> I think this description is too verbose.  I would remove all the text
> below.
>

Ok, I cut it.

So, I edited the patch and attached it again.
Would you see if it fits ?
Thanks

[-- Attachment #1.2: Type: text/html, Size: 3931 bytes --]

[-- Attachment #2: 0001-gnu-Add-emacs-clojure-mode.patch --]
[-- Type: text/x-patch, Size: 1436 bytes --]

From 6dc8470baf3493a93da3e3358136e5c9860d4e3a Mon Sep 17 00:00:00 2001
From: humanitiesNerd <catonano@gmail.com>
Date: Wed, 18 May 2016 15:41:47 +0200
Subject: gnu: Add emacs-clojure-mode.

* gnu/packages/emacs.scm (emacs-clojure-mode): New variable.
---
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 32ed722..fb07bc7 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1612,3 +1612,28 @@ It is built on top of the custom theme support in Emacs 24 or later.")
     (license license:gpl3+)))
 
 
+(define-public emacs-clojure-mode
+  (package
+    (name "emacs-clojure-mode")
+    (version "5.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/clojure-emacs/clojure-mode/archive/"
+             version
+             ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+         (base32
+         "0gi8ra3ap5m3mz4qh1yxp2cldn7z9xcxvypznr6rrlc6a9l8s5a6"))))
+    (build-system emacs-build-system)
+    (home-page "http://github.com/clojure-emacs/clojure-mode")
+    (synopsis "Major mode for Clojure code")
+    (description
+     "This Emacs package provides font-lock, indentation,3
+navigation and basic refactoring for the
+@uref{http://clojure.org, Clojure programming language}
+
+Using clojure-mode with paredit or smartparens is highly recommended.")
+    (license license:gpl3+)))

Re: [PATCH] gnu: Add emacs-clojure-mode

[Alex Kost]

Catonano (2016-05-19 13:20 +0300) wrote:

> 2016-05-19 10:54 GMT+02:00 Alex Kost <alezost@gmail.com>:
>
>     > Subject: gnu: Add emacs-clojure-mode
>                                           ^
>     This is a nitpick of course, but we put a period here...
>
>     > * gnu/packages/emacs.scm (emacs-clojure-mode): New variable
>                                                                  ^
>     ... and here.
>
>
> Do you mean like this ?
>
> Subject: gnu: Add emacs-clojure-mode.
>
> * gnu/packages/emacs.scm (emacs-clojure-mode): New variable.

Yes, thanks.

[...]
> So, I edited the patch and attached it again.
> Would you see if it fits ?

Yes, the only thing is: I had to do some manual interventions as this
patch wasn't applied cleanly because it was based on some old commit
(before your smartparens package).

Please, next time make sure that your patch can be applied on the
current master.  And thanks for contributing!

> From 6dc8470baf3493a93da3e3358136e5c9860d4e3a Mon Sep 17 00:00:00 2001
> From: humanitiesNerd <catonano@gmail.com>
> Date: Wed, 18 May 2016 15:41:47 +0200
> Subject: gnu: Add emacs-clojure-mode.
>
> * gnu/packages/emacs.scm (emacs-clojure-mode): New variable.
> ---
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 32ed722..fb07bc7 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -1612,3 +1612,28 @@ It is built on top of the custom theme support in Emacs 24 or later.")
>      (license license:gpl3+)))
>
>
> +(define-public emacs-clojure-mode
> +  (package
> +    (name "emacs-clojure-mode")
> +    (version "5.3.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://github.com/clojure-emacs/clojure-mode/archive/"
> +             version
> +             ".tar.gz"))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +         (base32
> +         "0gi8ra3ap5m3mz4qh1yxp2cldn7z9xcxvypznr6rrlc6a9l8s5a6"))))
> +    (build-system emacs-build-system)
> +    (home-page "http://github.com/clojure-emacs/clojure-mode")
> +    (synopsis "Major mode for Clojure code")
> +    (description
> +     "This Emacs package provides font-lock, indentation,3
I removed this extra "3" -----------------------------------^

> +navigation and basic refactoring for the
> +@uref{http://clojure.org, Clojure programming language}
> +
> +Using clojure-mode with paredit or smartparens is highly recommended.")

I removed the word "highly" as I think it's too much :-)
> +    (license license:gpl3+)))
>

Applied as commit 8eeb301¹, thanks!

¹ http://git.savannah.gnu.org/cgit/guix.git/commit/?id=8eeb301de2b4d3086f8e88f8a48bba0e83cf79bc

-- 
Alex