From 836e14abd7dbe71c685180ea802594163ecc21ad Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Fri, 5 Jan 2024 13:14:36 +0100
Subject: [PATCH] Emacs: Add stable Cider.

---
 .guix-channel            |  3 +++
 zilti/packages/emacs.scm | 40 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/.guix-channel b/.guix-channel
index 53a748e..15b83d5 100644
--- a/.guix-channel
+++ b/.guix-channel
@@ -6,6 +6,9 @@
  (news-file "news.txt")
  (url "https://gitea.lyrion.ch/zilti/guixchannel")
  (dependencies
+   (channel
+     (name emacs)
+     (url "https://github.com/babariviere/guix-emacs"))
    (channel
      (name nonguix)
      (url "https://gitlab.com/nonguix/nonguix.git"))))
diff --git a/zilti/packages/emacs.scm b/zilti/packages/emacs.scm
index 7bab4ed..fe2dbfe 100644
--- a/zilti/packages/emacs.scm
+++ b/zilti/packages/emacs.scm
@@ -14,9 +14,11 @@
   #:use-module (guix build-system copy)
   #:use-module (guix build-system emacs)
   #:use-module (guix build-system trivial)
+  #:use-module (emacs build-system melpa)
   #:use-module (guix utils)
   #:use-module (srfi srfi-1)
-  #:use-module (ice-9 match))
+  #:use-module (ice-9 match)
+  #:use-module (gnu packages emacs-xyz))
 
 (define-public emacs-xref-union
   (package
@@ -44,3 +46,39 @@ You can also manually make use of @code{xref-union} by adding an object
 of the form @code{(union XREF-BACKEND-1 XREF-BACKEND-2 ...)} to
 @code{xref-backend-functions}.")
     (license license:gpl3+)))
+
+(define-public emacs-cider-1.12.0
+  (package
+    (name "emacs-cider")
+    (version "1.12.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/clojure-emacs/cider.git")
+               (commit (string-append "v" version))))
+        (sha256
+         (base32
+          "11bibkbv3x0z4ilxra3p91nh8klgg3mg3h4f63pxnnp8fjhqpsph"))))
+    (build-system melpa-build-system)
+    (propagated-inputs
+      (list emacs-clojure-mode
+            emacs-parseedn
+            emacs-queue
+            emacs-spinner
+            emacs-sesman))
+    (arguments
+      '(#:files
+        ("lisp/*.el"
+         "bin/*.sh"
+         "*.el"
+         "clojure.sh"
+         "lein.sh"
+         (:exclude ".dir-locals.el"))))
+    (home-page
+      "https://www.github.com/clojure-emacs/cider")
+    (synopsis
+      "Clojure Interactive Development Environment that Rocks")
+    (description
+      "Documentation at https://melpa.org/#/cider")
+    (license #f)))