From patchwork Fri Jun 21 23:02:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 65572 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 C441827BBE9; Sat, 22 Jun 2024 00:07:41 +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, 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 BBB6D27BBE2 for ; Sat, 22 Jun 2024 00:07:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKnLV-0000U7-BS; Fri, 21 Jun 2024 19:07: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 1sKnLT-0000S7-Q7 for guix-patches@gnu.org; Fri, 21 Jun 2024 19:07:03 -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 1sKnLT-0005ya-IE for guix-patches@gnu.org; Fri, 21 Jun 2024 19:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sKnLR-0008Ix-Qg; Fri, 21 Jun 2024 19:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71319] [PATCH v4 1/3] gnu: emacs-ddskk: Update to 17.1 revision 0. References: In-Reply-To: Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2024 23:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71319@debbugs.gnu.org Cc: gemmaro , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 71319-submit@debbugs.gnu.org id=B71319.171901118031842 (code B ref 71319); Fri, 21 Jun 2024 23:07:01 +0000 Received: (at 71319) by debbugs.gnu.org; 21 Jun 2024 23:06:20 +0000 Received: from localhost ([127.0.0.1]:43996 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKnKl-0008HV-Mb for submit@debbugs.gnu.org; Fri, 21 Jun 2024 19:06:20 -0400 Received: from mail-pg1-f172.google.com ([209.85.215.172]:48224) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKnKh-0008HG-AN for 71319@debbugs.gnu.org; Fri, 21 Jun 2024 19:06:17 -0400 Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-6bce380eb9bso1610585a12.0 for <71319@debbugs.gnu.org>; Fri, 21 Jun 2024 16:06:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719011110; x=1719615910; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1JWNSctRekOk5LEuX5N/vv7/e7RBz7zgOgdeGG9ABt4=; b=HrCNgQs1C1RrGGKI4G4Ub8jwgbcRnFOE4H+IhaULEkECJ/tsDdZ8wYt/TKaFIKdQky FGO0fQ+xi+TL43P6ZpV7uSffrfcfsJ5ysrm3t9jO19tG15mJLSSVdaEmUt2tBO2x92eE wjpN71lvNZPiPXSFP/1y39kEXtSbtWebDZW7a8CZEpkpm0hDjHOL2SsJyshp9HbxYVcb VaHUG1c1W9fhhWAbagbkTzAn6MDk6/7rWxAacGOO3xh4HEwYHjUWiGT9zonZ2QzNd/nC 5vX8FRT4PmNVgdYNEEM88U74PVfx1L/3ayPfrYUQtA0Z5QNgPgGztTp+TXoxOClEc1dY wATw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719011110; x=1719615910; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1JWNSctRekOk5LEuX5N/vv7/e7RBz7zgOgdeGG9ABt4=; b=gs13MH57v1ehzncuyEUWr+kVEG19Q90bCz9XH+qaxu8EMttWd7leIFKIbn1Nqpji+o dRIo0vfkU1d7sRqkE0wLjyzCEYd6jsXVpYkg7yr3p6ScnfEmJAv9TRudrGE6g/v4xFE3 6PSxNhjgH9OKReLTXcXMQY7wVs832uBi+GUoic8dbaDlIehPxd6gNutZDCu5x9ocTz7R SS/HBfytR3AZ8CmJK9Sdwe0uEgo9ZjJtlPh0ANyCJZm7jG6IKJhjEc+T8z7dd2qkAMV4 P0wlUsWNvxY2RromMn0ovUjBibbmYqOpwx2pkHN5OEQ+qXT5ATclnWCuZjrXUlZnITz0 wK1A== X-Gm-Message-State: AOJu0Yx5FghaYxhEgv0cif4Uq2QUS0kaTWduMay3nScFdrKUfPP3KuOf UdtZBQJieLYF8HE4/fYrDYTJxb/5JvN9il4ENSPQRX+/x5t69WrJ8kX3ZSfn X-Google-Smtp-Source: AGHT+IHBJXVhGaIOkcYRd/fWDDotUzD8Tu9gLWRgdu1zO0Y4IwOg2VL+yDqaiDeqkiHxxxyzN7TLdA== X-Received: by 2002:a17:902:a3ce:b0:1f9:b807:21ac with SMTP id d9443c01a7336-1f9b80721fcmr69253745ad.51.1719011109794; Fri, 21 Jun 2024 16:05:09 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f9eb32b9f8sm19347715ad.114.2024.06.21.16.05.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 16:05:09 -0700 (PDT) From: gemmaro Date: Sat, 22 Jun 2024 08:02:54 +0900 Message-ID: <6364a0f1d329f7600523d9e27cc71fbebc4655be.1719010975.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.45.1 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-ddskk): Update to 17.1 revision 0 (commit 8c47f46). [arguments]: The SKK-MK and the doc files are now not explicitly made writable. The rm in nicola/Makefile is fixed. (emacs-ddskk-nicola)[arguments]: Move the chdir phase after the fix-test phase. The NICOLA-DDSKK-CFG file is now not explicitly made writable. Change-Id: I7a312f1dbbeb93666121646dd79becdd08f16b79 --- gnu/packages/emacs-xyz.scm | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) base-commit: 594419b09e124b84d3d6141f1e47b5c346eeb704 diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d000e7fd02..ae6f1ed3d9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -141,6 +141,7 @@ ;;; Copyright © 2024 Ilya Chernyshov ;;; Copyright © 2024 Wilko Meyer ;;; Copyright © 2024 Noé Lopez +;;; Copyright © 2024 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -37016,22 +37017,20 @@ (define-public emacs-org-static-blog (license license:bsd-3))) (define-public emacs-ddskk - ;; XXX: Upstream adds code names to their release tags, so version and code - ;; name below need to be updated together. - (let ((version "17.1") - (code-name "Neppu")) + (let ((commit "8c47f46e38a29a0f3eabcd524268d20573102467") + (revision "0")) (package (name "emacs-ddskk") - (version version) + (version (git-version "17.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/skk-dev/ddskk") - (commit (string-append "ddskk-" version "_" code-name)))) + (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0xm53rybxki2784gyjkafg6956viyhhcq51kbmnrwc6aw3yzh7aw")))) + (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -37044,17 +37043,17 @@ (define-public emacs-ddskk (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (make-file-writable "SKK-MK") (emacs-substitute-variables "SKK-MK" ("PREFIX" (assoc-ref outputs "out")) ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX)) ("SKK_PREFIX" "") ("SKK_INFODIR" '(expand-file-name "info" PREFIX))) - (for-each make-file-writable (find-files "./doc")) #t)) (add-after 'unpack 'fix-test (lambda _ (substitute* "Makefile" + (("/bin/rm") (which "rm"))) + (substitute* "nicola/Makefile" (("/bin/rm") (which "rm")))))))) (native-inputs (list emacs-minimal ruby)) @@ -37081,13 +37080,12 @@ (define-public emacs-ddskk-nicola ,@(substitute-keyword-arguments (package-arguments emacs-ddskk) ((#:phases phases) `(modify-phases ,phases - (add-after 'unpack 'chdir + (add-after 'fix-test 'chdir (lambda _ (chdir "nicola") #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (make-file-writable "NICOLA-DDSKK-CFG") (emacs-substitute-sexps "NICOLA-DDSKK-CFG" ("setq NICOLA-DDSKK_PREFIX" "")) #t))))))) From patchwork Fri Jun 21 23:02:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 65570 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 99ED927BBE9; Sat, 22 Jun 2024 00:07:26 +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, 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 5246C27BBE2 for ; Sat, 22 Jun 2024 00:07:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKnLV-0000VK-RG; Fri, 21 Jun 2024 19:07: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 1sKnLU-0000TJ-FA for guix-patches@gnu.org; Fri, 21 Jun 2024 19:07:04 -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 1sKnLU-0005yo-73 for guix-patches@gnu.org; Fri, 21 Jun 2024 19:07:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sKnLS-0008J4-7L; Fri, 21 Jun 2024 19:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71319] [PATCH v4 2/3] gnu: emacs-ddskk: Use newer package style. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2024 23:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71319@debbugs.gnu.org Cc: gemmaro , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 71319-submit@debbugs.gnu.org id=B71319.171901119131866 (code B ref 71319); Fri, 21 Jun 2024 23:07:02 +0000 Received: (at 71319) by debbugs.gnu.org; 21 Jun 2024 23:06:31 +0000 Received: from localhost ([127.0.0.1]:43999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKnKx-0008Ht-52 for submit@debbugs.gnu.org; Fri, 21 Jun 2024 19:06:31 -0400 Received: from mail-pg1-f180.google.com ([209.85.215.180]:51666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKnKv-0008Hh-P7 for 71319@debbugs.gnu.org; Fri, 21 Jun 2024 19:06:30 -0400 Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-710437d0affso1908037a12.3 for <71319@debbugs.gnu.org>; Fri, 21 Jun 2024 16:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719011125; x=1719615925; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J6xoLr+4HHXzLS6VihFtGm+ef2VOJhDzEGaFr+hR+U4=; b=Pyfb4bCRl1T7717iYAl9mMRXI6JpXtX3h0qnWqmTKXEkSouEHITGKNF0XeaXP7osx0 eGTRKXcjGAwF5ZHq2mLPKe4Hn7F40XKTL85YrVknpU6m8FRMPEHyY5cCAKTczPa8YaCF QSjzyVi95lhNO6I5nRMhPc7AEeM5KWqwNbQftDpPVFIhse9GHW5sbbKijX+G0B519+Af ZEdWKoBmDsYpqQsJvv0sEfDs4sIERxkvzbQcHIq8JajEJv5Ky6PXj5rVO2cSI/MUnwEc LH2L4WU7KK/e1ao2qAwwzx6mfWiigstP+Xvk0LEfN+16cj2MeNpAL8K7/393YNSlA3it hclw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719011125; x=1719615925; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J6xoLr+4HHXzLS6VihFtGm+ef2VOJhDzEGaFr+hR+U4=; b=h4K29asXjXhNZsfmfnN6ij2D6ExvuxbmDUafV6gsJ2qb1eX+GfHhkxvq6KxTwv8DEN 8AHrs/g69MjcXimlo+75ak5/icoLfsZFo8ET2x3gdzsaEg/0b+YDvWTOeZrC/BdCmn9d WSvMdTKTp+9PDoP/yxU8JSPhT/n7/T+7cAQiXB1ynt/aUTJr6IsWnWvf8Pa01KPPc/Y9 dMeJqBlK6I+ufQWM2CDuNBQqp6mCrl47FqU3TbBG6VySesnqwEvsZb2Qh9unaLQyX2My AKNo590QVLhj+t+w5WcTtXElJ5qh6fhL35k/wefrkaejBpzjZWZAI9nMTP/I/jERt6Rn ASfA== X-Gm-Message-State: AOJu0Yz9E/5gSiG6QNDWKkIZyxvGs33Gc++OZhd6rhkImshA8I8TGye3 K17nzWrutRtjHvRphimKy7tps56WwI/1z1MB2FZyBQejVZDg1ziFS5PdD33+ X-Google-Smtp-Source: AGHT+IFi2XYk/pMtzStWPXj+mRQpLx5vptq+xB1/a2gRnx2P+F29UC38se22syDYfux11FVLYuTddw== X-Received: by 2002:a17:902:bb10:b0:1f9:d982:5f23 with SMTP id d9443c01a7336-1f9d9826d9fmr43547615ad.12.1719011124492; Fri, 21 Jun 2024 16:05:24 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f9eb32b9f8sm19347715ad.114.2024.06.21.16.05.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 16:05:24 -0700 (PDT) From: gemmaro Date: Sat, 22 Jun 2024 08:02:55 +0900 Message-ID: <01992d075af9014d054c586982f3838ca76447d0.1719010975.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <6364a0f1d329f7600523d9e27cc71fbebc4655be.1719010975.git.gemmaro.dev@gmail.com> References: <6364a0f1d329f7600523d9e27cc71fbebc4655be.1719010975.git.gemmaro.dev@gmail.com> 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-ddskk)[arguments]: Convert to list of G-Expressions. Use #$output rather than the outputs alist. Removed #t. Change-Id: Ie6ed743ded35b55fa55bb61d02353456a0f2c79f --- gnu/packages/emacs-xyz.scm | 43 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ae6f1ed3d9..7128bbd1f1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37033,28 +37033,27 @@ (define-public emacs-ddskk (base32 "0vfdbab3ncns8wwrna8h6y2w0grkphzr9s65sgxq98lpqmxbbr72")))) (build-system gnu-build-system) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:test-target "test" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (emacs-substitute-variables "SKK-MK" - ("PREFIX" (assoc-ref outputs "out")) - ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX)) - ("SKK_PREFIX" "") - ("SKK_INFODIR" '(expand-file-name "info" PREFIX))) - #t)) - (add-after 'unpack 'fix-test - (lambda _ - (substitute* "Makefile" - (("/bin/rm") (which "rm"))) - (substitute* "nicola/Makefile" - (("/bin/rm") (which "rm")))))))) + (list #:modules '((guix build gnu-build-system) + (guix build utils) + (guix build emacs-utils)) + #:imported-modules `(,@%gnu-build-system-modules + (guix build emacs-utils)) + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (emacs-substitute-variables "SKK-MK" + ("PREFIX" #$output) + ("LISPDIR" '(expand-file-name "/share/emacs/site-lisp" PREFIX)) + ("SKK_PREFIX" "") + ("SKK_INFODIR" '(expand-file-name "info" PREFIX))))) + (add-after 'unpack 'fix-test + (lambda _ + (substitute* "Makefile" + (("/bin/rm") (which "rm"))) + (substitute* "nicola/Makefile" + (("/bin/rm") (which "rm")))))))) (native-inputs (list emacs-minimal ruby)) (home-page "https://github.com/skk-dev/ddskk") From patchwork Fri Jun 21 23:02:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 65571 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 7D2BE27BBE9; Sat, 22 Jun 2024 00:07:28 +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, 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 CE62B27BBE2 for ; Sat, 22 Jun 2024 00:07:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKnLV-0000Uo-Ng; Fri, 21 Jun 2024 19:07: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 1sKnLU-0000Sg-4X for guix-patches@gnu.org; Fri, 21 Jun 2024 19:07:04 -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 1sKnLT-0005yb-Sk for guix-patches@gnu.org; Fri, 21 Jun 2024 19:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sKnLS-0008JI-MM; Fri, 21 Jun 2024 19:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71319] [PATCH v4 3/3] gnu: emacs-ddskk-nicola: Use new package style. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2024 23:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71319@debbugs.gnu.org Cc: gemmaro , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 71319-submit@debbugs.gnu.org id=B71319.171901120431891 (code B ref 71319); Fri, 21 Jun 2024 23:07:02 +0000 Received: (at 71319) by debbugs.gnu.org; 21 Jun 2024 23:06:44 +0000 Received: from localhost ([127.0.0.1]:44002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKnL9-0008IJ-HR for submit@debbugs.gnu.org; Fri, 21 Jun 2024 19:06:43 -0400 Received: from mail-pl1-f180.google.com ([209.85.214.180]:52501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKnL7-0008I5-A7 for 71319@debbugs.gnu.org; Fri, 21 Jun 2024 19:06:41 -0400 Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1f9a78c6c5dso21558455ad.1 for <71319@debbugs.gnu.org>; Fri, 21 Jun 2024 16:06:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719011136; x=1719615936; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FpfuO5eKX71aIWbDZkTxVvTRDDISYHWIMxSkoXjI3u4=; b=U2cNOOL+gK7OJ1I1EjuN5zFAldkDMy+4D3UqTXcdvd7cEv6np/cfsFCIZxVhEwtdxd gu6eAcxdhWCMnMA55uzedKJd80tM2GBwfegSBk7teekEIO2ixkgqHHYHJZyEZyuxZf9G v9S1pLV1ogm/faYzavoTrrrfVJMTRAK+CK9JoduoHLC5ez0mjqDedM4l0DMCvpK1PVDu CMIgpxgW83kbCFLKtIdvBzhIPraS55DcfcYXzJmX6NU65UPNxLNEa4wVHTsgkwVoILo5 HpAhI4H/puNADQr1bZqf80VuDPnm2nBgvxQMLFiLJ4yuW8P2LNSuBLu4SDYgEYrPZA7N xMMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719011136; x=1719615936; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FpfuO5eKX71aIWbDZkTxVvTRDDISYHWIMxSkoXjI3u4=; b=C+9GlmCYD6IbuicUHE5uhouAGIvdsMb8+2/1L993cC6k3rTR5snFkka2KLu8Fl7qDf dYxk1yqZ7qiXtk2YkG9+K92d4LuWh1Marxo+aX5zAkEi2iY4Os3hv06Lb4Bv2Aq3V9OG sCMV/xrf8B/YOq5omhgD9E0f/JlZb9hGSC6o/U6v1gZ8tjU2YALNp5USAHpM3vkBcXf/ ASzIrBfwuL3EToV9TzzPLQv/D9RElMcq4HI4Rsku8xL/nVO2W7XD4fttgeoMqYSYX7jH +87qUSrdZGAYSM3IG8OZsumP2ePMobu0pq2AYSETI7q99qgt9KAepuppdLUv45/phF2N 3fxQ== X-Gm-Message-State: AOJu0YxYAJSV6MyJYqY89dRlcJqfkXlJZ1G8G8a17G/JrENdUQlE55Ol lvPxtiVsXF/cyFThk9n3YDmuPXDtIGW4uzprNYXsrVGfOXQDhhOMhIInSBto X-Google-Smtp-Source: AGHT+IHeTxvhl+L8rKs2pFmx3LA/lIaL8D+mR1iaSMaUEmGEsbWFHTjuBhhn0Ppk7GuM+dAJ93qBeA== X-Received: by 2002:a17:902:eccb:b0:1f4:75e8:2ea0 with SMTP id d9443c01a7336-1f9aa3ecd1amr104008045ad.6.1719011135982; Fri, 21 Jun 2024 16:05:35 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f9eb32b9f8sm19347715ad.114.2024.06.21.16.05.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 16:05:35 -0700 (PDT) From: gemmaro Date: Sat, 22 Jun 2024 08:02:56 +0900 Message-ID: <0732e895c25fb516a64c38909ede3e9fb3d679da.1719010975.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <6364a0f1d329f7600523d9e27cc71fbebc4655be.1719010975.git.gemmaro.dev@gmail.com> References: <6364a0f1d329f7600523d9e27cc71fbebc4655be.1719010975.git.gemmaro.dev@gmail.com> 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 This is a follow-up to commit d8577f604e91a7deebc1c6928a140ac4cfda5895. * gnu/packages/emacs-xyz.scm (emacs-ddskk-nicola)[arguments]: Convert to list of G-Expressions. Use #$output rather than the outputs alist. Removed trailing #t. Change-Id: Ief8761bca476eba5e675d995b22d0a070f90de2f --- gnu/packages/emacs-xyz.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7128bbd1f1..fbdd58ab9e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37070,24 +37070,23 @@ (define-public emacs-ddskk-nicola (propagated-inputs (list emacs-ddskk)) (arguments - `(#:make-flags - (let ((out (assoc-ref %outputs "out"))) - (append - (list (string-append "PREFIX=" out) - (string-append "LISPDIR=" out "/share/emacs/site-lisp")))) - #:tests? #f ; no tests in this subtree - ,@(substitute-keyword-arguments (package-arguments emacs-ddskk) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'fix-test 'chdir - (lambda _ - (chdir "nicola") - #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (emacs-substitute-sexps "NICOLA-DDSKK-CFG" - ("setq NICOLA-DDSKK_PREFIX" "")) - #t))))))) + (append + (list #:make-flags + #~(append + (list (string-append "PREFIX=" #$output) + (string-append "LISPDIR=" #$output "/share/emacs/site-lisp"))) + ;; no tests in this subtree + #:tests? #f) + (substitute-keyword-arguments (package-arguments emacs-ddskk) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'fix-test 'chdir + (lambda _ + (chdir "nicola"))) + (replace 'configure + (lambda _ + (emacs-substitute-sexps "NICOLA-DDSKK-CFG" + ("setq NICOLA-DDSKK_PREFIX" ""))))))))) (synopsis "Nicola layout for Daredevil SKK") (description "Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji