nanovna-saver: 0.6.8 -> 0.7.3
This commit is contained in:
@@ -4,16 +4,28 @@
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
qt6,
|
||||
writeShellScriptBin,
|
||||
}:
|
||||
let
|
||||
# Matches the pyside6-uic and pyside6-rcc implementations
|
||||
# https://code.qt.io/cgit/pyside/pyside-setup.git/tree/sources/pyside-tools/pyside_tool.py?id=9b310d4c0654a244147766e382834b5e8bdeb762#n90
|
||||
pyside-tools-uic = writeShellScriptBin "pyside6-uic" ''
|
||||
exec ${qt6.qtbase}/libexec/uic -g python "$@"
|
||||
'';
|
||||
pyside-tools-rcc = writeShellScriptBin "pyside6-rcc" ''
|
||||
exec ${qt6.qtbase}/libexec/rcc -g python "$@"
|
||||
'';
|
||||
in
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nanovna-saver";
|
||||
version = "0.6.8";
|
||||
version = "0.7.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NanoVNA-Saver";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-XGm3y0C0bFqKbh2ImbYTKOKSYFJ728mE/1N78/WPJqo=";
|
||||
sha256 = "sha256-Asx4drb9W2NobdgOlbgdm1aAzB69hnIWvOM915F7sgA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -28,6 +40,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
scipy
|
||||
pyqt6
|
||||
pyserial
|
||||
pyside6
|
||||
numpy
|
||||
setuptools
|
||||
setuptools-scm
|
||||
@@ -38,6 +51,12 @@ python3.pkgs.buildPythonApplication rec {
|
||||
dontWrapGApps = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/tools/ui_compile.py \
|
||||
--replace-fail "pyside6-uic" "${pyside-tools-uic}/bin/pyside6-uic" \
|
||||
--replace-fail "pyside6-rcc" "${pyside-tools-rcc}/bin/pyside6-rcc"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
|
||||
Reference in New Issue
Block a user