From patchwork Sun Sep 29 13:01:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 15513 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 80F0317454; Sun, 29 Sep 2019 14:02:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 493EE17451 for ; Sun, 29 Sep 2019 14:02:12 +0100 (BST) Received: from localhost ([::1]:39276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEYq3-0005hc-KK for patchwork@mira.cbaines.net; Sun, 29 Sep 2019 09:02:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57096) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEYpv-0005hA-B9 for guix-patches@gnu.org; Sun, 29 Sep 2019 09:02:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iEYpu-0000JJ-8j for guix-patches@gnu.org; Sun, 29 Sep 2019 09:02:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43766) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iEYpu-0000J8-4P for guix-patches@gnu.org; Sun, 29 Sep 2019 09:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iEYpu-000241-0q for guix-patches@gnu.org; Sun, 29 Sep 2019 09:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37553] [PATCH] inferior: Change to using guix-repl. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Sep 2019 13:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37553@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15697621087912 (code B ref -1); Sun, 29 Sep 2019 13:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Sep 2019 13:01:48 +0000 Received: from localhost ([127.0.0.1]:52587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iEYpf-00023X-KW for submit@debbugs.gnu.org; Sun, 29 Sep 2019 09:01:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:40684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iEYpd-00023Q-Tw for submit@debbugs.gnu.org; Sun, 29 Sep 2019 09:01:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57048) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEYpW-0005Yf-Ag for guix-patches@gnu.org; Sun, 29 Sep 2019 09:01:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iEYpS-0008HN-B4 for guix-patches@gnu.org; Sun, 29 Sep 2019 09:01:38 -0400 Received: from mira.cbaines.net ([2a01:7e00::f03c:91ff:fe69:8da9]:57078) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iEYpP-0008BL-2X for guix-patches@gnu.org; Sun, 29 Sep 2019 09:01:33 -0400 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 6940617450 for ; Sun, 29 Sep 2019 14:01:28 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id d1900893 for ; Sun, 29 Sep 2019 13:01:28 +0000 (UTC) From: Christopher Baines Date: Sun, 29 Sep 2019 14:01:28 +0100 Message-Id: <20190929130128.18484-1-mail@cbaines.net> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches Rather than machine-repl, that was removed in [1]. While this could work if the %load-path is such that a module that defines machine-repl is loaded, I believe the intent is that the (guix scripts repl) module comes from the Guix managing the inferior. Therefore, matching the changes in [1], switch to calling the guix-repl function with the right arguments. 1: 92a4087bf4862d5ba9b77111eba3c68c2a1c4679 * guix/inferior.scm (inferior-pipe): Call guix-repl, rather than machine-repl, and add necessary arguments. --- guix/inferior.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index dcbc954432..7c0143062b 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -137,7 +137,8 @@ it's an old Guix." `(begin (primitive-load ,(search-path %load-path "guix/scripts/repl.scm")) - ((@ (guix scripts repl) machine-repl)))))) + ((@ (guix scripts repl) guix-repl) + "-t" "machine"))))) pipe))) (define* (port->inferior pipe #:optional (close close-port))