From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qLOFLe2q8WAEQwEAgWs5BA (envelope-from ) for ; Fri, 16 Jul 2021 17:51:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id qMoxKe2q8WCEYwAA1q6Kng (envelope-from ) for ; Fri, 16 Jul 2021 15:51:09 +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 2AA1A7CFF for ; Fri, 16 Jul 2021 17:51:09 +0200 (CEST) Received: from localhost ([::1]:33458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4Q7I-0000A2-7T for larch@yhetil.org; Fri, 16 Jul 2021 11:51:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4Q7C-00009j-F7 for guix-patches@gnu.org; Fri, 16 Jul 2021 11:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40581) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4Q7C-00033v-7Q for guix-patches@gnu.org; Fri, 16 Jul 2021 11:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4Q7C-0002vG-78 for guix-patches@gnu.org; Fri, 16 Jul 2021 11:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49597] [PATCH core-updates 00/15] Ajust packages to label-less input style Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Jul 2021 15:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49597@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162645063811202 (code B ref -1); Fri, 16 Jul 2021 15:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jul 2021 15:50:38 +0000 Received: from localhost ([127.0.0.1]:52127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4Q6o-0002ub-7A for submit@debbugs.gnu.org; Fri, 16 Jul 2021 11:50:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:49174) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4Q6m-0002uT-0I for submit@debbugs.gnu.org; Fri, 16 Jul 2021 11:50:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4Q6l-0008Tr-L1 for guix-patches@gnu.org; Fri, 16 Jul 2021 11:50:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33636) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4Q6k-0002a0-LM; Fri, 16 Jul 2021 11:50:34 -0400 Received: from vpn-0-27.aquilenet.fr ([2a0c:e300:4:27::]:38210 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 1m4Q6k-0003wh-5Q; Fri, 16 Jul 2021 11:50:34 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 16 Jul 2021 17:50:09 +0200 Message-Id: <20210716155009.32118-1-ludo@gnu.org> X-Mailer: git-send-email 2.32.0 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=1626450669; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=gXsinWHsyyA8R7R9nEQazXqz3tA578hyLiPZDtKjgvY=; b=igggAMlfjv6y5ZLCxczxevz+sH58rZDZE/fPskgYX8XiPeAtzuAkLJymzvDXC74LlwN9a5 ikwbnxvnv/IQAPMaib93JKITPRDr1cFrDoiiyQDtbqrxcHpWVf6CnfQZ5B/QKPaS9Ud172 T1P157XF7Wij7jDfs5h/wv379CEiL35YRH2ojT4wfbj3IiuYBw/jkaxAZy+1878dljqK7M +yu9vaaVj/KSsuMpLguINfP+6BrsR5hcUj9yHdmYl2/jFHj9AESrNuXlhUpO0K7uuWzQ43 zCY2lUZ91/kWRHIkXpqsaN7o9FZuI/W+ZQ0Idfz/XDypB/14O96eVVvt97VtPw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626450669; a=rsa-sha256; cv=none; b=KHtTWfuJU0LQFKlok8uYK835NHcImKsGiGsOE+FXRWRSxIS/G25db+dSaD7wWBUZXBfdMB 8BD2W8J05h2wShfC3Cs14I3Q8MmtdKsSO3Bm5B+OrZTW5eUuvW7ZxZiQjqVvIhgk4tfcT0 D40dH3acx/VcTSmzLB+9ZN7XWMXP8Tdy8+Jh63yqmFrjCvSAFPaIW4ywOitYowKEDsNsHi UaA2SHQEAwWP0sOH2ey8YT+qIci/Q55hqpk8euAXaAJQtoeRPW3gZSfeERktQGZk9WJkGY KbtjkWvmZeaemyy5U8N+LWHDNE56kLAvQRb2mHrwEcqOBVGmCCpo2w/Zi7lXWg== 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: -1.91 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: 2AA1A7CFF X-Spam-Score: -1.91 X-Migadu-Scanner: scn0.migadu.com X-TUID: R+P9gimf0/BP Hello Guix! This series of patches updates the style of package definitions. The first one uses gexps and ‘local-file’ in (gnu packages base). The rest is about removing reliance on input labels in build-side code, primarily by changing: (string-append (assoc-ref inputs "LABEL") "FILE") to one of: (search-input-file inputs "FILE") (search-input-directory inputs "FILE") This change will help if we eventually remove input labels entirely from the API (remember that input labels are now unnecessary in package definitions but they’re still returned by ‘package-inputs’ and similar procedures). The idea is that code should not rely on package names when looking for files as this would prevent things such as ‘--with-inputs=openmpi=mpich’ since the label in the original package would be “openmpi” whereas it’d be “mpich” in the transformed package. In this case (a kind of “virtual dependencies”), a better idiom is: (search-input-file inputs "lib/libmpi.so") as this explicitly accommodates any implementation of that library. I initially made the ‘search-input-file’ changes by grepping for “(string-append (search-input inputs”, replacing everything in wgrep mode. I then reviewed changes one by one (though without rebuilding everything) and committed them in chunks of similar changes for easier review/bisecting. I’d like to push this to core-updates soonish. Feedback welcome! Ludo’. Ludovic Courtès (15): gnu: commencement: Use gexps and 'local-file' to refer to patches. gnu: tzdata: Remove input labels. gnu: Simplify "Xvbf" invocation in pre-check phases. gnu: Use 'search-input-directory' when looking for tzdata. gnu: Use 'search-input-directory' for the SDL header directory. gnu: Use 'search-input-directory' for the OpenEXR header directory. gnu: Use 'search-input-file' when searching for Automake files. gnu: Use 'search-input-directory' for the Eigen header directory. gnu: Use 'search-input-directory' for glibc locale data. gnu: Use 'search-input-directory' when looking for C/C++ library headers. gnu: Use 'search-input-file' when looking for *.so and *.a. gnu: Use 'search-input-file' when looking for executables. gnu: mozjs: Use 'which' where appropriate. gnu: Use 'search-input-file' when looking for .jar files. gnu: Use 'search-input-directory' and 'search-input-file' where appropriate. gnu/packages/admin.scm | 6 +- gnu/packages/arcan.scm | 6 +- gnu/packages/audio.scm | 15 +- gnu/packages/axoloti.scm | 8 +- gnu/packages/backup.scm | 3 +- gnu/packages/base.scm | 128 ++-- gnu/packages/benchmark.scm | 3 +- gnu/packages/bioinformatics.scm | 79 ++- gnu/packages/boost.scm | 7 +- gnu/packages/bootloaders.scm | 42 +- gnu/packages/calcurse.scm | 4 +- gnu/packages/calendar.scm | 4 +- gnu/packages/cedille.scm | 3 +- gnu/packages/chemistry.scm | 3 +- gnu/packages/commencement.scm | 902 ++++++++++++++-------------- gnu/packages/compression.scm | 10 +- gnu/packages/cran.scm | 25 +- gnu/packages/cups.scm | 5 +- gnu/packages/dictionaries.scm | 5 +- gnu/packages/django.scm | 3 +- gnu/packages/dlang.scm | 4 +- gnu/packages/education.scm | 32 +- gnu/packages/emacs-xyz.scm | 67 +-- gnu/packages/emulators.scm | 13 +- gnu/packages/engineering.scm | 32 +- gnu/packages/entr.scm | 6 +- gnu/packages/file-systems.scm | 22 +- gnu/packages/finance.scm | 7 +- gnu/packages/flashing-tools.scm | 6 +- gnu/packages/fontutils.scm | 3 +- gnu/packages/freedesktop.scm | 3 +- gnu/packages/game-development.scm | 16 +- gnu/packages/games.scm | 104 ++-- gnu/packages/geo.scm | 6 +- gnu/packages/gimp.scm | 6 +- gnu/packages/glib.scm | 16 +- gnu/packages/gnome.scm | 51 +- gnu/packages/gnupg.scm | 12 +- gnu/packages/gnuzilla.scm | 14 +- gnu/packages/golang.scm | 12 +- gnu/packages/graphics.scm | 19 +- gnu/packages/graphviz.scm | 5 +- gnu/packages/groovy.scm | 2 +- gnu/packages/guile-xyz.scm | 10 +- gnu/packages/haskell-xyz.scm | 5 +- gnu/packages/haskell.scm | 7 +- gnu/packages/hurd.scm | 9 +- gnu/packages/ibus.scm | 9 +- gnu/packages/image-processing.scm | 7 +- gnu/packages/image-viewers.scm | 9 +- gnu/packages/image.scm | 6 +- gnu/packages/irc.scm | 2 +- gnu/packages/irods.scm | 19 +- gnu/packages/java-graphics.scm | 3 +- gnu/packages/java.scm | 91 ++- gnu/packages/julia.scm | 6 +- gnu/packages/kde-frameworks.scm | 15 +- gnu/packages/kde-multimedia.scm | 3 +- gnu/packages/kde-pim.scm | 14 +- gnu/packages/kde-plasma.scm | 3 +- gnu/packages/kde.scm | 10 +- gnu/packages/kodi.scm | 3 +- gnu/packages/language.scm | 10 +- gnu/packages/less.scm | 9 +- gnu/packages/libreoffice.scm | 7 +- gnu/packages/linux.scm | 54 +- gnu/packages/lisp-xyz.scm | 52 +- gnu/packages/lisp.scm | 11 +- gnu/packages/llvm.scm | 15 +- gnu/packages/lua.scm | 4 +- gnu/packages/lxde.scm | 9 +- gnu/packages/machine-learning.scm | 17 +- gnu/packages/mail.scm | 12 +- gnu/packages/mate.scm | 4 +- gnu/packages/maths.scm | 34 +- gnu/packages/messaging.scm | 7 +- gnu/packages/mpi.scm | 12 +- gnu/packages/music.scm | 14 +- gnu/packages/netpbm.scm | 8 +- gnu/packages/networking.scm | 32 +- gnu/packages/node.scm | 22 +- gnu/packages/ocaml.scm | 10 +- gnu/packages/orpheus.scm | 9 +- gnu/packages/package-management.scm | 4 +- gnu/packages/pascal.scm | 6 +- gnu/packages/password-utils.scm | 6 +- gnu/packages/perl.scm | 5 +- gnu/packages/photo.scm | 8 +- gnu/packages/pretty-print.scm | 5 +- gnu/packages/pumpio.scm | 6 +- gnu/packages/python-crypto.scm | 4 +- gnu/packages/python-xyz.scm | 34 +- gnu/packages/python.scm | 4 +- gnu/packages/qt.scm | 4 +- gnu/packages/radio.scm | 28 +- gnu/packages/rrdtool.scm | 4 +- gnu/packages/ruby.scm | 8 +- gnu/packages/rust.scm | 6 +- gnu/packages/scheme.scm | 8 +- gnu/packages/screen.scm | 3 +- gnu/packages/security-token.scm | 19 +- gnu/packages/selinux.scm | 7 +- gnu/packages/serialization.scm | 3 +- gnu/packages/spice.scm | 4 +- gnu/packages/statistics.scm | 8 +- gnu/packages/suckless.scm | 4 +- gnu/packages/sync.scm | 5 +- gnu/packages/syndication.scm | 7 +- gnu/packages/telephony.scm | 11 +- gnu/packages/terminals.scm | 2 +- gnu/packages/tex.scm | 4 +- gnu/packages/tls.scm | 3 +- gnu/packages/uml.scm | 3 +- gnu/packages/version-control.scm | 30 +- gnu/packages/video.scm | 14 +- gnu/packages/vim.scm | 6 +- gnu/packages/virtualization.scm | 27 +- gnu/packages/vpn.scm | 12 +- gnu/packages/web.scm | 4 +- gnu/packages/wine.scm | 4 +- gnu/packages/wm.scm | 14 +- gnu/packages/wxwidgets.scm | 10 +- gnu/packages/xdisorg.scm | 5 +- gnu/packages/xfce.scm | 3 +- gnu/packages/xorg.scm | 16 +- 125 files changed, 1198 insertions(+), 1472 deletions(-) base-commit: 12c2648f4e8e050d9374ca70efd1856dc8238979 -- 2.32.0