about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOPNA2608 <opna2608@protonmail.com>2024-03-13 16:37:37 +0100
committerOPNA2608 <opna2608@protonmail.com>2024-04-11 23:14:58 +0200
commit94bc20ad0f8f8f09dc115d10739f15f5f0bf11ed (patch)
tree3b778008b71b853f5828beb1fb8e0d3caebfd443
parent865ce9d50798d46d125fd9f8113e7aea8972ff81 (diff)
corrscope: 0.8.1 -> 0.9.0
-rw-r--r--pkgs/applications/video/corrscope/default.nix22
1 files changed, 8 insertions, 14 deletions
diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix
index 8bd17d2f785e6..088e72456f380 100644
--- a/pkgs/applications/video/corrscope/default.nix
+++ b/pkgs/applications/video/corrscope/default.nix
@@ -1,36 +1,28 @@
-{ lib
+{ stdenv
+, lib
 , mkDerivationWith
 , python3Packages
 , fetchFromGitHub
-, fetchpatch
 , wrapQtAppsHook
 , ffmpeg
 , qtbase
+, qtwayland
 , testers
 , corrscope
 }:
 
 mkDerivationWith 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 = [
@@ -43,6 +35,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
   buildInputs = [
     ffmpeg
     qtbase
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
   ];
 
   propagatedBuildInputs = with python3Packages; [