[bug#63071] [PATCH] gnu: Add emacs-riscv-mode

[bug#63071] [PATCH] gnu: Add emacs-riscv-mode

[Gabriel Wicki]

Hello!

I hope this email finds you in a state of well-being!

I've come around to package this small little emacs-package which is
supposed to aid RISC-V assembly development.  Please let me know if I
can fix/improve/adjust anything with the patch.

It is based on commit 8c5ba69d6e9e4b1b9d6b5e9cd28859b19e8e180c


Best wishes,
gabber

From 3046e712491fa0bdc21c4d7aef62eedc134df783 Mon Sep 17 00:00:00 2001
Message-Id: <3046e712491fa0bdc21c4d7aef62eedc134df783.1682443077.git.gabriel@erlikon.ch>
From: Gabriel Wicki <gabriel@erlikon.ch>
Date: Tue, 25 Apr 2023 17:48:41 +0200
Subject: [PATCH] gnu: Add emacs-riscv-mode.

* gnu/packages/emacs-xyz.scm (emacs-riscv-mode): New variable.
---
 gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7c8af093fc..7b10bed7df 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -35854,6 +35854,32 @@ (define-public emacs-nasm-mode
 Unlike Emacs' generic ASM mode, it understands NASM-specific syntax.")
     (license license:unlicense)))
 
+(define-public emacs-riscv-mode
+  (let ((url "https://github.com/AdamNiederer/riscv-mode")
+        (commit "8e335b9c93de93ed8dd063d702b0f5ad48eef6d7")
+        (revision "1")
+        (version "0"))
+    (package
+      (name "emacs-riscv-mode")
+      (version (git-version version revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url url)
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "06jlf84mx49scw3zm1wjj25zinr2yr9abiyh83rli78wb1hdc0l4"))))
+      (build-system emacs-build-system)
+      (home-page url)
+      (synopsis "RISC-V assembly major mode")
+      (description
+       "RISC-V mode is a major mode for editing RISC-V assembly programs.
+It includes syntax highlighting, syntactic indentation and code evaluation
+with spike.")
+      (license license:gpl3))))
+
 (define-public emacs-validate-html
   ;; XXX: Upstream did not tag commits yet.  However, commit below matches the
   ;; last version bump.  Version is extracted from the keyword in main file.
-- 
2.39.2

[bug#63071] [PATCH] gnu: Add emacs-riscv-mode.

[Gabriel Wicki]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 3054 bytes --]

* gnu/packages/emacs-xyz.scm (emacs-riscv-mode): New variable.
---
Hi Gabriel,

your patch didn't apply cleanly thanks to some coding issues, but I got
them to work with a little bit of work.  Below is an expanded patch that
also makes sure that spike actually exists.  It also uses 0.1 as base
version, taken from riscv-mode.el.

Cheers,
Liliana

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7c8af093fc..3d4b9998ce 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -127,6 +127,7 @@
 ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
 ;;; Copyright © 2023 Juliana Sims <juli@incana.org>
 ;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
+;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -259,6 +260,7 @@ (define-module (gnu packages emacs-xyz)
   #:use-module (gnu packages erlang)
   #:use-module (gnu packages statistics)
   #:use-module (gnu packages libcanberra)
+  #:use-module (gnu packages virtualization)
   #:use-module (gnu packages web-browsers)
   #:use-module (gnu packages wget)
   #:use-module (guix utils)
@@ -35854,6 +35856,39 @@ (define-public emacs-nasm-mode
 Unlike Emacs' generic ASM mode, it understands NASM-specific syntax.")
     (license license:unlicense)))
 
+(define-public emacs-riscv-mode
+  (let ((commit "8e335b9c93de93ed8dd063d702b0f5ad48eef6d7")
+        (revision "1"))
+    (package
+      (name "emacs-riscv-mode")
+      (version (git-version "0.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/AdamNiederer/riscv-mode")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "06jlf84mx49scw3zm1wjj25zinr2yr9abiyh83rli78wb1hdc0l4"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list #:phases
+             #~(modify-phases %standard-phases
+                 (add-after 'unpack 'hardcode-spike
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     (emacs-substitute-variables "riscv-mode.el"
+                       ("riscv-interpreter"
+                        (search-input-file inputs "bin/spike"))))))))
+      (inputs (list spike))
+      (home-page "https://github.com/AdamNiederer/riscv-mode")
+      (synopsis "Emacs major mode for RISC-V assembly")
+      (description
+       "RISC-V mode is a major mode for editing RISC-V assembly programs.
+It includes syntax highlighting, syntactic indentation and code evaluation
+with spike.")
+      (license license:gpl3+))))
+
 (define-public emacs-validate-html
   ;; XXX: Upstream did not tag commits yet.  However, commit below matches the
   ;; last version bump.  Version is extracted from the keyword in main file.
-- 
2.39.2

[bug#63071] [PATCH] gnu: Add emacs-riscv-mode.

[Andrew Tropin]

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

On 2023-04-25 17:48, Gabriel Wicki wrote:

> * gnu/packages/emacs-xyz.scm (emacs-riscv-mode): New variable.
> ---
> Hi Gabriel,
>
> your patch didn't apply cleanly thanks to some coding issues, but I got
> them to work with a little bit of work.  Below is an expanded patch that
> also makes sure that spike actually exists.  It also uses 0.1 as base
> version, taken from riscv-mode.el.
>
> Cheers,
> Liliana
>
>  gnu/packages/emacs-xyz.scm | 35 +++++++++++++++++++++++++++++++++++
>  1 file changed, 35 insertions(+)
>
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index 7c8af093fc..3d4b9998ce 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -127,6 +127,7 @@
>  ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
>  ;;; Copyright © 2023 Juliana Sims <juli@incana.org>
>  ;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
> +;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -259,6 +260,7 @@ (define-module (gnu packages emacs-xyz)
>    #:use-module (gnu packages erlang)
>    #:use-module (gnu packages statistics)
>    #:use-module (gnu packages libcanberra)
> +  #:use-module (gnu packages virtualization)
>    #:use-module (gnu packages web-browsers)
>    #:use-module (gnu packages wget)
>    #:use-module (guix utils)
> @@ -35854,6 +35856,39 @@ (define-public emacs-nasm-mode
>  Unlike Emacs' generic ASM mode, it understands NASM-specific syntax.")
>      (license license:unlicense)))
>  
> +(define-public emacs-riscv-mode
> +  (let ((commit "8e335b9c93de93ed8dd063d702b0f5ad48eef6d7")
> +        (revision "1"))

Revision should be 0 here, everything else LGTM.

> +    (package
> +      (name "emacs-riscv-mode")
> +      (version (git-version "0.1" revision commit))
> +      (source (origin
> +                (method git-fetch)
> +                (uri (git-reference
> +                      (url "https://github.com/AdamNiederer/riscv-mode")
> +                      (commit commit)))
> +                (file-name (git-file-name name version))
> +                (sha256
> +                 (base32
> +                  "06jlf84mx49scw3zm1wjj25zinr2yr9abiyh83rli78wb1hdc0l4"))))
> +      (build-system emacs-build-system)
> +      (arguments
> +       (list #:phases
> +             #~(modify-phases %standard-phases
> +                 (add-after 'unpack 'hardcode-spike
> +                   (lambda* (#:key inputs #:allow-other-keys)
> +                     (emacs-substitute-variables "riscv-mode.el"
> +                       ("riscv-interpreter"
> +                        (search-input-file inputs "bin/spike"))))))))
> +      (inputs (list spike))
> +      (home-page "https://github.com/AdamNiederer/riscv-mode")
> +      (synopsis "Emacs major mode for RISC-V assembly")
> +      (description
> +       "RISC-V mode is a major mode for editing RISC-V assembly programs.
> +It includes syntax highlighting, syntactic indentation and code evaluation
> +with spike.")
> +      (license license:gpl3+))))
> +
>  (define-public emacs-validate-html
>    ;; XXX: Upstream did not tag commits yet.  However, commit below matches the
>    ;; last version bump.  Version is extracted from the keyword in main file.

-- 
Best regards,
Andrew Tropin

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

bug#63071: [PATCH] gnu: Add emacs-riscv-mode.

[Nicolas Goaziou]

Hello,

Andrew Tropin <andrew@trop.in> writes:

>> +(define-public emacs-riscv-mode
>> +  (let ((commit "8e335b9c93de93ed8dd063d702b0f5ad48eef6d7")
>> +        (revision "1"))
>
> Revision should be 0 here, everything else LGTM.

FWIW, I noticed that revision 1 for version V tells Repology that it was
released after V. This is not the case for revision 0. So I think
starting at 1 is not bad either.

I applied the latest version of patch.

Thanks to everyone.

Regards,
-- 
Nicolas Goaziou

[bug#63071] [PATCH] gnu: Add emacs-riscv-mode

[Liliana Marie Prikler]

Am Dienstag, dem 25.04.2023 um 19:23 +0200 schrieb Gabriel Wicki:
> Hello!
> 
> I hope this email finds you in a state of well-being!
> 
> I've come around to package this small little emacs-package which is
> supposed to aid RISC-V assembly development.  Please let me know if I
> can fix/improve/adjust anything with the patch.
> 
> It is based on commit 8c5ba69d6e9e4b1b9d6b5e9cd28859b19e8e180c
> 
> 
> Best wishes,
> gabber
> 
> From 3046e712491fa0bdc21c4d7aef62eedc134df783 Mon Sep 17 00:00:00
> 2001
> Message-Id:
> <3046e712491fa0bdc21c4d7aef62eedc134df783.1682443077.git.gabriel@erli
> kon.ch>
> From: Gabriel Wicki <gabriel@erlikon.ch>
> Date: Tue, 25 Apr 2023 17:48:41 +0200
> Subject: [PATCH] gnu: Add emacs-riscv-mode.
> 
> * gnu/packages/emacs-xyz.scm (emacs-riscv-mode): New variable.
> ---
>  gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index 7c8af093fc..7b10bed7df 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -35854,6 +35854,32 @@ (define-public emacs-nasm-mode
>  Unlike Emacs' generic ASM mode, it understands NASM-specific
> syntax.")
>      (license license:unlicense)))
>  
> +(define-public emacs-riscv-mode
> +  (let ((url "https://github.com/AdamNiederer/riscv-mode")
> +        (commit "8e335b9c93de93ed8dd063d702b0f5ad48eef6d7")
> +        (revision "1")
> +        (version "0"))
No need to let-bind url and version, please use their values in the
right locations below.
> +    (package
> +      (name "emacs-riscv-mode")
> +      (version (git-version version revision commit))
> +      (source (origin
> +                (method git-fetch)
> +                (uri (git-reference
> +                      (url url)
> +                      (commit commit)))
> +                (file-name (git-file-name name version))
> +                (sha256
> +                 (base32
> +                 
> "06jlf84mx49scw3zm1wjj25zinr2yr9abiyh83rli78wb1hdc0l4"))))
> +      (build-system emacs-build-system)
> +      (home-page url)
> +      (synopsis "RISC-V assembly major mode")
Better: "Emacs major mode for RISC-V assembly"
> +      (description
> +       "RISC-V mode is a major mode for editing RISC-V assembly
> programs.
> +It includes syntax highlighting, syntactic indentation and code
> evaluation
> +with spike.")
> +      (license license:gpl3))))
> +

Cheers

[bug#63071] [PATCH] gnu: Add emacs-riscv-mode

[Gabriel Wicki]

On Tue, Apr 25, 2023 at 08:21:11PM +0200, Liliana Marie Prikler wrote:
> No need to let-bind url and version, please use their values in the
> right locations below.
I thought I'd bind them since the values were used multiple times.

Anyhow, I've corrected the patch.  Thank you for that super-quick reply!


From ed779ffef71167d18256a21dbcab99d27c3a5176 Mon Sep 17 00:00:00 2001
Message-Id: <ed779ffef71167d18256a21dbcab99d27c3a5176.1682447183.git.gabriel@erlikon.ch>
From: Gabriel Wicki <gabriel@erlikon.ch>
Date: Tue, 25 Apr 2023 17:48:41 +0200
Subject: [PATCH] gnu: Add emacs-riscv-mode.

* gnu/packages/emacs-xyz.scm (emacs-riscv-mode): New variable.
---
 gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7c8af093fc..33c745d029 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -35854,6 +35854,30 @@ (define-public emacs-nasm-mode
 Unlike Emacs' generic ASM mode, it understands NASM-specific syntax.")
     (license license:unlicense)))
 
+(define-public emacs-riscv-mode
+  (let ((commit "8e335b9c93de93ed8dd063d702b0f5ad48eef6d7")
+        (revision "1"))
+    (package
+      (name "emacs-riscv-mode")
+      (version (git-version "0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/AdamNiederer/riscv-mode")
+                      (commit commit)))
+                (file-name (git-file-name name "0"))
+                (sha256
+                 (base32
+                  "06jlf84mx49scw3zm1wjj25zinr2yr9abiyh83rli78wb1hdc0l4"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/AdamNiederer/riscv-mode")
+      (synopsis "Emacs major mode for RISC-V assembly")
+      (description
+       "RISC-V mode is a major mode for editing RISC-V assembly programs.
+It includes syntax highlighting, syntactic indentation and code evaluation
+with spike.")
+      (license license:gpl3))))
+
 (define-public emacs-validate-html
   ;; XXX: Upstream did not tag commits yet.  However, commit below matches the
   ;; last version bump.  Version is extracted from the keyword in main file.
-- 
2.39.2

[bug#63071] [PATCH] gnu: Add emacs-riscv-mode

[Liliana Marie Prikler]

On Tue, 2023-04-25 at 20:27 +0200, Gabriel Wicki wrote:
> On Tue, Apr 25, 2023 at 08:21:11PM +0200, Liliana Marie Prikler
> wrote:
> > No need to let-bind url and version, please use their values in the
> > right locations below.
> I thought I'd bind them since the values were used multiple times.
> 
> Anyhow, I've corrected the patch.  Thank you for that super-quick
> reply!
> 
> 
> From ed779ffef71167d18256a21dbcab99d27c3a5176 Mon Sep 17 00:00:00
> 2001
> Message-Id:
> <ed779ffef71167d18256a21dbcab99d27c3a5176.1682447183.git.gabriel@erli
> kon.ch>
> From: Gabriel Wicki <gabriel@erlikon.ch>
> Date: Tue, 25 Apr 2023 17:48:41 +0200
> Subject: [PATCH] gnu: Add emacs-riscv-mode.
> 
> * gnu/packages/emacs-xyz.scm (emacs-riscv-mode): New variable.
> ---
>  gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
> 
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index 7c8af093fc..33c745d029 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -35854,6 +35854,30 @@ (define-public emacs-nasm-mode
>  Unlike Emacs' generic ASM mode, it understands NASM-specific
> syntax.")
>      (license license:unlicense)))
>  
> +(define-public emacs-riscv-mode
> +  (let ((commit "8e335b9c93de93ed8dd063d702b0f5ad48eef6d7")
> +        (revision "1"))
> +    (package
> +      (name "emacs-riscv-mode")
> +      (version (git-version "0" revision commit))
> +      (source (origin
> +                (method git-fetch)
> +                (uri (git-reference
> +                      (url
> "https://github.com/AdamNiederer/riscv-mode")
> +                      (commit commit)))
> +                (file-name (git-file-name name "0"))
Use "version" here.  It won't refer to "0", but instead to the expanded
(git-version ...) -- it's basically syntactic sugar for (package-
version this-package).
> +                (sha256
> +                 (base32
> +                 
> "06jlf84mx49scw3zm1wjj25zinr2yr9abiyh83rli78wb1hdc0l4"))))
> +      (build-system emacs-build-system)
> +      (home-page "https://github.com/AdamNiederer/riscv-mode")
> +      (synopsis "Emacs major mode for RISC-V assembly")
> +      (description
> +       "RISC-V mode is a major mode for editing RISC-V assembly
> programs.
> +It includes syntax highlighting, syntactic indentation and code
> evaluation
> +with spike.")
> +      (license license:gpl3))))
License should be gpl3+ going by the README.

Cheers

[bug#63071] [PATCH] gnu: Add emacs-riscv-mode

[Gabriel Wicki]

Thanks, again :)


From b7e9ef4f2f19858ef5feca32bed72a77fd96c968 Mon Sep 17 00:00:00 2001
Message-Id: <b7e9ef4f2f19858ef5feca32bed72a77fd96c968.1682449915.git.gabriel@erlikon.ch>
From: Gabriel Wicki <gabriel@erlikon.ch>
Date: Tue, 25 Apr 2023 17:48:41 +0200
Subject: [PATCH] gnu: Add emacs-riscv-mode.

* gnu/packages/emacs-xyz.scm (emacs-riscv-mode): New variable.
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7c8af093fc..588bc0248d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -127,6 +127,7 @@
 ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
 ;;; Copyright © 2023 Juliana Sims <juli@incana.org>
 ;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
+;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -35854,6 +35855,30 @@ (define-public emacs-nasm-mode
 Unlike Emacs' generic ASM mode, it understands NASM-specific syntax.")
     (license license:unlicense)))
 
+(define-public emacs-riscv-mode
+  (let ((commit "8e335b9c93de93ed8dd063d702b0f5ad48eef6d7")
+        (revision "1"))
+    (package
+      (name "emacs-riscv-mode")
+      (version (git-version "0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/AdamNiederer/riscv-mode")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "06jlf84mx49scw3zm1wjj25zinr2yr9abiyh83rli78wb1hdc0l4"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/AdamNiederer/riscv-mode")
+      (synopsis "Emacs major mode for RISC-V assembly")
+      (description
+       "RISC-V mode is a major mode for editing RISC-V assembly programs.
+It includes syntax highlighting, syntactic indentation and code evaluation
+with spike.")
+      (license license:gpl3+))))
+
 (define-public emacs-validate-html
   ;; XXX: Upstream did not tag commits yet.  However, commit below matches the
   ;; last version bump.  Version is extracted from the keyword in main file.
-- 
2.39.2