From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kHsaAnteq2FWaAAAgWs5BA (envelope-from ) for ; Sat, 04 Dec 2021 13:26:35 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id kIVvOXpeq2G3JwAAbx9fmQ (envelope-from ) for ; Sat, 04 Dec 2021 12:26:34 +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 F319332C69 for ; Sat, 4 Dec 2021 13:26:33 +0100 (CET) Received: from localhost ([::1]:44604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mtU7c-0001ca-I4 for larch@yhetil.org; Sat, 04 Dec 2021 07:26:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mtU7B-0001bq-Kl for guix-patches@gnu.org; Sat, 04 Dec 2021 07:26:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41507) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mtU78-0002Nu-9J for guix-patches@gnu.org; Sat, 04 Dec 2021 07:26:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mtU77-0002Eo-Sa for guix-patches@gnu.org; Sat, 04 Dec 2021 07:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Dec 2021 12:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52275 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Simen =?UTF-8?Q?Endsj=C3=B8?= , 52275@debbugs.gnu.org Received: via spool by 52275-submit@debbugs.gnu.org id=B52275.16386207518586 (code B ref 52275); Sat, 04 Dec 2021 12:26:01 +0000 Received: (at 52275) by debbugs.gnu.org; 4 Dec 2021 12:25:51 +0000 Received: from localhost ([127.0.0.1]:53053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtU6x-0002EP-FC for submit@debbugs.gnu.org; Sat, 04 Dec 2021 07:25:51 -0500 Received: from lepiller.eu ([89.234.186.109]:34150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtU6v-0002ED-FO for 52275@debbugs.gnu.org; Sat, 04 Dec 2021 07:25:50 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 69cfe497; Sat, 4 Dec 2021 12:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:in-reply-to:references:message-id:mime-version :content-type:content-transfer-encoding; s=dkim; bh=3JIIdIEjYSxn 03hyUHD6RrNlhmqB/zgLQV1tLlXpPFo=; b=m3a6eqXpzC8HD3TCVn1UJYLUdmth 7pv/Iw/la6xWfFpv9whJTyaAIy0fNzi+BWoUom8DCYHwDXb/kclWziCodkx+8Ac3 iW6wQp+a6ybpfgcepf1jKWI9F0txcr+vdBbxuRtX/gz3O2bSClZkP4L8UYG4OVLR /NmVXr/rqQDVKawIt5POcX0NJslN5u6r0cqickKlRdmzn/dVg1ovUUbMUXIQ755u UJI2OpPHdoGt1gZVW364Cn0b99Rxp/e8kVeUxzRAfhzbXSGjAbWPgDBOwXudQ9Lz bUBoY5vvYuyr0fvNfR/mQOnNVRGWOVMb+05+1iY2qLlBh3uefkyYK8+k2w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id c0a20e9b (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Sat, 4 Dec 2021 12:25:43 +0000 (UTC) Date: Sat, 04 Dec 2021 07:18:03 -0500 From: Julien Lepiller User-Agent: K-9 Mail for Android In-Reply-To: <87h7boefs3.fsf@gmail.com> References: <87h7boefs3.fsf@gmail.com> Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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" 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=1638620794; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=XYHRIpxJ8gst2P6vhd+simCVVlUOO7YPOPE1pafSfrM=; b=tyGmfZhndtrU41qEJcC563kII4/GEbZHrniM2bN4jta0G6SSa6znutOvsqzn572layuEem YNx+dqoufm4C0LxVimA8/O6Z0iHMfFkJjyTIr63Z56j7MlP+aMHNA4dQSsGr6hoQcar2Zs fIOKMjnyx79d7a0sBIxt9zgtb7yQ/z6xvm0rv+25oHp8WKFQB7PJI9H39L/c5Vb57nJkET EHec8xi0HBICA+MQHVrDxDobzU14QJCMt2liTFwNqWSqB/hSTO0NSg+Ex6urA5nsXmF/Xd KBVqBohyGSgqjkbv5qPtR4/YCnbgJ6XlgZD5GpmgklW6q/X5VIOAKe8xvvSlkQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638620794; a=rsa-sha256; cv=none; b=NLGggDgsZByZq1E/mNqNpwbPektglhg4Y8XNwtbpIVd10iCCG5yzsJksEYA6k66TWCwNX2 +zo/hbPNSpJFiopIOjsBgBrYDO6G+RKXyMHS/JWWpKLeGVoY2bukO0seQSNVfmABaDh0L0 pfLNwx77HolrZxRZFt5n2zptY8Dh3K2YEbxXJDmnoSHeR7dQsZvd87FkQGGZ2RlQK+cF61 v6fm7YT1DyinSxjG7ktnPG5pYn0d1oGJ6aXkm313BxcVUGK2CLuQ9CURKEyFrJkr199Pcq 6bFKoaBXkndI5d0V954DM7IiriiQd+zPOIzzgki5pCKWHKtIZsQDIhTJ4HLhRA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=m3a6eqXp; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); 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: -1.83 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=m3a6eqXp; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); 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: F319332C69 X-Spam-Score: -1.83 X-Migadu-Scanner: scn0.migadu.com X-TUID: UQUFqk/ojKFg Le 4 d=C3=A9cembre 2021 06:51:36 GMT-05:00, "Simen Endsj=C3=B8" a =C3=A9crit=C2=A0: > >* gnu/packages/syncthing=2Escm (syncthing): Update to 1=2E18=2E4=2E >--- > gnu/packages/syncthing=2Escm | 23 +++++++++++++++-------- > 1 file changed, 15 insertions(+), 8 deletions(-) > >diff --git a/gnu/packages/syncthing=2Escm b/gnu/packages/syncthing=2Escm >index 4deb60bee2=2E=2Ef524fec08e 100644 >--- a/gnu/packages/syncthing=2Escm >+++ b/gnu/packages/syncthing=2Escm >@@ -6,6 +6,7 @@ > ;;; Copyright =C2=A9 2020 Giacomo Leidi > ;;; Copyright =C2=A9 2021 Maxim Cournoyer > ;;; Copyright =C2=A9 2021 Arun Isaac >+;;; Copyright =C2=A9 2021 Simen Endsj=C3=B8 > ;;; > ;;; This file is part of GNU Guix=2E > ;;; >@@ -45,7 +46,7 @@ (define-module (gnu packages syncthing) > (define-public syncthing > (package > (name "syncthing") >- (version "1=2E16=2E1") >+ (version "1=2E18=2E4") > ; XXX After the go-build-system can use "Go modules", stop using bun= dled > ; dependencies for Syncthing=2E > (source (origin >@@ -55,7 +56,7 @@ (define-public syncthing > "/syncthing-source-v" version "=2Etar= =2Egz")) > (sha256 > (base32 >- "0m5k37sp3px8acs3y9an5wzy1wbcbdvqq74jy0pwzfk4bjbr999j"))= )) >+ "00kw1j2qi5ylbycv43n5177r3a3651qxhds927x6cz0a2b7qac8n"))= )) > (build-system go-build-system) > ;; The primary Syncthing executable goes to "out", while the auxilia= ry > ;; server programs and utility tools go to "utils"=2E This reduces = the size >@@ -87,12 +88,18 @@ (define-public syncthing > (delete-file "bin/syncthing") > (invoke "go" "run" "build=2Ego" "-no-upgrade" "build" "sy= ncthing")))) > >- (replace 'check >- (lambda* (#:key tests? #:allow-other-keys) >- (when tests? >- (with-directory-excursion "src/github=2Ecom/syncthing/syn= cthing" >- (invoke "go" "run" "build=2Ego" "test"))) >- #t)) >+ ;; Running tests currently fails=2E Get the message >+ ;; vendor/github=2Ecom/lucas-clemente/quic-go/internal/qerr/err= or_codes=2Ego:6:2: build constraints exclude all Go files in /tmp/guix-buil= d-syncthing-1=2E18=2E4=2Edrv-0/src/github=2Ecom/syncthing/syncthing/vendor/= github=2Ecom/lucas-clemente/quic-go/internal/qtls >+ ;; followed by two lines of `exit status 1`=2E >+ ;; Running on a non-guix has the same problem as for guix, but = the tests runs=2E >+ ;; We disable the tests for now >+ (replace 'check (lambda _ #t)) >+ ;; (replace 'check >+ ;; (lambda* (#:key tests? #:allow-other-keys) >+ ;; (when tests? >+ ;; (with-directory-excursion "src/github=2Ecom/syncthing/= syncthing" >+ ;; (invoke "go" "run" "build=2Ego" "test"))) >+ ;; #t)) > > (replace 'install > (lambda* (#:key outputs #:allow-other-keys) > >base-commit: 85ed37c170756bac78e4fd7fd83adba7e9537030 >-- >2=2E34=2E0 > > > Thanks for the patch! Why not use #:tests? #f instead of removing the whole test phase? With the= same comment before it=2E