colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123108 from Mindavi/graphviz/2.47.1

Browse Source 
graphviz: 2.42.2 -> 2.47.2
This commit is contained in:
Robert Schütz 2021-06-22 10:51:18 +02:00 committed by GitHub
commit 7eb297d5e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/graphics/graphviz/base.nix
View File

@ -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;
@ -41,7 +41,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

6
pkgs/tools/graphics/graphviz/default.nix
View File

@ -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=";
}

6
pkgs/top-level/all-packages.nix
View File

@ -7876,11 +7876,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 { };