From 47e1eefcc3acbd639503938236318f68be39c10e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 19 May 2023 01:38:35 +0200 Subject: [PATCH] quisk: Migrate to python 3.10 --- pkgs/applications/radio/quisk/default.nix | 22 +++++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index 5fcd11a17523..86b4db693ca2 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -1,7 +1,12 @@ -{ lib, python39Packages, fetchPypi -, fftw, alsa-lib, pulseaudio, pyusb, wxPython_4_2 }: +{ lib +, python3 +, fetchPypi +, fftw +, alsa-lib +, pulseaudio +}: -python39Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "quisk"; version = "4.2.17"; @@ -10,9 +15,16 @@ python39Packages.buildPythonApplication rec { sha256 = "sha256-eF/3++wRG0JulVTT+GvtqleBPkzLSZeu+RfHDI1xfOY="; }; - buildInputs = [ fftw alsa-lib pulseaudio ]; + buildInputs = [ + fftw + alsa-lib + pulseaudio + ]; - propagatedBuildInputs = [ pyusb wxPython_4_2 ]; + propagatedBuildInputs = with python3.pkgs; [ + pyusb + wxPython_4_2 + ]; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0633ae56794..6afc2f3ec80b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33640,7 +33640,7 @@ with pkgs; quirc = callPackage ../tools/graphics/quirc { }; - quisk = python39Packages.callPackage ../applications/radio/quisk { }; + quisk = callPackage ../applications/radio/quisk { }; quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss { };