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