From patchwork Sat Feb 16 17:40:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 1103 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 752CE16C49; Sat, 16 Feb 2019 17:41:17 +0000 (GMT) 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,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED 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 11E7B16C47 for ; Sat, 16 Feb 2019 17:41:17 +0000 (GMT) Received: from localhost ([127.0.0.1]:58635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gv3xk-0004oQ-Mz for patchwork@mira.cbaines.net; Sat, 16 Feb 2019 12:41:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gv3xY-0004mp-8j for guix-patches@gnu.org; Sat, 16 Feb 2019 12:41:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gv3xW-0006y0-V1 for guix-patches@gnu.org; Sat, 16 Feb 2019 12:41:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51219) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gv3xW-0006xw-Nr for guix-patches@gnu.org; Sat, 16 Feb 2019 12:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gv3xW-0005XI-LB for guix-patches@gnu.org; Sat, 16 Feb 2019 12:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34501] [PATCH] gnu: Remove unneeded uses of python-minimal. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Feb 2019 17:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34501 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34501@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155033884721237 (code B ref -1); Sat, 16 Feb 2019 17:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Feb 2019 17:40:47 +0000 Received: from localhost ([127.0.0.1]:50498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gv3xG-0005WS-E9 for submit@debbugs.gnu.org; Sat, 16 Feb 2019 12:40:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49901) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gv3xE-0005WF-GZ for submit@debbugs.gnu.org; Sat, 16 Feb 2019 12:40:44 -0500 Received: from lists.gnu.org ([209.51.188.17]:54281) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gv3x8-0006qF-Qp for submit@debbugs.gnu.org; Sat, 16 Feb 2019 12:40:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gv3x7-0004lw-J5 for guix-patches@gnu.org; Sat, 16 Feb 2019 12:40:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gv3x5-0006pM-9t for guix-patches@gnu.org; Sat, 16 Feb 2019 12:40:37 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:37833) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gv3x3-0006oU-8W for guix-patches@gnu.org; Sat, 16 Feb 2019 12:40:33 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 6ECA130E0 for ; Sat, 16 Feb 2019 12:40:31 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sat, 16 Feb 2019 12:40:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=K8jHdZiYMsY6VGeg03h8waCIwR JCOAXfVdDS8yiGyOI=; b=edwqdmMp5NoVmPm+jI6QGjfGhVKue4iwJbyOyW7Jf8 pEOuuwdz8QhIw1qok21eMn2P6ldRdBLCvz9OjYQ9qgCq7mPzBWsI6TPovawi8ATb wwcJpr7JSe/UBBvhpxudt6YrrHWFHo3zzGK4+rvqAocNShqA7Pe/wq3UCO4hVVGx dmekqhEZLjHggkv2eba0uv5ib/C5NKi+3dmlU3Vsh80ekZCvQAHZudnZCFtMKQwN q0YKG20NxA+7WyZTF3HhD8yACKmTozhuNtURtjGGHX/30St57k/gew+2TUL+Hbtk HcT6PA7rjgJj3EmJigKXgBLc+nmjBRD1fia4KBhZ+DEw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=K8jHdZiYMsY6VGeg0 3h8waCIwRJCOAXfVdDS8yiGyOI=; b=IPkx347oTpGeBA77uFsTfiBBwk5KHWWrW IcMb2BM2vc2UuwaFCFqdgEWqce+ReOr+7oXRXht8owVPHyWMUPmxOqiYsTSuZj+c wChyGQAWq8v5GYPc0YdmBwciGihsxcR4ErgFFLedcBaYtLFALFKeK1Y6eyJ2/W6X fSiqNtNHGa6acOu/+KjjQP6nPacTAJBnq8PIZop6J1uDdvGoF/Fa1q0uMAk+vNyQ /HDjoqdsjChB7PHWn6HUddzWAWx/GfOdRdLhpjsm35tYWIGSyKk61GIRfyhr019D rplFHBuWwtJlXVP2jtdTGq13ZnMi3T2A0Qajh6X16MlsCTsWK+vgw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtledguddtiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu fedttdenucenucfjughrpefhvffufffkofgggfestdekredtredttdenucfhrhhomhepof grrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghsthhmrghilhdrtghomheqnecu ffhomhgrihhnpehhihhshhgrmhdrhhhmnecukfhppeeivddrudeirddvvdeirddugedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhm necuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 7959C100E5 for ; Sat, 16 Feb 2019 12:40:30 -0500 (EST) From: Marius Bakke Date: Sat, 16 Feb 2019 18:40:29 +0100 Message-Id: <20190216174029.31799-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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 The "python-minimal" package exists mostly to resolve a dependency cycle. To reduce duplication, packages should prefer the regular Python variants. * gnu/packages/admin.scm (htop)[native-inputs]: Change PYTHON-MINIMAL-WRAPPER to PYTHON-WRAPPER. * gnu/packages/crypto.scm (botan)[native-inputs]: Likewise. * gnu/packages/bioinformatics.scm (sambamba)[native-inputs]: Change PYTHON-MINIMAL to PYTHON. * gnu/packages/dictionaries.scm (apertium)[native-inputs]: Likewise. * gnu/packages/databases.scm (mongodb)[native-inputs]: Change PYTHON2-MINIMAL to PYTHON2. * gnu/packages/games.scm (openttd-opensfx, openttd-openmsx)[native-inputs]: Likewise. * gnu/packages/gnome.scm (deja-dup)[native-inputs]: Likewise. --- gnu/packages/admin.scm | 2 +- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/crypto.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/dictionaries.scm | 2 +- gnu/packages/games.scm | 4 ++-- gnu/packages/gnome.scm | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c0c991c137..a45c7ed874 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -298,7 +298,7 @@ graphs and can export its output to different formats.") (inputs `(("ncurses" ,ncurses))) (native-inputs - `(("python" ,python-minimal-wrapper))) ; for scripts/MakeHeader.py + `(("python" ,python-wrapper))) ; for scripts/MakeHeader.py (home-page "https://hisham.hm/htop/") (synopsis "Interactive process viewer") (description diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 933b8b9adf..69c85563e1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11192,7 +11192,7 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") (native-inputs `(("ldc" ,ldc) ("rdmd" ,rdmd) - ("python" ,python-minimal) + ("python" ,python) ("biod" ,(let ((commit "4f1a7d2fb7ef3dfe962aa357d672f354ebfbe42e")) (origin diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index ffef4ff8e4..0345a59285 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -751,7 +751,7 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R (replace 'check (lambda _ (invoke "./botan-test")))))) (native-inputs - `(("python" ,python-minimal-wrapper) + `(("python" ,python-wrapper) ("python-docutils" ,python-docutils))) (inputs `(("sqlite" ,sqlite) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6129e3c0cb..e62e889f8c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -335,7 +335,7 @@ applications.") (native-inputs `(("valgrind" ,valgrind) ("perl" ,perl) - ("python" ,python2-minimal) + ("python" ,python-2) ("python2-pymongo" ,python2-pymongo) ("python2-pyyaml" ,python2-pyyaml) ("tzdata" ,tzdata))) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 8c39453650..e0cd7604b6 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -372,7 +372,7 @@ word (e.g. cats) into its lemma \"cat\" and the grammatical information ("flex" ,flex) ("pkg-config" ,pkg-config) ;; python is only required for running the test suite - ("python-minimal" ,python-minimal))) + ("python" ,python))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6d9e63c4e9..bfbd370228 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2413,7 +2413,7 @@ OpenGFX provides you with... (build-system gnu-build-system) (native-inputs `(("catcodec" ,catcodec) - ("python" ,python2-minimal))) + ("python" ,python-2))) (arguments `(#:make-flags (list (string-append "INSTALL_DIR=" %output @@ -2450,7 +2450,7 @@ the original Transport Tycoon Deluxe.") "0nskq97a6fsv1v6d62zf3yb8whzhqnlh3lap3va3nzvj7csjgf7c")))) (build-system gnu-build-system) (native-inputs - `(("python" ,python2-minimal))) + `(("python" ,python-2))) (arguments `(#:make-flags (list (string-append "INSTALL_DIR=" %output diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2f99755933..8753be7890 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -277,7 +277,7 @@ features to enable users to create their discs easily and quickly.") `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gobject-introspection" ,gobject-introspection) ("duplicity" ,duplicity) - ("python" ,python2-minimal) + ("python" ,python-2) ("python-pygobject" ,python2-pygobject) ("gtk+" ,gtk+) ("libnotify" ,libnotify)