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: e10c65cdb35b
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: 99a27f4cafa4
Choose a head ref

Commits on Apr 4, 2020

  1. apacheHttpd: 2.4.41 -> 2.4.43

    (cherry picked from commit f26b2af)
    r-ryantm authored and aanderse committed Apr 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    b3e1b81 View commit details

Commits on Apr 6, 2020

  1. wire-desktop: mac 3.15.3621 -> 3.16.3630

    (cherry picked from commit 39c5e1c)
    toonn committed Apr 6, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    30b05e1 View commit details
  2. Merge pull request #84496 from toonn/release-19.09

    [19.09] wire-desktop: mac 3.15.3621 -> 3.16.3630
    flokli authored Apr 6, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    f86271a View commit details

Commits on Apr 7, 2020

  1. libvpx_1_8: init at 1.8.2

    Adding this as a new attribute as software is likely going to break when
    we switch the default from the 1.7 branch to 1.8.
    
    (cherry picked from commit 1859b5a)
    andir committed Apr 7, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    832d4e9 View commit details
  2. firefox: prepare for version 75

    (cherry picked from commit 9de3c97)
    andir committed Apr 7, 2020
    Copy the full SHA
    70bca49 View commit details
  3. Copy the full SHA
    0ffd59a View commit details
  4. firefox: 74.0.1 -> 75.0

    (cherry picked from commit 4a41fd7)
    andir committed Apr 7, 2020
    Copy the full SHA
    5f4b02f View commit details
  5. firefox-esr-68: 68.6.1esr -> 68.7.0esr

    (cherry picked from commit f56ea6c)
    andir committed Apr 7, 2020
    Copy the full SHA
    0280d88 View commit details
  6. firefox-bin: 74.0.1 -> 75.0

    (cherry picked from commit bab82e7)
    andir committed Apr 7, 2020
    Copy the full SHA
    9dda51b View commit details
  7. firefox-beta-bin: 75.0b11 -> 76.0b1

    (cherry picked from commit 9d6a7fd)
    andir committed Apr 7, 2020
    Copy the full SHA
    08a7e09 View commit details
  8. firefox-devedition-bin: 75.0b12 -> 76.0b1

    (cherry picked from commit 79fb589)
    andir committed Apr 7, 2020
    Copy the full SHA
    aaffe07 View commit details
  9. Merge pull request #84590 from andir/19.09/firefox

    [19.09] firefox: 74.0.1 -> 75.0
    andir authored Apr 7, 2020
    Copy the full SHA
    16d0add View commit details

Commits on Apr 8, 2020

  1. signal-desktop: 1.32.3 -> 1.33.0

    (cherry picked from commit fdedc5d)
    primeos committed Apr 8, 2020
    Copy the full SHA
    be180f6 View commit details
  2. chromium: Ignore unknown warning options

    This can e.g. save around 150k lines of unnecessary log messages which
    take up around 66% of the total lines (based on a log of 80.0.3987.100):
    29527 warning: unknown warning option '-Wno-bitwise-conditional-parentheses'; did you mean '-Wno-bitwise-op-parentheses'? [-Wunknown-warning-option]
    29527 warning: unknown warning option '-Wno-builtin-assume-aligned-alignment' [-Wunknown-warning-option]
    29527 warning: unknown warning option '-Wno-deprecated-copy'; did you mean '-Wno-deprecated'? [-Wunknown-warning-option]
    29527 warning: unknown warning option '-Wno-final-dtor-non-final-class'; did you mean '-Wno-abstract-final-class'? [-Wunknown-warning-option]
    29527 warning: unknown warning option '-Wno-implicit-int-float-conversion'; did you mean '-Wno-implicit-float-conversion'? [-Wunknown-warning-option]
    
    (cherry picked from commit 9f39148)
    primeos committed Apr 8, 2020
    Copy the full SHA
    82de063 View commit details
  3. chromiumDev: Remove a patch that is already applied

    This fixes the patch phase.
    I missed this problem in #83956.
    
    (cherry picked from commit 36c7123)
    primeos committed Apr 8, 2020
    Copy the full SHA
    631a5ef View commit details
  4. chromiumBeta: Fix the build

    This patch was also backported to M81 [0][1].
    
    [0]: https://chromium-review.googlesource.com/c/chromium/src/+/2091896
    [1]: chromium/chromium@bbf0fad
    
    (cherry picked from commit ff3bc51)
    primeos committed Apr 8, 2020
    Copy the full SHA
    dd0d0e6 View commit details
  5. Copy the full SHA
    7c60e5c View commit details
  6. Merge pull request #84708 from primeos/signal-desktop-backport

    [19.09] signal-desktop: 1.32.3 -> 1.33.0 (backport)
    primeos authored Apr 8, 2020
    Copy the full SHA
    35cfc19 View commit details
  7. linux: 5.4.30 -> 5.4.31

    NeQuissimus committed Apr 8, 2020
    Copy the full SHA
    6a8c4f7 View commit details
  8. Merge pull request #84709 from primeos/chromium-backport

    [19.09] chromium: 80.0.3987.163 -> 81.0.4044.92 (backport)
    primeos authored Apr 8, 2020
    Copy the full SHA
    7770f3a View commit details
  9. vocal: add missing glib-networking

    otherwise https is disabled
    
    (cherry picked from commit b9b8388)
    Mic92 authored and worldofpeace committed Apr 8, 2020
    Copy the full SHA
    77b9000 View commit details

