summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2017-12-08 12:49:47 +0100
committerDaiderd Jordan <daiderd@gmail.com>2017-12-08 13:03:54 +0100
commit7d85f1b0e22b85a908e27ed08177bd228bbafc2a (patch)
treeb10b6c664b51f80b635c7dbb7d27691ea63fad7e
parent5bc910a6ef2133e104e8ef430c302871860f2d72 (diff)
downloadnixpkgs-7d85f1b0e22b85a908e27ed08177bd228bbafc2a.tar
nixpkgs-7d85f1b0e22b85a908e27ed08177bd228bbafc2a.tar.gz
nixpkgs-7d85f1b0e22b85a908e27ed08177bd228bbafc2a.tar.bz2
nixpkgs-7d85f1b0e22b85a908e27ed08177bd228bbafc2a.tar.lz
nixpkgs-7d85f1b0e22b85a908e27ed08177bd228bbafc2a.tar.xz
nixpkgs-7d85f1b0e22b85a908e27ed08177bd228bbafc2a.tar.zst
nixpkgs-7d85f1b0e22b85a908e27ed08177bd228bbafc2a.zip
erlangR17: mark insecure
-rw-r--r--pkgs/development/interpreters/erlang/R17.nix2
-rw-r--r--pkgs/development/interpreters/erlang/generic-builder.nix7
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index 02d7513331e..744f905c657 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -32,4 +32,6 @@ mkDerivation rec {
       ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl"
     done
   '';
+
+  meta.knownVulnerabilities = [ "CVE-2017-1000385" ];
 }
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index af728b942eb..eae4a50aa20 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -26,7 +26,7 @@
 , installTargets ? "install install-docs"
 , checkPhase ? "", preCheck ? "", postCheck ? ""
 , fixupPhase ? "", preFixup ? "", postFixup ? ""
-, meta ? null
+, meta ? {}
 }:
 
 assert wxSupport -> (if stdenv.isDarwin
@@ -101,7 +101,7 @@ in stdenv.mkDerivation ({
 
   setupHook = ./setup-hook.sh;
 
-  meta = with stdenv.lib; {
+  meta = with stdenv.lib; ({
     homepage = http://www.erlang.org/;
     downloadPage = "http://www.erlang.org/download.html";
     description = "Programming language used for massively scalable soft real-time systems";
@@ -118,7 +118,7 @@ in stdenv.mkDerivation ({
     platforms = platforms.unix;
     maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ];
     license = licenses.asl20;
-  };
+  } // meta);
 }
 // optionalAttrs (preUnpack != "")      { inherit preUnpack; }
 // optionalAttrs (postUnpack != "")     { inherit postUnpack; }
@@ -140,5 +140,4 @@ in stdenv.mkDerivation ({
 // optionalAttrs (fixupPhase != "")     { inherit fixupPhase; }
 // optionalAttrs (preFixup != "")       { inherit preFixup; }
 // optionalAttrs (postFixup != "")      { inherit postFixup; }
-// optionalAttrs (meta != null)         { inherit meta; }
 )