[PATCH 1/6] gnu: Add perl-html-element-extended.

[PATCH 1/6] gnu: Add perl-html-element-extended.

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

* gnu/packages/web.scm (perl-html-element-extended): New variable.
---
 gnu/packages/web.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index ae51cc7..ee67119 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1620,6 +1620,28 @@ which can be used to parse directory listings.")
 described in RFC 2744.")
     (license (package-license perl))))
 
+(define-public perl-html-element-extended
+  (package
+    (name "perl-html-element-extended")
+    (version "1.18")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://cpan/authors/id/M/MS/MSISK/"
+                           "HTML-Element-Extended-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0axknss8c368r5i082yhkfj8mq0w4nglfrpcxcayyzzj13qimvzk"))))
+    (build-system perl-build-system)
+    (propagated-inputs
+     `(("perl-html-tree" ,perl-html-tree)))
+    (home-page "http://search.cpan.org/dist/HTML-Element-Extended")
+    (synopsis "Manipulate tables of HTML::Element")
+    (description
+     "Perl extension for manipulating a table composed of HTML::Element style
+components.")
+    (license (package-license perl))))
+
 (define-public perl-html-form
   (package
     (name "perl-html-form")
-- 
2.4.3

[PATCH 2/6] gnu: Add perl-html-tableextract.

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

* gnu/packages/web.scm (perl-html-tableextract): New variable.
---
 gnu/packages/web.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index ee67119..c80b239 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1690,6 +1690,29 @@ components.")
 syntactic legitmacy.")
     (license l:artistic2.0)))
 
+(define-public perl-html-tableextract
+  (package
+    (name "perl-html-tableextract")
+    (version "2.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://cpan.metacpan.org/authors/id/M/MS/MSISK/"
+                           "HTML-TableExtract-" version ".tar.gz"))
+       (sha256
+        (base32
+         "01jimmss3q68a89696wmclvqwb2ybz6xgabpnbp6mm6jcni82z8a"))))
+    (build-system perl-build-system)
+    (propagated-inputs
+     `(("perl-html-element-extended" ,perl-html-element-extended)
+       ("perl-html-parser" ,perl-html-parser)))
+    (home-page "http://search.cpan.org/dist/HTML-TableExtract")
+    (synopsis "Extract contents from HTML tables")
+    (description
+     "HTML::TableExtract is a Perl module for extracting the content contained
+in tables within an HTML document, either as text or encoded element trees.")
+    (license (package-license perl))))
+
 (define-public perl-html-tree
   (package
     (name "perl-html-tree")
-- 
2.4.3

[PATCH 3/6] gnu: Add perl-date-manip.

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

* gnu/packages/perl.scm (perl-date-manip): New variable.
---
 gnu/packages/perl.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 3d28455..9250feb 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -1283,6 +1283,29 @@ applicable).")
 Date::Calc.")
     (license (list (package-license perl) lgpl2.0+))))
 
