[bug#66819] [PATCH 0/5] Update Clojure-related packages for Emacs

[bug#66819] [PATCH 0/5] Update Clojure-related packages for Emacs

[jlicht]

From: Jelle Licht <jlicht@fsfe.org>


Cider had a recent release, and related packages can subsequently also be
updated (or streamlined).


Jelle Licht (5):
  gnu: emacs-org-contrib: Remove dependency on emacs-cider.
  gnu: emacs-clojure-mode: Update to 5.18.0.
  gnu: emacs-clj-refactor: Update to 3.10.0.
  gnu: emacs-cider: Update to 1.9.0.
  gnu: emacs-cider: Include enrich-classpath wrapper scripts.

 gnu/packages/emacs-xyz.scm | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)


base-commit: 1dae56618271e7c8b19155d7984b9386ecb661f6
-- 
2.41.0

[bug#66819] [PATCH 1/5] gnu: emacs-org-contrib: Remove dependency on emacs-cider.

[jlicht]

From: Jelle Licht <jlicht@fsfe.org>

Since version 0.4 the ob-clojure-literate.el file with a dependency on cider
was removed from org-contrib.

* gnu/packages/emacs-xyz.scm (emacs-org-contrib)[native-inputs]: Remove
emacs-cider.

Change-Id: I838e965a819d9793424b6310ae324460b260afcc
---

 gnu/packages/emacs-xyz.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index fabd519ca7..7f9d302487 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16513,8 +16513,6 @@ (define-public emacs-org-contrib
          (add-after 'unpack 'enter-source-directory
            (lambda _
              (chdir "lisp"))))))
-    (native-inputs
-     (list emacs-cider))
     (propagated-inputs
      (list emacs-org))
     (home-page "https://git.sr.ht/~bzg/org-contrib")

base-commit: 1dae56618271e7c8b19155d7984b9386ecb661f6
-- 
2.41.0

