diff options
| author | OPNA2608 <christoph.neidahl@gmail.com> | 2021-08-05 18:01:26 +0200 |
|---|---|---|
| committer | OPNA2608 <christoph.neidahl@gmail.com> | 2021-08-05 18:01:26 +0200 |
| commit | c9f1c1380e25ee1cbe9cf20db456f22f158d50b0 (patch) | |
| tree | 6858285500fdd7f594abf7b7329d329d8a4a97e9 /pkgs/applications/video/corrscope | |
| parent | 6376458424433ced446cbb9045641cb23c9b832d (diff) | |
corrscope: 0.7.0 -> 0.7.1
Diffstat (limited to 'pkgs/applications/video/corrscope')
| -rw-r--r-- | pkgs/applications/video/corrscope/default.nix | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix index d691882a2c6f..610342c3f809 100644 --- a/pkgs/applications/video/corrscope/default.nix +++ b/pkgs/applications/video/corrscope/default.nix @@ -1,6 +1,8 @@ { lib , mkDerivationWith , python3Packages +, fetchFromGitHub +, fetchpatch , wrapQtAppsHook , ffmpeg , qtbase @@ -8,24 +10,31 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "corrscope"; - version = "0.7.0"; + version = "0.7.1"; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "0m62p3jlbx5dlp3j8wn1ka1sqpffsxbpsgv2h5cvj1n1lsgbss2s"; + src = fetchFromGitHub { + owner = "corrscope"; + repo = "corrscope"; + rev = version; + sha256 = "0c9kmrw6pcda68li04b5j2kmsgdw1q463qlc32wn96zn9hl82v6m"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'attrs>=18.2.0,<19.0.0' 'attrs>=18.2.0' \ - --replace 'numpy>=1.15,<2.0,!=1.19.4' 'numpy>=1.15,<2.0' - ''; + format = "pyproject"; + + patches = [ + # Remove when bumping past 0.7.1 + (fetchpatch { + name = "0001-Use-poetry-core.patch"; + url = "https://github.com/corrscope/corrscope/commit/d40d1846dd54b8bccd7b8055d6aece48aacbb943.patch"; + sha256 = "0xxsbmxdbh3agfm6ww3rpa7ab0ysppan490w0gaqwmwzrxmmdljv"; + }) + ]; nativeBuildInputs = [ wrapQtAppsHook ]; buildInputs = [ ffmpeg qtbase ]; - propagatedBuildInputs = with python3Packages; [ appdirs attrs click matplotlib numpy pyqt5 ruamel_yaml ]; + propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy poetry-core pyqt5 ruamel_yaml ]; dontWrapQtApps = true; @@ -36,8 +45,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec { ) ''; - preCheck = "export HOME=$TEMP"; - meta = with lib; { description = "Render wave files into oscilloscope views, featuring advanced correlation-based triggering algorithm"; longDescription = '' |