From patchwork Tue Jun 11 11:20:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 65277 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 C18B727BBF8; Tue, 11 Jun 2024 16:42:49 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 88D0627BBF7 for ; Tue, 11 Jun 2024 16:42:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sH3dT-0006tV-FN; Tue, 11 Jun 2024 11:42:11 -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 1sH3dP-0006sD-95 for guix-patches@gnu.org; Tue, 11 Jun 2024 11:42:08 -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 1sH3dN-0000Ch-N6 for guix-patches@gnu.org; Tue, 11 Jun 2024 11:42:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sH3dK-0000P8-9d; Tue, 11 Jun 2024 11:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71319] [PATCH v2 3/3] gnu: emacs-ddskk-nicola: Improve 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: Tue, 11 Jun 2024 15:42: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.17181204901465 (code B ref 71319); Tue, 11 Jun 2024 15:42:02 +0000 Received: (at 71319) by debbugs.gnu.org; 11 Jun 2024 15:41:30 +0000 Received: from localhost ([127.0.0.1]:35742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH3cn-0000NW-V1 for submit@debbugs.gnu.org; Tue, 11 Jun 2024 11:41:30 -0400 Received: from mail-qv1-f42.google.com ([209.85.219.42]:43374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH3cj-0000MJ-Hg for 71319@debbugs.gnu.org; Tue, 11 Jun 2024 11:41:26 -0400 Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-6ae259b1c87so57053876d6.1 for <71319@debbugs.gnu.org>; Tue, 11 Jun 2024 08:41:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718120421; x=1718725221; 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=FSZqQnstXTk2P5NH3ymZRxrC3uY+xKBwGDrGrNP43+I=; b=Aavd78lySgXiHmfXrRrQBGSVByI64229LzVH4e+KGoZrA9GYX+Tn3T7NXupSKYE8fw hjf1NUYGTg0Tn6aP3QLM/m1ReGdidHt2pIAKqOsfr6ptaGTgurpqcRrNUZXi57/0aUOf QPqA2JfhSPokRrlWVUNXh9OgOmD2Z64kq8UDiZB1Ij2QmwmHQhcoNhkGbmFUMU2cIHMp 7xUwUFiLgu2u43HDlpqiwMsN3oJlJfcCXLBKjM5688JClKSqKrW86OH8F6nrB8rIVKqv Y8EB4MN8ofatHKuB0wXUFQfagjybY4jHsXycN2hD4tyMLt6X2syzE4d2mIr2mmDR9utx TGUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718120421; x=1718725221; 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=FSZqQnstXTk2P5NH3ymZRxrC3uY+xKBwGDrGrNP43+I=; b=XjK8rAnSEzLDCY+B3G2caVbezH1fVEkXp/XB9tLlxz+09xJaLEBCvebmiVwyMNFc8a XZ96Z9OamC8vWyzpOwdkSXprBO3uSpYVVMrWFBUzZT04qI9ru+MeOoYhEHE/Wvmh0b1U 1G4C8tHu/K4VbLmk4GihXpFBcdm4Rn44V9yH53/j0GaSvbR+4Ra9/1DPMuC70tH848G/ NzDu8LejGtENpWgqEXqS4C9mxtg2s7fXOV4x8OFClOALfPCtVbltJo6UbL/q7eiQ2jC0 4KnILzdD+HhcOUOrOwwNccOuLlHbGKWREpTYYYTRiNypfp/xhL+lE5GJw0oJ3Xb0K0f2 /r+Q== X-Gm-Message-State: AOJu0Yx5VT+zaGOOPijyOPo3DKI6ee81ZF7vwOeIDwQwRP2Ul4/gce70 jPJIsgyL9di1Sfu0oM2RiZ3TT1msNWhhoRuVCHLNoZ2k4lAYBlkD5E02VriI X-Google-Smtp-Source: AGHT+IFpxrL4J/5ixM37rRBr4nSblXwJR0FRRS1fxP0I+mXj1qivWtCnk7C8VS/FIikUC1+LvsH9Sg== X-Received: by 2002:a17:902:e5c7:b0:1f7:113c:1b0d with SMTP id d9443c01a7336-1f72890f792mr30519045ad.27.1718104866822; Tue, 11 Jun 2024 04:21:06 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f72046ac16sm25666955ad.211.2024.06.11.04.21.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 04:21:06 -0700 (PDT) From: gemmaro Date: Tue, 11 Jun 2024 20:20:31 +0900 Message-ID: <80aa9ac79b1b8577ce04dec98909fb9e2d0bf9fc.1718104831.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <4328ea3c1b2e79691a6ed1d76e21688a5452f410.1718104831.git.gemmaro.dev@gmail.com> References: <4328ea3c1b2e79691a6ed1d76e21688a5452f410.1718104831.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-nicola)[arguments]: Use newer package style. This is necessary due to the emacs-ddskk package style update since emacs-ddskk-nicola inherits this. It also removes the last #t values from the lambda expressions in phases. Change-Id: Ief8761bca476eba5e675d995b22d0a070f90de2f --- gnu/packages/emacs-xyz.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e6f5eb356c..4690fffc56 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -36894,25 +36894,25 @@ (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 'unpack '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))))))) + (append + (list #: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 'unpack 'chdir + (lambda _ + (chdir "nicola"))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (make-file-writable "NICOLA-DDSKK-CFG") + (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