From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mFBbDD2S72BwBgAAgWs5BA (envelope-from ) for ; Thu, 15 Jul 2021 03:41:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id EOIlBj2S72C6cQAAB5/wlQ (envelope-from ) for ; Thu, 15 Jul 2021 01:41:17 +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 6020A2AD1 for ; Thu, 15 Jul 2021 03:41:16 +0200 (CEST) Received: from localhost ([::1]:41786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3qNH-00046N-Dj for larch@yhetil.org; Wed, 14 Jul 2021 21:41:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3qN5-0003qD-JB for guix-patches@gnu.org; Wed, 14 Jul 2021 21:41:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3qN5-0005LE-Bc for guix-patches@gnu.org; Wed, 14 Jul 2021 21:41:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3qN5-0003ed-Al for guix-patches@gnu.org; Wed, 14 Jul 2021 21:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49566] [PATCH core-updates 4/4] import: hackage: Emit new-style package inputs. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Jul 2021 01:41:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49566 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49566@debbugs.gnu.org Received: via spool by 49566-submit@debbugs.gnu.org id=B49566.162631325114002 (code B ref 49566); Thu, 15 Jul 2021 01:41:03 +0000 Received: (at 49566) by debbugs.gnu.org; 15 Jul 2021 01:40:51 +0000 Received: from localhost ([127.0.0.1]:46158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMt-0003dl-4o for submit@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:51 -0400 Received: from out2.migadu.com ([188.165.223.204]:24401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMp-0003dW-QT for 49566@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:49 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1626313246; 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=w1E7+L731Vb/EOueS6jKmKCgWm/oUzPP+eYbhSLt7aY=; b=YM/PknUTRWAxsLSuTRH2XbTpr+1cGUw+cZV3LHzO5dk1baih6xpv10tL9Tict7k3hAzH83 x0oCC4Yt8zKRBrmkApunOdE8qWrcEyGxuNuH5fOgvHG2arQRXwEsm/Y2tCGIMaWo1TY1Qp o8p2AIRXVJTbKfa5YfWI3wtMjL+vnno= Date: Wed, 14 Jul 2021 18:40:37 -0700 Message-Id: <66fc4a13098b1d7658175e9b966f4f579ac55b15.1626311767.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Auth-User: iskarian@mgsn.dev 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" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches From: Sarah Morgensen via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626313276; h=from:from:sender:sender:reply-to: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=w1E7+L731Vb/EOueS6jKmKCgWm/oUzPP+eYbhSLt7aY=; b=RlHVIhzqzMcGEJvh+Kf3ANjEAbtRteUGWzp5WXBHJCf2u7TYvRzkIQC3r/wTMlzu0M+poM L7YzBUxh5Y7s+dJnaZ0ncwwuDsP6qLFWbresVfe0dLDczQWw/uB3lf30urFmzzAkkI8KYp dRli5fJWfBWxea8C5a+aWgMheaNAexsWzKGwjrXwPKrb5gpv4NX3glJlOc+ODF76smGwZN M+D33FjSoX/RFxMMp62FbM0CMMefHwuFIOHcvF88lsSqPm8/MKXy58Dpf1SkLSg7NrShmV jM6MHJ5SmOBhKite6MEED74dHBjIvn4rjdT/r3DFcCjPdyF3hWDCvF9Woh5AAQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626313276; a=rsa-sha256; cv=none; b=P2ei/kQIu5+rv68xSJnEZOFoh2rcZfOafRmdVgsxhR9UJodklYGawOuMYTHBRMC/2dioa/ 00jicFFPziGi/di0E+T+NOCACL8rP0+VMCmADpkoUDsMfaDl1OHhTHinrVB5WSIWgBiohi RJ+Y30riqWl08WDgi1xfG1b7l5cz0N4se2vsUtHO+ggvYeR7XMugNO3ySqecKbSC9kLMjC Rvuagrd07AzbV28Nk9WEE8yDf/cr+stUpJurRGkN7osdSGe0RirQiCYgKRw6YZcyyJU/XP BxGPTBJRPDBOTpuoMicaMvUU9KiluXdMs/nWXhmEGjGSYIUEUNtb6X+G9J3IPg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b="YM/PknUT"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.90 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b="YM/PknUT"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 6020A2AD1 X-Spam-Score: -2.90 X-Migadu-Scanner: scn1.migadu.com X-TUID: NysuzUDIo1gw * guix/import/hackage.scm (hackage-module->sexp)[dependencies] [native-dependencies]: Make into a list of symbols. [maybe-inputs]: Wrap INPUTS in 'list' instead of 'quasiquote'. * tests/hackage.scm (match-ghc-foo) (match-ghc-foo-6) (match-ghc-foo-revision): Adjust accordingly. --- guix/import/hackage.scm | 11 +++++------ tests/hackage.scm | 18 +++++------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index f94a1e7087..7c6d9d0a22 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -265,14 +266,12 @@ the hash of the Cabal file." hackage-dependencies)) (define dependencies - (map (lambda (name) - (list name (list 'unquote (string->symbol name)))) + (map string->symbol (map hackage-name->package-name hackage-dependencies))) (define native-dependencies - (map (lambda (name) - (list name (list 'unquote (string->symbol name)))) + (map string->symbol (map hackage-name->package-name hackage-native-dependencies))) @@ -282,8 +281,8 @@ the hash of the Cabal file." '()) ((inputs ...) (list (list input-type - (list 'quasiquote inputs)))))) - + `(list ,@inputs)))))) + (define (maybe-arguments) (match (append (if (not include-test-dependencies?) '(#:tests? #f) diff --git a/tests/hackage.scm b/tests/hackage.scm index 66a13d9881..0ecef40b55 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -178,9 +179,7 @@ library ('base32 (? string? hash))))) ('build-system 'haskell-build-system) - ('inputs - ('quasiquote - (("ghc-http" ('unquote 'ghc-http))))) + ('inputs ('list 'ghc-http)) ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) @@ -223,13 +222,8 @@ library ('base32 (? string? hash))))) ('build-system 'haskell-build-system) - ('inputs - ('quasiquote - (("ghc-b" ('unquote 'ghc-b)) - ("ghc-http" ('unquote 'ghc-http))))) - ('native-inputs - ('quasiquote - (("ghc-haskell-gi" ('unquote 'ghc-haskell-gi))))) + ('inputs ('list 'ghc-b 'ghc-http)) + ('native-inputs ('list 'ghc-haskell-gi)) ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) @@ -353,9 +347,7 @@ executable cabal ('base32 (? string? hash))))) ('build-system 'haskell-build-system) - ('inputs - ('quasiquote - (("ghc-http" ('unquote 'ghc-http))))) + ('inputs ('list 'ghc-http)) ('arguments ('quasiquote ('#:cabal-revision -- 2.31.1