Skip to content

Commit

Permalink
shotcut: 20.07.11 -> 20.09.13, mlt: 6.20.0 -> 6.22.1
Browse files Browse the repository at this point in the history
and add updateScript
  • Loading branch information
woffs committed Sep 25, 2020
1 parent b888313 commit c835358
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 11 deletions.
17 changes: 12 additions & 5 deletions pkgs/applications/video/shotcut/default.nix
@@ -1,20 +1,21 @@
{ stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt
, jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets
, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools
, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools, genericUpdater
, common-updater-scripts
}:

assert stdenv.lib.versionAtLeast libmlt.version "6.20.0";
assert stdenv.lib.versionAtLeast mlt.version "6.20.0";
assert stdenv.lib.versionAtLeast libmlt.version "6.22.1";
assert stdenv.lib.versionAtLeast mlt.version "6.22.1";

mkDerivation rec {
pname = "shotcut";
version = "20.07.11";
version = "20.09.13";

src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
sha256 = "0ajg0bpdckhvmmsliy1xky9p4mdypnaw3z3cvfsdrm0zcihbgazv";
sha256 = "1q7ba6j3b2yzn3y5z9s5ldh15wrvhi6vymhwm910nqa5379dcc21";
};

enableParallelBuilding = true;
Expand Down Expand Up @@ -47,6 +48,12 @@ mkDerivation rec {
cp -r src/qml $out/share/shotcut/
'';

passthru.updateScript = genericUpdater {
inherit pname version;
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
rev-prefix = "v";
};

meta = with stdenv.lib; {
description = "A free, open source, cross-platform video editor";
longDescription = ''
Expand Down
12 changes: 9 additions & 3 deletions pkgs/development/libraries/mlt/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, makeWrapper
, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
, libvorbis, libxml2, movit, pkgconfig, sox
, gtk2
, gtk2, genericUpdater, common-updater-scripts
}:

stdenv.mkDerivation rec {
pname = "mlt";
version = "6.20.0";
version = "6.22.1";

src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "14kayzas2wisyw0z27qkcm4qnxbdb7bqa0hg7gaj5kbm3nvsnafk";
sha256 = "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k";
};

buildInputs = [
Expand All @@ -38,6 +38,12 @@ stdenv.mkDerivation rec {
sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g"
'';

passthru.updateScript = genericUpdater {
inherit pname version;
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
rev-prefix = "v";
};

meta = with stdenv.lib; {
description = "Open source multimedia framework, designed for television broadcasting";
homepage = "https://www.mltframework.org";
Expand Down
12 changes: 9 additions & 3 deletions pkgs/development/libraries/mlt/qt-5.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
, libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg
, fftw, vid-stab, opencv3, ladspa-sdk
, fftw, vid-stab, opencv3, ladspa-sdk, genericUpdater, common-updater-scripts
}:

let inherit (stdenv.lib) getDev; in

stdenv.mkDerivation rec {
pname = "mlt";
version = "6.20.0";
version = "6.22.1";

src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "14kayzas2wisyw0z27qkcm4qnxbdb7bqa0hg7gaj5kbm3nvsnafk";
sha256 = "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k";
};

buildInputs = [
Expand Down Expand Up @@ -57,6 +57,12 @@ stdenv.mkDerivation rec {
inherit ffmpeg;
};

passthru.updateScript = genericUpdater {
inherit pname version;
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
rev-prefix = "v";
};

meta = with stdenv.lib; {
description = "Open source multimedia framework, designed for television broadcasting";
homepage = "https://www.mltframework.org/";
Expand Down

0 comments on commit c835358

Please sign in to comment.