diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/by-name/co/corrscope/package.nix similarity index 72% rename from pkgs/applications/video/corrscope/default.nix rename to pkgs/by-name/co/corrscope/package.nix index 8bd17d2f785e6..a9d83f1a22241 100644 --- a/pkgs/applications/video/corrscope/default.nix +++ b/pkgs/by-name/co/corrscope/package.nix @@ -1,49 +1,41 @@ -{ lib -, mkDerivationWith +{ stdenv +, lib , python3Packages , fetchFromGitHub -, fetchpatch -, wrapQtAppsHook , ffmpeg -, qtbase +, libsForQt5 , testers , corrscope }: -mkDerivationWith python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "corrscope"; - version = "0.8.1"; - format = "pyproject"; + version = "0.9.0"; + pyproject = true; src = fetchFromGitHub { owner = "corrscope"; repo = "corrscope"; rev = version; - hash = "sha256-pS7upOYZAjgR3lWxny8TNZEj3Rrbg+L90ANZWFO9UPQ="; + hash = "sha256-kOPhVm4epIhBSsgQVKNCoQ7DZcMG/b3sapxwwKo/V+U="; }; - patches = [ - # https://github.com/corrscope/corrscope/pull/446 - (fetchpatch { - name = "remove-setuptools-dependency.patch"; - url = "https://github.com/corrscope/corrscope/commit/70b123173a7a012d9f29d6d3a8960b85caf6cc79.patch"; - hash = "sha256-YCtb7v8cGP0pdceAKeoempnRzw+LRKQqDb3AfN0z/9s="; - }) - ]; - pythonRelaxDeps = [ "attrs" "ruamel.yaml" ]; - nativeBuildInputs = [ + nativeBuildInputs = (with libsForQt5; [ wrapQtAppsHook - ] ++ (with python3Packages; [ + ]) ++ (with python3Packages; [ poetry-core pythonRelaxDepsHook ]); buildInputs = [ ffmpeg + ] ++ (with libsForQt5; [ qtbase - ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + qtwayland + ]); propagatedBuildInputs = with python3Packages; [ appdirs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdaa063bcdd3e..726b4edc4a809 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30387,10 +30387,6 @@ with pkgs; inherit (gnome2) libgnomeui GConf; }; - corrscope = libsForQt5.callPackage ../applications/video/corrscope { - ffmpeg = ffmpeg-full; - }; - cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { }; csa = callPackage ../applications/audio/csa { };