diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-24 13:56:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-24 13:56:28 +0200 |
| commit | 78ea189a6b1c59e7c331fe57d1eb035b8977bdac (patch) | |
| tree | 67f04910c45d8bdd1a4540f7777791bd04e7dc26 /pkgs/development/libraries | |
| parent | 8004e794153b34507f81a26f88174bdfee975aa8 (diff) | |
| parent | 760248360c1d3b2a0a648a76803180e7a6c13275 (diff) | |
| download | nixlib-78ea189a6b1c59e7c331fe57d1eb035b8977bdac.tar nixlib-78ea189a6b1c59e7c331fe57d1eb035b8977bdac.tar.gz nixlib-78ea189a6b1c59e7c331fe57d1eb035b8977bdac.tar.bz2 nixlib-78ea189a6b1c59e7c331fe57d1eb035b8977bdac.tar.lz nixlib-78ea189a6b1c59e7c331fe57d1eb035b8977bdac.tar.xz nixlib-78ea189a6b1c59e7c331fe57d1eb035b8977bdac.tar.zst nixlib-78ea189a6b1c59e7c331fe57d1eb035b8977bdac.zip | |
Merge branch 'master' into staging
... to fix *some* of the evaluation problems.
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.3.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 848cae09ed47..47be28f51302 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -234,7 +234,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "0bwgm6z6k3khb91qh9xv15inykkfchpkm0lcdckkxhkacpyaf0mp"; + sha256 = "0c37bdqwmaziikr2d5pqp7504ail6i7a1mfcmc06mdpwfxxwvcpw"; }; patchPhase = ''patchShebangs . diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix index 0227d7489ba9..d6380b795af8 100644 --- a/pkgs/development/libraries/ffmpeg/3.3.nix +++ b/pkgs/development/libraries/ffmpeg/3.3.nix @@ -7,6 +7,6 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; branch = "3.3.1"; - sha256 = "0bwgm6z6k3khb91qh9xv15inykkfchpkm0lcdckkxhkacpyaf0mp"; + sha256 = "0c37bdqwmaziikr2d5pqp7504ail6i7a1mfcmc06mdpwfxxwvcpw"; darwinFrameworks = [ Cocoa CoreMedia ]; }) |