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,94 @@
{
fetchFromGitHub,
lib,
gettext,
python3,
udevCheckHook,
umockdev,
writeScript,
}:
let
# We need these simple wrapper shell scripts because Inkscape extensions with
# interpreter="shell" always get invoked with the `sh` command [0], regardless of
# the shebang at the top of the script.
# [0]: https://gitlab.com/inkscape/inkscape/-/blob/d61d917afb94721c92a650b2c4b116b0a4826f41/src/extension/implementation/script.cpp#L93
launch-sendto_silhouette = writeScript "sendto_silhouette.sh" ''
cd $(dirname $0)
./sendto_silhouette.py "$@"
'';
launch-silhouette_multi = writeScript "silhouette_multi.sh" ''
cd $(dirname $0)
./silhouette_multi.py "$@"
'';
in
python3.pkgs.buildPythonApplication rec {
pname = "inkscape-silhouette";
version = "1.29";
format = "setuptools";
src = fetchFromGitHub {
owner = "fablabnbg";
repo = "inkscape-silhouette";
tag = "v${version}";
sha256 = "sha256-MfR88BuaAx6n5XRIjslpIk4PnDf6TLU9AsmHxKkcFS0=";
};
patches = [
./interpreter.patch
./use-prefix-for-udev.patch
];
propagatedBuildInputs = [
python3.pkgs.pyusb
python3.pkgs.lxml
python3.pkgs.inkex
python3.pkgs.matplotlib
python3.pkgs.wxpython
python3.pkgs.xmltodict
];
nativeBuildInputs = [
gettext # msgfmt
];
nativeCheckInputs = [
python3.pkgs.pytestCheckHook
udevCheckHook
umockdev
];
enabledTestPaths = [
"test"
];
doCheck = true;
doInstallCheck = true;
installPhase = ''
runHook preInstall
make install PREFIX=$out
runHook postInstall
'';
postInstall = ''
# Unmark read_dump.py as executable so wrapPythonProgramsIn won't turn it
# into a shell script (thereby making it impossible to import as a Python
# module).
chmod -x $out/share/inkscape/extensions/silhouette/read_dump.py
cp ${launch-sendto_silhouette} $out/share/inkscape/extensions/sendto_silhouette.sh
cp ${launch-silhouette_multi} $out/share/inkscape/extensions/silhouette_multi.sh
'';
postFixup = ''
wrapPythonProgramsIn "$out/share/inkscape/extensions/" "$out $pythonPath"
'';
meta = with lib; {
description = "Extension to drive Silhouette vinyl cutters (e.g. Cameo, Portrait, Curio series) from within Inkscape";
homepage = "https://github.com/fablabnbg/inkscape-silhouette";
license = licenses.gpl2Only;
maintainers = with maintainers; [ jfly ];
platforms = platforms.all;
};
}

View File

@@ -0,0 +1,24 @@
diff --git a/sendto_silhouette.inx b/sendto_silhouette.inx
index 55a3278..d780730 100644
--- a/sendto_silhouette.inx
+++ b/sendto_silhouette.inx
@@ -188,6 +188,6 @@ Always use the least amount of blade possible.
</effect>
<script>
- <command location="inx" interpreter="python">sendto_silhouette.py</command>
+ <command location="inx" interpreter="shell">sendto_silhouette.sh</command>
</script>
</inkscape-extension>
diff --git a/silhouette_multi.inx b/silhouette_multi.inx
index f6fd2ed..2d9dba6 100644
--- a/silhouette_multi.inx
+++ b/silhouette_multi.inx
@@ -31,6 +31,6 @@
</effect>
<script>
- <command location="inx" interpreter="python">silhouette_multi.py</command>
+ <command location="inx" interpreter="shell">silhouette_multi.sh</command>
</script>
</inkscape-extension>

View File

@@ -0,0 +1,13 @@
diff --git a/Makefile b/Makefile
index 5aff25d..43c3fb0 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ VERS=$$(python3 ./sendto_silhouette.py --version)
DEST=$(DESTDIR)$(PREFIX)/share/inkscape/extensions
LOCALE=$(DESTDIR)$(PREFIX)/share/locale
-UDEV=$(DESTDIR)/lib/udev
+UDEV=$(DESTDIR)$(PREFIX)/lib/udev
INKSCAPE_TEMPLATES=$(DESTDIR)$(PREFIX)/share/inkscape/templates
# User-specifc inkscape extensions folder for local install