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

[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

bug#24450: pypi importer outputs strange character series in optional dependency case.

[ng0]

I think this should not happen with pypi import:

  (inputs
`(("python-certifi==2016.2.28"
   ,python-certifi==2016.2.28)
  ("python-dateutil==2.5.3"
   ,python-dateutil==2.5.3)
  ("python-flask-babel==0.11.1"
   ,python-flask-babel==0.11.1)
  ("python-flask==0.11.1" ,python-flask==0.11.1)
  ("python-lxml==3.6.0" ,python-lxml==3.6.0)
  ("python-ndg-httpsclient==0.4.1"
   ,python-ndg-httpsclient==0.4.1)
  ("python-pyasn1-modules==0.0.8"
   ,python-pyasn1-modules==0.0.8)
  ("python-pyasn1==0.1.9" ,python-pyasn1==0.1.9)
  ("python-pygments==2.1.3"
   ,python-pygments==2.1.3)
  ("python-pyopenssl==0.15.1"
   ,python-pyopenssl==0.15.1)
  ("python-pyyaml==3.11" ,python-pyyaml==3.11)
  ("python-requests[socks]==2.10.0"
   ,#{python-requests\x5b;socks\x5d;==2.10.0}#)
  ("python-setuptools" ,python-setuptools)))


I can understand the version numbers, I can also understand the optional
socks building/module of the python-requests, but why does it read like
Gobbledygook?  Can't we improve the output here?

For version numbers, this is not a format which happened recently which
is exclusive for python build system right? This is just bad formated
because of the pypi query.
I will first try and not pin the application to these version numbers,
maybe itjustworks™.


To reproduce: "guix import pypi searx"
-- 
  ng0