uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
63
pkgs/applications/graphics/cq-editor/default.nix
Normal file
63
pkgs/applications/graphics/cq-editor/default.nix
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
{ lib
|
||||
, mkDerivationWith
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
pname = "cq-editor";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CadQuery";
|
||||
repo = "CQ-editor";
|
||||
rev = version;
|
||||
sha256 = "1970izjaa60r5cg9i35rzz9lk5c5d8q1vw1rh2skvfbf63z1hnzv";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./spyder4.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
cadquery
|
||||
Logbook
|
||||
pyqt5
|
||||
pyparsing
|
||||
pyqtgraph
|
||||
spyder
|
||||
path
|
||||
qtconsole
|
||||
requests
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
pytest
|
||||
pytest-xvfb
|
||||
pytest-mock
|
||||
pytest-cov
|
||||
pytest-repeat
|
||||
pytest-qt
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest --no-xvfb
|
||||
'';
|
||||
|
||||
# requires X server
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "CadQuery GUI editor based on PyQT";
|
||||
homepage = "https://github.com/CadQuery/CQ-editor";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ costrouc marcus7070 ];
|
||||
};
|
||||
|
||||
}
|
||||
58
pkgs/applications/graphics/cq-editor/spyder4.patch
Normal file
58
pkgs/applications/graphics/cq-editor/spyder4.patch
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
diff --git a/cq_editor/widgets/debugger.py b/cq_editor/widgets/debugger.py
|
||||
index b7398fb..d039db5 100644
|
||||
--- a/cq_editor/widgets/debugger.py
|
||||
+++ b/cq_editor/widgets/debugger.py
|
||||
@@ -162,7 +162,7 @@ class Debugger(QObject,ComponentMixin):
|
||||
|
||||
def get_breakpoints(self):
|
||||
|
||||
- return self.parent().components['editor'].get_breakpoints()
|
||||
+ return self.parent().components['editor'].debugger.get_breakpoints()
|
||||
|
||||
def compile_code(self,cq_script):
|
||||
|
||||
@@ -178,12 +178,14 @@ class Debugger(QObject,ComponentMixin):
|
||||
def _exec(self, code, locals_dict, globals_dict):
|
||||
|
||||
with ExitStack() as stack:
|
||||
- p = Path(self.parent().components['editor'].filename).dirname()
|
||||
- if self.preferences['Add script dir to path'] and p:
|
||||
+ fname = self.parent().components['editor'].filename
|
||||
+ p = Path(fname if fname else '').abspath().dirname()
|
||||
+ if self.preferences['Add script dir to path'] and p.exists():
|
||||
sys.path.append(p)
|
||||
stack.callback(sys.path.remove, p)
|
||||
- if self.preferences['Change working dir to script dir'] and p:
|
||||
+ if self.preferences['Change working dir to script dir'] and p.exists():
|
||||
stack.enter_context(p)
|
||||
+
|
||||
exec(code, locals_dict, globals_dict)
|
||||
|
||||
def _inject_locals(self,module):
|
||||
diff --git a/cq_editor/widgets/editor.py b/cq_editor/widgets/editor.py
|
||||
index 45aa048..2763469 100644
|
||||
--- a/cq_editor/widgets/editor.py
|
||||
+++ b/cq_editor/widgets/editor.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-from spyder.widgets.sourcecode.codeeditor import CodeEditor
|
||||
+from spyder.plugins.editor.widgets.codeeditor import CodeEditor
|
||||
from PyQt5.QtCore import pyqtSignal, QFileSystemWatcher, QTimer
|
||||
from PyQt5.QtWidgets import QAction, QFileDialog
|
||||
from PyQt5.QtGui import QFontDatabase
|
||||
@@ -32,6 +32,8 @@ class Editor(CodeEditor,ComponentMixin):
|
||||
|
||||
def __init__(self,parent=None):
|
||||
|
||||
+ self._watched_file = None
|
||||
+
|
||||
super(Editor,self).__init__(parent)
|
||||
ComponentMixin.__init__(self)
|
||||
|
||||
@@ -83,7 +85,6 @@ class Editor(CodeEditor,ComponentMixin):
|
||||
|
||||
# autoreload support
|
||||
self._file_watcher = QFileSystemWatcher(self)
|
||||
- self._watched_file = None
|
||||
# we wait for 50ms after a file change for the file to be written completely
|
||||
self._file_watch_timer = QTimer(self)
|
||||
self._file_watch_timer.setInterval(50)
|
||||
Loading…
Add table
Add a link
Reference in a new issue