diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-02-15 15:08:20 +0100 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2017-02-15 15:10:00 +0100 |
| commit | c731738ecc132f450bc1cb0eaad7c1fa232fa299 (patch) | |
| tree | a218bc02198f49993d05174b76acb2cc2b04f9e7 /pkgs | |
| parent | 91d0260feba50b25b13d1e0dd2705039f75e09a2 (diff) | |
| download | nixlib-c731738ecc132f450bc1cb0eaad7c1fa232fa299.tar nixlib-c731738ecc132f450bc1cb0eaad7c1fa232fa299.tar.gz nixlib-c731738ecc132f450bc1cb0eaad7c1fa232fa299.tar.bz2 nixlib-c731738ecc132f450bc1cb0eaad7c1fa232fa299.tar.lz nixlib-c731738ecc132f450bc1cb0eaad7c1fa232fa299.tar.xz nixlib-c731738ecc132f450bc1cb0eaad7c1fa232fa299.tar.zst nixlib-c731738ecc132f450bc1cb0eaad7c1fa232fa299.zip | |
graphviz_2_0: hide inside monotoneViz
The old Graphviz version is vulnerable, but monotone-viz will never feed it bad input.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/monotone-viz/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix (renamed from pkgs/tools/graphics/graphviz/2.0.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 154d6442a2f2..255192a91282 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,4 +1,12 @@ -{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, graphviz_2_0, makeWrapper}: +{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, makeWrapper +, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw +}: +# We need an old version of Graphviz for format compatibility reasons. +# This version is vulnerable, but monotone-viz will never feed it bad input. +let graphviz_2_0 = import ./graphviz-2.0.nix { + inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw + yacc libtool fontconfig pango gd libwebp; + }; in stdenv.mkDerivation rec { version = "1.0.2"; name = "monotone-viz-${version}"; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index 32cc283bc3c9..32cc283bc3c9 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ba672c477d7..bd1fd4e823a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2014,12 +2014,6 @@ with pkgs; }; /* Readded by Michael Raskin. There are programs in the wild - * that do want 2.0 but not 2.22. Please give a day's notice for - * objections before removal. The feature is integer coordinates - */ - graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { }; - - /* Readded by Michael Raskin. There are programs in the wild * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for * objections before removal. The feature is libgraph. */ |