Commits on Apr 9, 2020

  1. Merge pull request #84294 from aanderse/httpd-19.09

    apacheHttpd: 2.4.41 -> 2.4.43 [19.09]
    aanderse authored Apr 9, 2020
    Copy the full SHA
    52577ba View commit details
  2. linuxPackagesFor: wireguard: noop for kernel >= 5.6

    (cherry picked from commit 27ca6c2)
    
    Rationale for backport: it's explicitly supported to build a kernel with
    a custom tree. When using a 5.6 tree in a system configuration, eval
    will break since `wireguard` is still evaluated and throws an
    assertion-error on 5.6 or greater.
    d-xo authored and Ma27 committed Apr 9, 2020
    Copy the full SHA
    60c4ddb View commit details

Commits on Apr 10, 2020

  1. Copy the full SHA
    ebf64ea View commit details
  2. Merge pull request #84892 from andriokha/tor-browser-bundle-bin-9.0.9…

    …-release-19.09
    
    [19.09] tor-browser-bundle-bin: 9.0.7 -> 9.0.9
    joachifm authored Apr 10, 2020
    Copy the full SHA
    02f2241 View commit details

Commits on Apr 11, 2020

  1. Copy the full SHA
    99a27f4 View commit details
2 changes: 2 additions & 0 deletions pkgs/applications/audio/vocal/default.nix
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
, pantheon
, gtk3
, glib
, glib-networking
, libxml2
, webkitgtk
, clutter-gtk
@@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
pantheon.granite
sqlite
webkitgtk
glib-networking
];

meta = with stdenv.lib; {
8 changes: 6 additions & 2 deletions pkgs/applications/networking/browsers/chromium/common.nix
Original file line number Diff line number Diff line change
@@ -129,8 +129,6 @@ let
./patches/no-build-timestamps.patch
./patches/widevine-79.patch
./patches/dont-use-ANGLE-by-default.patch
# fix race condition in the interaction with pulseaudio
./patches/webrtc-pulse.patch
# Unfortunately, chromium regularly breaks on major updates and
# then needs various patches backported in order to be compiled with GCC.
# Good sources for such patches and other hints:
@@ -139,6 +137,7 @@ let
# - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits
#
# ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
] ++ optionals (useVaapi) [
# source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi
./patches/vaapi-fix.patch
@@ -268,6 +267,11 @@ let
runHook postConfigure
'';

# Don't spam warnings about unknown warning options. This is useful because
# our Clang is always older than Chromium's and the build logs have a size
# of approx. 25 MB without this option (and this saves e.g. 66 %).
NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option";

buildPhase = let
# Build paralelism: on Hydra the build was frequently running into memory
# exhaustion, and even other users might be running into similar issues.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@
version = "83.0.4100.3";
};
stable = {
sha256 = "0ikk4cgz3jgjhyncsvlqvlc03y7jywjpa6v34fwsjxs88flyzpdn";
sha256bin64 = "1ks0i6vdxbmixnfz2b128yf9hsk5pm9x2j17nm3xg3245k0z22xr";
version = "80.0.3987.163";
sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2";
sha256bin64 = "1ig899cpahw1xfhdff5xj6w4k8jja5smxvrcbw6b0jcjmawdrf72";
version = "81.0.4044.92";
};
}
770 changes: 385 additions & 385 deletions pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix

