From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 02 03:57:00 2024 Received: (at submit) by debbugs.gnu.org; 2 Jun 2024 07:57:01 +0000 Received: from localhost ([127.0.0.1]:57748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDg5M-0003tE-Jv for submit@debbugs.gnu.org; Sun, 02 Jun 2024 03:57:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:57252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDg5J-0003sv-WD for submit@debbugs.gnu.org; Sun, 02 Jun 2024 03:56:58 -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 1sDg57-00044J-HW for guix-patches@gnu.org; Sun, 02 Jun 2024 03:56:45 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sDg56-0005eN-56 for guix-patches@gnu.org; Sun, 02 Jun 2024 03:56:45 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1f64ecb1766so7158945ad.1 for ; Sun, 02 Jun 2024 00:56:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717315001; x=1717919801; darn=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=m6mmHJiDlgY3yAbzvbbCRmRQg4uIDzejGqdD7kZr5xE=; b=R2m5pwRKdWHVhlutIklj8JFZFeybV+z5TWMcyjThs4unABqZqIBVC5CIX+SgFJDi2b CpGmMOOgXADOPggAVjOlOTQCMNi1hHDXgqoFVXc/D4ABrCop60/4QEl9Zu36jfOkCc4W gJm34rJBMiYWeOagWoaFpTxbuxPGmlYj71HAYXpcy6ZPYTwPJj/k3u1xTe6NMrDQCRHy M1np3SzRLYEK3TFUwKRxIofpPj93NNFAgDsJWLO3eFUdX+s01fcpehkAYvAu9R1PLmPZ PIsj7eRDKRhls1FMqajQ+JbojzuhkmOCHgD/a/4MOjjnFb2plUBD0/EvR6YeKo3xzXkd J0ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717315001; x=1717919801; 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=m6mmHJiDlgY3yAbzvbbCRmRQg4uIDzejGqdD7kZr5xE=; b=r9V69/uIWkOo4tT+SODOwVGyG0Cixa4l7NTz29ShpZMTf6hbE+bxlCXF3y6LhODJqA 5JYzWmAhKWOT1P1nLpq9ajBYNAQNPmZvTKCnmcLQZ23ff2Me/FvFeiB8mqz8zohhl51m OJqqMaNy59Ui2qm4nSk3FW63WtmCKzbyx+ESdnxYSUpiN4BSJyY2uukDFi5OwV3YXdxC cXHEtWel5s2njEURaceaSgIH8dRtnsfsVUba/sX8p7JCa9CNb93zjhrD272vSMWQZspE QHncR10zD27GJAd3tqMbtDpvK+SdRVn1ctseV6Dj1oY3vNzTSyOd9XfWe7/7xaX2vnZ5 KD0A== X-Gm-Message-State: AOJu0YyPdjoIHujH1njdIWMsLMp6Jfa515D0hwNtvn+t6pOkkt/CecU6 09oYGP3FFT/kM6EBjtqn+lHUNAxCDdB2nxq8VX+CngljWbuL+gRlHdjGG15a X-Google-Smtp-Source: AGHT+IGpMB+zbK6c57irSWaG0oVxHoupJUqfVEMDpPMehcG0fHqXk62hNNLl10nbKsYY4jV18Z7CmA== X-Received: by 2002:a17:902:ecc7:b0:1f4:6f3a:a10e with SMTP id d9443c01a7336-1f636fd9b76mr76752845ad.9.1717315001374; Sun, 02 Jun 2024 00:56:41 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f6323e8ad6sm43176265ad.185.2024.06.02.00.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jun 2024 00:56:40 -0700 (PDT) From: gemmaro To: guix-patches@gnu.org Subject: [PATCH 0/2] gnu: emacs-ddskk: Update to 17.1 revision 0. Date: Sun, 2 Jun 2024 16:56:04 +0900 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=gemmaro.dev@gmail.com; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello, This updates emacs-ddskk to the latest commit. It also applies the newer package style. Best, gemmaro. gemmaro (2): gnu: emacs-ddskk: Update to 17.1 revision 0. gnu: emacs-ddskk: Improve package style. gnu/packages/emacs-xyz.scm | 59 ++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 28 deletions(-) base-commit: fa7906d64881ee12e0c418136b44c73766e3d169 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 02 05:10:22 2024 Received: (at 71319) by debbugs.gnu.org; 2 Jun 2024 09:10:22 +0000 Received: from localhost ([127.0.0.1]:57808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDhEL-00007X-Mf for submit@debbugs.gnu.org; Sun, 02 Jun 2024 05:10:22 -0400 Received: from mail-pl1-f176.google.com ([209.85.214.176]:44048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDhEI-000079-Cq for 71319@debbugs.gnu.org; Sun, 02 Jun 2024 05:10:20 -0400 Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1f47f07aceaso19297155ad.0 for <71319@debbugs.gnu.org>; Sun, 02 Jun 2024 02:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717319340; x=1717924140; 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=Bl03zV6VV4uyR9Zh7GSiuNjTcasiuqLMjcrePVaq6gs=; b=PSI0hU54lNdX/Oy7YSyJ8HWTq5SYgkiix95j4kWkdeDh0GlgxpRqeMIkxCXeKV2iWN f2adRBrOb6SSsC4sCw6A2UpDpKmA6ht894Cb74IBfbmPItmW91zKGRp4cPGACBgeFd9Z M0QvWBdUyx4L8yZ2NYMnaBFZhBhSA/7ROOMpTxfswcFKSc/rnyU5JbqyZfbxw12fziu1 G7Pr3P1BdNO+4dA/YvThgc622HkqMP3PCL6YRBKS9bw9ziv9mF/c9kel67tpzNt29xcr T21keCrpOWPbyroT1Afw1lkVY0sugJL9PnSdRRERPvg41aS0EoSb4nTvSl40dwup64VV 4E7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717319340; x=1717924140; 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=Bl03zV6VV4uyR9Zh7GSiuNjTcasiuqLMjcrePVaq6gs=; b=H60bdvi3FcG+nVc8ANTn6dmOVCamk5HygJuLxoZ5uDydaRmLGLSTo7VmeBP0t2TWdQ 90Obvk48aa8F/zLvOABBEYDui8egCoV92XnI6mXRrIkxYWowRc1a53EAENpLrQD4zK1b kHJuxARbLynqXnp8u/8S6eDD5aYbf+N5manY1n0GbWbAueqd6yb5UsxNer8APS8HXZMX Ujny5oHZKZa/yef6XfB7VIjbH4lrauxBzdM5GjRORt2byucwzYqFRhEs+L6Eks++U6+a UTTfVaDuDuxMztv+aD4zokrNEp3Ca6uZl2aKDqPBEALSUIEeeHoizgiv6ZC0VFz2MrrE xNzA== X-Gm-Message-State: AOJu0YzixBrnfXWTkAEBeSsKOtSJKBopNbKYdq6p45yYtJPxucBWuWno eMrWO95v3cUS2rECnjJAPSJC2oeUKnFtMQynakglnZFuKKqIY3M2qq/4XrA0 X-Google-Smtp-Source: AGHT+IGwd+GbufEe2hvilZu3efumP4WGW3ASiFVsERo6RqVP7owI+gdXjHy8oq71p+23wd6pHSINJw== X-Received: by 2002:a17:902:cec4:b0:1f3:1ca5:9166 with SMTP id d9443c01a7336-1f6370ad6aamr68502545ad.61.1717319340140; Sun, 02 Jun 2024 02:09:00 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63236d26dsm44345915ad.103.2024.06.02.02.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jun 2024 02:08:59 -0700 (PDT) From: gemmaro To: 71319@debbugs.gnu.org Subject: [PATCH 1/2] gnu: emacs-ddskk: Update to 17.1 revision 0. Date: Sun, 2 Jun 2024 18:08:45 +0900 Message-ID: <3e991841bf01280a06d083d3f51db71199599ac7.1717314904.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-ddskk): Update to version 17.1 revision 0 (commit 8c47f46). Change-Id: Iefd35340dfaad9daf2dbba3bcb1524716e90bd21 --- gnu/packages/emacs-xyz.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 75ea4d3a19..b4ce751b86 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -138,6 +138,7 @@ ;;; Copyright © 2023 Ian Eure ;;; Copyright © 2024 Suhail Singh ;;; Copyright © 2024 dan +;;; Copyright © 2024 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -36784,22 +36785,24 @@ (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. + ;; XXX: Upstream adds code names to their release tags, so version + ;; and code name need to be declared and updated together when the + ;; next version is released (e.g. "Neppu" in 17.1.) (let ((version "17.1") - (code-name "Neppu")) + (commit "8c47f46e38a29a0f3eabcd524268d20573102467") + (revision "0")) (package (name "emacs-ddskk") - (version version) + (version (git-version version 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) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 02 05:10:22 2024 Received: (at 71319) by debbugs.gnu.org; 2 Jun 2024 09:10:22 +0000 Received: from localhost ([127.0.0.1]:57810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDhEM-00007d-4c for submit@debbugs.gnu.org; Sun, 02 Jun 2024 05:10:22 -0400 Received: from mail-pg1-f174.google.com ([209.85.215.174]:59632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDhEK-00007G-96 for 71319@debbugs.gnu.org; Sun, 02 Jun 2024 05:10:20 -0400 Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-6819b3c92bbso2686226a12.2 for <71319@debbugs.gnu.org>; Sun, 02 Jun 2024 02:10:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717319342; x=1717924142; 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=4+gprbFc0FggoBpxd23BH9rf43T3fRDuvMFrlMoBP7A=; b=h4LWDBECA6JgZCU+gn88EKxQw4mLSwhHrHSP07d72OP3biXre+dhP+uY40uQgIBBAC QObKcUXQkgwM49zaj7cxRdpEbWXSmPRLeAKqcfZiHp03/3upJSF+VayZ92XSdWQDeN7r Gj5CHpMx6K5PxDOC8QVcjILpawKBgjT0NK6xxtBiMr78BiLorqcuN0AkDnIrivacj2yX jzzOxk9FxP4X35aNwrJgRr7wFhBUv0IMZ4Sjnu5wN5p1yNyedc41NRfYiNTrUTI5sY0v NCEk8DPeNRgkZ5+0TzYTMIUBE3pLN79DeBO5H+bXJvn6GTfiwCe3eU2eB40gj6wzYISx weeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717319342; x=1717924142; 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=4+gprbFc0FggoBpxd23BH9rf43T3fRDuvMFrlMoBP7A=; b=Tq74FjOdpzqn5BjkwJIqaLBTxCN+I/gYWY2wjXeqxsfd1S9jCYcqdL1cuubLTVfutn Ka7RL7vClWJzhrgD7OSnCOdpZrRMyKt2oV4Aik0PHQ3u9rMzzjpCAp/CtIPk4r0JrJm+ zEigDQSWwmTCVzL+vCughwDBFiLw5Is/Yut+oQRzhcxqlWm1xxZBlbgRnphESx6kf9+w BGQmCoiKMPGnx/vsyEk/dLcNr6Yfk/GedW/kgdVqVAe3pmBCQRsBUsmcnVp7D+RP/iw6 mHvyAe9gX7majqmdUMHcj3A0cIyOb62g+qfj32nDcKe8BdVfhNd1WmOZIdAjolS/a/oS ZadQ== X-Gm-Message-State: AOJu0Yy3TB1nSCsPkiSTZfkvkWKgX2p6KmzDpyXn3KM+xJ1KUibvW4RF n2CqlhbFeIdRAam6HJe37EOrMICoj4++OfEb3zSPBoBT92b1Rb5Nma7kS+yA X-Google-Smtp-Source: AGHT+IGe8mjzytPWwzAE0UXOusbeFjD45wAASZC4ugL8ndiKiHXoBY/Nhv/vOpZUqeYcIdNxlegdxg== X-Received: by 2002:a17:902:e742:b0:1f4:88a1:3fd9 with SMTP id d9443c01a7336-1f637028932mr91074135ad.40.1717319342039; Sun, 02 Jun 2024 02:09:02 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63236d26dsm44345915ad.103.2024.06.02.02.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jun 2024 02:09:01 -0700 (PDT) From: gemmaro To: 71319@debbugs.gnu.org Subject: [PATCH 2/2] gnu: emacs-ddskk: Improve package style. Date: Sun, 2 Jun 2024 18:08:46 +0900 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-ddskk)[arguments]: Use newer package style. Change-Id: Ie6ed743ded35b55fa55bb61d02353456a0f2c79f --- gnu/packages/emacs-xyz.scm | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b4ce751b86..66a685c82d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -36805,28 +36805,28 @@ (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) - (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")))))))) + (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* (#: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")))))))) (native-inputs (list emacs-minimal ruby)) (home-page "https://github.com/skk-dev/ddskk") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 11 11:41:30 2024 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 To: 71319@debbugs.gnu.org Subject: [PATCH v2 3/3] gnu: emacs-ddskk-nicola: Improve package style. 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-Debbugs-Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 11 12:28:10 2024 Received: (at 71319) by debbugs.gnu.org; 11 Jun 2024 16:28:10 +0000 Received: from localhost ([127.0.0.1]:36042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH4Lx-0001rW-KX for submit@debbugs.gnu.org; Tue, 11 Jun 2024 12:28:10 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:51363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH4Lw-0001rG-QP for 71319@debbugs.gnu.org; Tue, 11 Jun 2024 12:28:09 -0400 Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-4405a5425baso15426841cf.2 for <71319@debbugs.gnu.org>; Tue, 11 Jun 2024 09:28:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718123225; x=1718728025; 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=adFf2IR3DkeKUe12YBnr5IBvAsgf/BdpYlC6vYSNBKQ=; b=aoEYpeSGOqibMbg3LXyYNdwnRNRkGQrq4fDJQ9ydu6aJeLmfRl3akQ5tEpJIDbL3S2 4t6qiKSMzf2Hw+JVkmTZYCzYfwdvmbSazb2tJBzu5FzgZPI6jaxLkqsFEBOkq2wP/98M 0S3WZuTo64lS9zeBlFeffzq/chnhQ7SacjEb+0uNCxkvYGsIzI0Vhh2ArvXd05dV+UhB 5bznT/TokeN4jDgFPDUcVgw8m01i2//580qzBzcPsdy+sc3rwc32B9IwuOYH8CALIXjH LezV/nPZGqIDnlTTNzriuGoyEA6kDbuC/f3gwTtkxUQboc/lgz0frAmRIQT8/jSlft0p v1ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718123225; x=1718728025; 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=adFf2IR3DkeKUe12YBnr5IBvAsgf/BdpYlC6vYSNBKQ=; b=PRnppcHYqemB8t5YDMQbB2ijW0I/QHYBSYnX9Szjn6uVIkygIygNfLDJqxMkywLb9+ IDDtAlWhrdplxn4OWJRbWuy+pU5PDBQRuOWxP/sfj3a3ZX/TfYPZWQmtewMq9EXoeHsw XvL/3RsutUry7w0bldR4qkHwIft82i+t1bSRxvd8DEFFgPR9a/QRETpSECfuZ3W4azSF qBs/I0Fnab527IbfAnkpJ3Qsp5DKHKeWyRzO8ASOoQqptEJ3rUMS7sRTe8VgiK7bQY7v ZJUdYx996O/YKAWxWtToasA0MeSJaZJtaoEKj6kLiM0Gc1w5pYpM9ZFAXQ8jylp9L513 ngug== X-Gm-Message-State: AOJu0Yxxj6Zva7AZOqbR/71Kvkmnp5SxGckkel0vSFtOil7iqjBzC65q /NYckVUZIDcJWfk1YlOxZhucdoy10IRsOENEqOfzY+Vhaodvt3VeW2mY63WG X-Google-Smtp-Source: AGHT+IFSLJgSFLzNsVCbOW8IuWNIC2ZE1Nyrk/RH1OEZBUyGv9dtyTxEEE522/aXc/o00CJPhDrr4g== X-Received: by 2002:a05:6a20:2583:b0:1b5:781a:61b0 with SMTP id adf61e73a8af0-1b5781a638amr7491545637.61.1718104864753; Tue, 11 Jun 2024 04:21:04 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 04:21:04 -0700 (PDT) From: gemmaro To: 71319@debbugs.gnu.org Subject: [PATCH v2 2/3] gnu: emacs-ddskk: Improve package style. Date: Tue, 11 Jun 2024 20:20:30 +0900 Message-ID: <73fdffde326d9fdb418056b636e08be7b5be8644.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-Debbugs-Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-ddskk)[arguments]: Use newer package style. Change-Id: Ie6ed743ded35b55fa55bb61d02353456a0f2c79f --- gnu/packages/emacs-xyz.scm | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 14be801e9e..e6f5eb356c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -36856,28 +36856,28 @@ (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) - (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")))))))) + (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* (#: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")))))))) (native-inputs (list emacs-minimal ruby)) (home-page "https://github.com/skk-dev/ddskk") -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 11 13:11:28 2024 Received: (at 71319) by debbugs.gnu.org; 11 Jun 2024 17:11:28 +0000 Received: from localhost ([127.0.0.1]:36193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH51r-0005wW-MB for submit@debbugs.gnu.org; Tue, 11 Jun 2024 13:11:28 -0400 Received: from mail-yw1-f182.google.com ([209.85.128.182]:58867) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH51p-0005wH-UC for 71319@debbugs.gnu.org; Tue, 11 Jun 2024 13:11:26 -0400 Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-628c1f09f5cso16986847b3.1 for <71319@debbugs.gnu.org>; Tue, 11 Jun 2024 10:11:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718125822; x=1718730622; 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=iC1NvHLflhAp0oHraT2m38uaq1VEPqPPP8JxODKsrEE=; b=F8RuTuX/i8hT4vzi4yQdGI/Zv7lFOcUSVlilHaO2DwI1s8um4lt13OQ+rGsMfwPQmn x7runwcrGfXWwTtIRix2jmJKP+zXV3yz+txNYMnyKhmkbxkPDJJg63dv8zG5c4Y95xp3 U1UTBkFRsNN86RVFkVbR6wnIsq/n2fQ/ntgcO+VIyzEHk7axOlW99UHgdYu2vzOkI8tc zvH9SklZe7Sc3m0hXWjfVaSpXagGKuRyKABa5j60iYjmlomyfw/E9QSYood3wfSWdaV9 70GWSAngL7IKVjTtfGrFsP3CedPsQjmidczvqW8VrEjZpRFXC4Gtxk/F9ov5kSrLiql2 DXQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718125822; x=1718730622; 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=iC1NvHLflhAp0oHraT2m38uaq1VEPqPPP8JxODKsrEE=; b=wz9uI75M2JxyrpJ7eSS/DxE+Ll29fKsuWMRp9KgsuAXKfbm41xz6NRvRVjEVyPNIc6 TZ3ngNis9Oo+WgNMUW0QbCIF8ZV+31TjG1ZxrmWsaZ4Bzm03EDBxQTPHJ3krUtVGM1fb zWMicA+Xw0dFHzYOukb1AOEX6P2htzmFBikxbN9EO906XALj/pK8Ie7nQODZOfgJVPJN fITGiQWWu06a4XrTklbm6FesFaVWSQJuR0DSJrESJM1EYFEZ1J2jpltNsq6y1Mh0XbDw DzD8NWRK29lG66nR8gGsh5Ji2hmd9KvEdlGY2QuvYiTEcYv7NkgoRRnuEjMEqXCIcDp0 P23Q== X-Gm-Message-State: AOJu0Ywpj1x7d0cgVKxyizRwWebfJMDhOxzcW54xHy3oU0UUcTfkHkry q0HPTLSBGKmXFrvoxxhMwIB82Q6OEsBJ6NYi2gYs/B76F1Wtp2qZ7qDAckdq X-Google-Smtp-Source: AGHT+IGw+4/k+Cbhk8CYR5HBosTwmn9YbHWrSnCXZDnRlYpttaGRD9PvbghphoZoJ77+yWYzabXT/A== X-Received: by 2002:a17:902:da89:b0:1f6:ff9a:cee9 with SMTP id d9443c01a7336-1f6ff9ad07cmr106524235ad.58.1718104862681; Tue, 11 Jun 2024 04:21:02 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 04:21:02 -0700 (PDT) From: gemmaro To: 71319@debbugs.gnu.org Subject: [PATCH v2 1/3] gnu: emacs-ddskk: Update to 17.1 revision 0. Date: Tue, 11 Jun 2024 20:20:29 +0900 Message-ID: <4328ea3c1b2e79691a6ed1d76e21688a5452f410.1718104831.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-Debbugs-Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-ddskk): Update to 17.1 revision 0 (commit 8c47f46). Change-Id: Iefd35340dfaad9daf2dbba3bcb1524716e90bd21 --- gnu/packages/emacs-xyz.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2a943f5846..14be801e9e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -139,6 +139,7 @@ ;;; Copyright © 2024 Suhail Singh ;;; Copyright © 2024 dan ;;; Copyright © 2024 Ilya Chernyshov +;;; Copyright © 2024 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -36835,22 +36836,24 @@ (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. + ;; XXX: Upstream adds code names to their release tags, so version + ;; and code name need to be declared and updated together when the + ;; next version is released (e.g. "Neppu" in 17.1.) (let ((version "17.1") - (code-name "Neppu")) + (commit "8c47f46e38a29a0f3eabcd524268d20573102467") + (revision "0")) (package (name "emacs-ddskk") - (version version) + (version (git-version version 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) base-commit: aed2e17768bc2a2bbac95066637bbf00a60765b2 -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 19 07:13:06 2024 Received: (at 71319) by debbugs.gnu.org; 19 Jun 2024 11:13:06 +0000 Received: from localhost ([127.0.0.1]:40211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJtFR-0001WA-N6 for submit@debbugs.gnu.org; Wed, 19 Jun 2024 07:13:05 -0400 Received: from msg-1.mailo.com ([213.182.54.11]:44176 helo=mailo.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJtFO-0001Va-TT for 71319@debbugs.gnu.org; Wed, 19 Jun 2024 07:13:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=nicolasgoaziou.fr; s=mailo; t=1718795570; bh=AwOJV85uxRuOlwEJBwGPg90BDRniyEI9Tsfv7BznLIc=; h=X-EA-Auth:From:To:Cc:Subject:In-Reply-To:References:Date: Message-ID:MIME-Version:Content-Type; b=eJ1Bkjv3Mvti+AI2cW2n5csi4/u+jUKwMzJhfsYjgLwmDP2m6LOhgDeEYIupvEncq ey8TylTMZGav8Ysq/bZ1uyonlAKHCu7MPAXR42gMAiUZDji9nJfjd5TH17vgTXWzay vcrWnN1l+Z5O4fTuoz1SrLh2WbpThINaYAqv++Yg= Received: by b221-5.in.mailobj.net [192.168.90.25] with ESMTP via ip-20.mailobj.net [213.182.54.20] Wed, 19 Jun 2024 13:12:50 +0200 (CEST) X-EA-Auth: kl2OGkXj0rhnmh163NWAu7f+Bqldu6iZvyTGVyi7jThYqDflCAUT5FDQlZaHrC8qO/4k/vcIVbt4vBmh5WDCQ7+sceXuaxNRuT9aTcqY32E= From: Nicolas Goaziou To: gemmaro Subject: Re: [bug#71319] [PATCH v2 1/3] gnu: emacs-ddskk: Update to 17.1 revision 0. In-Reply-To: <4328ea3c1b2e79691a6ed1d76e21688a5452f410.1718104831.git.gemmaro.dev@gmail.com> (gemmaro's message of "Tue, 11 Jun 2024 20:20:29 +0900") References: <4328ea3c1b2e79691a6ed1d76e21688a5452f410.1718104831.git.gemmaro.dev@gmail.com> Date: Wed, 19 Jun 2024 13:12:33 +0200 Message-ID: <87zfrh425a.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: 71319@debbugs.gnu.org, Katherine Cox-Buday , Liliana Marie Prikler , Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, gemmaro writes: > * gnu/packages/emacs-xyz.scm (emacs-ddskk): Update to 17.1 revision > 0 (commit 8c47f46). Thank you. Some comments follow. > (define-public emacs-ddskk > - ;; XXX: Upstream adds code names to their release tags, so version and code > - ;; name below need to be updated together. > + ;; XXX: Upstream adds code names to their release tags, so version > + ;; and code name need to be declared and updated together when the > + ;; next version is released (e.g. "Neppu" in 17.1.) Since you're moving the package away from code names, you should also remove references to them in the comment above. I.e., we just use cherry-picked commits instead of tags. > (let ((version "17.1") > - (code-name "Neppu")) > + (commit "8c47f46e38a29a0f3eabcd524268d20573102467") > + (revision "0")) > (package > (name "emacs-ddskk") > - (version version) > + (version (git-version version revision commit)) You can replace version above with "17.1" and remove the binding above, as it is usually done. Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 19 07:15:06 2024 Received: (at 71319) by debbugs.gnu.org; 19 Jun 2024 11:15:06 +0000 Received: from localhost ([127.0.0.1]:40270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJtHO-0001am-83 for submit@debbugs.gnu.org; Wed, 19 Jun 2024 07:15:06 -0400 Received: from msg-2.mailo.com ([213.182.54.12]:37930 helo=mailo.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJtHL-0001Zs-Tb for 71319@debbugs.gnu.org; Wed, 19 Jun 2024 07:15:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=nicolasgoaziou.fr; s=mailo; t=1718795693; bh=Rp1bSSsyCeXyQj5PWrrPxrbt70wulepqN/4FCg4twBI=; h=X-EA-Auth:From:To:Cc:Subject:In-Reply-To:References:Date: Message-ID:MIME-Version:Content-Type; b=k4+z4sOuaLiuOVlhHf+MP7pi/fvcUZ02PXkit6XcvtWuKqY0cq8roTMEmeG3DeHZu ULBro1dHGQxiqq8iiHiMRTsc4xp6aeEPiZwKwjN5hpHz84ktjCJ/MxhAnmIJCJ/91s 0fraonC5cyZtC0Dwpaxk8nnIPLjxdk45c+Okml7o= Received: by b221-2.in.mailobj.net [192.168.90.22] with ESMTP via ip-20.mailobj.net [213.182.54.20] Wed, 19 Jun 2024 13:14:53 +0200 (CEST) X-EA-Auth: ow7GM2+synhYkrDQpGoU1au1usZnaG4+FajfvaGcKHTnctCRWWc2qevNaM51CFShYWhT0OGl30Hqn3eovOJyaoucuvHmmEAkho5MwXgN0Fk= From: Nicolas Goaziou To: gemmaro Subject: Re: [bug#71319] [PATCH v2 3/3] gnu: emacs-ddskk-nicola: Improve package style. In-Reply-To: <80aa9ac79b1b8577ce04dec98909fb9e2d0bf9fc.1718104831.git.gemmaro.dev@gmail.com> (gemmaro's message of "Tue, 11 Jun 2024 20:20:31 +0900") References: <4328ea3c1b2e79691a6ed1d76e21688a5452f410.1718104831.git.gemmaro.dev@gmail.com> <80aa9ac79b1b8577ce04dec98909fb9e2d0bf9fc.1718104831.git.gemmaro.dev@gmail.com> Date: Wed, 19 Jun 2024 13:14:37 +0200 Message-ID: <87v825421u.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: 71319@debbugs.gnu.org, Katherine Cox-Buday , Liliana Marie Prikler , Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, gemmaro writes: > * 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. Thank you. Some comments follow. > + (append > + (list #:make-flags > + #~(let ((out (assoc-ref %outputs "out"))) You can remove this and use #$output instead. > + (append > + (list (string-append "PREFIX=" out) > + (string-append "LISPDIR=" out "/share/emacs/site-lisp")))) See above. > + #:tests? #f ;no tests in this subtree > + ) Please do not leave dangling parenthesis like this one. > + (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" ""))))))))) You can use (lambda _ ...) instead of (lambda* (#:key outputs ...) ...) since you don't make use of OUTPUTS argument. Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 19 07:17:02 2024 Received: (at 71319) by debbugs.gnu.org; 19 Jun 2024 11:17:02 +0000 Received: from localhost ([127.0.0.1]:40310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJtJG-0001eM-1M for submit@debbugs.gnu.org; Wed, 19 Jun 2024 07:17:02 -0400 Received: from msg-2.mailo.com ([213.182.54.12]:38084 helo=mailo.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJtJE-0001dz-OU for 71319@debbugs.gnu.org; Wed, 19 Jun 2024 07:17:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=nicolasgoaziou.fr; s=mailo; t=1718795811; bh=0uYZSmz1o8zGa1mFvvSLiTMihmtVxSwfFedVvYbw/Dc=; h=X-EA-Auth:From:To:Cc:Subject:In-Reply-To:References:Date: Message-ID:MIME-Version:Content-Type; b=b4rkstBDMfJX3Qsv2oH0HNvF79/irf3AGIU/0F1ltRwJTh62wRTSZWQlUbKtBvMbc aNn+oP/BI9u8Spuv98cCrkOM6I6Stnn0MVutDhgnbmdeLV3UfOGSIBBTmQjL0zDAUQ fIxYEZP3/3zWXvuoIAHLk/vh5r1qC7WLJvEpZ1rg= Received: by b221-6.in.mailobj.net [192.168.90.26] with ESMTP via ip-20.mailobj.net [213.182.54.20] Wed, 19 Jun 2024 13:16:50 +0200 (CEST) X-EA-Auth: pOrj1gDZyIDb4LlZXFD7YoUh1y399misuzJkSeO0lNzXCPyT8fPToB5NEYuMDq/pvDXuuIYpZilpi4I3M7pljoUh3cZzvoaL0R4le3yY2GY= From: Nicolas Goaziou To: gemmaro Subject: Re: [bug#71319] [PATCH v2 2/3] gnu: emacs-ddskk: Improve package style. In-Reply-To: <73fdffde326d9fdb418056b636e08be7b5be8644.1718104831.git.gemmaro.dev@gmail.com> (gemmaro's message of "Tue, 11 Jun 2024 20:20:30 +0900") References: <4328ea3c1b2e79691a6ed1d76e21688a5452f410.1718104831.git.gemmaro.dev@gmail.com> <73fdffde326d9fdb418056b636e08be7b5be8644.1718104831.git.gemmaro.dev@gmail.com> Date: Wed, 19 Jun 2024 13:16:35 +0200 Message-ID: <87r0ct41yk.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: 71319@debbugs.gnu.org, Katherine Cox-Buday , Liliana Marie Prikler , Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, gemmaro writes: > * gnu/packages/emacs-xyz.scm (emacs-ddskk)[arguments]: Use newer > package style. Thanks. Some comments follow. > + (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* (#:key outputs #:allow-other-keys) Use (lambda _ ...) here. > + (make-file-writable "SKK-MK") I don't think this line is necessary. Could you double-check? > + (emacs-substitute-variables "SKK-MK" > + ("PREFIX" (assoc-ref outputs "out")) (assoc-ref outputs "out") -> #$output > + ("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)) Could you remove this trailing #T, too? Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 19 19:35:29 2024 Received: (at 71319) by debbugs.gnu.org; 19 Jun 2024 23:35:30 +0000 Received: from localhost ([127.0.0.1]:35108 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sK4pt-00077c-Ce for submit@debbugs.gnu.org; Wed, 19 Jun 2024 19:35:29 -0400 Received: from mail-oi1-f176.google.com ([209.85.167.176]:59839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sK4ps-00077K-6O for 71319@debbugs.gnu.org; Wed, 19 Jun 2024 19:35:28 -0400 Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3d218ea7750so126948b6e.3 for <71319@debbugs.gnu.org>; Wed, 19 Jun 2024 16:35:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718840059; x=1719444859; 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=5k8mMRqwLeXmc+KEzh/CGmUYWTMcik2RkoKUFxvR3V4=; b=O31ePdyS2Eofo0W22vhql1lZPZUSun4SUmw6xLDS62n+P/YhU5yGhWTlGP+Pvz0LR1 d9TgurrTafYzOZX/tPHMvy+WqvKcCaFNu0LzBgJK3npj6hzOCa9ZtZcfVlZ1QAOr/HvA FYfk7JKq0EAgZWsPyziswNkkzqZGTT1B4Xm48XLnVO9EXUozmeItb2KvQIAYz48W3RW8 qF9FvHQMp7SPm4ay6dCcn4sh+j1i+61Wbnbgoo2S9vdv6o/KEoRupwFigk2h7RzMONG2 ep2RdtA+0dzExqzQv4UyAan6QqN621kjrBqshhRw3h5YZamjMPYiABAkdJvyb3iEWbWJ xDdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718840059; x=1719444859; 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=5k8mMRqwLeXmc+KEzh/CGmUYWTMcik2RkoKUFxvR3V4=; b=sMMfZ/44OBDR+OjGZIGkxSZj/n0pXSKVECo29LtlXBrEB+KUy09t0o2A/7ggr3K46o yX34DyhIPErfi02QPCGbct3hnolMIPn80ZVmbddM8wu41WmJQhsOoZu5lQVRwD0MGUSG L1CR2YaUMXazLrY7mbXlSd10nINpI09VbvLlxwH+91r9W5ezaRYy/RVDAGnVcn5egnBL RHvU9TEO1+kAJp1+3n96neo+4MLJdGJLETjlZ4ulHFhMxlHHKwZY54w79WhBExvVqnus hrobcacvHjMu0SmmJ+IPwQYeSlqLQ0iYlFlR9gQeXbgRItGmrLfajYm98J9Dm6+TM6/b 4hGg== X-Gm-Message-State: AOJu0Yzzb6KDvVjq/Z1c5H/mSc2jHIF18raiFu+TTT3p9y3/Kdaj4tQO NwJ6FN65xkszzR3a/pg2RDhbP/Z+cmDR3hSvjSfXVQN/P7lj9J1wXJE/Fjly X-Google-Smtp-Source: AGHT+IFO2hBb271A5KDFqFhsOYEBfJdUxO5x/oyILNAWVRpuEArEg07Pr99cESQdIKtVnSIdlMfvZA== X-Received: by 2002:a05:6358:478e:b0:19f:54a8:db52 with SMTP id e5c5f4694b2df-1a1fd5274c6mr481143855d.24.1718840058605; Wed, 19 Jun 2024 16:34:18 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-6fee3ba48c1sm10131908a12.81.2024.06.19.16.34.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 16:34:18 -0700 (PDT) From: gemmaro To: 71319@debbugs.gnu.org Subject: [PATCH v3 1/3] gnu: emacs-ddskk: Update to 17.1 revision 0. Date: Thu, 20 Jun 2024 08:32:39 +0900 Message-ID: <378f901df9ae830b822653251f5e9db18cc18e0e.1718839586.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-Debbugs-Cc: Nicolas Goaziou , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-ddskk): Update to 17.1 revision 0 (commit 8c47f46). Change-Id: I7a312f1dbbeb93666121646dd79becdd08f16b79 --- gnu/packages/emacs-xyz.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d000e7fd02..2eee8cfcb5 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) base-commit: e1a66d2ddd9b5ab382569f3a1130508797844d3b -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 19 19:35:34 2024 Received: (at 71319) by debbugs.gnu.org; 19 Jun 2024 23:35:34 +0000 Received: from localhost ([127.0.0.1]:35114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sK4px-000783-Qs for submit@debbugs.gnu.org; Wed, 19 Jun 2024 19:35:34 -0400 Received: from mail-io1-f44.google.com ([209.85.166.44]:59741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sK4pt-00077P-F3 for 71319@debbugs.gnu.org; Wed, 19 Jun 2024 19:35:30 -0400 Received: by mail-io1-f44.google.com with SMTP id ca18e2360f4ac-7ec00e71a57so8648139f.3 for <71319@debbugs.gnu.org>; Wed, 19 Jun 2024 16:35:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718840060; x=1719444860; 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=YJGY/z8aaIx5vr6Z6BdOkJAlo+Gq7DIO5iEPcuiZIOg=; b=EXmPZYJubrKbguGIYp8B+2WQMB4vOevf8z9mlc1oOecU8w5otjZFvYmfpqIEoatfor W7ERJh82nEqq0sfIMzAEdDZSVs4Wlk0aUQKF7FRCKCT/GkHRFog5D3FQGqcg6t6+ZN8L i6BSMAv/7CHNOyTGmGvYOZAlGw+Mn2Zl/WG4GR1UYGa1JTY2jkHN4Mjn7nR/tPM6REb+ 9pk0rk78AFO7U9yRcrxIN9AgCPvki286RJUNf6f+96EoVJ3gvwzuFUJ5TDyAra/qZUcH lZ7bkEgDXvHXdgJQVfcq0Pzqx7bev4KWQrfkZ/KoRUa2GsdwtOGT/0K7oRfSzybj/a2M BsfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718840060; x=1719444860; 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=YJGY/z8aaIx5vr6Z6BdOkJAlo+Gq7DIO5iEPcuiZIOg=; b=oEYKQgc0fdTQiML9VDmGf7RPXN8/IwZnq+N85zlI8kwzfHP+xx/8rfW4ecOhf65Lo4 Hau4bk/8mMn2J2aqoeXo+OzXtQHBN95Mfq/OQbXK4TT1raImV/y2iUqon72IkgGOTFCs NTEDQnwc/yQhpUoNpwfzxBg9OreTs4vnw5d8izKCIecwHmGOdr2lGgQAIATHXe/2qZV+ bSuv2atLTZUkWYIf811tiVRygncyS9iSnBlzWVj0wacAI4TCAH6EtiUE4AV8ma0mvtAN +61HUtasi/aXYqWeQqKOJ367D81NCmR9TuI9ChkGS0LTtL1vMHWe8AOCwoBf9tPpKRif RcLw== X-Gm-Message-State: AOJu0YywS+s/y5SF7lRIhJer1OUPb5NaPp96J7LxW8Q9h0PKC7MvymP2 K9t8nm1Qu7dlcu7Yq1dfmyuvQax9WYzjQvj7NVfhcIezmQIPsIrFdjH8ZBpI X-Google-Smtp-Source: AGHT+IEozNIMgvPi5gdxHVYcTDIpYTXJcK3tjg0t5kjEEWXPI9dB0sYSRoFtDWH74A3J49FSqbayBA== X-Received: by 2002:a05:6e02:1b09:b0:374:a7d0:b0bc with SMTP id e9e14a558f8ab-3761d72b118mr46896655ab.23.1718840060312; Wed, 19 Jun 2024 16:34:20 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-6fee3ba48c1sm10131908a12.81.2024.06.19.16.34.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 16:34:19 -0700 (PDT) From: gemmaro To: 71319@debbugs.gnu.org Subject: [PATCH v3 2/3] gnu: emacs-ddskk: Improve package style. Date: Thu, 20 Jun 2024 08:32:40 +0900 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: <378f901df9ae830b822653251f5e9db18cc18e0e.1718839586.git.gemmaro.dev@gmail.com> References: <378f901df9ae830b822653251f5e9db18cc18e0e.1718839586.git.gemmaro.dev@gmail.com> MIME-Version: 1.0 X-Debbugs-Cc: Nicolas Goaziou , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-ddskk)[arguments]: Use newer package style. Make use of gexps and #$output and removed trailing #t. Also, SKK-MK and doc files are not made writable, and the rm in nicola/Makefile is fixed. 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 2eee8cfcb5..855d75e390 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) - (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")))))))) + (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") -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 19 19:35:34 2024 Received: (at 71319) by debbugs.gnu.org; 19 Jun 2024 23:35:35 +0000 Received: from localhost ([127.0.0.1]:35117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sK4py-000788-DZ for submit@debbugs.gnu.org; Wed, 19 Jun 2024 19:35:34 -0400 Received: from mail-ot1-f42.google.com ([209.85.210.42]:58769) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sK4pv-00077T-1j for 71319@debbugs.gnu.org; Wed, 19 Jun 2024 19:35:31 -0400 Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6f8ef63714cso165001a34.1 for <71319@debbugs.gnu.org>; Wed, 19 Jun 2024 16:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718840062; x=1719444862; 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=p0BpsLaYWmbfvNV4nhAxHCgnHlSGX6PpYpNb72zc6Hw=; b=U1wquOIBgSvuyPG58GodwWiswbItbuawvM+AtUKrIRoSx5tm4GI/Qd3j5a4eZnTPTj wDJdpugQqGerJ+9KUgQKPN6c7Uz54NaWeOxJcirTOfKDQDCPevu2pRGdlgIrr16U9Z5p 79L7Hq77lDAH5tFm17+Fix3fhHMrYm/wFt8zw13B/SdyAkANIsch98bjoghXP2DiNSOZ M+r2ia0WCwSdHdKbOQd4rXkl5HybjMCxpZCZLSsE0PBf22Jq04CvixhLLVcEXiPqUUIr ysFLL1z8V/Nn42+MJCB2lpmTBRTI7szLJ8fW6K8qg+air++fYyLvCBtvxYxShePyGyln M6tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718840062; x=1719444862; 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=p0BpsLaYWmbfvNV4nhAxHCgnHlSGX6PpYpNb72zc6Hw=; b=RGSt8Slekg3WWGtj1hvZork+lQzEB7Hjyv3DfjpKIPPuzGdLmYGI5pR/QnoyOXfteJ +e1mvTB+fHtdWx0q4cG7gyvroGOIbtGo72Agpd3cvl+sUEY+9WbhAQXWpnf8SROd8Jsu Pk1rWRK/9p+m69HPYgrTsHz/SDDQSqcs9hsaHFJip1g/Ora3RwL363mhdimL6TJ/B/xk 6aTvDpOzcYMSC70dOQsys5Jmi6c2E0jOnzp3Au4MJ7eeJKlGKtJnxCPxy9z+WKzXpmX0 UrNudYaRlfL0OWiVZd0k9SgtC+KZiOXVnH4K9eS1nAq8hyGtArW0nmp3jKP+EqzGUmbT ogZQ== X-Gm-Message-State: AOJu0Yye6ZPEKJs9r1EkgoJUuX62z2gMMbd5JXkTdPgYJAOZa1ofePPQ 2wzIw73aQZtb5WN8LXK1H+RWgu6eZx5WPuBpcblRBRJF06rgv01KqjEY91N2 X-Google-Smtp-Source: AGHT+IGxMSJifG+QGKD+QbE934LMa+OLo4iftvvSV1G2vq+K3wQH+GY9PeX7/H4AUH9X5/LpiIBRRA== X-Received: by 2002:a05:6358:78a:b0:19f:2f51:d6de with SMTP id e5c5f4694b2df-1a1fd30ddaemr517001355d.6.1718840061811; Wed, 19 Jun 2024 16:34:21 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-6fee3ba48c1sm10131908a12.81.2024.06.19.16.34.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 16:34:21 -0700 (PDT) From: gemmaro To: 71319@debbugs.gnu.org Subject: [PATCH v3 3/3] gnu: emacs-ddskk-nicola: Improve package style. Date: Thu, 20 Jun 2024 08:32:41 +0900 Message-ID: <3b7722e4eba090d4b45b739175c5094aa1907f03.1718839586.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <378f901df9ae830b822653251f5e9db18cc18e0e.1718839586.git.gemmaro.dev@gmail.com> References: <378f901df9ae830b822653251f5e9db18cc18e0e.1718839586.git.gemmaro.dev@gmail.com> MIME-Version: 1.0 X-Debbugs-Cc: Nicolas Goaziou , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 remove making NICOLA-DDSKK-CFG writable, and removes the last #t values from the lambda expressions in phases. Change-Id: Ief8761bca476eba5e675d995b22d0a070f90de2f --- gnu/packages/emacs-xyz.scm | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 855d75e390..fbdd58ab9e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37070,25 +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 '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 + #~(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 -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 20 12:05:47 2024 Received: (at 71319) by debbugs.gnu.org; 20 Jun 2024 16:05:47 +0000 Received: from localhost ([127.0.0.1]:34684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKKIE-000642-W7 for submit@debbugs.gnu.org; Thu, 20 Jun 2024 12:05:47 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKKID-00063h-9N for 71319@debbugs.gnu.org; Thu, 20 Jun 2024 12:05:45 -0400 Received: by mail-wm1-f65.google.com with SMTP id 5b1f17b1804b1-421757d217aso12623835e9.3 for <71319@debbugs.gnu.org>; Thu, 20 Jun 2024 09:05:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718899475; x=1719504275; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=Q4TrxXVTk7nK7KIUi2j6vhnyLLaGmsZJ8bYuz0ljhFc=; b=WffSQjCbqPV47v0UKblEEvJM4G9v0/FT7zjdgyMtwC98iRpHINNg3fwW7v/2SJWnNP OWKurOfnLtWTgTrycHh4rY7mB1cTGPoOP+Ds8ykhQ5oEXPr3X2ArWqMMq7VkLiHIItec J9IW9DDV/19yvDPHioGQ6GxLc9MbYIo4vbxApLfcG7YrVmK5DRo1intD3ZCqa7E0eQsB 0yM9qC1yJhLktn3HboCmNEtLKP3mrjkX/OzfpVpSe6TZk2Dx1B6BQvGelRTmCLjE483u relKrJdzVeBQChgm/X/YzgUff5lK8KGvHVxoYrUtarXL2d3539jdFu5jDItPuYsdbxQQ jmrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718899475; x=1719504275; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Q4TrxXVTk7nK7KIUi2j6vhnyLLaGmsZJ8bYuz0ljhFc=; b=d0s/arWnLYqZycPsh9bL0dhAJ/YfeQWzvKQQAKsJ8sxgvX0HFVVdru2sYjaF057ITO DdFIquoTRkSHTuYjD/k51Ge6AaSlcxsFQmWXDZxN1Cd3lCsZnfJW7z7R1/KMi2hNDwZj 3jqqPOhooRWrfj/th2rgEe8/N+DMdxr+kW//mOEMRqdupiNjvL3ov3IYzS8RRnBCicmQ +LAtBKUONkV6byypwX9VT1NKzH+mwuGvj6nX4vLXOVQTZSMQZq49cpkQCq30OgNaHT3g TR+jBF9oGZINX/ZsHMzMzOr4l/K7ggC1gCC/ir/VGnzwnT2KY3xqdVbVLNsKEf3v5+/N UxVg== X-Forwarded-Encrypted: i=1; AJvYcCU6nyH+yXaP2+yN/azHfOZBh/fKzblQkw2kjn4nLCfbd9kNrU+y5MLsKUsNbW8+eT3BB3KTvAJ9Js8dKyz/xQH2QmET72M= X-Gm-Message-State: AOJu0YxOCgyPg3xaSSABNzjYLQuy283pneMRLRGxkxjnZaYO/9rWf/wr P8H/NXZaLppVL6Pvi+o2cvxXwGbAPSNBuPbjgZy2Ltp6d2GfGN7xmNowWfpD X-Google-Smtp-Source: AGHT+IHXW+dSeVnPBH6KNC5ZMFRCte3HPGrlYHmzM9yysjYlpAJPXDXCfLHqPJSieUuF5kNvU/xTww== X-Received: by 2002:a5d:6c65:0:b0:364:aafb:61b1 with SMTP id ffacd0b85a97d-364aafb6df8mr2868015f8f.14.1718899475103; Thu, 20 Jun 2024 09:04:35 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36098c8c596sm9805302f8f.14.2024.06.20.09.04.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jun 2024 09:04:34 -0700 (PDT) Message-ID: Subject: Re: [bug#71319] [PATCH v3 2/3] gnu: emacs-ddskk: Improve package style. From: Liliana Marie Prikler To: gemmaro , 71319@debbugs.gnu.org Date: Thu, 20 Jun 2024 18:04:32 +0200 In-Reply-To: References: <378f901df9ae830b822653251f5e9db18cc18e0e.1718839586.git.gemmaro.dev@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: Katherine Cox-Buday , Nicolas Goaziou , Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 20.06.2024 um 08:32 +0900 schrieb gemmaro: > * gnu/packages/emacs-xyz.scm (emacs-ddskk)[arguments]: Use newer > package > style.=C2=A0 Make use of gexps and #$output and removed trailing #t.=C2= =A0 > Also, SKK-MK > and doc files are not made writable, and the rm in nicola/Makefile is > fixed. This ChangeLog really could use some love. "Use newer package style" should probably go to the commit message (instead of "Improve package style"). Also, don't sneak in actual code changes with formatting ones. These might need to go with the previous commit instead. I'd suggest something like=20 =E2=80=A6 [arguments]: Convert to list of G-Expressions. Use #$output rather than the outputs alist. Removed trailing #t. Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 20 12:08:08 2024 Received: (at 71319) by debbugs.gnu.org; 20 Jun 2024 16:08:08 +0000 Received: from localhost ([127.0.0.1]:34773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKKKW-0006AE-GM for submit@debbugs.gnu.org; Thu, 20 Jun 2024 12:08:08 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:57839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKKKU-00069l-Td for 71319@debbugs.gnu.org; Thu, 20 Jun 2024 12:08:07 -0400 Received: by mail-wm1-f65.google.com with SMTP id 5b1f17b1804b1-42138eadf64so9521945e9.3 for <71319@debbugs.gnu.org>; Thu, 20 Jun 2024 09:08:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718899617; x=1719504417; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=GptO92TSiD1457PYkkzHdck4dQODD8gMFfwOMfNVtls=; b=RzJy3CppM92wBpdfLeJLEf/Dd+cHB2EgSkyi+0khvP7rcPJU5HWREfUThgjvwlsne/ 1+JTL/sYSN8r7tYyRcncqAfjDFENsGHxcL2jaC1uACLc3do5zbM9FX/KxYKBcDc8ssXl +4NVJ5Doq0zbVWlHjAIAuDJTAm1iYgfA2yuX6a9+uT1VtN4dxyGivO2v9kOdQBjbV4OG YWmxmA1+xEFKkOs4cPiyt/YW1rjMptLbL6QoU9BiPFtCaoN2EHYBc9p9mdeksiWxaM1s vYzqKGee9uzTBIXsFa805J8FjMNsrkYeMYxDwLAf3iPdjUIMNJ+2RnxiiwkpI17WwkCF ZJ+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718899617; x=1719504417; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=GptO92TSiD1457PYkkzHdck4dQODD8gMFfwOMfNVtls=; b=Lwb2dWcTqKfk+/P1wOOyqSoBN1d1ugIa2mk8RkPJZGM6n+paC+Q6khbyhBnGH5q9hg WDV0rnWMVmvHPJ+2W11Uo8AjePIiWoO2OVX7VEFrR7ZanC+o3m8kDijK4/0qxq15fNJu nsu26gKEEwhEnnrcmuYhzR+CL6EzXDakaYFe0JlBNPipDtesDugr6D5bJoQPo5v5oly/ rF6ghtCuxxw4mmJArWhgi1hY6Qlqq5UEwxjtwZUBLFQK6PiS/vBb0iHPW51Xh5nV6AtB Wy0wtE1/TnQh39R/6KZPS6ULkKFoEv4PDovj5BvuX62wpW6aWY5OFmd6EUq16Af6y5pH L1+w== X-Forwarded-Encrypted: i=1; AJvYcCWAatm3OzQw/l3AbIrErvnewdsLXGgJas5paLd7/wa+v1yRBGidRrlNxAM2+oFrVzmwqmkKpNpllH7Ox4ekVhwvC7Qe3y4= X-Gm-Message-State: AOJu0Yy7JRKXpYbDivTTxgwCQll9AawxSoU2Nv05Gjh234UoQl0XQ3Qa joXQqglLRvFgN8Ff60JNtpCN9sFVSC9PQJk3EXDmdySDMLMcdBHb X-Google-Smtp-Source: AGHT+IH+YGiE/B/PURT+iZe+GwR0GiSYQ3YeoTCaWy1x7Sw5QU2Dd0QTQA2IVI+dyHikgolj+X8USg== X-Received: by 2002:a5d:4946:0:b0:35f:302e:a0d6 with SMTP id ffacd0b85a97d-363175b816bmr3668304f8f.18.1718899616831; Thu, 20 Jun 2024 09:06:56 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3621a4a17e6sm7182205f8f.19.2024.06.20.09.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jun 2024 09:06:56 -0700 (PDT) Message-ID: Subject: Re: [bug#71319] [PATCH v3 3/3] gnu: emacs-ddskk-nicola: Improve package style. From: Liliana Marie Prikler To: gemmaro , 71319@debbugs.gnu.org Date: Thu, 20 Jun 2024 18:06:55 +0200 In-Reply-To: <3b7722e4eba090d4b45b739175c5094aa1907f03.1718839586.git.gemmaro.dev@gmail.com> References: <378f901df9ae830b822653251f5e9db18cc18e0e.1718839586.git.gemmaro.dev@gmail.com> <3b7722e4eba090d4b45b739175c5094aa1907f03.1718839586.git.gemmaro.dev@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: Katherine Cox-Buday , Nicolas Goaziou , Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 20.06.2024 um 08:32 +0900 schrieb gemmaro: > * gnu/packages/emacs-xyz.scm (emacs-ddskk-nicola)[arguments]: Use > newer > package style.=C2=A0 This is necessary due to the emacs-ddskk package > style update > since emacs-ddskk-nicola inherits this.=C2=A0 It also remove making > NICOLA-DDSKK-CFG writable, and removes the last #t values from the > lambda > expressions in phases. Again, don't sneak in code changes with formatting ones; and the ChangeLog formatting hints to the previous patch mostly apply here as well. The "this is necessary, because=E2=80=A6" part should probably go before th= e ChangeLog, with the explanation that it is a follow-up to the previous commit. Cheers From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 21 19:06:20 2024 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 To: 71319@debbugs.gnu.org Subject: [PATCH v4 1/3] gnu: emacs-ddskk: Update to 17.1 revision 0. 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-Debbugs-Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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(-) 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))))))) base-commit: 594419b09e124b84d3d6141f1e47b5c346eeb704 -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 21 19:06:31 2024 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 To: 71319@debbugs.gnu.org Subject: [PATCH v4 2/3] gnu: emacs-ddskk: Use newer package style. 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-Debbugs-Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 21 19:06:43 2024 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 To: 71319@debbugs.gnu.org Subject: [PATCH v4 3/3] gnu: emacs-ddskk-nicola: Use new package style. 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-Debbugs-Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 23 04:17:17 2024 Received: (at 71319-done) by debbugs.gnu.org; 23 Jun 2024 08:17:17 +0000 Received: from localhost ([127.0.0.1]:49435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLIPV-0006Ve-EZ for submit@debbugs.gnu.org; Sun, 23 Jun 2024 04:17:17 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:51375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLIPU-0006VO-4D for 71319-done@debbugs.gnu.org; Sun, 23 Jun 2024 04:17:16 -0400 Received: by mail-wm1-f65.google.com with SMTP id 5b1f17b1804b1-4217c7eb6b4so28806985e9.2 for <71319-done@debbugs.gnu.org>; Sun, 23 Jun 2024 01:17:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719130570; x=1719735370; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=hL81PzYOc6ma+hY9liknFi2pmN2jgJnxz3hqG21cevg=; b=J0x4rOEau+mkmznR9oXYcD85c7CSmFVjRJDDFL7oq3n3ODoDzIGR6FT97Br59p8qik ggDxbQH/QgVHxEAIj6TZVdXnOhZnDIrQKA4rbIADoMeIu7wbgnYPDZR0BOB3AbCtkSt9 0tVkOzZa5NST3+/xXHxJnPHjvjxgsIY7DIMlQmXNURzNkuXs71M/2yEWCOkjpqXyRvLo nj1Po0FHwrjPFaueaBN4rS/FhE/fr8k6FuPgOGURfZQRNJjdmL0eJeAfmliH+PZFc+TH Xeh5ORN/ifyIU/Xt+n+azrQDM0RCSMoZc2CuGNB+L3odT443hYJVZ5SQm2Wjp9NCwD3T guBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719130570; x=1719735370; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=hL81PzYOc6ma+hY9liknFi2pmN2jgJnxz3hqG21cevg=; b=wvZYm8dfsOjBXcn6lfx9Hk34vGLe4EH2fIp08XtUJmv7b0QDLhHj5ZpkGzPyyLxtM2 VVS7EgIF/7LTcfELrhpWQOCzI77UVgs9XIpttPKijYZfFlfeqlB0jzQTEwoFURYol2ZS LLFdoqBRVOVVm96xs4CCfxQmeRQTHyFXFV3vdAR4ApX9cm96b7aN2tUfJB23ypFmIxrI WtLVJhn7K7wAhW15B5o7HS7YfxKTtpqF8sMpTs+QBYiySHPjzZz4GyXhTK5Nr80Aq5+0 vLhM1f+NWZY5NaUamRgyqzVJVH69LP4uypRiEzzOYLeRhnYaLpCWivEaEkfbVw+5VaSy 7MQQ== X-Forwarded-Encrypted: i=1; AJvYcCXUZgssDQ1uoMIKhDpO46xSJ1y31XPAe5CQkkyl+2YSJwTzel21usBQidoqa/AKblfQtux4tsgS3ffqmM5ipKhppTzHQYUmK2eTXQ== X-Gm-Message-State: AOJu0YwnYL55Y4T+BMJe+v7XBoxmFiJqYDJaqqg6FoMNEOggSuEbwSeH PUVvDv8E52p6GHXuvYTbKuUUxuzRGYFMKNrwQcC2hK0eFRWvO4ld X-Google-Smtp-Source: AGHT+IFUjwKD5/IOzME9vQETvFjLcJNqK1/mOOp/gJkB6+4R40tmRMMR6DsiVefl0TsBCXiTWEPDAA== X-Received: by 2002:a05:600c:5819:b0:421:5966:ca40 with SMTP id 5b1f17b1804b1-4248cc2a7c5mr11242455e9.10.1719130569756; Sun, 23 Jun 2024 01:16:09 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3663a8c8f50sm6668308f8f.109.2024.06.23.01.16.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 01:16:09 -0700 (PDT) Message-ID: Subject: Re: [bug#71319] [PATCH v4 3/3] gnu: emacs-ddskk-nicola: Use new package style. From: Liliana Marie Prikler To: gemmaro , 71319-done@debbugs.gnu.org Date: Sun, 23 Jun 2024 10:16:07 +0200 In-Reply-To: <0732e895c25fb516a64c38909ede3e9fb3d679da.1719010975.git.gemmaro.dev@gmail.com> References: <6364a0f1d329f7600523d9e27cc71fbebc4655be.1719010975.git.gemmaro.dev@gmail.com> <0732e895c25fb516a64c38909ede3e9fb3d679da.1719010975.git.gemmaro.dev@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71319-done Cc: Katherine Cox-Buday , Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 22.06.2024 um 08:02 +0900 schrieb gemmaro: > This is a follow-up to commit > d8577f604e91a7deebc1c6928a140ac4cfda5895. I avoided the breaking hash by squashing the two commits, just like the prior update was squashed. I've also reworded the previous commit to refer to the actual version as output by Guix. Anyhow, this is pushed now as commit d69270b696a9badd0ba91fd1ec94f6f292ac1a53, so go and have fun with it :) From unknown Sun Jun 22 07:50:06 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 21 Jul 2024 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator