From patchwork Sun Feb 5 17:08:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Josefsson X-Patchwork-Id: 46686 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 C3BD427BBED; Sun, 5 Feb 2023 17:10:15 +0000 (GMT) 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=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 9900627BBE9 for ; Sun, 5 Feb 2023 17:10:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pOiWh-0005jp-Ky; Sun, 05 Feb 2023 12:10:03 -0500 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 1pOiWg-0005jg-Ni for guix-patches@gnu.org; Sun, 05 Feb 2023 12:10:02 -0500 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 1pOiWg-00036X-FR for guix-patches@gnu.org; Sun, 05 Feb 2023 12:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pOiWf-0005k8-Ma for guix-patches@gnu.org; Sun, 05 Feb 2023 12:10:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60369] [PATCH v2] gnu: Add eweouz. Resent-From: Simon Josefsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Feb 2023 17:10:01 +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: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 60369@debbugs.gnu.org Received: via spool by 60369-submit@debbugs.gnu.org id=B60369.167561694822003 (code B ref 60369); Sun, 05 Feb 2023 17:10:01 +0000 Received: (at 60369) by debbugs.gnu.org; 5 Feb 2023 17:09:08 +0000 Received: from localhost ([127.0.0.1]:46363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOiVm-0005in-MV for submit@debbugs.gnu.org; Sun, 05 Feb 2023 12:09:08 -0500 Received: from uggla.sjd.se ([178.174.241.107]:36894) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOiVj-0005iK-Dc for 60369@debbugs.gnu.org; Sun, 05 Feb 2023 12:09:05 -0500 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=ed2110; 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=8rZkMwV6rJQzvRABKCwe0h1gShTswBdfmcHDvxw7H7A=; t=1675616943; x=1676826543; b=3I4MVwBTRjKL3rm8iGR166s34rWTV6g1m2KY3gcQeyUJPr1hTKkASRet7rCB/QpttO5/04KT6y5 lKZeXgXb0BQ==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=rsa2110; 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=8rZkMwV6rJQzvRABKCwe0h1gShTswBdfmcHDvxw7H7A=; t=1675616943; x=1676826543; b=lRIPOBshVmN16CbRaam8LBN0MZZsUciroJ+maUBkz7AewosNdRcUEE6eXRpR6SqzzOJrpIqNIaE yyN+OkLjvAOWxz+Q98X92GPoNKy75yMG3kVPQEPksgmoLcVBdPTyMFd7Th1xKl112aoe9T5pU7avR byT+zYnlNqRtIgMisNCAwV3t83ItaoAn7WMLbE8hIbpQHiCzJJeIkEdBQ/UIbSLgHVyQiMlHQTyG9 P8cBAzmYIdg+KsCmzCUsJFaNqU2BtoKKmW4+9ekxBrTnUdghstWfZWxfbTIVVbC5py7phnhbfdOOv C4syRF/LpYLGqJpI+Mf5UldhVyheHPCf2BZgVdMkcO37V0XV0y/HwenW/i6olbXt6Ue8Nzg1/In1f f2IbocZO2P5R0hi7XZfjF4bQVi3Gneq/hLqj/5QsEjvyGahE5rBFBU/hx8XRDoiq4kapdITaH; Received: from 233.56-78-194.adsl-static.isp.belgacom.be ([194.78.56.233]:20979 helo=kaka) by uggla.sjd.se with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pOiVf-00AILX-TP; Sun, 05 Feb 2023 18:09:00 +0100 References: <871qok1n2m.fsf@josefsson.org> <877cx2s4vl.fsf@gnu.org> OpenPGP: id=B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE; url=https://josefsson.org/key-20190320.txt X-Hashcash: 1:22:230205:ludo@gnu.org::Py7xF1A8lef3OjhM:zK5 X-Hashcash: 1:22:230205:60369@debbugs.gnu.org::WpIOjEZti9Jt5gSH:1r9g Date: Sun, 05 Feb 2023 18:08:58 +0100 In-Reply-To: <877cx2s4vl.fsf@gnu.org> ("Ludovic =?utf-8?q?Court=C3=A8s?= "'s message of "Tue, 31 Jan 2023 23:42:22 +0100") Message-ID: <87bkm859at.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 Ludovic Courtès writes: > Hi Simon, > > Simon Josefsson skribis: > >> While the package builds and works for me, I would appreciate a review >> so I can learn -- I wrote this without understanding anything of what I >> was doing, but merely pattern-matched things against other existing >> packages that looked relevant. > > Let’s see. Hi. Thank you for reviewing this. >> +(define-public eweouz >> + (package >> + (name "eweouz") > > Rather “emacs-eweouz” (info "(guix) Package Naming"). Okay. The package provides non-emacs tools too, but I agree emacs-eweouz is more appropriate since few are likely to use the tools outside of the Emacs context. >> + (build-system gnu-build-system) >> + (arguments >> + `(#:tests? #f > > Please add a short comment saying why tests are disabled. I re-enabled the tests now. Upstream doesn't ship any tests, but at least we shouldn't disable them in case there is ever a new version that adds self-test. >> + (modify-phases %standard-phases >> + (replace 'bootstrap >> + (lambda _ (invoke "autoreconf" "-vif") #t)) > > Is this needed? The default ‘bootstrap’ phase does that, roughly. It appears to be needed. The eweouz tarball contains autogen.sh: aclocal autoheader automake --copy --add-missing --foreign autoconf ./configure --enable-maintainer-mode "$@" And guix build seems to prefer invoking autogen.sh over autoreconf, which causes this failure: starting phase `bootstrap' running './autogen.sh' patch-shebang: ./autogen.sh: changing `/bin/sh' to `/gnu/store/4y5m9lb8k3qkb1y9m02sw9w9a6hacd16-bash-minimal-5.1.8/bin/sh' configure.ac:10: installing './compile' configure.ac:4: installing './install-sh' configure.ac:4: installing './missing' src/Makefile.am: installing './depcomp' ./autogen.sh: ./configure: /bin/sh: bad interpreter: No such file or directory error: in phase 'bootstrap': uncaught exception: %exception #<&invoke-error program: "./autogen.sh" arguments: () exit-status: 126 term-signal: #f stop-signal: #f> phase `bootstrap' failed after 0.6 seconds command "./autogen.sh" failed with status 126 > You can omit the trailing #t too. Nice catch, fixed. >> + (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.") >> + (license license:gpl2))) > > Might be ‘gpl2+’, unless it explicitly states “version 2 only”. The majority is GPLv2-only. The essential files in eweouz are the following: src/eweouz-dump-addressbook.c GPLv2-only src/eweouz-write-addressbook.c GPLv2-only lisp/eweouz.el GPLv2-only lisp/vcard.el GPLv2+ Is there a way to express that? I can't seem to find any documentation for the (license...) clause (or am I missing it?), but I added both licenses now and a comment. > That’s all I have to say! Overall it’s looking good. :-) > > Could you send an updated patch? See attached. /Simon From 24f79d8bd21fc7e4687c89bc920b33d6bf62cba9 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Sun, 5 Feb 2023 18:06:08 +0100 Subject: [PATCH] gnu: Add eweouz. * gnu/packages/emacs-xyz.scm (eweouz): New variable. --- gnu/packages/emacs-xyz.scm | 66 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d30696c7be..17d09a858d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -122,6 +122,7 @@ ;;; Copyright © 2023 Simon Streit ;;; Copyright © 2023 John Kehayias ;;; Copyright © 2023 Ivan Vilata-i-Balaguer +;;; Copyright © 2022-2023 Simon Josefsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -3155,6 +3156,71 @@ (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 + `(#: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) + (make-file-writable "eweouz.el") + (substitute* "eweouz.el" + (("\\(setq eweouz-helper-dirs '\\(") + (format #f "(setq eweouz-helper-dirs '(~s " + (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") -- 2.38.1