From b577f3292ebc98de91297fb24ed6ef3c2a95cb93 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 22 Apr 2018 15:46:12 -0500 Subject: [PATCH 1/2] mono: allow custom meta in generic --- pkgs/development/compilers/mono/generic.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 3b476bce0273..a62f2f24dd87 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -5,13 +5,15 @@ , version, sha256 , withLLVM ? false , enableParallelBuilding ? true +, meta ? {} }: let llvm = callPackage ./llvm.nix { }; -in -stdenv.mkDerivation rec { name = "mono-${version}"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { inherit sha256; @@ -91,5 +93,5 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.x86; maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ]; license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? - }; + } // meta; } From 6e0a68b1e6bd8decfb78ea5cc0b21d9c65fc3058 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 22 Apr 2018 15:46:51 -0500 Subject: [PATCH 2/2] mono: add knownVulnerabilities for 4.0.4 http://www.mono-project.com/docs/about-mono/vulnerabilities/#string-to-double-parser-bug --- pkgs/development/compilers/mono/4.0.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix index 8621751e5a14..f13883db74ff 100644 --- a/pkgs/development/compilers/mono/4.0.nix +++ b/pkgs/development/compilers/mono/4.0.nix @@ -3,4 +3,7 @@ callPackage ./generic.nix (rec { inherit Foundation libobjc; version = "4.0.4.1"; sha256 = "1ydw9l89apc9p7xr5mdzy0h97g2q6v243g82mxswfc2rrqhfs4gd"; + meta = { + knownVulnerabilities = [ "CVE-2009-0689" ]; + }; })