diff options
| author | Cray Elliott <MP2E@archlinux.us> | 2017-12-17 23:00:05 -0800 |
|---|---|---|
| committer | Cray Elliott <MP2E@archlinux.us> | 2017-12-17 23:00:05 -0800 |
| commit | c1e8fea4fcc1531265319ea1d8fe31448ec36769 (patch) | |
| tree | 2613f1136bd63957852031d3937776da0125709e /pkgs/development/libraries/ffmpeg | |
| parent | 2e2c2cad6c51588328b72f955d4ef1332623b786 (diff) | |
| download | nixlib-c1e8fea4fcc1531265319ea1d8fe31448ec36769.tar nixlib-c1e8fea4fcc1531265319ea1d8fe31448ec36769.tar.gz nixlib-c1e8fea4fcc1531265319ea1d8fe31448ec36769.tar.bz2 nixlib-c1e8fea4fcc1531265319ea1d8fe31448ec36769.tar.lz nixlib-c1e8fea4fcc1531265319ea1d8fe31448ec36769.tar.xz nixlib-c1e8fea4fcc1531265319ea1d8fe31448ec36769.tar.zst nixlib-c1e8fea4fcc1531265319ea1d8fe31448ec36769.zip | |
ffmpeg, ffmpeg-full: 3.4 -> 3.4.1
also remove CVE patch, it is upstream in v3.4.1
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.4.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index 9890d030e44e..f4cda16424c3 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,16 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4"; - sha256 = "0pn8g3ab937ahslqd41crk0g4j4fh7kwimsrlfc0rl0pc3z132ax"; + branch = "3.4.1"; + sha256 = "0b2aaxx8l7g3pvs4zd3mzig44cc73savrxzfm6w0lnaa2lh3wi7k"; darwinFrameworks = [ Cocoa CoreMedia ]; - - patches = [ - (fetchpatch{ - name = "CVE-2017-16840.patch"; - url = "http://git.videolan.org/?p=ffmpeg.git;a=patch;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74"; - sha256 = "1rjr9lc71cyy43wsa2zxb9ygya292h9jflvr5wk61nf0vp97gjg3"; - }) - ]; - }) |