[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/16: guix: import: Fix importing dune project.
From: |
guix-commits |
Subject: |
16/16: guix: import: Fix importing dune project. |
Date: |
Sat, 30 Nov 2019 09:51:50 -0500 (EST) |
roptat pushed a commit to branch master
in repository guix.
commit ba3ff730caab25ffb5b1f2b90a7eccd2fffa2691
Author: Julien Lepiller <address@hidden>
Date: Wed Nov 27 23:38:36 2019 +0100
guix: import: Fix importing dune project.
* guix/import/opam.scm: Detect dune projects from dependencies, then
filter dune from dependencies.
---
guix/import/opam.scm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/guix/import/opam.scm b/guix/import/opam.scm
index 7f5303f..e258c41 100644
--- a/guix/import/opam.scm
+++ b/guix/import/opam.scm
@@ -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
- 02/16: gnu: lablgtk: Update to 2.18.8., (continued)
- 02/16: gnu: lablgtk: Update to 2.18.8., guix-commits, 2019/11/30
- 04/16: gnu: ocaml-bitstring: Remove unneeded dependencies., guix-commits, 2019/11/30
- 03/16: gnu: ocaml-findlib: Update to 1.8.1., guix-commits, 2019/11/30
- 01/16: gnu: opam: Remove unneeded dependency on deprecated camlp4., guix-commits, 2019/11/30
- 12/16: gnu: ocaml-piqi: Update to 0.7.7., guix-commits, 2019/11/30
- 10/16: gnu: ocaml-piqilib: Update to 0.6.15., guix-commits, 2019/11/30
- 15/16: guix: import: Fix opam importer., guix-commits, 2019/11/30
- 07/16: gnu: ocaml-csv: Update to 2.3., guix-commits, 2019/11/30
- 06/16: gnu: ocaml-bisect: Remove package., guix-commits, 2019/11/30
- 08/16: gnu: Add ocaml-gen., guix-commits, 2019/11/30
- 16/16: guix: import: Fix importing dune project.,
guix-commits <=
- 11/16: gnu: ocaml-ulex: Remove package., guix-commits, 2019/11/30
- 05/16: gnu: ocaml-batteries: Remove unneeded dependencies., guix-commits, 2019/11/30
- 09/16: gnu: Add ocaml-sedlex., guix-commits, 2019/11/30
- 14/16: gnu: camlp4: Remove obsolete package., guix-commits, 2019/11/30
- 13/16: gnu: ocaml-camomile: Remove unneeded dependency., guix-commits, 2019/11/30