diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-05 16:10:35 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-05 16:10:40 +0100 |
| commit | 981b94442b1d65b6b281d3d7e49a9bf7502256ce (patch) | |
| tree | e44c31f7912c8014d2bb46dd1f025e3cfd9aa546 /pkgs/development/libraries/ffmpeg | |
| parent | 2dc4ab36772dfaf124af4d90e99c68038f46baa0 (diff) | |
| parent | 828f93a32665c9c72f7bf441878a91a11213fdf3 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/2.8.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix index 98ada9a3f09f..3b3fc900edea 100644 --- a/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/pkgs/development/libraries/ffmpeg/2.8.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (rec { - version = "${branch}.14"; + version = "${branch}.15"; branch = "2.8"; - sha256 = "1g6x3lyjl1zlfksizj1ys61kj97yg0xf4dlr6sr5acpbja3a26yn"; + sha256 = "08gf493a1ici1rn6gda6bxkcsk3fqbs6pdr0phcifjkd3xn7yr1m"; } // args) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 387069d16189..31cb0477c21a 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -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) |