mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
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.
This commit is contained in:
parent
ec60c3a581
commit
5537603fbf
3 changed files with 11 additions and 11 deletions
|
@ -1709,7 +1709,7 @@ (define-public qucs
|
|||
("gcc-toolchain" ,gcc-toolchain)
|
||||
("iverilog" ,iverilog)
|
||||
("libtool" ,libtool)
|
||||
("octave" ,octave)
|
||||
("octave" ,octave-cli)
|
||||
("qt4" ,qt-4)
|
||||
("sed" ,sed)))
|
||||
(home-page "http://qucs.sourceforge.net/")
|
||||
|
@ -1839,7 +1839,7 @@ (define-public qucs-s
|
|||
("libtool" ,libtool)
|
||||
("mpi" ,openmpi)
|
||||
("ngspice" ,ngspice)
|
||||
("octave" ,octave)
|
||||
("octave" ,octave-cli)
|
||||
("qt4" ,qt-4)
|
||||
("qucs" ,qucs)
|
||||
("sed" ,sed)
|
||||
|
|
|
@ -495,7 +495,7 @@ (define (delete-ifdefs file)
|
|||
`(("python" ,python)
|
||||
("numpy" ,python-numpy)
|
||||
("r-minimal" ,r-minimal)
|
||||
("octave" ,octave)
|
||||
("octave" ,octave-cli)
|
||||
("swig" ,swig)
|
||||
("eigen" ,eigen)
|
||||
("hdf5" ,hdf5)
|
||||
|
|
|
@ -1413,9 +1413,9 @@ (define-public ceres
|
|||
|
||||
;; 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 @@ (define-public octave
|
|||
(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
|
||||
|
@ -3580,7 +3580,7 @@ (define-public flann
|
|||
`(("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)))
|
||||
|
|
Loading…
Reference in a new issue