Merge branch 'master' into staging.

4 files changed, 16 insertions, 11 deletions

diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 2f74000eef..651415098e 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -273,9 +273,7 @@ standard packages used as implicit inputs of the GNU build system."
 
   ;; Resolve (gnu packages commencement) lazily to hide circular dependency.
   (let ((distro (resolve-module '(gnu packages commencement))))
-    (if (target-riscv64?)
-      (module-ref distro '%final-inputs-riscv64)
-      (module-ref distro '%final-inputs))))
+    (module-ref distro '%final-inputs)))
 
 (define* (lower name
                 #:key source inputs native-inputs outputs target
diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm
index 6261f8a55a..66e7711bcd 100644
--- a/guix/build-system/julia.scm
+++ b/guix/build-system/julia.scm
@@ -2,7 +2,8 @@
 ;;; Copyright © 2019 Nicolò Balzarotti <nicolo@nixo.xyz>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
-;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -88,6 +89,7 @@
                       (guile #f)
                       (julia-package-name #f)
                       (julia-package-uuid #f)
+                      (julia-package-dependencies ''())
                       (imported-modules %julia-build-system-modules)
                       (modules '((guix build julia-build-system)
                                  (guix build utils))))
@@ -108,7 +110,8 @@
                                                search-paths))
                        #:inputs #$(input-tuples->gexp inputs)
                        #:julia-package-name #$julia-package-name
-                       #:julia-package-uuid #$julia-package-uuid))))
+                       #:julia-package-uuid #$julia-package-uuid
+                       #:julia-package-dependencies #$julia-package-dependencies))))
 
   (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
                                                   system #:graft? #f)))
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index ad604f8871..9fee6c4570 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -58,6 +59,7 @@ for TRIPLET."
                           (if (target-64bit? triplet)
                               "ppc64"
                               "ppc"))
+                         ((target-riscv64? triplet) "riscv64")
                          (#t (error "meson: unknown architecture"))))
     (cpu . ,(cond ((target-x86-32? triplet) ; i386, ..., i686
                    (substring triplet 0 4))
@@ -78,6 +80,8 @@ for TRIPLET."
                      ;; At least in Guix.  Aarch64 and 32-bit arm
                      ;; have a big-endian mode as well.
                      ((target-arm? triplet) "little")
+                     ((target-ppc32? triplet) "big")
+                     ((target-riscv64? triplet) "little")
                      (#t (error "meson: unknown architecture"))))))
 
 (define (make-binaries-alist triplet)
diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm
index e7d6d96f0e..5ced9d243b 100644
--- a/guix/build-system/ocaml.scm
+++ b/guix/build-system/ocaml.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016, 2017, 2018 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
-;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021-2022 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -216,13 +216,13 @@ pre-defined variants."
          (host-inputs `(,@(if source
                               `(("source" ,source))
                               '())
-                        ,@inputs
-
-                        ;; Keep the standard inputs of 'gnu-build-system'.
-                        ,@(standard-packages)))
+                        ,@inputs))
          (build-inputs `(("ocaml" ,ocaml)
                          ("findlib" ,findlib)
-                         ,@native-inputs))
+                         ,@native-inputs
+
+                         ;; Keep the standard inputs of 'gnu-build-system'.
+                         ,@(standard-packages)))
          (outputs outputs)
          (build ocaml-build)
          (arguments (strip-keyword-arguments private-keywords arguments)))))