Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 35eda4aede5c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2f9bafaca90a
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on May 31, 2020

  1. ffmpeg_4: 4.2.2 -> 4.2.3 

    (cherry picked from commit 0e38414)
    @zowoq @vcunat
    zowoq authored and vcunat committed May 31, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    JounQin JounQin
    GPG key ID: 0BC0B62F2E603198
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7071e76 View commit details

  2. ffmpeg-full: 4.2.2 -> 4.2.3 

    (cherry picked from commit f7c914e)
    @zowoq @vcunat
    zowoq authored and vcunat committed May 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    76248ee View commit details

  3. ffmpeg_2_8: 2.8.15 -> 2.8.16 

    (cherry picked from commit cfaa803)
    @zowoq @vcunat
    zowoq authored and vcunat committed May 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d82bae4 View commit details

Commits on Jun 1, 2020

  1. ip2unix: 2.1.1 -> 2.1.2 

    This fixes the issues with glibc 2.30, which were caused because glibc
no longer allows to dlopen/LD_PRELOAD a PIE executable.

So this release is essentially just a hotfix release which addresses
this issue by splitting the executable and library.

Signed-off-by: aszlig <aszlig@nix.build>
Reported-by: @zimbatm
(cherry picked from commit b51d39f)
    @aszlig
    aszlig committed Jun 1, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    61421ed View commit details

  2. ip2unix: 2.1.2 -> 2.1.3 

    Upstream fixes:

  - Pass linker version script to the linker instead of the compiler.
  - Compile with `-fPIC` again (regression from version 2.1.2).
  - Out of bounds array access in `globpath`.
  - Handling of `epoll_ctl` calls (they're now replayed after replacing
    socket).
  - GCC 10 build errors and Clang warnings.

While most of these fixes are more relevant for other distros, the
linker script fix is actually a regression existing since a long time
(version 1.x) and caused libip2unix to expose way too many symbols.

Built and tested on i686-linux and x86_64-linux.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit 67325b1)
    @aszlig
    aszlig committed Jun 1, 2020
    Copy the full SHA
    2f9bafa View commit details
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
@@ -238,11 +238,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 (args // rec {
version = "${branch}.15";
version = "${branch}.16";
branch = "2.8";
sha256 = "08gf493a1ici1rn6gda6bxkcsk3fqbs6pdr0phcifjkd3xn7yr1m";
sha256 = "0lfmfd6rhywis9rblkxv33rpwfga9xv261fq4cn3pkx1izih7ybk";
})
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 (args // rec {
version = "4.2.2";
version = "4.2.3";
branch = "4.2";
sha256 = "0p0f024rxrpk8pgmrprhfywq10rvdhrs0422wwcwlxkgqa3x285n";
sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
})
4 changes: 2 additions & 2 deletions pkgs/tools/networking/ip2unix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "ip2unix";
version = "2.1.1";
version = "2.1.3";

src = fetchFromGitHub {
owner = "nixcloud";
repo = "ip2unix";
rev = "v${version}";
sha256 = "121ygj50i7ja9bv76y51qsjbjmmydhpi0sd3xb6pysmlzv0bxn17";
sha256 = "19c449h60b2m1d8kawnhpi4y9y4ddm24jmlh8kilqmx8m5l2khr6";
};

nativeBuildInputs = [