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

Merge branch 'master' into staging-next

Browse Source 
Fixed trivial conflicts caused by removing rec.
This commit is contained in:
Jan Tojnar
2019-09-06 03:20:09 +02:00
parent e7cccdbb13 ed54a5b51d
commit cdf426488b
247 changed files with 3153 additions and 2159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/v4l-utils/default.nix
+3 -3
View File
@@ -12,11 +12,11 @@ let
# we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt
in stdenv.mkDerivation rec {
pname = "v4l-utils";
version = "1.16.6";
version = "1.16.7";
src = fetchurl {
url = "https://linuxtv.org/downloads/v4l-utils/${pname}-${version}.tar.bz2";
sha256 = "1bkqlrizx0j2rd6ybam2x17bjrpwzl4v4szmnzm3cmixis3w3npr";
url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2";
sha256 = "1ng0x3wj3a1ckfd00yxa4za43xms92gdp7rdag060b7p39z7m4gf";
};
outputs = [ "out" "dev" ];