From 93e119866dab76f749a6eeca31e275aea04a3fec Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 15 May 2021 15:01:56 +0200 Subject: [PATCH 1/2] graphviz: 2.42.2 -> 2.47.2 also cleanup some parameters --- pkgs/tools/graphics/graphviz/base.nix | 4 ++-- pkgs/tools/graphics/graphviz/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 000e2b280891..a6472efaa52c 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -2,7 +2,7 @@ { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex , fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango -, bison, fetchpatch, xorg ? null, ApplicationServices }: +, bison, fetchpatch, xorg, ApplicationServices, python3 }: let inherit (lib) optional optionals optionalString; @@ -34,7 +34,7 @@ stdenv.mkDerivation { inherit sha256 rev; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3 ]; buildInputs = [ libpng libjpeg expat bison libtool fontconfig gd gts libdevil flex pango diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index c79fe3aaf4d5..0662205d17e9 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ import ./base.nix rec { - rev = "da4c2ec6f24ca1b6d1752c6b5bc4389e55682147"; # use rev as tags have disappeared before - version = "2.42.2"; - sha256 = "0lacl11amyvj04j78m63qifljl4c0nkyy50z4bkg8mg9j4hjdy0x"; + rev = "a11eb938514725493324d18db1686f9a99c8569f"; # use rev as tags have disappeared before + version = "2.47.2"; + sha256 = "sha256-6JFjM/2xl7KVmGhSr6RWgO23UwLDyAif3ONsBG4t/Wc="; } From e785e1b24be254cc4cd9efe7717b6d248691faed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 31 May 2021 11:25:07 +0200 Subject: [PATCH 2/2] plantuml: use graphviz instead of graphviz_2_32 Only versions 2.39 through 2.42 were advised against. --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb7290c3bec1..5a694a586d56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7640,11 +7640,7 @@ in pk2cmd = callPackage ../tools/misc/pk2cmd { }; - plantuml = callPackage ../tools/misc/plantuml { - # Graphviz 2.39 and 2.40 are discouraged by the PlantUML project, see - # http://plantuml.com/faq (heading: "Which version of Graphviz should I use ?") - graphviz = graphviz_2_32; - }; + plantuml = callPackage ../tools/misc/plantuml { }; plantuml-server = callPackage ../tools/misc/plantuml-server { };