From patchwork Fri May 5 09:11:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Josefsson X-Patchwork-Id: 49808 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 875A227BBE9; Fri, 5 May 2023 10:12:21 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 9740D27BBE2 for ; Fri, 5 May 2023 10:12:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1purTx-0004NK-2R; Fri, 05 May 2023 05:12:05 -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 1purTv-0004N7-ET for guix-patches@gnu.org; Fri, 05 May 2023 05:12:03 -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 1purTv-0002OY-6A for guix-patches@gnu.org; Fri, 05 May 2023 05:12:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1purTu-0007HL-JJ for guix-patches@gnu.org; Fri, 05 May 2023 05:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60369] [PATCH v3] gnu: Add eweouz. Resent-From: Simon Josefsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 May 2023 09:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60369 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: ludo@gnu.org, 60369@debbugs.gnu.org Received: via spool by 60369-submit@debbugs.gnu.org id=B60369.168327792027971 (code B ref 60369); Fri, 05 May 2023 09:12:02 +0000 Received: (at 60369) by debbugs.gnu.org; 5 May 2023 09:12:00 +0000 Received: from localhost ([127.0.0.1]:53139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1purTr-0007H4-O0 for submit@debbugs.gnu.org; Fri, 05 May 2023 05:12:00 -0400 Received: from uggla.sjd.se ([178.174.241.107]:50410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1purTm-0007Gp-1v for 60369@debbugs.gnu.org; Fri, 05 May 2023 05:11:58 -0400 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=ed2303; h=Content-Type:MIME-Version:Message-ID:In-Reply-To :Date:References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding :Content-ID:Content-Description; bh=nHF1Pq0pSOj3WwXG3poPKaQ57yzYVah4xQxF/mnlt0k=; t=1683277910; x=1684487510; b=KdXftpRv1rBmoZzARjh2N+fcJYfq+YXfkDwlRahNTy9J3MuPZbdhTT485EEQUMbVUo2ywLdxV6M eJcFcRgVGAg==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=rsa2303; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=nHF1Pq0pSOj3WwXG3poPKaQ57yzYVah4xQxF/mnlt0k=; t=1683277910; x=1684487510; b=htxJYjViuCrWkzrhMVc2233gHn3U87KBeOtXyr0ZRQpB6bBrrF8gGxmY0i/BDUBKMva2/d+v4MR d3q6BSSGEBT4FnUhnDZbarplvLVtqlINUxu5V78l5kv/nQHiuM6EwschmS2tHKoRvwMKgKCJHnV2Q Xb9V6z0Byyd7NgJ5wxqNLeCiXFdBMGT/2CoxGWJKKrqkmqRd/lcu2dIEL2EuSIGBS70NR35PY3Oji EiBbUZ1Om9oesh09Sew9aVKBfLSxzQD5p8+FkWIj4mkEbRcITHA4ytkkKh+Yfe6zEWuYdJ8PL4ifm ITnh3cXAkyNZTMj/AgNT7jS/KRpIcHHtgquvLyh0BoG7hwvdxd3A2Cx0PP3LH+QOo5HQIEPMWvQM6 Fjkw9tSrV6eAh79+TWNMu+U6nVqOg4PfvY311QFT42l6jM3sGaarg4OxVzgbBLxR94z2yCBW/; Received: from [2001:9b1:41ac:ff00:d2e3:ff72:3013:2f09] (port=48748 helo=paj) by uggla.sjd.se with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1purTf-009uJE-Ia; Fri, 05 May 2023 09:11:47 +0000 References: <871qok1n2m.fsf@josefsson.org> <877cx2s4vl.fsf@gnu.org> <87bkm859at.fsf_-_@josefsson.org> <87a5ylvadx.fsf@nicolasgoaziou.fr> OpenPGP: id=B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE; url=https://josefsson.org/key-20190320.txt X-Hashcash: 1:22:230505:ludo@gnu.org::HAc93/w2u6hB/di+:1FIr X-Hashcash: 1:22:230505:mail@nicolasgoaziou.fr::8p0j4gVMBERQfW7c:0t/n X-Hashcash: 1:22:230505:60369@debbugs.gnu.org::K/nhnX8yMHMw1Kiz:S+3x Date: Fri, 05 May 2023 11:11:50 +0200 In-Reply-To: <87a5ylvadx.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Wed, 03 May 2023 14:59:22 +0200") Message-ID: <87r0rvjg6h.fsf_-_@josefsson.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) 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: Simon Josefsson X-ACL-Warn: , Simon Josefsson via Guix-patches X-Patchwork-Original-From: Simon Josefsson via Guix-patches via From: Simon Josefsson 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 Nicolas Goaziou writes: > Hello, > > Thank you. Hi Nicolas. Thank you for your feedback! >> + (arguments > > You should use G-expressions from here: > > (list > #:modules '(...) > #:imported-modules `(...) > #:configure-flags > #~(list (string-append ... (emacs:elpa-directory #$output)))) > #:phases > #~(modify-phases ...) Fixed. >> + (add-after 'enter-lisp-dir 'emacs-patch-variables >> + (lambda* (#:key outputs #:allow-other-keys) > > This is not necessary: lambda _ I don't understand what you mean. There is no lambda _ above -- did you mean this snippet: (replace 'bootstrap (lambda _ (invoke "autoreconf" "-vif"))) (add-after 'compress-documentation 'enter-lisp-dir (lambda _ (chdir "lisp/"))) If so, how to improve that? >> + (make-file-writable "eweouz.el") > > I think you can remove this line. Fixed. I got permission errors earlier, but it seems to have gone away. > >> + (substitute* "eweouz.el" >> + (("\\(setq eweouz-helper-dirs '\\(") >> + (format #f "(setq eweouz-helper-dirs '(~s " >> + (string-append (assoc-ref outputs "out") >> + "/libexec/eweouz")))))) > > You should use emacs:emacs-substitute-variables here. I used emacs-substitute-sexp now. It seems emacs-substitute-variables only works on def*, and here it was setq. >> + "eweouz is an tool for looking up contacts from Evolution Data >> Server > > Typo and capitalization: Eweouz is a tool... > >> +from Emacs. It is similar to BBDB, except much, much simpler.") > > You should separate sentences with two spaces. Fixed. >> + ;; Most things are GPLv2-only although lisp/vcard.el is GPLv2+. >> + (license (list license:gpl2 license:gpl2+)))) > > Could you send an updated patch? Please see below! /Simon From 38e0cccb53eec629d05b0cbd469411907a4e39c7 Mon Sep 17 00:00:00 2001 Message-Id: <38e0cccb53eec629d05b0cbd469411907a4e39c7.1683277790.git.simon@josefsson.org> From: Simon Josefsson Date: Fri, 5 May 2023 11:04:41 +0200 Subject: [PATCH v3] gnu: Add eweouz. * gnu/packages/emacs-xyz.scm (eweouz): New variable. --- gnu/packages/emacs-xyz.scm | 65 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f9a14a5c9c..77432409eb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -128,6 +128,7 @@ ;;; Copyright © 2023 Juliana Sims ;;; Copyright © 2023 Evgeny Pisemsky ;;; Copyright © 2023 Gabriel Wicki +;;; Copyright © 2022-2023 Simon Josefsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -3359,6 +3360,70 @@ (define-public emacs-bbdb-vcard (BBDB). Version 2.1 vCards are converted into version 3.0 on import.") (license license:gpl2+)))) +(define-public emacs-eweouz + (package + (name "emacs-eweouz") + (version "0.12") + (source + (origin + (method url-fetch) + ;; README's git://git.err.no/eweouz is gone + (uri (string-append "mirror://debian/pool/main/e/eweouz/" + "eweouz_" version ".tar.xz")) + (file-name (string-append name "-" version ".tar.xz")) + (sha256 + (base32 + "192zl3dyphhvcrvn65bqsrc4h6zks8b747lp6pqbpbmsqy4g4mr8")))) + (build-system gnu-build-system) + (arguments + (list + #:modules '((guix build gnu-build-system) + ((guix build emacs-build-system) #:prefix emacs:) + (guix build utils) + (guix build emacs-utils)) + #:imported-modules `(,@%gnu-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) + #:configure-flags + #~(list (string-append "--with-lispdir=" + (emacs:elpa-directory #$output))) + #:phases + #~(modify-phases %standard-phases + (replace 'bootstrap + (lambda _ (invoke "autoreconf" "-vif"))) + (add-after 'compress-documentation 'enter-lisp-dir + (lambda _ (chdir "lisp/"))) + (add-after 'enter-lisp-dir 'emacs-patch-variables + (lambda* (#:key outputs #:allow-other-keys) + (emacs-substitute-sexps "eweouz.el" + ("eweouz-helper-dirs" + `(list ,(string-append (assoc-ref outputs "out") + "/libexec/eweouz")))))) + (add-after 'emacs-patch-variables 'emacs-expand-load-path + (assoc-ref emacs:%standard-phases 'expand-load-path)) + (add-after 'emacs-expand-load-path 'emacs-add-install-to-native-load-path + (assoc-ref emacs:%standard-phases 'add-install-to-native-load-path)) + (add-after 'emacs-add-install-to-native-load-path 'emacs-install + (assoc-ref emacs:%standard-phases 'install)) + (add-after 'emacs-install 'emacs-build + (assoc-ref emacs:%standard-phases 'build)) + (add-after 'emacs-install 'emacs-make-autoloads + (assoc-ref emacs:%standard-phases 'make-autoloads))))) + (native-inputs + (list autoconf + automake + emacs-minimal + pkg-config)) + (inputs + (list evolution-data-server)) + (home-page "https://tracker.debian.org/pkg/eweouz") + (synopsis "Emacs interface to Evolution Data Server") + (description + "Eweouz is an tool for looking up contacts from Evolution Data Server +from Emacs. It is similar to BBDB, except much, much simpler.") + ;; Most things are GPLv2-only although lisp/vcard.el is GPLv2+. + (license (list license:gpl2 license:gpl2+)))) + (define-public emacs-beacon (package (name "emacs-beacon") base-commit: cf44fb964e6216b153ab898002f2f2ab889532ce -- 2.39.2