+(define-public perl-date-manip
+  (package
+    (name "perl-date-manip")
+    (version "6.50")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://cpan.metacpan.org/authors/id/S/SB/SBECK/"
+                           "Date-Manip-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0zd0wbf91i49753rnf7m1lw197hdl5r97mxy0n43zdmcmhvkb3qq"))))
+    (build-system perl-build-system)
+    (arguments
+     ;; Tests would require tzdata for timezone information, but tzdata is in
+     ;; (gnu packages base) which would create a circular dependency.  TODO:
+     ;; Maybe put this package elsewhere so we can turn on tests.
+     '(#:tests? #f))
+    (home-page "http://search.cpan.org/dist/Date-Manip")
+    (synopsis "Date manipulation routines")
+    (description "")
+    (license (package-license perl))))
+
 (define-public perl-datetime
   (package
     (name "perl-datetime")
-- 
2.4.3

[PATCH 4/6] gnu: Add perl-finance-quote.

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

* gnu/packages/web.scm (perl-finance-quote): New variable.
* gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.
---
 gnu-system.am                                      |  1 +
 .../perl-finance-quote-unuse-mozilla-ca.patch      | 15 ++++++++++
 gnu/packages/web.scm                               | 33 ++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch

diff --git a/gnu-system.am b/gnu-system.am
index a3c56a8..fafe9ed 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -540,6 +540,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/patchutils-xfail-gendiff-tests.patch	\
   gnu/packages/patches/patch-hurd-path-max.patch		\
   gnu/packages/patches/pavucontrol-sigsegv.patch		\
+  gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
   gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch \
   gnu/packages/patches/perl-module-pluggable-search.patch	\
   gnu/packages/patches/perl-net-amazon-s3-moose-warning.patch	\
diff --git a/gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch b/gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch
new file mode 100644
index 0000000..5f37bb0
--- /dev/null
+++ b/gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch
@@ -0,0 +1,15 @@
+Rather than unconditionally using Mozilla's CA certificates, let the user tell
+LWP's UserAgent where to find certificates with the PERL_LWP_SSL_CA_FILE,
+HTTPS_CA_FILE, PERL_LWP_SSL_CA_PATH, or HTTPS_CA_DIR environment variables
+instead.
+
+--- Finance-Quote-1.37/lib/Finance/Quote/Tiaacref.pm.orig	2015-02-01 13:24:41.000000000 -0600
++++ Finance-Quote-1.37/lib/Finance/Quote/Tiaacref.pm	2015-07-07 20:09:47.278885944 -0500
+@@ -30,7 +30,6 @@
+ package Finance::Quote::Tiaacref;
+ require 5.005;
+ require LWP::Protocol::https;
+-require Mozilla::CA;
+ 
+ use strict;
+ 
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index c80b239..cb73c9a 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1597,6 +1597,39 @@ Encode::decode(locale => $string).")
 which can be used to parse directory listings.")
     (home-page "http://search.cpan.org/~gaas/File-Listing/")))
 
