From 3b7f2b006eed39d14213470fec54350a96d694bd Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Fri, 23 Oct 2020 22:12:18 +0000
Subject: [PATCH] nasm: 2.14.02 -> 2.15.05

https://nasm.us/doc/nasmdocc.html
https://nvd.nist.gov/vuln/detail/CVE-2019-6290
https://nvd.nist.gov/vuln/detail/CVE-2019-6291
https://nvd.nist.gov/vuln/detail/CVE-2019-8343
https://nvd.nist.gov/vuln/detail/CVE-2019-14248
https://nvd.nist.gov/vuln/detail/CVE-2019-20334
---
 pkgs/development/compilers/nasm/default.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index 67665c3bab18..89217db6818f 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -1,27 +1,25 @@
-{ stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
+{ stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   pname = "nasm";
-  version = "2.14.02";
+  version = "2.15.05";
 
-  src = fetchFromRepoOrCz {
-    repo = "nasm";
-    rev = "${pname}-${version}";
-    sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa";
+  src = fetchurl {
+    url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz";
+    sha256 = "0gqand86b0r86k3h46dh560lykxmxqqywz5m55kgjfq7q4lngbrw";
   };
 
-  nativeBuildInputs = [ autoreconfHook perl asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
+  nativeBuildInputs = [ perl ];
 
-  postBuild = "make manpages";
+  enableParallelBuilding = true;
 
   doCheck = true;
 
   checkPhase = ''
-    make golden && make test
+    make golden
+    make test
   '';
 
-  NIX_CFLAGS_COMPILE="-Wno-error=attributes";
-
   meta = with stdenv.lib; {
     homepage = "https://www.nasm.us/";
     description = "An 80x86 and x86-64 assembler designed for portability and modularity";