Merge pull request #101505 from TredwellGit/nasm

nasm: 2.14.02 -> 2.15.05 (CVE-2019-6290 CVE-2019-6291 CVE-2019-8343 CVE-2019-14248 CVE-2019-20334)
This commit is contained in:
WilliButz 2020-10-26 14:09:53 +01:00 committed by GitHub
commit c48a9a6b53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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