From patchwork Thu Apr 10 13:38:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Thompson X-Patchwork-Id: 41546 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AEE7027BC4B; Thu, 10 Apr 2025 14:39:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 20F2227BC49 for ; Thu, 10 Apr 2025 14:39:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2s7Z-0000eo-2n; Thu, 10 Apr 2025 09:39:09 -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 1u2s7V-0000bz-CL for guix-patches@gnu.org; Thu, 10 Apr 2025 09:39:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2s7V-0000Qk-2p for guix-patches@gnu.org; Thu, 10 Apr 2025 09:39:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3fgtyRTvygVPz+X2VEiYkx2eGybYUfFcH5mkHrnLRJU=; b=VMeBvQg9E7xpUDshdN5grhstW6CYA1xKPARRkefVCl5+653VTl7+aFBeK32tSvoDCdRHJqWB9jClsg4pTJXLknLW1nOffsCx8KHUM5BERyCNdm5YskKghdem3VDcthqduSnGPSMCSa3Ja4s38ig5MEcEhaEzXDbL15tyqYVjefrFCQIs8b+Ex8r1lqm6mkSs+zVy9KkMAVJRfWKQIzoYNjADiQp1RDKBpnxYpkBgWa/SpxKIWeh/Are9t8BP0s07KAcH7nFPY3iKPInDYgEjwbNCuWR+t0NtXKCh7jQLX1jSdwaiFHQ5EbvmzdgvpvTiWHI9VbzlyvL2PvxUp1o7xQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2s7U-0005pW-Re for guix-patches@gnu.org; Thu, 10 Apr 2025 09:39:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77552] [PATCH v2 5/5] gnu: cbqn: Update to 0.9.0. Resent-From: Lee Thompson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Apr 2025 13:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77552 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77552@debbugs.gnu.org Cc: Lee Thompson Received: via spool by 77552-submit@debbugs.gnu.org id=B77552.174429233722364 (code B ref 77552); Thu, 10 Apr 2025 13:39:04 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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)))))