push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,73 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
graphviz,
imagemagick,
inkscape,
jinja2,
poetry-core,
pytestCheckHook,
pythonOlder,
round,
}:
buildPythonPackage rec {
pname = "diagrams";
version = "0.24.4";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "mingrammer";
repo = "diagrams";
tag = "v${version}";
hash = "sha256-N4JGrtgLgGUayFR6/xTf3GZEZjtxC/4De3ZCfRZbi6M=";
};
patches = [
# Add build-system, https://github.com/mingrammer/diagrams/pull/1089
(fetchpatch {
name = "add-build-system.patch";
url = "https://github.com/mingrammer/diagrams/commit/59b84698b142f5a0998ee9e395df717a1b77e9b2.patch";
hash = "sha256-/zV5X4qgHJs+KO9gHyu6LqQ3hB8Zx+BzOFo7K1vQK78=";
})
./remove-black-requirement.patch
];
pythonRemoveDeps = [ "pre-commit" ];
pythonRelaxDeps = [ "graphviz" ];
preConfigure = ''
patchShebangs autogen.sh
./autogen.sh
'';
build-system = [ poetry-core ];
# Despite living in 'tool.poetry.dependencies',
# these are only used at build time to process the image resource files
nativeBuildInputs = [
inkscape
imagemagick
jinja2
round
];
dependencies = [ graphviz ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "diagrams" ];
meta = with lib; {
description = "Diagram as Code";
homepage = "https://diagrams.mingrammer.com/";
changelog = "https://github.com/mingrammer/diagrams/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ addict3d ];
};
}

View File

@@ -0,0 +1,33 @@
From bf081e60a7f604d2e71cf5c315dd90c48dd96808 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 26 Jan 2023 15:35:47 +0100
Subject: [PATCH] Update autogen.sh
---
autogen.sh | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index f5e065b35..b6cef5bf9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -37,11 +37,6 @@ if ! [ -x "$(command -v convert)" ]; then
exit 1
fi
-if ! [ -x "$(command -v black)" ]; then
- echo 'black is not installed'
- exit 1
-fi
-
# preprocess the resources
for pvd in "${providers[@]}"; do
# convert the svg to png for azure provider
@@ -75,7 +70,3 @@ python -m scripts.generate "custom"
# copy icons across to website
echo "copying icons to website static folder"
cp -r resources website/static/img/
-
-# run black
-echo "linting the all the diagram modules"
-black "$app_root_dir"/**/*.py