From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Kebreau Subject: Re: Octave & QtOctave Date: Sun, 02 Dec 2018 14:25:27 -0500 Message-ID: <87efazk9y0.fsf@posteo.net> References: <875zwnqomz.fsf@posteo.net> <87a7lyzkk2.fsf@gmail.com> <20181124221022.ankjuz4mdpkoohkn@abyayala> <87k1l1w3n0.fsf@gnu.org> <87in0ijtku.fsf@posteo.net> <87va4h5vhr.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTXN6-0003O8-T3 for guix-devel@gnu.org; Sun, 02 Dec 2018 14:25:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTXN5-0005F4-SL for guix-devel@gnu.org; Sun, 02 Dec 2018 14:25:40 -0500 Received: from mout01.posteo.de ([185.67.36.65]:38985) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gTXN5-0005CM-JS for guix-devel@gnu.org; Sun, 02 Dec 2018 14:25:39 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id D2716160065 for ; Sun, 2 Dec 2018 20:25:30 +0100 (CET) In-Reply-To: (swedebugia's message of "Thu, 29 Nov 2018 17:21:31 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: swedebugia Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable swedebugia writes: > On 2018-11-28 11:47, Ludovic Court=C3=A8s wrote: >> Kei Kebreau skribis: > snip > >>> >>> I agree with ng0 that Octave and its GUI interface should be kept in >>> separate packages, as the difference in size is more than 5000 MiB. >>> I also agree that the GUI package should be named "octave", but I don't >>> know whether the CLI package should be named "octave-minimal" or >>> "octave-cli". I find myself leaning toward "octave-cli" because the CLI >>> package does include some non-essential dependencies. >> >> Makes sense to me. If others agree with this (=E2=80=9Coctave-cli=E2=80= =9D rather than >> =E2=80=9Coctave-minimal=E2=80=9D), go ahead! > > I agree. Here are two tentative patches that make the changes we've discussed. Also, should we make a deprecated-package definition for qtoctave? --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Rename-octave-to-octave-cli.patch >From f31adbdaa5582e1c2d02adc2e7fc6afa2fc6e171 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 1 Dec 2018 23:15:14 -0500 Subject: [PATCH 1/2] gnu: Rename "octave" to "octave-cli". * gnu/packages/maths.scm (octave): Rename to... (octave-cli): ...this. [name]: Change to "octave-cli". (qtoctave): Inherit from octave-cli. (flann)[inputs]: Adjust accordingly. * gnu/packages/engineering.scm (qucs)[inputs]: Likewise. (qucs-s)[inputs]: Likewise. * gnu/packages/machine-learning.scm (shogun)[inputs]: Likewise. --- gnu/packages/engineering.scm | 4 ++-- gnu/packages/machine-learning.scm | 2 +- gnu/packages/maths.scm | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 008035649..761cc1282 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1702,7 +1702,7 @@ parallel computing platforms. It also supports serial execution.") ("gcc-toolchain" ,gcc-toolchain) ("iverilog" ,iverilog) ("libtool" ,libtool) - ("octave" ,octave) + ("octave" ,octave-cli) ("qt4" ,qt-4) ("sed" ,sed))) (home-page "http://qucs.sourceforge.net/") @@ -1832,7 +1832,7 @@ simulations are also supported.") ("libtool" ,libtool) ("mpi" ,openmpi) ("ngspice" ,ngspice) - ("octave" ,octave) + ("octave" ,octave-cli) ("qt4" ,qt-4) ("qucs" ,qucs) ("sed" ,sed) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a7df9dce0..c4a25eabd 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -493,7 +493,7 @@ sample proximities between pairs of cases.") `(("python" ,python) ("numpy" ,python-numpy) ("r-minimal" ,r-minimal) - ("octave" ,octave) + ("octave" ,octave-cli) ("swig" ,swig) ("eigen" ,eigen) ("hdf5" ,hdf5) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 3dabef441..bcd70232f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1413,9 +1413,9 @@ can solve two kinds of problems: ;; For a fully featured Octave, users are strongly recommended also to install ;; the following packages: less, ghostscript, gnuplot. -(define-public octave +(define-public octave-cli (package - (name "octave") + (name "octave-cli") (version "4.4.1") (source (origin @@ -1498,20 +1498,20 @@ script files.") (license license:gpl3+))) (define-public qtoctave - (package (inherit octave) + (package (inherit octave-cli) (name "qtoctave") (source (origin - (inherit (package-source octave)))) + (inherit (package-source octave-cli)))) (inputs `(("qscintilla" ,qscintilla) ("qt" ,qtbase) - ,@(package-inputs octave))) + ,@(package-inputs octave-cli))) (native-inputs `(("qttools" , qttools) ;for lrelease ("texlive" ,texlive) ;for texi2dvi - ,@(package-native-inputs octave))) + ,@(package-native-inputs octave-cli))) (arguments - (substitute-keyword-arguments (package-arguments octave) + (substitute-keyword-arguments (package-arguments octave-cli) ((#:phases phases) `(modify-phases ,phases (add-before 'configure 'patch-qscintilla-library-name @@ -3577,7 +3577,7 @@ in finite element programs.") `(("unzip" ,unzip))) (inputs `(("hdf5" ,hdf5) - ("octave" ,octave) + ("octave" ,octave-cli) ("python" ,python-2) ; print syntax ;; ("python2-numpy" ,python2-numpy) ; only required for the tests ("zlib" ,zlib))) -- 2.19.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Rename-qtoctave-to-octave.patch >From 2cdaf3cbc1c611acae606af47479eb14c479153e Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 1 Dec 2018 23:37:50 -0500 Subject: [PATCH 2/2] gnu: Rename "qtoctave" to "octave". * gnu/packages/maths.scm (qtoctave): Rename to... (octave): ...this. [name]: Change to "octave". --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index bcd70232f..8b1c9b413 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1497,9 +1497,9 @@ Work may be performed both at the interactive command-line as well as via script files.") (license license:gpl3+))) -(define-public qtoctave +(define-public octave (package (inherit octave-cli) - (name "qtoctave") + (name "octave") (source (origin (inherit (package-source octave-cli)))) (inputs -- 2.19.2 --=-=-=--