From patchwork Thu Jan 27 14:38:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 36847 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0BAEF27BBEA; Thu, 27 Jan 2022 14:52:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9E2D327BBE9 for ; Thu, 27 Jan 2022 14:52:04 +0000 (GMT) Received: from localhost ([::1]:41322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD683-0001IL-P3 for patchwork@mira.cbaines.net; Thu, 27 Jan 2022 09:52:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD5vS-00020H-SY for guix-patches@gnu.org; Thu, 27 Jan 2022 09:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33480) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD5vS-0005le-I0 for guix-patches@gnu.org; Thu, 27 Jan 2022 09:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nD5vS-0004M4-Bw for guix-patches@gnu.org; Thu, 27 Jan 2022 09:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53584] guix: Use 'gexp->derivation' instead of 'build-expression->derivation'. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Jan 2022 14:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53584 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 53584@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.164329430416688 (code B ref -1); Thu, 27 Jan 2022 14:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Jan 2022 14:38:24 +0000 Received: from localhost ([127.0.0.1]:54616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nD5up-0004L6-PP for submit@debbugs.gnu.org; Thu, 27 Jan 2022 09:38:23 -0500 Received: from lists.gnu.org ([209.51.188.17]:48678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nD5un-0004Ky-Eb for submit@debbugs.gnu.org; Thu, 27 Jan 2022 09:38:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD5un-0000g3-6u for guix-patches@gnu.org; Thu, 27 Jan 2022 09:38:21 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:36757) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD5uj-0005jB-MR for guix-patches@gnu.org; Thu, 27 Jan 2022 09:38:19 -0500 Date: Thu, 27 Jan 2022 14:38:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1643294295; bh=sWuarFDTeWxZeEqcAZzfDJFEFMxJO3CvLkwOT0+37+8=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=hRPpok5dDvfBKTibabv0qMySp/WlpHzXD140Xnr/8+/+KKyH41XkPoK3wWzQ5lAU5 1MwppfGwoHFc0R2l6fRKRzcKwXY+XDUiWwP4rDkV1GDzf6XPhLPWzDyWIdLs+li8Hh nPB3YcpPkK4OUy+EYd6gUGXbBWaHNhn5FXV3JeSD52T/tYiQZCH5IZgIxnXbbrNmse Z230VChiK0OXXL0fOEqwD6nO4siQrGjk2MIvZ2nyjejFLhdiMXV7EkimCFDGE56Kts LPANri784IHeWzWTNHptrawS7V+xg1ABNCfaKpzJp12dn1zQUTqGs7uImgrwyE30az 5gx8OPUvjz4Aw== Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.134; envelope-from=phodina@protonmail.com; helo=mail-40134.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi, I've noticed in the output of bootstraping the guix package some warnings about deprecated expression. ---- Petr From e128b9d35060187b04ebd36cabd152f0e968dc87 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Thu, 27 Jan 2022 15:32:35 +0100 Subject: [PATCH] guix: Use 'gexp->derivation' instead of 'build-expression->derivation'. * guix/derivations.scm: Update deprecated expression. * guix/grafts.scm: Same as above. diff --git a/guix/derivations.scm b/guix/derivations.scm index f77ea179f4..615bb161d1 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -1218,7 +1218,7 @@ (define builder #:opts %auto-compilation-options))))) files))) - (build-expression->derivation store name builder + (gexp->derivation store name builder #:inputs `(("modules" ,module-dir)) #:system system #:guile-for-build guile diff --git a/guix/grafts.scm b/guix/grafts.scm index 0ffda8f9aa..e0a97e895b 100644 --- a/guix/grafts.scm +++ b/guix/grafts.scm @@ -134,7 +134,7 @@ (define properties ((($ sources source-outputs targets target-outputs) ...) (let ((sources (zip sources source-outputs)) (targets (zip targets target-outputs))) - (build-expression->derivation store name build + (gexp->derivation store name build #:system system #:guile-for-build guile #:modules '((guix build graft) -- 2.34.0