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

Commits on Mar 29, 2019

  1. ffmpeg: 3.4.5 -> 3.4.6 

    https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/0ac9001ab9f2bdd7c4306afd1a91d6c78b294d9f:/Changelog
    @dtzWill
    dtzWill committed Mar 29, 2019
    Copy the full SHA
    dfdacfd View commit details

Commits on Mar 30, 2019

  1. Merge pull request #58549 from dtzWill/update/ffmpeg-3.4.6 

    ffmpeg: 3.4.5 -> 3.4.6
    @flokli
    flokli authored Mar 30, 2019
    Copy the full SHA
    d741262 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/libraries/ffmpeg/3.4.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/ffmpeg/3.4.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.4.5";
sha256 = "0cbzysj9pskxh1kfdwmq2848fn6gi4pvh5y3insv10pdhpcjp8a3";
branch = "3.4.6";
sha256 = "1s20wzgxxrm56gckyb8cf1lh36hdnkdxvmmnnvdxvia4zb3grf1b";
darwinFrameworks = [ Cocoa CoreMedia ];
})