diff options
Diffstat (limited to 'guix/import')
| -rw-r--r-- | guix/import/hackage.scm | 6 | ||||
| -rw-r--r-- | guix/import/opam.scm | 16 | ||||
| -rw-r--r-- | guix/import/texlive.scm | 8 |
3 files changed, 18 insertions, 12 deletions
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 5fe3d85a7f..9cf07c9504 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -52,8 +52,8 @@ hackage-package?)) (define ghc-standard-libraries - ;; List of libraries distributed with ghc (8.4.3). - ;; Contents of ...-ghc-8.4.3/lib/ghc-8.4.3. + ;; List of libraries distributed with ghc (8.6.5). + ;; Contents of ...-ghc-8.6.5/lib/ghc-8.6.5. '("ghc" "cabal" ;; in the output of `ghc-pkg list` Cabal is uppercased, but ;; hackage-name->package-name takes this into account. @@ -70,11 +70,13 @@ "ghc-boot" "ghc-boot-th" "ghc-compact" + "ghc-heap" "ghc-prim" "ghci" "haskeline" "hpc" "integer-gmp" + "libiserv" "mtl" "parsec" "pretty" diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 7f089a5cf3..e258c4197f 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -49,7 +49,7 @@ (define-peg-pattern COLON none ":") ;; A string character is any character that is not a quote, or a quote preceded by a backslash. (define-peg-pattern STRCHR body - (or " " "!" (and (ignore "\\") "\"") + (or " " "!" "\n" (and (ignore "\\") "\"") (and (ignore "\\") "\\") (range #\# #\頋))) (define-peg-pattern operator all (or "=" "!" "<" ">")) @@ -249,10 +249,7 @@ path to the repository." (url-dict (metadata-ref opam-content "url")) (source-url (metadata-ref url-dict "src")) (requirements (metadata-ref opam-content "depends")) - (dependencies (filter - (lambda (name) - (not (member name '("dune" "jbuilder")))) - (dependency-list->names requirements))) + (dependencies (dependency-list->names requirements)) (native-dependencies (depends->native-inputs requirements)) (inputs (dependency-list->inputs (depends->inputs requirements))) (native-inputs (dependency-list->inputs @@ -264,8 +261,8 @@ path to the repository." native-dependencies)))) ;; If one of these are required at build time, it means we ;; can use the much nicer dune-build-system. - (let ((use-dune? (or (member "dune" native-dependencies) - (member "jbuilder" native-dependencies)))) + (let ((use-dune? (or (member "dune" (append dependencies native-dependencies)) + (member "jbuilder" (append dependencies native-dependencies))))) (call-with-temporary-output-file (lambda (temp port) (and (url-fetch source-url temp) @@ -297,7 +294,10 @@ path to the repository." (synopsis ,(metadata-ref opam-content "synopsis")) (description ,(metadata-ref opam-content "description")) (license #f)) - dependencies))))))) + (filter + (lambda (name) + (not (member name '("dune" "jbuilder")))) + dependencies)))))))) (define (opam-recursive-import package-name) (recursive-import package-name #f diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 791b514485..d528aace9a 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -140,7 +140,9 @@ expression describing it." (synopsis (sxml-value '(entry caption *text*))) (version (or (sxml-value '(entry version @ number *text*)) (sxml-value '(entry version @ date *text*)))) - (license (string->license (sxml-value '(entry license @ type *text*)))) + (license (match ((sxpath '(entry license @ type *text*)) sxml) + ((license) (string->license license)) + ((lst ...) (map string->license lst)))) (home-page (string-append "http://www.ctan.org/pkg/" id)) (ref (texlive-ref component id)) (checkout (download-svn-to-store store ref))) @@ -169,7 +171,9 @@ expression describing it." (sxml->string (or (sxml-value '(entry description)) '()))) #\newline))))) - (license ,license))))) + (license ,(match license + ((lst ...) `(list ,@lst)) + (license license))))))) (define texlive->guix-package (memoize |