TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import: hackage: Avoid pointless use of 'compose'. 

* guix/import/hackage.scm (hackage-module->sexp): Unroll pointless calls
to 'compose'.
(hackage->guix-package): Likewise.
This commit is contained in:
Ludovic Courtès 2022-03-07 22:44:34 +01:00
parent 5278cab3dc
commit 483e4a9d07
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
guix/import/hackage.scm
View File

@ -249,23 +249,18 @@ the hash of the Cabal file."
(hackage-source-url name version))
(define hackage-dependencies
((compose (cut filter-dependencies <>
(cabal-package-name cabal))
(cut cabal-dependencies->names <>))
cabal))
(filter-dependencies (cabal-dependencies->names cabal)
(cabal-package-name cabal)))
(define hackage-native-dependencies
(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)
(filter-dependencies
(append (if include-test-dependencies?
(cabal-test-dependencies->names cabal)
'())
(cabal-custom-setup-dependencies->names cabal))
(cabal-package-name cabal))
hackage-dependencies))
(define dependencies
@ -339,11 +334,10 @@ respectively."
(read-cabal-and-hash port)
(hackage-fetch-and-hash package-name))))
(if cabal-meta
((compose (cut hackage-module->sexp <> cabal-hash
#:include-test-dependencies?
include-test-dependencies?)
(cut eval-cabal <> cabal-environment))
cabal-meta)
(hackage-module->sexp (eval-cabal cabal-meta cabal-environment)
cabal-hash
#:include-test-dependencies?
include-test-dependencies?)
(values #f '()))))
(define hackage->guix-package/m ;memoized variant