me
/
guix
Archived
1
0
Fork 0
Code

import: hackage: Filter upper/mixed case dependencies too. 

* guix/import/hackage.scm (filter-dependencies): Convert OWN-NAMES
to lowercase before filtering.
(hackage-module->sexp): Remove #f from OWN-NAMES, which is used for
unnamed (default) libraries.
* tests/hackage.scm (test-cabal-internal-library-ignored): Add mismatched
uppercase letters.
Lars-Dominik Braun 2022-06-02 13:52:08 +02:00
parent dedfcaa8e2
commit 143141726e
No known key found for this signature in database
GPG Key ID: F663943E08D8092A
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/import/hackage.scm
View File

@ -227,9 +227,10 @@ object."
list with the names of dependencies. OWN-NAMES is the name of the Cabal
package being processed and its internal libaries and is used to filter
references to itself."
(filter (lambda (d) (not (member (string-downcase d)
(let ((ignored-dependencies (map string-downcase
(append own-names ghc-standard-libraries))))
dependencies))
(filter (lambda (d) (not (member (string-downcase d) ignored-dependencies)))
dependencies)))
(define* (hackage-module->sexp cabal cabal-hash
#:key (include-test-dependencies? #t))
@ -250,7 +251,8 @@ the hash of the Cabal file."
(hackage-source-url name version))
(define own-names (cons (cabal-package-name cabal)
(map cabal-library-name (cabal-package-library cabal))))
(filter (lambda (x) (not (eqv? x #f)))
(map cabal-library-name (cabal-package-library cabal)))))
(define hackage-dependencies
(filter-dependencies (cabal-dependencies->names cabal) own-names))

7
tests/hackage.scm
View File

@ -368,7 +368,8 @@ executable cabal
(test-assert "hackage->guix-package test without final newline"
(eval-test-with-cabal test-cabal-no-final-newline match-ghc-foo))
;; Make sure internal libraries will not be part of the dependencies.
;; Make sure internal libraries will not be part of the dependencies,
;; ignore case.
(define test-cabal-internal-library-ignored
"name: foo
version: 1.0.0
@ -379,8 +380,8 @@ license: BSD3
executable cabal
build-depends:
HTTP >= 4000.2.5 && < 4000.3,
internal
library internal
internAl
library internaL
build-depends: mtl >= 2.0 && < 3
")