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