unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
* bug#50896: emacs-beancount broken, moved to its own project
@ 2021-09-29 18:03 Christine Lemmer-Webber
  2021-09-29 19:30 ` Nicolas Goaziou
  0 siblings, 1 reply; 3+ messages in thread
From: Christine Lemmer-Webber @ 2021-09-29 18:03 UTC (permalink / raw)
  To: 50896


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

Hello... emacs-beancount is broken because it's no longer just bundled
in beancount.  However, I've attached a fix.

If nobody has any problem with this I'll just push it up to master.
Since it's a leaf package, and the current state is "it's broken" I
figure it's probably fine to push, but since it's a significant
refactoring thought I'd ask for a review before I did so.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-emacs-beancount-Restructure-package-now-independ.patch --]
[-- Type: text/x-patch, Size: 2723 bytes --]

From e6f150f3eb3f3f63455c2a21a9490690b59216f2 Mon Sep 17 00:00:00 2001
From: Christine Lemmer-Webber <cwebber@dustycloud.org>
Date: Wed, 29 Sep 2021 12:46:01 -0400
Subject: [PATCH] gnu: emacs-beancount: Restructure package, now independent of
 beancount.

* gnu/packages/finance.scm (emacs-beancount): Restructure package, now
independent of beancount and in its own git repository.  Note that there is no
version number for the now independent code tree, so unfortunately this might
look like a "version downgrade" to some users as it switched from being
beancount's revision number to being a git-derived version number.
---
 gnu/packages/finance.scm | 41 ++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 4aaab58906..e554d93535 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1643,25 +1643,30 @@ define financial transaction records in a text file, read them in memory,
 generate a variety of reports from them, and provides a web interface.")
     (license license:gpl2)))
 
-;; The beancount source ships with elisp in a subdirectory
 (define-public emacs-beancount
-  (package
-    (inherit beancount)
-    (name "emacs-beancount")
-    (build-system emacs-build-system)
-    (arguments
-     `(#:tests? #f ;no tests
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'install 'chdir-emacs
-           (lambda _
-             (chdir "editors/emacs")
-             #t)))))
-    (inputs '())
-    (native-inputs '())
-    (synopsis "Emacs mode for beancount")
-    (description
-      "Emacs-beancount is an Emacs mode for the Beancount accounting tool.")))
+  (let ((commit "dbafe6a73d90c1f64d457b356b9dbb43499f70d5")
+        (revision "0"))
+    (package
+      (name "emacs-beancount")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/beancount/beancount-mode")
+               (commit commit)))
+         (sha256
+          (base32
+           "0v9bws2gv5b00x829p7hrcxqgdp7iwxvv1vhfjka81qrw6w1fvjw"))
+         (file-name (git-file-name name version))))
+      (build-system emacs-build-system)
+      (license license:gpl3+)
+      (home-page "https://github.com/beancount/beancount-mode")
+      (inputs '())
+      (native-inputs '())
+      (synopsis "Emacs mode for beancount")
+      (description
+       "Emacs-beancount is an Emacs mode for the Beancount accounting tool."))))
 
 (define-public hledger-web
   (package
-- 
2.33.0


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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* bug#50896: emacs-beancount broken, moved to its own project
  2021-09-29 18:03 bug#50896: emacs-beancount broken, moved to its own project Christine Lemmer-Webber
@ 2021-09-29 19:30 ` Nicolas Goaziou
  2021-10-13  3:34   ` Christine Lemmer-Webber
  0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Goaziou @ 2021-09-29 19:30 UTC (permalink / raw)
  To: Christine Lemmer-Webber; +Cc: 50896

Hello,

Christine Lemmer-Webber <cwebber@dustycloud.org> writes:

> +  (let ((commit "dbafe6a73d90c1f64d457b356b9dbb43499f70d5")
> +        (revision "0"))

I suggest to mention in a comment that upstream has not made any release
yet.

> +    (package
> +      (name "emacs-beancount")
> +      (version (git-version "0.0.0" revision commit))
> +      (source
> +       (origin
> +         (method git-fetch)
> +         (uri (git-reference
> +               (url "https://github.com/beancount/beancount-mode")
> +               (commit commit)))
> +         (sha256
> +          (base32
> +           "0v9bws2gv5b00x829p7hrcxqgdp7iwxvv1vhfjka81qrw6w1fvjw"))
> +         (file-name (git-file-name name version))))
> +      (build-system emacs-build-system)
> +      (license license:gpl3+)

Nitpick: usually, license field is at the end of the package definition.

> +      (home-page "https://github.com/beancount/beancount-mode")
> +      (inputs '())
> +      (native-inputs '())

You can remove inputs and native-inputs fields, since they are empty.

> +      (synopsis "Emacs mode for beancount")

Nitpick: beancount -> Beancount

> +      (description
> +       "Emacs-beancount is an Emacs mode for the Beancount accounting
> tool."))))

Otherwise, LGTM!

Regards,
-- 
Nicolas Goaziou




^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#50896: emacs-beancount broken, moved to its own project
  2021-09-29 19:30 ` Nicolas Goaziou
@ 2021-10-13  3:34   ` Christine Lemmer-Webber
  0 siblings, 0 replies; 3+ messages in thread
From: Christine Lemmer-Webber @ 2021-10-13  3:34 UTC (permalink / raw)
  To: Nicolas Goaziou; +Cc: 50896-done

Thank you... did all the above and pushed!  The emacs-beancount package
is sensibly alive again!




^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-10-13  3:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-29 18:03 bug#50896: emacs-beancount broken, moved to its own project Christine Lemmer-Webber
2021-09-29 19:30 ` Nicolas Goaziou
2021-10-13  3:34   ` Christine Lemmer-Webber

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).