From patchwork Tue Apr 25 15:48:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49510 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7789327BBE2; Tue, 25 Apr 2023 21:09:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 64E9827BBE9 for ; Tue, 25 Apr 2023 21:09:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prOyN-0002Ro-DG; Tue, 25 Apr 2023 16:09:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prOyF-0002Q7-F9 for guix-patches@gnu.org; Tue, 25 Apr 2023 16:09:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1prOyF-0005KA-14 for guix-patches@gnu.org; Tue, 25 Apr 2023 16:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1prOyE-0001j0-BG for guix-patches@gnu.org; Tue, 25 Apr 2023 16:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63071] [PATCH] gnu: Add emacs-riscv-mode. References: <875y9jj2po.fsf@erlikon.ch> In-Reply-To: <875y9jj2po.fsf@erlikon.ch> Resent-From: Gabriel Wicki Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Apr 2023 20:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63071@debbugs.gnu.org Cc: Liliana Marie Prikler , andrew@trop.in Received: via spool by 63071-submit@debbugs.gnu.org id=B63071.16824533146594 (code B ref 63071); Tue, 25 Apr 2023 20:09:02 +0000 Received: (at 63071) by debbugs.gnu.org; 25 Apr 2023 20:08:34 +0000 Received: from localhost ([127.0.0.1]:53651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prOxl-0001iH-KI for submit@debbugs.gnu.org; Tue, 25 Apr 2023 16:08:34 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:49326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prOxd-0001hx-Mu for 63071@debbugs.gnu.org; Tue, 25 Apr 2023 16:08:31 -0400 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-505934ccc35so10817738a12.2 for <63071@debbugs.gnu.org>; Tue, 25 Apr 2023 13:08:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682453299; x=1685045299; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=w+AXWQcYoiz3HVOiHfX44qcFDOxS6P9oZGdwVYq4Efc=; b=UqWhVM8kupfwe1UZFxCSOKy1cyOS8c29VxdAUDJ41zVbrjvqjZ31BhXiBKxk16g7/K 7NuXKswQwpboHMjYxxeC1FUGK5/30hjDHNN7OrD8llB77uTyul90/dylmfF8T3B+DdTR 2OaCSd0UiMe6cKn/zExMu9fFrcx6ANLZROIsg0XcHWbmIYyH0pGBG+34XhZ4/UnE/Fp5 m33kJ1GspdVuZBX5tZrg5bdkCEkvfjUHBRlzpdwSuvusTTvlf1OzWbJIVA0ckq4X+d4c sak69q6GpAJTeb4B28Ai1Y++C1jQm9xsdRk975kktewjDkD5yWS9cekOUJKSEQiL+4Dn /Tpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682453299; x=1685045299; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=w+AXWQcYoiz3HVOiHfX44qcFDOxS6P9oZGdwVYq4Efc=; b=mEmWtY02VBXNqTYV+dxrkXwObJ25JBjrEn5MoVbrsOyJKf5taqytVMP8+E2nBuYym0 q4AsJrKGjYqVAyxBfmunWrdT3d3oEhqAkVcoqHjki4yPRu7/QX3nc7KBIWmDzI6rqhy+ SrOdfoSMWFi6bEUc/cCQ6bUPMytk3+SQ5o7V0Ox6aepDpvuFHkfuauoffaLL2foPfVIm qN/3pqnZ5ej7SxLjmzPm4VEGfmWVHB+gKKLlW7yhdo439ITR7cQjVba7sRnVgdJlVOdm drNiBZiq1wZSKC+MOKUOytW5UGQ0niy9nfVuBUICnEC1/uR76Pss+M8hqWQsFX0lAbgP Vugg== X-Gm-Message-State: AAQBX9cr6sW51DJNd/XliY2vuOoDlUmdeHkZchjS7EvaT+yb44o8LGBH SEoSWMVtrnoMP4OMY564MFq1hDFhWWg71w== X-Google-Smtp-Source: AKy350bbhZIBtnS64ZGEvx/ybBALulBoTimkVavkWb4Xn+O4ycWd6p4uroNoiD9/j5DiQzQsDsI4ng== X-Received: by 2002:a05:6402:146:b0:506:75d4:44 with SMTP id s6-20020a056402014600b0050675d40044mr14595123edu.25.1682453299565; Tue, 25 Apr 2023 13:08:19 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id p21-20020a056402075500b0050684020babsm5929665edy.27.2023.04.25.13.08.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Apr 2023 13:08:19 -0700 (PDT) From: Gabriel Wicki X-Google-Original-From: Gabriel Wicki Date: Tue, 25 Apr 2023 17:48:41 +0200 Message-ID: <6e8f134d43202eb43e72b1be2ac5dd520968f75d.camel@erlikon.ch> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 ;;; Copyright © 2023 Juliana Sims ;;; Copyright © 2023 Evgeny Pisemsky +;;; Copyright © 2023 Gabriel Wicki ;;; ;;; 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.