bug#24433: [PATCH] gnu: fish: Add input bc.

2016-10-04 Thread Arun Isaac

> Pushed as a8d3bc473d2cd285f03989be8f558c25a7cbd6c9, thanks!

Great! Thank you!


signature.asc
Description: PGP signature


bug#24433: [PATCH] gnu: fish: Add input bc.

2016-10-04 Thread Ludovic Courtès
Arun Isaac  skribis:

> * gnu/packages/shells.scm (fish)[inputs]: Add bc.

Pushed as a8d3bc473d2cd285f03989be8f558c25a7cbd6c9, thanks!

Ludo’.





bug#24433: [PATCH] gnu: fish: Add input bc.

2016-09-25 Thread Arun Isaac

To reproduce this bug, run `math 1 + 1` in the fish shell. You should
get an error saying that 'bc' is an unknown command. With the patch I
supplied, this error will not occur.


signature.asc
Description: PGP signature


bug#24433: [PATCH] gnu: fish: Add input bc.

2016-09-16 Thread Arun Isaac
* gnu/packages/shells.scm (fish)[inputs]: Add bc.
---
 gnu/packages/shells.scm | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 183ef7f..bc43468 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -22,6 +22,7 @@
 
 (define-module (gnu packages shells)
   #:use-module (gnu packages)
+  #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages documentation)
@@ -94,11 +95,21 @@ direct descendant of NetBSD's Almquist Shell 
(@command{ash}).")
 (native-inputs
  `(("doxygen" ,doxygen)))
 (inputs
- `(("ncurses" ,ncurses)
+ `(("bc" ,bc)
+   ("ncurses" ,ncurses)
("python" ,python-wrapper)))   ;for fish_config and manpage completions
 (arguments
  '(#:tests? #f ; no check target
-   #:configure-flags '("--sysconfdir=/etc")))
+   #:configure-flags '("--sysconfdir=/etc")
+   #:phases
+   (modify-phases %standard-phases
+ ;; Replace bc by its absolute path in the store
+ (add-after 'unpack 'patch-bc
+   (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* '("share/functions/math.fish"
+"share/functions/seq.fish")
+   (("\\| bc") (string-append "| " (assoc-ref %build-inputs "bc")
+  "/bin/bc"
 (synopsis "The friendly interactive shell")
 (description
  "Fish (friendly interactive shell) is a shell focused on interactive use,
-- 
2.10.0