From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id SBDbNbWUxWLd3QAAbAwnHQ (envelope-from ) for ; Wed, 06 Jul 2022 15:57:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id yD60NbWUxWJsZgAAauVa8A (envelope-from ) for ; Wed, 06 Jul 2022 15:57:09 +0200 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 4FCAE35FE0 for ; Wed, 6 Jul 2022 15:57:09 +0200 (CEST) Received: from localhost ([::1]:33450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o95We-0005rO-08 for larch@yhetil.org; Wed, 06 Jul 2022 09:57:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o95WY-0005r4-35 for guix-patches@gnu.org; Wed, 06 Jul 2022 09:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o95WX-000761-QJ for guix-patches@gnu.org; Wed, 06 Jul 2022 09:57:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o95WX-0005Pc-PV for guix-patches@gnu.org; Wed, 06 Jul 2022 09:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55612] [PATCH 0/2] Update guile-hall to 0.4.1. In-Reply-To: <20220524132642.14122-1-higashi@taiju.info> Resent-From: Taiju HIGASHI Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Jul 2022 13:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55612 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ricardo Wurmus Cc: 55612@debbugs.gnu.org Received: via spool by 55612-submit@debbugs.gnu.org id=B55612.165711581720788 (code B ref 55612); Wed, 06 Jul 2022 13:57:01 +0000 Received: (at 55612) by debbugs.gnu.org; 6 Jul 2022 13:56:57 +0000 Received: from localhost ([127.0.0.1]:54752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o95WT-0005PC-6b for submit@debbugs.gnu.org; Wed, 06 Jul 2022 09:56:57 -0400 Received: from mail-pl1-f177.google.com ([209.85.214.177]:41595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o95WO-0005Ox-7I for 55612@debbugs.gnu.org; Wed, 06 Jul 2022 09:56:55 -0400 Received: by mail-pl1-f177.google.com with SMTP id j12so6922838plj.8 for <55612@debbugs.gnu.org>; Wed, 06 Jul 2022 06:56:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=taiju-info.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:references:date:message-id:user-agent :mime-version; bh=yETEBbe8b2ARpRnaM/cTnavTEKH3CstlQw9NEco6viY=; b=RJn+8A5YE54SzoWrNJjZgTc58JTOi5i0D2PzR31apy5rxrL5TCo+u7EYsnIFvkaBTB JhEeQjewm8phkiSJuXRHGP6EaUOsyfv6qmbchH/5JDpV7M80PBgsO1e5I34tri3FyZFo TwsyjGclS5LOl7hdcgiujNlKY8lcH/TfVqn2D4Q18+vQA8k7F3LrTYgYO3tx5bPKDw8l +QOLyh6AtMx+EmNSszFBUqm4zx3TPcs2ci4fONqnGzSo6LMYMbGSSEkvYNH/rG/2524H DfYiSaVXcdAobB9RttgF58sSwP0g+HHzjjuDzgqOi1mBOVy+8TVNpfqmbKu9Yk11O/L3 rT3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:message-id :user-agent:mime-version; bh=yETEBbe8b2ARpRnaM/cTnavTEKH3CstlQw9NEco6viY=; b=i7ndDcMeH66iK9VcmPXLQ+Ik8UUcsLiN9blqr1IQAnwkFIFHYArPalksdcwNvYfyVT kk4qd2N/4VEAri6FVXMPwDNTIFxK3MdVQ2Zfa7eAX48g85ulVQ3DDnLj50tY8LOmIv1T h3gBQ6Hx3sp6KUa8GRL+HOj3V0YdEBzMAbScHk1THx58dk8n98b/txhzz6x/VcdByoGt N+wh2geV5GXQzDPQy5w6Dbzjwf1On507WiPJPH2piH4wCTtl/GPVvWIEfiluLnKcRuAT FVPd34AkoRWGM9caGa+5Hp2AA235jpZZXcjGTkf6s098AvTIvzNrA6zM9kzYkffwHlUd e7Kg== X-Gm-Message-State: AJIora/hhgQc2Bam0JiqRgOFnGc62uznuLKAm1ItFoxZ+YYTeLJLRIPW pnHnHZ2viEMbRxA/m5h+A6VcXNq7BpacNV/TkfPp6w== X-Google-Smtp-Source: AGRyM1tgGgWZUWohj74SO47dfTFW0rXijIg5aDceD5xUQEeG89SyGASukQFJqMaCsppI1VY3g+nlRA== X-Received: by 2002:a17:90b:388b:b0:1ed:406:492c with SMTP id mu11-20020a17090b388b00b001ed0406492cmr50448930pjb.31.1657115805997; Wed, 06 Jul 2022 06:56:45 -0700 (PDT) Received: from Taix ([240b:253:ec40:2400:b7d1:436e:2d61:e925]) by smtp.gmail.com with ESMTPSA id t9-20020a170902e84900b0016bc947c5b7sm10044319plg.38.2022.07.06.06.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 06:56:45 -0700 (PDT) From: Taiju HIGASHI References: <20220524132642.14122-1-higashi@taiju.info> <87mtdm1vl2.fsf@elephly.net> Date: Wed, 06 Jul 2022 22:56:43 +0900 Message-ID: <87bku2ibtw.fsf@taiju.info> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1657115829; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=yETEBbe8b2ARpRnaM/cTnavTEKH3CstlQw9NEco6viY=; b=HuQGzn3ZiNUarPLihhKkiJ+BGhutRPhL+Sj4MEIn68sWWT5nXmIFtTFoeo7C3GxRUjRguk JhXJoHKH5fqos+3EuvY/eKtMeIT8aAQ/wdDQgM4IHhMmit5sKrummFmRKGjcC0GBKYkNTt qHkGNd7MMeo8TjlQ18SviPAo1g+GiYSO2Idwn9v9SqqqOLAJ/D51Vnm1yCJO/vBEVZnXHv 0DHNbFB6ahlIKqb8L5RYmcPL3XayAIJGMpqaEOsmiZVkvyfK/6IKXR6muDwyNwI71LZ6QU 1C6L7LH76AaWbdSlibKtRZo+WFjE9089qLEv+x3mv5Xc/aiAy7kC8Ghc+XnDTA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1657115829; a=rsa-sha256; cv=none; b=dSqEgml4VQfqubre+EOcAs0BjCqM1p1YdHV6wXLCfWNMnDU0+bS9ZYKArUF2Qqq+CA+O0F SADdiVkxvaWt06kvAdptEOAjC+xlWTmWb2G81ySKWNOy6VUE//vILTXzeOLQ9NKtM7j7Gd 8VXec3BwJsl91zYqtw4/LUvSz6lScybE4eAXoGnA4uaNg01ZkDPa2FhfWJCB2mRNZPfA2Q geBFDu2TcjcmGI81C+PZ5mIGd13QwQDitjwFfqCBbJGEz6TqSR/qIjZnoS++pakH+VmhiS Nk9Cpnk5AhoInkwrtLrj1eC9qK/iLOuXZWeJsNbmMl615oxJKX82NRz41IUOJg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=taiju-info.20210112.gappssmtp.com header.s=20210112 header.b=RJn+8A5Y; dmarc=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.05 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=taiju-info.20210112.gappssmtp.com header.s=20210112 header.b=RJn+8A5Y; dmarc=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: 4FCAE35FE0 X-Spam-Score: 1.05 X-Migadu-Scanner: scn1.migadu.com X-TUID: 17DiSHpSatyE --=-=-= Content-Type: text/plain; charset=iso-2022-jp Hi Ricarod, > The GWL now supports guile-config 0.5.x. My apologies for the delay. > > Taiju Higashi, could you please update your patch so that it updates to > guile-config 0.5.1? Once ready I can apply it. Thanks! > > (The GWL should get a new release soon, but that shouldn’t block this > issue.) I sent the patch. However, the GWL build fails. I also made a patch for GWL package definitions. If there are problems with the GWL patch, please ignore this patch. --=-=-= Content-Type: text/x-patch; charset=iso-8859-1 Content-Disposition: attachment; filename=0001-gnu-gwl-Fix-build.patch Content-Transfer-Encoding: quoted-printable Content-Description: patch-for-gwl >From cc9ca4bfdf295affeeaba6422cbbd13e66332387 Mon Sep 17 00:00:00 2001 From: Taiju HIGASHI Date: Wed, 6 Jul 2022 22:48:59 +0900 Subject: [PATCH] gnu: gwl: Fix build. * gnu/packages/package-management.scm (gwl): Apply patches for newer versio= ns of guile-config * gnu/packages/patches/gwl-fix-build-guile-config-0.5.1.patch: Add the patc= h. --- gnu/packages/package-management.scm | 5 +- .../gwl-fix-build-guile-config-0.5.1.patch | 75 +++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gwl-fix-build-guile-config-0.5.1.p= atch diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index e485e34bca..3c82d847a6 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -21,6 +21,7 @@ ;;; Copyright =A9 2021, 2022 Maxim Cournoyer ;;; Copyright =A9 2021 John Kehayias ;;; Copyright =A9 2022 Zhu Zihao +;;; Copyright =A9 2022 Taiju HIGASHI ;;; ;;; This file is part of GNU Guix. ;;; @@ -1308,7 +1309,9 @@ (define-public gwl (uri (string-append "mirror://gnu/gwl/gwl-" version ".tar.gz= ")) (sha256 (base32 - "0sgaaq430l3dqmqqiikfb0ilxnd2cq28626y18kxx5c781qwpys9")))) + "0sgaaq430l3dqmqqiikfb0ilxnd2cq28626y18kxx5c781qwpys9")) + (patches + (search-patches "gwl-fix-build-guile-config-0.5.1.patch"))= )) (build-system gnu-build-system) (arguments `(#:parallel-build? #false ; for reproducibility diff --git a/gnu/packages/patches/gwl-fix-build-guile-config-0.5.1.patch b/= gnu/packages/patches/gwl-fix-build-guile-config-0.5.1.patch new file mode 100644 index 0000000000..496fd652e1 --- /dev/null +++ b/gnu/packages/patches/gwl-fix-build-guile-config-0.5.1.patch @@ -0,0 +1,75 @@ +From c0f281d2ef927686ed42f9c44828c501011a60dc Mon Sep 17 00:00:00 2001 +From: Ricardo Wurmus +Date: Tue, 5 Jul 2022 16:58:53 +0200 +Subject: Require guile-config >=3D 0.5.0. + +--- + configure.ac | 5 +++++ + gwl/config.scm.in | 14 +++++++++----- + 2 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a6897f4..eadc82f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,6 +42,11 @@ GUILE_MODULE_REQUIRED(gcrypt hash) + GUILE_MODULE_REQUIRED(pfds sets) + GUILE_MODULE_REQUIRED(drmaa v1 high) + GUILE_MODULE_REQUIRED(config) ++GUILE_MODULE_CHECK(guile_config_too_old,(config api),(argument (name 'foo= ) (optional? 'old)),supports `optional?' field in argument definition) ++if test "x$guile_config_too_old" =3D "xyes"; then ++ AC_MSG_ERROR([Guile Config needs to be version 0.5.0 or higher.]) ++fi ++ + AC_PATH_PROG([DOT], [dot]) + if test "x$DOT" =3D "x"; then + AC_MSG_ERROR(['dot' could not be found; please check your Graphviz ins= tallation.]) +diff --git a/gwl/config.scm.in b/gwl/config.scm.in +index 20a562e..d64eca3 100644 +--- a/gwl/config.scm.in ++++ b/gwl/config.scm.in +@@ -65,7 +65,6 @@ workflow.") + (list + (argument + (name 'file) +- (optional? #false) + (test file-exists?) + (handler identity) + (example "/path/to/my-workflow.w")))) +@@ -95,12 +94,19 @@ workflow.") + (character #\i) + (synopsis "Specify workflow input NAME, optionally mapped to FIL= E") + (example "NAME[=3DFILE]") +- (test string?)) ++ (default #false) ++ (test (match-lambda ++ (#false #true) ++ (value (string? value))))) + (switch + (name 'output) + (character #\o) + (synopsis "Set LOCATION as output for a workflow") +- (example "LOCATION")) ++ (example "LOCATION") ++ (default #false) ++ (test (match-lambda ++ (#false #true) ++ (value (string? value))))) + (switch + (name 'engine) + (character #\e) +@@ -147,11 +153,9 @@ format) of the specified workflow.") + (list + (argument + (name 'file) +- (optional? #false) + (test file-exists?) + (handler identity) + (example "/path/to/my-workflow.w"))))) +- + (configuration + (name 'web) + (synopsis "Start the web interface") +--=20 +cgit v1.1 + --=20 2.36.1 --=-=-= Content-Type: text/plain Regards, -- Taiju --=-=-=--