From 8df3adc8f83ac4b76d97e1506fb2db95fe2081b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 23 Jun 2021 16:16:43 +0200 Subject: [PATCH] nanovna-saver: use packageOverrides --- .../electronics/nanovna-saver/default.nix | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 9f959bddf2d2..83100db00c33 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -1,12 +1,25 @@ -{ lib, mkDerivationWith, wrapQtAppsHook, python3Packages, fetchFromGitHub -, qtbase }: +{ lib +, python3 +, fetchFromGitHub +, wrapQtAppsHook +}: let - version = "0.3.8"; + python = python3.override { + packageOverrides = self: super: { + scipy = super.scipy.overridePythonAttrs (oldAttrs: rec { + version = "1.4.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0ndw7zyxd2dj37775mc75zm4fcyiipnqxclc45mkpxy8lvrvpqfy"; + }; + doCheck = false; + }); + }; + }; +in python.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - -in mkDerivationWith python3Packages.buildPythonApplication { - inherit pname version; + version = "0.3.8"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; @@ -17,9 +30,9 @@ in mkDerivationWith python3Packages.buildPythonApplication { nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ cython - scipy_1_4 + scipy pyqt5 pyserial numpy