From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Vong Subject: Re: Octave & QtOctave Date: Tue, 04 Dec 2018 22:17:27 +0800 Message-ID: <871s6xz894.fsf@gmail.com> References: <875zwnqomz.fsf@posteo.net> <87a7lyzkk2.fsf@gmail.com> <20181124221022.ankjuz4mdpkoohkn@abyayala> <87k1l1w3n0.fsf@gnu.org> <87in0ijtku.fsf@posteo.net> <87va4h5vhr.fsf@gnu.org> <87a7lnk9sb.fsf@posteo.net> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUBW9-0002FE-8i for guix-devel@gnu.org; Tue, 04 Dec 2018 09:17:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUBW5-00058y-DV for guix-devel@gnu.org; Tue, 04 Dec 2018 09:17:41 -0500 In-Reply-To: <87a7lnk9sb.fsf@posteo.net> (Kei Kebreau's message of "Sun, 02 Dec 2018 14:28:52 -0500") 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: Kei Kebreau Cc: guix-devel --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello Kei, Kei Kebreau writes: [...] > > Here are two tentative patches that make the changes we've discussed. > Also, should we make a deprecated-package definition for qtoctave? I think some additional changes related to "(assoc-ref inputs ..." needed to be made. Otherwise, looks good to me! Here is a patch I made earlier but it was not tested, feel free to cherry-pick what is needed: --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Rename-octave-to-octave-cli-and-qtoctave-to-octa.patch Content-Transfer-Encoding: quoted-printable From=202b04caa66c17da257dfb4f4ccb94e8d629b95e53 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 3 Dec 2018 03:39:40 +0800 Subject: [PATCH] gnu: Rename "octave" to "octave-cli" and "qtoctave" to "octave". * gnu/packages/maths.scm (octave): Rename to octave-cli. [name]: Change to "octave-cli". (qtoctave): Rename to octave. [name]: Change to "octave". [inherit]: Inherit from octave-cli. [source]: Likewise. [inputs]: Likewise. [native-inputs]: Likewise. [arguments]: Likewise. (flann): Update accordingly. * gnu/packages/engineering.scm (qucs): Likewise. (qucs-s): Likewise. * gnu/packages/machine-learning.scm (shogun): Likewise. =2D-- gnu/packages/engineering.scm | 11 ++++++----- gnu/packages/machine-learning.scm | 3 ++- gnu/packages/maths.scm | 21 +++++++++++---------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 008035649..27a8dface 100644 =2D-- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Cl=C3=A9ment Lassieur ;;; Copyright =C2=A9 2018 Jonathan Brielmaier +;;; Copyright =C2=A9 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -1678,7 +1679,7 @@ parallel computing platforms. It also supports seria= l execution.") `("ASCOBINDIR" ":" prefix (,(string-append (assoc-ref inputs "asco") "/bin"))) `("QUCS_OCTAVE" ":" prefix =2D (,(string-append (assoc-ref inputs "octave") "/bin/= octave"))))) + (,(string-append (assoc-ref inputs "octave-cli") "/bi= n/octave-cli"))))) #t))) #:parallel-build? #f ; race condition #:configure-flags '("--disable-doc"))) ; we need octave-epstk @@ -1702,7 +1703,7 @@ parallel computing platforms. It also supports seria= l execution.") ("gcc-toolchain" ,gcc-toolchain) ("iverilog" ,iverilog) ("libtool" ,libtool) =2D ("octave" ,octave) + ("octave-cli" ,octave-cli) ("qt4" ,qt-4) ("sed" ,sed))) (home-page "http://qucs.sourceforge.net/") @@ -1816,8 +1817,8 @@ simulations are also supported.") "/bin"))) `("ASCOBINDIR" ":" prefix (,(string-append (assoc-ref inp= uts "asco") "/bin"))) =2D `("QUCS_OCTAVE" ":" prefix (,(string-append (assoc-ref = inputs "octave") =2D "/bin/octav= e")))) + `("QUCS_OCTAVE" ":" prefix (,(string-append (assoc-ref in= puts "octave-cli") + "/bin/octave-= cli")))) (symlink qucsator (string-append out "/bin/qucsator")) #t)))))) (native-inputs @@ -1832,7 +1833,7 @@ simulations are also supported.") ("libtool" ,libtool) ("mpi" ,openmpi) ("ngspice" ,ngspice) =2D ("octave" ,octave) + ("octave-cli" ,octave-cli) ("qt4" ,qt-4) ("qucs" ,qucs) ("sed" ,sed) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learn= ing.scm index a7df9dce0..2af1cc02b 100644 =2D-- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -10,6 +10,7 @@ ;;; Copyright =C2=A9 2018 Fis Trivial ;;; Copyright =C2=A9 2018 Julien Lepiller ;;; Copyright =C2=A9 2018 Bj=C3=B6rn H=C3=B6fling +;;; Copyright =C2=A9 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -493,7 +494,7 @@ sample proximities between pairs of cases.") `(("python" ,python) ("numpy" ,python-numpy) ("r-minimal" ,r-minimal) =2D ("octave" ,octave) + ("octave-cli" ,octave-cli) ("swig" ,swig) ("eigen" ,eigen) ("hdf5" ,hdf5) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 3dabef441..3cec75893 100644 =2D-- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -29,6 +29,7 @@ ;;; Copyright =C2=A9 2018 Marius Bakke ;;; Copyright =C2=A9 2018 Eric Brown ;;; Copyright =C2=A9 2018 Julien Lepiller +;;; Copyright =C2=A9 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -1413,9 +1414,9 @@ can solve two kinds of problems: =20 ;; For a fully featured Octave, users are strongly recommended also to ins= tall ;; the following packages: less, ghostscript, gnuplot. =2D(define-public octave +(define-public octave-cli (package =2D (name "octave") + (name "octave-cli") (version "4.4.1") (source (origin @@ -1497,21 +1498,21 @@ Work may be performed both at the interactive comma= nd-line as well as via script files.") (license license:gpl3+))) =20 =2D(define-public qtoctave =2D (package (inherit octave) =2D (name "qtoctave") +(define-public octave + (package (inherit octave-cli) + (name "octave") (source (origin =2D (inherit (package-source octave)))) + (inherit (package-source octave-cli)))) (inputs `(("qscintilla" ,qscintilla) ("qt" ,qtbase) =2D ,@(package-inputs octave))) + ,@(package-inputs octave-cli))) (native-inputs `(("qttools" , qttools) ;for lrelease ("texlive" ,texlive) ;for texi2dvi =2D ,@(package-native-inputs octave))) + ,@(package-native-inputs octave-cli))) (arguments =2D (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 +3578,7 @@ in finite element programs.") `(("unzip" ,unzip))) (inputs `(("hdf5" ,hdf5) =2D ("octave" ,octave) + ("octave-cli" ,octave-cli) ("python" ,python-2) ; print syntax ;; ("python2-numpy" ,python2-numpy) ; only required for the tests ("zlib" ,zlib))) =2D-=20 2.19.2 --=-=-= Content-Type: text/plain Cheers, Alex --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQQwb8uPLAHCXSnTBVZh71Au9gJS8gUCXAaMdwAKCRBh71Au9gJS 8qh9AP46Uy+V8D6bYvplJk6jQ1GQLR1Mf97SvvRJIabqOhNveQEA2CrAJDQND8T4 so7SDCmBI1dY+BeOEDcG0ss5L3AexAc= =voij -----END PGP SIGNATURE----- --==-=-=--