[bug#32809] [PATCH 0/1] import: hackage: Do not repeat inputs in native-inputs.

[bug#32809] [PATCH 0/1] import: hackage: Do not repeat inputs in native-inputs.

[Arun Isaac]

Tha hackage importer lists packages in native-inputs even if they have already
been listed in inputs. This should not be. The following patch fixes this.

As an illustration of what I mean, look at the difference when importing the
hackage package test-framework with and without this patch applied.

Arun Isaac (1):
  import: hackage: Do not repeat inputs in native-inputs.

 guix/import/hackage.scm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

-- 
2.19.0

[bug#32809] [PATCH 1/1] import: hackage: Do not repeat inputs in native-inputs.

[Arun Isaac]

* guix/import/hackage.scm (hackage-module->sexp): Do not repeat inputs again
in native-inputs. native-inputs should only contain packages that are not
already listed in inputs.
---
 guix/import/hackage.scm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 766a0b53f..48db764b3 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -215,15 +215,18 @@ representation of a Cabal file as produced by 'read-cabal'."
      cabal))
 
   (define hackage-native-dependencies
-    ((compose (cut filter-dependencies <>
-                   (cabal-package-name cabal))
-              ;; FIXME: Check include-test-dependencies?
-              (lambda (cabal)
-                (append (if include-test-dependencies?
-                            (cabal-test-dependencies->names cabal)
-                            '())
-                        (cabal-custom-setup-dependencies->names cabal))))
-     cabal))
+    (lset-difference
+     equal?
+     ((compose (cut filter-dependencies <>
+                    (cabal-package-name cabal))
+               ;; FIXME: Check include-test-dependencies?
+               (lambda (cabal)
+                 (append (if include-test-dependencies?
+                             (cabal-test-dependencies->names cabal)
+                             '())
+                         (cabal-custom-setup-dependencies->names cabal))))
+      cabal)
+     hackage-dependencies))
 
   (define dependencies
     (map (lambda (name)
-- 
2.19.0

[bug#32809] [PATCH 1/1] import: hackage: Do not repeat inputs in native-inputs.

[Danny Milosavljevic]

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

On Sat, 22 Sep 2018 22:57:57 +0530
Arun Isaac <arunisaac@systemreboot.net> wrote:

> * guix/import/hackage.scm (hackage-module->sexp): Do not repeat inputs again
> in native-inputs. native-inputs should only contain packages that are not
> already listed in inputs.

Aha?  When cross-compiling, will guix provide all the tools natively that are
listed in inputs? (rather than just the ones in native-inputs)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#32809] [PATCH 1/1] import: hackage: Do not repeat inputs in native-inputs.

[Arun Isaac]

>> * guix/import/hackage.scm (hackage-module->sexp): Do not repeat inputs again
>> in native-inputs. native-inputs should only contain packages that are not
>> already listed in inputs.
>
> Aha?  When cross-compiling, will guix provide all the tools natively that are
> listed in inputs? (rather than just the ones in native-inputs)

That's a good question. I did not think of it, and I don't know the
answer. Whenever I have packaged any package (Haskell packages,
included) for Guix, I have taken care to not repeat the inputs in the
native-inputs. Now that you mention this, I don't know if that was the
right thing to do. WDYT?

I have CCed Ricardo in this mail.

[bug#32809] [PATCH 1/1] import: hackage: Do not repeat inputs in native-inputs.

[Ricardo Wurmus]

Hi Arun,

>>> * guix/import/hackage.scm (hackage-module->sexp): Do not repeat inputs again
>>> in native-inputs. native-inputs should only contain packages that are not
>>> already listed in inputs.
>>
>> Aha?  When cross-compiling, will guix provide all the tools natively that are
>> listed in inputs? (rather than just the ones in native-inputs)
>
> That's a good question. I did not think of it, and I don't know the
> answer. Whenever I have packaged any package (Haskell packages,
> included) for Guix, I have taken care to not repeat the inputs in the
> native-inputs. Now that you mention this, I don't know if that was the
> right thing to do. WDYT?

Currently, the haskell-build-system says this about cross-building
packages:

    XXX: no cross-compilation

Until we have patches to add proper cross-compilation support to the
Haskell build system, I’d prefer to let the importer only keep packages
that are not already listed in the inputs.

This is probably the right thing to do.  It may even be correct to have
all Haskell *libraries* among the regular inputs and only test *tools*
be build-host native.

The Cabal format does not differ between these cases.  It only supports
specifications of different build targets with arbitrary names and
usually with full lists of dependencies, even if the dependencies might
be duplicates of those used for other build targets.

In short: the patch looks good to me.

Thanks!

--
Ricardo

bug#32809: [PATCH 1/1] import: hackage: Do not repeat inputs in native-inputs.

[Arun Isaac]

> In short: the patch looks good to me.

Pushed, thanks!