From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 05 11:05:51 2025 Received: (at submit) by debbugs.gnu.org; 5 Apr 2025 15:05:51 +0000 Received: from localhost ([127.0.0.1]:44276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u155j-0002FS-AU for submit@debbugs.gnu.org; Sat, 05 Apr 2025 11:05:51 -0400 Received: from lists.gnu.org ([2001:470:142::17]:57768) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u155g-0002FC-NY for submit@debbugs.gnu.org; Sat, 05 Apr 2025 11:05:49 -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 1u155Z-00063e-TL for guix-patches@gnu.org; Sat, 05 Apr 2025 11:05:41 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u155Y-00047J-3e for guix-patches@gnu.org; Sat, 05 Apr 2025 11:05:41 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-39c1ef4ae3aso1679042f8f.1 for ; Sat, 05 Apr 2025 08:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743865538; x=1744470338; 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=x1QsWpTIYKwKjlHvJW1p8HJRCPR3Kh1o28ZNgn+k3qY=; b=YpseKqEPy66afiQO39ps4PEIzb/RbYMsvnMLCcn6Pob1WCJnPZXKkMoYTBOXTbn/Jk P85baB8Oo7atNprw8t/Z1Rvj0a7yTSQ81hnHeH22eNMy6GJo3su/3mWqzde6FoNLNSLp Z185Fh+YPiKt81ryfscLpL1dPxRXOnj8tp2upZH+Uje6uKD/xMMhvMYCaE4du4OQVOHX p0fM4sqdkk/TCP1tk5XdTPZMfELfELhFElD8ppo/Wr4KQaie1nvLehC+U2EfKbAJGyw4 TVijY9QLZbdgLyU6wLTeqSLhy7lgpP73hM//jrOouGqhvQUAk12jsepGtMGc4RQTQ47g E9EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743865538; x=1744470338; 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=x1QsWpTIYKwKjlHvJW1p8HJRCPR3Kh1o28ZNgn+k3qY=; b=pNTmc/+bSfmmZEYEejnCuNcbMR7/qQ90qz+9JA16YrBjLS1ARUAUXxAyn9yOMLStxE HP30dkbvchzbNvrz8F9cEt4H/JG8yQmlm3tr0yS2baS3CR3rbLoHh15MFA405WCXCtwr 0AB0ixFowp6Kd9l+aTifGdkp4Py7T4CnA897fnv33Nw7ojbJGXmI12nG49W22U+PALek 5bVYmAsTSXRwuZFsNzefO7ZnyTV+9PFFFmkuNqMk7Fk9eW56BGVSSbU8AoTHfg3w8zG0 O0oQFgrJc+JbJRboxG9VR3nPRczs0/dem9qDHNymv3WKtjteoXm5DnMr4hKiYP6e2h10 dl4A== X-Gm-Message-State: AOJu0YznN5EsxfGkUu0qU6DtBzVjdYcTQWQuGpUAyoAv62u3Y+lpoNfp lEuleegjFniLHP8GYTVh5ltnS661+WniGD4tX3Q62plDTLA/LGpPX5lsv1JT X-Gm-Gg: ASbGncvUGcBC0H277Xcy8sXuWHwP20pzXbJYECiTGH56btAgXnY3qgES+dZHfHkNlwJ k8/V2ASqtSpSOzlcBVZeeauAziLg0U1s/cBNQ1kPNS6CmRUGW6lR+me97kqH+HVUJLMNoDfdt5h 7f74Gw0VwcerQWUoK1tDlS58XmzEZUJMVV4HlMxM3RVUnJjuWWagO00t4s3SMxVx6WgyM4RkTvr +8PgLKhLEpRqhQ4vqAz8CkaCLmIJNXdqDkhAGoKu6hwHOlpiO8iAzAEE2idcsXZ8JyXVirYvCM6 U6mktE/wkPU1RcFcj6jMQSpg7hV2y2sc/K19Hl2VD5THv2/yA7wq5w7YZ+ARUVM= X-Google-Smtp-Source: AGHT+IH6oiyLs9g9jTILf05vmd1cyEPW+QjVcthux7RpmeOQibc0P8vC1jWJxSrVi0Ys16E7e6NvKg== X-Received: by 2002:a05:6000:1cc5:b0:39c:30f7:a599 with SMTP id ffacd0b85a97d-39c30f7a71cmr6922503f8f.18.1743865537746; Sat, 05 Apr 2025 08:05:37 -0700 (PDT) Received: from theodora.Home ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec17b3572sm78648255e9.39.2025.04.05.08.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Apr 2025 08:05:36 -0700 (PDT) From: Lee Thompson To: guix-patches@gnu.org Subject: [PATCH 0/5] gnu: cbqn: Update to 0.9.0. Date: Sat, 5 Apr 2025 15:59:16 +0100 Message-ID: <20250405150443.18510-1-lee.p.thomp@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=lee.p.thomp@gmail.com; helo=mail-wr1-x42e.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Lee Thompson 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: -0.0 (/) This series of patches aims to update CBQN to use the latest v0.9.0 release; also achieved via this patch series is a full source bootstrap of CBQN without using pre-compiled bytecode or building DBQN. I have added both (dzaima's fork of) REPLXX and Singeli as pure sources so CBQN can be compiled to make use of them. Some of this builds on work done in the (as far as I can see uncompleted) bug#69023, though this patch series makes no attempt to add Singeli as a standalone package. Regardless of Singeli's value here I believe REPLXX adds valuable quality of life improvements to using CBQN as an interactive interpreter. `bqn-sources' has been updated to a recent patch. I couldn't get the updates to `cbqn' to build properly without updating `bqn-sources', though the CBQN repo makes no suggestions as to where in history to take `bqn-sources' from. I first updated to a commit from the same time as CBQN v0.9.0, but why not update to something more recent? In testing this produced no obvious bugs or weird behaviour vs. CBQN v0.9.0-era checkout. The `cbqn-bootstrap'->`cbqn' interaction has been rearranged to achieve what I believe to be a reasonable full-source bootstrap without DBQN. New tests have been added also. I've added comments everywhere I feel appropriate; this might be too verbose for some so I'm happy to remove any. `cbqn' has been linted and styled and builds and works fine as far as I can see. Lee Thompson (5): gnu: bqn-sources: Update to 5880fa15. gnu: Add replxx-sources. gnu: Add singeli-sources. gnu: cbqn-bootstrap: Update to 0.9.0. gnu: cbqn: Update to 0.9.0. gnu/packages/bqn.scm | 175 ++++++++++++++++++++++++++++--------------- 1 file changed, 113 insertions(+), 62 deletions(-) -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 05 11:07:49 2025 Received: (at 77552) by debbugs.gnu.org; 5 Apr 2025 15:07:49 +0000 Received: from localhost ([127.0.0.1]:44292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u157d-0002M3-3R for submit@debbugs.gnu.org; Sat, 05 Apr 2025 11:07:49 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:61657) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u157a-0002KO-AM for 77552@debbugs.gnu.org; Sat, 05 Apr 2025 11:07:47 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43cfe63c592so28328495e9.2 for <77552@debbugs.gnu.org>; Sat, 05 Apr 2025 08:07:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743865660; x=1744470460; 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=8RctUBLu4qPoMkJMiNSnX6+8NtvLuYVftX9ooC8no+k=; b=UL8zaT6Nu28yphUJk9h2DERFHSo2SYUZMAouYlqJO2bKtBYf45yghfYwihCEe397Tg M8AJoNVuLniOrOKlRpDPLZt9US+HKb0Z/1Sh1K8A5MNlfpkGGLUBZfb6i+GeEB7hxabP 4gZmJzWxhN9kjuLogJEvj9YOrxJ3+mcz2G8wxUicNg7XZpkTSmOfVm/SyderTA1r9e9K h47nESwP0pZhTjQHryV5iflHQzdg6xx8FoRZFf9BnUmLuWROWdNL6cHCZ/CDFT9MQc2d P5EBIwmmi1W9Q+HTPQQQZcsBSkPjBjvBN8q+P60AQz8uG5mxEyKJQ4LY4c/86Soaa+Mw W5Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743865660; x=1744470460; 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=8RctUBLu4qPoMkJMiNSnX6+8NtvLuYVftX9ooC8no+k=; b=eo59u/4PB2wsai/ObnizUDloCGxxT48FVbZaxLKwVDfqJ4+FMOIsPInsbILXTGIVM4 XnkVDC87ukqmRsFeFZ1fW5jRWKvJDJ+jsa0n91dDW9J+bvB0I6BLvvsIiBgExipfA3kY jeAVWTYagFUq+u3yCDo25iqYAEuFMCn77y8vhaQwUpTD/3KkO6epRNYPJPQI8OHjnkK1 QwFzPv+5NPEVm0Ni1Omu8dwycOpaDReuOPXcvZWtlcDBwWUEeYKihr6Xf18IU6/4NB0I gA9N+6IwkgmrQmTk848RvIPW9ui6Stkldclwj6U6Wimmw6al1t/wKtrFVPLcHmFq+7cN gSxg== X-Gm-Message-State: AOJu0YzqIfM9E74/QZS3BBAiebFrbmvTa2Uak1ghcO007mTf+HGwr2/a WFnRwTfoi9+SxiZvmGLjBNK5Vu2V8JuKwPeNyItfkBKyXxHRL7tXqyNfFByw X-Gm-Gg: ASbGncs8pI7C6/EmO49hr93hgwAat6heMD3RlZVGFHZ9cyWupamTp6t7knszP8UCZkC OfOc00RX/Let517+X/kMAyhTWZkYDWJHVT9HT3O/4rYaqTM+TRJqe1aShbtNP5CL/rLx7NMZD4c qVl4gnNQYa8lbXmlc0PnywZm+D/gHG3zKZdwBGK9kg47pnI0Rf7ImFr+Rb0k6mtW4p6yOaKCTfb z9TKj7CK7uEPhcYRWCl871q29Lmb6iIVBsBWH5OOPBGrpE7sgFDemntovzn6s99f1p5CgCPyoCV +i18f+cKwfPYRht8sIrtv9OKz80+6+xydhRpQf2UP8V4ijhuqbhKC2+Ehz5FJ2w= X-Google-Smtp-Source: AGHT+IHOWNokLjaDZTi4pBA1D6xgzVe/n9Jll73ZvMDOidlXSraDWvoC3tEBCOme/IQaiN7nfTZAQA== X-Received: by 2002:a05:600c:35d6:b0:43c:f6b0:e807 with SMTP id 5b1f17b1804b1-43ed0db3b8emr50328165e9.31.1743865659544; Sat, 05 Apr 2025 08:07:39 -0700 (PDT) Received: from theodora.Home ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1795782sm78671535e9.26.2025.04.05.08.07.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Apr 2025 08:07:39 -0700 (PDT) From: Lee Thompson To: 77552@debbugs.gnu.org Subject: [PATCH 1/5] gnu: bqn-sources: Update to 5880fa15. Date: Sat, 5 Apr 2025 16:07:29 +0100 Message-ID: <20250405150733.18738-1-lee.p.thomp@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: Lee Thompson 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/bqn.scm (bqn-sources): Update to 5880fa15. Change-Id: Ida46884232955c3090bca72928f0a6d4240ed45c --- gnu/packages/bqn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index fd090ad433..c9f719939c 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -111,7 +111,7 @@ (define bqn-sources ;; Aside from dbqn above, the main bqn repository is used by other ;; implementations as a "known good" set of sources. CBQN uses dbqn to ;; generate an intermediate bytecode for its own compilation. - (let ((commit "71ce36141aaacfa714edca2e408ca522a3bc5554")) + (let ((commit "5880fa153bb3e3172afc59a711af7e471aeedcd3")) (origin (method git-fetch) (uri (git-reference @@ -119,7 +119,7 @@ (define bqn-sources (commit commit))) (file-name (git-file-name "bqn-sources" commit)) (sha256 - (base32 "060a3r5m7hynzxj4iz1av2kj5jf8w3j8yswzzx9wkx31rdrsiv2c"))))) + (base32 "1cap927i0s8ly4mckppw33ahlc5xnp3l2shk1m79wndf362x3r7c"))))) (define cbqn-bootstrap (let* ((revision "2") -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 05 11:07:49 2025 Received: (at 77552) by debbugs.gnu.org; 5 Apr 2025 15:07:49 +0000 Received: from localhost ([127.0.0.1]:44294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u157d-0002M6-E8 for submit@debbugs.gnu.org; Sat, 05 Apr 2025 11:07:49 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:42061) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u157a-0002L1-Q2 for 77552@debbugs.gnu.org; Sat, 05 Apr 2025 11:07:47 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3913d129c1aso2061823f8f.0 for <77552@debbugs.gnu.org>; Sat, 05 Apr 2025 08:07:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743865660; x=1744470460; 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=PZScT8ozBglVxLNzmPrQwP+/RF/fAxPbNgw/05r1pik=; b=fbAiPeyDumqSaHhEM3a7/dlOxOx7XlsWaty6PbZOUD19NsIQJ3VQ2wv2dTKqWG031X 5ZiE67VCiIqEIb2cOMLKkjhDN4MVHoHJxO71eWyXTAPLkwVoFXepk/HfpNtBuh+7Cb6x 9HClx2XRQlqk3zVoI3tNjXUKYVTDm8htOChsvLM9XLS3EFiNeXBiXaAHQ8lbVGJSVkZr cJ0jhN25wbhyb4w8LoMxDaAHhjl25R+dN7socsv3Lyby4vsDN2efg9NqKHmDO2HDY1Y3 8JAGicPN4+6ZNmtSpkxCigD4ESAZfdJzuF1d8HE715QjejB2fzNHn/cjILnky9OEyquk AdwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743865660; x=1744470460; 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=PZScT8ozBglVxLNzmPrQwP+/RF/fAxPbNgw/05r1pik=; b=ktG/EyW3yWy2XEJLWIXT3eARUntRfMiH9fg9Xon8+cQh1C4o0FM0XJgjx3f8aWK6eP ciEB6CjR8RZhbdxbdpvU4EHf/3CJaNB+wFoKV9WnPvNL0DEMEJKYQ4rE6sN/O/K+LEyA 6KdDCrz+Zy6jogaB6maj1Ffk7KcodZzqaAAufvwEeMEwrjmzuvlZSHIRiorRmjylVMi3 LwtGlnKlSXs9uHOTiPFg7/4TAADkUVSXFX7AaOi6+bmM2rUL3v3JAjvoS4LUCtkEmQ66 DI+JVoEAHIS/OeNO6BFPz0mKM+ickDBmbRp3DF3qnTUrzZU0iwJOui9jf3tGYbynxiJe QIuQ== X-Gm-Message-State: AOJu0Yz3FdlKKQaAVj6k3qgTCOkZJZ9wjXs7G43O2QKpzAsWHTlnWXIA 4Er+52cpV+3gQlIxkYeJshGsVUNdv04mDNoK2FZw0mSu8mEyQvejB+rRfFtH X-Gm-Gg: ASbGncuGtAlhYFPbj0LgNGNIY2tfk7YAVOtPsEc6N398HjKjcsp7x+nINBVBEI+CJAv hdhWU/mBC7r535hv/7UMitcMOf933jqU09F1rlHqWhHG18oMk83YnWeHRjMVwClcCL9H2Y1eYR5 I3aUfN8/0iVe+84RI7vhIV18QV4lf9GDpjPY6lNdhkqpy9hmvoKbPBG7CHlZNjbPCKqzw4BlujD nI8Qf/JeOVrxx5z1dx0x77ophmrOuY6ombNNm8q4O5AfKzHMWi38MsKLlACwJ0P/nlgUwaRcopl 3xABzohTV5YQw//i0YjxAyD26ZKNq4bkVBwLpTGtwiGghb9H+WR2 X-Google-Smtp-Source: AGHT+IFam4yU3ktDaxEk7zX7FYwwNuNt7LMgbTcSN3kpV9DaNHuFJvdzslJLdli0BoYVEG4ZzvLhZw== X-Received: by 2002:a05:6000:2511:b0:391:386d:5971 with SMTP id ffacd0b85a97d-39c2e6221bcmr9933129f8f.14.1743865660226; Sat, 05 Apr 2025 08:07:40 -0700 (PDT) Received: from theodora.Home ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1795782sm78671535e9.26.2025.04.05.08.07.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Apr 2025 08:07:39 -0700 (PDT) From: Lee Thompson To: 77552@debbugs.gnu.org Subject: [PATCH 2/5] gnu: Add replxx-sources. Date: Sat, 5 Apr 2025 16:07:30 +0100 Message-ID: <20250405150733.18738-2-lee.p.thomp@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250405150733.18738-1-lee.p.thomp@gmail.com> References: <20250405150733.18738-1-lee.p.thomp@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: Lee Thompson 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/bqn.scm (replxx-sources): New variable. Change-Id: I6ab4a714ec82165c7df9e5c67c26b43c40a5c625 --- gnu/packages/bqn.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index c9f719939c..5c69a2740c 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -121,6 +121,20 @@ (define bqn-sources (sha256 (base32 "1cap927i0s8ly4mckppw33ahlc5xnp3l2shk1m79wndf362x3r7c"))))) +(define replxx-sources + ;; Dzaima's fork of REPLXX can be used to enhance the CBQN REPL experience + ;; with syntax highlighting, readline-like history/navigation, and a + ;; prefixed keymap similar to BQNPAD. + (let ((commit "13f7b60f4f79c2f14f352a76d94860bad0fc7ce9")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dzaima/replxx") + (commit commit))) + (file-name (git-file-name "replxx" commit)) + (sha256 + (base32 "0440xjvdkrbpxqjrd6nsrnaxki0mgyinsb0b1dcshjj3h3jr1yy4"))))) + (define cbqn-bootstrap (let* ((revision "2") (commit "66584ce1491d300746963b8ed17170348b2a03e6")) -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 05 11:07:50 2025 Received: (at 77552) by debbugs.gnu.org; 5 Apr 2025 15:07:50 +0000 Received: from localhost ([127.0.0.1]:44296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u157d-0002MI-T1 for submit@debbugs.gnu.org; Sat, 05 Apr 2025 11:07:50 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:56648) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u157b-0002L3-EE for 77552@debbugs.gnu.org; Sat, 05 Apr 2025 11:07:48 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43edecbfb94so10081255e9.1 for <77552@debbugs.gnu.org>; Sat, 05 Apr 2025 08:07:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743865661; x=1744470461; 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=2hhL+9sqnGvSyx4DzngEbpXevsO5Q4CkXzxdq341crw=; b=U3IH4xHSx9rhnD5NyZH01JNYgLZVriSCuGUnXFjHZDnT/wAEqlJEozgGZk9d02wbpK 8NmqVdBpoQ5ymH/Jg1mIp3ZBqEIPVEszNd0TgWsqRrBDybhNMEnZCr5b4qo2wOx0G/ri mwZWhOj6S0HyVfqLuebeJpUmuAE3G8veacQjNparFS7WNMRvzYADPO/JzxBS0fxGYha1 9FGVHzqZCh+ZsPm7NOGeROSaI3/rEsK5lmnhs5ZXRw3GukDRkoa6AJXtdd7AIYcZkyxx SYIFKcEMhg3oluk5piyyyygIYESOXJTetwQH8WDT96aBhaO/xyDYvPQPYfr07iJUVVY4 abjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743865661; x=1744470461; 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=2hhL+9sqnGvSyx4DzngEbpXevsO5Q4CkXzxdq341crw=; b=vwhQcJ11uzAuCGzK2ARAln/hh+F+qefNfNywRfhdwHbrrgbbzcq7EwNZe81tizODv8 LnGLttlmQOG28Ret7LSJqTCYAbrI1ImmQgtSTqFjYIxxblzWocd5humrwha3O/EDkmsh E0gNGacPEWzq73450l+fxXcujE86rDIVHatoPaAOq97QANTldwIZMm6jF/WbUtmoIVPb DhUvH3fOH5i3yLeD3VLJ11eqMi1/z9zIY/lude/YzsLZC9GM7RH8bW118LX3Ysd4awWD NYxCeZjV5Eg6bjMn5gcKSEALGa1proiCdu7LpDHQ8NII4+cYMyN2spwd92QRXfDlN5MJ zY6A== X-Gm-Message-State: AOJu0Yxt2MEo3sMvfNl+3UlxTkGsspNT6WPEcmegsP+ui2bEqbU82RKf MfC5HR3MAbG2TrLwibZLwmew6zRpyYoSoQOuZrs0rO79Dv6ZAz2gwFuLo9zT X-Gm-Gg: ASbGncvUK5X9mEHxV9y6U5CJcDdzSCLbiYiT2iTXdoVmb5ESQ6DTFg3L6O0c400TMYl 88WyXzNB2YAZ1dJ8vFT9dFyAcVWjVfEwrZVzJwnPE9JcAn/g3wY3jSmxv2ePgG/Y0aaO8fzXkQV hDWRnahpqPhhuIxmUDzjnRS9z/4OA0iYS4jE7R4lCYsOePOFaeXlLg5v3a2i06X0eqxsNTdBjxW zhWjmnq9RmxE677xhBlpCwHJFBVhJ+W5WTZEk/buXQz97aQ55fGmW+IEVv9EPrV9E2/oBEatNLT Dx0BcGoDvi9Ne0ebgab753Stje8ujKfnGRy1vnwYOy+ehwB8cydy X-Google-Smtp-Source: AGHT+IHj6XLJNfmYoanVWW5P9RWn9VZ3fRMnrXqvxsaP6Gu7Kc1P09/Zd+ulCt8Tji3f5IurnfX+wA== X-Received: by 2002:a05:6000:2288:b0:39c:12f2:2f86 with SMTP id ffacd0b85a97d-39d07ad55a6mr5077281f8f.8.1743865660982; Sat, 05 Apr 2025 08:07:40 -0700 (PDT) Received: from theodora.Home ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1795782sm78671535e9.26.2025.04.05.08.07.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Apr 2025 08:07:40 -0700 (PDT) From: Lee Thompson To: 77552@debbugs.gnu.org Subject: [PATCH 3/5] gnu: Add singeli-sources. Date: Sat, 5 Apr 2025 16:07:31 +0100 Message-ID: <20250405150733.18738-3-lee.p.thomp@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250405150733.18738-1-lee.p.thomp@gmail.com> References: <20250405150733.18738-1-lee.p.thomp@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: Lee Thompson 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/bqn.scm (singeli-sources): New variable. Change-Id: I9a96915a23adc786a3c92fd7ad34aaa5ee938ad6 --- gnu/packages/bqn.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 5c69a2740c..11a5a48b33 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -135,6 +135,19 @@ (define replxx-sources (sha256 (base32 "0440xjvdkrbpxqjrd6nsrnaxki0mgyinsb0b1dcshjj3h3jr1yy4"))))) +(define singeli-sources + ;; Singeli can be used to more efficiently implement CBQN primitive + ;; operations. Used in this way only its source is required. + (let ((commit "53f42ce4331176d281fa577408ec5a652bdd9127")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mlochbaum/Singeli") + (commit commit))) + (file-name (git-file-name "singeli" commit)) + (sha256 + (base32 "1dzg4gk74lhy6pwvxzhk4zj1qinc83l7i6x6zpvdajdlz5vqvc1m"))))) + (define cbqn-bootstrap (let* ((revision "2") (commit "66584ce1491d300746963b8ed17170348b2a03e6")) -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 05 11:07:52 2025 Received: (at 77552) by debbugs.gnu.org; 5 Apr 2025 15:07:52 +0000 Received: from localhost ([127.0.0.1]:44298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u157g-0002Ms-Bc for submit@debbugs.gnu.org; Sat, 05 Apr 2025 11:07:52 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:57569) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u157c-0002L5-1O for 77552@debbugs.gnu.org; Sat, 05 Apr 2025 11:07:48 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43cfecdd8b2so23722715e9.2 for <77552@debbugs.gnu.org>; Sat, 05 Apr 2025 08:07:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743865662; x=1744470462; 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=j9EQxi2NOSbzivuW4VkyyN+SwuhYmxzNeJi3ICvbEOc=; b=a1dSpM6sYiTS9FIZGf+lPjWefiAiGfEIVO4OmjqX0lcI9JuF90O7Mv9ElukNjvQj+c pV1hxPNp4KRPMARHesIvzk9Jmhu+pjZI3pH/bLmENTh1zC06MSv8VoalTzAFBrJQ1KF2 xzmpEjwA2z1kaMjyKNSzpeMmfzf+MfAGKLf6WH+OgshZ9+S1WM6XIOHmgH8MTZgwCuYE aix/H6zORvJ25wpoAHkd2XxyZ5+lup940EMwd2rWr1unytrXe82hJ5TUQNc9vrTA+36i s7420+SlxS3dLvo67/CJSUYQ8pmnBji04AyCXpfL4ECGQSKJap1Ioi3+znnOb5h5uKrE vgwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743865662; x=1744470462; 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=j9EQxi2NOSbzivuW4VkyyN+SwuhYmxzNeJi3ICvbEOc=; b=vb9EFwdJzC7nWE8BhfWv4WidFb0c5gIvUojJKgGaX8Q9XkuMGWr/koCrjodTYRbPfG 9NZuSO4SppAXIttMmBYAlUV2ANz2tJkwilEQlYGJVkqs4ARW32vNz0i56mXAsIVXLC2d eTbgqKG6p/SwhHKU1o0q3Ul5QvbnHcyXD8WKHhaCt2KUIqq5k0cZpETvvE6Tmy++Pr/h FLIeIC5D9MW13IBPrLPgFxCbAdlq+5LcWvyMRfCQ7SSHtRrCPh6F13NcvgHQyM29w0l+ OSBFXcdXPLU/hHGH0HzcBbbrh/Ht+pJs7UBHsapYvU22cIWrggPaUch4bqdsGpFSqqyU CGSQ== X-Gm-Message-State: AOJu0YztE+zJYtkj3fK2XqQAkJWM63gym5SdDEYT9VK42Ew4bv2t1jUE zwGwPUD7XneTYAbWxg3M00QSjjpidJ4e09qmITSQJv6cjljiIXqkHn2FWj1c X-Gm-Gg: ASbGnct6erWVPXCbda6K7dR0IGFuT7C2T6UzsTFExqBQ6iyuGiMQTyeUGIYfp+YLcUx Y0xtxZ2V4SUx+FjFvhcngyd3k5XjZOSgQCjMt49QHNfqjNWo/TbwkXfelBFH/4+OH9ebyh/bfV7 kQRL0pS4FNhtCl+00yZsgEs5EiPI7jrn5qMyg/FQ7LTFRdIQmcIwsBRhoh3WW8gD17BJ9kpnL3T MglEcGMYkwVzzVkkVOYk2nwfJ0FxuiXeCIs95WZmhXnLUwe52NaB6DRQw6zZTqj50czjM2HNDPB eHufAjBBmD95UagCtQP31DS1ZuD8OmLsZ3xyI9YvtJwtVrwJpP1V X-Google-Smtp-Source: AGHT+IH/mVr2jwzlE4L4rXSHIyHGo8nvxwcA/dt016aDuZgcjDYlU8xN4FGiV0eewZcj/m7C8/OrcQ== X-Received: by 2002:a05:600c:1e13:b0:43c:fbbf:7bf1 with SMTP id 5b1f17b1804b1-43ed0da49e6mr79236775e9.30.1743865661655; Sat, 05 Apr 2025 08:07:41 -0700 (PDT) Received: from theodora.Home ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1795782sm78671535e9.26.2025.04.05.08.07.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Apr 2025 08:07:41 -0700 (PDT) From: Lee Thompson To: 77552@debbugs.gnu.org Subject: [PATCH 4/5] gnu: cbqn-bootstrap: Update to 0.9.0. Date: Sat, 5 Apr 2025 16:07:32 +0100 Message-ID: <20250405150733.18738-4-lee.p.thomp@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250405150733.18738-1-lee.p.thomp@gmail.com> References: <20250405150733.18738-1-lee.p.thomp@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: Lee Thompson 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/bqn.scm (cbqn-bootstrap): Update to 0.9.0. dbqn dependency removed. Now runs `make for-bootstrap'. Change-Id: I54c39dbcad7f485b539cf5fc3156829efec4f8c4 --- gnu/packages/bqn.scm | 77 ++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 11a5a48b33..fb153696e6 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -149,47 +149,46 @@ (define singeli-sources (base32 "1dzg4gk74lhy6pwvxzhk4zj1qinc83l7i6x6zpvdajdlz5vqvc1m"))))) (define cbqn-bootstrap - (let* ((revision "2") - (commit "66584ce1491d300746963b8ed17170348b2a03e6")) - (package - (name "cbqn-bootstrap") - (version (git-version "0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dzaima/CBQN") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13gg96aa56b8k08bjvv8i0f5nxrah2sij7g6pg7i21fdv08rd9iv")))) - (build-system gnu-build-system) - (arguments - (list - #:tests? #f ; skipping tests for bootstrap - #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) - #:phases - #~(modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'generate-bytecode - (lambda* (#:key inputs #:allow-other-keys) - (system (string-append #+dbqn - "/bin/dbqn ./genRuntime " - #+bqn-sources)))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append #$output "/bin")) - (chmod "BQN" #o755) - (rename-file "BQN" "bqn") - (install-file "bqn" (string-append #$output "/bin"))))))) - (native-inputs (list dbqn bqn-sources)) - (inputs (list icedtea-8 libffi)) - (synopsis "BQN implementation in C") - (description "This package provides the reference implementation of + (package + (name "cbqn-bootstrap") + (version "0.9.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dzaima/CBQN") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0433hp9lgv6w6mhdz0k1kx2rmxia76yy9i0z7ps4qdk7snf2yr2q")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; skipping tests for bootstrap + ;; `make for-bootstrap' implicitly disables REPLXX, Singeli + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + ;; Default behaviour is to extract git hash to use for version + ;; string, here our version string is manually substituted in so + ;; git isn't required for building. + (string-append "version=" #$version) + "nogit=1" + "for-bootstrap") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append #$output "/bin")) + (chmod "BQN" #o755) + (rename-file "BQN" "bqn") + (install-file "bqn" (string-append #$output "/bin"))))))) + (inputs (list libffi)) + (synopsis "BQN implementation in C") + (description "This package provides the reference implementation of @uref{https://mlochbaum.github.io/BQN/, BQN}, a programming language inspired by APL.") - (home-page "https://mlochbaum.github.io/BQN/") - (license license:gpl3)))) + (home-page "https://mlochbaum.github.io/BQN/") + (license license:gpl3))) (define-public cbqn (package -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 05 11:07:53 2025 Received: (at 77552) by debbugs.gnu.org; 5 Apr 2025 15:07:53 +0000 Received: from localhost ([127.0.0.1]:44300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u157g-0002Mw-Qo for submit@debbugs.gnu.org; Sat, 05 Apr 2025 11:07:53 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:53474) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u157c-0002L7-RE for 77552@debbugs.gnu.org; Sat, 05 Apr 2025 11:07:50 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso26877095e9.2 for <77552@debbugs.gnu.org>; Sat, 05 Apr 2025 08:07:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743865663; x=1744470463; 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=qqvzAYt/2e7TRtnLtniLTTIi4UMtIsZb2c1IQWbriCw=; b=PWBrf2hDP3Hh8LWuKsJ0b/L1QpjjU64c7kogHH1Z1R7DiX3ibs2G9PAr+HI4FMUol7 v08uvi0/DzWJgAaGRMbU1KmuZGthpFHK3+J11a6vHzbOhNgE7W5a1I3rTs4X9IiThAQx TVkX2eia+COymnXvPRY44H+3fBKgV+83whzo+FuiMi0Vza0sTt8Vl/fKEKYHF7waVAkG YIeOhJY2WvCUNtg2NYaUluqLTpZWWdGqzBTf2p+Uq6oabLJbcIEVDimasE0VIlmc3BU6 TqueP0I3zx+gTHZ+sINFodgaEN32h6i2aSZrOnRnnEEwi2bzCkCaMyFWnSUIFEUHY6Sd vDBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743865663; x=1744470463; 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=qqvzAYt/2e7TRtnLtniLTTIi4UMtIsZb2c1IQWbriCw=; b=G4bx41C/akokTN7aaJ0vXbHKMQei6Z5Ao6xEm7xuRg+7PbeAQAa7o1ThphQpesg2Yh ZN8NN74jOL3Gax1qGx2RcdQ0knUzTv+wktkUKm0V7h/pqoogOY5Lr4t8lfnRpsVe/1Wk zPxYNpt461qPtMyprL4JsOxP5Rkq8BHV+a2dzYHW9Sp1KeB5JKr6gw/YttJv6fJ46UC7 1pKYCvLxp6WubDIGKJFYljUN8do0W8lzTX/EOlOF0OXkujTFjdClTCXHXunZ1HGc8H+p tctgWeSab6qiUqjL1OchU/TWqPYLxK87B5dwTNYg30AE+Q00T19q+wsZywO0MNpxueRr sIgw== X-Gm-Message-State: AOJu0YwEDEbrAIcrvjm8rQNv4BnqCuqoizCJ1c6YOWora/1KVDQoOTif GDyDZEm0b2wFOnSq2yIP1ZFkjNN8liP5MNvY6KiIgKSIj/Y9xPVsApbVs553 X-Gm-Gg: ASbGncvK9asWtAAz08RFLb3DF4UzFpMoptmdEvAJoZ82VfCHZ4OfFJ7UobixBddvhfy ND9fIQptsj/2aJ/ayCFN50tGe60ZUnRNahsWIeSMutX6zc8Rv6ZgqaGxQ85l61SsEMQN9s5Kg+D +vR4z9KnSEL3VpkLJvxOy4s3l2O12ZeaFpbUxLmxbYXQbx67xW2HjcDA8DfmQIM1Pdnt2ndoeYr BhJm2BVyidYj34Ww8SXUVjOUzZw9RQUhfDl6WvL5G2z3iu3d1CWK5setUhyUY50/bAJ9P1iKpTf vXa5/65WaxCqgrLicY0HGBd+wRtv3luQlhGPQLVLfBU4seX56Lcp X-Google-Smtp-Source: AGHT+IHzx8GzSPSxe8OBpWYPgbC0tKcmOzOIkgSZYmMZd8nKGoLUHlj38FSidW1NMRq04xZYujAZzA== X-Received: by 2002:a05:600c:4f02:b0:43d:23fe:e8a6 with SMTP id 5b1f17b1804b1-43ecf842ab0mr43271125e9.5.1743865662388; Sat, 05 Apr 2025 08:07:42 -0700 (PDT) Received: from theodora.Home ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1795782sm78671535e9.26.2025.04.05.08.07.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Apr 2025 08:07:42 -0700 (PDT) From: Lee Thompson To: 77552@debbugs.gnu.org Subject: [PATCH 5/5] gnu: cbqn: Update to 0.9.0. Date: Sat, 5 Apr 2025 16:07:33 +0100 Message-ID: <20250405150733.18738-5-lee.p.thomp@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250405150733.18738-1-lee.p.thomp@gmail.com> References: <20250405150733.18738-1-lee.p.thomp@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: Lee Thompson 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/bqn.scm (cbqn): Update to 0.9.0. Source-only bootstrap phase to generate bytecode added. Library dependencies on replxx-sources and singeli-sources added. New tests added to list. Dependency on dbqn eliminated. Change-Id: I97ba12dd9d67b944ef7be1d6d76a98f4f2d69e35 --- gnu/packages/bqn.scm | 67 ++++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index fb153696e6..fa3c7bbddc 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -196,39 +196,64 @@ (define-public cbqn (name "cbqn") (outputs '("out" "lib")) (arguments - (substitute-keyword-arguments (strip-keyword-arguments - (list #:tests?) - (package-arguments cbqn-bootstrap)) - ((#:make-flags flags #~(list)) - #~(cons* "shared-o3" "o3" #$flags)) - ((#:phases phases #~%standard-phases) + (substitute-keyword-arguments (strip-keyword-arguments (list #:tests?) + (package-arguments + cbqn-bootstrap)) + ((#:make-flags flags + #~(list)) + #~(cons* "shared-o3" "o3" + #$flags)) + ((#:phases phases + #~%standard-phases) #~(modify-phases #$phases + ;; Symlinking local copies of REPLXX and Singeli is allowed + ;; instead of cloning submodules. `singeli-source' and + ;; `replxx-source' git hashes match the submodule hashes for this + ;; release of CBQN. + (add-before 'build 'link-local-replxx + (lambda* (#:key inputs #:allow-other-keys) + (symlink #+replxx-sources "build/replxxLocal"))) + (add-before 'build 'link-local-singeli + (lambda* (#:key inputs #:allow-other-keys) + (symlink #+singeli-sources "build/singeliLocal"))) + ;; The BQN built as part of `cbqn-bootstrap' is used here to + ;; generate bytecode rather than downloading pre-built bytecode. + (add-before 'build 'generate-bytecode + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "build/bytecodeLocal/gen") + (system (string-append #+cbqn-bootstrap + "/bin/bqn build/bootstrap.bqn " + #+bqn-sources)))) (replace 'check (lambda* (#:key inputs tests? #:allow-other-keys) (when tests? (system (string-append "./BQN -M 1000 \"" - #+bqn-sources - "/test/this.bqn\"")) + #+bqn-sources "/test/this.bqn\"")) (map (lambda (x) - (system (string-append "./BQN ./test/" x - ".bqn"))) - '("cmp" "equal" "copy" "random")) + (system (string-append "./BQN ./test/" x ".bqn"))) + '("cmp" "equal" + "copy" + "bitcpy" + "bit" + "mut" + "hash" + "squeezeValid" + "squeezeExact" + "various" + "random" + "joinReuse")) (system "make -C test/ffi")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let* ((bin (string-append (assoc-ref outputs "out") - "/bin")) - (lib (string-append (assoc-ref outputs "lib") - "/lib")) + (let* ((bin (string-append (assoc-ref outputs "out") "/bin")) + (lib (string-append (assoc-ref outputs "lib") "/lib")) (include (string-append (assoc-ref outputs "lib") - "/include"))) + "/include"))) (mkdir-p bin) (rename-file "BQN" "bqn") (install-file "bqn" bin) (install-file "libcbqn.so" lib) (install-file "include/bqnffi.h" include)))))))) - (native-inputs (list dbqn - bqn-sources - libffi)) - (properties - `((tunable? . #t))))) + (native-inputs (list bqn-sources cbqn-bootstrap replxx-sources + singeli-sources libffi)) + (properties `((tunable? . #t))))) -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 09 12:00:29 2025 Received: (at 77552) by debbugs.gnu.org; 9 Apr 2025 16:00:30 +0000 Received: from localhost ([127.0.0.1]:41341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2Xqn-0005uL-KA for submit@debbugs.gnu.org; Wed, 09 Apr 2025 12:00:29 -0400 Received: from latitanza.investici.org ([82.94.249.234]:23915) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2Xql-0005u9-2s for 77552@debbugs.gnu.org; Wed, 09 Apr 2025 12:00:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1744214425; bh=F9+JA1MkuPvVZi/9/LQVge4HCzN69lcUNT3hVHZB0Cg=; h=From:To:Cc:Subject:In-Reply-To:Date:From; b=ZcMT+r7pWxQRsWKTong0FdFCW1YgBUiaioMUUFQZo+MXtLhhR+hVtmBE/qFjI9Wy+ 0I63DqufyzA92qpSKwpW/bLlh2Y9ViS5gJMSiRtkhgENr/OmBfH9HxHRZMR/hxPJ8Z O6Ys/MRQ9jrVBX84kE+18/iuzY9X/SnC119gbN7E= Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4ZXnj501Q9zGp6b; Wed, 9 Apr 2025 16:00:25 +0000 (UTC) Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4ZXnj45YtfzGp6Y; Wed, 9 Apr 2025 16:00:24 +0000 (UTC) From: Cayetano Santos To: Lee Thompson Subject: Re: [bug#77552] [PATCH 5/5] gnu: cbqn: Update to 0.9.0. In-Reply-To: <20250405150733.18738-5-lee.p.thomp@gmail.com> (message from Lee Thompson on Sat, 5 Apr 2025 16:07:33 +0100) User-Agent: mu4e 1.12.9; emacs 29.4 Date: Wed, 09 Apr 2025 18:00:23 +0200 Message-ID: <87zfgpiaug.fsf@inventati.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 77552 Cc: lee.p.thomp@gmail.com, 77552@debbugs.gnu.org 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.7 (-) --=-=-= Content-Type: text/plain Please, use changelog format for changes in commit message. See: https://www.gnu.org/prep/standards/html_node/Change-Logs.html - (substitute-keyword-arguments (strip-keyword-arguments - (list #:tests?) - (package-arguments cbqn-bootstrap)) - ((#:make-flags flags #~(list)) - #~(cons* "shared-o3" "o3" #$flags)) - ((#:phases phases #~%standard-phases) + (substitute-keyword-arguments (strip-keyword-arguments (list #:tests?) + (package-arguments + cbqn-bootstrap)) + ((#:make-flags flags + #~(list)) + #~(cons* "shared-o3" "o3" + #$flags)) + ((#:phases phases + #~%standard-phases) Try to avoid unnecessary modifications in original code, this makes hard to follow the contributions. - #+bqn-sources - "/test/this.bqn\"")) + #+bqn-sources "/test/this.bqn\"")) Idem - (let* ((bin (string-append (assoc-ref outputs "out") - "/bin")) - (lib (string-append (assoc-ref outputs "lib") - "/lib")) + (let* ((bin (string-append (assoc-ref outputs "out") "/bin")) + (lib (string-append (assoc-ref outputs "lib") "/lib")) (include (string-append (assoc-ref outputs "lib") - "/include"))) + "/include"))) Again. You get the idea. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iI0EARYKADUWIQTMuBhC+dcFjs1nN3q/XN9N9r9mggUCZ/aZlxccY3NhbnRvc2JA aW52ZW50YXRpLm9yZwAKCRC/XN9N9r9mglMxAP4tdjKKNtZ2dwrwuha90JJDCGPW PBWiAjxMk7uTjKnHOgEAxVzM0aph8s88ZoG8WQIkdYcjQR/ci/oZgbMO4kYScQ8= =q+h5 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 09 12:07:44 2025 Received: (at 77552) by debbugs.gnu.org; 9 Apr 2025 16:07:44 +0000 Received: from localhost ([127.0.0.1]:41351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2Xxn-0006DI-NF for submit@debbugs.gnu.org; Wed, 09 Apr 2025 12:07:43 -0400 Received: from confino.investici.org ([2a11:7980:1::2:0]:28111) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2Xxk-0006D2-Of for 77552@debbugs.gnu.org; Wed, 09 Apr 2025 12:07:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1744214857; bh=3+PCbL9OI2LFcTbIq3/l+Edsh8sbyL5rN+YBLBlAbA0=; h=From:To:Cc:Subject:In-Reply-To:Date:From; b=hxwkSgW1totc8bl4sF6enKYoECwwENX45yOFh1IHrstMz2q8BpzIwgBnt0fdrUZFA fTgn+c4YluQfAizG9zDzKwKA2JM1NUwfK9QeCulZGdgZsMCa8P8GVRWKDcqcP25/en 3BcSnbg1Dc5AK3zv45TVBiuczH0xQgnGIdOBgE1M= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4ZXnsP2jZKz112t; Wed, 9 Apr 2025 16:07:37 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4ZXnsP1SRXz10yx; Wed, 9 Apr 2025 16:07:35 +0000 (UTC) From: Cayetano Santos To: Lee Thompson Subject: Re: [bug#77552] [PATCH 4/5] gnu: cbqn-bootstrap: Update to 0.9.0. In-Reply-To: <20250405150733.18738-4-lee.p.thomp@gmail.com> (message from Lee Thompson on Sat, 5 Apr 2025 16:07:32 +0100) User-Agent: mu4e 1.12.9; emacs 29.4 Date: Wed, 09 Apr 2025 18:07:35 +0200 Message-ID: <874iyxiaig.fsf@inventati.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: lee.p.thomp@gmail.com, 77552@debbugs.gnu.org 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 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable + ;; Default behaviour is to extract git hash to use for version + ;; string, here our version string is manually substituted in You exceed maximum column here. Use =E2=80=98./pre-inst-env guix lint PACKAGE=E2=80=99 before submitting to= fix this kind of errors. + (license license:gpl3))) Have you checked "licenses" folder ? Additionally, none of your sources include a license field. And yet, they a= re used in cbqn/bootstrap.This is anomalous to me. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iI0EARYKADUWIQTMuBhC+dcFjs1nN3q/XN9N9r9mggUCZ/abRxccY3NhbnRvc2JA aW52ZW50YXRpLm9yZwAKCRC/XN9N9r9mgg9JAP9sKvxTtWHo9Ucrvi5a4p8FX3lY YmJWsFP2sqp82TN/VgD/bLQfRoepkFD2E1pY102Xps0vJbNd/uSf0Vqoe4fOWw0= =XKb5 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 09 14:02:42 2025 Received: (at 77552) by debbugs.gnu.org; 9 Apr 2025 18:02:42 +0000 Received: from localhost ([127.0.0.1]:41788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2Zl3-0006nt-Q4 for submit@debbugs.gnu.org; Wed, 09 Apr 2025 14:02:42 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:56377) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u2Zl1-0006nc-F9 for 77552@debbugs.gnu.org; Wed, 09 Apr 2025 14:02:40 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43ce70f9afbso230635e9.0 for <77552@debbugs.gnu.org>; Wed, 09 Apr 2025 11:02:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744221753; x=1744826553; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vPrC4txMNLP7zuOSaLGbTJOOR45uS/esKWvWN9Nhh64=; b=Fd1UBl4OK+/kJeyvzTQzghn3PAVN2UxKYdgQALOZQ34NdHeT2OG19HXRcOnkjBK4Uy AHp+20BfH8+XbgkIdXFoX0fguNFk8E1bURUBRzl5SkzYHiegD3UU4NcG7ykK1v0xZU7q d9fITZhw+nGexax9XTU43KfpotUJH8A6bjmpxAVByxmcPYR7A+i+5XDffqRkOO8gi7fJ /LiZculTNN9LNv1yeSj8uwnOQIfS4TJNcUDw+6jb5bwRNrlW9OqmFaitClKWDgW2dzef rjCbUZMDkFt8Q6Y698o60LQU84FqwyOhfvhWfIMUiPfO95Ta8uhGqrs2lLkdK2wVCKjL 7BLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744221753; x=1744826553; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vPrC4txMNLP7zuOSaLGbTJOOR45uS/esKWvWN9Nhh64=; b=JzGnUvit2RRNczRpxt8/XGJ0RSAvbhTRuAjkMJeL8niNoW6UCsp1dHfd9JmqadEy2l ybxr3jgpTP+DsrLP24pGYj+0qS4jQcSFqNDLlMk5dcylQr46K1vAQxrMdWcyUt9kA5wj 8Qh+5Ep9FXM043xDtIXj8kcVzGNxgJjdnxaN+j5tf/EdkiiRjytAb39ItlXk61cS4edM oybkAnoOU9mskv6K6KvQsrvMl606KZ+yNjuRJA8fHkadPWUDtvXAqtfqZBWXjeStM/Er 0SCbHp4qZL2vPxpWD2LZISSIKqvJXJFI218qLfQ32wT1tbuHOsRsNn20lcyySNiIAQqb tzSA== X-Gm-Message-State: AOJu0YyiO0Of+7m06A6c8vyTrpbqGQ7B1l569ri8FuvaLzpPxVBKEeuf bS45hO8M/1t4uN6Oj3z/UtW77TLpIa/vBv93WqntV+xvEH4mR4Is9niW3TYE X-Gm-Gg: ASbGncvZFCSIwTL2eRk4PLAkjqiCo3xr9kxJNz1E2stYmMFgjCBlJ3kXBIt5dmAj9re 1dWrKtzGEA/ZI03q4+JWblHgaatvKJdrojcqgNddZLqzELq903xV9nWVNm72gf8uljQKHFubFZT 6TvHgtzAoP3hL2L6HWIyAJqNZhCRtvWz/E470wwo3m9mULdWG9Ch5mVIQ7lNObYnVS0FyTes0sA NxiYNP8nRYmIXQFbAF08c5L8/6g+Jdmacc0U2zdP37wrTiN1zceMFEvxaA+rmWEpJ153lq2XD89 ZFHKcha2wm00bz9WO/xttXXtau5ayOTA1/DjnHytWg== X-Google-Smtp-Source: AGHT+IHm5AhtOvSpo5X/IFOF03zQimJIHIo0+nsTKDssIzK2DfmESk5t/TVLTt6tYv1zM6fIMETDyQ== X-Received: by 2002:a5d:6d8b:0:b0:390:dfa1:3448 with SMTP id ffacd0b85a97d-39d87cd001fmr3742933f8f.43.1744221752299; Wed, 09 Apr 2025 11:02:32 -0700 (PDT) Received: from theodora ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2338d802sm25465655e9.1.2025.04.09.11.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 11:02:31 -0700 (PDT) From: Lee Thompson To: Cayetano Santos Subject: Re: [bug#77552] [PATCH 4/5] gnu: cbqn-bootstrap: Update to 0.9.0. In-Reply-To: <874iyxiaig.fsf@inventati.org> (Cayetano Santos's message of "Wed, 09 Apr 2025 18:07:35 +0200") References: <874iyxiaig.fsf@inventati.org> Date: Wed, 09 Apr 2025 19:02:30 +0100 Message-ID: <87zfgpfc21.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: 77552@debbugs.gnu.org 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 (-) Cayetano Santos writes: > You exceed maximum column here. > > Use =E2=80=98./pre-inst-env guix lint PACKAGE=E2=80=99 before submitting = to fix this > kind of errors. Okay this is my bad, though I am wondering if there's a more ergonomic way to style/lint packages that aren't defined publicly like this one. What I find myself doing is changing the `(define cbqn-bootstrap ...' to `(define-public ...', running `./pre-inst-env guix style cbqn-bootstrap', then swapping `define-public' back to `define'. Is there something I'm missing with this? > + (license license:gpl3))) > > Have you checked "licenses" folder ? This paragraph from upstream about licenses: https://github.com/dzaima/CBQN?tab=3Dreadme-ov-file#licensing talks a bit about the licensing situation for CBQN itself. It seems obvious to me to list out lgpl3, gpl3 and mpl2, though do you think I'd be better off listing all the licenses under `licenses' including Boost and Apache etc? > Additionally, none of your sources include a license field. And yet, they= are > used in cbqn/bootstrap.This is anomalous to me. Unless I'm mistaken I don't think there's a way to specify a license for a plain `origin' like I've used for the `-sources' I've added. I chose to add Singeli and REPLXX as just `origin's instead of full packages taking inspiration from the existing `bqn-sources'. `bqn-sources' currently doesn't mention its ISC license at all. Despite this checking the build output it looks like all the following still manage to end up in /gnu/store/...-cbqn-0.9.0/share/doc/cbqn-0.9.0: > LICENSE-Apache2 LICENSE-Boost LICENSE-GPLv3 LICENSE-LGPLv3 LICENSE-MI= T-sort LICENSE-MPL2 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 09 14:07:07 2025 Received: (at 77552) by debbugs.gnu.org; 9 Apr 2025 18:07:07 +0000 Received: from localhost ([127.0.0.1]:41856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2ZpL-00074d-7q for submit@debbugs.gnu.org; Wed, 09 Apr 2025 14:07:07 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:47279) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u2ZpI-00073e-L2 for 77552@debbugs.gnu.org; Wed, 09 Apr 2025 14:07:05 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-39149bccb69so6705861f8f.2 for <77552@debbugs.gnu.org>; Wed, 09 Apr 2025 11:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744222018; x=1744826818; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=PUdmwdDP+9f/v2mz4rjLLot9MnHt6bdwnsifEEPiC8c=; b=LmlR6vgwa6wMxHoL+9WBVY8oHmER2qGYHA1d/WFSKzo+HHgCxhYU0o/iQp88M3P4Tn 0e+8LvCjiYl4uUh06W5hQyub08rDYuVLtPuLU7ItvBef/4Z1oNNERdZv9y83FkKuMwgV +KVhc5bNoIG8MCHoatT2sB6KZyi7X5VkPasy0I9ccD6LCLyrTob9AXcfahfahc/FbCGA YG6hKwUu8J+rK6e36iBDae4ONrU6MC47sX7Q3GonPr7oR8NkcWiLr94H0c7Ncqd3PXrD U3+9VlD5i1Mp4CqWtWMASFFyo8WwaDZx4GzNpE+pXvWROCYbK/Ck+ic6SmRYZUKACYhE gnVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744222018; x=1744826818; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=PUdmwdDP+9f/v2mz4rjLLot9MnHt6bdwnsifEEPiC8c=; b=TdJHx9Uemq16aEXOmAiPaDjqp5U0Pp7pHM65vqxWBzGBSZCV8jp2UsgpWjngUGaMWw GZCClytK+e3G1v1abc6QkGsUDM5qzMW/ylTP0VK6mrxpO0PWwZu5H3t42PDkh0d0O7wT +lNZ42w3mKpfn8A0CRBOFwMe0lbEwnAnC+k4SU06eTaUna+U21nk7bVJy7ZDg8NMeHdw vrOri7r+aGkoyLoCmMy9/SfM1dDtf+gFVa5zh8kK7sRy+UzZfzRKRv0laVSngp3VUrqg nIdP+hAvU4oMDFbf+gvH1nd4rPb4gqPgE7n6ItcgS7G5cUHZO06N1O8Fq8uDnnlJc0RR EEvw== X-Gm-Message-State: AOJu0YzCjWrXW91rOkg6qW6YfS5UtRR485VHh62VGBorbQ4TAvH4sPQn M3zFCXUCwAtT3ucNH1BrcF4CtvYMYCmfC3aZidP7DrzoHrS9i14dUCmqhj/g X-Gm-Gg: ASbGncuzC9Gslm4HZYb7Ce/UIeWTdJRLofqXhUVZhpzXruuPKpXdEIYbiwKrrRc+UC0 9Vtjr3alkKpFD68U61iULhZ6vpmru1C8OA2gX7THdrNY7C6kJgCIPXNqS0jWaMk8pLawLK6DvHG zFeIEEye0mvssbjtgFvldoWIiRhbU+MRYR28TQnN5KucCJfiOt1YkVU/pex4ThE3iCf93wHiaGI T3wqHXZyLV+fbQQKHFzE3DqB3hVnrRgRi8F9gcmVuUoj4ZXcwrEVogPVgBZKl3DivpJftPLomgW v/Sq48YiXxfRgcdfR5AfagDChz5i0dqgVCaQy3xzP7TQfpBSjtI8 X-Google-Smtp-Source: AGHT+IGeTB0qOoFPXHFEqKdNEtxz6WEatF45w4sX2iD2WYXGOxzJ7D9dOZx5xtj5fxRi9Q7bPVdkZw== X-Received: by 2002:a05:6000:40db:b0:39c:13fa:3eb with SMTP id ffacd0b85a97d-39d87cd59e2mr3925476f8f.39.1744222017896; Wed, 09 Apr 2025 11:06:57 -0700 (PDT) Received: from theodora ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f233c49f7sm23170515e9.17.2025.04.09.11.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 11:06:57 -0700 (PDT) From: Lee Thompson To: Cayetano Santos Subject: Re: [bug#77552] [PATCH 5/5] gnu: cbqn: Update to 0.9.0. In-Reply-To: <87zfgpiaug.fsf@inventati.org> (Cayetano Santos's message of "Wed, 09 Apr 2025 18:00:23 +0200") References: <87zfgpiaug.fsf@inventati.org> Date: Wed, 09 Apr 2025 19:06:56 +0100 Message-ID: <87v7rdfbun.fsf@gmail.com> 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: 77552 Cc: 77552@debbugs.gnu.org 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 (-) Cayetano Santos writes: > Try to avoid unnecessary modifications in original code, this makes hard > to follow the contributions. I'm following guidance to run `./pre-inst-env guix style PACKAGE' before sending in a patch. What you see here is just the result of running that. I agree though it makes reading diffs confusing. Is there a way to only `guix style' what's been changed? From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 10 03:27:57 2025 Received: (at 77552) by debbugs.gnu.org; 10 Apr 2025 07:27:57 +0000 Received: from localhost ([127.0.0.1]:43510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2mKK-0005Um-VR for submit@debbugs.gnu.org; Thu, 10 Apr 2025 03:27:57 -0400 Received: from confino.investici.org ([2a11:7980:1::2:0]:45201) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2mKI-0005UY-GU for 77552@debbugs.gnu.org; Thu, 10 Apr 2025 03:27:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1744270070; bh=+xNIrb2gHPWfhboM/IUx3d6T820BTxWCezJ6CnQAWY0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=CfRaYL4IeGsJfAZmM2aM7TNiyVBQtgEXj+Ri6bZN7VeFkx+Ng4DEz69SmfUUURNvi 9Gk8Xevmf2WqtOj2N7DWK8bja4djP9xN+xzM8yKQDDVXbD3Pvyt/OsM87wcmHy3V1A kFR9pDPwkpVfM6pOr5rvzOUmy+gQG1HiQ/cDCHRE= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4ZYBHB5vY7z11Pp; Thu, 10 Apr 2025 07:27:50 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4ZYBHB4sXnz11Pj; Thu, 10 Apr 2025 07:27:50 +0000 (UTC) From: Cayetano Santos To: Lee Thompson Subject: Re: [bug#77552] [PATCH 5/5] gnu: cbqn: Update to 0.9.0. In-Reply-To: <87v7rdfbun.fsf@gmail.com> (Lee Thompson's message of "Wed, 09 Apr 2025 19:06:56 +0100") References: <87zfgpiaug.fsf@inventati.org> <87v7rdfbun.fsf@gmail.com> User-Agent: mu4e 1.12.9; emacs 29.4 Date: Thu, 10 Apr 2025 09:27:49 +0200 Message-ID: <87a58ofpca.fsf@inventati.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: 77552@debbugs.gnu.org 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 (-) >Wed 09 Apr 2025 at 19:06, Lee Thompson wrote: > Cayetano Santos writes: > >> Try to avoid unnecessary modifications in original code, this makes hard >> to follow the contributions. > I'm following guidance to run `./pre-inst-env guix style PACKAGE' before > sending in a patch. What you see here is just the result of running > that. I agree though it makes reading diffs confusing. I see what you mean. Generally speaking, guix community privileges avoiding unnecessary changes and readability, over strict styling (you can verify in most packages). > Is there a way to only `guix style' what's been changed? Not that I=E2=80=99m aware of, but would be useful ! From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 10 03:40:49 2025 Received: (at 77552) by debbugs.gnu.org; 10 Apr 2025 07:40:49 +0000 Received: from localhost ([127.0.0.1]:43536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2mWm-0006C3-JB for submit@debbugs.gnu.org; Thu, 10 Apr 2025 03:40:48 -0400 Received: from devianza.investici.org ([2c0f:f930:0:4::108]:62621) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2mWk-0006Bm-CI for 77552@debbugs.gnu.org; Thu, 10 Apr 2025 03:40:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1744270843; bh=F0NWqlDmfHhP0u8FWttfP97k0/ZGtyRd+cckfXLxeIU=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=mV678qQMG1i9gJ4P5JMVxAJirYJDoHQZE5eSumdwkE591zdkNkcefX9CqFj2Itake DUfPtibN3GEjm5EqUekot8dRJ7j+6nz+L5qSOQ9LUaXTrRLnGK9J0pfqFL4Tr3/186 Xu0TNnJAX0BzpB0+koz5md2Pj3SOwDny0Ycg0WY8= Received: from mx2.investici.org (unknown [127.0.0.1]) by devianza.investici.org (Postfix) with ESMTP id 4ZYBZ30yXPz6vJR; Thu, 10 Apr 2025 07:40:43 +0000 (UTC) Received: from [198.167.222.108] (mx2.investici.org [198.167.222.108]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4ZYBZ26RBXz6vK8; Thu, 10 Apr 2025 07:40:42 +0000 (UTC) From: Cayetano Santos To: Lee Thompson Subject: Re: [bug#77552] [PATCH 4/5] gnu: cbqn-bootstrap: Update to 0.9.0. In-Reply-To: <87zfgpfc21.fsf@gmail.com> (Lee Thompson's message of "Wed, 09 Apr 2025 19:02:30 +0100") References: <874iyxiaig.fsf@inventati.org> <87zfgpfc21.fsf@gmail.com> User-Agent: mu4e 1.12.9; emacs 29.4 Date: Thu, 10 Apr 2025 09:40:42 +0200 Message-ID: <87h62wea6d.fsf@inventati.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 77552 Cc: 77552@debbugs.gnu.org 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.7 (-) >Wed 09 Apr 2025 at 19:02, Lee Thompson wrote: > Cayetano Santos writes: > >> You exceed maximum column here. >> >> Use =E2=80=98./pre-inst-env guix lint PACKAGE=E2=80=99 before submitting= to fix this >> kind of errors. > Okay this is my bad, though I am wondering if there's a more ergonomic > way to style/lint packages that aren't defined publicly like this one. > What I find myself doing is changing the `(define cbqn-bootstrap ...' to > `(define-public ...', running `./pre-inst-env guix style > cbqn-bootstrap', then swapping `define-public' back to `define'. Is > there something I'm missing with this? In my case, I usually do the same. >> + (license license:gpl3))) >> >> Have you checked "licenses" folder ? > This paragraph from upstream about licenses: > https://github.com/dzaima/CBQN?tab=3Dreadme-ov-file#licensing talks a bit > about the licensing situation for CBQN itself. It seems obvious to me to > list out lgpl3, gpl3 and mpl2, though do you think I'd be better off > listing all the licenses under `licenses' including Boost and Apache > etc? I think so. You may get inspiration from iverilog and similar packages. >> Additionally, none of your sources include a license field. And yet, the= y are >> used in cbqn/bootstrap.This is anomalous to me. > Unless I'm mistaken I don't think there's a way to specify a license for > a plain `origin' like I've used for the `-sources' I've added. I chose > to add Singeli and REPLXX as just `origin's instead of full packages > taking inspiration from the existing `bqn-sources'. `bqn-sources' > currently doesn't mention its ISC license at all. I guess that once the (non-license) source is included in a package, its license must appear in the package itself. > Despite this checking the build output it looks like all the following > still manage to end up in > /gnu/store/...-cbqn-0.9.0/share/doc/cbqn-0.9.0: >> LICENSE-Apache2 LICENSE-Boost LICENSE-GPLv3 LICENSE-LGPLv3 LICENSE-MIT-s= ort LICENSE-MPL2 Yes, the builder detects the licenses folder and assumes all of its contents as licenses, so it takes them all; they still need to be mentioned in the package. From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 10 09:38:52 2025 Received: (at 77552) by debbugs.gnu.org; 10 Apr 2025 13:38:52 +0000 Received: from localhost ([127.0.0.1]:44472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2s7H-0005nu-Kp for submit@debbugs.gnu.org; Thu, 10 Apr 2025 09:38:51 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:42126) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u2s7F-0005nR-Lg for 77552@debbugs.gnu.org; Thu, 10 Apr 2025 09:38:50 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3913d129c1aso600065f8f.0 for <77552@debbugs.gnu.org>; Thu, 10 Apr 2025 06:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744292323; x=1744897123; 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=8RctUBLu4qPoMkJMiNSnX6+8NtvLuYVftX9ooC8no+k=; b=N7TykQVv9G3s3xQ61RjYecPo9ona965kOG+xYVkMiqFRuX2AJwa3yH8WGdUiAA5KJ6 cPeqIhOk4IeE+6La4BGpqJwav5wroxvfGma/t1Q6X4hByDxbNRMlefDqQSlXoGvHSC4y tmoOR7gThP26ujvIQ47se/k0G5VKrI95wyNoCIbip2PI2cBCPi5NTG5NzOFGGsaOb3mS VgKpzNx1lBMn3REc1SSOyHXAh7s4ITmXNd6qq5WXmLJ+YFADgrhUyr73uNuXq+z6EWLr 7v9qzZynP/+rslqLjMLNNVhufTUCF7RyD18Nvhp/FI6rWWLSMmRUX0GutY5XlbHFdlqA /ehw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744292323; x=1744897123; 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=8RctUBLu4qPoMkJMiNSnX6+8NtvLuYVftX9ooC8no+k=; b=XSp1mc525PQBb5BSNtGC3eVdvy1Kj6SSJdKve0YOnbBvY1ZMh5Ifw+/nmos1tkJyB9 JEIxo0Pdau1ffKY2jKGwM12g31/qKYttTESURC0Us/jUzHzIB3Ew30sqJbURR1xsIHJa GxHctObOa3/jklFo5XZxEjMLz7gdDYKiIixBI+zWIR+Dg1Su1FsJk+Lru8O5IMOUeC3s QpIGiyBv8WCuXYBNvUGDEokpKOIA6oJjSOE1M8LyXcsBsdwBZm5QYDJZtduAgZsc6Cas 7p3HsmVxpD4FGCWMxAwS2YJNa++ZbIryd8uvoRJyrB4wf8Wnt6CuF/mB29uPB1rNpced YpGQ== X-Gm-Message-State: AOJu0YzME0/ZUCdNjqJUFrWkaJbZrnx9FvZMSb6VjxESJrgFMb4tyahg sLfcnRTHZLsFWY54cVVzYH0lInVuxdyWi/KIzmc/+f2jv0estoHA48BXYhGr X-Gm-Gg: ASbGncsJALT2a2kRyspYKZX2ugCln08accyc87N8jZGu4f1Dj1gEnRIVXrxqF1LSojf Okq+3P316WmrhfFns6sbP6GxxqX1IQhdJzIg0M9kQx40tgB2rdEuDPpBqSuXQKZcbisXH9c80wo WE+g/LQ8ZyFZ0pISd1Lh35M49awMkn1xigoVWpePWAY4zoRWQtxus7FDzdkAzlPFgSyLLilZ6MW sJ65RbBykyv6igXKLGvLR6LIGfJQdrcjlax2xA0/3OE2RpjtVLQUQPpB/b02TeiQVsUyPpXxyDM uXnlep/PivwbUaBBLAjzuaLBn6QanlRo2ahv4ULMCuFp/qIh X-Google-Smtp-Source: AGHT+IHV9eRoVpevA+5dL3iF7UKkDvq9t874eBbuBprqzW9O4aQgXCcuyPCypVg34DiXMzXV+wlNYQ== X-Received: by 2002:a05:6000:2585:b0:390:f0ff:2c10 with SMTP id ffacd0b85a97d-39d8f4c95eamr2627141f8f.19.1744292322843; Thu, 10 Apr 2025 06:38:42 -0700 (PDT) Received: from theodora.Home ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2075fca5sm57847515e9.32.2025.04.10.06.38.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 06:38:42 -0700 (PDT) From: Lee Thompson To: 77552@debbugs.gnu.org Subject: [PATCH v2 1/5] gnu: bqn-sources: Update to 5880fa15. Date: Thu, 10 Apr 2025 14:38:32 +0100 Message-ID: <20250410133836.32326-1-lee.p.thomp@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: Lee Thompson 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/bqn.scm (bqn-sources): Update to 5880fa15. Change-Id: Ida46884232955c3090bca72928f0a6d4240ed45c --- gnu/packages/bqn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index fd090ad433..c9f719939c 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -111,7 +111,7 @@ (define bqn-sources ;; Aside from dbqn above, the main bqn repository is used by other ;; implementations as a "known good" set of sources. CBQN uses dbqn to ;; generate an intermediate bytecode for its own compilation. - (let ((commit "71ce36141aaacfa714edca2e408ca522a3bc5554")) + (let ((commit "5880fa153bb3e3172afc59a711af7e471aeedcd3")) (origin (method git-fetch) (uri (git-reference @@ -119,7 +119,7 @@ (define bqn-sources (commit commit))) (file-name (git-file-name "bqn-sources" commit)) (sha256 - (base32 "060a3r5m7hynzxj4iz1av2kj5jf8w3j8yswzzx9wkx31rdrsiv2c"))))) + (base32 "1cap927i0s8ly4mckppw33ahlc5xnp3l2shk1m79wndf362x3r7c"))))) (define cbqn-bootstrap (let* ((revision "2") -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 10 09:38:56 2025 Received: (at 77552) by debbugs.gnu.org; 10 Apr 2025 13:38:56 +0000 Received: from localhost ([127.0.0.1]:44476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2s7M-0005oI-1H for submit@debbugs.gnu.org; Thu, 10 Apr 2025 09:38:56 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:61521) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u2s7G-0005nU-Ha for 77552@debbugs.gnu.org; Thu, 10 Apr 2025 09:38:50 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43cfe63c592so9534385e9.2 for <77552@debbugs.gnu.org>; Thu, 10 Apr 2025 06:38:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744292324; x=1744897124; 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=PZScT8ozBglVxLNzmPrQwP+/RF/fAxPbNgw/05r1pik=; b=Eq5++K5fotYoQGM2fhgiL7nb5SMFRqkGdOHPVMyhEnCFmljYz3oPANVR2m5Gq6iAV6 yoFIUDBD1JdZkD3VsgNEvat8aik9nq86UM6ERTzXeKYpUm9jNED0Ko5dP15A936Z/27j EgwCwAvREF7fZMmQHplrGoZx5PiDi+gruzq/TEzdKm61XH8wkzC/izvpaByYKyU0Hudf pOuhi+Zg3l4vVjv6DAxQ4Fc4vw3xClfqg6jgDPLgauxQWfuD50AYnljuT4VI3YL05QUN J12C7mjhvVNDQtGAt1RCZtPnzYm+OyzrMzI0gjrX9ehRHQaXO0QeTIyh9q9SnK4pHXMa PDQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744292324; x=1744897124; 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=PZScT8ozBglVxLNzmPrQwP+/RF/fAxPbNgw/05r1pik=; b=UC+1sQqNXYdxa8zBQSCXOxsjH5RkRa5sXgrq+H50lUYw0KYO05Q4ZmX9eOyPe0IM4H 6kSR+S1YrEOMcTWC9RK/bKbNwiH9n2HQNHTNEH5IpHdFnVeOXdm0nDM3CeQDNq2YaKjL T0/aIX9VvRB8Af9lKHizwzYBv0lfOp34FoFh+YAZ6UeHwNa3tAMnL98JFGyQrnomxo3/ WlBDwR7a7VNYUg7+lEKDWptmFgWbraFspwDnKtkNg5dvlA4MZhmrCaKJ3wrNkIl1E2af ZUWobpLJyOQMznRimjwr0wOycOITaorikQpeI5oK05ynb4whjscP1btsehotriAljL/C D1kg== X-Gm-Message-State: AOJu0Yz4tqZfz247EM6nKfazNS8K7/ky2rJADYPXAW2Q5djvDVWiy+ck xTyFGNlzhfz495pByNyIwX9oZW6emUjgMx+KxDGnQnuafD116iduF3LhVOWS X-Gm-Gg: ASbGnctj/nnYBEmhj+kd8qufdBTZMSlCx39sxOBH1+qbuc1MTYLsZs9iir6eqddyr/h c1tEikJDrEvNqE/ADBtUf48zVGV7hRP0iw9utGthjp+t9fk3AUCxnni0QDFLJQ8i6XvPMGj9VaZ OdRTC3cpP4Q/K7vq7r00m2ZQej3ARlUmc9B9ti3xCddX/hw4h+XVfpv93Kb7E0zKKEWeUtTkukK uZQhK+QA9ubAxBxb87KjZ39ZQYguqR8ZwaFn8a/n1BArno2LJC3JQVxrRkv/GWH3M4eCXNVOeQh Urmo/4bC5rIS92Ipo247l/Z7BE9HnhRlOU7iLPPQR8IngrTL X-Google-Smtp-Source: AGHT+IHZhxSe5F4oVv1LATAVm13+HJbyp3990s14lHcaV9i1Ws4cvYEgFRNgJiqNJYmjvSXZGUBvpQ== X-Received: by 2002:a05:600c:1f8c:b0:43c:f64c:447f with SMTP id 5b1f17b1804b1-43f2ffa3be3mr19807535e9.29.1744292323982; Thu, 10 Apr 2025 06:38:43 -0700 (PDT) Received: from theodora.Home ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2075fca5sm57847515e9.32.2025.04.10.06.38.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 06:38:43 -0700 (PDT) From: Lee Thompson To: 77552@debbugs.gnu.org Subject: [PATCH v2 2/5] gnu: Add replxx-sources. Date: Thu, 10 Apr 2025 14:38:33 +0100 Message-ID: <20250410133836.32326-2-lee.p.thomp@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250410133836.32326-1-lee.p.thomp@gmail.com> References: <20250410133836.32326-1-lee.p.thomp@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: Lee Thompson 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/bqn.scm (replxx-sources): New variable. Change-Id: I6ab4a714ec82165c7df9e5c67c26b43c40a5c625 --- gnu/packages/bqn.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index c9f719939c..5c69a2740c 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -121,6 +121,20 @@ (define bqn-sources (sha256 (base32 "1cap927i0s8ly4mckppw33ahlc5xnp3l2shk1m79wndf362x3r7c"))))) +(define replxx-sources + ;; Dzaima's fork of REPLXX can be used to enhance the CBQN REPL experience + ;; with syntax highlighting, readline-like history/navigation, and a + ;; prefixed keymap similar to BQNPAD. + (let ((commit "13f7b60f4f79c2f14f352a76d94860bad0fc7ce9")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dzaima/replxx") + (commit commit))) + (file-name (git-file-name "replxx" commit)) + (sha256 + (base32 "0440xjvdkrbpxqjrd6nsrnaxki0mgyinsb0b1dcshjj3h3jr1yy4"))))) + (define cbqn-bootstrap (let* ((revision "2") (commit "66584ce1491d300746963b8ed17170348b2a03e6")) -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 10 09:38:56 2025 Received: (at 77552) by debbugs.gnu.org; 10 Apr 2025 13:38:56 +0000 Received: from localhost ([127.0.0.1]:44478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2s7M-0005oK-Ci for submit@debbugs.gnu.org; Thu, 10 Apr 2025 09:38:56 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:55585) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u2s7G-0005nV-Sg for 77552@debbugs.gnu.org; Thu, 10 Apr 2025 09:38:51 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso6448315e9.3 for <77552@debbugs.gnu.org>; Thu, 10 Apr 2025 06:38:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744292325; x=1744897125; 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=2hhL+9sqnGvSyx4DzngEbpXevsO5Q4CkXzxdq341crw=; b=PbFSel9iLN4tMNQhja51xS9u6QzJOWJhfIduc+V8dpHYuHM+kgE5hm7B1Mfpy8T1ff ABrQytZ6rtUnn9v/7pTEk2KarPCFMIfjOYH/rQVsnXFO32s7Q7txOs6eeKg003+9ApFj uPDjMhlvx4/hF23IZZztdiqs6NANwAWXEad02GHKBVr7TT9ykWFMvKoyCP3o2RfE7zFT WxLq4abJmrqg6imgJ2i5yK447HE8xBDaEL2v0YetgzcwsUMZgYZf5ELS5jT5HwgQT9cQ FD5Z1k+oEHmNSbRkBPkS1e9MD5XqMgxVESr/7jmssjr2D9WquInN8yGPKhcydhDpgpJt P1NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744292325; x=1744897125; 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=2hhL+9sqnGvSyx4DzngEbpXevsO5Q4CkXzxdq341crw=; b=PWnOK6rp59MWW7tQ4gBqVQF7Rq5NESGwng40/TGH3WbQ2TKVCj5DvKI0o8B8PNgSY/ iUz77H8641vJu0JGNC0HLBZN3Cf6Qx7jWENKNHreIgoThTa8+hW9iaqHYYuboGv6mJNL HNxrIWan4tFTdXyTe7KowxPbqBilzqwamaECwDBIPrwxIGFboKy+z3Gbi5frOLdTXL7X dP4Axei0tG1hhYuY9pcBbR0qoOmAEv2h9xd/V0UhN4FDORTxGO4wfQZqp6Z+a3KVRVjP v0rMjmP10xXT3fcApP7Fxn2tttOIW4cWTHO4L3kBcUduWJt9D0aami3dqSdHAcTrS1vg ytRg== X-Gm-Message-State: AOJu0YyYeNBXkFh6nKGboFXQHO9cndSkpag0Q35SEY4XONriviN5JIew dgQF1ccqxT0iEijesxw0aEnLnGzlLW9swsTEAB5VHhFqZ5KrdVH124iGQ28D X-Gm-Gg: ASbGncu8ckOIbDfVUYe2LRbJ8Tk4SS7tSdOA5z00uojPwJ2Q5mx87lSNGEAya5Jbtty H22XiwWPG0opO0U4G+jIUBpUMs0wYbGn1l9o6EjuwBLXMyXfEqMB2hZOA4gMeuGm4PlOVyHlAea ffGpS4vfbCs0w9fdp7APseCcWkRUtRKJ6WseOgNYYsGVSGIBryFe+r8P1kPqTfUueFmTvW3cFRZ +UMCfp9EZbUayQ/EnfYRxyOPLkKDNyGTX1j2VL5TV4mPqvRVOjPkYQ23hDSUve1q5tP4M4TQpbD Bp7MdUMiIXEFme/jQzWAhCYE5R5nt6u2WvZpw69W7wiXOGvT6W48DOf0yrA= X-Google-Smtp-Source: AGHT+IHW57BwgE/t0h2AqXEgNqrSIhLDWeuRSR6O/HXELwqxvAeYOR44UJWI/90z9q9wr7QM0Fvqvg== X-Received: by 2002:a5d:598e:0:b0:39c:1424:2827 with SMTP id ffacd0b85a97d-39d8f46d10bmr2437773f8f.15.1744292324671; Thu, 10 Apr 2025 06:38:44 -0700 (PDT) Received: from theodora.Home ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2075fca5sm57847515e9.32.2025.04.10.06.38.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 06:38:44 -0700 (PDT) From: Lee Thompson To: 77552@debbugs.gnu.org Subject: [PATCH v2 3/5] gnu: Add singeli-sources. Date: Thu, 10 Apr 2025 14:38:34 +0100 Message-ID: <20250410133836.32326-3-lee.p.thomp@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250410133836.32326-1-lee.p.thomp@gmail.com> References: <20250410133836.32326-1-lee.p.thomp@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: Lee Thompson 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/bqn.scm (singeli-sources): New variable. Change-Id: I9a96915a23adc786a3c92fd7ad34aaa5ee938ad6 --- gnu/packages/bqn.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 5c69a2740c..11a5a48b33 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -135,6 +135,19 @@ (define replxx-sources (sha256 (base32 "0440xjvdkrbpxqjrd6nsrnaxki0mgyinsb0b1dcshjj3h3jr1yy4"))))) +(define singeli-sources + ;; Singeli can be used to more efficiently implement CBQN primitive + ;; operations. Used in this way only its source is required. + (let ((commit "53f42ce4331176d281fa577408ec5a652bdd9127")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mlochbaum/Singeli") + (commit commit))) + (file-name (git-file-name "singeli" commit)) + (sha256 + (base32 "1dzg4gk74lhy6pwvxzhk4zj1qinc83l7i6x6zpvdajdlz5vqvc1m"))))) + (define cbqn-bootstrap (let* ((revision "2") (commit "66584ce1491d300746963b8ed17170348b2a03e6")) -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 10 09:38:57 2025 Received: (at 77552) by debbugs.gnu.org; 10 Apr 2025 13:38:57 +0000 Received: from localhost ([127.0.0.1]:44480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2s7M-0005oV-PX for submit@debbugs.gnu.org; Thu, 10 Apr 2025 09:38:57 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:43347) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u2s7H-0005nX-Pk for 77552@debbugs.gnu.org; Thu, 10 Apr 2025 09:38:52 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43cf628cb14so13568375e9.1 for <77552@debbugs.gnu.org>; Thu, 10 Apr 2025 06:38:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744292326; x=1744897126; 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=HSj9kZXJZP6Yqu2PC77ICuxvpS/WAqc8/k5NTuXt4G0=; b=el5CRgW/3YS4xARl+uqfvXXg+OhUAN2MxnC/nkC2rKsTbKPerrbUaqjS+KTpj4qDAF INknpn2UoYp3IBz07iUgwyiTKe8labG4cXn0pQYmpSMihtqKsSNhsRemQ3CY0zxjt9jc bX/iLu1CEg51TrNMdPnPFgj+g42qq+q620shHNxkdp/gDUbbFKSfLioC17p4i/5xNr+u RJ9HktVtekrl91JJOFKdP+tUOYHUl3sEXh1OTUWtD6LAnqfnCI/VRUxILQmfGJxew+XZ Ya765ydeb2BMSW1niyweousOLgGHJDBnuVy/06/Um9gM8HBCnrBfMQdrqI1POIufjCyu DhOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744292326; x=1744897126; 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=HSj9kZXJZP6Yqu2PC77ICuxvpS/WAqc8/k5NTuXt4G0=; b=BKjXVTcgpKmD4RlGFbb+HDqVGQBMBCHsFCT23/y9yqdox3T3N8mY1Q07SpzS7X17u4 UeWOHp0dCpV4/A3tHT4F0Ea3JhLv4Wp+n0q3xxrIZDvMQ89lMdPCEvo59YIts0jzEemU Nbx9kTuXvxjfkA1Ecf81s70q4ZkP4xFg61tcHQjQ/3OSUi0Ur+JKamLrl3oxD/kqbD5K nckLXhcuH30/OWyFNwlU4s/OQ34p/vvN9/0xtqG46J6R+8S9H4wwMwQE2VbcZAOxlhYl b/XtPqrBA9Vn67MyMtocxq7A03EMs/8onW539c7J8LjhigdtClMpwR/zJywCvdS/NDRH xLMg== X-Gm-Message-State: AOJu0YwM5PkUp4U70YsV1QRdCJqwVw2bwPJJNn2QnsMupGRp61vitCO0 4AtAd8Ytmekt1MZw61e6XnyuD32Mf+ZEmKYvajEpNG3DdHjfUA4y9xEnLXoM X-Gm-Gg: ASbGncsR24B4b94EWXxRIleunezclCna8yGjr53NuonpOoqY5HQFmbgv/H17zGs2xa+ F3x3o/DGVsE0dw1dW7T8JqP4A50Asd6kehxFm1YcxHb+NGqUdq0mJff7zFtg6aiiE1/b9L5dfhj yw69GZVXAgNyv01RdwS11RMjbJpJHedAt+WqyDYOMOVS3oXT5s3RwTCKroYPEa9ghC7LI1OmTaI hEvty1PpBHtsC4BV6MLyO8FbrbWnmOk6SHzEcjXCaePS/OTyRxvwwy0P9RFAiFCy3ZTNmi/UoVN ZqsYBOdmLLq5c3FE1r9mN/zy0G5UOT9YnE0wgCERmbDyd1hR X-Google-Smtp-Source: AGHT+IFD9QfzgB0QnHfHZq/1UhuwPky/XxxokSwCCy5yvUZYCPmSqqKaKyiHNFr1a6SqMlw++YiqIQ== X-Received: by 2002:a05:600c:46cb:b0:43d:fa5f:7d30 with SMTP id 5b1f17b1804b1-43f2f0fd059mr25772325e9.16.1744292325332; Thu, 10 Apr 2025 06:38:45 -0700 (PDT) Received: from theodora.Home ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2075fca5sm57847515e9.32.2025.04.10.06.38.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 06:38:44 -0700 (PDT) From: Lee Thompson To: 77552@debbugs.gnu.org Subject: [PATCH v2 4/5] gnu: cbqn-bootstrap: Update to 0.9.0. Date: Thu, 10 Apr 2025 14:38:35 +0100 Message-ID: <20250410133836.32326-4-lee.p.thomp@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250410133836.32326-1-lee.p.thomp@gmail.com> References: <20250410133836.32326-1-lee.p.thomp@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: Lee Thompson 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/bqn.scm (cbqn-bootstrap): Update to 0.9.0. [version]: Now 0.9.0 instead of assembled from git-version, revision, commit. [source]: Commit swapped out for version, hash updated. [arguments]<#:make-flags>: Manual version added, flag to disable git during build, build type switched to "for-bootstrap". <#:phases>: `generate-bytecode' deleted here, moved to `cbqn' package. [native-inputs]: All deleted, bootstrap no longer needs `dbqn' or sources. [inputs]: Deleted `icedtea-8'. [license]: License list updated, covers CBQN code and exceptions. Change-Id: I54c39dbcad7f485b539cf5fc3156829efec4f8c4 --- gnu/packages/bqn.scm | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 11a5a48b33..1caf6f3c8a 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -149,47 +149,53 @@ (define singeli-sources (base32 "1dzg4gk74lhy6pwvxzhk4zj1qinc83l7i6x6zpvdajdlz5vqvc1m"))))) (define cbqn-bootstrap - (let* ((revision "2") - (commit "66584ce1491d300746963b8ed17170348b2a03e6")) (package (name "cbqn-bootstrap") - (version (git-version "0" revision commit)) + (version "0.9.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/dzaima/CBQN") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "13gg96aa56b8k08bjvv8i0f5nxrah2sij7g6pg7i21fdv08rd9iv")))) + "0433hp9lgv6w6mhdz0k1kx2rmxia76yy9i0z7ps4qdk7snf2yr2q")))) (build-system gnu-build-system) (arguments (list - #:tests? #f ; skipping tests for bootstrap - #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) + #:tests? #f ;skipping tests for bootstrap + ;; `make for-bootstrap' implicitly disables REPLXX, Singeli + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + ;; Default behaviour is to extract git hash to + ;; use for version string, here our version + ;; string is manually substituted in so git isn't + ;; required for building. + (string-append "version=" + #$version) + "nogit=1" "for-bootstrap") #:phases #~(modify-phases %standard-phases (delete 'configure) - (add-before 'build 'generate-bytecode - (lambda* (#:key inputs #:allow-other-keys) - (system (string-append #+dbqn - "/bin/dbqn ./genRuntime " - #+bqn-sources)))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (mkdir-p (string-append #$output "/bin")) (chmod "BQN" #o755) (rename-file "BQN" "bqn") (install-file "bqn" (string-append #$output "/bin"))))))) - (native-inputs (list dbqn bqn-sources)) - (inputs (list icedtea-8 libffi)) + (inputs (list libffi)) (synopsis "BQN implementation in C") (description "This package provides the reference implementation of @uref{https://mlochbaum.github.io/BQN/, BQN}, a programming language inspired by APL.") (home-page "https://mlochbaum.github.io/BQN/") - (license license:gpl3)))) + ;; Upstream explains licensing situation + (license (list license:asl2.0 ; src/utils/ryu* + license:boost1.0 + license:expat ; src/builtins/sortTemplate.h + license:lgpl3 ; Everything else except the above + license:gpl3 + license:mpl2.0)))) (define-public cbqn (package -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 10 09:38:57 2025 Received: (at 77552) by debbugs.gnu.org; 10 Apr 2025 13:38:57 +0000 Received: from localhost ([127.0.0.1]:44482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2s7N-0005oZ-9h for submit@debbugs.gnu.org; Thu, 10 Apr 2025 09:38:57 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:47512) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u2s7J-0005nZ-E3 for 77552@debbugs.gnu.org; Thu, 10 Apr 2025 09:38:53 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3913958ebf2so717497f8f.3 for <77552@debbugs.gnu.org>; Thu, 10 Apr 2025 06:38:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744292326; x=1744897126; 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=3fgtyRTvygVPz+X2VEiYkx2eGybYUfFcH5mkHrnLRJU=; b=jP9PA3rLjRifkXpmnoAk7I4IHynsHArTmo88ZXcEImmr2y41YBxg5MqDFRNjFps9Or GyIB/VBCv+33ZcBXzkpvvoYH2RR6qDtv/7ePsajTENY0fyTHatXHE7SwC7FVxwQ6BO03 TbMJCyZIw85yuB4XO33KPcj5gAYGQ0JPMu1bFDvQYYaj93pg5jSyYSjezOFvXF2egJSX u3VNwcb3wDjmtbZptbHywOHgSao3c/Z8TuHJ1lIlTBcrkMXmHC0W7C2F3qjXuLXowwH+ p/RnUccnhttNVDz9UQuIxHrmJ9lEgcYRVFoPCIycSlGEhKC0JXouvlOwbsUIXE02CrB7 BThQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744292326; x=1744897126; 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=3fgtyRTvygVPz+X2VEiYkx2eGybYUfFcH5mkHrnLRJU=; b=T77h+eJGSVPDcdqfzmiKznMUjdmdn+IEhbQBebQF5dGUvblbGcOOSpjKFm9eRXMKEA rpiKLAB6lTW9eQ6C64g4hfXU5hfOpffe/Kr9Txi6xQXruaNa5AvVzQOjo8Htl4XzJ++X 4ybTB2hzivyZit4WoxaG2RFK+xL/IQuS967NrLvCFMn4QES5SwESGCIBd4gopXDonAYS Djp8NkuK+jcT8h04uVdzJYy67wOrmJrduGCU6QvwzC9KeSbSnpKQNS2FVSTjX5ou3X8X iXBXQgHJWX9IfdYzl8/9tiAM9jQ9fANeBS4NuGL13cewVkQcDvkiHgEHokspLESgs7cM cp6A== X-Gm-Message-State: AOJu0YxHiuswFm1itKsTYvF9GbBV1sWxPxQowiIXx+d1sJjHAM6YXRXZ j5MjRal/6kTVRQ/J7nvJodF+1QdBqBLwu64o7xybVi0SkXIaGs+dK7c2SYpo X-Gm-Gg: ASbGnctqzZuECHDAwYREb8eVGQ5EhmOUvS9cH+96RrzHSOK/3u2fgEwC8bRYaxpAQUq SCnvwvEimHCF+AvaCf1u02yiDJcaEHjK+51xx2z0GGDLKs1kDzn7LBrpE93CCamsoUyQa+7keyt w0SfVupBxQHU0mYN7M3X/LUCDogYTl8TbPB+j2sj/b7+IBdNTAbB5enYDpD/KnH3BdQHROtE9Wo +cEZ2uVOnUwfyrYBbbzU07IgQYx8fTzRlMzt6CaDwn4WMcy25S6flMJnKtE4uQ3r+BjGCOwI2nv pLWt8zvQ+ks0hgxeRsUGtr+mSTt5/8oCpz5smUb08zZKKD04 X-Google-Smtp-Source: AGHT+IG9eIQG6ArZ6nNA9sXlUibQS/CO0SLbConoeC2uE2U+V2La+UNsA4+FYts0/INzEC0rbG9x9A== X-Received: by 2002:a05:6000:40df:b0:39c:1258:7e17 with SMTP id ffacd0b85a97d-39d8f4f1ab5mr2195619f8f.56.1744292326013; Thu, 10 Apr 2025 06:38:46 -0700 (PDT) Received: from theodora.Home ([2a02:c7c:c11b:7600:7aae:703b:7fec:dcc5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2075fca5sm57847515e9.32.2025.04.10.06.38.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 06:38:45 -0700 (PDT) From: Lee Thompson To: 77552@debbugs.gnu.org Subject: [PATCH v2 5/5] gnu: cbqn: Update to 0.9.0. Date: Thu, 10 Apr 2025 14:38:36 +0100 Message-ID: <20250410133836.32326-5-lee.p.thomp@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250410133836.32326-1-lee.p.thomp@gmail.com> References: <20250410133836.32326-1-lee.p.thomp@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77552 Cc: Lee Thompson 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/bqn.scm (cbqn): Update to 0.9.0. [arguments]<#:phases>: Phases linking REPLXX and Singeli and to generate bytecode are added before build, new tests are added to the replaced 'check. [native-inputs]: Removed `dbqn', added `cbqn-bootstrap', `replxx-sources' and `singeli-sources'. [license]: Licenses for REPLXX and Singeli appended to those for just CBQN. Change-Id: I97ba12dd9d67b944ef7be1d6d76a98f4f2d69e35 --- gnu/packages/bqn.scm | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 1caf6f3c8a..a90007f593 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -210,6 +210,24 @@ (define-public cbqn #~(cons* "shared-o3" "o3" #$flags)) ((#:phases phases #~%standard-phases) #~(modify-phases #$phases + ;; Symlinking local copies of REPLXX and Singeli is allowed + ;; instead of cloning submodules. `singeli-source' and + ;; `replxx-source' git hashes match the submodule hashes for this + ;; release of CBQN. + (add-before 'build 'link-local-replxx + (lambda* (#:key inputs #:allow-other-keys) + (symlink #+replxx-sources "build/replxxLocal"))) + (add-before 'build 'link-local-singeli + (lambda* (#:key inputs #:allow-other-keys) + (symlink #+singeli-sources "build/singeliLocal"))) + ;; The BQN built as part of `cbqn-bootstrap' is used here to + ;; generate bytecode rather than downloading pre-built bytecode. + (add-before 'build 'generate-bytecode + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "build/bytecodeLocal/gen") + (system (string-append #+cbqn-bootstrap + "/bin/bqn build/bootstrap.bqn " + #+bqn-sources)))) (replace 'check (lambda* (#:key inputs tests? #:allow-other-keys) (when tests? @@ -219,7 +237,17 @@ (define-public cbqn (map (lambda (x) (system (string-append "./BQN ./test/" x ".bqn"))) - '("cmp" "equal" "copy" "random")) + '("cmp" "equal" + "copy" + "bitcpy" + "bit" + "mut" + "hash" + "squeezeValid" + "squeezeExact" + "various" + "random" + "joinReuse")) (system "make -C test/ffi")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) @@ -234,8 +262,11 @@ (define-public cbqn (install-file "bqn" bin) (install-file "libcbqn.so" lib) (install-file "include/bqnffi.h" include)))))))) - (native-inputs (list dbqn - bqn-sources - libffi)) + (native-inputs (list bqn-sources cbqn-bootstrap replxx-sources + singeli-sources libffi)) (properties - `((tunable? . #t))))) + `((tunable? . #t))) + (license (append (package-license cbqn-bootstrap) + (list license:isc ;Singeli module + license:bsd-3 ;REPLXX module + license:unicode))))) -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 20 04:36:20 2025 Received: (at 77552) by debbugs.gnu.org; 20 Jul 2025 08:36:20 +0000 Received: from localhost ([127.0.0.1]:48427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1udPWu-0002Wc-GC for submit@debbugs.gnu.org; Sun, 20 Jul 2025 04:36:20 -0400 Received: from fhigh-b8-smtp.messagingengine.com ([202.12.124.159]:34571) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1udPWr-0002WE-Gt for 77552@debbugs.gnu.org; Sun, 20 Jul 2025 04:36:18 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.stl.internal (Postfix) with ESMTP id 666187A0160 for <77552@debbugs.gnu.org>; Sun, 20 Jul 2025 04:36:11 -0400 (EDT) Received: from phl-imap-08 ([10.202.2.84]) by phl-compute-11.internal (MEProxy); Sun, 20 Jul 2025 04:36:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.fm; h= cc:content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm2; t=1753000571; x=1753086971; bh=poMaOshDJu jzUV/BNHlmpgIGR4jcR4PicwbR++Hp9Kk=; b=PE3W/O7gkRyh35jPqiwt81rboo Il+WZ8ftaj5zz4p+HM9VkLHQmm/PXnSgvaZ+BbQOb8DU/ZqggRRvCUReGbf9U7ox iK7gpRKEDUNXhCosWU/C9kED/HZIHG2E1DYlAoVrdHIrGKWAmqZK8iW8I3N7EFB3 EN5HmhHN2Ws3pj244+pCUdkc3QZ9CY9gwjPRFI3MFZwTSJXYGMWrAH0yQ0712AxW SREDWqDIPsXXJS2qB4AzNNUQDrkbZ9B1iianOeN88OtdOZn29PgICx8iORaXdXsw sHuV2d5FS5Ge0E4s9Q8oBKjMaXfPDog3uXt3nJWCTXtk2tlX36SV4+YsNMQA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1753000571; x=1753086971; bh=poMaOshDJujzUV/BNHlmpgIGR4jcR4Picwb R++Hp9Kk=; b=FdxpmJHYLpuaDSGN4jz6saf0N+lOtjDIdm4B4lk4M2OsNtN7Jle HOaEGPqAIbeW+BWQs0zhODU/hUVEWF7qW5sxg2Cx2/nDy6gcyTNk1/UXnPEF9F8x TIYD2/IqnK9Pce+vHl4ty2DcRdL13uq8x1mmGEnAacfiP0njco7R0LqZwG6t3udM OlxldQpF5wZ4O460jIEHyHmO6yjNf/zlQw+uNhspWnHXE5rG9b0RIpFVtbgp7dv+ NTBO07rXGbWPOYXfHSoxwdRg3bI3ZKPnQoloLtyeLUsB/+jKJ1GhfIM75QOiOj+p 24jLdj5OqZg9oXmKYQDEqibCZQG4OV2gbfw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdeikeejfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecunecujfgurhepofggfffhvffkufgtgfesthejredtredttd enucfhrhhomheprggvtggvphhoghhluhcuoegrvggtvghpohhglhhusehfrghsthhmrghi lhdrfhhmqeenucggtffrrghtthgvrhhnpeekudduleejleegudfhkeevueekueehtdffgf evudfgtdegtddvgefftddthfeujeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpegrvggtvghpohhglhhusehfrghsthhmrghilhdrfhhmpdhnsg gprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejjeehhedv seguvggssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i7bb4409f:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id D62E92CE0071; Sun, 20 Jul 2025 04:36:10 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface MIME-Version: 1.0 Date: Sun, 20 Jul 2025 09:33:43 +0100 From: aecepoglu To: 77552@debbugs.gnu.org Message-Id: <23cbb1e2-a5b5-40a7-8953-d0e6f0fa3345@app.fastmail.com> Subject: Thanks for picking this up again Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 77552 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.7 (-) Thanks Lee Thompson for picking this up again. I had forgotten about #69023 and will suggest closing it in favour of this. Also many thanks to Cayetano Santos for their assistance with the patch. As for Singeli: Singeli as library: a package exposing source code will work. Conceptually though it is an interpreter/compiler and better served as an executable. That was an effort I didn't feel comfortable taking on at the time :) As for REPLXX: Unlike libffi which is a functional feature, REPLXX is strictly a UX feature that I don't use and didn't want to spend time with but I appreciate you having done so. Looking forward to the patch making it upstream. - aecepoglu