ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

inkcut: 2.1.2 -> 2.1.3

Browse Source 
we had a patch to make using inkcut as an inkscape plugin more reliable.
This has been accepted upstream so no longer needs to be in nixpkgs.
This commit is contained in:
Arnout Engelen 2020-12-09 11:22:16 +01:00
parent 1f8ef6970a
commit e5ae22ee81
No known key found for this signature in database
GPG Key ID: 061107B0F74A6DAA
2 changed files with 2 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch
View File

@ -1,85 +0,0 @@
From ddc1f9e63e7a769c71131b56f6a2a011c649635c Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 24 Nov 2020 15:34:40 +0100
Subject: [PATCH] Avoid name clash between inkscape plugin and inkcut itself
Ohterwise, with an unfortunate PYTONPATH, inkcut would no longer
start since it'd try to invoke the inkcut.py from the extension
instead of the main application
---
plugins/inkscape/{inkcut.py => inkcut4inkscape.py} | 2 +-
plugins/inkscape/inkcut_cut.inx | 2 +-
plugins/inkscape/inkcut_cut.py | 2 +-
plugins/inkscape/inkcut_open.inx | 2 +-
plugins/inkscape/inkcut_open.py | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
rename plugins/inkscape/{inkcut.py => inkcut4inkscape.py} (98%)
diff --git a/plugins/inkscape/inkcut.py b/plugins/inkscape/inkcut4inkscape.py
similarity index 98%
rename from plugins/inkscape/inkcut.py
rename to plugins/inkscape/inkcut4inkscape.py
index 5b90475..7dc8d86 100644
--- a/plugins/inkscape/inkcut.py
+++ b/plugins/inkscape/inkcut4inkscape.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
"""
Inkcut, Plot HPGL directly from Inkscape.
- inkcut.py
+ inkcut4inkscape.py
Copyright 2018 The Inkcut Team
diff --git a/plugins/inkscape/inkcut_cut.inx b/plugins/inkscape/inkcut_cut.inx
index 4b44ae5..3db8721 100644
--- a/plugins/inkscape/inkcut_cut.inx
+++ b/plugins/inkscape/inkcut_cut.inx
@@ -2,7 +2,7 @@
<_name>Cut selection...</_name>
<id>org.ekips.filter.inkcut.cut</id>
<dependency type="executable" location="extensions">inkcut_cut.py</dependency>
- <dependency type="executable" location="extensions">inkcut.py</dependency>
+ <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency>
<dependency type="executable" location="extensions">inkex.py</dependency>
<effect>
<object-type>all</object-type>
diff --git a/plugins/inkscape/inkcut_cut.py b/plugins/inkscape/inkcut_cut.py
index acaf812..777629a 100644
--- a/plugins/inkscape/inkcut_cut.py
+++ b/plugins/inkscape/inkcut_cut.py
@@ -37,7 +37,7 @@
else:
inkex.localize()
import subprocess
-from inkcut import contains_text, convert_objects_to_paths
+from inkcut4inkscape import contains_text, convert_objects_to_paths
diff --git a/plugins/inkscape/inkcut_open.inx b/plugins/inkscape/inkcut_open.inx
index 45ee585..2dcd38e 100644
--- a/plugins/inkscape/inkcut_open.inx
+++ b/plugins/inkscape/inkcut_open.inx
@@ -2,7 +2,7 @@
<_name>Open current document...</_name>
<id>org.ekips.filter.inkcut.open</id>
<dependency type="executable" location="extensions">inkcut_open.py</dependency>
- <dependency type="executable" location="extensions">inkcut.py</dependency>
+ <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency>
<dependency type="executable" location="extensions">inkex.py</dependency>
<effect>
<object-type>all</object-type>
diff --git a/plugins/inkscape/inkcut_open.py b/plugins/inkscape/inkcut_open.py
index b4652eb..e4c2d62 100644
--- a/plugins/inkscape/inkcut_open.py
+++ b/plugins/inkscape/inkcut_open.py
@@ -38,7 +38,7 @@
inkex.localize()
import subprocess
-from inkcut import convert_objects_to_paths
+from inkcut4inkscape import convert_objects_to_paths
DEBUG = False
try:

10
pkgs/applications/misc/inkcut/default.nix
View File

@ -8,21 +8,15 @@ with python3Packages;
buildPythonApplication rec {
pname = "inkcut";
version = "2.1.2";
version = "2.1.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1zn5i69f3kimcwdd2qkqd3hd1hq76a6i5wxxfb91ih2hj04vdbmx";
sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32";
};
patches = [
# https://github.com/inkcut/inkcut/pull/292 but downloaded
# because of https://github.com/NixOS/nixpkgs/issues/32084
./avoid-name-clash-between-inkcut-and-extension.patch
];
nativeBuildInputs = [ wrapQtAppsHook ];
propagatedBuildInputs = [