diff options
| author | Marius Bakke <marius@gnu.org> | 2021-09-17 01:25:52 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-09-17 01:25:52 +0200 |
| commit | 5c3cb22c9b2810669999e044b2de5e9331011a83 (patch) | |
| tree | 3276e19cc1a0af3cece6ce4f2bfa930901888bb4 /guix/build-system/dune.scm | |
| parent | c896287ce5eff968a0b323f3a069653a64b96b4c (diff) | |
| parent | 2a054d29dcfd4b68ed3914886b637f93ac7a0a72 (diff) | |
| download | guix-5c3cb22c9b2810669999e044b2de5e9331011a83.tar guix-5c3cb22c9b2810669999e044b2de5e9331011a83.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/chez.scm
gnu/packages/docbook.scm
gnu/packages/ebook.scm
gnu/packages/gnome.scm
gnu/packages/linux.scm
gnu/packages/networking.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/tex.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/dune.scm
guix/build-system/go.scm
guix/build-system/linux-module.scm
guix/packages.scm
Diffstat (limited to 'guix/build-system/dune.scm')
| -rw-r--r-- | guix/build-system/dune.scm | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/guix/build-system/dune.scm b/guix/build-system/dune.scm index 303b5f76c6..12100fd8e8 100644 --- a/guix/build-system/dune.scm +++ b/guix/build-system/dune.scm @@ -61,6 +61,17 @@ #:allow-other-keys #:rest arguments) "Return a bag for NAME." + + ;; Flags that put dune into reproducible build mode. + (define dune-release-flags + (if (version>=? (package-version dune) "2.5.0") + ;; For dune >= 2.5.0 this is just --release. + ''("--release") + ;; --release does not exist before 2.5.0. Replace with flags compatible + ;; with our old ocaml4.07-dune (1.11.3) + ''("--root" "." "--ignore-promoted-rules" "--no-config" + "--profile" "release"))) + (define private-keywords '(#:target #:dune #:findlib #:ocaml #:inputs #:native-inputs)) @@ -80,7 +91,9 @@ (build-inputs `(("dune" ,dune) ,@(bag-build-inputs base))) (build dune-build) - (arguments (strip-keyword-arguments private-keywords arguments)))))) + (arguments (append + `(#:dune-release-flags ,dune-release-flags) + (strip-keyword-arguments private-keywords arguments))))))) (define* (dune-build name inputs #:key @@ -91,7 +104,7 @@ (out-of-source? #t) (jbuild? #f) (package #f) - (profile "release") + (dune-release-flags ''()) (tests? #t) (test-flags ''()) (test-target "test") @@ -131,7 +144,7 @@ provides a 'setup.ml' file as its build system." #:out-of-source? #$out-of-source? #:jbuild? #$jbuild? #:package #$package - #:profile #$profile + #:dune-release-flags #$dune-release-flags #:tests? #$tests? #:test-target #$test-target #:install-target #$install-target |