diff options
Diffstat (limited to 'gnu/packages/assembly.scm')
| -rw-r--r-- | gnu/packages/assembly.scm | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 51c0572674..177ea0b74f 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Christopher Lemmer Webber <cwebber@dustycloud.org> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> +;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,14 +58,14 @@ (define-public nasm (package (name "nasm") - (version "2.14.02") + (version "2.15.05") (source (origin (method url-fetch) (uri (string-append "http://www.nasm.us/pub/nasm/releasebuilds/" version "/nasm-" version ".tar.xz")) (sha256 (base32 - "1xg8dfr49py15vbwk1rzcjc3zpqydmr49ahlijm56wlgj8zdwjp2")))) + "0gqand86b0r86k3h46dh560lykxmxqqywz5m55kgjfq7q4lngbrw")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;for doc and test target ("texinfo" ,texinfo))) @@ -75,11 +76,10 @@ (add-after 'unpack 'dont-build-ps-pdf-outputs (lambda _ (substitute* "doc/Makefile.in" - (("html nasmdoc.txt nasmdoc.pdf") + (("html nasmdoc.txt nasmdoc.pdf \\$\\(XZFILES\\)") "html nasmdoc.txt") (("\\$\\(INSTALL_DATA\\) nasmdoc.pdf") - "$(INSTALL_DATA)")) - #t)) + "$(INSTALL_DATA)")))) (add-after 'install 'install-info (lambda _ (invoke "make" "install_doc")))))) @@ -445,19 +445,19 @@ sets, both THUMB and ARM mode.") (define-public intel-xed (package (name "intel-xed") - (version "11.2.0") + (version "12.0.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/intelxed/xed") (commit version))) - (sha256 (base32 "1jffayski2gpd54vaska7fmiwnnia8v3cka4nfyzjgl8xsky9v2s")) + (sha256 (base32 "07zfff8zf29c2n0wal87hiqfq3cwcjn80zz78mz0nyjfj09nd39f")) (file-name (git-file-name name version)) (patches (search-patches "intel-xed-fix-nondeterminism.patch")))) (build-system gnu-build-system) (native-inputs - `(("python-wrapper" ,python-wrapper) + `(("python" ,python-wrapper) ("tcsh" ,tcsh) ;; As of the time of writing this comment, mbuild does not exist in the ;; Python Package Index and seems to only be used by intel-xed, so we @@ -471,10 +471,10 @@ sets, both THUMB and ARM mode.") (method git-fetch) (uri (git-reference (url "https://github.com/intelxed/mbuild") - (commit "5304b94361fccd830c0e2417535a866b79c1c297"))) + (commit "3de3f0d753c11dbe634bec611d4cc13f74768e4f"))) (sha256 (base32 - "0r3avc3035aklqxcnc14rlmmwpj3jp09vbcbwynhvvmcp8srl7dl")) + "0z8hdhpmk8y5c9429p2yns9daswnffbprni9czkq3vij8f58lkg4")) (file-name (git-file-name name version))))))) (outputs '("out" "lib")) (arguments @@ -489,8 +489,7 @@ sets, both THUMB and ARM mode.") (replace 'build (lambda* (#:key inputs #:allow-other-keys) (let ((mbuild (assoc-ref inputs "mbuild"))) - (setenv "PYTHONPATH" (string-append - (getenv "PYTHONPATH") ":" mbuild)) + (setenv "PYTHONPATH" mbuild) (invoke "./mfile.py" (string-append "--build-dir=" build-dir) (string-append "--install-dir=" kit-dir) @@ -517,8 +516,7 @@ sets, both THUMB and ARM mode.") (copy-recursively (string-append kit-dir "/include") (string-append lib "/include")) (copy-recursively (string-append kit-dir "/lib") - (string-append lib "/lib")) - #t))))))) + (string-append lib "/lib"))))))))) (home-page "https://intelxed.github.io/") (synopsis "Encoder and decoder for x86 (IA32 and Intel64) instructions") (description "The Intel X86 Encoder Decoder (XED) is a software library and |