[bug#66819] [PATCH 2/5] gnu: emacs-clojure-mode: Update to 5.18.0.

[jlicht]

From: Jelle Licht <jlicht@fsfe.org>

* gnu/packages/emacs-xyz.scm (emacs-clojure-mode): Update to 5.18.0.

Change-Id: I84cadfe0af5e1635abd02593e4f5f02b53645b39
---

 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7f9d302487..4d3c176e4f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13117,7 +13117,7 @@ (define-public emacs-lpy
 (define-public emacs-clojure-mode
   (package
     (name "emacs-clojure-mode")
-    (version "5.17.0")
+    (version "5.18.0")
     (source
      (origin
        (method git-fetch)
@@ -13126,7 +13126,7 @@ (define-public emacs-clojure-mode
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0knx3y53z0dn49xisa78bac55vhhkwxs2iw3jvalx41wfwvkirxc"))))
+        (base32 "0g4x587fpzcj9y59k8sb1g7c6yvga9gjs8ximpmar7d8jq2cv5qa"))))
     (build-system emacs-build-system)
     (native-inputs
      (list emacs-buttercup emacs-dash emacs-paredit emacs-s))
-- 
2.41.0

[bug#66819] [PATCH 3/5] gnu: emacs-clj-refactor: Update to 3.10.0.

[jlicht]

From: Jelle Licht <jlicht@fsfe.org>

* gnu/packages/emacs-xyz.scm (emacs-clj-refactor): Update to 3.10.0.

Change-Id: Idef5f44e2e3a8ed149d46ba2307184ffee21de4b
---

 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 4d3c176e4f..3a3da8fe8a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13169,7 +13169,7 @@ (define-public emacs-clj-deps-new
 (define-public emacs-clj-refactor
   (package
     (name "emacs-clj-refactor")
-    (version "3.9.4")
+    (version "3.10.0")
     (source
      (origin
        (method git-fetch)
@@ -13178,7 +13178,7 @@ (define-public emacs-clj-refactor
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1j9pkkpnbvyl9p45dycngdiq2kyj6bmyb709pdxj3nar2d8ryl1h"))))
+        (base32 "100ngpgvff0xvw1h5krvh40sa3ympl241imwskcv62yk29m9z411"))))
     (build-system emacs-build-system)
     (propagated-inputs
      (list emacs-cider
-- 
2.41.0

[bug#66819] [PATCH 4/5] gnu: emacs-cider: Update to 1.9.0.

[jlicht]

From: Jelle Licht <jlicht@fsfe.org>

* gnu/packages/emacs-xyz.scm (emacs-cider): Update to 1.9.0.

Change-Id: I25c511e93bdd7ec19a74ef10d0b5527a9e0b922d
---

 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3a3da8fe8a..29faee5656 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15334,7 +15334,7 @@ (define-public emacs-islisp-mode
 (define-public emacs-cider
   (package
     (name "emacs-cider")
-    (version "1.7.0")
+    (version "1.9.0")
     (source
      (origin
        (method git-fetch)
@@ -15343,7 +15343,7 @@ (define-public emacs-cider
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0jqjgygdvny1vhjbx7k0l492fhamwndsjcbb2mccwp9j47k4qar9"))))
+        (base32 "0sjscbi3qgwn3wcpq5lz7k4gam69h0svh8wbhxcbskr9ys1rmysp"))))
     (build-system emacs-build-system)
     (arguments
      '(#:exclude                        ;don't exclude 'cider-test.el'
-- 
2.41.0

[bug#66819] [PATCH 5/5] gnu: emacs-cider: Include enrich-classpath wrapper scripts.

[jlicht]

From: Jelle Licht <jlicht@fsfe.org>

* gnu/packages/emacs-xyz.scm (emacs-cider)[arguments]<#:include>: Add
"^lein\\.sh$" and "^clojure\\.sh$" to the list of regexes for installed files.

Change-Id: I02507d3cd012dbe827751a21870e4bc1f13d93b5
---

 gnu/packages/emacs-xyz.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 29faee5656..9620c17a5c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15346,7 +15346,8 @@ (define-public emacs-cider
         (base32 "0sjscbi3qgwn3wcpq5lz7k4gam69h0svh8wbhxcbskr9ys1rmysp"))))
     (build-system emacs-build-system)
     (arguments
-     '(#:exclude                        ;don't exclude 'cider-test.el'
+     '(#:include (cons* "^lein\\.sh$" "^clojure\\.sh$" %default-include)
+       #:exclude                        ;don't exclude 'cider-test.el'
        '("^\\.dir-locals\\.el$" "^test/")
        #:phases
        ;; XXX: file "test/cider-tests.el" contains a bogus "/bin/command"
-- 
2.41.0

bug#66819: [PATCH 0/5] Update Clojure-related packages for Emacs

[Andrew Tropin]

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

On 2023-10-29 15:37, jlicht@fsfe.org wrote:

> From: Jelle Licht <jlicht@fsfe.org>
>
>
> Cider had a recent release, and related packages can subsequently also be
> updated (or streamlined).
>
>
> Jelle Licht (5):
>   gnu: emacs-org-contrib: Remove dependency on emacs-cider.
>   gnu: emacs-clojure-mode: Update to 5.18.0.
>   gnu: emacs-clj-refactor: Update to 3.10.0.
>   gnu: emacs-cider: Update to 1.9.0.
>   gnu: emacs-cider: Include enrich-classpath wrapper scripts.
>
>  gnu/packages/emacs-xyz.scm | 17 ++++++++---------
>  1 file changed, 8 insertions(+), 9 deletions(-)
>
>
> base-commit: 1dae56618271e7c8b19155d7984b9386ecb661f6

All commits looks good to me!  I went ahead, applied and pushed all the
patches, closed the ticket.  I hope you are ok with it :)  Thank you for
updating packages.

-- 
Best regards,
Andrew Tropin

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