diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-09 12:22:14 +0200 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-09 12:22:14 +0200 |
commit | 94ca5b4357af8f8921f0cb0873a7cf316f13aa69 (patch) | |
tree | 6ef30120737f26f298f7f17d86597b0b729517e0 /gnu/packages/assembly.scm | |
parent | 6750c114e3e988249f4069d0180316c6d0192350 (diff) | |
parent | db61bdd7f52270a35bd0a3a88650d98276dab20b (diff) | |
download | guix-94ca5b4357af8f8921f0cb0873a7cf316f13aa69.tar.gz guix-94ca5b4357af8f8921f0cb0873a7cf316f13aa69.zip |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/assembly.scm')
-rw-r--r-- | gnu/packages/assembly.scm | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 4494c475ce..81e38c3f41 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -470,20 +470,18 @@ sets, both THUMB and ARM mode.") (define-public intel-xed (package (name "intel-xed") - (version "12.0.1") + (version "2023.08.21") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/intelxed/xed") - (commit version))) - (sha256 (base32 "07zfff8zf29c2n0wal87hiqfq3cwcjn80zz78mz0nyjfj09nd39f")) - (file-name (git-file-name name version)) - (patches (search-patches "intel-xed-fix-nondeterminism.patch")))) + (commit (string-append "v" version)))) + (sha256 (base32 "1zv99m5h3n3w6jcpplznq030s5mlwg5llz3vgfwpfl5l8laz1032")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("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 ;; opt to include it here instead of packaging separately. Note also @@ -491,15 +489,15 @@ sets, both THUMB and ARM mode.") ;; reference the "version" variable from setup.py instead. ("mbuild" ,(let ((name "mbuild") - (version "0.2496")) + (version "2022.07.28")) (origin (method git-fetch) (uri (git-reference (url "https://github.com/intelxed/mbuild") - (commit "3de3f0d753c11dbe634bec611d4cc13f74768e4f"))) + (commit (string-append "v" version)))) (sha256 (base32 - "0z8hdhpmk8y5c9429p2yns9daswnffbprni9czkq3vij8f58lkg4")) + "0rc9xp202yqw42bwgylwxvfvjr1crdl50qvv8vzfczyvlf4wflcx")) (file-name (git-file-name name version))))))) (outputs '("out" "lib")) (arguments @@ -585,5 +583,3 @@ intrinsics as defined in the @file{arm_neon.h} header and x86 SSE (up to SSE4.2) intrinsic functions as defined in corresponding x86 compilers headers files.") (license license:bsd-2)))) - - |