Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7da72d58adb2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6050c0bf453e
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on May 24, 2020

  1. ffmpeg_4: 4.2.2 -> 4.2.3

    @zowoq
    zowoq committed May 24, 2020
    Copy the full SHA
    0e38414 View commit details

  2. ffmpeg-full: 4.2.2 -> 4.2.3

    @zowoq
    zowoq committed May 24, 2020
    Copy the full SHA
    f7c914e View commit details

  3. ffmpeg_2_8: 2.8.15 -> 2.8.16

    @zowoq
    zowoq committed May 24, 2020
    Copy the full SHA
    cfaa803 View commit details

Commits on May 27, 2020

  1. Merge pull request #88561 from zowoq/ffmpeg 

    ffmpeg{_4,-full}: 4.2.2 -> 4.2.3, ffmpeg_2_8: 2.8.15 -> 2.8.16
    @marsam
    marsam authored May 27, 2020
    Copy the full SHA
    6050c0b View commit details
Showing with 7 additions and 7 deletions.
  1. +3 −3 pkgs/development/libraries/ffmpeg-full/default.nix
  2. +2 −2 pkgs/development/libraries/ffmpeg/2.8.nix
  3. +2 −2 pkgs/development/libraries/ffmpeg/4.nix
6 changes: 3 additions & 3 deletions pkgs/development/libraries/ffmpeg-full/default.nix
View file
Original file line number Diff line number Diff line change
@@ -239,11 +239,11 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;

stdenv.mkDerivation rec {
pname = "ffmpeg-full";
version = "4.2.2";
version = "4.2.3";

src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
sha256 = "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb";
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1";
};

patches = [ ./prefer-libdav1d-over-libaom.patch ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/ffmpeg/2.8.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:

callPackage ./generic.nix (rec {
version = "${branch}.15";
version = "${branch}.16";
branch = "2.8";
sha256 = "08gf493a1ici1rn6gda6bxkcsk3fqbs6pdr0phcifjkd3xn7yr1m";
sha256 = "0lfmfd6rhywis9rblkxv33rpwfga9xv261fq4cn3pkx1izih7ybk";
} // args)
4 changes: 2 additions & 2 deletions pkgs/development/libraries/ffmpeg/4.nix
View file
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
}@args:

callPackage ./generic.nix (rec {
version = "4.2.2";
version = "4.2.3";
branch = "4.2";
sha256 = "0p0f024rxrpk8pgmrprhfywq10rvdhrs0422wwcwlxkgqa3x285n";
sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args)