From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id GHSuMw4Zm2JRNwEAbAwnHQ (envelope-from ) for ; Sat, 04 Jun 2022 10:34:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EK/VMw4Zm2JwGQAA9RJhRA (envelope-from ) for ; Sat, 04 Jun 2022 10:34:22 +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 8532A29FD8 for ; Sat, 4 Jun 2022 10:34:22 +0200 (CEST) Received: from localhost ([::1]:44246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nxPEj-0000X6-G7 for larch@yhetil.org; Sat, 04 Jun 2022 04:34:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nxPEQ-0000Wb-5I for bug-guix@gnu.org; Sat, 04 Jun 2022 04:34:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nxPEP-0003U8-TJ for bug-guix@gnu.org; Sat, 04 Jun 2022 04:34:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nxPEP-0006z4-Ql for bug-guix@gnu.org; Sat, 04 Jun 2022 04:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#55449: [PATCH] gnu: recutils: Use correct bash headers. References: <9841253361ff5e3caccd4702518c70bdba8ac622.camel@ist.tugraz.at> In-Reply-To: <9841253361ff5e3caccd4702518c70bdba8ac622.camel@ist.tugraz.at> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 04 Jun 2022 08:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55449 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 55449@debbugs.gnu.org Cc: Tobias Geerinckx-Rice , Maxime Devos Received: via spool by 55449-submit@debbugs.gnu.org id=B55449.165433163426832 (code B ref 55449); Sat, 04 Jun 2022 08:34:01 +0000 Received: (at 55449) by debbugs.gnu.org; 4 Jun 2022 08:33:54 +0000 Received: from localhost ([127.0.0.1]:57591 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nxPEI-0006yi-0x for submit@debbugs.gnu.org; Sat, 04 Jun 2022 04:33:54 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:39531) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nxPEF-0006yU-GC for 55449@debbugs.gnu.org; Sat, 04 Jun 2022 04:33:52 -0400 Received: by mail-ej1-f68.google.com with SMTP id y19so19936561ejq.6 for <55449@debbugs.gnu.org>; Sat, 04 Jun 2022 01:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=/ddw1WKZBOQpe4a3U5kA4Val1VCRIbLYyTj8O5BLKOE=; b=Gr3Q3xhuVYxjgI8rNtfLQTlo5uXYGlDGNrBnQLMWSfNHngHA5EeRQifruwxkwktS2M FjLaU6B8KhNQFAEcKnuyLtJhAQDoaZgVpzkxGYrfZWM/4u2/jS5HLOK0OWn6WV0qEKxL 5IrUnF02RNOuwVUNTPeQ9hLixQGY3PWLunPzIfk4uyQQDN3XXM7TbKT/f1MRkhd52Nnx uiZdCmv/Tg+adie14tCsJXsoq0QHSb2xpLHYJK/E5gTbd+TwIsoT4wxEVnpzM6j9ueJ5 6d8fXQvmW0056qZBDLpafHxfMep8ATTBtfm3h+R3MPyK3UqBp4KWwPjZChUuDF4cJV9s vQ/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:cc :content-transfer-encoding:message-id:mime-version; bh=/ddw1WKZBOQpe4a3U5kA4Val1VCRIbLYyTj8O5BLKOE=; b=KUem7KZSJ5syFp6WOWgjPyCBgxwRAHX+q0nDYH/oVeWDLBJYrwiJLn9pMV1IMuazGv aulWW94XxP3LPSHCRO9joycrI1m97LWoBxikURPyHSgNbfzBV3iFCuixr/I4T1QJOLfz Rlk+AgGPKTQ4ucTQaFchUeyv5lv0vxyv2YhPF80dvkMI+F+aSb5hxzUnuAcaw3LA0B02 woP5K8jkI9bdH9GZTA+koJ0H5Agba3VBuOB3KmFRLuwRwN9BtVUU81O6juNykDBt99DQ BmaxK9TZkyt1cSFwwbTVUiJh8tImhQEE++4hqbs8L3kJHkVatZavjw0lNKj1WRUSu5Ek CnvQ== X-Gm-Message-State: AOAM5319AvK7MjId10d+YRyj+itlmK7tXUkHOBfHM+UG2DExQwup206a pncUyUczR4R7nsuKH35rH38n4c8zcco= X-Google-Smtp-Source: ABdhPJwHUsMC3+Fcz33PMmD7TMi35GGoJID3TQWZW4ZWUhJlkAE82kqnNREJ6Q9E3MyozcD6t849+A== X-Received: by 2002:a17:907:2cc3:b0:6f8:5a21:4d62 with SMTP id hg3-20020a1709072cc300b006f85a214d62mr12664145ejc.256.1654331625480; Sat, 04 Jun 2022 01:33:45 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id i7-20020a170906444700b0070e238ff66fsm1660430ejp.96.2022.06.04.01.33.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jun 2022 01:33:45 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 4 Jun 2022 10:30:12 +0200 Content-Transfer-Encoding: 7bit Message-ID: <18b93bc799d759f48d0645f971104277f2a3b066.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" 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=1654331662; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=/ddw1WKZBOQpe4a3U5kA4Val1VCRIbLYyTj8O5BLKOE=; b=Gw3zoIKNHMxFkYnscZve+9YGy6z6LWgg0s6yVLcXc7BrzXwpW+PfzpYjfSC2VLt0uqHX2T 8aU77ib848VDOe2/wemwyPnS8nowb5SSto38E7L6wPbr+UMgL5f6pnaKhlhYLflPfNhv7z zxzRFCJDh8O/E1j19t0zxOyWLx9HkyrYRMfUOl4ZgTrDUmgD8ww04dad9Yc9Zkin8s9dDU PADt2n4td5gkwESlNQQt4N5vmuBMRf5Xf96SS3aADp+5tR8EP0v/eBrxR8V6fTVORx9tpx O8+D3/uTNYpqjnRXe9hkgjS/uoAkHg7YF/6bx1eSzttLkHZ4FBVAjEvXBpaNBg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654331662; a=rsa-sha256; cv=none; b=SbDuvDuxbb0wsx43wAxJUcFEgN3NYQNOz1SYabyZBEuK5dIy41pXdoKAuWB15yESS6ymKe pX7Ja1cSeEEMnuDh6fIEYN40ObpsJbTTKltd5Svy74JOIkc2vcWjeIx7ULt0T11x2pNNiC WqXjD2bLyVaLC7AHmRk0IZfgeRzV4hHcmvNFr7bUwYv+RV4ZCFUEj13SZcw2FoPAEEj7BS 7mqu4rTvbhJbPj/Imx00C9dy0KvbUmGlbz7IprpMzGCfi34yxPqURLoZRwx4BPaCQHiunF Aa0levwKqObSIJePpLxAvGez/v0z/neKQYtyAEedeeRUo2G4mUiH08jx4b2CFA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Gr3Q3xhu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.98 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Gr3Q3xhu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 8532A29FD8 X-Spam-Score: 5.98 X-Migadu-Scanner: scn0.migadu.com X-TUID: AF2EUr8eQSJ1 * gnu/packages/databases.scm (recutils)[arguments]: Convert to G-Expressions. Drop gratuitous dirname. [native-inputs]: Drop labels. Move bash:include... [inputs]: ... here. Also add regular bash. --- gnu/packages/databases.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 09d825af3e..5cd8cc2fa3 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1527,20 +1527,17 @@ (define-public recutils (build-system gnu-build-system) (arguments (list #:configure-flags - '(list "--disable-static" - (string-append "--with-bash-headers=" - (dirname (search-input-directory - %build-inputs - "include/bash")))))) + #~(list "--disable-static" + (string-append "--with-bash-headers=" + (search-input-directory %build-inputs + "include/bash"))))) (native-inputs - ;; XXX Without labels, the default 'configure phase picks the wrong "bash". - `(("bc" ,bc) - ("bash:include" ,bash "include") - ("check" ,check-0.14) - ("pkg-config" ,pkg-config))) + (list bc check-0.14 pkg-config)) (inputs ;; TODO: Add more optional inputs. - (list curl + (list bash ; /bin/bash for native compilation + `(,bash "include") + curl libgcrypt `(,util-linux "lib"))) (synopsis "Manipulate plain text files as databases") -- 2.36.1