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

Commits on Sep 5, 2017

  1. libav-11: maintenance 11.8 -> 11.9 

    The patch doesn't apply anymore and changelog suggests it's not needed.

(cherry picked from commit 5576ef9)
    @vcunat @fpletz
    vcunat authored and fpletz committed Sep 5, 2017
    Copy the full SHA
    f758cb8 View commit details

  2. libav: maintenance 11.9 -> 11.10 

    (cherry picked from commit 322582d)
    @vcunat @fpletz
    vcunat authored and fpletz committed Sep 5, 2017
    Copy the full SHA
    e146e9e View commit details

  3. libav_12: 12 -> 12.1 

    (cherry picked from commit b1e9eff)
    @fpletz
    fpletz committed Sep 5, 2017
    Copy the full SHA
    f94fa51 View commit details

  4. ffmpeg_2_8: 2.8.11 -> 2.8.13 

    (cherry picked from commit 85cffcf)
    @fpletz
    fpletz committed Sep 5, 2017
    Copy the full SHA
    a95a8a2 View commit details
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 (args // rec {
version = "${branch}.11";
version = "${branch}.13";
branch = "2.8";
sha256 = "0cldkzcbvsnb7mxz3kwpa0mnb44wmlc0qyl01wwi2qznn7vf11wr";
sha256 = "0y3712ivmpr5dw1nsk1bqpd4b7ldzd69ak4vwbl4q02ab35ri6yz";
})
6 changes: 3 additions & 3 deletions pkgs/development/libraries/libav/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,8 +27,8 @@ with { inherit (stdenv.lib) optional optionals hasPrefix; };
let
result = {
libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f";
libav_11 = libavFun "11.8" "d0e93f6b229ae46c49d13ec183b13cfee70a51f0";
libav_12 = libavFun "12" "4ecde7274621c82a6882b7614d907b28de25cc4e";
libav_11 = libavFun "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00";
libav_12 = libavFun "12.1" "df048240318b888e3938f649422b967f62e43e3c";
};

libavFun = version : sha1 : stdenv.mkDerivation rec {
@@ -41,7 +41,7 @@ let

patches = []
++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch
++ optional (vpxSupport && hasPrefix "11." version) ./vpxenc-11.6-libvpx-1.5.patch;
;

preConfigure = "patchShebangs doc/texi2pod.pl";

22 changes: 0 additions & 22 deletions pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch
View file

This file was deleted.