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: f2e1e7f3cd9f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 08ec54a86d46
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 10, 2017

  1. ffmpeg{,-full}: 3.3.1 -> 3.3.2 

    https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/6d7192bcb7bbab17dc194e8dbb56c208bced0a92:/Changelog
    @GeNTooFReaK
    GeNTooFReaK committed Jun 10, 2017
    Copy the full SHA
    d402df0 View commit details

  2. Merge pull request #26504 from gentoofreak/ffmpeg-3.3.2 

    ffmpeg{,-full}: 3.3.1 -> 3.3.2
    @Mic92
    Mic92 authored Jun 10, 2017
    Copy the full SHA
    08ec54a View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/libraries/ffmpeg-full/default.nix
  2. +2 −2 pkgs/development/libraries/ffmpeg/3.3.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
@@ -230,11 +230,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;

stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}";
version = "3.3.1";
version = "3.3.2";

src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
sha256 = "0bwgm6z6k3khb91qh9xv15inykkfchpkm0lcdckkxhkacpyaf0mp";
sha256 = "11974vcfsy8w0i6f4lfwqmg80xkfybqw7vw6zzrcn5i6ncddx60r";
};

patchPhase = ''patchShebangs .
4 changes: 2 additions & 2 deletions pkgs/development/libraries/ffmpeg/3.3.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

callPackage ./generic.nix (args // rec {
version = "${branch}";
branch = "3.3.1";
sha256 = "0c37bdqwmaziikr2d5pqp7504ail6i7a1mfcmc06mdpwfxxwvcpw";
branch = "3.3.2";
sha256 = "0slf12dxk6wq1ns09kqqqrzwylxcy0isvc3niyxig45gq3ah0s91";
darwinFrameworks = [ Cocoa CoreMedia ];
})