Large diffs are not rendered by default.

770 changes: 385 additions & 385 deletions pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix

Large diffs are not rendered by default.

770 changes: 385 additions & 385 deletions pkgs/applications/networking/browsers/firefox-bin/release_sources.nix

Large diffs are not rendered by default.

14 changes: 10 additions & 4 deletions pkgs/applications/networking/browsers/firefox/common.nix
Original file line number Diff line number Diff line change
@@ -8,7 +8,8 @@
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify
, yasm, libGLU_combined, sqlite, unzip, makeWrapper
, hunspell, libXdamage, libevent, libstartup_notification, libvpx
, hunspell, libXdamage, libevent, libstartup_notification
, libvpx, libvpx_1_8
, icu, libpng, jemalloc, glib
, autoconf213, which, gnused, cargo, rustc, llvmPackages
, rust-cbindgen, nodejs, nasm, fetchpatch
@@ -20,6 +21,7 @@
, rustc_1_41
, cargo_1_41
, rust-cbindgen_0_1_13
, nodejs-12_x

, debugBuild ? false

@@ -128,6 +130,7 @@ let
rustc_pkg = if lib.versionAtLeast ffversion "73" then rustc_1_41 else rustc;
cargo_pkg = if lib.versionAtLeast ffversion "73" then cargo_1_41 else cargo;
cbindgen_pkg = if lib.versionAtLeast ffversion "73" then rust-cbindgen_0_1_13 else rust-cbindgen;
nodejs_pkg = if lib.versionAtLeast ffversion "75" then nodejs-12_x else nodejs;

in

