diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-11-26 10:28:00 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-11-26 10:28:00 +0100 |
| commit | a5de78b7d7a794b744594bda47f3d11ce985d48d (patch) | |
| tree | 76d6d2190d5e860edd0c3ca03e1a3b09b48d9337 /pkgs/applications/video | |
| parent | e41154d1abcbcd1b9a0f542e590c63a210ea4266 (diff) | |
| parent | 4fef4fbb4bccc73d26b9a601d211990261cbb657 (diff) | |
| download | nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.tar nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.tar.gz nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.tar.bz2 nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.tar.lz nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.tar.xz nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.tar.zst nixlib-a5de78b7d7a794b744594bda47f3d11ce985d48d.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/openshot-qt/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/video/pyca/default.nix | 30 |
2 files changed, 32 insertions, 2 deletions
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index d1849e2b4b35..0905ef5481bb 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -4,13 +4,13 @@ python3Packages.buildPythonApplication rec { name = "openshot-qt-${version}"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "0m4fq9vj8gc5ngk8qf6ikj85qgzxhfk7nnz7n7362dzlfymaz18q"; + sha256 = "1qdw1mli4y9qhrnllnkaf6ydgw5vfvdb90chs4i679k0x0jyb9a2"; }; nativeBuildInputs = [ doxygen wrapGAppsHook ]; diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix new file mode 100644 index 000000000000..af9ef4c1cd50 --- /dev/null +++ b/pkgs/applications/video/pyca/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }: + +buildPythonApplication rec { + pname = "pyca"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "opencast"; + repo = "pyCA"; + rev = "v${version}"; + sha256 = "0cvkmdlcax9da9iw4ls73vw0pxvm8wvchab5gwdy9w9ibqdpcmwh"; + }; + + propagatedBuildInputs = [ + pycurl + dateutil + configobj + sqlalchemy + sdnotify + flask + ]; + + meta = with stdenv.lib; { + description = "A fully functional Opencast capture agent written in Python"; + homepage = https://github.com/opencast/pyCA; + license = licenses.lgpl3; + maintainers = with maintainers; [ pmiddend ]; + }; +} + |