diff options
| author | alyaeanyx <alexandra.hollmeier@mailbox.org> | 2021-10-01 19:13:20 +0200 |
|---|---|---|
| committer | Raphael Megzari <raphael@megzari.com> | 2021-10-02 09:37:14 +0900 |
| commit | 5c81b8818709d736b9e52eb45efb237c80f732de (patch) | |
| tree | 1b5eae5353ceb51d836e2c009d876da3b68faeec | |
| parent | 3b9943f477304d9d128eee70b95c4fec6e0aff8d (diff) | |
| download | nixpkgs-5c81b8818709d736b9e52eb45efb237c80f732de.tar nixpkgs-5c81b8818709d736b9e52eb45efb237c80f732de.tar.gz nixpkgs-5c81b8818709d736b9e52eb45efb237c80f732de.tar.bz2 nixpkgs-5c81b8818709d736b9e52eb45efb237c80f732de.tar.lz nixpkgs-5c81b8818709d736b9e52eb45efb237c80f732de.tar.xz nixpkgs-5c81b8818709d736b9e52eb45efb237c80f732de.tar.zst nixpkgs-5c81b8818709d736b9e52eb45efb237c80f732de.zip | |
friture: use sed instead of patch
| -rw-r--r-- | pkgs/applications/audio/friture/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/audio/friture/unlock_constraints.patch | 30 |
2 files changed, 4 insertions, 33 deletions
diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index c838f377955..1c5d292c0ae 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -28,9 +28,10 @@ in py.buildPythonApplication rec { rtmixer ]; - patches = [ - ./unlock_constraints.patch - ]; + 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[@]}") diff --git a/pkgs/applications/audio/friture/unlock_constraints.patch b/pkgs/applications/audio/friture/unlock_constraints.patch deleted file mode 100644 index 62ada840462..00000000000 --- a/pkgs/applications/audio/friture/unlock_constraints.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/setup.py b/setup.py -index 886fe78..5dccac0 100644 ---- a/setup.py -+++ b/setup.py -@@ -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", -- "docutils==0.17.1", -- "numpy==1.21.1", -- "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.21.1", "Cython<=0.29.24"] - - with open(join(dirname(__file__), 'README.rst')) as f: - long_description = f.read() |