From patchwork Tue Jun 16 16:16:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 22747 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 0049F27BBE3; Tue, 16 Jun 2020 17:17:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 88E7C27BBE1 for ; Tue, 16 Jun 2020 17:17:11 +0100 (BST) Received: from localhost ([::1]:43206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlEGt-0001lF-1a for patchwork@mira.cbaines.net; Tue, 16 Jun 2020 12:17:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlEGm-0001ka-C9 for guix-patches@gnu.org; Tue, 16 Jun 2020 12:17:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlEGk-0005zj-92 for guix-patches@gnu.org; Tue, 16 Jun 2020 12:17:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jlEGk-0004xU-4z for guix-patches@gnu.org; Tue, 16 Jun 2020 12:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41889] [PATCH] Fix ipython/jupyter References: <87o8pj9ymu.fsf@alice.lan> In-Reply-To: <87o8pj9ymu.fsf@alice.lan> Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jun 2020 16:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41889@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 41889-submit@debbugs.gnu.org id=B41889.159232418819008 (code B ref 41889); Tue, 16 Jun 2020 16:17:02 +0000 Received: (at 41889) by debbugs.gnu.org; 16 Jun 2020 16:16:28 +0000 Received: from localhost ([127.0.0.1]:49472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlEGC-0004wW-DT for submit@debbugs.gnu.org; Tue, 16 Jun 2020 12:16:28 -0400 Received: from sender4-of-o53.zoho.com ([136.143.188.53]:21345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlEGA-0004wO-K0 for 41889@debbugs.gnu.org; Tue, 16 Jun 2020 12:16:27 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1592324185; cv=none; d=zohomail.com; s=zohoarc; b=P4WQlR/EkRq00WOcStK41BdJEdBT0l4mUm3WK4a7by3OrSup1LaKNrkQVh+IAktX6g6HesiIHC1XJDedoGHABEaNzjlCkCD2dJ0ZhU0DcGfqgEe3YffH/vsOHi/fNrgCH/bfcELJyY1pzSdtM8rU4Ts4VubbTnyftiKhgIopTKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592324185; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=VagD+9B4IWQjGJNL4KHzvPXXmmvdi22acLdSNTxOPic=; b=O7Q0HKukQlslBUOAiksrQ8OXtkGgivJBkyzFOlppmm6Rv9x6o+wMB5UJS+hYU9C84Z43eCPzWxs82VIkWyxB5G+TIWIRTama3HIFHTx1HYn7PnM6gLSvWp1UWJf39BMiCmxLbUFj70tcWQ5oouDF20S7W4hpngPeJXBvLF5IHAM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1592324185; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Message-ID:Subject:Date:MIME-Version:Content-Transfer-Encoding:Content-Type; bh=VagD+9B4IWQjGJNL4KHzvPXXmmvdi22acLdSNTxOPic=; b=QB+FbCorXdPD+AdBly+yMkJ4iXlhCxrQtUiz+Y1Cun3F7EPwRH3Rfl1xBj3SIBUc ROTBIHJi0QthM9ppNyYzhktzPMlkIf1f+gHL7rZGipUS8edC1knoDG4L3ABli5n5L6k GNWO4GFL5s1tRDxPbcEzpOzl+0gh29UC+8ofK6YA= Received: from localhost (p54ad4b58.dip0.t-ipconnect.de [84.173.75.88]) by mx.zohomail.com with SMTPS id 1592324181541935.0572183386405; Tue, 16 Jun 2020 09:16:21 -0700 (PDT) From: Ricardo Wurmus Message-ID: <20200616161617.28035-1-rekado@elephly.net> Date: Tue, 16 Jun 2020 18:16:17 +0200 X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-ZohoMailClient: External 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" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/machine-learning.scm | 3 +-- gnu/packages/python-xyz.scm | 15 ++++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 0e11da41ca..cc69aa3ec1 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1817,8 +1817,7 @@ advanced research.") "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l")))) (build-system python-build-system) (propagated-inputs - `(("ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit - python-ipython)) + `(("ipython" ,python-ipython) ("numpy" ,python-numpy) ("pandas" ,python-pandas) ("scipy" ,python-scipy))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e0a738d51..5896764266 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6450,7 +6450,7 @@ callback signature using a prototype function.") (propagated-inputs `(("python-backcall" ,python-backcall) ("python-pyzmq" ,python-pyzmq) - ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-prompt-toolkit" ,python-prompt-toolkit-2) ("python-terminado" ,python-terminado) ("python-matplotlib" ,python-matplotlib) ("python-numpy" ,python-numpy) @@ -9004,8 +9004,7 @@ interactive computing.") "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" - ,(prompt-toolkit-2-instead-of-prompt-toolkit python-ipykernel)) + `(("python-ipykernel" ,python-ipykernel) ("python-notebook" ,python-notebook))) (native-inputs `(("python-certifi" ,python-certifi) @@ -9032,8 +9031,7 @@ notebooks.") "15sww2mvnkqlvx55gwa82v05062a8j1xpncnqna4k9sl53hgcig9")))) (build-system python-build-system) (propagated-inputs - `(("python-ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit - python-ipython)) + `(("python-ipython" ,python-ipython) ("python-traitlets" ,python-traitlets) ("python-widgetsnbextension" ,python-widgetsnbextension))) (native-inputs @@ -9063,8 +9061,7 @@ in the data.") "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" ,(prompt-toolkit-2-instead-of-prompt-toolkit - python-ipykernel)) + `(("python-ipykernel" ,python-ipykernel) ("python-jupyter-client" ,python-jupyter-client) ("python-prompt-toolkit" ,python-prompt-toolkit-2) ("python-pygments" ,python-pygments))) @@ -12192,10 +12189,6 @@ characters, mouse support, and auto suggestions.") ("python-six" ,python-six) ("python-pygments" ,python-pygments))))) -(define-public prompt-toolkit-2-instead-of-prompt-toolkit - (package-input-rewriting/spec - `(("python-prompt-toolkit" . ,(const python-prompt-toolkit-2))))) - (define-public python2-prompt-toolkit (package-with-python2 python-prompt-toolkit-2))