Merge pull request #127910 from dotlambda/scipy_1_4-drop

This commit is contained in:
Sandro 2021-06-24 11:43:37 +02:00 committed by GitHub
commit 6ff52436cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 21 deletions

View file

@ -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
@ -30,10 +43,11 @@ in mkDerivationWith python3Packages.buildPythonApplication {
dontWrapGApps = true;
dontWrapQtApps = true;
postFixup = ''
wrapProgram $out/bin/NanoVNASaver \
"''${gappsWrapperArgs[@]}" \
preFixup = ''
makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}"
"''${qtWrapperArgs[@]}"
)
'';
meta = with lib; {

View file

@ -7703,16 +7703,6 @@ in {
scikit-tda = callPackage ../development/python-modules/scikit-tda { };
scipy_1_4 = self.scipy.overridePythonAttrs (oldAttrs: rec {
version = "1.4.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "0ndw7zyxd2dj37775mc75zm4fcyiipnqxclc45mkpxy8lvrvpqfy";
};
doCheck = false;
disabled = !isPy3k;
});
scipy = callPackage ../development/python-modules/scipy { };
scour = callPackage ../development/python-modules/scour { };