mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
graphviz: 12.2.1 -> 14.1.2 (#526573)
This commit is contained in:
commit
7e3ea97264
2 changed files with 29 additions and 8 deletions
|
|
@ -39,13 +39,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "graphviz";
|
||||
version = "12.2.1";
|
||||
version = "14.1.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "graphviz";
|
||||
repo = "graphviz";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Uxqg/7+LpSGX4lGH12uRBxukVw0IswFPfpb2EkLsaiI=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LkyiKl0ulS9ujEdVLfyeoc4CtjITd6CAc35IUtlHSfw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -136,6 +136,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
meta = {
|
||||
homepage = "https://graphviz.org";
|
||||
changelog = "https://gitlab.com/graphviz/graphviz/-/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Graph visualization tools";
|
||||
license = lib.licenses.epl10;
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -2,24 +2,26 @@
|
|||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
replaceVars,
|
||||
graphviz,
|
||||
coreutils,
|
||||
pkg-config,
|
||||
setuptools,
|
||||
swig,
|
||||
pytest,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "pygraphviz";
|
||||
version = "1.14";
|
||||
version = "1.14-unstable-2026-05-07";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pygraphviz";
|
||||
repo = "pygraphviz";
|
||||
tag = "pygraphviz-${version}";
|
||||
hash = "sha256-RyUmT2djj2GnVG82xO9HULMAJZb2LYMUGDRvCwaYBg8=";
|
||||
rev = "6b9efcd1a76a97836de79d1380c0d003c6f834e7";
|
||||
hash = "sha256-ghtnwOevSnecshMBoASCZircgOsPF7+l+Cer+J+yEqM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -32,9 +34,27 @@ buildPythonPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail ', "swig>4.1.0"' ""
|
||||
|
||||
# https://github.com/pygraphviz/pygraphviz/pull/573
|
||||
substituteInPlace pygraphviz/graphviz.i \
|
||||
--replace-fail '%cstring_output_allocate_size(char **result, unsigned int* size, free(*$1));' \
|
||||
'%cstring_output_allocate_size(char **result, size_t* size, free(*$1));' \
|
||||
--replace-fail 'int gvRenderData(GVC_t *gvc, Agraph_t* g, char *format, char **result, unsigned int *size);' \
|
||||
'int gvRenderData(GVC_t *gvc, Agraph_t* g, char *format, char **result, size_t *size);'
|
||||
'';
|
||||
|
||||
env.GRAPHVIZ_PREFIX = graphviz;
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
setuptools
|
||||
swig
|
||||
];
|
||||
|
||||
buildInputs = [ graphviz ];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue