summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-06-04 22:28:49 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-06-05 00:14:57 -0400
commit5d547f74ed50ad2065e39af5687a6ca552f53c61 (patch)
tree27d2ade44fd62006e905352fa3c2283a3cac3636 /gnu
parentd1827d5c636adb395153a4ed6064629ed5b7664b (diff)
downloadguix-5d547f74ed50ad2065e39af5687a6ca552f53c61.tar.gz
gnu: nasm: Update to 2.15.05.
* gnu/packages/assembly.scm (nasm): Update to 2.15.05.
[phases]{dont-build-ps-pdf-outputs}: Adjust patching to changes in the source.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/assembly.scm9
1 files changed, 4 insertions, 5 deletions
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 7440a31e1f..177ea0b74f 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -58,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)))
@@ -76,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"))))))