@@ -151,7 +154,7 @@ stdenv.mkDerivation (rec {
libnotify xorg.pixman yasm libGLU_combined
xorg.libXScrnSaver xorg.xorgproto
xorg.libXext sqlite_pkg unzip makeWrapper
libevent libstartup_notification libvpx /* cairo */
libevent libstartup_notification /* cairo */
icu libpng jemalloc glib
]
++ lib.optionals (!isTorBrowserLike) [ nspr_pkg nss_pkg ]
@@ -163,6 +166,8 @@ stdenv.mkDerivation (rec {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1501796
# https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
++ lib.optional (lib.versionAtLeast ffversion "66") nasm
++ lib.optionals (lib.versionOlder ffversion "75") [ libvpx sqlite ]
++ lib.optional (lib.versionAtLeast ffversion "75.0") libvpx_1_8
++ lib.optional alsaSupport alsaLib
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
++ lib.optional gtk3Support gtk3
@@ -191,7 +196,7 @@ stdenv.mkDerivation (rec {
++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals stdenv.isDarwin [ xcbuild rsync ]
++ lib.optional (lib.versionAtLeast ffversion "61.0") [ python3 ]
++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ cbindgen_pkg nodejs ]
++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ cbindgen_pkg nodejs_pkg ]
++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0
++ extraNativeBuildInputs;

@@ -255,7 +260,6 @@ stdenv.mkDerivation (rec {
"--with-system-icu"
"--enable-system-ffi"
"--enable-system-pixman"
"--enable-system-sqlite"
#"--enable-system-cairo"
"--enable-startup-notification"
#"--enable-content-sandbox" # TODO: probably enable after 54
@@ -276,6 +280,8 @@ stdenv.mkDerivation (rec {
++ lib.optionals (lib.versionAtLeast ffversion "57" && lib.versionOlder ffversion "69") [
"--enable-webrender=build"
]
++ lib.optional (lib.versionOlder ffversion "75") "--enable-system-sqlite"
++ lib.optional (stdenv.isDarwin) "--disable-xcode-checks"

# TorBrowser patches these
++ lib.optionals (!isTorBrowserLike) [
8 changes: 4 additions & 4 deletions pkgs/applications/networking/browsers/firefox/packages.nix
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "74.0.1";
ffversion = "75.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "3aycj3wllsz97x30dxngpbwryqss209cisj91vs1yfgspp8nbl148fk37id6bgl33hga1irc4zxx7glmymibymkfkrmy0xx803w8dy4";
sha512 = "0m3ibm6dy9cpvsxkzkzwj7na5rm5qz7sm3bpx604ibay9pccvgv59jxapisvmswzmlz2nv02l6p2gxlz3b0lbcg7rd5zasia92y7j99";
};

patches = [
@@ -99,10 +99,10 @@ rec {

firefox-esr-68 = common rec {
pname = "firefox-esr";
ffversion = "68.6.1esr";
ffversion = "68.7.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "1xg2hdk50ys9np5a0jdwr2wb543sq8ibmvr05h9apmb4yn1hhz3ml9yq9r4v2di4hnb3s181zvq4np5srka2v6aqz8rk7cq46096fls";
sha512 = "29qbcc78hz1rsnz735a5miwfj0c3r1c5qm2043vyd9qz879vsh4ab82k7wncm3xa04kqdff26zh1rpbbjmdr7gwn4q8nmjzzs7wzpd3";
};

patches = [
Original file line number Diff line number Diff line change
@@ -89,19 +89,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "9.0.7";
version = "9.0.9";

lang = "en-US";

srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
sha256 = "11pgafa2lgj35s6kacy1b7pnzjg3ckqjxg0pf0aywxvc2qr3syv1";
sha256 = "0ws4s0jn559j1ih60wqspxvr5wpqww29kzk0xzzbr56wfyahp4fg";
};

i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
sha256 = "1mjz41n53gxpaxx7jdxk226f085v23kwr31m20vv4ar4vxfa42d8";
sha256 = "0sv73jlv0qwlkxgqkmqg1flsa9lbkxa4yahny5wrfgsbw74xibkl";
};
};
in
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.32.3"; # Please backport all updates to the stable channel.
version = "1.33.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1aqk0hdgdxjznj0nbh2glvyzdq2af8xgiw3qb4k7wpjd0my28r2l";
sha256 = "0s403243cm8x3daj4p7cpp5z0hwmsnk21cq42zcfls2q5d30p6wz";
};

nativeBuildInputs = [
Original file line number Diff line number Diff line change
@@ -18,13 +18,13 @@ let
pname = "wire-desktop";

version = {
x86_64-linux = "3.11.2912";
x86_64-darwin = "3.10.3215";
x86_64-darwin = "3.16.3630";
x86_64-linux = "3.16.2923";
}.${system} or throwSystem;

sha256 = {
x86_64-linux = "1d2wa13d750dd2vslnvzf0ibwjmf5s299pxq0rs2x98y2sabw3sl";
x86_64-darwin = "0ygm3fgy9k1dp2kjfwsrrwq1i88wgxc6k8y80yz61ivdawgph9wa";
x86_64-darwin = "1lnjn45bhd36n9xgx6xx9cggwivvkr2s6r4zai2dwg0aac1bywr5";
x86_64-linux = "0c8jmlsg2gnxsvly04xj1al80nj52rg4czfdha58sg14x14lyspz";
}.${system} or throwSystem;

meta = with stdenv.lib; {
@@ -110,7 +110,7 @@ let

src = fetchurl {
url = "https://github.com/wireapp/wire-desktop/releases/download/"
+ "macos%2F${version}/Wire.pkg";
+ "macos%2F${version}/Wire.pkg";
inherit sha256;
};

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -25,13 +25,13 @@ let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec {
pname = "thunderbird";
version = "68.6.0";
version = "68.7.0";

src = fetchurl {
url =
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 =
"0z2r93inj4k0sg4ghq8nz209ayklvh9dxgbsimg6dgil5ibcmyapks30gva7r9jxi07mzmb6i2mj4wazgkyi6i124svzvllnm1cq0im";
"0glskn3djf739v2dphs663a2lfg5b0lbk1vlwwbzwfj9wfshvk7l07ijp84143bamvgb0lhhh0c9zx4gy5jj3x1j4196m3s1c1n7rzs";
};

# from firefox, but without sound libraries
183 changes: 183 additions & 0 deletions pkgs/development/libraries/libvpx/1_8.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
{ stdenv, fetchFromGitHub, perl, yasm
, vp8DecoderSupport ? true # VP8 decoder
, vp8EncoderSupport ? true # VP8 encoder
, vp9DecoderSupport ? true # VP9 decoder
, vp9EncoderSupport ? true # VP9 encoder
, extraWarningsSupport ? false # emit non-fatal warnings
, werrorSupport ? false # treat warnings as errors (not available with all compilers)
, debugSupport ? false # debug mode
, gprofSupport ? false # gprof profiling instrumentation
, gcovSupport ? false # gcov coverage instrumentation
, sizeLimitSupport ? true # limit max size to allow in the decoder
, optimizationsSupport ? true # compiler optimization flags
, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime
, thumbSupport ? false # build arm assembly in thumb mode
, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples)
, debugLibsSupport ? false # include debug version of each library
, postprocSupport ? true # postprocessing
, multithreadSupport ? true # multithreaded decoding & encoding
, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders)
, spatialResamplingSupport ? true # spatial sampling (scaling)
, realtimeOnlySupport ? false # build for real-time encoding
, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding
, errorConcealmentSupport ? false # decoder conceals losses
, smallSupport ? false # favor smaller binary over speed
, postprocVisualizerSupport ? false # macro block/block level visualizers
, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests
, webmIOSupport ? true # input from and output to webm container
, libyuvSupport ? true # libyuv
, decodePerfTestsSupport ? false # build decoder perf tests with unit tests
, encodePerfTestsSupport ? false # build encoder perf tests with unit tests
, multiResEncodingSupport ? false # multiple-resolution encoding
, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range
, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9
# Experimental features
, experimentalSpatialSvcSupport ? false # Spatial scalable video coding
, experimentalFpMbStatsSupport ? false
, experimentalEmulateHardwareSupport ? false
}:

let
inherit (stdenv) is64bit isMips isDarwin isCygwin;
inherit (stdenv.lib) enableFeature optional optionals;
in

assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport;
/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors.
Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl,
but is only executed if spatialResamplingSupport is enabled */
assert spatialResamplingSupport;
assert postprocVisualizerSupport -> postprocSupport;
assert unitTestsSupport -> curl != null && coreutils != null;
assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport);
assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;

stdenv.mkDerivation rec {
pname = "libvpx";
version = "1.8.2";

src = fetchFromGitHub {
owner = "webmproject";
repo = "libvpx";
rev = "v${version}";
sha256 = "0gyq4fkbd2fv7m1mm9xrvn6rk6f4jsmbv8bnlhingmnrvyncnmnr";
};

patches = [
# ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
];

postPatch = ''patchShebangs .'';

outputs = [ "bin" "dev" "out" ];
setOutputFlags = false;

configurePlatforms = [];
configureFlags = [
(enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
(enableFeature vp8EncoderSupport "vp8-encoder")
(enableFeature vp8DecoderSupport "vp8-decoder")
(enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9")
(enableFeature vp9EncoderSupport "vp9-encoder")
(enableFeature vp9DecoderSupport "vp9-decoder")
(enableFeature extraWarningsSupport "extra-warnings")
(enableFeature werrorSupport "werror")
"--disable-install-docs"
(enableFeature examplesSupport "install-bins")
"--enable-install-libs"
"--disable-install-srcs"
(enableFeature debugSupport "debug")
(enableFeature gprofSupport "gprof")
(enableFeature gcovSupport "gcov")
# Required to build shared libraries
(enableFeature (!isCygwin) "pic")
(enableFeature optimizationsSupport "optimizations")
(enableFeature runtimeCpuDetectSupport "runtime-cpu-detect")
(enableFeature thumbSupport "thumb")
"--enable-libs"
(enableFeature examplesSupport "examples")
"--disable-docs"
"--as=yasm"
# Limit default decoder max to WHXGA
(if sizeLimitSupport then "--size-limit=5120x3200" else null)
"--disable-codec-srcs"
(enableFeature debugLibsSupport "debug-libs")
(enableFeature isMips "dequant-tokens")
(enableFeature isMips "dc-recon")
(enableFeature postprocSupport "postproc")
(enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc")
(enableFeature multithreadSupport "multithread")
(enableFeature internalStatsSupport "internal-stats")
(enableFeature spatialResamplingSupport "spatial-resampling")
(enableFeature realtimeOnlySupport "realtime-only")
(enableFeature ontheflyBitpackingSupport "onthefly-bitpacking")
(enableFeature errorConcealmentSupport "error-concealment")
# Shared libraries are only supported on ELF platforms
(if isDarwin || isCygwin then
"--enable-static --disable-shared"
else
"--enable-shared")
(enableFeature smallSupport "small")
(enableFeature postprocVisualizerSupport "postproc-visualizer")
(enableFeature unitTestsSupport "unit-tests")
(enableFeature webmIOSupport "webm-io")
(enableFeature libyuvSupport "libyuv")
(enableFeature decodePerfTestsSupport "decode-perf-tests")
(enableFeature encodePerfTestsSupport "encode-perf-tests")
(enableFeature multiResEncodingSupport "multi-res-encoding")
(enableFeature temporalDenoisingSupport "temporal-denoising")
(enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising")
(enableFeature coefficientRangeCheckingSupport "coefficient-range-checking")
(enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth")
(enableFeature (experimentalSpatialSvcSupport ||
experimentalFpMbStatsSupport ||
experimentalEmulateHardwareSupport) "experimental")
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
#"--extra-cflags="
#"--extra-cxxflags="
#"--prefix="
#"--libc="
#"--libdir="
"--enable-external-build"
# libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
# See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure
# Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14
"--force-target=${stdenv.hostPlatform.config}${
if stdenv.hostPlatform.isDarwin then
if stdenv.hostPlatform.osxMinVersion == "10.10" then "14"
else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13"
else if stdenv.hostPlatform.osxMinVersion == "10.8" then "12"
else if stdenv.hostPlatform.osxMinVersion == "10.7" then "11"
else if stdenv.hostPlatform.osxMinVersion == "10.6" then "10"
else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9"
else "8"
else ""}-gcc"
(if stdenv.hostPlatform.isCygwin then "--enable-static-msvcrt" else "")
] # Experimental features
++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";

nativeBuildInputs = [ perl yasm ];

buildInputs = [ ]
++ optionals unitTestsSupport [ coreutils curl ];

NIX_LDFLAGS = [
"-lpthread" # fixes linker errors
];

enableParallelBuilding = true;

postInstall = ''moveToOutput bin "$bin" '';

meta = with stdenv.lib; {
description = "WebM VP8/VP9 codec SDK";
homepage = https://www.webmproject.org/;
license = licenses.bsd3;
maintainers = with maintainers; [ codyopel ];
platforms = platforms.all;
};
}
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.4.30";
version = "5.4.31";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1vwx6j87pkfyq68chng1hy0c85hpc2byabiv1pcikrmw07vpip8i";
sha256 = "1svf4wf4j1vqhdpgx63ry4c99fc54d9nfi4d1xm7z209z3w86451";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/servers/http/apache-httpd/2.4.nix
Original file line number Diff line number Diff line change
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null;

stdenv.mkDerivation rec {
version = "2.4.41";
version = "2.4.43";
pname = "apache-httpd";

src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha256 = "0h7a31yxwyh7h521frnmlppl0h7sh9icc3ka6vlmlcg5iwllhg8k";
sha256 = "0hqgw47r3p3521ygkkqs8s30s5crm683081avj6330gwncm6b5x4";
};

# FIXME: -dev depends on -doc
3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -12512,6 +12512,7 @@ in
libviper = callPackage ../development/libraries/libviper { };

libvpx = callPackage ../development/libraries/libvpx { };
libvpx_1_8 = callPackage ../development/libraries/libvpx/1_8.nix { };

libvterm = callPackage ../development/libraries/libvterm { };
libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { };
@@ -15957,7 +15958,7 @@ in
virtualbox = pkgs.virtualboxHardened;
};

wireguard = callPackage ../os-specific/linux/wireguard { };
wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null;

x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };