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-01-05 16:10:35 +01:00
parent 2dc4ab3677 828f93a326
commit 981b94442b
146 changed files with 3509 additions and 1340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/ffmpeg/2.8.nix
View File

@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (rec {
version = "${branch}.14";
version = "${branch}.15";
branch = "2.8";
sha256 = "1g6x3lyjl1zlfksizj1ys61kj97yg0xf4dlr6sr5acpbja3a26yn";
sha256 = "08gf493a1ici1rn6gda6bxkcsk3fqbs6pdr0phcifjkd3xn7yr1m";
} // args)

4
pkgs/development/libraries/ffmpeg/4.nix
View File

@@ -5,8 +5,8 @@
}@args:
callPackage ./generic.nix (rec {
version = "4.2.1";
version = "4.2.2";
branch = "4.2";
sha256 = "090naa6rj46pzkgh03bf51hbqdz356qqckr2pw6pykc6ysiryak8";
sha256 = "0p0f024rxrpk8pgmrprhfywq10rvdhrs0422wwcwlxkgqa3x285n";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args)