Re: Octave & QtOctave
Kei Kebreau writes: > Alex Vong writes: > >> Kei Kebreau writes: >> >>> Alex Vong writes: >>> Kei Kebreau writes: > Alex Vong writes: > >> 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: >> >> From 2b04caa66c17da257dfb4f4ccb94e8d629b95e53 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. > > ... > >> - ("octave" ,octave) >> + ("octave-cli" ,octave-cli) > > I see the main difference is that you've replace the package's > associated string to "octave-cli" as well as the name, whereas I've only > replaced the package name. Should I replace the associated package > string, too? According to the manual "6.7.2 Package Naming", the associated string is used for package management commands such as 'guix package' and 'guix build'. Therefore, I think we should change them as well, so that the users can install the packages using the command "guix package -i octave-cli" and "guix package -i octave" respectively. What do you think? >>> >>> Maybe this is true when manipulating the package definition, but that >>> doesn't seem to be the case in general. When I run >>> "./pre-inst-env guix package --show=shogun", for example, >>> "octave-cli@4.4.1" is listed as a dependency, even though "octave" is >>> the associated name in shogun's input list. >>> >>> To be clear, I've changed the string for octave's and octave-cli's >>> package name in their respective package definitions, but I haven't >>> changed the string in the input lists of octave-cli's dependent >>> packages. >>> >>> I'm inclined to follow convention when it comes to this, and other >>> packages in input lists seem to omit extensions to the base name of the >>> package in their assoc-lists. For example, ("gettext", gettext-minimal) >>> and ("python", python-minimal-wrapper) are common inputs for packages. >> >> I think you are right! This was a misunderstanding on my part. I thought >> the association string in the input lists must be the same as the >> package name, but appraently this is not the case. >> >> Take gettext-minimal as an example, >> its variable name is 'gettext-minimal', >> its package name is "gettext-minimal", >> but its input name is "gettext". > > Precisely! Unless anyone else has concerns that should be brought to > light, I'll be committing this within the next 2 days. > > Thank you to all involved so far. I've pushed this to master. Thanks again! signature.asc Description: PGP signature
Re: Octave & QtOctave
Alex Vong writes: > Kei Kebreau writes: > >> Alex Vong writes: >> >>> Kei Kebreau writes: >>> Alex Vong writes: > 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: > > From 2b04caa66c17da257dfb4f4ccb94e8d629b95e53 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. ... > - ("octave" ,octave) > + ("octave-cli" ,octave-cli) I see the main difference is that you've replace the package's associated string to "octave-cli" as well as the name, whereas I've only replaced the package name. Should I replace the associated package string, too? >>> >>> According to the manual "6.7.2 Package Naming", the associated string is >>> used for package management commands such as 'guix package' and 'guix >>> build'. Therefore, I think we should change them as well, so that the >>> users can install the packages using the command >>> "guix package -i octave-cli" and "guix package -i octave" >>> respectively. What do you think? >> >> Maybe this is true when manipulating the package definition, but that >> doesn't seem to be the case in general. When I run >> "./pre-inst-env guix package --show=shogun", for example, >> "octave-cli@4.4.1" is listed as a dependency, even though "octave" is >> the associated name in shogun's input list. >> >> To be clear, I've changed the string for octave's and octave-cli's >> package name in their respective package definitions, but I haven't >> changed the string in the input lists of octave-cli's dependent >> packages. >> >> I'm inclined to follow convention when it comes to this, and other >> packages in input lists seem to omit extensions to the base name of the >> package in their assoc-lists. For example, ("gettext", gettext-minimal) >> and ("python", python-minimal-wrapper) are common inputs for packages. > > I think you are right! This was a misunderstanding on my part. I thought > the association string in the input lists must be the same as the > package name, but appraently this is not the case. > > Take gettext-minimal as an example, > its variable name is 'gettext-minimal', > its package name is "gettext-minimal", > but its input name is "gettext". Precisely! Unless anyone else has concerns that should be brought to light, I'll be committing this within the next 2 days. Thank you to all involved so far. signature.asc Description: PGP signature
Re: Octave & QtOctave
Kei Kebreau writes: > Alex Vong writes: > >> Kei Kebreau writes: >> >>> Alex Vong writes: >>> 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: From 2b04caa66c17da257dfb4f4ccb94e8d629b95e53 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. >>> >>> ... >>> - ("octave" ,octave) + ("octave-cli" ,octave-cli) >>> >>> I see the main difference is that you've replace the package's >>> associated string to "octave-cli" as well as the name, whereas I've only >>> replaced the package name. Should I replace the associated package >>> string, too? >> >> According to the manual "6.7.2 Package Naming", the associated string is >> used for package management commands such as 'guix package' and 'guix >> build'. Therefore, I think we should change them as well, so that the >> users can install the packages using the command >> "guix package -i octave-cli" and "guix package -i octave" >> respectively. What do you think? > > Maybe this is true when manipulating the package definition, but that > doesn't seem to be the case in general. When I run > "./pre-inst-env guix package --show=shogun", for example, > "octave-cli@4.4.1" is listed as a dependency, even though "octave" is > the associated name in shogun's input list. > > To be clear, I've changed the string for octave's and octave-cli's > package name in their respective package definitions, but I haven't > changed the string in the input lists of octave-cli's dependent > packages. > > I'm inclined to follow convention when it comes to this, and other > packages in input lists seem to omit extensions to the base name of the > package in their assoc-lists. For example, ("gettext", gettext-minimal) > and ("python", python-minimal-wrapper) are common inputs for packages. I think you are right! This was a misunderstanding on my part. I thought the association string in the input lists must be the same as the package name, but appraently this is not the case. Take gettext-minimal as an example, its variable name is 'gettext-minimal', its package name is "gettext-minimal", but its input name is "gettext". signature.asc Description: PGP signature
Re: Octave & QtOctave
Alex Vong writes: > Kei Kebreau writes: > >> Alex Vong writes: >> >>> 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: >>> >>> From 2b04caa66c17da257dfb4f4ccb94e8d629b95e53 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. >> >> ... >> >>> - ("octave" ,octave) >>> + ("octave-cli" ,octave-cli) >> >> I see the main difference is that you've replace the package's >> associated string to "octave-cli" as well as the name, whereas I've only >> replaced the package name. Should I replace the associated package >> string, too? > > According to the manual "6.7.2 Package Naming", the associated string is > used for package management commands such as 'guix package' and 'guix > build'. Therefore, I think we should change them as well, so that the > users can install the packages using the command > "guix package -i octave-cli" and "guix package -i octave" > respectively. What do you think? Maybe this is true when manipulating the package definition, but that doesn't seem to be the case in general. When I run "./pre-inst-env guix package --show=shogun", for example, "octave-cli@4.4.1" is listed as a dependency, even though "octave" is the associated name in shogun's input list. To be clear, I've changed the string for octave's and octave-cli's package name in their respective package definitions, but I haven't changed the string in the input lists of octave-cli's dependent packages. I'm inclined to follow convention when it comes to this, and other packages in input lists seem to omit extensions to the base name of the package in their assoc-lists. For example, ("gettext", gettext-minimal) and ("python", python-minimal-wrapper) are common inputs for packages. signature.asc Description: PGP signature
Re: Octave & QtOctave
Kei Kebreau writes: > Alex Vong writes: > >> 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: >> >> From 2b04caa66c17da257dfb4f4ccb94e8d629b95e53 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. > > ... > >> - ("octave" ,octave) >> + ("octave-cli" ,octave-cli) > > I see the main difference is that you've replace the package's > associated string to "octave-cli" as well as the name, whereas I've only > replaced the package name. Should I replace the associated package > string, too? According to the manual "6.7.2 Package Naming", the associated string is used for package management commands such as 'guix package' and 'guix build'. Therefore, I think we should change them as well, so that the users can install the packages using the command "guix package -i octave-cli" and "guix package -i octave" respectively. What do you think? signature.asc Description: PGP signature
Re: Octave & QtOctave
Alex Vong writes: > 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: > > From 2b04caa66c17da257dfb4f4ccb94e8d629b95e53 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. ... > - ("octave" ,octave) > + ("octave-cli" ,octave-cli) I see the main difference is that you've replace the package's associated string to "octave-cli" as well as the name, whereas I've only replaced the package name. Should I replace the associated package string, too? signature.asc Description: PGP signature
Re: Octave & QtOctave
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: From 2b04caa66c17da257dfb4f4ccb94e8d629b95e53 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. --- 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 ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Jonathan Brielmaier +;;; Copyright © 2018 Alex Vong ;;; ;;; 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 ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018 Björn Höfling +;;; Copyright © 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) - ("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 ;;; Copyright © 2018 Eric Brown ;;; Copyright © 2018 Julien Lepiller +;;; Copyright © 2018 Alex Vong ;;; ;;; 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
Re: Octave & QtOctave
swedebugia writes: > On 2018-12-02 20:28, Kei Kebreau wrote: > snip > >> Here are two tentative patches that make the changes we've discussed. > > Nice > >> Also, should we make a deprecated-package definition for qtoctave? > > Yes, that sounds like a good idea to me. Here's the new second patch, then. >From 663441af034b6bd7a3bd24866d3721cac21be221 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): Define in terms of 'deprectated-package'. (octave): New variable, formerly known as "qtoctave". --- gnu/packages/maths.scm | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index bcd70232f..67be8b807 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 @@ -1525,6 +1525,9 @@ script files.") "qscintilla2_qt5")) #t +(define-public qtoctave + (deprecated-package "qtoctave" octave)) + (define-public opencascade-oce (package (name "opencascade-oce") -- 2.19.2
Re: Octave & QtOctave
On 2018-12-02 20:28, Kei Kebreau wrote: snip Here are two tentative patches that make the changes we've discussed. Nice Also, should we make a deprecated-package definition for qtoctave? Yes, that sounds like a good idea to me. -- Cheers Swedebugia
Re: Octave & QtOctave
l...@gnu.org (Ludovic Courtès) writes: > Kei Kebreau skribis: > >> l...@gnu.org (Ludovic Courtès) writes: >> >>> Hello, >>> >>> n...@n0.is skribis: >>> names for packages are (mostly) random, although in some cases following classiifcations (see python-*, r-*, ...). >>> >>> That randomness is very limited in practice, if I may. :-) >>> >>> https://gnu.org/software/guix/manual/en/html_node/Package-Naming.html >>> >>> “qtoctave” was added by Kei. WDYT about the naming issue, Kei? >>> >>> Ludo’. >> >> 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 (“octave-cli” rather than > “octave-minimal”), go ahead! > > Ludo’. Sorry, the last message didn't include the earlier contributors to this thread. Here are two tentative patches that make the changes we've discussed. Also, should we make a deprecated-package definition for qtoctave? >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
Re: Octave & QtOctave
swedebugia writes: > On 2018-11-28 11:47, Ludovic Courtès 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 (“octave-cli” rather than >> “octave-minimal”), 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? >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 >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..8b1
Re: Octave & QtOctave
On 2018-11-28 11:47, Ludovic Courtès 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 (“octave-cli” rather than “octave-minimal”), go ahead! I agree. -- Cheers Swedebugia
Re: Octave & QtOctave
Kei Kebreau skribis: > l...@gnu.org (Ludovic Courtès) writes: > >> Hello, >> >> n...@n0.is skribis: >> >>> names for packages are (mostly) random, although in some >>> cases following classiifcations (see python-*, r-*, ...). >> >> That randomness is very limited in practice, if I may. :-) >> >> https://gnu.org/software/guix/manual/en/html_node/Package-Naming.html >> >> “qtoctave” was added by Kei. WDYT about the naming issue, Kei? >> >> Ludo’. > > 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 (“octave-cli” rather than “octave-minimal”), go ahead! Ludo’.
Re: Octave & QtOctave
Hello all, l...@gnu.org (Ludovic Courtès) writes: > Hello, > > n...@n0.is skribis: > >> names for packages are (mostly) random, although in some >> cases following classiifcations (see python-*, r-*, ...). > > That randomness is very limited in practice, if I may. :-) > > https://gnu.org/software/guix/manual/en/html_node/Package-Naming.html > > “qtoctave” was added by Kei. WDYT about the naming issue, Kei? > > Ludo’. 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.
Re: Octave & QtOctave
Hello, n...@n0.is skribis: > names for packages are (mostly) random, although in some > cases following classiifcations (see python-*, r-*, ...). That randomness is very limited in practice, if I may. :-) https://gnu.org/software/guix/manual/en/html_node/Package-Naming.html “qtoctave” was added by Kei. WDYT about the naming issue, Kei? Ludo’.
Re: Should we rename qtoctave to octave and octave to octave-cli? (was Re: Octave & QtOctave)
Alex Vong writes: > n...@n0.is writes: > >> names for packages are (mostly) random, although in some >> cases following classiifcations (see python-*, r-*, ...). >> > I am thinking that should we rename qtoctave to octave and octave to > octave-cli (or octave-minimal)? > > Firstly, a new user wanting to install octave will probably do the > obvious "guix package -i octave", but currently this command will do the > counter-intuitive thing of installing the non-gui version of > octave. Instead, they will have to install qtoctave to get the gui. I am > in favour of making a package to support as many features as possible, > while also making a minimal version for building other packages (or > users who desn't want a gui). An example would be emacs vs > emacs-minimal. > > Secondly, I suggest to name the minimal version as "octave-cli" because > this is what the octave binary (the command-line only version) is > called. Also, running "guix package -A '-cli$'" shows some of the > existing packages also follow similar naming convention (I don't know it > they have a corresponding gui version though). > > What do others think? > > Cheers, > Alex I am in favor of this idea: Octave && Octave Minimal Brett
Should we rename qtoctave to octave and octave to octave-cli? (was Re: Octave & QtOctave)
n...@n0.is writes: > names for packages are (mostly) random, although in some > cases following classiifcations (see python-*, r-*, ...). > I am thinking that should we rename qtoctave to octave and octave to octave-cli (or octave-minimal)? Firstly, a new user wanting to install octave will probably do the obvious "guix package -i octave", but currently this command will do the counter-intuitive thing of installing the non-gui version of octave. Instead, they will have to install qtoctave to get the gui. I am in favour of making a package to support as many features as possible, while also making a minimal version for building other packages (or users who desn't want a gui). An example would be emacs vs emacs-minimal. Secondly, I suggest to name the minimal version as "octave-cli" because this is what the octave binary (the command-line only version) is called. Also, running "guix package -A '-cli$'" shows some of the existing packages also follow similar naming convention (I don't know it they have a corresponding gui version though). What do others think? Cheers, Alex > The Qt part of Octave is a separate package because making > it just an output would still pull in Qt and the size difference > is huge. > > Alex Vong transcribed 856 bytes: >> Hello, >> >> Brett Gilio writes: >> >> > Hey all, >> > >> > Happy guix birthday! >> > >> > Quick question, why is the octave package split up into two different >> > public definitions, rather than just having the QtOctave-GUI being a >> > "gui" output, like it is for transmissionBT and some others? >> > >> I would also want to know why it is called qtoctave. My understanding is >> that qtoctave was a GUI frontend to the official octave which is now >> replaced by the official octave GUI. >> >> > Best, >> > Brett Gilio >> >> Cheers, >> Alex signature.asc Description: PGP signature
Re: Octave & QtOctave
names for packages are (mostly) random, although in some cases following classiifcations (see python-*, r-*, ...). The Qt part of Octave is a separate package because making it just an output would still pull in Qt and the size difference is huge. Alex Vong transcribed 856 bytes: > Hello, > > Brett Gilio writes: > > > Hey all, > > > > Happy guix birthday! > > > > Quick question, why is the octave package split up into two different > > public definitions, rather than just having the QtOctave-GUI being a > > "gui" output, like it is for transmissionBT and some others? > > > I would also want to know why it is called qtoctave. My understanding is > that qtoctave was a GUI frontend to the official octave which is now > replaced by the official octave GUI. > > > Best, > > Brett Gilio > > Cheers, > Alex
Re: Octave & QtOctave
Hello, Brett Gilio writes: > Hey all, > > Happy guix birthday! > > Quick question, why is the octave package split up into two different > public definitions, rather than just having the QtOctave-GUI being a > "gui" output, like it is for transmissionBT and some others? > I would also want to know why it is called qtoctave. My understanding is that qtoctave was a GUI frontend to the official octave which is now replaced by the official octave GUI. > Best, > Brett Gilio Cheers, Alex signature.asc Description: PGP signature
Octave & QtOctave
Hey all, Happy guix birthday! Quick question, why is the octave package split up into two different public definitions, rather than just having the QtOctave-GUI being a "gui" output, like it is for transmissionBT and some others? Best, Brett Gilio