diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-01-18 13:31:15 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-18 13:31:15 -0300 |
| commit | 8eabb500ebf5dcb9a40024c1150ef348cefa8320 (patch) | |
| tree | dc71dac7525f854f21bd941d2182c5e55787185d /pkgs/applications/video | |
| parent | 44fc962f76f771b80bdffe7c209c11b0c29526d7 (diff) | |
| parent | 7f145286ed2e439efe0d5265ac39cc28b084dfb2 (diff) | |
Merge pull request #211399 from mislavzanic/mislavzanic/openshot-qt-3.0.0
openshot-qt: 2.6.1 -> 3.0.0
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/openshot-qt/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/applications/video/openshot-qt/libopenshot.nix | 4 |
2 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 5d8b68200ded..02270cd75e06 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -13,13 +13,13 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { pname = "openshot-qt"; - version = "2.6.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - hash = "sha256-29fAg4SDoAFzv6q43Dcs2HdaeKZfPEzlGqCcICiPSF0="; + hash = "sha256-h4R2txi038m6tzdKYiXIB8CiqWt2MFFRNerp1CFP5as="; }; nativeBuildInputs = [ @@ -45,22 +45,6 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { export HOME=$(mktemp -d) ''; - # Following Arch PKGBUILD for Python 3.10 compatibility - # https://github.com/OpenShot/openshot-qt/issues/4608 - # https://github.com/archlinux/svntogit-community/commits/packages/openshot/trunk - patches = [ - (fetchpatch { - name = "video-widget.patch"; - url = "https://github.com/OpenShot/openshot-qt/commit/9748a13268d66a5949aebc970637b5903756d018.patch"; - hash = "sha256-QwLtcooDJeYWDp80a1dUFo2so/zEWqqsq5IgkXWX324="; - }) - (fetchpatch { - name = "python-3.10-int.patch"; - url = "https://github.com/OpenShot/openshot-qt/commit/fff785eb1e3e0c30ed6ca57e2d1933aaa807ae22.patch"; - hash = "sha256-ee/s7rhF71ot5oPkGK+j59mL1B3e72xoH27KFoDL8s8="; - }) - ]; - doCheck = false; dontWrapGApps = true; diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 22ed82fd3d0b..4214bed7167f 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libopenshot"; - version = "0.2.7"; + version = "0.3.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "sha256-aF8wrPxFIjCy5gw72e/WyL/Wcx9tUGDkrqHS+ZDVK0U="; + sha256 = "sha256-qe866gFhcbd7yCNXDiZ9Aj0TAiWoJ+r7C5BjtWBKSGA="; }; postPatch = '' |