From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 4D2bBXYf82ZZKAEAqHPOHw:P1 (envelope-from ) for ; Tue, 24 Sep 2024 20:22:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 4D2bBXYf82ZZKAEAqHPOHw (envelope-from ) for ; Tue, 24 Sep 2024 22:22:14 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=iJ3KC9uy; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=klnretGR; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727209333; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=dlBIGYu7E2jdqyAbbokT6hcWccFWlrSC5x5u0LmTyp4=; b=F+fGzfb9oTmVY/ORLNS0hdTgUPICCqNvmD0YdUv7M43tFf7CiE8tM5flERDgTG4wvbcCyI 1o9wZ0T1vkFVRLazZBNsItGloUk3j5+aCoXQLvTx0qPgraZPDfZLv8uF9jrexofUVKv5dU cxAj2GUCeY7xtyMKfeEngf7WbvVx24e0LTVKipCkoTz6ozCDMzJ0mDX5/FVeiRWyY0PbpB pr9Zc4cg2YTdzCNFtw/UYxVN5gshL2LRdcpPDgOhJexDPhDhBZmYiH4qLzpiPBSvgTCkcK fTrMMI7CjgaCKjyzHfvgKKuJ+RBHcnEXmlRDM8Dg7CAwwWpLDXy101nhnbonjg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=iJ3KC9uy; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=klnretGR; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727209333; a=rsa-sha256; cv=none; b=PSz2LIGvXSKRuVkR1dfrOs1cTaLiS49Y48mErfp4BKGx6Lq1LUhO0xLu+TV6Sw/VxtAXU1 CvEXZlhrfAlsFbYJGUTKPZCLoSKGID5xHZbrXPTBAZtSBZvugjRHb1Cx1whmXWkxymjtw3 XhOItNeHjVZM5RYmaAAzVxJqFiH2s7MiAeQ77Xnvf+R4x7LnuxtPJlDU8Wx3tTHKgqVKTL ShEAGlQosJi/2Or7Vr/egQevaHIrqB1t5K9BwgldzaOI+7/7eXag4OFuVSuBR6P6RmK+pE 1pdkmPohOegu3FszyOYEQ1h4T5yoNx5WCmqqVffunVUbXgZIOtih7W3ykv0V5A== 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 CE0457B7AC for ; Tue, 24 Sep 2024 22:22:13 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stC2x-0000hJ-Mz; Tue, 24 Sep 2024 16:22:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1stC2a-0000La-Tg for guix-patches@gnu.org; Tue, 24 Sep 2024 16:21:45 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stC2Y-0003PH-1A for guix-patches@gnu.org; Tue, 24 Sep 2024 16:21:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=dlBIGYu7E2jdqyAbbokT6hcWccFWlrSC5x5u0LmTyp4=; b=iJ3KC9uy16/K0KP6TUm2J4v3ibukBIhKWFd6EiLqdaVaYwsWUYl7Iyx5ZjOcITiWEBk4zdeqQ0QcuKuDRnrsTh7Wprk1Me3RLvhBNmUji8CAxhXmWafPMHgmk6MIIzP0Dg4+HtNnxsTU4ZM6h+byEQtDhiK2OX5Kc9UNUrLKCAIUKzujpwFO9izzlO36XNb/Ib/91yr18zctwvuJS3f0C2DBkgEpVbG+1Z+Qk726gcLgdeUGyIwIB20p9jsEg33ovj4hki0Z2HTXf9sUZlDte+3cwvwn4E3Ax/vm4HuKhJbloqkESK9+6/MG9QA2/V/L17+AahYWUlyy9ZzonBpcCw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stC2w-000559-Pf; Tue, 24 Sep 2024 16:22:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70923] [PATCH v3 07/11] import: hackage: Use 'maybe-list-field' procedure. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Tue, 24 Sep 2024 20:22:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70923 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70923@debbugs.gnu.org Cc: Lars-Dominik Braun X-Debbugs-Original-Xcc: Lars-Dominik Braun Received: via spool by 70923-submit@debbugs.gnu.org id=B70923.172720930119414 (code B ref 70923); Tue, 24 Sep 2024 20:22:06 +0000 Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:41 +0000 Received: from localhost ([127.0.0.1]:38514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stC2W-00052y-Jr for submit@debbugs.gnu.org; Tue, 24 Sep 2024 16:21:41 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:46027 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stC2G-00050O-Qs for 70923@debbugs.gnu.org; Tue, 24 Sep 2024 16:21:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1727208848; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=dlBIGYu7E2jdqyAbbokT6hcWccFWlrSC5x5u0LmTyp4=; b=klnretGRuhrvtne6g4GxxeXD2aKItwitFTleL5qrKcwMbrXyTwmx/hsjLv3ZN+zs9yNSGm 0Y7ELrPyNji5H0ool+ZEaUZvdkPNBHC89RjklFnhvr/F3WLabC9ruKDJ9KuLQ0X/gqMvH+ 6j1cZBfDlK8/eu+zlIyXtCLkYmHLn7B1TJ8DAiQ/JaJD7FGbr8dyLnznOiyYXJH6IOu3w/ tu0Nl3obhVRpzRx6GdoeR5Hcva37nt4PC4VN2LtZthhTZkR61Ts/7M+uASBo+IjWZs1az2 0ORPipatAH6Bciuutcy4pDuTjv9V5HdnTWX3oot+QT9JNQoDb0tKtzgwqbazBw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id c97d0f43 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70923@debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:08 +0000 (UTC) Date: Tue, 24 Sep 2024 22:13:13 +0200 Message-ID: <1bc3fa4669d55efc9bf5c7fdf97efc39b03fab23.1727207512.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.91 X-Spam-Score: -4.91 X-Migadu-Queue-Id: CE0457B7AC X-Migadu-Scanner: mx10.migadu.com X-TUID: Fd9aJFPXNLLD * guix/import/hackage.scm (maybe-inputs, maybe-arguments): Delete procedures. (hackage-module->sexp): Use 'maybe-list-field' and 'maybe-upstream-inputs' procedures. * tests/hackage.scm: Fix whitespace and replace 'quasiquote' with 'list'. Change-Id: I4fe39ff84c9f6a677f810d9e4fe751d762973757 --- guix/import/hackage.scm | 39 ++++++++++++--------------------------- tests/hackage.scm | 13 +++++++------ 2 files changed, 19 insertions(+), 33 deletions(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 79a51d3300..bd3bed146e 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2019 Simon Tournier ;;; Copyright © 2022 Hartmut Goebel ;;; Copyright © 2023-2024 Ludovic Courtès +;;; Copyright © 2024 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -288,26 +289,6 @@ (define* (hackage-module->sexp cabal cabal-hash #:include-test-dependencies? include-test-dependencies?)) - (define (maybe-inputs input-type inputs) - (match inputs - (() - '()) - ((inputs ...) - (list (list input-type - `(list ,@(map (compose string->symbol - upstream-input-downstream-name) - inputs))))))) - - (define (maybe-arguments) - (match (append (if (not include-test-dependencies?) - '(#:tests? #f) - '()) - (if (not (string-null? revision)) - `(#:cabal-revision (,revision ,cabal-hash)) - '())) - (() '()) - (args `((arguments (,'quasiquote ,args)))))) - (let ((tarball (with-store store (download-to-store store source-url)))) (values @@ -324,13 +305,17 @@ (define* (hackage-module->sexp cabal cabal-hash "failed to download tar archive"))))) (build-system haskell-build-system) (properties '((upstream-name . ,name))) - ,@(maybe-inputs 'inputs - (filter (upstream-input-type-predicate 'regular) - inputs)) - ,@(maybe-inputs 'native-inputs - (filter (upstream-input-type-predicate 'native) - inputs)) - ,@(maybe-arguments) + ,@(maybe-upstream-inputs 'inputs + (filter (upstream-input-type-predicate 'regular) inputs)) + ,@(maybe-upstream-inputs 'native-inputs + (filter (upstream-input-type-predicate 'native) inputs)) + ,@(maybe-list-field 'arguments + (append (if (not include-test-dependencies?) + '(#:tests? #f) + '()) + (if (not (string-null? revision)) + `(#:cabal-revision '(,revision ,cabal-hash)) + '()))) (home-page ,(cabal-package-home-page cabal)) (synopsis ,(cabal-package-synopsis cabal)) (description ,(beautify-description (cabal-package-description cabal))) diff --git a/tests/hackage.scm b/tests/hackage.scm index 403f587c41..f6d91515e2 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -67,7 +67,7 @@ (define test-cabal-3 if impl(ghc>=7.2&&<7.6) Build-depends: ghc-b if impl(ghc == 7.8) - Build-depends: + Build-depends: HTTP >= 4000.2.5 && < 4000.3, mtl >= 2.0 && < 3 ") @@ -86,7 +86,7 @@ (define test-cabal-4 if impl(ghc>=7.2&&<7.6) Build-depends: ghc-b if impl(ghc == 7.8) - Build-depends: + Build-depends: HTTP >= 4000.2.5 && < 4000.3, mtl >= 2.0 && < 3 ") @@ -101,7 +101,7 @@ (define test-cabal-5 license: BSD3 library if impl(ghc == 7.8) - Build-depends: + Build-depends: HTTP >= 4000.2.5 && < 4000.3, if impl(ghc -any) Build-depends: mtl >= 2.0 && < 3 @@ -126,7 +126,7 @@ (define test-cabal-6 if impl(ghc>=7.2&&<7.6) Build-depends: ghc-b if impl(ghc == 7.8) - Build-depends: + Build-depends: HTTP >= 4000.2.5 && < 4000.3, mtl >= 2.0 && < 3 ") @@ -524,8 +524,9 @@ (define-package-matcher match-ghc-foo-revision ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-http)) ('arguments - ('quasiquote - ('#:cabal-revision + ('list + '#:cabal-revision + ('quote ("2" "0xxd88fb659f0krljidbvvmkh9ppjnx83j0nqzx8whcg4n5qbyng")))) ('home-page "http://test.org") ('synopsis (? string?)) -- 2.45.2