public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-16 18:32:44 +00:00
committed by GitHub
parent 21541fc97c 8c6d819143
commit 6cdac75d25
77 changed files with 796 additions and 1799 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/video/hdhomerun-config-gui/default.nix
+3 -3
View File
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, libhdhomerun, gcc, gnumake, pkg-config, gtk2 }:
{ lib, stdenv, fetchurl, libhdhomerun, pkg-config, gtk2 }:
stdenv.mkDerivation rec {
pname = "hdhomerun-config-gui";
version = "20200907";
version = "20210224";
src = fetchurl {
url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz";
sha256 = "17zf0hzw68b0xdkh1maqhl96jb7171mbhd29y64as29nps9x4fmz";
sha256 = "sha256-vzrSk742Ca2I8Uk0uGo44SxpEoVY1QBn62Ahwz8E7p8=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/applications/video/openshot-qt/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
buildInputs = [ gtk3 ];
propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip httplib2 pyzmq ];
propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip_4 httplib2 pyzmq ];
dontWrapGApps = true;
dontWrapQtApps = true;
pkgs/applications/video/vdr/default.nix
+4 -4
View File
@@ -5,12 +5,12 @@
}: stdenv.mkDerivation rec {
pname = "vdr";
version = "2.4.6";
version = "2.4.7";
src = fetchgit {
url = "git://git.tvdr.de/vdr.git";
rev = "V20406";
sha256 = "sha256-te9lMmnWpesv+np2gJUDL17pI0WyVxhUnoBsFSRtOco=";
rev = version;
sha256 = "sha256-hDJ/DemWuLddDvXGqxkSTIqATlWUjolcP7ojjhK2CDk=";
};
enableParallelBuilding = true;
@@ -51,6 +51,6 @@
description = "Video Disc Recorder";
maintainers = [ maintainers.ck3d ];
platforms = [ "i686-linux" "x86_64-linux" ];
license = licenses.gpl2;
license = licenses.gpl2Plus;
};
}