From d6afe91d212141da31b1c0b7fc3bb2bd94bc72a8 Mon Sep 17 00:00:00 2001
From: Alexandra <74795488+alyaeanyx@users.noreply.github.com>
Date: Wed, 18 Aug 2021 12:00:51 +0200
Subject: friture: unstable-2020-02-16 -> 0.47 (#133781)

* friture: unstable-2020-02-16 -> v0.47

* python39Package -> python3Packages
---
 pkgs/applications/audio/friture/default.nix        |  6 ++--
 pkgs/applications/audio/friture/factorial.patch    | 13 --------
 .../audio/friture/unlock_constraints.patch         | 36 +++++++++++-----------
 3 files changed, 21 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/applications/audio/friture/factorial.patch

diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix
index 99ce726ca1774..8383bdbebc675 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 = "unstable-2020-02-16";
+  version = "0.47";
 
   src = fetchFromGitHub {
     owner = "tlecomte";
     repo = pname;
-    rev = "4460b4e72a9c55310d6438f294424b5be74fc0aa";
-    sha256 = "1pmxzq78ibifby3gbir1ah30mgsqv0y7zladf5qf3sl5r1as0yym";
+    rev = "v${version}";
+    sha256 = "1qcsvmgdz9hhv5gaa918147wvng6manc4iq8ci6yr761ljqrgwjx";
   };
 
   nativeBuildInputs = (with py; [ numpy cython scipy ]) ++
diff --git a/pkgs/applications/audio/friture/factorial.patch b/pkgs/applications/audio/friture/factorial.patch
deleted file mode 100644
index de053802932dc..0000000000000
--- a/pkgs/applications/audio/friture/factorial.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/friture/filter_design.py b/friture/filter_design.py
-index 9876c43..1cc749a 100644
---- a/friture/filter_design.py
-+++ b/friture/filter_design.py
-@@ -2,7 +2,7 @@
- from numpy import pi, exp, arange, cos, sin, sqrt, zeros, ones, log, arange, set_printoptions
- # the three following lines are a workaround for a bug with scipy and py2exe
- # together. See http://www.pyinstaller.org/ticket/83 for reference.
--from scipy.misc import factorial
-+from scipy.special import factorial
- import scipy
- scipy.factorial = factorial
- 
diff --git a/pkgs/applications/audio/friture/unlock_constraints.patch b/pkgs/applications/audio/friture/unlock_constraints.patch
index ab53f948a4858..6ee474794b2b4 100644
--- a/pkgs/applications/audio/friture/unlock_constraints.patch
+++ b/pkgs/applications/audio/friture/unlock_constraints.patch
@@ -1,34 +1,34 @@
 diff --git a/setup.py b/setup.py
-index f31eeec..ac0927b 100644
+index 4092388..6cb7dac 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -50,19 +50,19 @@ 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.3.14",
--    "rtmixer==0.1.0",
--    "PyOpenGL==3.1.4",
--    "PyOpenGL-accelerate==3.1.4",
--    "docutils==0.15.2",
--    "numpy==1.17.4",
--    "PyQt5==5.13.2",
--    "appdirs==1.4.3",
+-    "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.3.14",
-+    "rtmixer>=0.1.0",
++    "sounddevice>=0.4.1",
++    "rtmixer>=0.1.1",
 +    "PyOpenGL>=3.1.4",
-+    "PyOpenGL-accelerate>=3.1.4",
-+    "docutils>=0.15.2",
-+    "numpy>=1.17.4",
-+    "PyQt5>=5.13.2",
-+    "appdirs>=1.4.3",
++    "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",
  ]
  
  # Cython and numpy are needed when running setup.py, to build extensions
--setup_requires=["numpy==1.17.4", "Cython==0.29.14"]
-+setup_requires=["numpy>=1.17.4", "Cython>=0.29.14"]
+-setup_requires=["numpy==1.21.1", "Cython==0.29.24"]
++setup_requires=["numpy>=1.20.3", "Cython>=0.29.22"]
  
  with open(join(dirname(__file__), 'README.rst')) as f:
      long_description = f.read()
-- 
cgit 1.4.1