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:
Frederik Rietdijk
2020-05-27 15:27:28 +02:00
parent 0367fa630d 1b7204ab3c
commit 362d88c2b1
277 changed files with 4061 additions and 1435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/ffmpeg/2.8.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (rec {
version = "${branch}.15";
version = "${branch}.16";
branch = "2.8";
sha256 = "08gf493a1ici1rn6gda6bxkcsk3fqbs6pdr0phcifjkd3xn7yr1m";
sha256 = "0lfmfd6rhywis9rblkxv33rpwfga9xv261fq4cn3pkx1izih7ybk";
} // args)
pkgs/development/libraries/ffmpeg/4.nix
+2 -2
View File
@@ -5,8 +5,8 @@
}@args:
callPackage ./generic.nix (rec {
version = "4.2.2";
version = "4.2.3";
branch = "4.2";
sha256 = "0p0f024rxrpk8pgmrprhfywq10rvdhrs0422wwcwlxkgqa3x285n";
sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args)