Merge pull request #325822 from linsui/friture

friture: 0.49 -> 0.49-unstable-2024-06-02

pkgs/by-name/fr/friture/package.nix

@@ -1,18 +1,38 @@
-{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  qt5,
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "friture";
-  version = "0.49";
+  version = "0.49-unstable-2024-06-02";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tlecomte";
     repo = pname;
-    rev = "v${version}";
+    rev = "405bffa585ece0cb535c32d0f4f6ace932b40103";
-    sha256 = "sha256-xKgyBV/Qc+9PgXyxcT0xG1GXLC6KnjavJ/0SUE+9VSY=";
+    hash = "sha256-4xvIlRuJ7WCFj1dEyvO9UOsye70nFlWjb9XU0owwgiM=";
   };
 
-  nativeBuildInputs = (with python3Packages; [ numpy cython scipy ]) ++
+  pythonRelaxDeps = true;
-    [ wrapQtAppsHook ];
+
+  postPatch = ''
+    sed -i -e '/packages=\[/a "friture.playback",' pyproject.toml
+  '';
+
+  nativeBuildInputs =
+    (with python3Packages; [
+      numpy
+      cython
+      scipy
+      setuptools
+    ])
+    ++ (with qt5; [ wrapQtAppsHook ]);
+
+  buildInputs = with qt5; [ qtquickcontrols2 ];
 
   propagatedBuildInputs = with python3Packages; [
     sounddevice
@@ -26,11 +46,6 @@ python3Packages.buildPythonApplication rec {
     rtmixer
   ];
 
-  postPatch = ''
-    # Remove version constraints from Python dependencies in setup.py
-    sed -i -E "s/\"([A-Za-z0-9]+)(=|>|<)=[0-9\.]+\"/\"\1\"/g" setup.py
-  '';
-
   preFixup = ''
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
@@ -53,6 +68,9 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://friture.org/";
     license = licenses.gpl3;
     platforms = platforms.linux; # fails on Darwin
-    maintainers = with maintainers; [ laikq alyaeanyx ];
+    maintainers = with maintainers; [
+      laikq
+      alyaeanyx
+    ];
   };
 }

pkgs/development/python-modules/pyopengl-accelerate/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonAtLeast,
   fetchPypi,
   cython,
   numpy,

pkgs/top-level/all-packages.nix

@@ -30877,8 +30877,8 @@ with pkgs;
 
   freerdpUnstable = freerdp;
 
-  friture = libsForQt5.callPackage ../applications/audio/friture {
+  friture = callPackage ../by-name/fr/friture/package.nix {
-    python3Packages = python39Packages;
+    python3Packages = python311Packages;
   };
 
   g933-utils = callPackage ../tools/misc/g933-utils { };