From b906513cf59ac2d9fb2dc18ee71daaa1665062f8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 18 Sep 2019 01:45:08 -0500
Subject: graphviz: 2.40.1 -> 2.42.2

Little uncertain what's going on re:versions,
here's some info:

2.42.0 "Fixes quite a few bugs"[1], which is primary motivation.

[1] https://gitlab.com/graphviz/graphviz/blob/stable_release_2.42.0/ChangeLog

2.42.1 has a note in 2.42.2's ChangeLog[2] which is good but also
interesting as 2.42.2 doesn't have an entry in its own ChangeLog :).
FWIW there are two tags for 2.42.2 but happily they're equivalent.

While a bit verbose, the changes between these versions can be looked at
using git locally or a URL like one of these:

* https://gitlab.com/graphviz/graphviz/compare/stable_release_2.42.0...stable_release_2.42.2
* https://gitlab.com/graphviz/graphviz/compare/stable_release_2.40.1...stable_release_2.42.0

Anyway, looks like a bunch of bugfixes! :)
---
 pkgs/tools/graphics/graphviz/base.nix    | 10 +++++-----
 pkgs/tools/graphics/graphviz/default.nix |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index cd2302efd165d..700bed237bdb3 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -7,7 +7,7 @@
 assert stdenv.isDarwin -> ApplicationServices != null;
 
 let
-  inherit (stdenv.lib) optionals optionalString;
+  inherit (stdenv.lib) optional optionals optionalString;
   raw_patch =
     # https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196
     fetchpatch {
@@ -17,11 +17,13 @@ let
       excludes = ["tests/*"]; # we don't run them and they don't apply
     };
   # the patch needs a small adaption for older versions
-  patch = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else
+  patchToUse = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else
   stdenv.mkDerivation {
     inherit (raw_patch) name;
     buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out";
   };
+  # 2.42 has the patch included
+  patches = optional (stdenv.lib.versionOlder version "2.42") patchToUse;
 in
 
 stdenv.mkDerivation {
@@ -52,9 +54,7 @@ stdenv.mkDerivation {
     "--with-ltdl-include=${libtool}/include"
   ] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ];
 
-  patches = [
-    patch
-  ];
+  inherit patches;
 
   postPatch = ''
     for f in $(find . -name Makefile.in); do
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 7249a6cdaad74..c79fe3aaf4d55 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -1,5 +1,5 @@
 import ./base.nix rec {
-  rev = "67cd2e5121379a38e0801cc05cce5033f8a2a609";
-  version = "2.40.1";
-  sha256 = "1xjqq3g2n6jgwp5xzyvibgrxawlskkpam69fjjz9ksrrjas2qwzj";
+  rev = "da4c2ec6f24ca1b6d1752c6b5bc4389e55682147"; # use rev as tags have disappeared before
+  version = "2.42.2";
+  sha256 = "0lacl11amyvj04j78m63qifljl4c0nkyy50z4bkg8mg9j4hjdy0x";
  }
-- 
cgit 1.4.1