From c537b968909d98b31884c5bb181308b68eed036e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 24 Mar 2019 13:13:20 -0500 Subject: [PATCH 1/2] ffmpeg_4: 4.1.1 -> 4.1.2 https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/a7cb7a2e4314956e06a351333ff8096fab9afa7f:/Changelog --- pkgs/development/libraries/ffmpeg/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 738411d398df..d8a13a9c384d 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.1.1"; - sha256 = "0n5hz98gcyznj8lnqma6c9004vhcdzv67a4angnd1k6ai8xhxd0c"; + branch = "4.1.2"; + sha256 = "00yzwc2g97h8ws0haz1p0ahaavhgrbha6xjdc53a5vyfy3zyy3i0"; darwinFrameworks = [ Cocoa CoreMedia ]; }) From 2a5558ab302f08816094d89a863dcb05cbe60cb7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 24 Mar 2019 13:16:57 -0500 Subject: [PATCH 2/2] ffmpeg-full: 4.1.1 -> 4.1.2 --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index f7968380e29b..1ab0b543400f 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 = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "11id9pm4azfrhpa4vr2yaw31dzgd55kl1zsxwn24sczx9n14jdrp"; + sha256 = "0yrl6nij4b1pk1c4nbi80857dsd760gziiss2ls19awq8zj0lpxr"; }; prePatch = ''