diff options
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 13 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 87c39d1be558..892208b01d7d 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -59,7 +59,18 @@ <itemizedlist> <listitem> - <para /> + <para> + Grafana is now built without support for phantomjs by default. Phantomjs support has been + <link xlink:href="https://grafana.com/docs/grafana/latest/guides/whats-new-in-v6-4/">deprecated in Grafana</link> + and the <package>phantomjs</package> project is + <link xlink:href="https://github.com/ariya/phantomjs/issues/15344#issue-302015362">currently unmaintained</link>. + It can still be enabled by providing <literal>phantomJsSupport = true</literal> to the package instanciation: +<programlisting>{ + services.grafana.package = pkgs.grafana.overrideAttrs (oldAttrs: rec { + phantomJsSupport = false; + }); +}</programlisting> + </para> </listitem> </itemizedlist> </section> diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index cbb13074afc8..a4a4796a8cdf 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: +{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomJsSupport ? false, phantomjs2 ? null }: buildGoPackage rec { pname = "grafana"; @@ -31,6 +31,7 @@ buildGoPackage rec { tar -xvf $srcStatic mkdir -p $bin/share/grafana mv grafana-*/{public,conf,tools} $bin/share/grafana/ + '' + lib.optionalString phantomJsSupport '' ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs ''; |