diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-06-24 01:02:33 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-06-25 01:20:31 +0200 |
| commit | a2991de0f44a5f4db71ddad67e914fe3344a4505 (patch) | |
| tree | 5f3c22f4349d36fac3c9f7a98b827598eacfdf83 | |
| parent | 9e91f8623f6ac5e00e935a5429adb5cf62416098 (diff) | |
| download | guix-a2991de0f44a5f4db71ddad67e914fe3344a4505.tar guix-a2991de0f44a5f4db71ddad67e914fe3344a4505.tar.gz | |
gnu: guix: Build with Guile 3.0.4.
Since Guile 3.0.4 bytecode is not readable by 3.0.2, build the
dependents of 'guix' with 3.0.4 as well.
* gnu/packages/package-management.scm (guix)[inputs, native-inputs]: Use
GUILE-3.0-LATEST.
(gwl, guix-jupyter): Likewise.
* gnu/packages/web.scm (hpcguix-web): Likewise.
* gnu/packages/ci.scm (cuirass): Likewise.
* gnu/packages/emacs-xyz.scm (emacs-guix): Likewise.
| -rw-r--r-- | gnu/packages/ci.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/package-management.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/web.scm | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index ebc8767490..beb189ede8 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -120,7 +120,7 @@ `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) #t)))))) (inputs - `(("guile" ,guile-3.0) + `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-4) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8df190d606..4869b24a6e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2533,7 +2533,7 @@ type, for example: packages, buffers, files, etc.") `(("pkg-config" ,pkg-config) ("emacs" ,emacs-minimal))) (inputs - `(("guile" ,guile-3.0) + `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) ("guix" ,guix))) (propagated-inputs `(("geiser" ,emacs-geiser) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 44321240e9..bfecf110ca 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -319,7 +319,7 @@ $(prefix)/etc/init.d\n"))) ;; Guile libraries are needed here for ;; cross-compilation. - ("guile" ,guile-3.0) + ("guile" ,guile-3.0-latest) ;for faster builds ("gnutls" ,gnutls) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-4) @@ -346,7 +346,7 @@ $(prefix)/etc/init.d\n"))) ("sqlite" ,sqlite) ("libgcrypt" ,libgcrypt) - ("guile" ,guile-3.0) + ("guile" ,guile-3.0-latest) ;; Some of the tests use "unshare" when it is available. ("util-linux" ,util-linux) @@ -897,7 +897,7 @@ written entirely in Python."))) ("texinfo" ,texinfo) ("graphviz" ,graphviz))) (inputs - `(("guile" ,guile-3.0))) + `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")))) (propagated-inputs `(("guix" ,guix) ("guile-commonmark" ,guile-commonmark) @@ -995,7 +995,7 @@ environments.") ("python-ipykernel" ,python-ipykernel))) (inputs `(("guix" ,guix) - ("guile" ,guile-3.0))) + ("guile" ,@(assoc-ref (package-native-inputs guix) "guile")))) (propagated-inputs `(("guile-json" ,guile-json-4) ("guile-simple-zmq" ,guile-simple-zmq) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8d1c668b8e..cca722f6e9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7370,9 +7370,9 @@ compressed JSON header blocks. ("uglify-js" ,uglify-js) ("pkg-config" ,pkg-config))) (inputs - `(("guix" ,guix))) + `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")))) (propagated-inputs - `(("guile" ,guile-3.0) + `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) ("guile-commonmark" ,guile-commonmark) ("guile-json" ,guile-json-4))) (home-page "https://github.com/UMCUGenetics/hpcguix-web") |