From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 1FXxLpRp52MM6gAAbAwnHQ (envelope-from ) for ; Sat, 11 Feb 2023 11:10:28 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id GHwkLpRp52MBsAAA9RJhRA (envelope-from ) for ; Sat, 11 Feb 2023 11:10:28 +0100 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 836CEF73A for ; Sat, 11 Feb 2023 11:10:28 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004so-EM; Sat, 11 Feb 2023 05:09:19 -0500 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 1pQmob-0004np-Au for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQmoa-00009E-4A for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoZ-0004CK-W8 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 06/31] import: hackage: Add upstream-name property. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61420@debbugs.gnu.org Cc: Lars-Dominik Braun Received: via spool by 61420-submit@debbugs.gnu.org id=B61420.167611013415968 (code B ref 61420); Sat, 11 Feb 2023 10:09:03 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:54 +0000 Received: from localhost ([127.0.0.1]:38864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoP-00049N-KD for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:54 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:57624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoG-00046Q-T7 for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:46 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PDRBs3DT7z9sW9; Sat, 11 Feb 2023 11:08:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o05D5AJhXVV7+YJM5jixmp53F7hKNr8EAozEV+S4/C0=; b=Tfz6aS9gEMIFAWHsjZj6EtMk35nUr7y7qIaisC7z82ypHGCqPVJrBq1qLlUbF2Md8yaBHt Mzg2GPdc0ljeSCdzaZ7Ue4C0Vr1Ksql6Qk70RVMIIjWkDbBMaqQQNwRKE3OLtIbFZrN8Op RgtY2EesQKT+lvqI/eI9c3YHK1VmD/5uAb/4gDnOaHQFI4a1bNvioocmTUeuFZ39iKy8Jf EJ9JqFTvr7LdvgZjK5rVSVeYFfbeiqaxzQlsctEC8zvXCQjOOx75hkOEU8ItXOMzKUt/hM ucKpA8fIT/+g3/zlzercB0TgxkEx5mk8utw6E97rqBafUNQYtq/VDOhdYpWhLA== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:03 +0100 Message-Id: <20230211100825.47971-6-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676110228; a=rsa-sha256; cv=none; b=FUXsBpaMqaoKOrlFCEdYPXXGeFjY5WvIor4x6djv6tL5uqR4pPoa+USgXsDL53fjWPbxMM QA6uol5Tj1uztFFiFaz/Lnqwf7cWNOvqb1x/aYG01gV1ft//eOrZZBSqJ7DnhpYya39C+4 K6qHCGdavrvCBYsWph+nNpGawKkswv0fhMwLkxl5nxXfVDHNLz2UQNmwfsBsV0WA+LNPZD LCavfZvBR9nVoU4tyP/+lnLF/dgkgon7fUNzMBKD2bPEyEufQhmuE1g+cGaMxt6VYe8PFe JDkRXY4WjHSBTcj77GIlJpK07FOoTshW6lpzx3sOw5oANiqypd0odRWDD4hxRQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b=Tfz6aS9g; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676110228; 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=o05D5AJhXVV7+YJM5jixmp53F7hKNr8EAozEV+S4/C0=; b=GxxUwhRgVhiTEr+T4jyiwzpGhEA30UdHXIOrN+ByH41LWxlwJMZYmSgQAFI5EQTpxeto38 mKp8FcKoD3WJLJR0nelmPC3nAIbqmCjyi/uomJL0B1kl9jFYmQqFKsGN+ptLcTteAjI2ra dlPXf3x9dBP2jd/5elVfw2rtrZYITnfAdQJjWx1+zp+0Z17slfEaMlt7EHJC5J6vnEzMWZ D3ZEebsXM88RazBOY9gMBkFzFOPUlxKouewFZOdmpX20+ZnK5DWEKx9AUDW0vYkvX8hKdH RVO8jGVUJhviCId43/J/KHcerCLZKlUu/Zi1our/qM2UapETigeOYjoPMr409g== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b=Tfz6aS9g; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (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: 7.30 X-Spam-Score: 7.30 X-Migadu-Queue-Id: 836CEF73A X-Migadu-Scanner: scn1.migadu.com X-TUID: pU/6+I/TOoHu * guix/import/hackage.scm (hackage-module->sexp): Add property upstream-name to imported package. * tests/hackage.scm (match-ghc-foo): Add upstream-name property. (match-ghc-foo-6): Ditto. (match-ghc-elif): Ditto. (match-ghc-foo-revision): Ditto. (match-ghc-foo-import): Ditto. --- guix/import/hackage.scm | 1 + tests/hackage.scm | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index e915aac58d..9e305cf080 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -314,6 +314,7 @@ (define (maybe-arguments) (bytevector->nix-base32-string (file-sha256 tarball)) "failed to download tar archive"))))) (build-system haskell-build-system) + (properties '((upstream-name . ,name))) ,@(maybe-inputs 'inputs dependencies) ,@(maybe-inputs 'native-inputs native-dependencies) ,@(maybe-arguments) diff --git a/tests/hackage.scm b/tests/hackage.scm index ad2ee4b7f9..8eea818ebd 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -201,6 +201,7 @@ (define-package-matcher match-ghc-foo ('base32 (? string? hash))))) ('build-system 'haskell-build-system) + ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-http)) ('home-page "http://test.org") ('synopsis (? string?)) @@ -241,6 +242,7 @@ (define-package-matcher match-ghc-foo-6 ('base32 (? string? hash))))) ('build-system 'haskell-build-system) + ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-b 'ghc-http)) ('native-inputs ('list 'ghc-haskell-gi)) ('home-page "http://test.org") @@ -471,6 +473,7 @@ (define-package-matcher match-ghc-elif ('base32 (? string? hash))))) ('build-system 'haskell-build-system) + ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-c)) ('home-page "http://test.org") ('synopsis (? string?)) @@ -520,6 +523,7 @@ (define-package-matcher match-ghc-foo-revision ('base32 (? string? hash))))) ('build-system 'haskell-build-system) + ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-http)) ('arguments ('quasiquote @@ -610,6 +614,7 @@ (define-package-matcher match-ghc-foo-import ('base32 (? string? hash))))) ('build-system 'haskell-build-system) + ('properties '(quote ((upstream-name . "foo")))) ('inputs ('list 'ghc-http)) ('home-page "http://test.org") ('synopsis (? string?)) -- 2.38.2