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: 4be14c94b290
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c13f1a508d61
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 4, 2020

  1. ffmpeg_4: 4.2.1 -> 4.2.2

    @zowoq @alyssais
    zowoq authored and alyssais committed Jan 4, 2020
    Copy the full SHA
    115791b View commit details

  2. ffmpeg-full: 4.2.1 -> 4.2.2

    @zowoq @alyssais
    zowoq authored and alyssais committed Jan 4, 2020
    Copy the full SHA
    4a70ef8 View commit details

  3. ffmpeg_2_8: 2.8.14 -> 2.8.15

    @zowoq @alyssais
    zowoq authored and alyssais committed Jan 4, 2020
    Copy the full SHA
    c13f1a5 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 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
4 changes: 2 additions & 2 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.1";
version = "4.2.2";

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

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}.14";
version = "${branch}.15";
branch = "2.8";
sha256 = "1g6x3lyjl1zlfksizj1ys61kj97yg0xf4dlr6sr5acpbja3a26yn";
sha256 = "08gf493a1ici1rn6gda6bxkcsk3fqbs6pdr0phcifjkd3xn7yr1m";
} // 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.1";
version = "4.2.2";
branch = "4.2";
sha256 = "090naa6rj46pzkgh03bf51hbqdz356qqckr2pw6pykc6ysiryak8";
sha256 = "0p0f024rxrpk8pgmrprhfywq10rvdhrs0422wwcwlxkgqa3x285n";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args)