diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/ada.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/ada.scm')
| -rw-r--r-- | gnu/packages/ada.scm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gnu/packages/ada.scm b/gnu/packages/ada.scm index 240e13f3ef..a3bba245ec 100644 --- a/gnu/packages/ada.scm +++ b/gnu/packages/ada.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic <[email protected]> ;;; Copyright © 2020 Tobias Geerinckx-Rice <[email protected]> +;;; Copyright © 2021 Efraim Flashner <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,17 +49,20 @@ (file-name (git-file-name name version)))) (build-system gnu-build-system) (supported-systems (list "i686-linux" "x86_64-linux" - "armhf-linux" "aarch64-linux")) + "armhf-linux" "aarch64-linux" + "powerpc-linux")) (outputs (list "out" "debug")) (arguments `(#:system ,@(match (%current-system) ;; This package predates 64-bit PCs: a ‘64-bit’ adaexec segfaults. ;; Force a 32-bit build targeting a similar architecture. - ((or "armhf-linux" "aarch64-linux") + ("aarch64-linux" `("armhf-linux")) + ("x86_64-linux" + `("i686-linux")) (_ - `("i686-linux"))) + (list (%current-system)))) #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append @@ -130,7 +134,7 @@ (find-files "share" "."))) #t))))))) (native-inputs - `(("sed" ,sed))) + (list sed)) (home-page (string-append "https://web.archive.org/web/20140902150609/" "http://www2.informatik.uni-stuttgart.de/iste/ps/" "ada-software/html/dos_ada.html")) @@ -163,10 +167,7 @@ level.") (file-name (string-append name "-" version "-checkout")))) (build-system python-build-system) (propagated-inputs - `(("python2-docutils" ,python2-docutils) - ("python2-enum34" ,python2-enum34) - ("python2-funcy" ,python2-funcy) - ("python2-mako" ,python2-mako))) + (list python2-docutils python2-enum34 python2-funcy python2-mako)) (arguments `(#:python ,python-2 #:tests? #f)) ; Tests would requite gprbuild (Ada). |