From patchwork Mon Sep 26 19:12:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Rodriguez X-Patchwork-Id: 42995 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 5131927BBEA; Mon, 26 Sep 2022 20:15:14 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7D28C27BBE9 for ; Mon, 26 Sep 2022 20:15:13 +0100 (BST) Received: from localhost ([::1]:46088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1octZQ-0004Cp-KA for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 15:15:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1octXK-0001kp-QQ for guix-patches@gnu.org; Mon, 26 Sep 2022 15:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1octXK-0008Ka-Hh for guix-patches@gnu.org; Mon, 26 Sep 2022 15:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1octXJ-0004sx-U7 for guix-patches@gnu.org; Mon, 26 Sep 2022 15:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58100] [PATCH] gnu: cbqn: factor out singeli into derivative package. References: <878rm6hs4d.fsf@gmail.com> In-Reply-To: <878rm6hs4d.fsf@gmail.com> Resent-From: Christopher Rodriguez Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 19:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58100@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 58100-submit@debbugs.gnu.org id=B58100.166421955118739 (code B ref 58100); Mon, 26 Sep 2022 19:13:01 +0000 Received: (at 58100) by debbugs.gnu.org; 26 Sep 2022 19:12:31 +0000 Received: from localhost ([127.0.0.1]:51778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1octWp-0004sB-E9 for submit@debbugs.gnu.org; Mon, 26 Sep 2022 15:12:31 -0400 Received: from mail-qt1-f180.google.com ([209.85.160.180]:39567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1octWm-0004rx-7s for 58100@debbugs.gnu.org; Mon, 26 Sep 2022 15:12:30 -0400 Received: by mail-qt1-f180.google.com with SMTP id s18so4740485qtx.6 for <58100@debbugs.gnu.org>; Mon, 26 Sep 2022 12:12:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=dIS/y2rp7I65RhjjKzBiynavj4N6VWEdOUyUqxZWRLA=; b=NtIdCDCyPZZ1Gcubm3N6x5FUCBIScDUHXQdie9Gw7SiQyWrPIoTAFKWtyJGeZ7ZZXX L8mvIYeH772UYRzF8Vp7kpOdeKcUFr5YWagqIJ5Ayhj0+3If9RkFBOTEvre//tX5XVDo /jGRbt6LqyC01/XY3XJm0PvJoQr0/tfamzK8WyR3lvhCOoW0enhqnF83VnFjadVw8fCs Y1OxrbtbTkRjOwOn0xF1y9Ho6/XKNUZ8cxDSQMGdmZq89givFK1nhJZ036sTlWrKYjcW cNiA4zFDwuf67UrEQUc1iTZIQBPxUdZPWmqs2OuOEpkLUdSiRv5olXZ+BxhKhkKACeyg JxMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=dIS/y2rp7I65RhjjKzBiynavj4N6VWEdOUyUqxZWRLA=; b=pdn/1JlaMDWkDu++BQjWdq40HhT+jrCXvSBXa1lfkEYSX0a0ykr7h7yogAZpdYNcEL 1Ku9IPBHJ550a+L3qpgI+37siPdbo5VyCkfHOMTG88eThKUy7cnD/91/28UWdUWsrLTf 0boCsDbZs/bY63N6y3vNMvYClWI4pzjs74VXBrONKLJkudnzTCzyU6WHHBrkCav8Ut/k q/NdfWX2Hmr/J1bTuiW1KGNDy+bIbYu6GvJMD8fkmw+EKqYfYRo11kxBWL3K4fRT2ztV XBuwYbX+h+ZIkWE8lyD1YLB0K/ebMb/QYajMp4Dds+9NitirwD/YSA1HNc13329eSUk8 5ETA== X-Gm-Message-State: ACrzQf1JwsFsb+gYGiAVEH2m8A6iXBijxfhTEPYbEkf4V2V9zMV9VRMH Nj1UBBNoYk6nTW/v+aJluAOHQZhzqs+igw== X-Google-Smtp-Source: AMsMyM4L39zDGEuZZ+WpOBW1sPYUKcKI2OindhJfUukQSG4ScwdI+S8ByWlbNjJu+pMBe94ccp/EWQ== X-Received: by 2002:a05:622a:1a1b:b0:35c:d51b:505b with SMTP id f27-20020a05622a1a1b00b0035cd51b505bmr20269298qtb.308.1664219542395; Mon, 26 Sep 2022 12:12:22 -0700 (PDT) Received: from gmail.com (ec2-44-193-142-136.compute-1.amazonaws.com. [44.193.142.136]) by smtp.gmail.com with ESMTPSA id a3-20020a05622a02c300b0035d430d4315sm1944280qtx.19.2022.09.26.12.12.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 12:12:21 -0700 (PDT) From: Christopher Rodriguez Date: Mon, 26 Sep 2022 15:12:12 -0400 Message-Id: <20220926191212.30609-1-yewscion@gmail.com> X-Mailer: git-send-email 2.37.3 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" X-getmail-retrieved-from-mailbox: Patches Persuant to a recent conversation[1] with upstream, I've factored the AVX2-dependent builds into their own package (defaulting to a generic build instead). + gnu/packages/bqn.scm: cbqn-singeli ~ gnu/packages/bqn.scm: cbqn: changed make flags, inputs, and commit. --- gnu/packages/bqn.scm | 45 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index c4e0f39efb..56705beede 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -126,7 +126,7 @@ (define bqn-sources (define cbqn-bootstrap (let* ((revision "1") - (commit "9c1cbdc99863b1da0116df61cd832137b196dc5c")) + (commit "bd823839feaf42af4013e5a245981f58f563e659")) (package (name "cbqn-bootstrap") (version (git-version "0" "1" commit)) @@ -138,7 +138,7 @@ (define cbqn-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0w38fhwf20drkyijy6nfnhmc5g5gw0zmzgmy1q605x57znlj85a2")))) + "0735mixvpgp2g1jsmbg7aaw35r4xs348y7djkwdvb0193ais6xz2")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;skipping tests for bootstrap @@ -182,12 +182,9 @@ (define-public cbqn (name "cbqn") (outputs '("out" "lib")) (arguments - (list #:make-flags '(list "shared-o3" "o3n-singeli") + (list #:make-flags '(list "shared-o3" "o3") #:phases #~(modify-phases %standard-phases (delete 'configure) - (add-before 'build 'link-singeli - (lambda* (#:key inputs #:allow-other-keys) - (symlink #+singeli-sources "Singeli"))) (add-before 'build 'generate-bytecode (lambda* (#:key inputs #:allow-other-keys) (system (string-append #+dbqn @@ -222,3 +219,39 @@ (define-public cbqn libffi clang-toolchain linux-libre-headers)))) +(define-public cbqn-singeli + (package + (inherit cbqn) + (name "cbqn-singeli") + (outputs '("out")) + (arguments + (list #:make-flags '(list "singeli=1 f='-mavx2 -mbmi2 -O3' c") + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'link-singeli + (lambda* (#:key inputs #:allow-other-keys) + (symlink #+singeli-sources "Singeli"))) + (add-before 'build 'generate-bytecode + (lambda* (#:key inputs #:allow-other-keys) + (system (string-append #+dbqn + "/bin/dbqn ./genRuntime " + #+bqn-sources)))) + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (system (string-append "./BQN -M 1000 \"" + #+bqn-sources + "/test/this.bqn\"")) + (map (lambda (x) + (system (string-append "./BQN ./test/" x + ".bqn"))) + '("cmp" "equal" "copy" "random"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((bin (string-append (assoc-ref outputs + "out") + "/bin"))) + (mkdir-p bin) + (copy-recursively "BQN" + (string-append bin "/bqn")))))))))) + From patchwork Sat Oct 22 18:25:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 44009 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 AA83D27BBEA; Mon, 24 Oct 2022 05:42:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 4150C27BBE9 for ; Mon, 24 Oct 2022 05:42:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjnU-0008Gs-Eu for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 18:50:24 -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 1omLzK-000091-S3 for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omLzK-0002Vm-Jr for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omLzK-0006jT-Ee for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58100] [PATCH v2 2/8] gnu: Remove singeli-sources. References: <878rm6hs4d.fsf@gmail.com> In-Reply-To: <878rm6hs4d.fsf@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Oct 2022 21:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58100@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 58100-submit@debbugs.gnu.org id=B58100.166647385025756 (code B ref 58100); Sat, 22 Oct 2022 21:25:02 +0000 Received: (at 58100) by debbugs.gnu.org; 22 Oct 2022 21:24:10 +0000 Received: from localhost ([127.0.0.1]:42480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyT-0006hJ-SK for submit@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:10 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:34369) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyM-0006fu-Vb for 58100@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:05 -0400 Received: by mail-ed1-f67.google.com with SMTP id w8so15888803edc.1 for <58100@debbugs.gnu.org>; Sat, 22 Oct 2022 14:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:cc:to:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=iIF8WRaXxPiO3RXRdAP/LClwy394cbTln5nlzAzMWzQ=; b=JG6I7Y9RfSgN/P+XDyFBewbggVxEmOkszqpBjpL/CozQnXYKmkxICx1cXp0tl/mqH1 6NRuoEOYr3EbY7REoiNtajevhzeVgvzUQ60H4hx9bhc6PnS/zLeojCeie8f33REvzQvy 1KLbuFU3pJICEKZwcPeG8+AoTZqLbTZ+D/UJzM9EyxH2TBN3WeLG5GkAx5c6crUIyZvQ wuxEdw3cnXx5kyUufW7rcu23+CMgtTKcrOcWfR3EPF83zSDlKgxOYAxfoqJ2Ji3HW2V4 KSU0o1jYgkfMNj4DtZWj+myrJ2EPyuO5otf7ecpqUe2PMC7xto6fzskOJjc+ZTeP2XMp r4Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:cc:to:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iIF8WRaXxPiO3RXRdAP/LClwy394cbTln5nlzAzMWzQ=; b=pn3nMweRqUreTZUNpSqTDVgj0RY8+ftJ/IYtWiijjrjWESjjOM/sCXT+TxynmgqPiE MrJt3bEmpA5TBmy5HIeV7yN29UMul+dHkFH9FxJqdO/InohAeJmxk5SiB9UfkxlnebNS UsgR+BNWsEfn4cZonQW449LabsMz2yacUFpbItd5ODgTK6En6Qo8MgJ5CcyzQpRQn2RS z64a5e1GThTdBXeURKES8y9nY07k4faGtDmC9SfS1XvssAufv0XnlgG45mB0CGFsdYNz tn4Ri4GxLWBZ5vIwhEK+/GT6sZrKyAjEl6q8sWNslXBY4B79QB3be72aeeQRqD7FgzPJ UNkw== X-Gm-Message-State: ACrzQf3OFMBmpvf1vBJwNxSb+FB57WaIZ3nvH3dZ+gEbSB3W+F+200nJ JcnVk4okXB2E+CVPdZtY86VvKTio/yM= X-Google-Smtp-Source: AMsMyM5Z20ZfnNUnV7K5mXWLyjJ2QFO2G5XmkAbW+nMewIPGEHvLjPA0wvJjvjfrCag2bPdWvins6A== X-Received: by 2002:a17:907:80b:b0:77a:86a1:db52 with SMTP id wv11-20020a170907080b00b0077a86a1db52mr22031655ejb.294.1666473837322; Sat, 22 Oct 2022 14:23:57 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kv20-20020a17090778d400b0078d261f9f44sm13313506ejc.224.2022.10.22.14.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 14:23:56 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 22 Oct 2022 20:25:41 +0200 Message-ID: <2ac3a9fa2bb4acf33edab88639f68484a767a7d2.camel@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" X-getmail-retrieved-from-mailbox: Patches They aren't currently used to build a package, nor a package themselves. * gnu/packages/bqn.scm (singeli-sources): Delete variable. --- gnu/packages/bqn.scm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 02f539bb8b..be634d6dfb 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -165,17 +165,6 @@ (define cbqn-bootstrap (home-page "https://mlochbaum.github.io/BQN/") (license license:gpl3)))) -(define singeli-sources - (let ((commit "fd17b144483549dbd2bcf23e3a37a09219171a99")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mlochbaum/Singeli") - (commit commit))) - (file-name (git-file-name "singeli-sources" commit)) - (sha256 - (base32 "1rr4l7ijzcg25n2igi1mzya6qllh5wsrf3m5i429rlgwv1fwvfji"))))) - (define-public cbqn (package (inherit cbqn-bootstrap) From patchwork Sat Oct 22 18:28:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 44091 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 A60FD27BBEA; Mon, 24 Oct 2022 07:58:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6796427BBE9 for ; Mon, 24 Oct 2022 07:58:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjnh-0008KY-TV for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 18:50:37 -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 1omLzL-00009I-Q0 for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omLzL-0002dJ-Gb for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omLzL-0006jj-BH for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58100] [PATCH v2 3/8] gnu: cbqn-bootstrap: Use let-bound revision. References: <878rm6hs4d.fsf@gmail.com> In-Reply-To: <878rm6hs4d.fsf@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Oct 2022 21:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58100@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 58100-submit@debbugs.gnu.org id=B58100.166647385125770 (code B ref 58100); Sat, 22 Oct 2022 21:25:03 +0000 Received: (at 58100) by debbugs.gnu.org; 22 Oct 2022 21:24:11 +0000 Received: from localhost ([127.0.0.1]:42484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyU-0006hU-JY for submit@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:10 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:46916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyN-0006fw-LK for 58100@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:05 -0400 Received: by mail-ed1-f68.google.com with SMTP id m15so18125706edb.13 for <58100@debbugs.gnu.org>; Sat, 22 Oct 2022 14:24:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:cc:to:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=r2kN09s0R7Wg9TR3SShwWtIFRj+9Wj3ppcRC9v1K8FU=; b=FKB/z4LTkuASzhnYbPzdXwJUaVGPA0ByzTHIl1yYhuSKY/QcarKMAZdAOR28M/TFvO iRk/CjMrNZ7wAIoRD8UPNfpcd39mWmQjksWCZYHR7TiQaDYt5GxPiVm+T4Whl8IieLjL 5bAnpnx53wV7AIw4HTZTFIAHA05jyF1jgyVxaEhGnOpfKjYAdtazYQg0YkiVo1wNAT85 EV5adZi/FYtipcQh9ZIwYdFMTTvBPM6xFYT28IWU8bJ/X/brpichS6xSxBRcPxshxp7o HkWOJx/bsQOGT0bX0dJ3ECNIvz4gJu0kpvRS+8MwnHtG1bSZj3DHqA4iX1xAJQ7dNL26 QR/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:cc:to:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=r2kN09s0R7Wg9TR3SShwWtIFRj+9Wj3ppcRC9v1K8FU=; b=ydg4qi3a3lbFlgjMlxD9Wl/dY+YLtD3TDkNjuEjp+hB5zyBZ/p5tlubOeQXk8Ln28f khM8tBR9J4M0Nj3bjlL5hX8XMiZRkpQpVcOJHkROQ+019a6uj67xmAtbbVUBooknqpyn 2BQHf+4qQ/017zisLkG/mG7Eg33kXY2ODXezJgR8NZVxqWZKOVLU+Q9suR6mV9x6Wy7U KmXo8hsGkjnXY0ysWAQ00yZG3e4donTKXcSnXkTPpxpd6L5MlpuMS8R0P82xgGeg6tkC g2OFhD2Uia5mnYYASeYKe7RHza+bIve628tZaH6taC9BmVH69NOWZ2RB0zIpLCv6qv2y JLTA== X-Gm-Message-State: ACrzQf0KizxyMId44J7Zs/yht0JkiDM58shv5SU4Nf61Yj4n/pWNh1v6 Bo2QcFI3YST4dVGl1eww0LW7rp0NbsQ= X-Google-Smtp-Source: AMsMyM5t19BbMGkOICnpV0n8VksWo4q5oa67RDqKwF5wolbF2ZJiDbTxqCz71+LJblBlbsyVuvzYTw== X-Received: by 2002:a17:906:9746:b0:798:baec:3a80 with SMTP id o6-20020a170906974600b00798baec3a80mr11510804ejy.610.1666473838054; Sat, 22 Oct 2022 14:23:58 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kv20-20020a17090778d400b0078d261f9f44sm13313506ejc.224.2022.10.22.14.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 14:23:57 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 22 Oct 2022 20:28:00 +0200 Message-ID: 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bqn.scm (cbqn-bootstrap)[version]: Use let-bound revision. --- gnu/packages/bqn.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index be634d6dfb..8a1b1dfba2 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -129,7 +129,7 @@ (define cbqn-bootstrap (commit "9c1cbdc99863b1da0116df61cd832137b196dc5c")) (package (name "cbqn-bootstrap") - (version (git-version "0" "1" commit)) + (version (git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference From patchwork Sat Oct 22 18:34:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 43825 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 066ED27BBEA; Mon, 24 Oct 2022 00:59:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 5805527BBE9 for ; Mon, 24 Oct 2022 00:59:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjnb-0008JP-89 for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 18:50:31 -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 1omLzL-00009B-Ax for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omLzL-0002Zt-31 for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omLzK-0006jc-Sw for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58100] [PATCH v2 4/8] gnu: cbqn: Rewrite in terms of cbqn-bootstrap. References: <878rm6hs4d.fsf@gmail.com> In-Reply-To: <878rm6hs4d.fsf@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Oct 2022 21:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58100@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 58100-submit@debbugs.gnu.org id=B58100.166647385025763 (code B ref 58100); Sat, 22 Oct 2022 21:25:02 +0000 Received: (at 58100) by debbugs.gnu.org; 22 Oct 2022 21:24:10 +0000 Received: from localhost ([127.0.0.1]:42482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyU-0006hM-6O for submit@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:10 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:44999) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyO-0006fy-5i for 58100@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:05 -0400 Received: by mail-ed1-f66.google.com with SMTP id a5so5099294edb.11 for <58100@debbugs.gnu.org>; Sat, 22 Oct 2022 14:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:cc:to:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=ogHvUmLOKA9T7/2kSx7gLAcVn3GjZ8gn+JV8lP+q2hI=; b=WtpOAW6sts9Khmblt/cLjT+AoKTtiF4yIDE5upbx4mCGU4PKRjXJXJFLbyUrOmu3Wq J+xSbu9aHnnAHlLAe8PcXUJ0/5Jcp7gG2SPylYoMHCWRRIhWjEd3H1G6zHIlAEx3NafP lTYMLiphySeG//wrpAz74oeoGvIVYrYblYIm2cIXYcRG/WLuhBy0XFg4NLTYk2WCxc1r tqgjYj6vWJ3v9qoRCkLFAU32efsKIE5FsmTQWLbd3FFr6v9JRIq93eNAMWbKYnnbX4sx KoNaYKHIsNodWBGA6+3ru52a4GgozWuy4A6AlBBZw0pCJK6u8NcA+N7jsck/T22VqCYt FJSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:cc:to:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ogHvUmLOKA9T7/2kSx7gLAcVn3GjZ8gn+JV8lP+q2hI=; b=c/Ht8T/GLlv9le+1AfrnVjP3/4pxO2PWcy0lH7RdMTF0LXAP+S3Ahi/fGsZujctcOn WjzTSo4u+jpTC46Ilk4BHPLj1HMUSUpK8odSMgVOq4j9lJtme4oiLWiTA+m+sz+lqxe2 zSINFnkuHBvSbcX9KzM67QhqB5f4MJxEjopIUIZytd79+gltf2WpYfLq6Uy2B4qIVZRe Ta8MwdG6ZuYTXUoN7GE3ehBql58xSI9QTyWPNF6q9G2DT5mGWYH1gCzvimN3cP0JcaRr Bo0OYy04+a82qP50LWbm14HmIWrEh2oO7bqeIBIkArFi1WyKuJCyO7DCbFm1yJ8gMPMO qygw== X-Gm-Message-State: ACrzQf3N99mefAMSpie7Qc2E49Icm1fLIDgY3WAMNhlesYdRaXgtCyfQ lCK0UdVdPIVuJnfANEq0mWnMouJSGMs= X-Google-Smtp-Source: AMsMyM6Ef2lThzxScjytyeMFOrgWxKsTWPX7MkdDwUPLC7rZPa34VRyKYCpsAYkYEueTS8Dc+tQzXQ== X-Received: by 2002:a05:6402:5ca:b0:445:c80a:3c2 with SMTP id n10-20020a05640205ca00b00445c80a03c2mr23740307edx.247.1666473838693; Sat, 22 Oct 2022 14:23:58 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kv20-20020a17090778d400b0078d261f9f44sm13313506ejc.224.2022.10.22.14.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 14:23:58 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 22 Oct 2022 20:34:37 +0200 Message-ID: <69d947544bdbcec3c1eb06ff349c7b467b5b759b.camel@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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bqn.scm (cbqn)[arguments]: Use substitute-keyword-arguments to preserve options from cbqn-bootstrap. --- gnu/packages/bqn.scm | 59 +++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 8a1b1dfba2..bc714c3d49 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -171,37 +171,34 @@ (define-public cbqn (name "cbqn") (outputs '("out" "lib")) (arguments - (list #:make-flags '(list "shared-o3" "o3") - #: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 'check - (lambda* (#:key inputs tests? #:allow-other-keys) - (when tests? - (system (string-append "./BQN -M 1000 \"" - #+bqn-sources - "/test/this.bqn\"")) - (map (lambda (x) - (system (string-append "./BQN ./test/" x - ".bqn"))) - '("cmp" "equal" "copy" "random")) - (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"))) - (mkdir-p bin) - (copy-recursively "BQN" - (string-append bin "/bqn")) - (install-file "libcbqn.so" lib))))))) + (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 + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (system (string-append "./BQN -M 1000 \"" + #+bqn-sources + "/test/this.bqn\"")) + (map (lambda (x) + (system (string-append "./BQN ./test/" x + ".bqn"))) + '("cmp" "equal" "copy" "random")) + (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"))) + (mkdir-p bin) + (copy-recursively "BQN" + (string-append bin "/bqn")) + (install-file "libcbqn.so" lib)))))))) (native-inputs (list dbqn bqn-sources libffi From patchwork Sat Oct 22 18:43:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 43823 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 84C8927BBEA; Mon, 24 Oct 2022 00:47:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=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 1F1A827BBE9 for ; Mon, 24 Oct 2022 00:47:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjnJ-0008F0-BQ for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 18:50:13 -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 1omLzK-00008p-IR for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omLzK-0002Tv-7V for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omLzK-0006jL-22 for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58100] [PATCH v2 5/8] gnu: cbqn: Build using GCC. References: <878rm6hs4d.fsf@gmail.com> In-Reply-To: <878rm6hs4d.fsf@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Oct 2022 21:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58100@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 58100-submit@debbugs.gnu.org id=B58100.166647384925747 (code B ref 58100); Sat, 22 Oct 2022 21:25:02 +0000 Received: (at 58100) by debbugs.gnu.org; 22 Oct 2022 21:24:09 +0000 Received: from localhost ([127.0.0.1]:42478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyT-0006hD-Ht for submit@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:09 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:45000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyO-0006g1-Q3 for 58100@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:05 -0400 Received: by mail-ed1-f66.google.com with SMTP id a5so5099349edb.11 for <58100@debbugs.gnu.org>; Sat, 22 Oct 2022 14:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:content-transfer-encoding:cc:to:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=5sNtfDpQowE6Xt69ySjOqdSUS381689VwhJ1xxYpPVg=; b=OI0p+Q40qFRuC954pTske7KO5k+8YOr64UAlZIS/B4Zi0n46s/GMCzvIb3DdNPQwUe O4Pls3+alz6pjao70jHmNK+mnwxuKiIl3u3WvSwpRIFQvobd0RXuR/KHwQ6pMGF2tfum 0iXp1R4DfaGUJK+Oz/N71Rxams3qo5sGLZPikWrhtzM10H7B4Lbw9uHpW9YWt/6gEGsH Zg6MlY/hZtFV0JfXM+SKsdU64aLdweW0TPkoBC9e+Pvg+qfEeXkiwmlyk4q/8pXSLei/ 1gaUmjqpELLVTp1yxXe3ymgRo+DSaFMkC7hdTJIf051ER305G9pon7KpthfgSEAsd30E HfJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:content-transfer-encoding:cc:to:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5sNtfDpQowE6Xt69ySjOqdSUS381689VwhJ1xxYpPVg=; b=6M2Ae3tdD5JnYG+n/z1zKWW+EwBccQ/VfCZHkonTcFDlEAvFS77iBCGbV8PyYsP35F WBCw5Eynx/6ifKAANatfB85uWLXHL3JeIBEaTzyWhDmpgbSEbUC8A+9iKo6jdD2tXECs Jr8A5JSlNN9Nac9kT7/dlU3fcvX/qJLBIDYRBMnA5DFF66zGroSoorAx1l0cRghip/Ct p25pBUjXoQx1yWC0KFMjWRpPlE5eCdvgME6ubmdVOJKfhyrTzXLF3bir1be7b4iLFTFJ kBMFTyNxkmBP8IjWjHmHz8MMpAWyA9kbbfWEa6V84n48KdP9HnhckNIJIf+/NDIbSpbq QkmA== X-Gm-Message-State: ACrzQf2fYsZ5c1qTzZ1TtTqELUFLpH27UFOEYCe/ZZt8BsLHxF3G11F6 XHaz83T3lw0WQ4+sh/G15Xl0OXLg9bw= X-Google-Smtp-Source: AMsMyM6bTcb9JDR+NaehYtyxeq4S+bzkOZb9oGWpiLZMcm/EHdubZpLf+vbyEgimgSoq/2WZLXGiNg== X-Received: by 2002:a17:907:6d27:b0:78d:46f6:c59e with SMTP id sa39-20020a1709076d2700b0078d46f6c59emr21245949ejc.30.1666473839359; Sat, 22 Oct 2022 14:23:59 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kv20-20020a17090778d400b0078d261f9f44sm13313506ejc.224.2022.10.22.14.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 14:23:59 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 22 Oct 2022 20:43:05 +0200 MIME-Version: 1.0 Message-ID: <943f0bc6e7e697f5d02d18e8d6fe0931dc8ff196.camel@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bqn.scm (cbqn-bootstrap, cbqn)[#:make-flags]: Set CC via ‘cc-for-target’. [inputs]: Remove clang-toolchain. --- 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 bc714c3d49..fcf2e98bc7 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -142,6 +142,7 @@ (define cbqn-bootstrap (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 @@ -156,7 +157,7 @@ (define cbqn-bootstrap (copy-recursively "BQN" (string-append #$output "/bin/bqn"))))))) - (native-inputs (list dbqn clang-toolchain bqn-sources)) + (native-inputs (list dbqn bqn-sources)) (inputs (list icedtea-8 libffi)) (synopsis "BQN implementation in C") (description "This package provides the reference implementation of @@ -202,5 +203,4 @@ (define-public cbqn (native-inputs (list dbqn bqn-sources libffi - clang-toolchain linux-libre-headers)))) From patchwork Sat Oct 22 18:59:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 44046 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 C3F3627BBEA; Mon, 24 Oct 2022 06:43:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8943627BBE9 for ; Mon, 24 Oct 2022 06:43:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjoo-0000Dl-CT for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 18:51:46 -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 1omLzM-0000AE-QL for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omLzM-0002fF-JT for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omLzM-0006k5-De for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58100] [PATCH v2 6/8] gnu: dbqn: Install regular files rather than copying them recursively. References: <878rm6hs4d.fsf@gmail.com> In-Reply-To: <878rm6hs4d.fsf@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Oct 2022 21:25:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58100@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 58100-submit@debbugs.gnu.org id=B58100.166647387625829 (code B ref 58100); Sat, 22 Oct 2022 21:25:04 +0000 Received: (at 58100) by debbugs.gnu.org; 22 Oct 2022 21:24:36 +0000 Received: from localhost ([127.0.0.1]:42491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyl-0006iM-KB for submit@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:36 -0400 Received: from mail-lj1-f171.google.com ([209.85.208.171]:37573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLya-0006hr-Rm for 58100@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:17 -0400 Received: by mail-lj1-f171.google.com with SMTP id by36so8214311ljb.4 for <58100@debbugs.gnu.org>; Sat, 22 Oct 2022 14:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:content-transfer-encoding:cc:to:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=zzUWV6vER4L8eL8cja65Q7mPjPo4IS7tCCES0JFAMuM=; b=Ih2LWkDP1CJdsGceUVbkwFqqlafuQSOqxEDZtUkOCKfqk8JjvO4wBcCIq81I0TI6DT kq1+KNTTPT7tXipVgKBGbNKQdr5iAxsgjhQ/L/rPxpfNlui1w+hHiZvMUdMkeMk62ilp 0diUz9RCptu+S8/b5czHtvu3P7N/lM85GRm5W+tLiW8MzjJCN3BiYq/bm6KOxADvVIZq ZgR6ahTngT7AN5P46T8r5cY5iSvWKl/6+q+sxp80xajcVgxSb7JZBycqqtHhfECak8+N M/udqgK9/NTHjXkeN3/hhEz1UyDif6kUwZQ9gnqfC7BB1c6j1ls11R1naIfEji7Lafhd efxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:content-transfer-encoding:cc:to:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zzUWV6vER4L8eL8cja65Q7mPjPo4IS7tCCES0JFAMuM=; b=wbyZWnnGNXAbp15sP+qBlwVkCUphu65+s/pXRO8w6M898CQ5Bbl2RLv+pxgDyhL103 olcn//QQiEl0jKQtgUJU8uu14qo8ORZNBCfGOSCnIpGY1Nh8bl9pO1Pn+xsmVMD+JSBw W1uxJCWdEB/HnaeNJZxmOf/NNiaKlFAM1gapy8tpK7QQMcR1UWvrcFqBgUiuo1XQ2kPx 0NXP+BUbdlClcYn9vtHinzJR8GkjSx5gTn2mDM8DxJX3K0F+V9/Y1tmZdzATBpk0wnzk 8FnU8LL/Twpb8Hj4aOnfd8dGmO0gY/YU7h5ewyE8XSBCqGZTVmSKVfEEztJvZwiMtWsm PNtA== X-Gm-Message-State: ACrzQf1EXYwVqXBWpjgCJZZ8NU3NqI9fjLfkbwVzaJBERhEqozWB9DJv ue20Ynf/l39hJd0FCiGnTMIOljAqnQc= X-Google-Smtp-Source: AMsMyM678kmJaN/ZIXP3M+aexMbRQ7r1YfUWReezRIdokgjg7mcoplVI8opxcQGpcnfKHxUTOcshAg== X-Received: by 2002:a17:906:99c2:b0:78d:b5cf:419e with SMTP id s2-20020a17090699c200b0078db5cf419emr21541713ejn.673.1666473839994; Sat, 22 Oct 2022 14:23:59 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kv20-20020a17090778d400b0078d261f9f44sm13313506ejc.224.2022.10.22.14.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 14:23:59 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 22 Oct 2022 20:59:49 +0200 MIME-Version: 1.0 Message-ID: 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bqn.scm (dbqn)[#:phases]: Use ‘install-file’ rather than ‘copy-recursively’ for “dbqn”. --- gnu/packages/bqn.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index fcf2e98bc7..700175db16 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -92,9 +92,8 @@ (define-public dbqn (dest-jar (string-append out "/share/java"))) (mkdir-p dest-bin) (mkdir-p dest-jar) - (copy-recursively "BQN" - (string-append dest-bin - "/dbqn")) + (rename-file "BQN" "dbqn") + (install-file "dbqn" dest-bin) (install-file "BQN.jar" dest-jar) (substitute* (string-append dest-bin "/dbqn") (("BQN.jar") From patchwork Sat Oct 22 19:01:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 43869 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 D94A327BBEA; Mon, 24 Oct 2022 03:06:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=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 4469527BBE9 for ; Mon, 24 Oct 2022 03:06:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjoc-0008RM-07 for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 18:51:34 -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 1omLzM-00009O-2g for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omLzL-0002f2-Rn for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omLzL-0006jq-Me for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58100] [PATCH v2 7/8] gnu: cbqn-bootstrap: Install regular files rather than copying them recursively. References: <878rm6hs4d.fsf@gmail.com> In-Reply-To: <878rm6hs4d.fsf@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Oct 2022 21:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58100@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 58100-submit@debbugs.gnu.org id=B58100.166647385125777 (code B ref 58100); Sat, 22 Oct 2022 21:25:03 +0000 Received: (at 58100) by debbugs.gnu.org; 22 Oct 2022 21:24:11 +0000 Received: from localhost ([127.0.0.1]:42486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyU-0006hb-St for submit@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:11 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:34374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyQ-0006g3-4M for 58100@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:06 -0400 Received: by mail-ed1-f66.google.com with SMTP id w8so15889061edc.1 for <58100@debbugs.gnu.org>; Sat, 22 Oct 2022 14:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:content-transfer-encoding:cc:to:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=Dib9ULOonmhfrMNzXx3dMPTXXH+NW2kIC76mWehjRLo=; b=FwE+nrQ1WazMd07pqEED9wSa9JjAt/oR9Ya7oSQPnZjXgPYEDhIhYOZdNAcKyuEr2U NJZdGHa9vfEmFUFgfO5JNrekEHt0Nj98b46xMcbygkSLLw+deS/7mctWgh/mpm4hxARL JqTcYnLJcSI7vR5NNktTlAt2Rf4ZiEgD8320cPb36p70SCbWabNyDJdgOBFFpvKVfy80 B5i+Oe3OZblu6HE/cAAobmVvSbQETxyrNEj9+jLalCXFa314hUhoIAmaw04yWJspzVTw +h9wm+hg1+CBXSNOx+G3wnBm+qEtxLXPIhlyHvgWMj8VTXouONDeJi/Y1vNMkU/3VTqS /8Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:content-transfer-encoding:cc:to:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Dib9ULOonmhfrMNzXx3dMPTXXH+NW2kIC76mWehjRLo=; b=sVbUA85igKVf4ojlE0CIbaO0pcIF8UPKj/elF/yyxRPcFFAgCYwCTrB4vNbuCmmn44 zXEWMNuGtN8k/ZjQH463PFCzEQEjqJNl2Z8tHgdLirmEzOI1z5MgjlS5YeSduTkUr4// YlGpS1fLfyEVFjVKBcWJi+QZLTUb6EHyA3wYpQkEyihwoCPYPRex+LMSY89H7cqHuCoQ y+j51a5cepzE5HbrOuzx2nDtqSm2eiM/1UKlp3bLW6Zm0ese4HuScOP2PZVvEDv8xNSR bCH7ZEj32KBQgXgT9BrxholXkOHLpWt6MkArkuPJn3kNn9le1Ui//jCW72p25IGtcxkb EtwQ== X-Gm-Message-State: ACrzQf2iesWEoG7aYDCzw4pswKfCdrWXlFrQLNjSCjH+ybTGtt5xf1Va 4Hqa7kYqGncbCB6my6EQ/gx6EaY+nB8= X-Google-Smtp-Source: AMsMyM5jN8dHEwM2W17svcv5i00cO7Qm/knu7WiBkhbOrFWRLXrU6FK3mInNA8mVUsmRdxre6XvXQA== X-Received: by 2002:a05:6402:518b:b0:45d:9a19:66d2 with SMTP id q11-20020a056402518b00b0045d9a1966d2mr23365431edd.43.1666473840658; Sat, 22 Oct 2022 14:24:00 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kv20-20020a17090778d400b0078d261f9f44sm13313506ejc.224.2022.10.22.14.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 14:24:00 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 22 Oct 2022 21:01:34 +0200 MIME-Version: 1.0 Message-ID: <8948ad36694f74da7604fd0451ded04e775cdbe8.camel@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bqn.scm (cbqn-bootstrap)[arguments]: Reindent. <#:phases>{install}: Use ‘install-file’ rather than ‘copy-recursively’ for “bqn”. --- gnu/packages/bqn.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 700175db16..2b59d5b6ac 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -140,22 +140,23 @@ (define cbqn-bootstrap "0w38fhwf20drkyijy6nfnhmc5g5gw0zmzgmy1q605x57znlj85a2")))) (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) - (copy-recursively "BQN" - (string-append #$output - "/bin/bqn"))))))) + (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") From patchwork Sat Oct 22 19:01:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 43839 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 6B08127BBEA; Mon, 24 Oct 2022 02:36:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 007FB27BBE9 for ; Mon, 24 Oct 2022 02:36:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjoi-0000B5-6C for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 18:51:40 -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 1omLzM-00009k-Ey for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omLzM-0002f7-7T for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omLzM-0006jy-2I for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58100] [PATCH v2 8/8] gnu: cbqn: Install regular files rather than copying them recursively. References: <878rm6hs4d.fsf@gmail.com> In-Reply-To: <878rm6hs4d.fsf@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Oct 2022 21:25:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58100@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 58100-submit@debbugs.gnu.org id=B58100.166647385125786 (code B ref 58100); Sat, 22 Oct 2022 21:25:04 +0000 Received: (at 58100) by debbugs.gnu.org; 22 Oct 2022 21:24:11 +0000 Received: from localhost ([127.0.0.1]:42488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyV-0006hi-8F for submit@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:11 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:33363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyQ-0006gM-SP for 58100@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:07 -0400 Received: by mail-ed1-f67.google.com with SMTP id a13so18264598edj.0 for <58100@debbugs.gnu.org>; Sat, 22 Oct 2022 14:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:content-transfer-encoding:cc:to:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=BsPOtdjiOcZSpv4S8qYywkHxykMhFTvA4FSJQd3ECIU=; b=RG4rny/HP0YV1qz0eufBj2cEx/CIbkyfLGoWQKdOkM+/xgHW+wKKBBozX+0HPeURcO rCBpSc9b4ecqT5QZ8yLvW5VdmYaKNqs2LhLBfFc1jW/bBCWjIdtG2XGRusbN+q1mqkHI QiOcZvrJ27q8hnJEg5saqcUSmHnNT449zIjvDDCUeUESq37n6/FffHbo0zo25dRg2ATF g4cP4c+kBQUaoYAC+XTAZpkUWZbkgU0s896CNJu56Lva0aO3SK5MXjiAtAy2MgC3yNgd SA0yKjmFVchDnjIWsa7h8WU7nnJExDK5dJr2YoF2KyHHMccyc7d62PL14Y+zHldhdLdg kpSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:content-transfer-encoding:cc:to:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BsPOtdjiOcZSpv4S8qYywkHxykMhFTvA4FSJQd3ECIU=; b=ighKw/a+9+C2v+kZCZsBiX8REDT+3zEsfNvsycflKafXFoxD2/foBHOTZWTNaq+ryW LffEBYl+wLNXhv7BfxB1DDC0WhvY6fue4TmCckB1NI0Jf0+S+GPY15E5VQFuCN9wF4f9 ldD2TKM6ZKuGAhShjkm1IF/rIuiNwPisKQK2EmoF63Bckgj2OPPE6/TsWzZNmrGzHOIl 3Nh6ed8eYUcTFhNg3uPZ+D2IyPcJHywb+vUlRJgZ92SweekYY5X8TP1csjchimeDiIaz d0MY681BXaOkL851ybINJXg4O7GkEijlzG4/81zQaKiIKnnEX0S4SddI4Xwt3pqVQxAT 0K7w== X-Gm-Message-State: ACrzQf3KnGS3N2oBcSlNN9axxgoq5cbL/nxEadJaBD5bA6pChQ3aOBuu oJGS4Sa17iz7vw5W/r+CKlbMfgu5ciM= X-Google-Smtp-Source: AMsMyM7YWd5TC1yGvo4EA5bLhKZNOSZAbuwMuPfg19D7Aa7iHVXKhjTKWslK+GpnyTeMh3MPWQCnqg== X-Received: by 2002:a17:906:8451:b0:78d:d467:55a4 with SMTP id e17-20020a170906845100b0078dd46755a4mr21054809ejy.352.1666473841291; Sat, 22 Oct 2022 14:24:01 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kv20-20020a17090778d400b0078d261f9f44sm13313506ejc.224.2022.10.22.14.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 14:24:01 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 22 Oct 2022 21:01:12 +0200 MIME-Version: 1.0 Message-ID: <691c381ee820cbb9c45f1056192682fa0e8354a2.camel@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bqn.scm (cbqn)[#:phases]: Use ‘install-file’ rather than ‘copy-recursively’ for “bqn”. --- 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 2b59d5b6ac..e2dc8f85dd 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -197,8 +197,8 @@ (define-public cbqn (lib (string-append (assoc-ref outputs "lib") "/lib"))) (mkdir-p bin) - (copy-recursively "BQN" - (string-append bin "/bqn")) + (rename-file "BQN" "bqn") + (install-file "bqn" bin) (install-file "libcbqn.so" lib)))))))) (native-inputs (list dbqn bqn-sources