Merge pull request #174495 from Artturin/graphvizupdate

graphviz: 2.50.0 -> 3.0.0

authored by 7c6f434c and committed by GitHub 2ca477a8 68b24492

+12 -5
+12 -5
pkgs/tools/graphics/graphviz/default.nix
··· 19 , xorg 20 , ApplicationServices 21 , python3 22 , withXorg ? true 23 }: 24 ··· 27 in 28 stdenv.mkDerivation { 29 pname = "graphviz"; 30 - version = "2.50.0"; 31 32 src = fetchFromGitLab { 33 owner = "graphviz"; 34 repo = "graphviz"; 35 # use rev as tags have disappeared before 36 - rev = "ca43e4c6a217650447e2928c2e9cb493c73ebd7d"; 37 - sha256 = "1psfgr8y4hh9yyzl04f7xbqb2y9k1xbja051j6b06q9dx7bmkmky"; 38 }; 39 40 nativeBuildInputs = [ ··· 88 postFixup = optionalString withXorg '' 89 substituteInPlace $out/bin/dotty --replace '`which lefty`' $out/bin/lefty 90 substituteInPlace $out/bin/vimdot \ 91 - --replace /usr/bin/vi '$(command -v vi)' \ 92 - --replace /usr/bin/vim '$(command -v vim)' \ 93 --replace /usr/bin/vimdot $out/bin/vimdot \ 94 ''; 95 96 meta = with lib; { 97 homepage = "https://graphviz.org";
··· 19 , xorg 20 , ApplicationServices 21 , python3 22 + , fltk 23 + , exiv2 24 , withXorg ? true 25 }: 26 ··· 29 in 30 stdenv.mkDerivation { 31 pname = "graphviz"; 32 + version = "3.0.0"; 33 34 src = fetchFromGitLab { 35 owner = "graphviz"; 36 repo = "graphviz"; 37 # use rev as tags have disappeared before 38 + rev = "24cf7232bb8728823466e0ef536862013893e567"; 39 + sha256 = "sha256-qqrpCJ9WP8wadupp4YRJMMaSCeFIDuFDQvEOpbG/wGM="; 40 }; 41 42 nativeBuildInputs = [ ··· 90 postFixup = optionalString withXorg '' 91 substituteInPlace $out/bin/dotty --replace '`which lefty`' $out/bin/lefty 92 substituteInPlace $out/bin/vimdot \ 93 + --replace '"/usr/bin/vi"' '"$(command -v vi)"' \ 94 + --replace '"/usr/bin/vim"' '"$(command -v vim)"' \ 95 --replace /usr/bin/vimdot $out/bin/vimdot \ 96 ''; 97 + 98 + passthru.tests = { 99 + inherit (python3.pkgs) pygraphviz; 100 + inherit fltk exiv2; 101 + }; 102 103 meta = with lib; { 104 homepage = "https://graphviz.org";