Hello Kei, Kei Kebreau <kkebr...@posteo.net> 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:
From 2b04caa66c17da257dfb4f4ccb94e8d629b95e53 Mon Sep 17 00:00:00 2001
From: Alex Vong <alexvong1...@gmail.com>
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.
---
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
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <m...@tobias.gr>
;;; Copyright © 2018 Clément Lassieur <clem...@lassieur.org>
;;; Copyright © 2018 Jonathan Brielmaier <jonathan.brielma...@web.de>
+;;; Copyright © 2018 Alex Vong <alexvong1...@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1678,7 +1679,7 @@ parallel computing platforms. It also supports serial execution.")
`("ASCOBINDIR" ":" prefix
(,(string-append (assoc-ref inputs "asco") "/bin")))
`("QUCS_OCTAVE" ":" prefix
- (,(string-append (assoc-ref inputs "octave") "/bin/octave")))))
+ (,(string-append (assoc-ref inputs "octave-cli") "/bin/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 serial execution.")
("gcc-toolchain" ,gcc-toolchain)
("iverilog" ,iverilog)
("libtool" ,libtool)
- ("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 inputs "asco")
"/bin")))
- `("QUCS_OCTAVE" ":" prefix (,(string-append (assoc-ref inputs "octave")
- "/bin/octave"))))
+ `("QUCS_OCTAVE" ":" prefix (,(string-append (assoc-ref inputs "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)
- ("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-learning.scm
index a7df9dce0..2af1cc02b 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2018 Fis Trivial <ybbs.da...@hotmail.com>
;;; Copyright © 2018 Julien Lepiller <jul...@lepiller.eu>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefl...@bjoernhoefling.de>
+;;; Copyright © 2018 Alex Vong <alexvong1...@gmail.com>
;;;
;;; 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)
- ("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
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -29,6 +29,7 @@
;;; Copyright © 2018 Marius Bakke <mba...@fastmail.com>
;;; Copyright © 2018 Eric Brown <br...@fastmail.com>
;;; Copyright © 2018 Julien Lepiller <jul...@lepiller.eu>
+;;; Copyright © 2018 Alex Vong <alexvong1...@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1413,9 +1414,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
@@ -1497,21 +1498,21 @@ Work may be performed both at the interactive command-line as well as via
script files.")
(license license:gpl3+)))
-(define-public qtoctave
- (package (inherit octave)
- (name "qtoctave")
+(define-public octave
+ (package (inherit octave-cli)
+ (name "octave")
(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 +3578,7 @@ in finite element programs.")
`(("unzip" ,unzip)))
(inputs
`(("hdf5" ,hdf5)
- ("octave" ,octave)
+ ("octave-cli" ,octave-cli)
("python" ,python-2) ; print syntax
;; ("python2-numpy" ,python2-numpy) ; only required for the tests
("zlib" ,zlib)))
--
2.19.2
Cheers, Alex
signature.asc
Description: PGP signature
