ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 06:06:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Rename "octave" to "octave-cli".

Browse source 
* 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:
Kei Kebreau 2018-12-01 23:15:14 -05:00
parent ec60c3a581
commit 5537603fbf
No known key found for this signature in database
GPG key ID: E6A5EE3C19467A0D
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/engineering.scm
View file

@ -1709,7 +1709,7 @@ (define-public qucs
("gcc-toolchain" ,gcc-toolchain) ("gcc-toolchain" ,gcc-toolchain)
("iverilog" ,iverilog) ("iverilog" ,iverilog)
("libtool" ,libtool) ("libtool" ,libtool)
("octave" ,octave) ("octave" ,octave-cli)
("qt4" ,qt-4) ("qt4" ,qt-4)
("sed" ,sed))) ("sed" ,sed)))
(home-page "http://qucs.sourceforge.net/") (home-page "http://qucs.sourceforge.net/")
@ -1839,7 +1839,7 @@ (define-public qucs-s
("libtool" ,libtool) ("libtool" ,libtool)
("mpi" ,openmpi) ("mpi" ,openmpi)
("ngspice" ,ngspice) ("ngspice" ,ngspice)
("octave" ,octave) ("octave" ,octave-cli)
("qt4" ,qt-4) ("qt4" ,qt-4)
("qucs" ,qucs) ("qucs" ,qucs)
("sed" ,sed) ("sed" ,sed)

2
gnu/packages/machine-learning.scm
View file

@ -495,7 +495,7 @@ (define (delete-ifdefs file)
`(("python" ,python) `(("python" ,python)
("numpy" ,python-numpy) ("numpy" ,python-numpy)
("r-minimal" ,r-minimal) ("r-minimal" ,r-minimal)
("octave" ,octave) ("octave" ,octave-cli)
("swig" ,swig) ("swig" ,swig)
("eigen" ,eigen) ("eigen" ,eigen)
("hdf5" ,hdf5) ("hdf5" ,hdf5)

16
gnu/packages/maths.scm
View file

@ -1413,9 +1413,9 @@ (define-public ceres
;; For a fully featured Octave, users are strongly recommended also to install ;; For a fully featured Octave, users are strongly recommended also to install
;; the following packages: less, ghostscript, gnuplot. ;; the following packages: less, ghostscript, gnuplot.
(define-public octave (define-public octave-cli
(package (package
(name "octave") (name "octave-cli")
(version "4.4.1") (version "4.4.1")
(source (source
(origin (origin
@ -1498,20 +1498,20 @@ (define-public octave
(license license:gpl3+))) (license license:gpl3+)))
(define-public qtoctave (define-public qtoctave
(package (inherit octave) (package (inherit octave-cli)
(name "qtoctave") (name "qtoctave")
(source (origin (source (origin
(inherit (package-source octave)))) (inherit (package-source octave-cli))))
(inputs (inputs
`(("qscintilla" ,qscintilla) `(("qscintilla" ,qscintilla)
("qt" ,qtbase) ("qt" ,qtbase)
,@(package-inputs octave))) ,@(package-inputs octave-cli)))
(native-inputs (native-inputs
`(("qttools" , qttools) ;for lrelease `(("qttools" , qttools) ;for lrelease
("texlive" ,texlive) ;for texi2dvi ("texlive" ,texlive) ;for texi2dvi
,@(package-native-inputs octave))) ,@(package-native-inputs octave-cli)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments octave) (substitute-keyword-arguments (package-arguments octave-cli)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-before 'configure 'patch-qscintilla-library-name (add-before 'configure 'patch-qscintilla-library-name
@ -3580,7 +3580,7 @@ (define-public flann
`(("unzip" ,unzip))) `(("unzip" ,unzip)))
(inputs (inputs
`(("hdf5" ,hdf5) `(("hdf5" ,hdf5)
("octave" ,octave) ("octave" ,octave-cli)
("python" ,python-2) ; print syntax ("python" ,python-2) ; print syntax
;; ("python2-numpy" ,python2-numpy) ; only required for the tests ;; ("python2-numpy" ,python2-numpy) ; only required for the tests
("zlib" ,zlib))) ("zlib" ,zlib)))