+(define-public perl-finance-quote
+  (package
+   (name "perl-finance-quote")
+   (version "1.37")
+   (source
+    (origin
+      (method url-fetch)
+      (uri (string-append "https://cpan.metacpan.org/authors/id/E/EC/ECOCODE/"
+                          "Finance-Quote-" version ".tar.gz"))
+      (sha256
+       (base32
+        "1b6pbh7f76fb5sa4f0lhx085xy55pprz5v7z7li7pqiyw7i4f4bf"))
+      (patches (list
+                (search-patch "perl-finance-quote-unuse-mozilla-ca.patch")))))
+   (build-system perl-build-system)
+   (propagated-inputs
+    `(("perl-datetime" ,perl-datetime)
+      ("perl-html-parser" ,perl-html-parser)
+      ("perl-html-tableextract" ,perl-html-tableextract)
+      ("perl-html-tree" ,perl-html-tree)
+      ("perl-http-cookies" ,perl-http-cookies)
+      ("perl-http-message" ,perl-http-message)
+      ("perl-json" ,perl-json)
+      ("perl-libwww" ,perl-libwww)
+      ("perl-lwp-protocol-https" ,perl-lwp-protocol-https)
+      ("perl-uri" ,perl-uri)))
+   (home-page "http://search.cpan.org/dist/Finance-Quote")
+   (synopsis "Stock and mutual fund quotes")
+   (description
+    "This module gets stock quotes from various internet sources, including
+Yahoo! Finance, Fidelity Investments, and the Australian Stock Exchange.")
+   (license l:gpl2)))
+
 (define-public perl-gssapi
   (package
     (name "perl-gssapi")
-- 
2.4.3

[PATCH 5/6] guix: Move package-transitive-propagated-labels* and package-propagated-input-refs to (guix packages).

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

* gnu/packages/version-control.scm (package-transitive-propagated-labels*)
  (package-propagated-input-refs): Move from here...
* guix/packages.scm: ...to here.
---
 gnu/packages/version-control.scm | 17 -----------------
 guix/packages.scm                | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 15e6fb6..eee3a2f 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -99,23 +99,6 @@ changes to project files over time.  It supports both a distributed workflow
 as well as the classic centralized workflow.")
     (license gpl2+)))
 
-(define (package-transitive-propagated-labels* package)
-  "Return a list of the input labels of PACKAGE and its transitive inputs."
-  (let ((name (package-name package)))
-    `(,name
-      ,@(map (match-lambda
-               ((label (? package? _) . _)
-                (string-append name "/" label)))
-             (package-transitive-propagated-inputs package)))))
-
-(define (package-propagated-input-refs inputs packages)
-  "Return a list of (assoc-ref INPUTS <package-name>) for each package in
-PACKAGES and their propagated inputs."
-  (map (lambda (l)
-         `(assoc-ref ,inputs ,l))
-       (append-map package-transitive-propagated-labels*
-                   packages)))
-
 (define-public git
   ;; Keep in sync with 'git-manpages'!
   (package
diff --git a/guix/packages.scm b/guix/packages.scm
index 5a28085..e84d129 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -93,6 +93,9 @@
             package-output
             package-grafts
 
+            package-transitive-propagated-labels*
+            package-propagated-input-refs
+
             %supported-systems
             %hydra-supported-systems
             supported-package?
@@ -559,6 +562,23 @@ for the host system (\"native inputs\"), and not target inputs."
 recursively."
   (transitive-inputs (package-propagated-inputs package)))
 
+(define (package-transitive-propagated-labels* package)
+  "Return a list of the input labels of PACKAGE and its transitive inputs."
+  (let ((name (package-name package)))
+    `(,name
+      ,@(map (match-lambda
+               ((label (? package? _) . _)
+                (string-append name "/" label)))
+             (package-transitive-propagated-inputs package)))))
+
+(define (package-propagated-input-refs inputs packages)
+  "Return a list of (assoc-ref INPUTS <package-name>) for each package in
+PACKAGES and their transitive propagated inputs."
+  (map (lambda (l)
+         `(assoc-ref ,inputs ,l))
+       (append-map package-transitive-propagated-labels*
+                   packages)))
+
 (define-syntax define-memoized/v
   (lambda (form)
     "Define a memoized single-valued unary procedure with docstring.
-- 
2.4.3

[PATCH 6/6] gnu: gnucash: Add Finance::Quote support.

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

* gnu/packages/patches/gnucash-price-quotes-perl.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/gnucash.scm (gnucash)[source]: Use it.
  [arguments]: Add 'wrap-programs' phase.
  [inputs]: Add perl-date-manip and perl-finance-quote.
---
 gnu-system.am                                      |  1 +
 gnu/packages/gnucash.scm                           | 41 ++++++++++++++++++++--
 .../patches/gnucash-price-quotes-perl.patch        | 23 ++++++++++++
 3 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/gnucash-price-quotes-perl.patch

diff --git a/gnu-system.am b/gnu-system.am
index fafe9ed..99899e7 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -447,6 +447,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/glibc-ldd-x86_64.patch			\
   gnu/packages/patches/glibc-locales.patch			\
   gnu/packages/patches/gmp-arm-asm-nothumb.patch		\
+  gnu/packages/patches/gnucash-price-quotes-perl.patch		\
   gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \
   gnu/packages/patches/gobject-introspection-cc.patch		\
   gnu/packages/patches/gobject-introspection-girepository.patch	\
diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index 6ab8f09..d7e72c9 100644
--- a/gnu/packages/gnucash.scm
+++ b/gnu/packages/gnucash.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,7 +28,9 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages icu4c)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xml))
 
@@ -42,11 +45,41 @@
                           version ".tar.bz2"))
       (sha256
        (base32
-        "103ir5qg6k8m2mmg9b99c3gn8myxh1gsqyr0mfhmrhqya68wfdr3"))))
+        "103ir5qg6k8m2mmg9b99c3gn8myxh1gsqyr0mfhmrhqya68wfdr3"))
+      (patches (list (search-patch "gnucash-price-quotes-perl.patch")))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ;FIXME: failing at /qof/gnc-date/qof print date dmy buff
-       #:configure-flags '("--disable-dbi")))
+       #:configure-flags '("--disable-dbi")
+       #:modules ((srfi srfi-1)
+                  ,@%gnu-build-system-modules)
+       #:phases
+       (modify-phases %standard-phases
+         (add-after
+          'install 'wrap-programs
+          (lambda* (#:key inputs outputs #:allow-other-keys)
+            (for-each (lambda (prog)
+                        (wrap-program (string-append (assoc-ref outputs "out")
+                                                     "/bin/" prog)
+                          `("PERL5LIB" ":" prefix
+                            ,(map (lambda (o)
+                                    (string-append o "/lib/perl5/site_perl/"
+                                                   ,(package-version perl)))
+                                  (delete-duplicates
+                                   (if (string=? prog "gnc-fq-helper")
+                                       (list
+                                        ,@(package-propagated-input-refs
+                                           'inputs
+                                           (list perl-finance-quote
+                                                 perl-date-manip)))
+                                       (list
+                                        ,@(package-propagated-input-refs
+                                           'inputs
+                                           (list perl-finance-quote)))))))))
+                      '("gnucash"
+                        "gnc-fq-check"
+                        "gnc-fq-helper"
+                        "gnc-fq-dump")))))))
     (inputs
      `(("guile" ,guile-2.0)
        ("icu4c" ,icu4c)
@@ -56,7 +89,9 @@
        ("libgnomecanvas" ,libgnomecanvas)
        ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
-       ("webkitgtk" ,webkitgtk/gtk+-2)))
+       ("webkitgtk" ,webkitgtk/gtk+-2)
+       ("perl-date-manip" ,perl-date-manip)
+       ("perl-finance-quote" ,perl-finance-quote)))
     (native-inputs
      `(("glib" ,glib "bin") ; glib-compile-schemas, etc.
        ("intltool" ,intltool)
diff --git a/gnu/packages/patches/gnucash-price-quotes-perl.patch b/gnu/packages/patches/gnucash-price-quotes-perl.patch
new file mode 100644
index 0000000..982763f
--- /dev/null
+++ b/gnu/packages/patches/gnucash-price-quotes-perl.patch
@@ -0,0 +1,23 @@
+After wrapping gnc-fq-check and gnc-fq-helper we can no longer execute them
+with perl, so execute them directly instead.
+
+--- gnucash-2.6.6/src/scm/price-quotes.scm.orig	2014-04-27 17:42:28.000000000 -0500
++++ gnucash-2.6.6/src/scm/price-quotes.scm	2015-07-09 16:12:11.196218472 -0500
+@@ -74,7 +74,7 @@
+     (define (start-program)
+       (if (not (string-null? gnc:*finance-quote-check*))
+           (set! program (gnc-spawn-process-async
+-                         (list "perl" "-w" gnc:*finance-quote-check*) #t))))
++                         (list gnc:*finance-quote-check*) #t))))
+ 
+     (define (get-sources)
+       (if (not (null? program))
+@@ -158,7 +158,7 @@
+     (define (start-quoter)
+       (if (not (string-null? gnc:*finance-quote-helper*))
+           (set! quoter (gnc-spawn-process-async
+-                        (list "perl" "-w" gnc:*finance-quote-helper*) #t))))
++                        (list gnc:*finance-quote-helper*) #t))))
+ 
+     (define (get-quotes)
+       (if (not (null? quoter))
-- 
2.4.3

Re: [PATCH 1/6] gnu: Add perl-html-element-extended.

[Andreas Enge]

On Thu, Jul 09, 2015 at 07:38:04PM -0500, ericbavier@openmailbox.org wrote:
> +    (description
> +     "Perl extension for manipulating a table composed of HTML::Element style
> +components.")

I would use a full sentence as in your other patch: "... is a Perl extension...".
Otherwise it looks good.

Andreas

Re: [PATCH 2/6] gnu: Add perl-html-tableextract.

[Andreas Enge]

Looks good.

Andreas

Re: [PATCH 3/6] gnu: Add perl-date-manip.

[Andreas Enge]

On Thu, Jul 09, 2015 at 07:38:06PM -0500, ericbavier@openmailbox.org wrote:
> +    (arguments
> +     ;; Tests would require tzdata for timezone information, but tzdata is in
> +     ;; (gnu packages base) which would create a circular dependency.  TODO:
> +     ;; Maybe put this package elsewhere so we can turn on tests.
> +     '(#:tests? #f))

Would it be enough to selectively import only tzdata here?

> +    (description "")

Empty description.

Andreas

Re: [PATCH 3/6] gnu: Add perl-date-manip.

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> On Thu, Jul 09, 2015 at 07:38:06PM -0500, ericbavier@openmailbox.org wrote:
>> +    (arguments
>> +     ;; Tests would require tzdata for timezone information, but tzdata is in
>> +     ;; (gnu packages base) which would create a circular dependency.  TODO:
>> +     ;; Maybe put this package elsewhere so we can turn on tests.
>> +     '(#:tests? #f))
>
> Would it be enough to selectively import only tzdata here?

On the contrary: Circular dependencies among modules are OK as long as
#:select isn’t used (see <http://bugs.gnu.org/15540>.)

Ludo’.

Re: [PATCH 1/6] gnu: Add perl-html-element-extended.

[Ludovic Courtès]

ericbavier@openmailbox.org skribis:

> * gnu/packages/web.scm (perl-html-element-extended): New variable.

LGTM.

Ludo'.

Re: [PATCH 2/6] gnu: Add perl-html-tableextract.

[Ludovic Courtès]

ericbavier@openmailbox.org skribis:

> * gnu/packages/web.scm (perl-html-tableextract): New variable.

LGTM.

Re: [PATCH 5/6] guix: Move package-transitive-propagated-labels* and package-propagated-input-refs to (guix packages).

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 86 bytes --]

Attached is an updated patch based on current master after core-updates
merge.

`~Eric

[-- Attachment #2: 0005-guix-Move-package-transitive-propagated-labels-and-p.patch --]
[-- Type: application/x-patch, Size: 3219 bytes --]

Re: [PATCH 5/6] guix: Move package-transitive-propagated-labels* and package-propagated-input-refs to (guix packages).

[Ludovic Courtès]

Eric Bavier <ericbavier@openmailbox.org> skribis:

> From 6282f668d3cadb9f24f045a0c6992eda9fbe6d5d Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Tue, 21 Jul 2015 20:45:54 -0500
> Subject: [PATCH 5/6] guix: Move package-transitive-propagated-labels* and
>  package-propagated-input-refs to (guix packages).
>
> * gnu/packages/version-control.scm (package-transitive-propagated-labels*)
>   (package-propagated-input-refs): Move from here...
> * guix/packages.scm: ...to here.

[...]

> +(define (package-transitive-propagated-labels* package)
> +  "Return a list of the input labels of PACKAGE and its transitive inputs."

Why is there a star in the name?

> +(define (package-propagated-input-refs inputs packages)

Should be “references”, not “refs.”  I think this one should not be
exported.

> +  "Return a list of (assoc-ref INPUTS <package-name>) for each package in
> +PACKAGES and their transitive propagated inputs."

Maybe mention that this assumes that each input uses the package name as
the label.

> +  (map (lambda (l)
> +         `(assoc-ref ,inputs ,l))
> +       (delete-duplicates               ;XXX: efficiency
> +        (append-map package-transitive-propagated-labels*
> +                    packages))))

The quadratic ‘delete-duplicates’ is going to be a problem sooner or
later.

Also, could you add one or two tests?

I understand this is needed in some cases, but it is not really nice (or
“really not nice”?).  I would rather avoid propagating the use of these
constructs, but OTOH, I have nothing better to propose currently.

Could you send an updated patch?

Thanks,
Ludo’.

Re: [PATCH 3/6] gnu: Add perl-date-manip.

[Ludovic Courtès]

ericbavier@openmailbox.org skribis:

> * gnu/packages/perl.scm (perl-date-manip): New variable.

LGTM.  Sorry for the delay!

Thanks,
Ludo’.

Re: [PATCH 4/6] gnu: Add perl-finance-quote.

[Ludovic Courtès]

ericbavier@openmailbox.org skribis:

> From: Eric Bavier <bavier@member.fsf.org>
>
> * gnu/packages/web.scm (perl-finance-quote): New variable.
> * gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch: New patch.
> * gnu-system.am (dist_patch_DATA): Add it.

LGTM.

> +++ b/gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch
> @@ -0,0 +1,15 @@
> +Rather than unconditionally using Mozilla's CA certificates, let the user tell
> +LWP's UserAgent where to find certificates with the PERL_LWP_SSL_CA_FILE,
> +HTTPS_CA_FILE, PERL_LWP_SSL_CA_PATH, or HTTPS_CA_DIR environment variables
> +instead.

Makes sense.  Should perl-lwp-useragent-determined be augmented with
search path entries for these?

Thanks,
Ludo’.

Re: [PATCH 6/6] gnu: gnucash: Add Finance::Quote support.

[Ludovic Courtès]

ericbavier@openmailbox.org skribis:

> From: Eric Bavier <bavier@member.fsf.org>
>
> * gnu/packages/patches/gnucash-price-quotes-perl.patch: New patch.
> * gnu-system.am (dist_patch_DATA): Add it.
> * gnu/packages/gnucash.scm (gnucash)[source]: Use it.
>   [arguments]: Add 'wrap-programs' phase.
>   [inputs]: Add perl-date-manip and perl-finance-quote.

OK!

Thanks,
Ludo'.

Re: [PATCH 5/6] guix: Move package-transitive-propagated-labels* and package-propagated-input-refs to (guix packages).

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 3019 bytes --]

I find myself needing this functionality while exploring configuration
support in xmonad, so I am (finally) revisiting this patch.

The attached patch, rather than simply moving the two relevant
procedures from (gnu packages version-control), instead replaces them
with a single new procedure, named 'transitive-input-references', in
(guix packages). I think the new procedure addresses the concerns raised
previously.

On Wed, 22 Jul 2015 15:20:11 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Eric Bavier <ericbavier@openmailbox.org> skribis:
> 
> > From 6282f668d3cadb9f24f045a0c6992eda9fbe6d5d Mon Sep 17 00:00:00 2001
> > From: Eric Bavier <bavier@member.fsf.org>
> > Date: Tue, 21 Jul 2015 20:45:54 -0500
> > Subject: [PATCH 5/6] guix: Move package-transitive-propagated-labels* and
> >  package-propagated-input-refs to (guix packages).
> >
> > * gnu/packages/version-control.scm (package-transitive-propagated-labels*)
> >   (package-propagated-input-refs): Move from here...
> > * guix/packages.scm: ...to here.
> 
[...]
> 
> > +(define (package-propagated-input-refs inputs packages)
> 
> Should be “references”, not “refs.”

Sure.

> 
> > +  "Return a list of (assoc-ref INPUTS <package-name>) for each package in
> > +PACKAGES and their transitive propagated inputs."
> 
> Maybe mention that this assumes that each input uses the package name as
> the label.

This is not the case with the new transitive-input-references.  Labels
may be arbitrary strings.  This behavior is checked in the new test
case.

> 
> > +  (map (lambda (l)
> > +         `(assoc-ref ,inputs ,l))
> > +       (delete-duplicates               ;XXX: efficiency
> > +        (append-map package-transitive-propagated-labels*
> > +                    packages))))
> 
> The quadratic ‘delete-duplicates’ is going to be a problem sooner or
> later.

The new procedure makes use of 'transitive-inputs' and so benefits from
its optimizations.
 
> Also, could you add one or two tests?

Done.

> 
> I understand this is needed in some cases, but it is not really nice (or
> “really not nice”?).

I would go with "really not nice"

> I would rather avoid propagating the use of these
> constructs,

No pun intended? ;)

> but OTOH, I have nothing better to propose currently.

For Perl, my idea is to wrap each module somehow, so that perl gets the
appropriate 'use lib "/gnu/store/..."' when it loads each module.
Preferably the solution would also work with store deduplication.
I've not yet confirmed this is even feasible, so anyone with more perl
knowledge should chime in.

Our haskell modules install files into a "package.conf.d" subdirectory,
and these files actually keep references to all haskell modules that
were configured in the environment when it was built.  I'm baffled why
GHC does not make use of this information for dependency resolution when
it loads libraries.  Perhaps we could hack our GHC to do so.

`~Eric



[-- Attachment #2: 0005-guix-packages-Add-transitive-input-references.patch --]
[-- Type: text/plain, Size: 4830 bytes --]

From c7932475b95f22f891169b7f315366e2602fb4f5 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Tue, 21 Jul 2015 20:45:54 -0500
Subject: [PATCH 5/6] guix: packages: Add transitive-input-references.

* guix/packages.scm (transitive-input-references): New procedure.
* gnu/packages/version-control.scm (package-transitive-propagated-labels*)
  (package-propagated-input-refs): Delete.
  (git)[arguments]: Adjust to transitive-input-references.
---
 gnu/packages/version-control.scm | 28 ++++++----------------------
 guix/packages.scm                | 14 ++++++++++++++
 tests/packages.scm               | 17 +++++++++++++++++
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8d8003f..3c0571b 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -98,24 +98,6 @@ changes to project files over time.  It supports both a distributed workflow
 as well as the classic centralized workflow.")
     (license gpl2+)))
 
-(define (package-transitive-propagated-labels* package)
-  "Return a list of the input labels of PACKAGE and its transitive inputs."
-  (let ((name (package-name package)))
-    `(,name
-      ,@(map (match-lambda
-               ((label (? package? _) . _)
-                label))
-             (package-transitive-propagated-inputs package)))))
-
-(define (package-propagated-input-refs inputs packages)
-  "Return a list of (assoc-ref INPUTS <package-name>) for each package in
-PACKAGES and their propagated inputs."
-  (map (lambda (l)
-         `(assoc-ref ,inputs ,l))
-       (delete-duplicates                  ;XXX: efficiency
-        (append-map package-transitive-propagated-labels*
-                    packages))))
-
 (define-public git
   ;; Keep in sync with 'git-manpages'!
   (package
@@ -238,11 +220,13 @@ PACKAGES and their propagated inputs."
                 `("PERL5LIB" ":" prefix
                   ,(map (lambda (o) (string-append o "/lib/perl5/site_perl"))
                         (list
-                         ,@(package-propagated-input-refs
+                         ,@(transitive-input-references
                             'inputs
-                            (list perl-authen-sasl
-                                  perl-net-smtp-ssl
-                                  perl-io-socket-ssl))))))
+                            (map (lambda (l)
+                                   (assoc l (inputs)))
+                                 '("perl-authen-sasl"
+                                   "perl-net-smtp-ssl"
+                                   "perl-io-socket-ssl")))))))
 
               ;; Tell 'git-submodule' where Perl is.
               (wrap-program git-sm
diff --git a/guix/packages.scm b/guix/packages.scm
index 3983d14..053803f 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -93,6 +93,8 @@
             package-output
             package-grafts
 
+            transitive-input-references
+
             %supported-systems
             %hydra-supported-systems
             supported-package?
@@ -579,6 +581,18 @@ for the host system (\"native inputs\"), and not target inputs."
 recursively."
   (transitive-inputs (package-propagated-inputs package)))
 
+(define (transitive-input-references alist inputs)
+  "Return a list of (assoc-ref ALIST <label>) for each (<label> <package> . _)
+in INPUTS and their transitive propagated inputs."
+  (define label
+    (match-lambda
+      ((label . _)
+       label)))
+
+  (map (lambda (input)
+         `(assoc-ref ,alist ,(label input)))
+       (transitive-inputs inputs)))
+
 (define-syntax define-memoized/v
   (lambda (form)
     "Define a memoized single-valued unary procedure with docstring.
diff --git a/tests/packages.scm b/tests/packages.scm
index 3cb532d..00a0998 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -207,6 +207,23 @@
            (member i s)
            (member u s)))))
 
+(test-assert "transitive-input-references"
+  (let* ((a (dummy-package "a"))
+         (b (dummy-package "b"))
+         (c (dummy-package "c"
+              (inputs `(("a" ,a)))
+              (propagated-inputs `(("boo" ,b)))))
+         (d (dummy-package "d"
+              (inputs `(("c*" ,c)))))
+         (keys (map (match-lambda
+                      (('assoc-ref 'l key)
+                       key))
+                    (pk 'refs (transitive-input-references
+                               'l (package-inputs d))))))
+    (and (= (length keys) 2)
+         (member "c*" keys)
+         (member "boo" keys))))
+
 (test-equal "package-transitive-supported-systems, implicit inputs"
   %supported-systems
 
-- 
2.4.3

Re: [PATCH 5/6] guix: Move package-transitive-propagated-labels* and package-propagated-input-refs to (guix packages).

[Ludovic Courtès]

Eric Bavier <ericbavier@openmailbox.org> skribis:

> I find myself needing this functionality while exploring configuration
> support in xmonad, so I am (finally) revisiting this patch.

Nice!

> For Perl, my idea is to wrap each module somehow, so that perl gets the
> appropriate 'use lib "/gnu/store/..."' when it loads each module.
> Preferably the solution would also work with store deduplication.
> I've not yet confirmed this is even feasible, so anyone with more perl
> knowledge should chime in.
>
> Our haskell modules install files into a "package.conf.d" subdirectory,
> and these files actually keep references to all haskell modules that
> were configured in the environment when it was built.  I'm baffled why
> GHC does not make use of this information for dependency resolution when
> it loads libraries.  Perhaps we could hack our GHC to do so.

This sounds like retrofitting some RUNPATH-like functionality in
languages.  This would be ideal, and we should use whatever already
exists if that does the job (which seems to be the case for Perl?).

Otherwise we should really push upstream to implement that
functionality.

> From c7932475b95f22f891169b7f315366e2602fb4f5 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Tue, 21 Jul 2015 20:45:54 -0500
> Subject: [PATCH 5/6] guix: packages: Add transitive-input-references.
>
> * guix/packages.scm (transitive-input-references): New procedure.
> * gnu/packages/version-control.scm (package-transitive-propagated-labels*)
>   (package-propagated-input-refs): Delete.
>   (git)[arguments]: Adjust to transitive-input-references.

It addresses previous comments and looks reasonable to me.

OK for ‘master’!

Thank you,
Ludo’.

Re: [PATCH 5/6] guix: Move package-transitive-propagated-labels* and package-propagated-input-refs to (guix packages).

[Eric Bavier]

On Wed, 09 Sep 2015 22:24:11 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Eric Bavier <ericbavier@openmailbox.org> skribis:
> 
> > For Perl, my idea is to wrap each module somehow, so that perl gets the
> > appropriate 'use lib "/gnu/store/..."' when it loads each module.
> > Preferably the solution would also work with store deduplication.
> > I've not yet confirmed this is even feasible, so anyone with more perl
> > knowledge should chime in.
> >
> > Our haskell modules install files into a "package.conf.d" subdirectory,
> > and these files actually keep references to all haskell modules that
> > were configured in the environment when it was built.  I'm baffled why
> > GHC does not make use of this information for dependency resolution when
> > it loads libraries.  Perhaps we could hack our GHC to do so.
> 
> This sounds like retrofitting some RUNPATH-like functionality in
> languages.  This would be ideal, and we should use whatever already
> exists if that does the job (which seems to be the case for Perl?).

It exists for Perl to some degree, but 'use lib "/..."' rather than
simple 'use lib' needs to be explicitely used by the module author,
which is rarely done in practice. 

> 
> Otherwise we should really push upstream to implement that
> functionality.
> 
> > From c7932475b95f22f891169b7f315366e2602fb4f5 Mon Sep 17 00:00:00 2001
> > From: Eric Bavier <bavier@member.fsf.org>
> > Date: Tue, 21 Jul 2015 20:45:54 -0500
> > Subject: [PATCH 5/6] guix: packages: Add transitive-input-references.
> >
> > * guix/packages.scm (transitive-input-references): New procedure.
> > * gnu/packages/version-control.scm (package-transitive-propagated-labels*)
> >   (package-propagated-input-refs): Delete.
> >   (git)[arguments]: Adjust to transitive-input-references.
> 
> It addresses previous comments and looks reasonable to me.
> 
> OK for ‘master’!

Pushed.  Thanks!

`~Eric

Re: [PATCH 4/6] gnu: Add perl-finance-quote.

[Eric Bavier]

On Wed, 22 Jul 2015 15:41:00 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> ericbavier@openmailbox.org skribis:
> 
> > From: Eric Bavier <bavier@member.fsf.org>
> >
> > * gnu/packages/web.scm (perl-finance-quote): New variable.
> > * gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch: New patch.
> > * gnu-system.am (dist_patch_DATA): Add it.
> 
> LGTM.

I pushed this to 'master'.

> 
> > +++ b/gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch
> > @@ -0,0 +1,15 @@
> > +Rather than unconditionally using Mozilla's CA certificates, let the user tell
> > +LWP's UserAgent where to find certificates with the PERL_LWP_SSL_CA_FILE,
> > +HTTPS_CA_FILE, PERL_LWP_SSL_CA_PATH, or HTTPS_CA_DIR environment variables
> > +instead.
> 
> Makes sense.  Should perl-lwp-useragent-determined be augmented with
> search path entries for these?

I don't know that it's necessary.  It seems that the cert bundle made
during profile creation gets picked up somehow.

`~Eric