Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

friture: 0.37 -> unstable

authored by

laikq and committed by
Jon
1ee68120 d4b6ea97

+43 -7
+9 -7
pkgs/applications/audio/friture/default.nix
··· 4 4 py = python3Packages; 5 5 in py.buildPythonApplication rec { 6 6 pname = "friture"; 7 - version = "0.37"; 7 + version = "unstable-2020-02-16"; 8 8 9 9 src = fetchFromGitHub { 10 10 owner = "tlecomte"; 11 11 repo = pname; 12 - rev = "v${version}"; 13 - sha256 = "1ivy5qfd90w1s1icsphvvdnnqz563v3fhg5pws2zn4483cgnzc2y"; 12 + rev = "4460b4e72a9c55310d6438f294424b5be74fc0aa"; 13 + sha256 = "1pmxzq78ibifby3gbir1ah30mgsqv0y7zladf5qf3sl5r1as0yym"; 14 14 }; 15 15 16 - # module imports scipy.misc.factorial, but it has been removed since scipy 17 - # 1.3.0; use scipy.special.factorial instead 18 - patches = [ ./factorial.patch ]; 19 - 20 16 nativeBuildInputs = (with py; [ numpy cython scipy ]) ++ 21 17 [ wrapQtAppsHook ]; 22 18 23 19 propagatedBuildInputs = with py; [ 24 20 sounddevice 25 21 pyopengl 22 + pyopengl-accelerate 26 23 docutils 27 24 numpy 28 25 pyqt5 29 26 appdirs 30 27 pyrr 28 + rtmixer 29 + ]; 30 + 31 + patches = [ 32 + ./unlock_constraints.patch 31 33 ]; 32 34 33 35 postFixup = ''
+34
pkgs/applications/audio/friture/unlock_constraints.patch
··· 1 + diff --git a/setup.py b/setup.py 2 + index f31eeec..ac0927b 100644 3 + --- a/setup.py 4 + +++ b/setup.py 5 + @@ -50,19 +50,19 @@ ext_modules = [LateIncludeExtension("friture_extensions.exp_smoothing_conv", 6 + # these will be installed when calling 'pip install friture' 7 + # they are also retrieved by 'requirements.txt' 8 + install_requires = [ 9 + - "sounddevice==0.3.14", 10 + - "rtmixer==0.1.0", 11 + - "PyOpenGL==3.1.4", 12 + - "PyOpenGL-accelerate==3.1.4", 13 + - "docutils==0.15.2", 14 + - "numpy==1.17.4", 15 + - "PyQt5==5.13.2", 16 + - "appdirs==1.4.3", 17 + - "pyrr==0.10.3", 18 + + "sounddevice>=0.3.14", 19 + + "rtmixer>=0.1.0", 20 + + "PyOpenGL>=3.1.4", 21 + + "PyOpenGL-accelerate>=3.1.4", 22 + + "docutils>=0.15.2", 23 + + "numpy>=1.17.4", 24 + + "PyQt5>=5.13.2", 25 + + "appdirs>=1.4.3", 26 + + "pyrr>=0.10.3", 27 + ] 28 + 29 + # Cython and numpy are needed when running setup.py, to build extensions 30 + -setup_requires=["numpy==1.17.4", "Cython==0.29.14"] 31 + +setup_requires=["numpy>=1.17.4", "Cython>=0.29.14"] 32 + 33 + with open(join(dirname(__file__), 'README.rst')) as f: 34 + long_description = f.read()