From patchwork Fri Dec 10 17:13:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 35114 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 63B1827BBE9; Fri, 10 Dec 2021 17:20:15 +0000 (GMT) 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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,T_SPF_HELO_PERMERROR, 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 9336927BBEA for ; Fri, 10 Dec 2021 17:20:14 +0000 (GMT) Received: from localhost ([::1]:41368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvjZ7-0000uw-P5 for patchwork@mira.cbaines.net; Fri, 10 Dec 2021 12:20:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvjYw-0000tv-AN for guix-patches@gnu.org; Fri, 10 Dec 2021 12:20:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36295) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvjYw-0000Fl-0s for guix-patches@gnu.org; Fri, 10 Dec 2021 12:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvjYv-0006HF-Sc for guix-patches@gnu.org; Fri, 10 Dec 2021 12:20:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52310] [PATCH] Updated vlang to version 0.2 References: <20211205151434.5446-1-paren@disroot.org> In-Reply-To: <20211205151434.5446-1-paren@disroot.org> Resent-From: "(unmatched-parenthesis" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Dec 2021 17:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52310 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52310@debbugs.gnu.org Cc: "\(unmatched-parenthesis" Received: via spool by 52310-submit@debbugs.gnu.org id=B52310.163915675224040 (code B ref 52310); Fri, 10 Dec 2021 17:20:01 +0000 Received: (at 52310) by debbugs.gnu.org; 10 Dec 2021 17:19:12 +0000 Received: from localhost ([127.0.0.1]:47837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvjY8-0006Fg-Df for submit@debbugs.gnu.org; Fri, 10 Dec 2021 12:19:12 -0500 Received: from knopi.disroot.org ([178.21.23.139]:44184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvjY6-0006FV-8w for 52310@debbugs.gnu.org; Fri, 10 Dec 2021 12:19:11 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id EAE1D8FBC9; Fri, 10 Dec 2021 18:19:08 +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 UTF8SMTP id jVTW2q8QJKXN; Fri, 10 Dec 2021 18:19:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1639156415; bh=wNzoATM7KxyeZ+BbiwLfhk1sHmvvTx3K8nArFBwCB0Y=; h=From:To:Cc:Subject:Date; b=hTSQ4SkPmFEeQGhzJhlJNnQoxi/Zoc3TZWrQSuqwflJIMP+frIZAaEazRGkewPZC4 9846CdJX9CB0kXbmcUXWIVwhrjc9NvM/3+iLCx+hduwkoy/TWPo6eKPW8z20AiuZ/K MnRO1mdbxvaSAwwEflcECDXzNxJ3mfAMRdSZ8g550TFBYcc5joqUVbHU2KDeCchbXA XhyqQtGgKLCJzO7wYAP/9mm3iDmCRWbB4vB94XvL78oq1S3r/bz8jJhD99qBdeT7MN Qf6bvh/W7soe9PSk9sRmMpECOw0wEgGx8k4gVG7YDxUklI4NVduzK7PUwk4rr5y9uM iW6vQOxSCG2Jg== Date: Fri, 10 Dec 2021 17:13:25 +0000 Message-Id: <20211210171325.25863-1-paren@disroot.org> 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" Reply-to: "\(unmatched-parenthesis" X-ACL-Warn: , "\(unmatched-parenthesis via Guix-patches" X-Patchwork-Original-From: "\(unmatched-parenthesis via Guix-patches" via From: "\\(" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/vlang.scm | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm index def858da17..03bc18c240 100644 --- a/gnu/packages/vlang.scm +++ b/gnu/packages/vlang.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2021 (unmatched parenthesis ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,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 +35,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 +44,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 +55,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 +88,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 +115,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 +129,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)