diff options
| author | Cray Elliott <MP2E@archlinux.us> | 2017-10-23 23:23:23 -0700 |
|---|---|---|
| committer | Cray Elliott <MP2E@archlinux.us> | 2017-10-23 23:23:23 -0700 |
| commit | 5ddea062e269c124346c8d2c6cee1eac1aa36bfd (patch) | |
| tree | ac9fccc0dd95876388275199e5488898bcbdce6a | |
| parent | cccee1ddb7fc34e3ee4e549cdcc4e07d34a0f9f6 (diff) | |
| download | nixlib-5ddea062e269c124346c8d2c6cee1eac1aa36bfd.tar nixlib-5ddea062e269c124346c8d2c6cee1eac1aa36bfd.tar.gz nixlib-5ddea062e269c124346c8d2c6cee1eac1aa36bfd.tar.bz2 nixlib-5ddea062e269c124346c8d2c6cee1eac1aa36bfd.tar.lz nixlib-5ddea062e269c124346c8d2c6cee1eac1aa36bfd.tar.xz nixlib-5ddea062e269c124346c8d2c6cee1eac1aa36bfd.tar.zst nixlib-5ddea062e269c124346c8d2c6cee1eac1aa36bfd.zip | |
ffmpeg: 3.3.4 -> 3.4
ffmpeg_3 bumped to 3.4, and 3.3.4 removed from the tree
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.4.nix (renamed from pkgs/development/libraries/ffmpeg/3.3.nix) | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 275389b7b8bd..11d365159f80 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -231,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.3.4"; + version = "3.4"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "0mx9dvad3lkyhvsrblf280x2bz6dxajya1ylnspbdzldj0dpxfcq"; + sha256 = "1vzvpx8ixy8m44f8qwp833hv253hpghybgzbc4n8b3div3j0dvmf"; }; patchPhase = ''patchShebangs . diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index 3218461258d7..513654e98f74 100644 --- a/pkgs/development/libraries/ffmpeg/3.3.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.3.4"; - sha256 = "0zmczggi95fbsq9nz33mpln1y3p1gqniqc4x5smp871idhkykxay"; + branch = "3.4"; + sha256 = "0pn8g3ab937ahslqd41crk0g4j4fh7kwimsrlfc0rl0pc3z132ax"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 510509d144e9..a5c7e0af0755 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8098,14 +8098,14 @@ with pkgs; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_3_3 = callPackage ../development/libraries/ffmpeg/3.3.nix { + ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; ffmpeg_2 = ffmpeg_2_8; - ffmpeg_3 = ffmpeg_3_3; + ffmpeg_3 = ffmpeg_3_4; ffmpeg = ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { |