From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id yH/iL8jY3GBjZgEAgWs5BA (envelope-from ) for ; Wed, 30 Jun 2021 22:49:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MMeRK8jY3GCAKQAA1q6Kng (envelope-from ) for ; Wed, 30 Jun 2021 20:49:12 +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 4D343221A2 for ; Wed, 30 Jun 2021 22:49:12 +0200 (CEST) Received: from localhost ([::1]:52720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyh8w-0000Rb-8V for larch@yhetil.org; Wed, 30 Jun 2021 16:49:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyh8p-0000Qh-98 for guix-patches@gnu.org; Wed, 30 Jun 2021 16:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47370) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyh8o-00014G-Nk for guix-patches@gnu.org; Wed, 30 Jun 2021 16:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lyh8o-00057Y-F9 for guix-patches@gnu.org; Wed, 30 Jun 2021 16:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49169] [PATCH v2 00/16] Removing input labels from package definitions Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Jun 2021 20:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49169@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 49169-submit@debbugs.gnu.org id=B49169.162508613919636 (code B ref 49169); Wed, 30 Jun 2021 20:49:02 +0000 Received: (at 49169) by debbugs.gnu.org; 30 Jun 2021 20:48:59 +0000 Received: from localhost ([127.0.0.1]:58908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyh8l-00056b-4b for submit@debbugs.gnu.org; Wed, 30 Jun 2021 16:48:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyh8j-00055d-58 for 49169@debbugs.gnu.org; Wed, 30 Jun 2021 16:48:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:53118) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyh8d-0000v4-6C; Wed, 30 Jun 2021 16:48:51 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=42586 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyh8c-0001jQ-UT; Wed, 30 Jun 2021 16:48:51 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 30 Jun 2021 22:48:16 +0200 Message-Id: <20210630204832.25753-1-ludo@gnu.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210622090221.15182-1-ludo@gnu.org> References: <20210622090221.15182-1-ludo@gnu.org> 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: , 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=1625086152; 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; bh=zzWecs4IoiFghGK+LanWxR+gerVjWhA5/wM2KQFpHOA=; b=iKU79mnSXW6MotT0XHvEcSFjZjCBPAd6Lph9sAd83EDHUloFktPD81VVGL+l5GhazTIz6x LdJHBO+VyKR7tDEZhPezM7QcpjKdU7UtEKIYiJzD2QY/6iZBbrFkpxsklt4or6AgHO162Z THAFW1iiY7nH5He1ji3iLgKvzVRHDeAt6V7UJ6LUS7LmUGQ/Wn/eYifvDnqPa5CTiItwwZ Eo6k4+B2g906AGKBSHTBDDyqFl/PA/HQruB3GEZzwQ9I9uiL2Y/7KsnJ4GDvPa96gGhRjG rKsRgyAfyrmYLWegb/7q42DYgM/RzXD5A9udEoI9nOSAKkdkTP4WF4fOyhkOcA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625086152; a=rsa-sha256; cv=none; b=dsjB6uAn0bQtv5bZzbVRPOgqN090WegDbGCQQivIbTJbHEnjWFVuGjKU6s8aRSfu6jgJC5 ZvqhGvuJKqU7CC5WBkISO9SetJXWmE2rkOMcOGPt611D/WmUwchBL0BXHAFDoTjztQbO3n UiIkjVi1C3LEHeGTa6rhNV4lhs55vBoeFusB8TfbCDaFcH8sAahGoIY3i/5sa24ezNT6Az Khub2n20vp7vb/w7ZHG/08bBwWslDMKhJbmQz9NYqLyUOgLFjlWsVoR+QuQ28ANEkFsGhm QYfEVAMdrY16pssgHiSXI61V8WJO70Aw+33b5sh2CNR68rDKJiNJZtlHbJierg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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: -0.42 Authentication-Results: aspmx1.migadu.com; dkim=none; 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: 4D343221A2 X-Spam-Score: -0.42 X-Migadu-Scanner: scn1.migadu.com X-TUID: q0W2v2xQR+B1 Hi! This is an improved version of this patch series, with the following changes: • ‘guix style’ supports -e/--expression and --input-simplification=POLICY. The latter allows users to ask for input simplification even when labels don’t match package names (this is useful in obvious cases where there’s a “libX11” label for the “libx11” package, for instance.) • I changed a few importers to emit simplified package inputs. We’ll have to take care of the other importers eventually. I plan to merge this series by the end of the week on ‘core-updates’. The plan is to run ‘guix style’ (with no arguments: convert all the packages as long as that does not involve a rebuild) towards the end of the ‘core-updates’ cycle so as to minimize merge conflicts. Thanks, Ludo’. Ludovic Courtès (16): records: Support field sanitizers. packages: Allow inputs to be plain package lists. lint: Add 'input-labels' checker. packages: Add 'lookup-package-input' & co. packages: Add 'modify-inputs'. gnu: Change inputs of core packages to plain lists. utils: 'edit-expression' no longer leaks file ports. utils: Add 'go-to-location' with source location caching. utils: 'edit-expression' modifies the file only if necessary. utils: 'edit-expression' copies part of the original source map. Add 'guix style'. packages: 'hidden-package' inherits the original package location. import: pypi: Emit new-style package inputs. import: cran: Emit new-style package inputs. import: print: Emit new-style package inputs when possible. import: elpa: Emit new-style package inputs. .dir-locals.el | 6 + Makefile.am | 2 + doc/guix.texi | 208 ++++++++++++++-- gnu/packages/base.scm | 48 ++-- gnu/packages/guile.scm | 103 +++----- gnu/packages/mes.scm | 25 +- guix/import/cran.scm | 8 +- guix/import/elpa.scm | 7 +- guix/import/print.scm | 57 +++-- guix/import/pypi.scm | 15 +- guix/lint.scm | 36 +++ guix/packages.scm | 146 +++++++++++- guix/records.scm | 65 +++-- guix/scripts/style.scm | 527 +++++++++++++++++++++++++++++++++++++++++ guix/utils.scm | 151 +++++++++--- po/guix/POTFILES.in | 1 + tests/cran.scm | 10 +- tests/lint.scm | 14 ++ tests/packages.scm | 86 ++++--- tests/print.scm | 4 +- tests/pypi.scm | 18 +- tests/records.scm | 38 +++ tests/style.scm | 366 ++++++++++++++++++++++++++++ 23 files changed, 1643 insertions(+), 298 deletions(-) create mode 100644 guix/scripts/style.scm create mode 100644 tests/style.scm base-commit: 4c0cf61afd5ed62e830f2e87ef6b72505f2c303a -- 2.32.0