alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #69058 from dtzWill/update/graphviz-2.42.2

Browse source 
graphviz: 2.40.1 -> 2.42.2
This commit is contained in:
Michael Raskin 2019-12-08 18:11:24 +00:00 committed by GitHub
parent 704eecee88 b906513cf5
commit fd0e1eef28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/graphics/graphviz/base.nix
View file

@ -7,7 +7,7 @@
assert stdenv.isDarwin -> ApplicationServices != null; assert stdenv.isDarwin -> ApplicationServices != null;
let let
inherit (stdenv.lib) optionals optionalString; inherit (stdenv.lib) optional optionals optionalString;
raw_patch = raw_patch =
# https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196 # https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196
fetchpatch { fetchpatch {
@ -17,11 +17,13 @@ let
excludes = ["tests/*"]; # we don't run them and they don't apply excludes = ["tests/*"]; # we don't run them and they don't apply
}; };
# the patch needs a small adaption for older versions # 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 { stdenv.mkDerivation {
inherit (raw_patch) name; inherit (raw_patch) name;
buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out"; 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 in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -52,9 +54,7 @@ stdenv.mkDerivation {
"--with-ltdl-include=${libtool}/include" "--with-ltdl-include=${libtool}/include"
] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ]; ] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ];
patches = [ inherit patches;
patch
];
postPatch = '' postPatch = ''
for f in $(find . -name Makefile.in); do for f in $(find . -name Makefile.in); do

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

@ -1,5 +1,5 @@
import ./base.nix rec { import ./base.nix rec {
rev = "67cd2e5121379a38e0801cc05cce5033f8a2a609"; rev = "da4c2ec6f24ca1b6d1752c6b5bc4389e55682147"; # use rev as tags have disappeared before
version = "2.40.1"; version = "2.42.2";
sha256 = "1xjqq3g2n6jgwp5xzyvibgrxawlskkpam69fjjz9ksrrjas2qwzj"; sha256 = "0lacl11amyvj04j78m63qifljl4c0nkyy50z4bkg8mg9j4hjdy0x";
} }