From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YNMXI9hMS2E0cAEAgWs5BA (envelope-from ) for ; Wed, 22 Sep 2021 17:33:44 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id KMWoHthMS2GUagAAbx9fmQ (envelope-from ) for ; Wed, 22 Sep 2021 15:33:44 +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 93CCE1721B for ; Wed, 22 Sep 2021 17:33:43 +0200 (CEST) Received: from localhost ([::1]:45786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mT4Fi-0004a8-Hz for larch@yhetil.org; Wed, 22 Sep 2021 11:33:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mT4F4-0004Xa-1D for guix-patches@gnu.org; Wed, 22 Sep 2021 11:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39925) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mT4F3-0003QL-PH for guix-patches@gnu.org; Wed, 22 Sep 2021 11:33:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mT4F3-0005ll-LA for guix-patches@gnu.org; Wed, 22 Sep 2021 11:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50618] [PATCH v2] import: stackage: =?UTF-8?Q?Don=E2=80=99t?= try to update packages not available on Stackage. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Sep 2021 15:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50618@debbugs.gnu.org Cc: Lars-Dominik Braun Received: via spool by 50618-submit@debbugs.gnu.org id=B50618.163232473722059 (code B ref 50618); Wed, 22 Sep 2021 15:33:01 +0000 Received: (at 50618) by debbugs.gnu.org; 22 Sep 2021 15:32:17 +0000 Received: from localhost ([127.0.0.1]:51470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mT4EL-0005jj-DZ for submit@debbugs.gnu.org; Wed, 22 Sep 2021 11:32:17 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:40110 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mT4EF-0005j7-2W for 50618@debbugs.gnu.org; Wed, 22 Sep 2021 11:32:16 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1632324721; bh=HU5p31C05hPnjPmoFRFhDl/jqZFPgKfd2IrZAJRlic0=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=VzAvlhRRrbvUB1xzAkaLDsR8wS1hgSY/PN2xzQBc5NfcYBufvswlcw3TLnqpyyovX pYGNHXNhj5Jg2ZLs6YGrNjuaG6x50G5UHNkAuFBanGOorQMCbjD/vryTcSBkYxSnE8 5Y6Pj4HA3s71Zp7J/m+acPi8UAxVP8i2ljTt2gkk= In-Reply-To: <33ce44c6b5dc4f0c2ea2cf7a8402807d91e849a6.1631791821.git.public@yoctocell.xyz> References: <33ce44c6b5dc4f0c2ea2cf7a8402807d91e849a6.1631791821.git.public@yoctocell.xyz> Message-Id: <0aa369b60b785e933cab9de136cf9745dc4ea50a.1632324617.git.public@yoctocell.xyz> Date: Wed, 22 Sep 2021 17:31:49 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632324824; 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: 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=ww+zY1uRJXv/xy0njBBrjW7g27bMH5GZVcyLDI1wt90=; b=ELXsbN2zq/QSQRcEAI+PVjEcDhNlaFVMYLOxg1fDsGZ4oC1w1dUvcOLoz8yNcQmIkxqrV/ n3g/zOUVTQxW1Q9f/GlGnL3YLQLZF61cswbIoSBLxeMJlsFTQANRhB3mjNL7+zsZNWeYda jDzLjYmAx/njNHYj8cOT88wuFXAfy+5JxTjcbbeVu0O85IiFr+ex35oAGb8nn1MTpSxE6X B2WEpE7bVLMytrmYrA0BlOMnh/0Qgt6X/2OMsFryj0T/mjV+oy8PGpoFQ0ywvFlbiPtC41 2j00t+jTI8HJ9g6tg4XQenapuDi4HMjIcKcK08Izo7WEUe7YI8v0q1e3E3cyDg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632324824; a=rsa-sha256; cv=none; b=n8MyrVMeIogmhKM6I5PYs/y6bfTDrDVuNCek40IHmm8CD2LwdYO4rkdRekWrjfrBTgMqKv K7brcx0NbORy9C8FbZjBVJc03jWqW9rccmnohOeKoCXpLCy/kM5ws5OtGKgTDmQwUtmxZC WGjpyw9Ncyhxs0yxJdfFs0rzt2PHUHzJLd6KWDHM77IpPWJ5tekchy2ejH3E59g0YHuv1L fPYmyaxSKNLwDOm8Mw6zg89o+/ooci/W3Zn8mcyyQQqgTW2bKfI0h3ZbxgZ1zG7am8FIFy nEqx2PwUpN34+G5bzCZgFhJEvOMCGL64BxetivROUP3fOXZ5AB9O9pQCLWSENg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=VzAvlhRR; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); 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: -0.29 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=VzAvlhRR; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); 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: 93CCE1721B X-Spam-Score: -0.29 X-Migadu-Scanner: scn0.migadu.com X-TUID: 9xHYGSeoxxL2 Previously, the =E2=80=98hackage-package?=E2=80=99 predicate was used which= meant that the updater would try to update non-Stackage packages, and lead to messages like these: $ guix refresh -t stackage warning: failed to parse https://hackage.haskell.org/package/hurl/hurl.ca= bal warning: failed to parse https://hackage.haskell.org/package/idris/idris.= cabal Since =E2=80=98hurl=E2=80=99 and =E2=80=98idris=E2=80=99 aren=E2=80=99t ava= ilable on the current Stackage LTS release, they should be filtered out before the Stackage updater even tries to update them. * stackage.scm (stackage-package?): New procedure. (%stackage-updater): Use it. --- Changes since v1: * Use =E2=80=98stackage-lts-info-fetch=E2=80=99 to improve performance. guix/import/stackage.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index bbd903a2cd..9b757f1986 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2017 Federico Beffa ;;; Copyright =C2=A9 2018 Ricardo Wurmus ;;; Copyright =C2=A9 2020 Martin Becze +;;; Copyright =C2=A9 2021 Xinglu Chem ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,10 +22,13 @@ (define-module (guix import stackage) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (srfi srfi-43) #:use-module (guix import json) #:use-module (guix import hackage) #:use-module (guix import utils) @@ -141,11 +145,23 @@ (define latest-lts-release (version version) (urls (list url)))))))))) =20 +(define (stackage-package? package) + "Whether PACKAGE is available on the default Stackage LTS release." + (and (hackage-package? package) + (let ((packages (lts-info-packages + (stackage-lts-info-fetch %default-lts-version))) + (hackage-name (guix-package->hackage-name package))) + (vector-any identity + (vector-map + (lambda (_ metadata) + (string=3D? (cdr (list-ref metadata 2)) hackage-na= me)) + packages))))) + (define %stackage-updater (upstream-updater (name 'stackage) (description "Updater for Stackage LTS packages") - (pred hackage-package?) + (pred stackage-package?) (latest latest-lts-release))) =20 ;;; stackage.scm ends here base-commit: 33bc3fb2a5f30a6e21f1b8d6d43867d921bd951c --=20 2.33.0