From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0KhHCFMArWEL8wAAgWs5BA (envelope-from ) for ; Sun, 05 Dec 2021 19:09:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +NfgA1MArWEISQAAB5/wlQ (envelope-from ) for ; Sun, 05 Dec 2021 18:09:23 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AF1002DBE5 for ; Sun, 5 Dec 2021 19:09:22 +0100 (CET) Received: from localhost ([::1]:38630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mtvwv-0002WS-QW for larch@yhetil.org; Sun, 05 Dec 2021 13:09:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mtvwi-0001wE-IT for guix-patches@gnu.org; Sun, 05 Dec 2021 13:09:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mtvwi-00064m-AM for guix-patches@gnu.org; Sun, 05 Dec 2021 13:09:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mtvwi-0000Zj-5q for guix-patches@gnu.org; Sun, 05 Dec 2021 13:09:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52310] [PATCH] Updated vlang to version 0.2 Resent-From: "(unmatched-parenthesis" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Dec 2021 18:09:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52310@debbugs.gnu.org Cc: "\(unmatched-parenthesis" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16387276951920 (code B ref -1); Sun, 05 Dec 2021 18:09:07 +0000 Received: (at submit) by debbugs.gnu.org; 5 Dec 2021 18:08:15 +0000 Received: from localhost ([127.0.0.1]:59284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtvvq-0000Uo-OP for submit@debbugs.gnu.org; Sun, 05 Dec 2021 13:08:15 -0500 Received: from lists.gnu.org ([209.51.188.17]:45902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mttED-0002i2-Rl for submit@debbugs.gnu.org; Sun, 05 Dec 2021 10:15:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mttED-0001iO-ME for guix-patches@gnu.org; Sun, 05 Dec 2021 10:15:01 -0500 Received: from knopi.disroot.org ([178.21.23.139]:37486) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mttEB-0001yI-5R for guix-patches@gnu.org; Sun, 05 Dec 2021 10:15:01 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1C0558C20E; Sun, 5 Dec 2021 16:14:56 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YBykckH66Wvf; Sun, 5 Dec 2021 16:14:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1638717294; bh=q51nVeowuGlo79vx4y61zzfW3cSDGJHzmBX+I2DpDJI=; h=From:To:Cc:Subject:Date; b=DQoGWmrPcqPlTd2648rW62YvXFH4Pe+naF2fBPdAsWrdGg8sCaLb8IIyAInl+9IUs 8egtKWVp8JRTTh21EMvYoxFPfhXWM6P8RZrCDrQySGb+JV6h/CD/DGXjHSsIwYx7tr kx51Y3OV2mwdd3OVyfMz5HBHnr/Cxbw2Yko243RBf1gFXHGQ39wXZ9mtcqmnZtqb6J FnTRm2x6+fhAChaCwICrfmlUSkIfMvIN/j57u3H4MH84E7ZBy28YljEjuKckv6xi6F xlf8oEGcIsDr0OYvbkwU4Dxujn1ni+MJ4UlXIm58WIwwctJFq6sifVhj0UKfmFy0PV tnRt1Hw6eu5kw== Date: Sun, 5 Dec 2021 15:14:34 +0000 Message-Id: <20211205151434.5446-1-paren@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@disroot.org; helo=knopi.disroot.org 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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: "\(unmatched-parenthesis" X-ACL-Warn: , "\(unmatched-parenthesis via Guix-patches" From: "\(unmatched-parenthesis via Guix-patches" via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638727762; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=iI73TRZNFIuDZAWCJ4OCZVduMQqkhcyBZbD4berk9Ow=; b=nxUaRGPRGoLG+pVWcHl8wly51XWu92e/n2SORebQXyTjYGWbUNJyumTH+dAkASl80tpSIx Dl5ULOTTWcTsJgMTrTR4NEu3Sm76Ctoplvs/7dv2NByIr5nG4N/+N1QK7yVGYJT81DAReb LFTJg/aViCMpgHR/MoKDM375ZnNa1NoE+tK0CvYHv2wZaEKOlkIFpaRl6Un35Uqka2SYCE Yml1gbBMHlh+xU/PMHOnZTR0f+ce3flBk/gIeNKqAbQKwKslSWZcX5p9LWCJXwcwqWL7Uk bBmDyE/gdrVikUSFzG5GYBvCzrL1X76xa7QO8k8RqQPzOWKlpBHlf6dz0Eq2uA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638727762; a=rsa-sha256; cv=none; b=V2Atrip8K6G+cBO/tA5vre3ESvPbZ4oq+GdUERyY9fGHutdA3Q7PCLl/gsWcWDM9JXN+OL BXA6Me0UwNfG6fxiK5HB/Vp0kDBVHrnLBI5qBd4QsDx4tJHznqKkDUrZbMz3Yw9a1FMKZL m8MSLD1kbn0dUQe/+HfUFLvoRMyveUGmwDS2v+gPcXGCsEG/az4FHSI2bVKAKdCXTIxfUN 6IBzipN/b3t1ZXpqF1af6SwW2fWTPfPyySea2Xxa4RGPK/P0rfNpciaW/kfYdn3nc4qXDO 50r8FtgAQqsukaY28JyYP1ygCG9hpy73arYw/dv1PNJ3STniFEk4hbwWgnU7rA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=DQoGWmrP; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.14 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=DQoGWmrP; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: AF1002DBE5 X-Spam-Score: -3.14 X-Migadu-Scanner: scn0.migadu.com X-TUID: WYlATTavL1Ol This patch updates the V compiler/transpiler to version 0.2.4. It also fixes the `v help` command, which was broken with Guix's V 0.1 package because `v help` tries to look in `$PATH_TO_V_EXECUTABLE/cmd/v/help` for help .txt files, which were not present because Guix copies the `v` executable into `$V_STORE_LOCATION/bin` but does not copy the help directory. --- gnu/packages/vlang.scm | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm index def858da17..32909d34ca 100644 --- a/gnu/packages/vlang.scm +++ b/gnu/packages/vlang.scm @@ -23,6 +23,7 @@ (define-module (gnu packages vlang) #:use-module (gnu packages node) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) #:use-module (guix git-download) @@ -33,7 +34,7 @@ (define-module (gnu packages vlang) (define-public vlang (package (name "vlang") - (version "0.1.29") + (version "0.2.4") (source (origin (method git-fetch) @@ -42,7 +43,7 @@ (define-public vlang (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1rqi7cah5nq8aggrib9xvdpfjxq20li91svv0w9yny6nn1ag7snx")))) + (base32 "17wmjxssmg6kd4j8i6pgib452zzwvkyi3n1znd1jj3xkf2l92fw8")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -53,26 +54,30 @@ (define-public vlang "GITFASTCLONE=mkdir -p" "TCCREPO=" "VCREPO=" + (string-append "VFLAGS=-cc " ,(cc-for-target)) "VERBOSE=1") #:phases (modify-phases %standard-phases (delete 'configure) + (add-before 'build 'change-home + (lambda _ + (setenv "HOME" "/tmp") + #t)) (add-before 'build 'patch-makefile (lambda _ (substitute* "Makefile" - (("rm -rf") "true") - (("v self") (string-append "v -cc " ,(cc-for-target) " cmd/v"))) + (("--branch thirdparty-unknown-unknown") "") + (("rm -rf") "true")) #t)) (add-before 'check 'delete-failing-tests ;; XXX As always, these should eventually be fixed and run. (lambda _ (for-each delete-file - '("vlib/v/gen/x64/tests/x64_test.v" + '("vlib/os/notify/notify_test.v" + "vlib/v/doc/doc_private_fn_test.v" + "vlib/v/live/live_test.v" "vlib/v/tests/repl/repl_test.v" - "vlib/v/tests/valgrind/valgrind_test.v" - "vlib/v/tests/valgrind/strings_and_arrays.vv" - "vlib/v/tests/live_test.v" - "vlib/net/websocket/ws_test.v")) + "vlib/v/tests/valgrind/valgrind_test.v")) #t)) (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -82,21 +87,23 @@ (define-public vlang (mkdir-p bin) (symlink gcc (string-append bin "/cc")) (setenv "PATH" (string-append bin ":" (getenv "PATH"))) - (invoke "./v" "test-fixed"))) + (invoke "./v" "test-self"))) #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((bin (string-append (assoc-ref outputs "out") "/bin")) + (docs (string-append bin "/cmd/v/help")) (tools (string-append bin "/cmd/tools")) (thirdparty (string-append bin "/thirdparty")) (vlib (string-append bin "/vlib")) (vmod (string-append bin "/v.mod"))) (mkdir-p bin) (copy-file "./v" (string-append bin "/v")) - ;; v requires as of 0.1.27 that these other components are in the + ;; v requires as of 0.2.4 that these other components are in the ;; same directory. In a future release we may be able to move ;; these into other output folders. (copy-recursively "cmd/tools" tools) + (copy-recursively "cmd/v/help" docs) (copy-recursively "thirdparty" thirdparty) (copy-recursively "vlib" vlib) (copy-file "v.mod" vmod)) @@ -107,7 +114,7 @@ (define-public vlang `(("vc" ;; Versions are not consistently tagged, but the matching commit will ;; probably have ‘v0.x.y’ in the commit message. - ,(let ((vc-version "b01d0fcda4b55861baa4be82e307cca4834b1641")) + ,(let ((vc-version "5e876c1491db50b136499d3397b57b7c062040e5")) ;; v bootstraps from generated c source code from a dedicated ;; repository. It's readable, as generated source goes, and not at all ;; obfuscated, and it's about 15kb. The original source written in @@ -121,8 +128,8 @@ (define-public vlang (commit vc-version))) (file-name (git-file-name "vc" vc-version)) (sha256 - (base32 "052gp5q2k31r3lci3rx4k0vy0vjdjva64xvrbbihn8lgmw63lc9f"))))) - + (base32 "1gxdkgc7aqw5f0fhch1n6nhzgzvgb49p77idx1zj7wcp53lpx5ng"))))) + ("git" ,git-minimal) ;; For the tests. ("libx11" ,libx11) ("node" ,node) -- 2.34.0