From patchwork Thu Apr 10 13:38:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Thompson X-Patchwork-Id: 41543 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 D032E27BC49; Thu, 10 Apr 2025 14:39:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 2298127BC4A for ; Thu, 10 Apr 2025 14:39:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2s7Y-0000ef-Nb; 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 1u2s7U-0000bj-N8 for guix-patches@gnu.org; Thu, 10 Apr 2025 09:39:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2s7U-0000Qc-Dw for guix-patches@gnu.org; Thu, 10 Apr 2025 09:39:04 -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=HSj9kZXJZP6Yqu2PC77ICuxvpS/WAqc8/k5NTuXt4G0=; b=gmK/265XK92M5RBJRXBmG10BKLAiljXh/UTfRbm1v0hBty4wXvo/oZA273tAIN7SRRSKeQvGkU5Rxnfsxl6ZTK91mu+y5T79PSv/U6+1xBhJngI1IbPHApb0OsFI7PaT0CWiJvk3AJ9Z8+1IVzYrqVzOrIBIW9UHNFJo9VhRBvxOup4wkSP/77wl82raJ+imQWPBywUVmphyN1ohTti5w0t87o7hrbTlHkotCeILyjS0l61JnXbUvAAYwh3BSRgSFQKGz3trSorA8XQZE+NbmYJmXWPjCdqVDc5Mp9KyA84390slK9qmZB9wM/1nn34v3PeGgj+AyYmBef3Q4o6e8A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2s7U-0005pO-71 for guix-patches@gnu.org; Thu, 10 Apr 2025 09:39:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77552] [PATCH v2 4/5] gnu: cbqn-bootstrap: 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.174429233722358 (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]: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 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 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-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