git.iko.soy/typeable/nixpkgs
on master help sign in
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! :)

commitb906513cf59ac2d9fb2dc18ee71daaa1665062f8 authorWill Dietz <w@wdtz.org> dateWed 18 Sep 2019, 01:45 (7 years ago) parentf760f0e
2 files changed+8−8
pkgs/tools/graphics/graphviz/base.nix+5−5 pkgs/tools/graphics/graphviz/default.nix+3−3
pkgs/tools/graphics/graphviz/base.nix+5−5
@@ -7,7 +7,7 @@
77assert stdenv.isDarwin -> ApplicationServices != null;
88
99let
10− inherit (stdenv.lib) optionals optionalString;
10+ inherit (stdenv.lib) optional optionals optionalString;
1111 raw_patch =
1212 # https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196
1313 fetchpatch {
@@ -17,11 +17,13 @@ let
1717 excludes = ["tests/*"]; # we don't run them and they don't apply
1818 };
1919 # the patch needs a small adaption for older versions
20− patch = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else
20+ patchToUse = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else
2121 stdenv.mkDerivation {
2222 inherit (raw_patch) name;
2323 buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out";
2424 };
25+ # 2.42 has the patch included
26+ patches = optional (stdenv.lib.versionOlder version "2.42") patchToUse;
2527in
2628
2729stdenv.mkDerivation {
@@ -52,9 +54,7 @@ stdenv.mkDerivation {
5254 "--with-ltdl-include=${libtool}/include"
5355 ] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ];
5456
55− patches = [
56− patch
57− ];
57+ inherit patches;
5858
5959 postPatch = ''
6060 for f in $(find . -name Makefile.in); do
pkgs/tools/graphics/graphviz/default.nix+3−3
@@ -1,5 +1,5 @@
11import ./base.nix rec {
2− rev = "67cd2e5121379a38e0801cc05cce5033f8a2a609";
3− version = "2.40.1";
4− sha256 = "1xjqq3g2n6jgwp5xzyvibgrxawlskkpam69fjjz9ksrrjas2qwzj";
2+ rev = "da4c2ec6f24ca1b6d1752c6b5bc4389e55682147"; # use rev as tags have disappeared before
3+ version = "2.42.2";
4+ sha256 = "0lacl11amyvj04j78m63qifljl4c0nkyy50z4bkg8mg9j4hjdy0x";
55 }