From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KEOlMCCo916fRwAA0tVLHw (envelope-from ) for ; Sat, 27 Jun 2020 20:12:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MC17LCCo914SXQAA1q6Kng (envelope-from ) for ; Sat, 27 Jun 2020 20:12:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 59CB594053F for ; Sat, 27 Jun 2020 20:12:16 +0000 (UTC) Received: from localhost ([::1]:40754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpHBP-0003ox-9y for larch@yhetil.org; Sat, 27 Jun 2020 16:12:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpHBC-0003oV-QA for guix-patches@gnu.org; Sat, 27 Jun 2020 16:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33133) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpHBC-000759-GY for guix-patches@gnu.org; Sat, 27 Jun 2020 16:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jpHBC-00041X-Bp for guix-patches@gnu.org; Sat, 27 Jun 2020 16:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42093] [PATCH 1/2] gnu: emacs-nov-el: Use version tag instead of commit. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jun 2020 20:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42093 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42093@debbugs.gnu.org Cc: Simon South Received: via spool by 42093-submit@debbugs.gnu.org id=B42093.159328869515421 (code B ref 42093); Sat, 27 Jun 2020 20:12:02 +0000 Received: (at 42093) by debbugs.gnu.org; 27 Jun 2020 20:11:35 +0000 Received: from localhost ([127.0.0.1]:44676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpHAl-00040c-DR for submit@debbugs.gnu.org; Sat, 27 Jun 2020 16:11:35 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:39658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpHAj-00040O-VE for 42093@debbugs.gnu.org; Sat, 27 Jun 2020 16:11:34 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id A5C71A11BF; Sat, 27 Jun 2020 20:11:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Dx8Stn8bpVul; Sat, 27 Jun 2020 20:11:28 +0000 (UTC) Received: from mars.simonsouth.net (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id C3C65A0EEB; Sat, 27 Jun 2020 20:11:26 +0000 (UTC) From: Simon South Date: Sat, 27 Jun 2020 16:11:15 -0400 Message-Id: <9ee7db8615b71c43ddc1ffbb3c38e218c0580d74.1593287683.git.simon@simonsouth.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: iEuk0yHKHgT5 * gnu/packages/emacs-xyz.scm (emacs-nov-el): Remove let binding and associated comment; correct indentation. [source]: Use version tag as commit identifier now that upstream has restored this information. --- gnu/packages/emacs-xyz.scm | 65 ++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8b03ce347c..c83a7f5d95 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12550,39 +12550,36 @@ the format.") (license license:gpl3+))) (define-public emacs-nov-el - ;; Upstream does not tag releases. Specify raw commit hash matching the - ;; release. - (let ((commit "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596")) - (package - (name "emacs-nov-el") - (version "0.3.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://depp.brause.cc/nov.el.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'embed-path-to-unzip - (lambda _ - (substitute* "nov.el" - (("\\(executable-find \"unzip\"\\)") - (string-append "\"" (which "unzip") "\""))) - #t))))) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-esxml" ,emacs-esxml))) - (inputs - `(("unzip" ,unzip))) - (home-page "https://depp.brause.cc/nov.el/") - (synopsis "Major mode for reading EPUBs in Emacs") - (description "@code{nov.el} provides a major mode for reading EPUB + (package + (name "emacs-nov-el") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://depp.brause.cc/nov.el.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'embed-path-to-unzip + (lambda _ + (substitute* "nov.el" + (("\\(executable-find \"unzip\"\\)") + (string-append "\"" (which "unzip") "\""))) + #t))))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-esxml" ,emacs-esxml))) + (inputs + `(("unzip" ,unzip))) + (home-page "https://depp.brause.cc/nov.el/") + (synopsis "Major mode for reading EPUBs in Emacs") + (description "@code{nov.el} provides a major mode for reading EPUB documents. Features: @@ -12599,7 +12596,7 @@ Features: @item Image rescaling @end itemize ") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public epipe (package -- 2.26.2