From patchwork Sun Apr 6 07:40:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cayetano Santos X-Patchwork-Id: 41335 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 9989527BBEA; Sun, 6 Apr 2025 08:42:42 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 B752327BBE2 for ; Sun, 6 Apr 2025 08:42:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1Ke1-0007Af-Qq; Sun, 06 Apr 2025 03:42:18 -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 1u1Kdx-00079O-9f for guix-patches@gnu.org; Sun, 06 Apr 2025 03:42:13 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u1Kdw-0006jS-Pm for guix-patches@gnu.org; Sun, 06 Apr 2025 03:42:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=U+kig8FglqiRtIfDqQwB9koNPSsASAmjs7u32ocdnis=; b=omkKVDfyjgXPkPnxn90LLItkfla6TiuB8tvqi0quEkHApZk38m9xwtqEOYL8CkPPvarKxmfNiSpq+NqKHno/M1eFcTC6lqvZmC4dh47tHF4nh9qF/7Co9wnbynETYyt1mDqmaQiFMw/oT52CDTzYPsEooBURUssSDaM0cQcfy0ijpWNtO5FdYDuI2QWdkX+VwBQkIQQlbvT86SQPnS8Dzs3vUMbsen8h8NYbdsgY/B6WyNBn78oZilzJEf9VbXImkN7hpVjgy0i4rQvukxNQayZiao9V7IF1BwFZw4yKQrofsREfAUNJh8JQB5KxSnj11T6pgX5XObekr3ykF20Kew==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u1Kdm-0001IQ-Eg; Sun, 06 Apr 2025 03:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77561] [PATCH v2] gnu: emacs-org-roam: Update to 2.2.2-2.046822b. References: In-Reply-To: Resent-From: Cayetano Santos Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, csantosb@inventati.org, divya@subvertising.org, hako@ultrarare.space, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 06 Apr 2025 07:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77561 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77561@debbugs.gnu.org Cc: Cayetano Santos , Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 77561-submit@debbugs.gnu.org id=B77561.17439252874927 (code B ref 77561); Sun, 06 Apr 2025 07:42:02 +0000 Received: (at 77561) by debbugs.gnu.org; 6 Apr 2025 07:41:27 +0000 Received: from localhost ([127.0.0.1]:45906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u1KdD-0001HP-ED for submit@debbugs.gnu.org; Sun, 06 Apr 2025 03:41:27 -0400 Received: from latitanza.investici.org ([82.94.249.234]:33415) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u1KdA-0001HF-9Q for 77561@debbugs.gnu.org; Sun, 06 Apr 2025 03:41:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1743925282; bh=U+kig8FglqiRtIfDqQwB9koNPSsASAmjs7u32ocdnis=; h=From:To:Cc:Subject:Date:From; b=oLIh8yEWtxl3XmkNCTK1fQNyyKrEVSmukLDs/8Ec78lj3qC28wJeXU4JbTL4h6nWH XT75kpIJFtg614buNzis/lXDd/Bg5Yizp6/R95fo+wiVztW/2mGNEMIU0fni9dvo5+ PLHqWAcg2PerufK6bG4FnxNRPZYrkYzrreWPvjCU= Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4ZVkmf4wJFzGp0M; Sun, 6 Apr 2025 07:41:22 +0000 (UTC) Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4ZVkmf2hn6zGnxW; Sun, 6 Apr 2025 07:41:22 +0000 (UTC) Date: Sun, 6 Apr 2025 09:40:26 +0200 Message-ID: <4091e5ef6ed534341cedbf967b6a8ae14cff5551.1743925226.git.csantosb@inventati.org> X-Mailer: git-send-email 2.49.0 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: , Reply-to: Cayetano Santos X-ACL-Warn: , Cayetano Santos via Guix-patches X-Patchwork-Original-From: Cayetano Santos via Guix-patches via From: Cayetano Santos 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-org-roam): Update to 2.2.2-2.046822b. - Update to recent commit - Produce info document using provided makefile - Put stages in order - Remove unnecessary input dependencies Change-Id: I70cdd629a92145ad4cf5d965e53ce34f71117c7f --- gnu/packages/emacs-xyz.scm | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) base-commit: 80826c6e038997dc47eb455888f0feaa38c08bf5 -- 2.49.0 diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7c290d0833..022048fa7d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -40163,8 +40163,8 @@ (define-public emacs-orca (license license:gpl3+)))) (define-public emacs-org-roam - (let ((commit "0b9fcbc97b65b349826e63bad89ca121a08fd2be") - (revision "1")) + (let ((commit "046822b512ffecdee7d110f73dd3a511802ca590") + (revision "2")) (package (name "emacs-org-roam") (version (git-version "2.2.2" revision commit)) @@ -40176,15 +40176,23 @@ (define-public emacs-org-roam (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "04vqwrsb71jdb66fkahmxwvx8cssgqamrradbdgp3ygf8alwc7ml")))) + (base32 "0jbj48glh0r6fkb0lk1xb9067x2myp3krkw2byycijwdq1nlqzv2")))) (build-system emacs-build-system) (arguments (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'make-info + (lambda _ + (invoke "make" "-C" "doc" "info") + (copy-file "doc/org-roam.info" "org-roam.info"))) + (add-after 'make-info 'install-image + (lambda* (#:key outputs #:allow-other-keys) + (install-file "doc/images/org-ref-citelink.png" + (string-append #$output "/share/info/images")))) ;; Move the extensions source files to the top level, which ;; is included in the EMACSLOADPATH. - (add-after 'unpack 'move-source-files + (add-after 'install-image 'move-source-files (lambda _ (let ((el-files (find-files "./extensions" ".*\\.el$"))) (for-each (lambda (f) @@ -40195,17 +40203,7 @@ (define-public emacs-org-roam (make-file-writable "org-roam-graph.el") (emacs-substitute-variables "org-roam-graph.el" ("org-roam-graph-executable" - (search-input-file inputs "/bin/dot"))))) - (add-after 'install 'install-image - (lambda* (#:key outputs #:allow-other-keys) - (install-file "doc/images/org-ref-citelink.png" - (string-append #$output "/share/info/images")))) - (add-after 'install-image 'make-info - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion "doc" - (invoke "makeinfo" "-o" "org-roam.info" "org-roam.texi") - (install-file "org-roam.info" - (string-append #$output "/share/info")))))))) + (search-input-file inputs "/bin/dot")))))))) (inputs (list graphviz)) (native-inputs @@ -40213,10 +40211,7 @@ (define-public emacs-org-roam (propagated-inputs (list emacs-dash emacs-emacsql - emacs-f - emacs-magit - emacs-org - emacs-s)) + emacs-magit)) (home-page "https://github.com/org-roam/org-roam/") (synopsis "Non-hierarchical note-taking with Org mode") (description "Emacs Org Roam is a solution for taking non-hierarchical