From ac0269c3792db76ac074965f4da9f5566a3f7bb7 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Thu, 30 Sep 2021 15:05:33 +0200 Subject: [PATCH] friture: 0.47 -> 0.48 --- pkgs/applications/audio/friture/default.nix | 4 ++-- .../audio/friture/unlock_constraints.patch | 24 ++++++++----------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index 7d891834ed7f..42ed94294619 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -4,13 +4,13 @@ let py = python3Packages; in py.buildPythonApplication rec { pname = "friture"; - version = "0.47"; + version = "0.48"; src = fetchFromGitHub { owner = "tlecomte"; repo = pname; rev = "v${version}"; - sha256 = "1qcsvmgdz9hhv5gaa918147wvng6manc4iq8ci6yr761ljqrgwjx"; + sha256 = "sha256-oOH58jD49xAeSuP+l6tYUpwkYsnfeSGTt8x4DFzTY6g="; }; nativeBuildInputs = (with py; [ numpy cython scipy ]) ++ diff --git a/pkgs/applications/audio/friture/unlock_constraints.patch b/pkgs/applications/audio/friture/unlock_constraints.patch index 6ee474794b2b..62ada8404629 100644 --- a/pkgs/applications/audio/friture/unlock_constraints.patch +++ b/pkgs/applications/audio/friture/unlock_constraints.patch @@ -1,34 +1,30 @@ diff --git a/setup.py b/setup.py -index 4092388..6cb7dac 100644 +index 886fe78..5dccac0 100644 --- a/setup.py +++ b/setup.py -@@ -50,19 +50,19 @@ ext_modules = [LateIncludeExtension("friture_extensions.exp_smoothing_conv", +@@ -50,17 +50,17 @@ ext_modules = [LateIncludeExtension("friture_extensions.exp_smoothing_conv", # these will be installed when calling 'pip install friture' # they are also retrieved by 'requirements.txt' install_requires = [ - "sounddevice==0.4.2", - "rtmixer==0.1.3", -- "PyOpenGL==3.1.5", -- "PyOpenGL-accelerate==3.1.5", - "docutils==0.17.1", - "numpy==1.21.1", - "PyQt5==5.15.4", - "appdirs==1.4.4", - "pyrr==0.10.3", -+ "sounddevice>=0.4.1", -+ "rtmixer>=0.1.1", -+ "PyOpenGL>=3.1.4", -+ "PyOpenGL-accelerate>=3.1.5", -+ "docutils>=0.17.1", -+ "numpy>=1.20.3", -+ "PyQt5>=5.15.4", -+ "appdirs>=1.4.4", -+ "pyrr>=0.10.3", ++ "sounddevice<=0.4.2", ++ "rtmixer<=0.1.3", ++ "docutils<=0.17.1", ++ "numpy>=1.21.1", ++ "PyQt5<=5.15.4", ++ "appdirs<=1.4.4", ++ "pyrr<=0.10.3", ] # Cython and numpy are needed when running setup.py, to build extensions -setup_requires=["numpy==1.21.1", "Cython==0.29.24"] -+setup_requires=["numpy>=1.20.3", "Cython>=0.29.22"] ++setup_requires=["numpy>=1.21.1", "Cython<=0.29.24"] with open(join(dirname(__file__), 'README.rst')) as f: long_description = f.read()