git.iko.soy/typeable/nixpkgs
on master help sign in
Merge remote-tracking branch 'upstream/staging' into wrap-gdb
commit95692734b05d0caa42c91b1446e18e8c82ce0a58 authorTmplt <tmplt@dragons.rocks> dateSun 17 Nov 2019, 23:33 (7 years ago) parent800f2809daa5b7
238 files changed+2398−1978
nixos/doc/manual/release-notes/rl-2003.xml+7 nixos/modules/system/boot/systemd.nix+2 nixos/tests/all-tests.nix+1 nixos/tests/systemd-nspawn.nix+58 pkgs/applications/audio/i-score/default.nix+1−1 pkgs/applications/audio/mpg123/default.nix+2−2 pkgs/applications/audio/mpg321/default.nix+9−1 pkgs/applications/editors/vim/common.nix+2−2 pkgs/applications/graphics/renderdoc/default.nix+21−15 pkgs/applications/networking/protocol/default.nix+4−4 pkgs/applications/office/zotero/default.nix+2−2 pkgs/applications/science/math/mathematica/default.nix+4−1 pkgs/applications/version-management/git-and-tools/git/default.nix+3−3 pkgs/applications/video/kodi/default.nix+2−2 pkgs/build-support/bintools-wrapper/default.nix+1−12 pkgs/build-support/bintools-wrapper/setup-hook.sh−3 pkgs/build-support/build-dotnet-package/default.nix+4−4 pkgs/build-support/cc-wrapper/default.nix−4 pkgs/build-support/cc-wrapper/setup-hook.sh−3 pkgs/build-support/emacs/setup-hook.sh+3−3 pkgs/build-support/ocaml/default.nix+1−1 pkgs/build-support/setup-hooks/audit-tmpdir.sh+1−1 pkgs/build-support/setup-hooks/auto-patchelf.sh+1−1 pkgs/build-support/setup-hooks/compress-man-pages.sh+1−1 pkgs/build-support/setup-hooks/find-xml-catalogs.sh+2−2 pkgs/build-support/setup-hooks/move-lib64.sh+1−1 pkgs/build-support/setup-hooks/move-sbin.sh+1−1 pkgs/build-support/setup-hooks/multiple-outputs.sh+3−3 pkgs/build-support/setup-hooks/patch-shebangs.sh+1−1 pkgs/build-support/setup-hooks/prune-libtool-files.sh+1−1 pkgs/build-support/setup-hooks/strip.sh+2−2 pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh+1−1 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh+1−1 pkgs/desktops/gnome-2/default.nix+1−3 pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix+13−1 pkgs/desktops/gnome-3/core/mutter/3.28.nix+2 pkgs/desktops/gnome-3/core/mutter/default.nix+5 pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch+63 pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix+1−1 pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix+1−1 pkgs/development/compilers/graalvm/default.nix+1−1 pkgs/development/compilers/graalvm/enterprise-edition.nix+1−1 pkgs/development/compilers/llvm/7/libc++/default.nix+4−2 pkgs/development/compilers/llvm/7/libc++abi.nix+9−5 pkgs/development/compilers/openjdk/11.nix+1−1 pkgs/development/compilers/openjdk/8.nix+1−1 pkgs/development/compilers/openjdk/darwin/11.nix+1−1 pkgs/development/compilers/openjdk/darwin/8.nix+1−1 pkgs/development/compilers/openjdk/darwin/default.nix+1−1 pkgs/development/compilers/openjdk/default.nix+1−1 pkgs/development/compilers/oraclejdk/jdk-linux-base.nix+1−1 pkgs/development/compilers/reason/default.nix+2−2 pkgs/development/compilers/rust/rustc.nix+5−5 pkgs/development/compilers/rust/setup-hook.sh+1−1 pkgs/development/compilers/zulu/8.nix+1−1 pkgs/development/compilers/zulu/default.nix+1−1 pkgs/development/interpreters/lua-5/setup-hook.sh+1−1 pkgs/development/interpreters/octave/default.nix+2−2 pkgs/development/interpreters/perl/default.nix+17−9 pkgs/development/interpreters/python/hooks/flit-build-hook.sh+1−1 pkgs/development/interpreters/python/hooks/pip-build-hook.sh+1−1 pkgs/development/interpreters/python/hooks/pip-install-hook.sh+1−1 pkgs/development/interpreters/python/hooks/pytest-check-hook.sh+1−1 pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh+1−1 pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh+1−1 pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh+1−1 pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh+2−2 pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh+1−1 pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh+1−1 pkgs/development/libraries/SDL/setup-hook.sh+4−2 pkgs/development/libraries/SDL2/default.nix+14−2 pkgs/development/libraries/SDL2/setup-hook.sh+1−1 pkgs/development/libraries/clutter/default.nix+2−2 pkgs/development/libraries/cogl/default.nix+9−3 pkgs/development/libraries/coin3d/default.nix+2−2 pkgs/development/libraries/ffmpeg/generic.nix+8 pkgs/development/libraries/fltk/default.nix+2−2 pkgs/development/libraries/fribidi/default.nix+8 pkgs/development/libraries/ftgl/default.nix+2−2 pkgs/development/libraries/gcr/default.nix+53−18 pkgs/development/libraries/gdk-pixbuf/setup-hook.sh+3−3 pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch−323 pkgs/development/libraries/gettext/default.nix+4−20 pkgs/development/libraries/gettext/gettext-setup-hook.sh+1−1 pkgs/development/libraries/gettext/gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch+82 pkgs/development/libraries/gle/default.nix+2−2 pkgs/development/libraries/glib/setup-hook.sh+5−3 pkgs/development/libraries/gnu-efi/default.nix+9−1 pkgs/development/libraries/gstreamer/bad/default.nix+169−81 pkgs/development/libraries/gstreamer/base/default.nix+111−58 pkgs/development/libraries/gstreamer/core/default.nix+66−41 pkgs/development/libraries/gstreamer/core/setup-hook.sh+1−1 pkgs/development/libraries/gstreamer/ges/default.nix+46−19 pkgs/development/libraries/gstreamer/good/default.nix+105−48 pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix+3−3 pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh+1−1 pkgs/development/libraries/gstreamer/libav/default.nix+29−26 pkgs/development/libraries/gstreamer/rtsp-server/default.nix+32−20 pkgs/development/libraries/gstreamer/ugly/default.nix+54−31 pkgs/development/libraries/gstreamer/vaapi/default.nix+51−30 pkgs/development/libraries/gstreamer/validate/default.nix+25−21 pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh+1−1 pkgs/development/libraries/icu/base.nix+9−3 pkgs/development/libraries/leptonica/default.nix+3−1 pkgs/development/libraries/libglvnd/default.nix+16 pkgs/development/libraries/libiconv/setup-hook.sh+1−1 pkgs/development/libraries/libmad/001-mips_removal_h_constraint.patch−73 pkgs/development/libraries/libmad/default.nix+43−13 pkgs/development/libraries/libmad/optimize.diff−77 pkgs/development/libraries/libmad/pkgconfig.patch−117 pkgs/development/libraries/libnice/default.nix+41−12 pkgs/development/libraries/libpsl/default.nix+35−7 pkgs/development/libraries/libtiff/CVE-2019-14973.patch−384 pkgs/development/libraries/libtiff/default.nix+2−12 pkgs/development/libraries/libtxc_dxtn/default.nix+2−2 pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix+2−2 pkgs/development/libraries/libxml2/default.nix+8−2 pkgs/development/libraries/libxslt/default.nix+2−20 pkgs/development/libraries/mesa/default.nix+2−2 pkgs/development/libraries/mesa/stubs.nix+2−2 pkgs/development/libraries/ncurses/default.nix+1 pkgs/development/libraries/openscenegraph/default.nix+2−2 pkgs/development/libraries/p11-kit/default.nix+2−2 pkgs/development/libraries/phonon/default.nix+2−2 pkgs/development/libraries/qt-5/5.12/default.nix+1 pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch+16 pkgs/development/libraries/qt-5/hooks/qmake-hook.sh+2−2 pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh+2−2 pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh+2−2 pkgs/development/libraries/qt-5/modules/qtbase.nix+1−1 pkgs/development/libraries/vtk/default.nix+3−3 pkgs/development/libraries/webkitgtk/default.nix+4−2 pkgs/development/libraries/webkitgtk/libglvnd-headers.patch+586 pkgs/development/lisp-modules/clwrapper/setup-hook.sh+1−1 pkgs/development/lua-modules/overrides.nix+1−1 pkgs/development/node-packages/node-env.nix+1−1 pkgs/development/ocaml-modules/bap/default.nix+3−3 pkgs/development/ocaml-modules/ocsigen-server/default.nix+1−1 pkgs/development/python-modules/cfn-lint/default.nix+2 pkgs/development/python-modules/mpi4py/default.nix+2−2 pkgs/development/python-modules/mwoauth/default.nix+2−2 pkgs/development/python-modules/myfitnesspal/default.nix+2−2 pkgs/development/python-modules/mysqlclient/default.nix+2−2 pkgs/development/python-modules/nbconvert/default.nix+2−2 pkgs/development/python-modules/nbdime/default.nix+2−2 pkgs/development/python-modules/notebook/default.nix+2−2 pkgs/development/python-modules/numcodecs/default.nix+2−2 pkgs/development/python-modules/numpy/default.nix+2−2 pkgs/development/python-modules/pandas/2.nix+2−2 pkgs/development/python-modules/pandas/default.nix+2−2 pkgs/development/python-modules/persistent/default.nix+2−2 pkgs/development/python-modules/phonenumbers/default.nix+2−2 pkgs/development/python-modules/pipdate/default.nix+2−2 pkgs/development/python-modules/plac/default.nix+2−2 pkgs/development/python-modules/psutil/default.nix+2−2 pkgs/development/python-modules/pyatmo/default.nix+2−2 pkgs/development/python-modules/pybase64/default.nix+2−2 pkgs/development/python-modules/pybids/default.nix+2−2 pkgs/development/python-modules/pybullet/default.nix+2−2 pkgs/development/python-modules/pycairo/default.nix+2−2 pkgs/development/python-modules/pycryptodome/default.nix+2−2 pkgs/development/python-modules/pycryptodomex/default.nix+2−2 pkgs/development/python-modules/pymupdf/default.nix+2−2 pkgs/development/python-modules/pyopencl/default.nix+2−2 pkgs/development/python-modules/pyparsing/default.nix+2−2 pkgs/development/python-modules/pyrsistent/default.nix+2−2 pkgs/development/python-modules/pyside/default.nix+2−2 pkgs/development/python-modules/pytest-mypy/default.nix+2−2 pkgs/development/python-modules/pytest/default.nix+2−2 pkgs/development/python-modules/python-daemon/default.nix+2−2 pkgs/development/python-modules/pythonnet/default.nix+2−2 pkgs/development/python-modules/reportlab/default.nix+2−2 pkgs/development/python-modules/rethinkdb/default.nix+2−2 pkgs/development/python-modules/runway-python/default.nix+2−2 pkgs/development/python-modules/scipy/default.nix+2−2 pkgs/development/python-modules/sentry-sdk/default.nix+2−2 pkgs/development/python-modules/soupsieve/default.nix+2−2 pkgs/development/python-modules/sqlmap/default.nix+2−2 pkgs/development/python-modules/starlette/default.nix+2−2 pkgs/development/python-modules/strictyaml/default.nix+2−2 pkgs/development/python-modules/tables/3.5.nix+2−2 pkgs/development/python-modules/tenacity/default.nix+2−2 pkgs/development/python-modules/testfixtures/default.nix+2−2 pkgs/development/python-modules/testpath/default.nix+2−2 pkgs/development/python-modules/tld/default.nix+2−2 pkgs/development/python-modules/trustme/default.nix+2−2 pkgs/development/python-modules/typing-extensions/default.nix+2−2 pkgs/development/python-modules/unittest-xml-reporting/default.nix+2−2 pkgs/development/python-modules/uproot/default.nix+2−2 pkgs/development/python-modules/vcrpy/default.nix+2−2 pkgs/development/python-modules/whisper/default.nix+2−2 pkgs/development/python-modules/wxPython/4.0.nix+2−2 pkgs/development/python-modules/zstd/default.nix+2−2 pkgs/development/ruby-modules/gem/default.nix+1−1 pkgs/development/tools/build-managers/apache-ant/1.9.nix+2−2 pkgs/development/tools/build-managers/apache-ant/default.nix+2−2 pkgs/development/tools/build-managers/cmake/setup-hook.sh+12−12 pkgs/development/tools/build-managers/gn/setup-hook.sh+1−1 pkgs/development/tools/build-managers/meson/default.nix+25−1 pkgs/development/tools/build-managers/meson/setup-hook.sh+2−2 pkgs/development/tools/build-managers/ninja/setup-hook.sh+3−3 pkgs/development/tools/build-managers/scons/setup-hook.sh+3−3 pkgs/development/tools/misc/patchelf/setup-hook.sh+1−1 pkgs/development/tools/misc/premake/setup-hook.sh+1−1 pkgs/development/tools/ocaml/camlidl/default.nix+1−1 pkgs/development/tools/ocaml/findlib/default.nix+3−3 pkgs/development/tools/ocaml/opam/opam-shebangs.patch+1−1 pkgs/development/tools/ocaml/utop/default.nix+1 pkgs/development/tools/xcbuild/setup-hook.sh+1−1 pkgs/misc/emulators/retroarch/cores.nix+16−16 pkgs/misc/ghostscript/default.nix+5 pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh+1−1 pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh+1−1 pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh+1−1 pkgs/os-specific/linux/kernel/manual-config.nix+1−1 pkgs/os-specific/linux/systemd/default.nix+28−5 pkgs/servers/sql/mariadb/connector-c/3_1.nix+2−2 pkgs/servers/sql/mariadb/connector-c/default.nix+1−8 pkgs/servers/x11/xorg/default.nix+1−1 pkgs/servers/x11/xorg/imake-setup-hook.sh+1−1 pkgs/servers/x11/xorg/overrides.nix+11−1 pkgs/stdenv/cygwin/rebase-i686.sh+1−1 pkgs/stdenv/cygwin/rebase-x86_64.sh+1−1 pkgs/stdenv/generic/setup.sh+32−59 pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patch−29 pkgs/tools/archivers/cpio/default.nix+3−17 pkgs/tools/archivers/unzip/default.nix+15 pkgs/tools/graphics/maim/default.nix+2−2 pkgs/tools/misc/desktop-file-utils/setup-hook.sh+1−1 pkgs/tools/networking/curl/default.nix+2−2 pkgs/tools/networking/network-manager/default.nix+8−1 pkgs/tools/security/gnupg/22.nix+15−8 pkgs/tools/security/sudo/default.nix+3−3 pkgs/tools/text/sgml/opensp/setup-hook.sh+1−1 pkgs/tools/typesetting/asciidoctorj/default.nix+36 pkgs/top-level/all-packages.nix+9−13 pkgs/top-level/lua-packages.nix+2−2 pkgs/top-level/perl-packages.nix+32
nixos/doc/manual/release-notes/rl-2003.xml+7
@@ -131,6 +131,13 @@
131131 <link linkend="opt-networking.interfaces">networking.interfaces.&lt;name&gt;.…</link> options.
132132 </para>
133133 </listitem>
134+ <listitem>
135+ <para>
136+ The stdenv now runs all bash with <literal>set -u</literal>, to catch the use of undefined variables.
137+ Before, it itself used <literal>set -u</literal> but was careful to unset it so other packages' code ran as before.
138+ Now, all bash code is held to the same high standard, and the rather complex stateful manipulation of the options can be discarded.
139+ </para>
140+ </listitem>
134141 </itemizedlist>
135142 </section>
136143
nixos/modules/system/boot/systemd.nix+2
@@ -63,6 +63,7 @@ let
6363 "systemd-logind.service"
6464 "autovt@.service"
6565 "systemd-user-sessions.service"
66+ "dbus-org.freedesktop.import1.service"
6667 "dbus-org.freedesktop.machine1.service"
6768 "user@.service"
6869 "user-runtime-dir@.service"
@@ -145,6 +146,7 @@ let
145146 "user.slice"
146147 "machine.slice"
147148 "machines.target"
149+ "systemd-importd.service"
148150 "systemd-machined.service"
149151 "systemd-nspawn@.service"
150152
nixos/tests/all-tests.nix+1
@@ -263,6 +263,7 @@ in
263263 systemd-confinement = handleTest ./systemd-confinement.nix {};
264264 systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
265265 systemd-networkd-wireguard = handleTest ./systemd-networkd-wireguard.nix {};
266+ systemd-nspawn = handleTest ./systemd-nspawn.nix {};
266267 pdns-recursor = handleTest ./pdns-recursor.nix {};
267268 taskserver = handleTest ./taskserver.nix {};
268269 telegraf = handleTest ./telegraf.nix {};
nixos/tests/systemd-nspawn.nixnew file+58
@@ -0,0 +1,58 @@
1+import ./make-test.nix ({pkgs, lib, ...}:
2+let
3+ gpgKeyring = (pkgs.runCommand "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } ''
4+ mkdir -p $out
5+ export GNUPGHOME=$out
6+ cat > foo <<EOF
7+ %echo Generating a basic OpenPGP key
8+ %no-protection
9+ Key-Type: DSA
10+ Key-Length: 1024
11+ Subkey-Type: ELG-E
12+ Subkey-Length: 1024
13+ Name-Real: Joe Tester
14+ Name-Email: joe@foo.bar
15+ Expire-Date: 0
16+ # Do a commit here, so that we can later print "done"
17+ %commit
18+ %echo done
19+ EOF
20+ gpg --batch --generate-key foo
21+ rm $out/S.gpg-agent $out/S.gpg-agent.*
22+ gpg --export joe@foo.bar -a > $out/pubkey.gpg
23+ '');
24+
25+ nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } ''
26+ mkdir -p $out
27+ cd $out
28+ dd if=/dev/urandom of=$out/testimage.raw bs=$((1024*1024+7)) count=5
29+ sha256sum testimage.raw > SHA256SUMS
30+ export GNUPGHOME="$(mktemp -d)"
31+ cp -R ${gpgKeyring}/* $GNUPGHOME
32+ gpg --batch --sign --detach-sign --output SHA256SUMS.gpg SHA256SUMS
33+ '');
34+in {
35+ name = "opensmtpd";
36+
37+ nodes = {
38+ server = { pkgs, ... }: {
39+ networking.firewall.allowedTCPPorts = [ 80 ];
40+ services.nginx = {
41+ enable = true;
42+ virtualHosts."server".root = nspawnImages;
43+ };
44+ };
45+ client = { pkgs, ... }: {
46+ environment.etc."systemd/import-pubring.gpg".source = "${gpgKeyring}/pubkey.gpg";
47+ };
48+ };
49+
50+ testScript = ''
51+ startAll;
52+
53+ $server->waitForUnit("nginx.service");
54+ $client->waitForUnit("network-online.target");
55+ $client->succeed("machinectl pull-raw --verify=signature http://server/testimage.raw");
56+ $client->succeed("cmp /var/lib/machines/testimage.raw ${nspawnImages}/testimage.raw");
57+ '';
58+})
pkgs/applications/audio/i-score/default.nix+1−1
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
7070 ];
7171
7272 preConfigure = ''
73− export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")"
73+ export CMAKE_PREFIX_PATH="''${CMAKE_PREFIX_PATH-}:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")"
7474 '';
7575
7676 postInstall = ''rm $out/bin/i-score.sh'';
pkgs/applications/audio/mpg123/default.nix+2−2
@@ -3,11 +3,11 @@
33}:
44
55stdenv.mkDerivation rec {
6− name = "mpg123-1.25.12";
6+ name = "mpg123-1.25.13";
77
88 src = fetchurl {
99 url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
10− sha256 = "1l9iwwgqzw6yg5zk9pqmlbfyq6d8dqysbmj0j3m8dyrxd34wgzhz";
10+ sha256 = "02l915jq0ymndb082g6w89bpf66z04ifa1lr7ga3yycw6m46hc4h";
1111 };
1212
1313 buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
pkgs/applications/audio/mpg321/default.nix+9−1
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib
1+{stdenv, fetchurl, fetchpatch, libao, libmad, libid3tag, zlib, alsaLib
22# Specify default libao output plugin to use (e.g. "alsa", "pulse" …).
33# If null, it will use the libao system default.
44, defaultAudio ? null
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
1313 sha256 = "0ki8mh76bbmdh77qsiw682dvi8y468yhbdabqwg05igmwc1wqvq5";
1414 };
1515
16+ patches = [
17+ (fetchpatch {
18+ name = "CVE-2018-7263.patch";
19+ url = "https://sources.debian.org/data/main/m/mpg321/0.3.2-3/debian/patches/handle_illegal_bitrate_value.patch";
20+ sha256 = "15simp5fjvm9b024ryfh441rkh2d5bcrizqkzlrh07n9sm7fkw6x";
21+ })
22+ ];
23+
1624 hardeningDisable = [ "format" ];
1725
1826 configureFlags =
pkgs/applications/editors/vim/common.nix+2−2
@@ -1,12 +1,12 @@
11{ lib, fetchFromGitHub }:
22rec {
3− version = "8.1.2188";
3+ version = "8.1.2237";
44
55 src = fetchFromGitHub {
66 owner = "vim";
77 repo = "vim";
88 rev = "v${version}";
9− sha256 = "0ixq96l991b84sj66v63ds61yr75gx5zz411213yn6bz3s2fvlcv";
9+ sha256 = "1qwh3cw5zmjmnk07g0nc8nz8k5nlq9ilvvygnfdjy1fqg69q8p0h";
1010 };
1111
1212 enableParallelBuilding = true;
pkgs/applications/graphics/renderdoc/default.nix+21−15
@@ -1,32 +1,34 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig
1+{ stdenv, fetchFromGitHub, cmake, pkgconfig, mkDerivation
22, qtbase, qtx11extras, qtsvg, makeWrapper
3−, vulkan-loader, xorg
4−, python3, bison, pcre, automake, autoconf
3+, vulkan-loader, xorg, python3, python3Packages
4+, bison, pcre, automake, autoconf, addOpenGLRunpath
55}:
66let
77 custom_swig = fetchFromGitHub {
88 owner = "baldurk";
99 repo = "swig";
10− rev = "renderdoc-modified-6";
11− sha256 = "00ykqlzx1k9iwqjlc54kfch7cnzsj53hxn7ql70dj3rxqzrnadc0";
10+ rev = "renderdoc-modified-7";
11+ sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6";
1212 };
13+ pythonPackages = python3Packages;
1314in
14−stdenv.mkDerivation rec {
15− version = "1.4";
15+mkDerivation rec {
16+ version = "1.5";
1617 pname = "renderdoc";
1718
1819 src = fetchFromGitHub {
1920 owner = "baldurk";
2021 repo = "renderdoc";
2122 rev = "v${version}";
22− sha256 = "1iann73r4yzkwnm13h4zqipqrp5i5cnkv27yyap0axz6h3npw94r";
23+ sha256 = "0a05f6qfq90wrf4fixchp9knx4nhqhwjxl02n03a7k56xzxxnlci";
2324 };
2425
2526 buildInputs = [
2627 qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
27− ];
28+ ]; # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]);
29+ # TODO: figure out how to make cmake recognise pyside2
2830
29− nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf ];
31+ nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf addOpenGLRunpath ];
3032
3133 postUnpack = ''
3234 cp -r ${custom_swig} swig
@@ -40,19 +42,23 @@ stdenv.mkDerivation rec {
4042 "-DBUILD_VERSION_DIST_VER=${version}"
4143 "-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc"
4244 "-DBUILD_VERSION_STABLE=ON"
43− # TODO: add once pyside2 is in nixpkgs
44− #"-DPYSIDE2_PACKAGE_DIR=${python36Packages.pyside2}"
4545 ];
4646
47− # Future work: define these in the above array via placeholders
47+ # TODO: define these in the above array via placeholders, once those are widely supported
4848 preConfigure = ''
4949 cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/"
5050 cmakeFlags+=" -DRENDERDOC_SWIG_PACKAGE=$PWD/../swig"
5151 '';
5252
53+ dontWrapQtApps = true;
5354 preFixup = ''
54− wrapProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
55− wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
55+ wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib"
56+ wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib"
57+ '';
58+
59+ # The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh
60+ postFixup = ''
61+ addOpenGLRunpath $out/lib/librenderdoc.so
5662 '';
5763
5864 enableParallelBuilding = true;
pkgs/applications/networking/protocol/default.nix+4−4
@@ -1,14 +1,14 @@
11{ stdenv, buildPythonApplication, fetchFromGitHub }:
22
33buildPythonApplication {
4− pname = "protocol";
5− version = "20171226";
4+ pname = "protocol-unstable";
5+ version = "2019-03-28";
66
77 src = fetchFromGitHub {
88 owner = "luismartingarcia";
99 repo = "protocol";
10− rev = "d450da7d8a58595d8ef82f1d199a80411029fc7d";
11− sha256 = "1g31s2xx0bw8ak5ag1c6mv0p0b8bj5dp3lkk9mxaf2ndj1m1qdkw";
10+ rev = "4e8326ea6c2d288be5464c3a7d9398df468c0ada";
11+ sha256 = "13l10jhf4vghanmhh3pn91b2jdciispxy0qadz4n08blp85qn9cm";
1212 };
1313
1414 meta = with stdenv.lib; {
pkgs/applications/office/zotero/default.nix+2−2
@@ -34,11 +34,11 @@
3434
3535stdenv.mkDerivation rec {
3636 pname = "zotero";
37− version = "5.0.73";
37+ version = "5.0.77";
3838
3939 src = fetchurl {
4040 url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
41− sha256 = "0m2i3l0gy22h6c7rk39cd17vyksyz5l5py2fn9pza8lcbypkwf3l";
41+ sha256 = "1dgxzprpb8f5wpmvlvkxix0xxckfgjsi3wfcy9mb221a17cv0029";
4242 };
4343
4444 buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
pkgs/applications/science/math/mathematica/default.nix+4−1
@@ -93,13 +93,16 @@ stdenv.mkDerivation rec {
9393 # Fix library paths
9494 cd $out/libexec/Mathematica/Executables
9595 for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do
96− sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path
96+ sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}\n" $path
9797 done
9898
9999 # Fix xkeyboard config path for Qt
100100 for path in mathematica Mathematica; do
101101 sed -i -e "2iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"\n" $path
102102 done
103+
104+ # Remove some broken libraries
105+ rm $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so*
103106 '';
104107
105108 preFixup = ''
pkgs/applications/version-management/git-and-tools/git/default.nix+3−3
@@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport;
2121assert svnSupport -> perlSupport;
2222
2323let
24− version = "2.23.0";
24+ version = "2.24.0";
2525 svn = subversionClient.override { perlBindings = perlSupport; };
2626
2727 gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
3333
3434 src = fetchurl {
3535 url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
36− sha256 = "0rv0y45gcd3h191isppn77acih695v4pipdj031jvs9rd1ds0kr3";
36+ sha256 = "06rpakbwzck85ncfsgv4xmq3iwab9d4f5y6dqhl8nvb2fccxcwcz";
3737 };
3838
3939 outputs = [ "out" ];
@@ -93,7 +93,7 @@ stdenv.mkDerivation {
9393 ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"])
9494 ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"])
9595 ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="]
96− ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc/"])
96+ ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"])
9797 ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"]
9898 ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1";
9999
pkgs/applications/video/kodi/default.nix+2−2
@@ -8,7 +8,7 @@
88, libXt, libXmu, libXext
99, libXinerama, libXrandr
1010, libXtst, libXfixes, systemd
11−, alsaLib, libGLU_combined, glew, fontconfig, freetype, ftgl
11+, alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl
1212, libjpeg, jasper, libpng, libtiff
1313, libmpeg2, libsamplerate, libmad
1414, libogg, libvorbis, flac, libxslt
@@ -156,7 +156,7 @@ in stdenv.mkDerivation {
156156 openssl gperf tinyxml2 taglib libssh swig jre
157157 libX11 xorgproto libXt libXmu libXext
158158 libXinerama libXrandr libXtst libXfixes
159− alsaLib libGLU_combined glew fontconfig freetype ftgl
159+ alsaLib libGL libGLU glew fontconfig freetype ftgl
160160 libjpeg jasper libpng libtiff
161161 libmpeg2 libsamplerate libmad
162162 libogg libvorbis flac libxslt systemd
pkgs/build-support/bintools-wrapper/default.nix+1−12
@@ -111,17 +111,13 @@ stdenv.mkDerivation {
111111
112112 installPhase =
113113 ''
114− set -u
115−
116114 mkdir -p $out/bin $out/nix-support
117115
118116 wrap() {
119117 local dst="$1"
120118 local wrapper="$2"
121119 export prog="$3"
122− set +u
123120 substituteAll "$wrapper" "$out/bin/$dst"
124− set -u
125121 chmod +x "$out/bin/$dst"
126122 }
127123 ''
@@ -163,8 +159,6 @@ stdenv.mkDerivation {
163159 [[ -e "$underlying" ]] || continue
164160 wrap ${targetPrefix}$variant ${./ld-wrapper.sh} $underlying
165161 done
166−
167− set +u
168162 '';
169163
170164 emulation = let
@@ -205,11 +199,7 @@ stdenv.mkDerivation {
205199 ];
206200
207201 postFixup =
208− ''
209− set -u
210− ''
211−
212− + optionalString (libc != null) (''
202+ optionalString (libc != null) (''
213203 ##
214204 ## General libc support
215205 ##
@@ -307,7 +297,6 @@ stdenv.mkDerivation {
307297 ''
308298
309299 + ''
310− set +u
311300 substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
312301 substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
313302 substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
pkgs/build-support/bintools-wrapper/setup-hook.sh−3
@@ -2,8 +2,6 @@
22#
33# See comments in cc-wrapper's setup hook. This works exactly the same way.
44
5−set -u
6−
75# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a
86# native compile.
97#
@@ -73,4 +71,3 @@ export NIX_HARDENING_ENABLE
7371
7472# No local scope in sourced file
7573unset -v role_pre role_post cmd upper_case
76−set +u
pkgs/build-support/build-dotnet-package/default.nix+4−4
@@ -29,9 +29,9 @@ attrsOrig @
2929 configurePhase = ''
3030 runHook preConfigure
3131
32− [ -z "$dontPlacateNuget" ] && placate-nuget.sh
33− [ -z "$dontPlacatePaket" ] && placate-paket.sh
34− [ -z "$dontPatchFSharpTargets" ] && patch-fsharp-targets.sh
32+ [ -z "''${dontPlacateNuget-}" ] && placate-nuget.sh
33+ [ -z "''${dontPlacatePaket-}" ] && placate-paket.sh
34+ [ -z "''${dontPatchFSharpTargets-}" ] && patch-fsharp-targets.sh
3535
3636 runHook postConfigure
3737 '';
@@ -69,7 +69,7 @@ attrsOrig @
6969
7070 cp -rv ${arrayToShell outputFiles} "''${outputFilesArray[@]}" "$target"
7171
72− if [ -z "$dontRemoveDuplicatedDlls" ]
72+ if [ -z "''${dontRemoveDuplicatedDlls-}" ]
7373 then
7474 pushd "$out"
7575 remove-duplicated-dlls.sh
pkgs/build-support/cc-wrapper/default.nix−4
@@ -134,8 +134,6 @@ stdenv.mkDerivation {
134134
135135 installPhase =
136136 ''
137− set -u
138−
139137 mkdir -p $out/bin $out/nix-support
140138
141139 wrap() {
@@ -224,8 +222,6 @@ stdenv.mkDerivation {
224222
225223 postFixup =
226224 ''
227− set -u
228−
229225 # Backwards compatability for packages expecting this file, e.g. with
230226 # `$NIX_CC/nix-support/dynamic-linker`.
231227 #
pkgs/build-support/cc-wrapper/setup-hook.sh−3
@@ -54,8 +54,6 @@
5454# For more details, read the individual files where the mechanisms used to
5555# accomplish this will be individually documented.
5656
57−set -u
58−
5957# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a
6058# native compile.
6159#
@@ -120,4 +118,3 @@ export NIX_HARDENING_ENABLE
120118
121119# No local scope in sourced file
122120unset -v role_pre role_post
123−set +u
pkgs/build-support/emacs/setup-hook.sh+3−3
@@ -1,11 +1,11 @@
11addEmacsVars () {
2− if test -d $1/share/emacs/site-lisp; then
3− export EMACSLOADPATH="$1/share/emacs/site-lisp:$EMACSLOADPATH"
2+ if [[ -d "$1/share/emacs/site-lisp" ]]; then
3+ export EMACSLOADPATH="$1/share/emacs/site-lisp${EMACSLOADPATH:+:}${EMACSLOADPATH-}"
44 fi
55}
66
77# If this is for a wrapper derivation, emacs and the dependencies are all
88# run-time dependencies. If this is for precompiling packages into bytecode,
99# emacs is a compile-time dependency of the package.
10−addEnvHooks "$targetOffset" addEmacsVars
10+addEnvHooks "$hostOffset" addEmacsVars
1111addEnvHooks "$targetOffset" addEmacsVars
pkgs/build-support/ocaml/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation (args // {
2323
2424 setupHook = if setupHook == null && hasSharedObjects
2525 then writeText "setupHook.sh" ''
26− export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
26+ export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
2727 ''
2828 else setupHook;
2929
pkgs/build-support/setup-hooks/audit-tmpdir.sh+1−1
@@ -7,7 +7,7 @@
77# the moment that would produce too many spurious errors (e.g. debug
88# info or assertion messages that refer to $TMPDIR).
99
10−fixupOutputHooks+=('if [ -z "$noAuditTmpdir" -a -e "$prefix" ]; then auditTmpdir "$prefix"; fi')
10+fixupOutputHooks+=('if [[ -z "${noAuditTmpdir-}" && -e "$prefix" ]]; then auditTmpdir "$prefix"; fi')
1111
1212auditTmpdir() {
1313 local dir="$1"
pkgs/build-support/setup-hooks/auto-patchelf.sh+1−1
@@ -228,7 +228,7 @@ autoPatchelf() {
228228# behaviour as fixupOutputHooks because the setup hook for patchelf is run in
229229# fixupOutput and the postFixup hook runs later.
230230postFixupHooks+=('
231− if [ -z "$dontAutoPatchelf" ]; then
231+ if [ -z "${dontAutoPatchelf-}" ]; then
232232 autoPatchelf -- $(for output in $outputs; do
233233 [ -e "${!output}" ] || continue
234234 echo "${!output}"
pkgs/build-support/setup-hooks/compress-man-pages.sh+1−1
@@ -1,4 +1,4 @@
1−fixupOutputHooks+=('if [ -z "$dontGzipMan" ]; then compressManPages "$prefix"; fi')
1+fixupOutputHooks+=('if [ -z "${dontGzipMan-}" ]; then compressManPages "$prefix"; fi')
22
33compressManPages() {
44 local dir="$1"
pkgs/build-support/setup-hooks/find-xml-catalogs.sh+2−2
@@ -11,12 +11,12 @@ addXMLCatalogs () {
1111 done
1212}
1313
14−if [ -z "$libxmlHookDone" ]; then
14+if [ -z "${libxmlHookDone-}" ]; then
1515 libxmlHookDone=1
1616
1717 # Set up XML_CATALOG_FILES. An empty initial value prevents
1818 # xmllint and xsltproc from looking in /etc/xml/catalog.
19− export XML_CATALOG_FILES
19+ export XML_CATALOG_FILES=''
2020 if [ -z "$XML_CATALOG_FILES" ]; then XML_CATALOG_FILES=" "; fi
2121 addEnvHooks "$hostOffset" addXMLCatalogs
2222fi
pkgs/build-support/setup-hooks/move-lib64.sh+1−1
@@ -8,7 +8,7 @@
88fixupOutputHooks+=(_moveLib64)
99
1010_moveLib64() {
11− if [ "$dontMoveLib64" = 1 ]; then return; fi
11+ if [ "${dontMoveLib64-}" = 1 ]; then return; fi
1212 if [ ! -e "$prefix/lib64" -o -L "$prefix/lib64" ]; then return; fi
1313 echo "moving $prefix/lib64/* to $prefix/lib"
1414 mkdir -p $prefix/lib
pkgs/build-support/setup-hooks/move-sbin.sh+1−1
@@ -5,7 +5,7 @@
55fixupOutputHooks+=(_moveSbin)
66
77_moveSbin() {
8− if [ "$dontMoveSbin" = 1 ]; then return; fi
8+ if [ "${dontMoveSbin-}" = 1 ]; then return; fi
99 if [ ! -e "$prefix/sbin" -o -L "$prefix/sbin" ]; then return; fi
1010 echo "moving $prefix/sbin/* to $prefix/bin"
1111 mkdir -p $prefix/bin
pkgs/build-support/setup-hooks/multiple-outputs.sh+3−3
@@ -9,8 +9,8 @@ _assignFirst() {
99 local varName="$1"
1010 local REMOVE=REMOVE # slightly hacky - we allow REMOVE (i.e. not a variable name)
1111 shift
12− while [ $# -ge 1 ]; do
13− if [ -n "${!1}" ]; then eval "${varName}"="$1"; return; fi
12+ while (( $# )); do
13+ if [ -n "${!1-}" ]; then eval "${varName}"="$1"; return; fi
1414 shift
1515 done
1616 echo "Error: _assignFirst found no valid variant!"
@@ -19,7 +19,7 @@ _assignFirst() {
1919
2020# Same as _assignFirst, but only if "$1" = ""
2121_overrideFirst() {
22− if [ -z "${!1}" ]; then
22+ if [ -z "${!1-}" ]; then
2323 _assignFirst "$@"
2424 fi
2525}
pkgs/build-support/setup-hooks/patch-shebangs.sh+1−1
@@ -105,7 +105,7 @@ patchShebangs() {
105105}
106106
107107patchShebangsAuto () {
108− if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then
108+ if [ -z "${dontPatchShebangs-}" -a -e "$prefix" ]; then
109109
110110 # Dev output will end up being run on the build platform. An
111111 # example case of this is sdl2-config. Otherwise, we can just
pkgs/build-support/setup-hooks/prune-libtool-files.sh+1−1
@@ -8,7 +8,7 @@
88fixupOutputHooks+=(_pruneLibtoolFiles)
99
1010_pruneLibtoolFiles() {
11− if [ "$dontPruneLibtoolFiles" ] || [ ! -e "$prefix" ]; then
11+ if [ "${dontPruneLibtoolFiles-}" ] || [ ! -e "$prefix" ]; then
1212 return
1313 fi
1414
pkgs/build-support/setup-hooks/strip.sh+2−2
@@ -10,7 +10,7 @@ _doStrip() {
1010 local -ra stripCmds=(STRIP TARGET_STRIP)
1111
1212 # Optimization
13− if [[ "$STRIP" == "$TARGET_STRIP" ]]; then
13+ if [[ "${STRIP-}" == "${TARGET_STRIP-}" ]]; then
1414 dontStripTarget+=1
1515 fi
1616
@@ -20,7 +20,7 @@ _doStrip() {
2020 local -n stripCmd="${stripCmds[$i]}"
2121
2222 # `dontStrip` disables them all
23− if [[ "$dontStrip" || "$flag" ]] || ! type -f "$stripCmd" 2>/dev/null
23+ if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null
2424 then continue; fi
2525
2626 stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}
pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh+1−1
@@ -1,7 +1,7 @@
11preConfigurePhases+=" updateAutotoolsGnuConfigScriptsPhase"
22
33updateAutotoolsGnuConfigScriptsPhase() {
4− if [ -n "$dontUpdateAutotoolsGnuConfigScripts" ]; then return; fi
4+ if [ -n "${dontUpdateAutotoolsGnuConfigScripts-}" ]; then return; fi
55
66 for script in config.sub config.guess; do
77 for f in $(find . -type f -name "$script"); do
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh+1−1
@@ -15,7 +15,7 @@ wrapGApp() {
1515 wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@"
1616}
1717
18−# Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
18+# Note: $gappsWrapperArgs still gets defined even if ${dontWrapGApps-} is set.
1919wrapGAppsHook() {
2020 # guard against running multiple times (e.g. due to propagation)
2121 [ -z "$wrapGAppsHookHasRun" ] || return 0
pkgs/desktops/gnome-2/default.nix+1−3
@@ -37,9 +37,7 @@ lib.makeScope pkgs.newScope (self: with self; {
3737
3838 gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { };
3939
40− gnome_vfs = callPackage ./platform/gnome-vfs {
41− openssl = pkgs.openssl_1_0_2;
42− };
40+ gnome_vfs = callPackage ./platform/gnome-vfs { };
4341
4442 libgnome = callPackage ./platform/libgnome { };
4543
pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix+13−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib
1+{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, bzip2, openssl, dbus-glib
22, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
33
44stdenv.mkDerivation rec {
@@ -20,6 +20,18 @@ stdenv.mkDerivation rec {
2020
2121 propagatedBuildInputs = [ GConf glib ];
2222
23+ # struct SSL is opaque in openssl-1.1; and the SSL_free() man page
24+ # says that one should not free members of it manually (in both
25+ # the openssl-1.0 and openssl-1.1 man pages).
26+ # https://bugs.gentoo.org/592540
27+ patches = [ (fetchpatch {
28+ name = "gnome-vfs-2.24.4-openssl-1.1.patch";
29+ url = "https://bugs.gentoo.org/attachment.cgi?id=535944";
30+ sha256 = "1q4icapvmwmd5rjah7rr0bqazzk5cg36znmjlpra20n9y27nz040";
31+ extraPrefix = "";
32+ })
33+ ];
34+
2335 postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i ";
2436
2537 doCheck = false; # needs dbus daemon
pkgs/desktops/gnome-3/core/mutter/3.28.nix+2
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
5656 })
5757 # See patch commit message
5858 ./0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
59+ # Fix build with libglvnd provided headers
60+ ./libglvnd-328.patch
5961 ];
6062
6163 configureFlags = [
pkgs/desktops/gnome-3/core/mutter/default.nix+5
@@ -66,6 +66,11 @@ stdenv.mkDerivation rec {
6666 src = ./fix-paths.patch;
6767 inherit zenity;
6868 })
69+ # Fix build with libglvnd provided headers
70+ (fetchpatch {
71+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch";
72+ sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd";
73+ })
6974 ];
7075
7176 postPatch = ''
pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patchnew file+63
@@ -0,0 +1,63 @@
1+diff --git a/cogl/configure.ac b/cogl/configure.ac
2+index 3be282f..d338cd1 100644
3+--- a/cogl/configure.ac
4++++ b/cogl/configure.ac
5+@@ -490,6 +490,11 @@ AS_IF([test "x$enable_gles1" = "xyes"],
6+ #include <EGL/eglext.h>"],
7+ [],
8+ [$COGL_EGL_INCLUDES])
9++ AC_CHECK_HEADERS([EGL/eglmesaext.h],
10++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
11++#include <EGL/eglmesaext.h>"],
12++ [],
13++ [$COGL_EGL_INCLUDES])
14+
15+ # Check for a GLES 1.x Common Profile library with/without EGL.
16+ #
17+@@ -759,7 +764,9 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
18+ )
19+
20+ COGL_EGL_INCLUDES="#include <EGL/egl.h>
21+-#include <EGL/eglext.h>"
22++#include <EGL/eglext.h>
23++#include <EGL/eglmesaext.h>
24++"
25+ AC_SUBST([COGL_EGL_INCLUDES])
26+ ])
27+
28+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
29+index 8705e7d..db0b74f 100644
30+--- a/src/backends/meta-egl-ext.h
31++++ b/src/backends/meta-egl-ext.h
32+@@ -29,6 +29,7 @@
33+
34+ #include <EGL/egl.h>
35+ #include <EGL/eglext.h>
36++#include <EGL/eglmesaext.h>
37+
38+ /*
39+ * This is a little different to the tests shipped with EGL implementations,
40+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
41+index 755ec49..bd253c9 100644
42+--- a/src/backends/meta-egl.c
43++++ b/src/backends/meta-egl.c
44+@@ -31,6 +31,7 @@
45+
46+ #include <EGL/egl.h>
47+ #include <EGL/eglext.h>
48++#include <EGL/eglmesaext.h>
49+ #include <gio/gio.h>
50+ #include <glib.h>
51+ #include <glib-object.h>
52+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
53+index 060c7cd..2fef264 100644
54+--- a/src/backends/meta-egl.h
55++++ b/src/backends/meta-egl.h
56+@@ -27,6 +27,7 @@
57+
58+ #include <EGL/egl.h>
59+ #include <EGL/eglext.h>
60++#include <EGL/eglmesaext.h>
61+ #include <glib-object.h>
62+
63+ #define META_EGL_ERROR meta_egl_error_quark ()
pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix+1−1
@@ -37,7 +37,7 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
3737
3838 # Set JAVA_HOME automatically.
3939 cat <<EOF >> $out/nix-support/setup-hook
40− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
40+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
4141 EOF
4242 '';
4343
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix+1−1
@@ -54,7 +54,7 @@ let result = stdenv.mkDerivation rec {
5454
5555 # Set JAVA_HOME automatically.
5656 cat <<EOF >> "$out/nix-support/setup-hook"
57− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
57+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
5858 EOF
5959 '';
6060
pkgs/development/compilers/graalvm/default.nix+1−1
@@ -270,7 +270,7 @@ in rec {
270270 # Set JAVA_HOME automatically.
271271 mkdir -p $out/nix-support
272272 cat <<EOF > $out/nix-support/setup-hook
273− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
273+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
274274 EOF
275275 '';
276276 postFixup = openjdk.postFixup or null;
pkgs/development/compilers/graalvm/enterprise-edition.nix+1−1
@@ -72,7 +72,7 @@ let
7272 # Set JAVA_HOME automatically.
7373 mkdir -p $out/nix-support
7474 cat <<EOF > $out/nix-support/setup-hook
75− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
75+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
7676 EOF
7777 '';
7878
pkgs/development/compilers/llvm/7/libc++/default.nix+4−2
@@ -1,4 +1,5 @@
1−{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
1+{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version
2+, enableShared ? ! stdenv.hostPlatform.isMusl }:
23
34stdenv.mkDerivation {
45 pname = "libc++";
@@ -31,7 +32,8 @@ stdenv.mkDerivation {
3132 "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
3233 "-DLIBCXX_LIBCPPABI_VERSION=2"
3334 "-DLIBCXX_CXX_ABI=libcxxabi"
34− ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
35+ ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"
36+ ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ;
3537
3638 enableParallelBuilding = true;
3739
pkgs/development/compilers/llvm/7/libc++abi.nix+9−5
@@ -1,4 +1,6 @@
1−{ stdenv, cmake, fetch, libcxx, llvm, version }:
1+{ stdenv, cmake, fetch, libcxx, llvm, version
2+ # on musl the shared objects don't build
3+, enableShared ? ! stdenv.hostPlatform.isMusl }:
24
35stdenv.mkDerivation {
46 pname = "libc++abi";
@@ -11,13 +13,15 @@ stdenv.mkDerivation {
1113 postUnpack = ''
1214 unpackFile ${libcxx.src}
1315 unpackFile ${llvm.src}
14− export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
16+ cmakeFlagsArray=($cmakeFlagsArray -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*) )
1517 '' + stdenv.lib.optionalString stdenv.isDarwin ''
1618 export TRIPLE=x86_64-apple-darwin
1719 '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
1820 patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
1921 '';
2022
23+ cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";
24+
2125 installPhase = if stdenv.isDarwin
2226 then ''
2327 for file in lib/*.dylib; do
@@ -34,10 +38,10 @@ stdenv.mkDerivation {
3438 else ''
3539 install -d -m 755 $out/include $out/lib
3640 install -m 644 lib/libc++abi.a $out/lib
37− install -m 644 lib/libc++abi.so.1.0 $out/lib
41+ ${stdenv.lib.optionalString enableShared "install -m 644 lib/libc++abi.so.1.0 $out/lib"}
3842 install -m 644 ../include/cxxabi.h $out/include
39− ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
40− ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
43+ ${stdenv.lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so"}
44+ ${stdenv.lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1"}
4145 '';
4246
4347 meta = {
pkgs/development/compilers/openjdk/11.nix+1−1
@@ -106,7 +106,7 @@ let
106106 # Set JAVA_HOME automatically.
107107 mkdir -p $out/nix-support
108108 cat <<EOF > $out/nix-support/setup-hook
109− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
109+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
110110 EOF
111111 '';
112112
pkgs/development/compilers/openjdk/8.nix+1−1
@@ -231,7 +231,7 @@ let
231231 # Set JAVA_HOME automatically.
232232 mkdir -p $out/nix-support
233233 cat <<EOF > $out/nix-support/setup-hook
234− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
234+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
235235 EOF
236236 '';
237237
pkgs/development/compilers/openjdk/darwin/11.nix+1−1
@@ -44,7 +44,7 @@ let
4444
4545 # Set JAVA_HOME automatically.
4646 cat <<EOF >> $out/nix-support/setup-hook
47− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
47+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
4848 EOF
4949 '';
5050
pkgs/development/compilers/openjdk/darwin/8.nix+1−1
@@ -44,7 +44,7 @@ let
4444
4545 # Set JAVA_HOME automatically.
4646 cat <<EOF >> $out/nix-support/setup-hook
47− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
47+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
4848 EOF
4949 '';
5050
pkgs/development/compilers/openjdk/darwin/default.nix+1−1
@@ -44,7 +44,7 @@ let
4444
4545 # Set JAVA_HOME automatically.
4646 cat <<EOF >> $out/nix-support/setup-hook
47− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
47+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
4848 EOF
4949 '';
5050
pkgs/development/compilers/openjdk/default.nix+1−1
@@ -114,7 +114,7 @@ let
114114 # Set JAVA_HOME automatically.
115115 mkdir -p $out/nix-support
116116 cat <<EOF > $out/nix-support/setup-hook
117− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
117+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
118118 EOF
119119 '';
120120
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix+1−1
@@ -156,7 +156,7 @@ let result = stdenv.mkDerivation rec {
156156
157157 # Set JAVA_HOME automatically.
158158 cat <<EOF >> $out/nix-support/setup-hook
159− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
159+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
160160 EOF
161161 '';
162162
pkgs/development/compilers/reason/default.nix+2−2
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
2727 postInstall = ''
2828 wrapProgram $out/bin/rtop \
2929 --prefix PATH : "${utop}/bin" \
30− --set CAML_LD_LIBRARY_PATH ${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib:$CAML_LD_LIBRARY_PATH \
31− --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH
30+ --prefix CAML_LD_LIBRARY_PATH : "${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib" \
31+ --prefix OCAMLPATH : "$out/lib/ocaml/${ocaml.version}/site-lib"
3232 '';
3333
3434 meta = with stdenv.lib; {
pkgs/development/compilers/rust/rustc.nix+5−5
@@ -1,6 +1,6 @@
11{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
22, fetchurl, file, python2
3−, llvm_7, darwin, git, cmake, rustPlatform
3+, llvm_9, darwin, git, cmake, rustPlatform
44, pkgconfig, openssl
55, which, libffi
66, withBundledLLVM ? false
@@ -12,12 +12,12 @@ let
1212 inherit (stdenv.lib) optional optionalString;
1313 inherit (darwin.apple_sdk.frameworks) Security;
1414
15− llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; };
16− llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; };
17− llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; };
15+ llvmSharedForBuild = pkgsBuildBuild.llvm_9.override { enableSharedLibraries = true; };
16+ llvmSharedForHost = pkgsBuildHost.llvm_9.override { enableSharedLibraries = true; };
17+ llvmSharedForTarget = pkgsBuildTarget.llvm_9.override { enableSharedLibraries = true; };
1818
1919 # For use at runtime
20− llvmShared = llvm_7.override { enableSharedLibraries = true; };
20+ llvmShared = llvm_9.override { enableSharedLibraries = true; };
2121in stdenv.mkDerivation rec {
2222 pname = "rustc";
2323 inherit version;
pkgs/development/compilers/rust/setup-hook.sh+1−1
@@ -1,4 +1,4 @@
11# Fix 'failed to open: /homeless-shelter/.cargo/.package-cache' in rust 1.36.
2−if [[ -z $IN_NIX_SHELL && -z $CARGO_HOME ]]; then
2+if [[ -z ${IN_NIX_SHELL-} && -z ${CARGO_HOME-} ]]; then
33 export CARGO_HOME=$TMPDIR
44fi
pkgs/development/compilers/zulu/8.nix+1−1
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
5858
5959 # Set JAVA_HOME automatically.
6060 cat <<EOF >> $out/nix-support/setup-hook
61− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
61+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
6262 EOF
6363 '';
6464
pkgs/development/compilers/zulu/default.nix+1−1
@@ -55,7 +55,7 @@ in stdenv.mkDerivation {
5555
5656 # Set JAVA_HOME automatically.
5757 cat <<EOF >> $out/nix-support/setup-hook
58− if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
58+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
5959 EOF
6060 '';
6161
pkgs/development/interpreters/lua-5/setup-hook.sh+1−1
@@ -20,7 +20,7 @@ addToLuaSearchPathWithCustomDelimiter() {
2020 if [[ ! -d "$topDir" ]]; then return; fi
2121
2222 # export only if we haven't already got this dir in the search path
23− if [[ ${!varName} == *"$absPattern"* ]]; then return; fi
23+ if [[ ${!varName-} == *"$absPattern"* ]]; then return; fi
2424
2525 export "${varName}=${!varName:+${!varName};}${absPattern}"
2626}
pkgs/development/interpreters/octave/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
2−, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGLU_combined, fltk
2+, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGL, libGLU, fltk
33, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp
44, qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
55, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 ++ (stdenv.lib.optional (jdk != null) jdk)
3939 ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
4040 ++ (stdenv.lib.optional (python != null) python)
41− ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGLU_combined libX11 ])
41+ ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
4242 ;
4343
4444 # makeinfo is required by Octave at runtime to display help
pkgs/development/interpreters/perl/default.nix+17−9
@@ -1,5 +1,5 @@
11{ config, lib, stdenv, fetchurl, pkgs, buildPackages, callPackage
2−, enableThreading ? stdenv ? glibc, makeWrapper
2+, enableThreading ? stdenv ? glibc, coreutils, makeWrapper
33}:
44
55with lib;
@@ -35,7 +35,7 @@ let
3535
3636 # TODO: Add a "dev" output containing the header files.
3737 outputs = [ "out" "man" "devdoc" ] ++
38− stdenv.lib.optional crossCompiling "dev";
38+ optional crossCompiling "dev";
3939 setOutputFlags = false;
4040
4141 disallowedReferences = [ stdenv.cc ];
@@ -57,12 +57,20 @@ let
5757 ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
5858 ++ optional crossCompiling ./MakeMaker-cross.patch;
5959
60− postPatch = ''
61− pwd="$(type -P pwd)"
60+ # This is not done for native builds because pwd may need to come from
61+ # bootstrap tools when building bootstrap perl.
62+ postPatch = (if crossCompiling then ''
6263 substituteInPlace dist/PathTools/Cwd.pm \
63− --replace "/bin/pwd" "$pwd"
64− '' + stdenv.lib.optionalString crossCompiling ''
64+ --replace "/bin/pwd" '${coreutils}/bin/pwd'
6565 substituteInPlace cnf/configure_tool.sh --replace "cc -E -P" "cc -E"
66+ '' else ''
67+ substituteInPlace dist/PathTools/Cwd.pm \
68+ --replace "/bin/pwd" "$(type -P pwd)"
69+ '') +
70+ # Perl's build system uses the src variable, and its value may end up in
71+ # the output in some cases (when cross-compiling)
72+ ''
73+ unset src
6674 '';
6775
6876 # Build a thread-safe Perl with a dynamic libperls.o. We need the
@@ -85,7 +93,7 @@ let
8593 ++ optional stdenv.isSunOS "-Dcc=gcc"
8694 ++ optional enableThreading "-Dusethreads";
8795
88− configureScript = stdenv.lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure";
96+ configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure";
8997
9098 dontAddPrefix = !crossCompiling;
9199
@@ -140,7 +148,7 @@ let
140148 }" /no-such-path \
141149 --replace "${stdenv.cc}" /no-such-path \
142150 --replace "$man" /no-such-path
143− '' + stdenv.lib.optionalString crossCompiling
151+ '' + optionalString crossCompiling
144152 ''
145153 mkdir -p $dev/lib/perl5/cross_perl/${version}
146154 for dir in cnf/{stub,cpan}; do
@@ -172,7 +180,7 @@ let
172180 platforms = platforms.all;
173181 priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
174182 };
175− } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
183+ } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
176184 crossVersion = "980998f7d11baf97284426ca91f84681d49a08f5"; # Jul 20, 2019
177185
178186 perl-cross-src = fetchurl {
pkgs/development/interpreters/python/hooks/flit-build-hook.sh+1−1
@@ -9,7 +9,7 @@ flitBuildPhase () {
99 echo "Finished executing flitBuildPhase"
1010}
1111
12−if [ -z "$dontUseFlitBuild" ] && [ -z "$buildPhase" ]; then
12+if [ -z "${dontUseFlitBuild-}" ] && [ -z "${buildPhase-}" ]; then
1313 echo "Using flitBuildPhase"
1414 buildPhase=flitBuildPhase
1515fi
pkgs/development/interpreters/python/hooks/pip-build-hook.sh+1−1
@@ -31,7 +31,7 @@ pipShellHook() {
3131 echo "Finished executing pipShellHook"
3232}
3333
34−if [ -z "$dontUsePipBuild" ] && [ -z "$buildPhase" ]; then
34+if [ -z "${dontUsePipBuild-}" ] && [ -z "${buildPhase-}" ]; then
3535 echo "Using pipBuildPhase"
3636 buildPhase=pipBuildPhase
3737fi
pkgs/development/interpreters/python/hooks/pip-install-hook.sh+1−1
@@ -18,7 +18,7 @@ pipInstallPhase() {
1818 echo "Finished executing pipInstallPhase"
1919}
2020
21−if [ -z "$dontUsePipInstall" ] && [ -z "$installPhase" ]; then
21+if [ -z "${dontUsePipInstall-}" ] && [ -z "${installPhase-}" ]; then
2222 echo "Using pipInstallPhase"
2323 installPhase=pipInstallPhase
2424fi
pkgs/development/interpreters/python/hooks/pytest-check-hook.sh+1−1
@@ -43,7 +43,7 @@ function pytestCheckPhase() {
4343 echo "Finished executing pytestCheckPhase"
4444}
4545
46−if [ -z "$dontUsePytestCheck" ] && [ -z "$installCheckPhase" ]; then
46+if [ -z "${dontUsePytestCheck-}" ] && [ -z "${installCheckPhase-}" ]; then
4747 echo "Using pytestCheckPhase"
4848 preDistPhases+=" pytestCheckPhase"
4949fi
pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh+1−1
@@ -5,6 +5,6 @@ pythonCatchConflictsPhase() {
55 @pythonInterpreter@ @catchConflicts@
66}
77
8−if [ -z "$dontUsePythonCatchConflicts" ]; then
8+if [ -z "${dontUsePythonCatchConflicts-}" ]; then
99 preDistPhases+=" pythonCatchConflictsPhase"
1010fi
pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh+1−1
@@ -10,7 +10,7 @@ pythonImportsCheckPhase () {
1010 fi
1111}
1212
13−if [ -z "$dontUsePythonImportsCheck" ]; then
13+if [ -z "${dontUsePythonImportsCheck-}" ]; then
1414 echo "Using pythonImportsCheckPhase"
1515 preDistPhases+=" pythonImportsCheckPhase"
1616fi
pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh+1−1
@@ -12,6 +12,6 @@ pythonRemoveBinBytecodePhase () {
1212 fi
1313}
1414
15−if [ -z "$dontUsePythonRemoveBinBytecode" ]; then
15+if [ -z "${dontUsePythonRemoveBinBytecode-}" ]; then
1616 preDistPhases+=" pythonRemoveBinBytecodePhase"
1717fi
pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh+2−2
@@ -36,12 +36,12 @@ setuptoolsShellHook() {
3636 echo "Finished executing setuptoolsShellHook"
3737}
3838
39−if [ -z "$dontUseSetuptoolsBuild" ] && [ -z "$buildPhase" ]; then
39+if [ -z "${dontUseSetuptoolsBuild-}" ] && [ -z "${buildPhase-}" ]; then
4040 echo "Using setuptoolsBuildPhase"
4141 buildPhase=setuptoolsBuildPhase
4242fi
4343
44−if [ -z "$dontUseSetuptoolsShellHook" ] && [ -z "$shellHook" ]; then
44+if [ -z "${dontUseSetuptoolsShellHook-}" ] && [ -z "${shellHook-}" ]; then
4545 echo "Using setuptoolsShellHook"
4646 shellHook=setuptoolsShellHook
4747fi
pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh+1−1
@@ -12,7 +12,7 @@ setuptoolsCheckPhase() {
1212 echo "Finished executing setuptoolsCheckPhase"
1313}
1414
15−if [ -z "$dontUseSetuptoolsCheck" ] && [ -z "$installCheckPhase" ]; then
15+if [ -z "${dontUseSetuptoolsCheck-}" ] && [ -z "${installCheckPhase-}" ]; then
1616 echo "Using setuptoolsCheckPhase"
1717 preDistPhases+=" setuptoolsCheckPhase"
1818fi
pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh+1−1
@@ -12,7 +12,7 @@ wheelUnpackPhase(){
1212 echo "Finished executing wheelUnpackPhase"
1313}
1414
15−if [ -z "$dontUseWheelUnpack" ] && [ -z "$unpackPhase" ]; then
15+if [ -z "${dontUseWheelUnpack-}" ] && [ -z "${unpackPhase-}" ]; then
1616 echo "Using wheelUnpackPhase"
1717 unpackPhase=wheelUnpackPhase
1818fi
pkgs/development/libraries/SDL/setup-hook.sh+4−2
@@ -1,7 +1,9 @@
11addSDLPath () {
22 if [ -e "$1/include/SDL" ]; then
3− export SDL_PATH="$SDL_PATH $1/include/SDL"
4− export SDL_LIB_PATH="$SDL_LIB_PATH -L$1/lib"
3+ export SDL_PATH="${SDL_PATH-}${SDL_PATH:+ }$1/include/SDL"
4+ fi
5+ if [ -e "$1/lib" ]; then
6+ export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }$1/lib"
57 fi
68}
79
pkgs/development/libraries/SDL2/default.nix+14−2
@@ -75,9 +75,21 @@ stdenv.mkDerivation rec {
7575 ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"
7676 ++ optional stdenv.isDarwin "--disable-sdltest";
7777
78+ # We remove libtool .la files when static libs are requested,
79+ # because they make the builds of downstream libs like `SDL_tff`
80+ # fail with `cannot find -lXext, `-lXcursor` etc. linker errors
81+ # because the `.la` files are not pruned if static libs exist
82+ # (see https://github.com/NixOS/nixpkgs/commit/fd97db43bcb05e37f6bb77f363f1e1e239d9de53)
83+ # and they also don't carry the necessary `-L` paths of their
84+ # X11 dependencies.
85+ # For static linking, it is better to rely on `pkg-config` `.pc`
86+ # files.
7887 postInstall = ''
79− moveToOutput lib/libSDL2main.a "$dev"
80− rm $out/lib/*.a
88+ if [ "$dontDisableStatic" -eq "1" ]; then
89+ rm $out/lib/*.la
90+ else
91+ rm $out/lib/*.a
92+ fi
8193 moveToOutput bin/sdl2-config "$dev"
8294 '';
8395
pkgs/development/libraries/SDL2/setup-hook.sh+1−1
@@ -1,6 +1,6 @@
11addSDL2Path () {
22 if [ -e "$1/include/SDL2" ]; then
3− export SDL2_PATH="$SDL2_PATH $1/include/SDL2"
3+ export SDL2_PATH="${SDL2_PATH-}${SDL2_PATH:+ }$1/include/SDL2"
44 fi
55}
66
pkgs/development/libraries/clutter/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libGLU_combined, libX11, libXext, libXfixes
1+{ stdenv, fetchurl, pkgconfig, libGLU, libGL, libX11, libXext, libXfixes
22, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib
33, gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon
44}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 buildInputs = [ gtk3 ];
2121 nativeBuildInputs = [ pkgconfig ];
2222 propagatedBuildInputs =
23− [ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango
23+ [ libX11 libGL libGLU libXext libXfixes libXdamage libXcomposite libXi cogl pango
2424 atk json-glib gobject-introspection libxcb libinput libgudev libxkbcommon
2525 ];
2626
pkgs/development/libraries/cogl/default.nix+9−3
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk-pixbuf, xorg, libintl
22, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3
3−, mesa
3+, mesa, automake, autoconf
44, gstreamerSupport ? true, gst_all_1 }:
55
66let
@@ -29,11 +29,17 @@ in stdenv.mkDerivation rec {
2929 url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056;
3030 sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490";
3131 })
32+
33+ # Fix build with libglvnd headers (these headers used to be provided by mesa)
34+ (fetchpatch {
35+ url = "https://gitlab.gnome.org/GNOME/cogl/commit/9c4764224aded552fb855b1c2b85b26d2b894adf.patch";
36+ sha256 = "1v9drpzgcd5pq2shhdcw5px7mdiggk6ga13qjbklq8xpd92ac0i1";
37+ })
3238 ];
3339
3440 outputs = [ "out" "dev" ];
3541
36− nativeBuildInputs = [ pkgconfig libintl ];
42+ nativeBuildInputs = [ pkgconfig libintl automake autoconf ];
3743
3844 configureFlags = [
3945 "--enable-introspection"
@@ -41,7 +47,7 @@ in stdenv.mkDerivation rec {
4147 "--enable-wayland-egl-platform"
4248 "--enable-wayland-egl-server"
4349 ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
44− ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
50+ ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
4551
4652 propagatedBuildInputs = with xorg; [
4753 glib gdk-pixbuf gobject-introspection wayland mesa
pkgs/development/libraries/coin3d/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchFromBitbucket, stdenv, boost, cmake, libGLU_combined }:
1+{ fetchFromBitbucket, stdenv, boost, cmake, libGL, libGLU }:
22
33stdenv.mkDerivation {
44 pname = "coin";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616 '';
1717
1818 nativeBuildInputs = [ cmake ];
19− buildInputs = [ boost libGLU_combined ];
19+ buildInputs = [ boost libGL libGLU ];
2020
2121 meta = {
2222 homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home";
pkgs/development/libraries/ffmpeg/generic.nix+8
@@ -3,6 +3,8 @@
33, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
44, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
55, openglSupport ? false, libGLU_combined ? null
6+, libmfxSupport ? false, intel-media-sdk ? null
7+, libaomSupport ? false, libaom ? null
68# Build options
79, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
810, multithreadBuild ? true # Multithreading via pthreads/win32 threads
@@ -62,6 +64,8 @@ let
6264in
6365
6466assert openglSupport -> libGLU_combined != null;
67+assert libmfxSupport -> intel-media-sdk != null;
68+assert libaomSupport -> libaom != null;
6569
6670stdenv.mkDerivation rec {
6771
@@ -135,6 +139,8 @@ stdenv.mkDerivation rec {
135139 (ifMinVer "0.6" (enableFeature vpxSupport "libvpx"))
136140 (ifMinVer "2.4" "--enable-lzma")
137141 (ifMinVer "2.2" (enableFeature openglSupport "opengl"))
142+ (ifMinVer "4.2" (enableFeature libmfxSupport "libmfx"))
143+ (ifMinVer "4.2" (enableFeature libaomSupport "libaom"))
138144 (disDarwinOrArmFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse")
139145 (ifMinVer "2.5" (if sdlSupport && reqMin "3.2" then "--enable-sdl2" else if sdlSupport then "--enable-sdl" else null)) # autodetected before 2.5, SDL1 support removed in 3.2 for SDL2
140146 (ifMinVer "1.2" "--enable-libsoxr")
@@ -163,6 +169,8 @@ stdenv.mkDerivation rec {
163169 bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
164170 libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers
165171 ] ++ optional openglSupport libGLU_combined
172+ ++ optional libmfxSupport intel-media-sdk
173+ ++ optional vpxSupport libaom
166174 ++ optional vpxSupport libvpx
167175 ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM
168176 ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva
pkgs/development/libraries/fltk/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
2−, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
2+, freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng
33, libtiff, freetype, Cocoa, AGL, GLUT
44}:
55
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919 patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
2020
2121 nativeBuildInputs = [ pkgconfig ];
22− buildInputs = [ libGLU_combined libjpeg zlib libpng libXft ]
22+ buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
2323 ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
2424
2525 propagatedBuildInputs = [ xorgproto ]
pkgs/development/libraries/fribidi/default.nix+8
@@ -20,6 +20,14 @@ stdenv.mkDerivation rec {
2020 sha256 = "0pckda4fcn0aw32lpycwdp25r2m7vca8zspq815ppi9gkwgg5das";
2121 };
2222
23+ patches = [
24+ (fetchpatch {
25+ name = "CVE-2019-18397.patch";
26+ url = "https://github.com/fribidi/fribidi/commit/034c6e9a1d296286305f4cfd1e0072b879f52568.patch";
27+ sha256 = "102xrbf1l5gvavkxd6csx8pj3rlgcw10c0y4h4d40yhn84b1p0y8";
28+ })
29+ ];
30+
2331 postPatch = ''
2432 patchShebangs test
2533 '';
pkgs/development/libraries/ftgl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, freetype, libGLU_combined, OpenGL }:
1+{ stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }:
22
33let
44 name = "ftgl-2.1.3-rc5";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 ++ (if stdenv.isDarwin then
1616 [ OpenGL ]
1717 else
18− [ libGLU_combined ])
18+ [ libGL libGLU ])
1919 ;
2020
2121 enableParallelBuilding = true;
pkgs/development/libraries/gcr/default.nix+53−18
@@ -1,49 +1,84 @@
1−{ stdenv, fetchurl, pkgconfig, gettext, gnupg, p11-kit, glib
2−, libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk-pixbuf, atk
3−, gobject-introspection, makeWrapper, libxslt, vala, gnome3
4−, python3 }:
1+{ stdenv
2+, fetchurl
3+, pkgconfig
4+, gettext
5+, gnupg
6+, p11-kit
7+, glib
8+, libgcrypt
9+, libtasn1
10+, gtk3
11+, pango
12+, gobject-introspection
13+, makeWrapper
14+, libxslt
15+, vala
16+, gnome3
17+, python3
18+}:
519
620stdenv.mkDerivation rec {
721 pname = "gcr";
8− version = "3.33.4";
22+ version = "3.34.0";
923
1024 src = fetchurl {
1125 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "1hf06p4qfyywnb6334ysnr6aqxik3srb37glclvr4yhb3wzrjqnm";
13− };
14−
15− passthru = {
16− updateScript = gnome3.updateScript { packageName = pname; };
26+ sha256 = "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9";
1727 };
1828
1929 postPatch = ''
20− patchShebangs .
30+ patchShebangs build/ gcr/fixtures/
2131 '';
2232
2333 outputs = [ "out" "dev" ];
2434
25− nativeBuildInputs = [ pkgconfig gettext gobject-introspection libxslt makeWrapper vala ];
35+ nativeBuildInputs = [
36+ pkgconfig
37+ gettext
38+ gobject-introspection
39+ libxslt
40+ makeWrapper
41+ vala
42+ ];
43+
44+ buildInputs = [
45+ gnupg
46+ libgcrypt
47+ libtasn1
48+ pango
49+ ];
2650
27− buildInputs = [ gnupg libgcrypt libtasn1 dbus-glib pango gdk-pixbuf atk ];
51+ propagatedBuildInputs = [
52+ glib
53+ gtk3
54+ p11-kit
55+ ];
2856
29− propagatedBuildInputs = [ glib gtk3 p11-kit ];
57+ checkInputs = [
58+ python3
59+ ];
3060
31− checkInputs = [ python3 ];
3261 doCheck = false; # fails 21 out of 603 tests, needs dbus daemon
3362
34− #enableParallelBuilding = true; issues on hydra
63+ enableParallelBuilding = true;
3564
3665 preFixup = ''
3766 wrapProgram "$out/bin/gcr-viewer" \
3867 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
3968 '';
4069
70+ passthru = {
71+ updateScript = gnome3.updateScript {
72+ packageName = pname;
73+ };
74+ };
75+
4176 meta = with stdenv.lib; {
4277 platforms = platforms.linux;
4378 maintainers = gnome3.maintainers;
4479 description = "GNOME crypto services (daemon and tools)";
45− homepage = https://gitlab.gnome.org/GNOME/gcr;
46− license = licenses.gpl2;
80+ homepage = "https://gitlab.gnome.org/GNOME/gcr";
81+ license = licenses.lgpl2Plus;
4782
4883 longDescription = ''
4984 GCR is a library for displaying certificates, and crypto UI, accessing
pkgs/development/libraries/gdk-pixbuf/setup-hook.sh+3−3
@@ -2,9 +2,9 @@ findGdkPixbufLoaders() {
22
33 # choose the longest loaders.cache
44 local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
5− if [ -f "$loadersCache" ]; then
6− if [ -f "$GDK_PIXBUF_MODULE_FILE" ]; then
7− if [ $(cat "$loadersCache"|wc -l) -gt $(cat "$GDK_PIXBUF_MODULE_FILE"|wc -l) ]; then
5+ if [[ -f "$loadersCache" ]]; then
6+ if [[ -f "${GDK_PIXBUF_MODULE_FILE-}" ]]; then
7+ if [[ "$(cat "$loadersCache" | wc -l)" > "$(cat "$GDK_PIXBUF_MODULE_FILE" | wc -l)" ]]; then
88 export GDK_PIXBUF_MODULE_FILE="$loadersCache"
99 fi
1010 else
pkgs/development/libraries/gettext/CVE-2018-18751-bison.patchdeleted−323
@@ -1,323 +0,0 @@
1−This patch was generated by re-running Bison 3.0.4 on pro-gram-gen.y after
2−applying CVE-2018-18751.patch. This patch removes the need to add bison to
3−nativeBuildInputs.
4−
5−--- a/gettext-tools/src/po-gram-gen.c
6−+++ b/gettext-tools/src/po-gram-gen.c
7−@@ -568,9 +568,9 @@ static const yytype_uint8 yytranslate[] =
8− static const yytype_uint16 yyrline[] =
9− {
10− 0, 169, 169, 171, 172, 173, 174, 179, 187, 195,
11−- 216, 240, 249, 258, 269, 278, 292, 301, 315, 321,
12−- 332, 338, 350, 361, 372, 376, 391, 414, 422, 434,
13−- 442
14−+ 216, 237, 246, 255, 266, 275, 289, 298, 312, 318,
15−+ 329, 335, 347, 358, 369, 373, 388, 411, 419, 431,
16−+ 439
17− };
18− #endif
19−
20−@@ -1419,14 +1419,11 @@ yyreduce:
21− check_obsolete ((yyvsp[-3].message_intro), (yyvsp[-1].string));
22− check_obsolete ((yyvsp[-3].message_intro), (yyvsp[0].rhs));
23− if (!(yyvsp[-3].message_intro).obsolete || pass_obsolete_entries)
24−- {
25−- do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string,
26−- (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos,
27−- (yyvsp[-3].message_intro).prev_ctxt,
28−- (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural,
29−- (yyvsp[-3].message_intro).obsolete);
30−- free ((yyvsp[-1].string).string);
31−- }
32−+ do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string,
33−+ (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos,
34−+ (yyvsp[-3].message_intro).prev_ctxt,
35−+ (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural,
36−+ (yyvsp[-3].message_intro).obsolete);
37− else
38− {
39− free_message_intro ((yyvsp[-3].message_intro));
40−@@ -1435,11 +1432,11 @@ yyreduce:
41− free ((yyvsp[0].rhs).rhs.msgstr);
42− }
43− }
44−-#line 1439 "po-gram-gen.c" /* yacc.c:1646 */
45−+#line 1436 "po-gram-gen.c" /* yacc.c:1646 */
46− break;
47−
48− case 11:
49−-#line 241 "po-gram-gen.y" /* yacc.c:1646 */
50−+#line 238 "po-gram-gen.y" /* yacc.c:1646 */
51− {
52− check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist));
53− check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].string));
54−@@ -1448,11 +1445,11 @@ yyreduce:
55− string_list_destroy (&(yyvsp[-1].stringlist).stringlist);
56− free ((yyvsp[0].string).string);
57− }
58−-#line 1452 "po-gram-gen.c" /* yacc.c:1646 */
59−+#line 1449 "po-gram-gen.c" /* yacc.c:1646 */
60− break;
61−
62− case 12:
63−-#line 250 "po-gram-gen.y" /* yacc.c:1646 */
64−+#line 247 "po-gram-gen.y" /* yacc.c:1646 */
65− {
66− check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist));
67− check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].rhs));
68−@@ -1461,22 +1458,22 @@ yyreduce:
69− string_list_destroy (&(yyvsp[-1].stringlist).stringlist);
70− free ((yyvsp[0].rhs).rhs.msgstr);
71− }
72−-#line 1465 "po-gram-gen.c" /* yacc.c:1646 */
73−+#line 1462 "po-gram-gen.c" /* yacc.c:1646 */
74− break;
75−
76− case 13:
77−-#line 259 "po-gram-gen.y" /* yacc.c:1646 */
78−+#line 256 "po-gram-gen.y" /* yacc.c:1646 */
79− {
80− check_obsolete ((yyvsp[-1].message_intro), (yyvsp[0].stringlist));
81− po_gram_error_at_line (&(yyvsp[-1].message_intro).pos, _("missing 'msgstr' section"));
82− free_message_intro ((yyvsp[-1].message_intro));
83− string_list_destroy (&(yyvsp[0].stringlist).stringlist);
84− }
85−-#line 1476 "po-gram-gen.c" /* yacc.c:1646 */
86−+#line 1473 "po-gram-gen.c" /* yacc.c:1646 */
87− break;
88−
89− case 14:
90−-#line 270 "po-gram-gen.y" /* yacc.c:1646 */
91−+#line 267 "po-gram-gen.y" /* yacc.c:1646 */
92− {
93− (yyval.message_intro).prev_ctxt = NULL;
94− (yyval.message_intro).prev_id = NULL;
95−@@ -1485,11 +1482,11 @@ yyreduce:
96− (yyval.message_intro).pos = (yyvsp[0].string).pos;
97− (yyval.message_intro).obsolete = (yyvsp[0].string).obsolete;
98− }
99−-#line 1489 "po-gram-gen.c" /* yacc.c:1646 */
100−+#line 1486 "po-gram-gen.c" /* yacc.c:1646 */
101− break;
102−
103− case 15:
104−-#line 279 "po-gram-gen.y" /* yacc.c:1646 */
105−+#line 276 "po-gram-gen.y" /* yacc.c:1646 */
106− {
107− check_obsolete ((yyvsp[-1].prev), (yyvsp[0].string));
108− (yyval.message_intro).prev_ctxt = (yyvsp[-1].prev).ctxt;
109−@@ -1499,11 +1496,11 @@ yyreduce:
110− (yyval.message_intro).pos = (yyvsp[0].string).pos;
111− (yyval.message_intro).obsolete = (yyvsp[0].string).obsolete;
112− }
113−-#line 1503 "po-gram-gen.c" /* yacc.c:1646 */
114−+#line 1500 "po-gram-gen.c" /* yacc.c:1646 */
115− break;
116−
117− case 16:
118−-#line 293 "po-gram-gen.y" /* yacc.c:1646 */
119−+#line 290 "po-gram-gen.y" /* yacc.c:1646 */
120− {
121− check_obsolete ((yyvsp[-1].string), (yyvsp[0].stringlist));
122− (yyval.prev).ctxt = (yyvsp[-1].string).string;
123−@@ -1512,11 +1509,11 @@ yyreduce:
124− (yyval.prev).pos = (yyvsp[-1].string).pos;
125− (yyval.prev).obsolete = (yyvsp[-1].string).obsolete;
126− }
127−-#line 1516 "po-gram-gen.c" /* yacc.c:1646 */
128−+#line 1513 "po-gram-gen.c" /* yacc.c:1646 */
129− break;
130−
131− case 17:
132−-#line 302 "po-gram-gen.y" /* yacc.c:1646 */
133−+#line 299 "po-gram-gen.y" /* yacc.c:1646 */
134− {
135− check_obsolete ((yyvsp[-2].string), (yyvsp[-1].stringlist));
136− check_obsolete ((yyvsp[-2].string), (yyvsp[0].string));
137−@@ -1526,21 +1523,21 @@ yyreduce:
138− (yyval.prev).pos = (yyvsp[-2].string).pos;
139− (yyval.prev).obsolete = (yyvsp[-2].string).obsolete;
140− }
141−-#line 1530 "po-gram-gen.c" /* yacc.c:1646 */
142−+#line 1527 "po-gram-gen.c" /* yacc.c:1646 */
143− break;
144−
145− case 18:
146−-#line 316 "po-gram-gen.y" /* yacc.c:1646 */
147−+#line 313 "po-gram-gen.y" /* yacc.c:1646 */
148− {
149− (yyval.string).string = NULL;
150− (yyval.string).pos = (yyvsp[0].pos).pos;
151− (yyval.string).obsolete = (yyvsp[0].pos).obsolete;
152− }
153−-#line 1540 "po-gram-gen.c" /* yacc.c:1646 */
154−+#line 1537 "po-gram-gen.c" /* yacc.c:1646 */
155− break;
156−
157− case 19:
158−-#line 322 "po-gram-gen.y" /* yacc.c:1646 */
159−+#line 319 "po-gram-gen.y" /* yacc.c:1646 */
160− {
161− check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist));
162− check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos));
163−@@ -1548,21 +1545,21 @@ yyreduce:
164− (yyval.string).pos = (yyvsp[0].pos).pos;
165− (yyval.string).obsolete = (yyvsp[0].pos).obsolete;
166− }
167−-#line 1552 "po-gram-gen.c" /* yacc.c:1646 */
168−+#line 1549 "po-gram-gen.c" /* yacc.c:1646 */
169− break;
170−
171− case 20:
172−-#line 333 "po-gram-gen.y" /* yacc.c:1646 */
173−+#line 330 "po-gram-gen.y" /* yacc.c:1646 */
174− {
175− (yyval.string).string = NULL;
176− (yyval.string).pos = (yyvsp[0].pos).pos;
177− (yyval.string).obsolete = (yyvsp[0].pos).obsolete;
178− }
179−-#line 1562 "po-gram-gen.c" /* yacc.c:1646 */
180−+#line 1559 "po-gram-gen.c" /* yacc.c:1646 */
181− break;
182−
183− case 21:
184−-#line 339 "po-gram-gen.y" /* yacc.c:1646 */
185−+#line 336 "po-gram-gen.y" /* yacc.c:1646 */
186− {
187− check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist));
188− check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos));
189−@@ -1570,11 +1567,11 @@ yyreduce:
190− (yyval.string).pos = (yyvsp[0].pos).pos;
191− (yyval.string).obsolete = (yyvsp[0].pos).obsolete;
192− }
193−-#line 1574 "po-gram-gen.c" /* yacc.c:1646 */
194−+#line 1571 "po-gram-gen.c" /* yacc.c:1646 */
195− break;
196−
197− case 22:
198−-#line 351 "po-gram-gen.y" /* yacc.c:1646 */
199−+#line 348 "po-gram-gen.y" /* yacc.c:1646 */
200− {
201− check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist));
202− plural_counter = 0;
203−@@ -1582,30 +1579,30 @@ yyreduce:
204− (yyval.string).pos = (yyvsp[-1].pos).pos;
205− (yyval.string).obsolete = (yyvsp[-1].pos).obsolete;
206− }
207−-#line 1586 "po-gram-gen.c" /* yacc.c:1646 */
208−+#line 1583 "po-gram-gen.c" /* yacc.c:1646 */
209− break;
210−
211− case 23:
212−-#line 362 "po-gram-gen.y" /* yacc.c:1646 */
213−+#line 359 "po-gram-gen.y" /* yacc.c:1646 */
214− {
215− check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist));
216− (yyval.string).string = string_list_concat_destroy (&(yyvsp[0].stringlist).stringlist);
217− (yyval.string).pos = (yyvsp[-1].pos).pos;
218− (yyval.string).obsolete = (yyvsp[-1].pos).obsolete;
219− }
220−-#line 1597 "po-gram-gen.c" /* yacc.c:1646 */
221−+#line 1594 "po-gram-gen.c" /* yacc.c:1646 */
222− break;
223−
224− case 24:
225−-#line 373 "po-gram-gen.y" /* yacc.c:1646 */
226−+#line 370 "po-gram-gen.y" /* yacc.c:1646 */
227− {
228− (yyval.rhs) = (yyvsp[0].rhs);
229− }
230−-#line 1605 "po-gram-gen.c" /* yacc.c:1646 */
231−+#line 1602 "po-gram-gen.c" /* yacc.c:1646 */
232− break;
233−
234− case 25:
235−-#line 377 "po-gram-gen.y" /* yacc.c:1646 */
236−+#line 374 "po-gram-gen.y" /* yacc.c:1646 */
237− {
238− check_obsolete ((yyvsp[-1].rhs), (yyvsp[0].rhs));
239− (yyval.rhs).rhs.msgstr = XNMALLOC ((yyvsp[-1].rhs).rhs.msgstr_len + (yyvsp[0].rhs).rhs.msgstr_len, char);
240−@@ -1617,11 +1614,11 @@ yyreduce:
241− (yyval.rhs).pos = (yyvsp[-1].rhs).pos;
242− (yyval.rhs).obsolete = (yyvsp[-1].rhs).obsolete;
243− }
244−-#line 1621 "po-gram-gen.c" /* yacc.c:1646 */
245−+#line 1618 "po-gram-gen.c" /* yacc.c:1646 */
246− break;
247−
248− case 26:
249−-#line 392 "po-gram-gen.y" /* yacc.c:1646 */
250−+#line 389 "po-gram-gen.y" /* yacc.c:1646 */
251− {
252− check_obsolete ((yyvsp[-4].pos), (yyvsp[-3].pos));
253− check_obsolete ((yyvsp[-4].pos), (yyvsp[-2].number));
254−@@ -1640,11 +1637,11 @@ yyreduce:
255− (yyval.rhs).pos = (yyvsp[-4].pos).pos;
256− (yyval.rhs).obsolete = (yyvsp[-4].pos).obsolete;
257− }
258−-#line 1644 "po-gram-gen.c" /* yacc.c:1646 */
259−+#line 1641 "po-gram-gen.c" /* yacc.c:1646 */
260− break;
261−
262− case 27:
263−-#line 415 "po-gram-gen.y" /* yacc.c:1646 */
264−+#line 412 "po-gram-gen.y" /* yacc.c:1646 */
265− {
266− string_list_init (&(yyval.stringlist).stringlist);
267− string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string);
268−@@ -1652,11 +1649,11 @@ yyreduce:
269− (yyval.stringlist).pos = (yyvsp[0].string).pos;
270− (yyval.stringlist).obsolete = (yyvsp[0].string).obsolete;
271− }
272−-#line 1656 "po-gram-gen.c" /* yacc.c:1646 */
273−+#line 1653 "po-gram-gen.c" /* yacc.c:1646 */
274− break;
275−
276− case 28:
277−-#line 423 "po-gram-gen.y" /* yacc.c:1646 */
278−+#line 420 "po-gram-gen.y" /* yacc.c:1646 */
279− {
280− check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string));
281− (yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist;
282−@@ -1665,11 +1662,11 @@ yyreduce:
283− (yyval.stringlist).pos = (yyvsp[-1].stringlist).pos;
284− (yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete;
285− }
286−-#line 1669 "po-gram-gen.c" /* yacc.c:1646 */
287−+#line 1666 "po-gram-gen.c" /* yacc.c:1646 */
288− break;
289−
290− case 29:
291−-#line 435 "po-gram-gen.y" /* yacc.c:1646 */
292−+#line 432 "po-gram-gen.y" /* yacc.c:1646 */
293− {
294− string_list_init (&(yyval.stringlist).stringlist);
295− string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string);
296−@@ -1677,11 +1674,11 @@ yyreduce:
297− (yyval.stringlist).pos = (yyvsp[0].string).pos;
298− (yyval.stringlist).obsolete = (yyvsp[0].string).obsolete;
299− }
300−-#line 1681 "po-gram-gen.c" /* yacc.c:1646 */
301−+#line 1678 "po-gram-gen.c" /* yacc.c:1646 */
302− break;
303−
304− case 30:
305−-#line 443 "po-gram-gen.y" /* yacc.c:1646 */
306−+#line 440 "po-gram-gen.y" /* yacc.c:1646 */
307− {
308− check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string));
309− (yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist;
310−@@ -1690,11 +1687,11 @@ yyreduce:
311− (yyval.stringlist).pos = (yyvsp[-1].stringlist).pos;
312− (yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete;
313− }
314−-#line 1694 "po-gram-gen.c" /* yacc.c:1646 */
315−+#line 1691 "po-gram-gen.c" /* yacc.c:1646 */
316− break;
317−
318−
319−-#line 1698 "po-gram-gen.c" /* yacc.c:1646 */
320−+#line 1695 "po-gram-gen.c" /* yacc.c:1646 */
321− default: break;
322− }
323− /* User semantic actions sometimes alter yychar, and that requires
pkgs/development/libraries/gettext/default.nix+4−20
@@ -1,24 +1,16 @@
1−{ stdenv, lib, fetchurl, libiconv, xz, bison, automake115x, autoconf }:
1+{ stdenv, lib, fetchurl, libiconv, xz }:
22
3−let allowBisonDependency = !stdenv.isDarwin; in
43stdenv.mkDerivation rec {
54 pname = "gettext";
6− version = "0.19.8.1";
5+ version = "0.20.1";
76
87 src = fetchurl {
98 url = "mirror://gnu/gettext/${pname}-${version}.tar.gz";
10− sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z";
9+ sha256 = "0p3zwkk27wm2m2ccfqm57nj7vqkmfpn7ja1nf65zmhz8qqs5chb6";
1110 };
1211 patches = [
1312 ./absolute-paths.diff
14− (fetchurl {
15− name = "CVE-2018-18751.patch";
16− url = "https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=patch;h=dce3a16e5e9368245735e29bf498dcd5e3e474a4";
17− sha256 = "1lpjwwcjr1sb879faj0xyzw02kma0ivab6xwn3qciy13qy6fq5xn";
18− })
19− ] ++ lib.optionals (!allowBisonDependency) [
20− # Only necessary for CVE-2018-18751.patch:
21− ./CVE-2018-18751-bison.patch
13+ ./gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch
2214 ];
2315
2416 outputs = [ "out" "man" "doc" "info" ];
@@ -54,14 +46,6 @@ stdenv.mkDerivation rec {
5446 nativeBuildInputs = [
5547 xz
5648 xz.bin
57− ]
58− # Only necessary for CVE-2018-18751.patch (unless CVE-2018-18751-bison.patch
59− # is also applied):
60− ++ lib.optional allowBisonDependency bison
61− ++ [
62− # Only necessary for CVE-2018-18751.patch:
63− automake115x
64− autoconf
6549 ];
6650 # HACK, see #10874 (and 14664)
6751 buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;
pkgs/development/libraries/gettext/gettext-setup-hook.sh+1−1
@@ -10,7 +10,7 @@ addEnvHooks "$hostOffset" gettextDataDirsHook
1010
1111# libintl must be listed in load flags on non-Glibc
1212# it doesn't hurt to have it in Glibc either though
13−if [ -n "@gettextNeedsLdflags@" -a -z "$dontAddExtraLibs" ]; then
13+if [ -n "@gettextNeedsLdflags@" -a -z "${dontAddExtraLibs-}" ]; then
1414 # See pkgs/build-support/setup-hooks/role.bash
1515 getHostRole
1616 export NIX_${role_pre}LDFLAGS+=" -lintl"
pkgs/development/libraries/gettext/gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patchnew file+82
@@ -0,0 +1,82 @@
1+From 2336451ed68d91ff4b5ae1acbc1eca30e47a86a9 Mon Sep 17 00:00:00 2001
2+From: Bruno Haible <bruno@clisp.org>
3+Date: Sun, 19 May 2019 13:10:06 +0200
4+Subject: [PATCH] msgmerge: Fix behaviour of --for-msgfmt on PO files with no
5+ translations.
6+
7+Reported by Don Lawrence <dlawrence@iecok.com>
8+in <https://lists.freedesktop.org/archives/p11-glue/2019-May/000700.html>
9+via Daiki Ueno
10+in <https://lists.gnu.org/archive/html/bug-gettext/2019-05/msg00124.html>.
11+
12+* gettext-tools/src/msgmerge.c (main): Treat force_po like true if for_msgfmt
13+is true.
14+* gettext-tools/tests/msgmerge-26: Add test of PO file with no translations.
15+---
16+ gettext-tools/src/msgmerge.c | 4 ++--
17+ gettext-tools/tests/msgmerge-26 | 36 +++++++++++++++++++++++++++++++++---
18+ 2 files changed, 35 insertions(+), 5 deletions(-)
19+
20+diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
21+index cd762c0..92c9b7a 100644
22+--- a/gettext-tools/src/msgmerge.c
23++++ b/gettext-tools/src/msgmerge.c
24+@@ -520,8 +520,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\
25+ else
26+ {
27+ /* Write the merged message list out. */
28+- msgdomain_list_print (result, output_file, output_syntax, force_po,
29+- false);
30++ msgdomain_list_print (result, output_file, output_syntax,
31++ for_msgfmt || force_po, false);
32+ }
33+
34+ exit (EXIT_SUCCESS);
35+diff --git a/gettext-tools/tests/msgmerge-26 b/gettext-tools/tests/msgmerge-26
36+index cd3862e..b86f7a0 100755
37+--- a/gettext-tools/tests/msgmerge-26
38++++ b/gettext-tools/tests/msgmerge-26
39+@@ -73,7 +73,37 @@ msgstr "Papaya"
40+ EOF
41+
42+ : ${DIFF=diff}
43+-${DIFF} mm-test26.ok mm-test26.out
44+-result=$?
45++${DIFF} mm-test26.ok mm-test26.out || Exit 1
46+
47+-exit $result
48++# Test with a PO file that has no translated messages.
49++
50++cat <<\EOF > mm-test26a.in1
51++msgid ""
52++msgstr ""
53++"Content-Type: text/plain; charset=UTF-8\n"
54++
55++msgid "Hello world"
56++msgstr "Hallo Welt"
57++EOF
58++
59++cat <<\EOF > mm-test26a.in2
60++msgid ""
61++msgstr ""
62++"Content-Type: text/plain; charset=ASCII\n"
63++
64++msgid "Hello, world!"
65++msgstr ""
66++EOF
67++
68++: ${MSGMERGE=msgmerge}
69++${MSGMERGE} --for-msgfmt -o mm-test26a.tmp mm-test26a.in1 mm-test26a.in2 \
70++ || Exit 1
71++LC_ALL=C tr -d '\r' < mm-test26a.tmp > mm-test26a.out || Exit 1
72++
73++cat <<\EOF > mm-test26a.ok
74++msgid ""
75++msgstr "Content-Type: text/plain; charset=UTF-8\n"
76++EOF
77++
78++: ${DIFF=diff}
79++${DIFF} mm-test26a.ok mm-test26a.out || Exit 1
80+--
81+1.9.1
82+
pkgs/development/libraries/gle/default.nix+2−2
@@ -1,7 +1,7 @@
1−{stdenv, fetchurl, libGLU_combined, freeglut, libX11, libXt, libXmu, libXi, libXext}:
1+{stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}:
22stdenv.mkDerivation {
33 name = "gle-3.1.0";
4− buildInputs = [libGLU_combined freeglut libX11 libXt libXmu libXi libXext];
4+ buildInputs = [libGLU libGL freeglut libX11 libXt libXmu libXi libXext];
55 src = fetchurl {
66 urls = [
77 "mirror://sourceforge/project/gle/gle/gle-3.1.0/gle-3.1.0.tar.gz"
pkgs/development/libraries/glib/setup-hook.sh+5−3
@@ -1,9 +1,11 @@
11
22make_glib_find_gsettings_schemas() {
33 # For packages that need gschemas of other packages (e.g. empathy)
4− if [ -d "$1"/share/gsettings-schemas/*/glib-2.0/schemas ]; then
5− addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/share/gsettings-schemas/"*
6− fi
4+ for maybe_dir in "$1"/share/gsettings-schemas/*/glib-2.0; do
5+ if [[ -d "$maybe_dir/schemas" ]]; then
6+ addToSearchPath GSETTINGS_SCHEMAS_PATH "$maybe_dir"
7+ fi
8+ done
79}
810addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas
911
pkgs/development/libraries/gnu-efi/default.nix+9−1
@@ -1,4 +1,4 @@
1−{ stdenv, buildPackages, fetchurl, pciutils }:
1+{ stdenv, buildPackages, fetchurl, fetchpatch, pciutils }:
22
33with stdenv.lib;
44
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
1111 sha256 = "1ffnc4xbzfggs37ymrgfx76j56kk2644c081ivhr2bjkla9ag3gj";
1212 };
1313
14+ patches = [
15+ # Fix build on armv6l
16+ (fetchpatch {
17+ url = "https://sourceforge.net/p/gnu-efi/patches/_discuss/thread/25bb273a18/9c4d/attachment/0001-Fix-ARCH-on-armv6-and-other-32-bit-ARM-platforms.patch";
18+ sha256 = "0pj03h20g2bbz6fr753bj1scry6919h57l1h86z3b6q7hqfj0b4r";
19+ })
20+ ];
21+
1422 buildInputs = [ pciutils ];
1523
1624 hardeningDisable = [ "stackprotector" ];
pkgs/development/libraries/gstreamer/bad/default.nix+169−81
@@ -1,16 +1,40 @@
1−{ stdenv, fetchurl, fetchpatch, meson, ninja, gettext
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, gettext
26, config
3−, pkgconfig, python3, gst-plugins-base, orc
7+, pkgconfig
8+, python3
9+, gst-plugins-base
10+, orc
411, gobject-introspection
512, enableZbar ? true
6−, faacSupport ? false, faac ? null
7−, faad2, libass, libkate, libmms, librdf, ladspaH
8−, libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom
9−, libbs2b, libmodplug, mpeg2dec
10−, openjpeg, libopus, librsvg
13+, faacSupport ? false
14+, faac ? null
15+, faad2
16+, libass
17+, libkate
18+, libmms
19+, librdf
20+, ladspaH
21+, libnice
22+, webrtc-audio-processing
23+, lilv
24+, lv2
25+, serd
26+, sord
27+, sratom
28+, libbs2b
29+, libmodplug
30+, mpeg2dec
31+, openjpeg
32+, libopus
33+, librsvg
1134, bluez
1235, chromaprint
1336, curl
37+, darwin
1438, directfb
1539, fdk_aac
1640, flite
@@ -27,7 +51,7 @@
2751, libusb1
2852, neon
2953, openal
30−, opencv3
54+, opencv4
3155, openexr
3256, openh264
3357, pango
@@ -38,10 +62,20 @@
3862, srtp
3963, zbar
4064, wayland-protocols
41−, wildmidi, fluidsynth, libvdpau, wayland
42−, libwebp, xvidcore, gnutls, mjpegtools
43−, libGLU_combined, libintl, libgme
44−, openssl, x265, libxml2
65+, wildmidi
66+, fluidsynth
67+, libvdpau
68+, wayland
69+, libwebp
70+, xvidcore
71+, gnutls
72+, mjpegtools
73+, libGLU_combined
74+, libintl
75+, libgme
76+, openssl
77+, x265
78+, libxml2
4579, srt
4680}:
4781
@@ -49,113 +83,127 @@ assert faacSupport -> faac != null;
4983
5084let
5185 inherit (stdenv.lib) optional optionals;
52−in
53−stdenv.mkDerivation rec {
86+in stdenv.mkDerivation rec {
5487 pname = "gst-plugins-bad";
55− version = "1.16.0";
88+ version = "1.16.1";
5689
57− meta = with stdenv.lib; {
58− description = "Gstreamer Bad Plugins";
59− homepage = "https://gstreamer.freedesktop.org";
60− longDescription = ''
61− a set of plug-ins that aren't up to par compared to the
62− rest. They might be close to being good quality, but they're missing
63− something - be it a good code review, some documentation, a set of tests,
64− a real live maintainer, or some actual wide use.
65− '';
66− license = licenses.lgpl2Plus;
67− platforms = platforms.linux ++ platforms.darwin;
68− maintainers = with maintainers; [ matthewbauer ];
69− };
90+ outputs = [ "out" "dev" ];
7091
71− preConfigure = ''
72− patchShebangs .
73− '';
92+ src = fetchurl {
93+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
94+ sha256 = "1dddqacxgp77f3nl153x5a6139wdphc9phds2fpqb2cv6faiqj2n";
95+ };
7496
7597 patches = [
7698 ./fix_pkgconfig_includedir.patch
77− # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/312 is merged and available to us
78− (fetchpatch {
79− url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/99790eaad9083cce5ab2b1646489e1a1c0faad1e.patch";
80− sha256 = "11bqy4sl05qq5mj4bx5s09rq106s3j0vnpjl4np058im32j69lr3";
81− })
82− # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/312 is merged and available to us
83− (fetchpatch {
84− url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/1872da81c48d3a719bd39955fd97deac7d037d74.patch";
85− sha256 = "11zwrr5ggflmvr0qfssj7dmhgd3ybiadmy79b4zh24022zgw3xpz";
86− })
8799 ];
88100
89− src = fetchurl {
90− url = "${meta.homepage}/src/gst-plugins-bad/${pname}-${version}.tar.xz";
91− sha256 = "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2";
92− };
93−
94− outputs = [ "out" "dev" ];
95−
96101 nativeBuildInputs = [
97− meson ninja pkgconfig python3 gettext gobject-introspection
98− ]
99− ++ optionals stdenv.isLinux [
102+ meson
103+ ninja
104+ pkgconfig
105+ python3
106+ gettext
107+ gobject-introspection
108+ ] ++ optionals stdenv.isLinux [
100109 wayland-protocols
101110 ];
102111
103112 buildInputs = [
104− gst-plugins-base orc
105− faad2 libass libkate libmms
106− libnice webrtc-audio-processing # webrtc
113+ gst-plugins-base
114+ orc
115+ faad2
116+ libass
117+ libkate
118+ libmms
119+ webrtc-audio-processing # webrtc
107120 libbs2b
108− ladspaH librdf # ladspa plug-in
109− lilv lv2 serd sord sratom # lv2 plug-in
110− libmodplug mpeg2dec
111− openjpeg libopus librsvg
112− bluez
113− chromaprint
121+ libmodplug
122+ mpeg2dec
123+ openjpeg
124+ libopus
125+ librsvg
114126 curl.dev
115− directfb
116127 fdk_aac
117− flite
118128 gsm
119129 libaom
120130 libdc1394
121131 libde265
122− libdrm
123132 libdvdnav
124133 libdvdread
125− libgudev
126− libofa
127134 libsndfile
128135 libusb1
136+ mjpegtools
129137 neon
130138 openal
131− opencv3
139+ opencv4
132140 openexr
133141 openh264
134142 rtmpdump
135143 pango
136− sbc
137144 soundtouch
138− spandsp
139145 srtp
140− fluidsynth libvdpau
141− libwebp xvidcore gnutls libGLU_combined
142− libgme openssl x265 libxml2
146+ fluidsynth
147+ libvdpau
148+ libwebp
149+ xvidcore
150+ gnutls
151+ libGLU_combined
152+ libgme
153+ openssl
154+ x265
155+ libxml2
143156 libintl
144157 srt
145− ]
146− ++ optional enableZbar zbar
147− ++ optional faacSupport faac
148− ++ optional stdenv.isLinux wayland
158+ ] ++ optionals enableZbar [
159+ zbar
160+ ] ++ optionals faacSupport [
161+ faac
162+ ] ++ optionals stdenv.isLinux [
163+ bluez
164+ wayland
165+ ] ++ optionals (!stdenv.isDarwin) [
149166 # wildmidi requires apple's OpenAL
150167 # TODO: package apple's OpenAL, fix wildmidi, include on Darwin
151− ++ optional (!stdenv.isDarwin) wildmidi
168+ wildmidi
152169 # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin
153− ++ optional (!stdenv.isDarwin) mjpegtools;
170+ mjpegtools
154171
155− mesonFlags = [
156− # Enables all features, so that we know when new dependencies are necessary.
157− "-Dauto_features=enabled"
172+ chromaprint
173+ directfb
174+ flite
175+ libdrm
176+ libgudev
177+ libnice
178+ libofa
179+ librdf
180+ sbc
181+ spandsp
182+
183+ # ladspa plug-in
184+ ladspaH
185+ librdf # TODO: make build on Darwin
158186
187+ # lv2 plug-in
188+ lilv
189+ lv2
190+ serd
191+ sord
192+ sratom
193+ ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
194+ # For unknown reasons the order is important, e.g. if
195+ # VideoToolbox is last, we get:
196+ # fatal error: 'VideoToolbox/VideoToolbox.h' file not found
197+ VideoToolbox
198+ AudioToolbox
199+ AVFoundation
200+ CoreMedia
201+ CoreVideo
202+ Foundation
203+ MediaToolbox
204+ ]);
205+
206+ mesonFlags = [
159207 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
160208
161209 "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development"
@@ -191,10 +239,50 @@ stdenv.mkDerivation rec {
191239 # see https://github.com/NixOS/nixpkgs/issues/54395
192240 "-Dnvdec=disabled"
193241 "-Dnvenc=disabled"
242+ ]
243+ ++ optionals stdenv.isDarwin [
244+ "-Dbluez=disabled"
245+ "-Dchromaprint=disabled"
246+ "-Ddirectfb=disabled"
247+ "-Dflite=disabled"
248+ "-Dkms=disabled" # renders to libdrm output
249+ "-Dofa=disabled"
250+ "-Dlv2=disabled"
251+ "-Dsbc=disabled"
252+ "-Dspandsp=disabled"
253+ "-Ddvb=disabled"
254+ "-Dfbdev=disabled"
255+ "-Duvch264=disabled" # requires gudev
256+ "-Dladspa=disabled" # requires lrdf
257+ "-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs
258+ "-Dwildmidi=disabled" # see dependencies above
259+ ] ++ optionals (!gst-plugins-base.glEnabled) [
260+ "-Dgl=disabled"]
261+ ++ optionals (!gst-plugins-base.waylandEnabled) [
262+ "-Dwayland=disabled"
263+ ] ++ optionals (!gst-plugins-base.glEnabled) [
264+ # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`,
265+ # but its meson build system does not declare the dependency.
266+ "-Dapplemedia=disabled"
194267 ];
195268
196− enableParallelBuilding = true;
269+ # This package has some `_("string literal")` string formats
270+ # that trip up clang with format security enabled.
271+ hardeningDisable = [ "format" ];
197272
198273 doCheck = false; # fails 20 out of 58 tests, expensive
199274
275+ meta = with stdenv.lib; {
276+ description = "GStreamer Bad Plugins";
277+ homepage = "https://gstreamer.freedesktop.org";
278+ longDescription = ''
279+ a set of plug-ins that aren't up to par compared to the
280+ rest. They might be close to being good quality, but they're missing
281+ something - be it a good code review, some documentation, a set of tests,
282+ a real live maintainer, or some actual wide use.
283+ '';
284+ license = licenses.lgpl2Plus;
285+ platforms = platforms.linux ++ platforms.darwin;
286+ maintainers = with maintainers; [ matthewbauer ];
287+ };
200288}
pkgs/development/libraries/gstreamer/base/default.nix+111−58
@@ -1,100 +1,153 @@
1−{ stdenv, fetchurl, fetchpatch, lib
2−, pkgconfig, meson, ninja, gettext, gobject-introspection
3−, python3, gstreamer, orc, pango, libtheora
4−, libintl, libopus
1+{ stdenv
2+, fetchurl
3+, lib
4+, pkgconfig
5+, meson
6+, ninja
7+, gettext
8+, gobject-introspection
9+, python3
10+, gstreamer
11+, orc
12+, pango
13+, libtheora
14+, libintl
15+, libopus
516, isocodes
617, libjpeg
18+, libpng
719, libvisual
820, tremor # provides 'virbisidec'
921, libGL
10−, gtk-doc, docbook_xsl, docbook_xml_dtd_412
11−, enableX11 ? stdenv.isLinux, libXv
12−, enableWayland ? stdenv.isLinux, wayland
13−, enableAlsa ? stdenv.isLinux, alsaLib
14−, enableCocoa ? false, darwin
15−, enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }:
22+, gtk-doc
23+, docbook_xsl
24+, docbook_xml_dtd_43
25+, enableX11 ? stdenv.isLinux
26+, libXv
27+, enableWayland ? stdenv.isLinux
28+, wayland
29+, enableAlsa ? stdenv.isLinux
30+, alsaLib
31+# Enabling Cocoa seems to currently not work, giving compile
32+# errors. Suspected is that a newer version than clang
33+# is needed than 5.0 but it is not clear.
34+, enableCocoa ? false
35+, darwin
36+, enableGl ? (enableX11 || enableWayland || enableCocoa)
37+, enableCdparanoia ? (!stdenv.isDarwin)
38+, cdparanoia
39+}:
1640
1741stdenv.mkDerivation rec {
1842 pname = "gst-plugins-base";
19− version = "1.16.0";
43+ version = "1.16.1";
2044
21− meta = with lib; {
22− description = "Base plugins and helper libraries";
23− homepage = https://gstreamer.freedesktop.org;
24− license = licenses.lgpl2Plus;
25− platforms = platforms.unix;
26− maintainers = with maintainers; [ matthewbauer ];
27− };
45+ outputs = [ "out" "dev" ];
2846
2947 src = fetchurl {
30− url = "${meta.homepage}/src/gst-plugins-base/${pname}-${version}.tar.xz";
31− sha256 = "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0";
48+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
49+ sha256 = "0aybbwnzm15074smdk2bamj3ssck3hjvmilvgh49f19xjf4w8g2w";
3250 };
3351
34− outputs = [ "out" "dev" ];
52+ patches = [
53+ ./fix_pkgconfig_includedir.patch
54+ ];
3555
3656 nativeBuildInputs = [
37− pkgconfig python3 gettext gobject-introspection
57+ meson
58+ ninja
59+ pkgconfig
60+ python3
61+ gettext
62+ gobject-introspection
63+
64+ # docs
3865 gtk-doc
39− # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install`
40− docbook_xsl docbook_xml_dtd_412
41− ]
42− # Broken meson with Darwin. Should hopefully be fixed soon. Tracking
43− # in https://bugzilla.gnome.org/show_bug.cgi?id=781148.
44− ++ lib.optionals (!stdenv.isDarwin) [ meson ninja ];
66+ docbook_xsl
67+ docbook_xml_dtd_43
68+ ];
4569
46− # On Darwin, we currently use autoconf, on all other systems Meson
47− # TODO Switch to Meson on Darwin as well
70+ buildInputs = [
71+ orc
72+ libtheora
73+ libintl
74+ libopus
75+ isocodes
76+ libpng
77+ libjpeg
78+ tremor
79+ libGL
80+ ] ++ lib.optional (!stdenv.isDarwin) [
81+ libvisual
82+ ] ++ lib.optionals stdenv.isDarwin [
83+ pango
84+ darwin.apple_sdk.frameworks.OpenGL
85+ ] ++ lib.optional enableAlsa alsaLib
86+ ++ lib.optionals enableX11 [ libXv pango ]
87+ ++ lib.optional enableWayland wayland
88+ ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa
89+ ++ lib.optional enableCdparanoia cdparanoia;
4890
49− # TODO How to pass these to Meson?
50− configureFlags = lib.optionals stdenv.isDarwin [
51− "--enable-x11=${if enableX11 then "yes" else "no"}"
52− "--enable-wayland=${if enableWayland then "yes" else "no"}"
53− "--enable-cocoa=${if enableCocoa then "yes" else "no"}"
54− ]
55− # Introspection fails on my MacBook currently
56− ++ lib.optional stdenv.isDarwin "--disable-introspection";
91+ propagatedBuildInputs = [
92+ gstreamer
93+ ];
5794
58− mesonFlags = lib.optionals (!stdenv.isDarwin) [
59− # Enables all features, so that we know when new dependencies are necessary.
60− "-Dauto_features=enabled"
95+ mesonFlags = [
6196 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
6297 "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing
98+ "-Dgl_platform=[${lib.optionalString (enableX11 || enableWayland || enableCocoa) "auto"}]"
6399 # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
64100 "-Dgl_winsys=[${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}]"
65101 # We must currently disable gtk_doc API docs generation,
66102 # because it is not compatible with some features being disabled.
67103 # See for example
68− # https://gitlab.gnome.org/GNOME/gnome-build-meta/issues/38
104+ # https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/564
69105 # for it failing because some Wayland symbols are missing.
70106 # This problem appeared between 1.15.1 and 1.16.0.
107+ # In 1.18 they should switch to hotdoc, which should make this issue irrelevant.
71108 "-Dgtk_doc=disabled"
72109 ]
73110 ++ lib.optional (!enableX11) "-Dx11=disabled"
74111 # TODO How to disable Wayland?
112+ ++ lib.optional (!enableGl) "-Dgl=disabled"
75113 ++ lib.optional (!enableAlsa) "-Dalsa=disabled"
76114 ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled"
77− ;
78−
79− buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor libGL ]
80− ++ lib.optional (!stdenv.isDarwin) libvisual
81− ++ lib.optional enableAlsa alsaLib
82− ++ lib.optionals enableX11 [ libXv pango ]
83− ++ lib.optional enableWayland wayland
84− ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa
85− ++ lib.optional enableCdparanoia cdparanoia;
86−
87− propagatedBuildInputs = [ gstreamer ];
115+ ++ lib.optionals stdenv.isDarwin [
116+ "-Dlibvisual=disabled"
117+ ];
88118
89119 postPatch = ''
90− patchShebangs .
120+ patchShebangs common/scangobj-merge.py
91121 '';
92122
93− enableParallelBuilding = true;
123+ # This package has some `_("string literal")` string formats
124+ # that trip up clang with format security enabled.
125+ hardeningDisable = [ "format" ];
94126
95127 doCheck = false; # fails, wants DRI access for OpenGL
96128
97− patches = [
98− ./fix_pkgconfig_includedir.patch
99− ];
129+ passthru = {
130+ # Downstream `gst-*` packages depending on `gst-plugins-base`
131+ # have meson build options like 'gl' etc. that depend
132+ # on these features being built in `-base`.
133+ # If they are not built here, then the downstream builds
134+ # will fail, as they, too, use `-Dauto_features=enabled`
135+ # which would enable these options unconditionally.
136+ # That means we must communicate to these downstream packages
137+ # if the `-base` enabled these options or not, so that
138+ # the can enable/disable those features accordingly.
139+ # The naming `*Enabled` vs `enable*` is intentional to
140+ # distinguish inputs from outputs (what is to be built
141+ # vs what was built) and to make them easier to search for.
142+ glEnabled = enableGl;
143+ waylandEnabled = enableWayland;
144+ };
145+
146+ meta = with lib; {
147+ description = "Base GStreamer plug-ins and helper libraries";
148+ homepage = "https://gstreamer.freedesktop.org";
149+ license = licenses.lgpl2Plus;
150+ platforms = platforms.unix;
151+ maintainers = with maintainers; [ matthewbauer ];
152+ };
100153}
pkgs/development/libraries/gstreamer/core/default.nix+66−41
@@ -1,10 +1,23 @@
1−{ stdenv, fetchurl, fetchpatch, meson, ninja
2−, pkgconfig, gettext, gobject-introspection
3−, bison, flex, python3, glib, makeWrapper
4−, libcap,libunwind, darwin
1+{ stdenv
2+, fetchurl
3+, fetchpatch
4+, meson
5+, ninja
6+, pkgconfig
7+, gettext
8+, gobject-introspection
9+, bison
10+, flex
11+, python3
12+, glib
13+, makeWrapper
14+, libcap
15+, libunwind
16+, darwin
517, elfutils # for libdw
618, bash-completion
7−, docbook_xsl, docbook_xml_dtd_412
19+, docbook_xsl
20+, docbook_xml_dtd_43
821, gtk-doc
922, lib
1023, CoreServices
@@ -12,50 +25,66 @@
1225
1326stdenv.mkDerivation rec {
1427 pname = "gstreamer";
15− version = "1.16.0";
28+ version = "1.16.1";
1629
17− meta = with lib ;{
18− description = "Open source multimedia framework";
19− homepage = https://gstreamer.freedesktop.org;
20− license = licenses.lgpl2Plus;
21− platforms = platforms.unix;
22− maintainers = with maintainers; [ ttuegel matthewbauer ];
23− };
30+ outputs = [ "out" "dev" "devdoc" ];
31+ outputBin = "dev";
2432
2533 src = fetchurl {
26− url = "${meta.homepage}/src/gstreamer/${pname}-${version}.tar.xz";
27− sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf";
34+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
35+ sha256 = "0z9pyhf6zm1r0spw6zym80bvbyx6h8xg9h6535csbnn48ws1q882";
2836 };
2937
3038 patches = [
3139 ./fix_pkgconfig_includedir.patch
3240 ];
3341
34− outputs = [ "out" "dev" ];
35− outputBin = "dev";
36−
3742 nativeBuildInputs = [
38− meson ninja pkgconfig gettext bison flex python3 makeWrapper gobject-introspection
43+ meson
44+ ninja
45+ pkgconfig
46+ gettext
47+ bison
48+ flex
49+ python3
50+ makeWrapper
51+ gobject-introspection
3952 bash-completion
53+
54+ # documentation
4055 gtk-doc
41− # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install`
42− docbook_xsl docbook_xml_dtd_412
56+ docbook_xsl
57+ docbook_xml_dtd_43
4358 ];
4459
45− buildInputs =
46− lib.optionals stdenv.isLinux [ libcap libunwind elfutils ]
47− ++ lib.optional stdenv.isDarwin CoreServices;
60+ buildInputs = lib.optionals stdenv.isLinux [
61+ libcap
62+ libunwind
63+ elfutils
64+ ] ++ lib.optionals stdenv.isDarwin [
65+ CoreServices
66+ ];
4867
49− propagatedBuildInputs = [ glib ];
68+ propagatedBuildInputs = [
69+ glib
70+ ];
5071
5172 mesonFlags = [
52− # Enables all features, so that we know when new dependencies are necessary.
53− "-Dauto_features=enabled"
5473 "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those
5574 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
56− ]
75+ ] ++ lib.optionals stdenv.isDarwin [
5776 # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it.
58− ++ stdenv.lib.optionals stdenv.isDarwin [ "-Dlibunwind=disabled" "-Dlibdw=disabled" ];
77+ "-Dlibunwind=disabled"
78+ "-Dlibdw=disabled"
79+ ];
80+
81+ postPatch = ''
82+ patchShebangs \
83+ gst/parse/get_flex_version.py \
84+ gst/parse/gen_grammar.py.in \
85+ gst/parse/gen_lex.py.in \
86+ libs/gst/helpers/ptp_helper_post_install.sh
87+ '';
5988
6089 postInstall = ''
6190 for prog in "$dev/bin/"*; do
@@ -64,21 +93,17 @@ stdenv.mkDerivation rec {
6493 done
6594 '';
6695
67− preConfigure=
68− # These files are not executable upstream, so we need to
69− # make them executable for `patchShebangs` to pick them up.
70− # Can be removed when this is merged and available:
71− # https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/141
72− ''
73− chmod +x gst/parse/get_flex_version.py
74− '' +
75− ''
76− patchShebangs .
77− '';
78−
7996 preFixup = ''
8097 moveToOutput "share/bash-completion" "$dev"
8198 '';
8299
83100 setupHook = ./setup-hook.sh;
101+
102+ meta = with lib ;{
103+ description = "Open source multimedia framework";
104+ homepage = "https://gstreamer.freedesktop.org";
105+ license = licenses.lgpl2Plus;
106+ platforms = platforms.unix;
107+ maintainers = with maintainers; [ ttuegel matthewbauer ];
108+ };
84109}
pkgs/development/libraries/gstreamer/core/setup-hook.sh+1−1
@@ -1,7 +1,7 @@
11addGstreamer1LibPath () {
22 if test -d "$1/lib/gstreamer-1.0"
33 then
4− export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_SYSTEM_PATH_1_0}${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$1/lib/gstreamer-1.0"
4+ export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_SYSTEM_PATH_1_0-}${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$1/lib/gstreamer-1.0"
55 fi
66}
77
pkgs/development/libraries/gstreamer/ges/default.nix+46−19
@@ -1,39 +1,66 @@
1−{ stdenv, fetchurl, fetchpatch, meson, ninja
2−, pkgconfig, python, gst-plugins-base, libxml2
3−, flex, perl, gettext, gobject-introspection
1+{ stdenv
2+, fetchurl
3+, fetchpatch
4+, meson
5+, ninja
6+, pkgconfig
7+, python
8+, gst-plugins-base
9+, libxml2
10+, flex
11+, perl
12+, gettext
13+, gobject-introspection
414}:
515
616stdenv.mkDerivation rec {
717 pname = "gstreamer-editing-services";
8− version = "1.16.0";
18+ version = "1.16.1";
919
10− meta = with stdenv.lib; {
11− description = "Library for creation of audio/video non-linear editors";
12− homepage = "https://gstreamer.freedesktop.org";
13− license = licenses.lgpl2Plus;
14− platforms = platforms.unix;
15− };
20+ outputs = [ "out" "dev" ];
1621
1722 src = fetchurl {
18− url = "${meta.homepage}/src/gstreamer-editing-services/${pname}-${version}.tar.xz";
19− sha256 = "1las94jkx83sxmzi5w6b0xm89dqqwzpdsb6h9w9ixndhnbpzm8w2";
23+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
24+ sha256 = "10375z5mc3bwfs07mhmfx943sbp55z8m8ihp9xpcknkdks7qg168";
2025 };
2126
22− outputs = [ "out" "dev" ];
27+ patches = [
28+ ./fix_pkgconfig_includedir.patch
29+ ];
30+
31+ nativeBuildInputs = [
32+ meson
33+ ninja
34+ pkgconfig
35+ gettext
36+ gobject-introspection
37+ python
38+ flex
39+ perl
40+ ];
2341
24− nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection python flex perl ];
42+ buildInputs = [
43+ libxml2
44+ ];
2545
26− propagatedBuildInputs = [ gst-plugins-base libxml2 ];
46+ propagatedBuildInputs = [
47+ gst-plugins-base
48+ ];
2749
2850 mesonFlags = [
2951 "-Dgtk_doc=disabled"
3052 ];
3153
32− patches = [
33− ./fix_pkgconfig_includedir.patch
34− ];
35−
3654 postPatch = ''
55+ # for some reason, gst-plugins-bad cannot be found
56+ # fortunately, they are only used by tests, which we do not run
3757 sed -i -r -e 's/p(bad|good) = .*/p\1 = pbase/' tests/check/meson.build
3858 '';
59+
60+ meta = with stdenv.lib; {
61+ description = "Library for creation of audio/video non-linear editors";
62+ homepage = "https://gstreamer.freedesktop.org";
63+ license = licenses.lgpl2Plus;
64+ platforms = platforms.unix;
65+ };
3966}
pkgs/development/libraries/gstreamer/good/default.nix+105−48
@@ -1,14 +1,37 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, python
2−, gst-plugins-base, orc, bzip2, gettext
3−, libv4l, libdv, libavc1394, libiec61883
4−, libvpx, speex, flac, taglib, libshout
5−, cairo, gdk-pixbuf, aalib, libcaca
6−, libsoup, libpulseaudio, libintl
7−, darwin, lame, mpg123, twolame
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, pkgconfig
6+, python
7+, gst-plugins-base
8+, orc
9+, bzip2
10+, gettext
11+, libv4l
12+, libdv
13+, libavc1394
14+, libiec61883
15+, libvpx
16+, speex
17+, flac
18+, taglib
19+, libshout
20+, cairo
21+, gdk-pixbuf
22+, aalib
23+, libcaca
24+, libsoup
25+, libpulseaudio
26+, libintl
27+, darwin
28+, lame
29+, mpg123
30+, twolame
831, gtkSupport ? false, gtk3 ? null
9−# As of writing, jack2 incurs a Qt dependency (big!) via `ffado`.
10−# In the fuure we should probably split `ffado`.
11−, enableJack ? false
32+ # As of writing, jack2 incurs a Qt dependency (big!) via `ffado`.
33+ # In the future we should probably split `ffado`.
34+, enableJack ? false, jack2
1235, libXdamage
1336, libXext
1437, libXfixes
@@ -16,7 +39,6 @@
1639, xorg
1740, libgudev
1841, wavpack
19−, jack2
2042}:
2143
2244assert gtkSupport -> gtk3 != null;
@@ -26,39 +48,44 @@ let
2648in
2749stdenv.mkDerivation rec {
2850 pname = "gst-plugins-good";
29− version = "1.16.0";
51+ version = "1.16.1";
3052
31− meta = with stdenv.lib; {
32− description = "Gstreamer Good Plugins";
33− homepage = "https://gstreamer.freedesktop.org";
34− longDescription = ''
35− a set of plug-ins that we consider to have good quality code,
36− correct functionality, our preferred license (LGPL for the plug-in
37− code, LGPL or LGPL-compatible for the supporting library).
38− '';
39− license = licenses.lgpl2Plus;
40− platforms = platforms.linux ++ platforms.darwin;
41− maintainers = with maintainers; [ matthewbauer ];
42− };
53+ outputs = [ "out" "dev" ];
4354
4455 src = fetchurl {
45− url = "${meta.homepage}/src/gst-plugins-good/${pname}-${version}.tar.xz";
46− sha256 = "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5";
56+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
57+ sha256 = "07wgz9anf4ram2snp8n1wv6l0q3pd00iaw8bvw3wgklg05lvxflz";
4758 };
4859
49− outputs = [ "out" "dev" ];
50−
5160 patches = [ ./fix_pkgconfig_includedir.patch ];
5261
53− nativeBuildInputs = [ pkgconfig python meson ninja gettext ];
54−
55− NIX_LDFLAGS = "-lncurses";
62+ nativeBuildInputs = [
63+ pkgconfig
64+ python
65+ meson
66+ ninja
67+ gettext
68+ ];
5669
5770 buildInputs = [
58− gst-plugins-base orc bzip2
59− libdv libvpx speex flac taglib
60− cairo gdk-pixbuf aalib libcaca
61− libsoup libshout lame mpg123 twolame libintl
71+ gst-plugins-base
72+ orc
73+ bzip2
74+ libdv
75+ libvpx
76+ speex
77+ flac
78+ taglib
79+ cairo
80+ gdk-pixbuf
81+ aalib
82+ libcaca
83+ libsoup
84+ libshout
85+ lame
86+ mpg123
87+ twolame
88+ libintl
6289 libXdamage
6390 libXext
6491 libXfixes
@@ -66,29 +93,59 @@ stdenv.mkDerivation rec {
6693 xorg.libXfixes
6794 xorg.libXdamage
6895 wavpack
69− ]
70− ++ optional gtkSupport gtk3 # for gtksink
71− ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
72− ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev ]
73− ++ optionals (stdenv.isLinux && enableJack) [
96+ ] ++ optional gtkSupport [
97+ # for gtksink
98+ gtk3
99+ ] ++ optionals stdenv.isDarwin [
100+ darwin.apple_sdk.frameworks.Cocoa
101+ ] ++ optionals stdenv.isLinux [
102+ libv4l
103+ libpulseaudio
104+ libavc1394
105+ libiec61883
106+ libgudev
107+ ] ++ optionals (stdenv.isLinux && enableJack) [
74108 jack2
75109 ];
76110
77111 mesonFlags = [
78− # Enables all features, so that we know when new dependencies are necessary.
79− "-Dauto_features=enabled"
80112 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
81113 "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps
82− ]
83− ++ optional (!gtkSupport) "-Dgtk3=disabled"
84− ++ optionals (!stdenv.isLinux || !enableJack) [
114+ ] ++ optionals (!gtkSupport) [
115+ "-Dgtk3=disabled"
116+ ] ++ optionals (!stdenv.isLinux || !enableJack) [
85117 "-Djack=disabled" # unclear whether Jack works on Darwin
86− ]
87− ++ optionals (!stdenv.isLinux) [
88− "-Dv4l2-gudev=disabled"
118+ ] ++ optionals (!stdenv.isLinux) [
119+ "-Ddv1394=disabled" # Linux only
120+ "-Doss4=disabled" # Linux only
121+ "-Doss=disabled" # Linux only
122+ "-Dpulse=disabled" # TODO check if we can keep this enabled
123+ "-Dv4l2-gudev=disabled" # Linux-only
124+ "-Dv4l2=disabled" # Linux-only
125+ "-Dximagesrc=disabled" # Linux-only
126+ "-Dpulse=disabled" # TODO check if we can keep this enabled
127+ ];
128+
129+
130+ NIX_LDFLAGS = [
131+ # linking error on Darwin
132+ # https://github.com/NixOS/nixpkgs/pull/70690#issuecomment-553694896
133+ "-lncurses"
89134 ];
90135
91136 # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''"
92137 doCheck = false;
93138
139+ meta = with stdenv.lib; {
140+ description = "GStreamer Good Plugins";
141+ homepage = "https://gstreamer.freedesktop.org";
142+ longDescription = ''
143+ a set of plug-ins that we consider to have good quality code,
144+ correct functionality, our preferred license (LGPL for the plug-in
145+ code, LGPL or LGPL-compatible for the supporting library).
146+ '';
147+ license = licenses.lgpl2Plus;
148+ platforms = platforms.linux ++ platforms.darwin;
149+ maintainers = with maintainers; [ matthewbauer ];
150+ };
94151}
pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, gstreamer, xorg, alsaLib, cdparanoia
1+{ fetchurl, fetchpatch, stdenv, pkgconfig, gstreamer, xorg, alsaLib, cdparanoia
22, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
33, libintl
44, ApplicationServices
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
2020
2121 patches = [
2222 ./gcc-4.9.patch
23− (fetchurl {
23+ (fetchpatch {
2424 url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/commit/f672277509705c4034bc92a141eefee4524d15aa.patch";
2525 name = "CVE-2019-9928.patch";
26− sha256 = "0hz3lsq3ppmaf329sbyi05y1qniqfj9vlp2f3z918383pvrcms4i";
26+ sha256 = "1dlamsmyr7chrb6vqqmwikqvvqcx5l7k72p98448qm6k59ndnimc";
2727 })
2828 ];
2929
pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh+1−1
@@ -1,7 +1,7 @@
11addGstreamerLibPath () {
22 if test -d "$1/lib/gstreamer-0.10"
33 then
4− export GST_PLUGIN_SYSTEM_PATH="${GST_PLUGIN_SYSTEM_PATH}${GST_PLUGIN_SYSTEM_PATH:+:}$1/lib/gstreamer-0.10"
4+ export GST_PLUGIN_SYSTEM_PATH="${GST_PLUGIN_SYSTEM_PATH-}${GST_PLUGIN_SYSTEM_PATH:+:}$1/lib/gstreamer-0.10"
55 fi
66}
77
pkgs/development/libraries/gstreamer/libav/default.nix+29−26
@@ -1,43 +1,46 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig
2−, python, yasm, gst-plugins-base, orc, bzip2
3−, gettext, withSystemLibav ? true, libav ? null
1+{ stdenv
2+, lib
3+, fetchurl
4+, meson
5+, ninja
6+, pkgconfig
7+, python3
8+, gst-plugins-base
9+, gettext
10+, libav
411}:
512
613# Note that since gst-libav-1.6, libav is actually ffmpeg. See
714# https://gstreamer.freedesktop.org/releases/1.6/ for more info.
815
9−assert withSystemLibav -> libav != null;
10−
1116stdenv.mkDerivation rec {
1217 pname = "gst-libav";
13− version = "1.16.0";
14−
15− meta = {
16− homepage = https://gstreamer.freedesktop.org;
17− license = stdenv.lib.licenses.lgpl2Plus;
18− platforms = stdenv.lib.platforms.unix;
19− };
18+ version = "1.16.1";
2019
2120 src = fetchurl {
22− url = "${meta.homepage}/src/gst-libav/${pname}-${version}.tar.xz";
23− sha256 = "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z";
21+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
22+ sha256 = "1i31ra0l77cfahb6k5xpx45zwvpskzm848aijsbbx9x4x65799g8";
2423 };
2524
2625 outputs = [ "out" "dev" ];
2726
28− nativeBuildInputs = with stdenv.lib;
29− [ meson ninja gettext pkgconfig python ]
30− ++ optional (!withSystemLibav) yasm
31− ;
32−
33− buildInputs = with stdenv.lib;
34− [ gst-plugins-base orc bzip2 ]
35− ++ optional withSystemLibav libav
36− ;
27+ nativeBuildInputs = [
28+ meson
29+ ninja
30+ gettext
31+ pkgconfig
32+ python3
33+ ];
3734
38− mesonFlags = [
39− # Enables all features, so that we know when new dependencies are necessary.
40− "-Dauto_features=enabled"
35+ buildInputs = [
36+ gst-plugins-base
37+ libav
4138 ];
4239
40+ meta = with lib; {
41+ description = "FFmpeg/libav plugin for GStreamer";
42+ homepage = "https://gstreamer.freedesktop.org";
43+ license = licenses.lgpl2Plus;
44+ platforms = platforms.unix;
45+ };
4346}
pkgs/development/libraries/gstreamer/rtsp-server/default.nix+32−20
@@ -1,38 +1,50 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig
2−, gettext, gobject-introspection
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, pkgconfig
6+, gettext
7+, gobject-introspection
38, gst-plugins-base
49, gst-plugins-bad
510}:
611
712stdenv.mkDerivation rec {
813 pname = "gst-rtsp-server";
9− version = "1.16.0";
10−
11− meta = with stdenv.lib; {
12− description = "Gstreamer RTSP server";
13− homepage = "https://gstreamer.freedesktop.org";
14− longDescription = ''
15− a library on top of GStreamer for building an RTSP server.
16− '';
17− license = licenses.lgpl2Plus;
18− platforms = platforms.linux ++ platforms.darwin;
19− maintainers = with maintainers; [ bkchr ];
20− };
14+ version = "1.16.1";
2115
2216 src = fetchurl {
23− url = "${meta.homepage}/src/gst-rtsp-server/${pname}-${version}.tar.xz";
24− sha256 = "069zy159izy50blci9fli1i2r8jh91qkmgrz1n0xqciy3bn9x3hr";
17+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
18+ sha256 = "0i01f1nr0921z6z4nrh8icz76s2n7i228aqxg1ihvxl65ynsraxh";
2519 };
2620
2721 outputs = [ "out" "dev" ];
2822
29− nativeBuildInputs = [ meson ninja gettext gobject-introspection pkgconfig ];
23+ nativeBuildInputs = [
24+ meson
25+ ninja
26+ gettext
27+ gobject-introspection
28+ pkgconfig
29+ ];
3030
31− buildInputs = [ gst-plugins-base gst-plugins-bad ];
31+ buildInputs = [
32+ gst-plugins-base
33+ gst-plugins-bad
34+ ];
3235
3336 mesonFlags = [
34− # Enables all features, so that we know when new dependencies are necessary.
35− "-Dauto_features=enabled"
3637 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
3738 ];
39+
40+ meta = with stdenv.lib; {
41+ description = "GStreamer RTSP server";
42+ homepage = "https://gstreamer.freedesktop.org";
43+ longDescription = ''
44+ A library on top of GStreamer for building an RTSP server.
45+ '';
46+ license = licenses.lgpl2Plus;
47+ platforms = platforms.unix;
48+ maintainers = with maintainers; [ bkchr ];
49+ };
3850}
pkgs/development/libraries/gstreamer/ugly/default.nix+54−31
@@ -1,53 +1,76 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, python
2−, gst-plugins-base, orc, gettext
3−, a52dec, libcdio, libdvdread
4−, libmad, libmpeg2, x264, libintl, lib
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, pkgconfig
6+, python
7+, gst-plugins-base
8+, orc
9+, gettext
10+, a52dec
11+, libcdio
12+, libdvdread
13+, libmad
14+, libmpeg2
15+, x264
16+, libintl
17+, lib
518, opencore-amr
619, darwin
720}:
821
922stdenv.mkDerivation rec {
1023 pname = "gst-plugins-ugly";
11− version = "1.16.0";
24+ version = "1.16.1";
1225
13− meta = with lib; {
14− description = "Gstreamer Ugly Plugins";
15− homepage = "https://gstreamer.freedesktop.org";
16− longDescription = ''
17− a set of plug-ins that have good quality and correct functionality,
18− but distributing them might pose problems. The license on either
19− the plug-ins or the supporting libraries might not be how we'd
20− like. The code might be widely known to present patent problems.
21− '';
22− license = licenses.lgpl2Plus;
23− platforms = platforms.unix;
24− maintainers = with maintainers; [ matthewbauer ];
25− };
26+ outputs = [ "out" "dev" ];
2627
2728 src = fetchurl {
28− url = "${meta.homepage}/src/gst-plugins-ugly/${pname}-${version}.tar.xz";
29− sha256 = "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3";
29+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
30+ sha256 = "07cajqjs8pqchpf2sm87hljx4ibwvkiavqxmacxsr5airar17yab";
3031 };
3132
32− outputs = [ "out" "dev" ];
33−
34− nativeBuildInputs = [ meson ninja gettext pkgconfig python ];
33+ nativeBuildInputs = [
34+ meson
35+ ninja
36+ gettext
37+ pkgconfig
38+ python
39+ ];
3540
3641 buildInputs = [
37− gst-plugins-base orc
38− a52dec libcdio libdvdread
39− libmad libmpeg2 x264
42+ gst-plugins-base
43+ orc
44+ a52dec
45+ libcdio
46+ libdvdread
47+ libmad
48+ libmpeg2
49+ x264
4050 libintl
4151 opencore-amr
42− ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks;
43− [ IOKit CoreFoundation DiskArbitration ]);
52+ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
53+ IOKit
54+ CoreFoundation
55+ DiskArbitration
56+ ]);
4457
4558 mesonFlags = [
46− # Enables all features, so that we know when new dependencies are necessary.
47− "-Dauto_features=enabled"
4859 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
4960 "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing
5061 ];
5162
52− NIX_LDFLAGS = [ "-lm" ];
63+ meta = with lib; {
64+ description = "Gstreamer Ugly Plugins";
65+ homepage = "https://gstreamer.freedesktop.org";
66+ longDescription = ''
67+ a set of plug-ins that have good quality and correct functionality,
68+ but distributing them might pose problems. The license on either
69+ the plug-ins or the supporting libraries might not be how we'd
70+ like. The code might be widely known to present patent problems.
71+ '';
72+ license = licenses.lgpl2Plus;
73+ platforms = platforms.unix;
74+ maintainers = with maintainers; [ matthewbauer ];
75+ };
5376}
pkgs/development/libraries/gstreamer/vaapi/default.nix+51−30
@@ -1,49 +1,70 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland
2−, libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm
3−, libvpx, python, fetchpatch
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, pkgconfig
6+, gst-plugins-base
7+, bzip2
8+, libva
9+, wayland
10+, libdrm
11+, udev
12+, xorg
13+, libGLU_combined
14+, gstreamer
15+, gst-plugins-bad
16+, nasm
17+, libvpx
18+, python
419}:
520
621stdenv.mkDerivation rec {
7− pname = "gst-vaapi";
8− version = "1.16.0";
22+ pname = "gstreamer-vaapi";
23+ version = "1.16.1";
924
1025 src = fetchurl {
11− url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
12− sha256 = "07qpynamiz0lniqajcaijh3n7ixs4lfk9a5mfk50sng0dricwzsf";
26+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
27+ sha256 = "0fk0nymvbfc04fv63fj2r6q9vvi431svhkrwpr7kdjvq3rphymyb";
1328 };
1429
15− patches = [
16− # See: https://mail.gnome.org/archives/distributor-list/2019-September/msg00000.html
17− # Note that the patch has now been actually accepted upstream.
18− (fetchpatch {
19− url = "https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/commit/a90daabb84f983d2fa05ff3159f7ad59aa648b55.patch";
20− sha256 = "0p2qygq6b5h6nxjdfnlzbsyih43hjq5c94ag8sbyyb8pmnids9rb";
21− })
22− ];
23−
2430 outputs = [ "out" "dev" ];
2531
26− nativeBuildInputs = [ meson ninja pkgconfig bzip2 ];
32+ nativeBuildInputs = [
33+ meson
34+ ninja
35+ pkgconfig
36+ bzip2
37+ ];
2738
2839 buildInputs = [
29− gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev
30− xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM
31− xorg.libICE libGLU_combined nasm libvpx python
40+ gstreamer
41+ gst-plugins-base
42+ gst-plugins-bad
43+ libva
44+ wayland
45+ libdrm
46+ udev
47+ xorg.libX11
48+ xorg.libXext
49+ xorg.libXv
50+ xorg.libXrandr
51+ xorg.libSM
52+ xorg.libICE
53+ libGLU_combined
54+ nasm
55+ libvpx
56+ python
3257 ];
3358
34− preConfigure = ''
35− export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0
36− mkdir -p $GST_PLUGIN_PATH_1_0
37− '';
38−
3959 mesonFlags = [
4060 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
4161 ];
4262
43− meta = {
44− homepage = https://gstreamer.freedesktop.org;
45− license = stdenv.lib.licenses.lgpl21Plus;
46− platforms = stdenv.lib.platforms.linux;
47− maintainers = with stdenv.lib.maintainers; [ tstrobel ];
63+ meta = with stdenv.lib; {
64+ description = "Set of VAAPI GStreamer Plug-ins";
65+ homepage = "https://gstreamer.freedesktop.org";
66+ license = licenses.lgpl21Plus;
67+ maintainers = with maintainers; [ tstrobel ];
68+ platforms = platforms.linux;
4869 };
4970}
pkgs/development/libraries/gstreamer/validate/default.nix+25−21
@@ -1,39 +1,43 @@
1−{ stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base
2−, python, gobject-introspection, json-glib
1+{ stdenv
2+, fetchurl
3+, pkgconfig
4+, gstreamer
5+, gst-plugins-base
6+, python
7+, gobject-introspection
8+, json-glib
39}:
410
511stdenv.mkDerivation rec {
612 pname = "gst-validate";
7− version = "1.16.0";
8−
9− meta = {
10− description = "Integration testing infrastructure for the GStreamer framework";
11− homepage = https://gstreamer.freedesktop.org;
12− license = stdenv.lib.licenses.lgpl2Plus;
13− platforms = stdenv.lib.platforms.unix;
14− };
13+ version = "1.16.1";
1514
1615 src = fetchurl {
17− url = "${meta.homepage}/src/gst-validate/${pname}-${version}.tar.xz";
18− sha256 = "1jfnd0g9hmdbqfxsx96yc9vpf1w6m33hqwrr6lj4i83kl54awcck";
16+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
17+ sha256 = "1698arvmpb0cvyi8ll1brvs51vs7i3f3fw19iswh8xhj5adrn1vz";
1918 };
2019
2120 outputs = [ "out" "dev" ];
2221
2322 nativeBuildInputs = [
24− pkgconfig gobject-introspection
23+ pkgconfig
24+ gobject-introspection
2525 ];
2626
2727 buildInputs = [
28− python json-glib
28+ python
29+ json-glib
2930 ];
3031
31− propagatedBuildInputs = [ gstreamer gst-plugins-base ];
32−
33− enableParallelBuilding = true;
34−
35− mesonFlags = [
36− # Enables all features, so that we know when new dependencies are necessary.
37− "-Dauto_features=enabled"
32+ propagatedBuildInputs = [
33+ gstreamer
34+ gst-plugins-base
3835 ];
36+
37+ meta = with stdenv.lib; {
38+ description = "Integration testing infrastructure for the GStreamer framework";
39+ homepage = "https://gstreamer.freedesktop.org";
40+ license = licenses.lgpl2Plus;
41+ platforms = platforms.unix;
42+ };
3943}
pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh+1−1
@@ -16,4 +16,4 @@ dropIconThemeCache() {
1616 fi
1717}
1818
19−preFixupPhases="$preFixupPhases dropIconThemeCache"
19+preFixupPhases="${preFixupPhases-} dropIconThemeCache"
pkgs/development/libraries/icu/base.nix+9−3
@@ -63,10 +63,16 @@ let
6363 # remove dependency on bootstrap-tools in early stdenv build
6464 postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
6565 sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
66− '' + ''
66+ '' + (let
67+ replacements = [
68+ { from = "\${prefix}/include"; to = "${placeholder "dev"}/include"; } # --cppflags-searchpath
69+ { from = "\${pkglibdir}/Makefile.inc"; to = "${placeholder "dev"}/lib/icu/Makefile.inc"; } # --incfile
70+ { from = "\${pkglibdir}/pkgdata.inc"; to = "${placeholder "dev"}/lib/icu/pkgdata.inc"; } # --incpkgdatafile
71+ ];
72+ in ''
6773 substituteInPlace "$dev/bin/icu-config" \
68− --replace \''${pkglibdir}/Makefile.inc "$dev/lib/icu/Makefile.inc"
69− '';
74+ ${lib.concatMapStringsSep " " (r: "--replace '${r.from}' '${r.to}'") replacements}
75+ '');
7076
7177 postFixup = ''moveToOutput lib/icu "$dev" '';
7278 };
pkgs/development/libraries/leptonica/default.nix+3−1
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
1616 enableParallelBuilding = true;
1717
1818 checkInputs = [ which gnuplot ];
19− doCheck = !stdenv.isDarwin;
19+
20+ # Fails on pngio_reg for unknown reason
21+ doCheck = false; # !stdenv.isDarwin;
2022
2123 meta = {
2224 description = "Image processing and analysis library";
pkgs/development/libraries/libglvnd/default.nix+16
@@ -14,6 +14,22 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ autoreconfHook pkgconfig python2 addOpenGLRunpath ];
1515 buildInputs = [ libX11 libXext xorgproto ];
1616
17+ # The following 3 patches should be removed once libglvnd >1.2.0 is released
18+ patches = [
19+ (fetchpatch {
20+ url = "https://github.com/NVIDIA/libglvnd/commit/6f52473dac08c44b081b792874b4ce73122096da.patch";
21+ sha256 = "0rd9ihl8n33cm0rya5a7ki0hn31fh52r0gaj5d4w80jrsah2ayij";
22+ })
23+ (fetchpatch {
24+ url = "https://github.com/NVIDIA/libglvnd/commit/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch";
25+ sha256 = "1qx3nw8vq5xcrixmi7xw1vpy4gbf7kmx38rx8wg8x046g4mv8ijj";
26+ })
27+ (fetchpatch {
28+ url = "https://github.com/NVIDIA/libglvnd/commit/5dfdc5a6dc60a3bdc63cd4510dabacba388da13a.patch";
29+ sha256 = "0gmb3619yz3z7n22afjh8p2y13bmsky4r0z0csm14is3wvdi64ya";
30+ })
31+ ];
32+
1733 postPatch = lib.optionalString stdenv.isDarwin ''
1834 substituteInPlace src/GLX/Makefile.am \
1935 --replace "-Wl,-Bsymbolic " ""
pkgs/development/libraries/libiconv/setup-hook.sh+1−1
@@ -2,7 +2,7 @@
22# it doesn't hurt to have it in Glibc either though
33
44# See pkgs/build-support/setup-hooks/role.bash
5−if [ -z "$dontAddExtraLibs" ]; then
5+if [ -z "${dontAddExtraLibs-}" ]; then
66 getHostRole
77 export NIX_${role_pre}LDFLAGS+=" -liconv"
88fi
pkgs/development/libraries/libmad/001-mips_removal_h_constraint.patchdeleted−73
@@ -1,73 +0,0 @@
1−Taken from openwrt:
2−https://dev.openwrt.org/browser/packages/libs/libmad/patches/001-mips_removal_h_constraint.patch?rev=18548
3−
4−diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h
5−--- libmad-0.15.1b-orig/fixed.h 2004-02-17 12:32:03.000000000 +1030
6−+++ libmad-0.15.1b/fixed.h 2009-08-05 10:46:30.000000000 +0930
7−@@ -299,6 +299,23 @@
8−
9− # elif defined(FPM_MIPS)
10−
11−+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
12−+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
13−+#define __GNUC_PREREQ(maj, min) \
14−+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
15−+#else
16−+#define __GNUC_PREREQ(maj, min) 0
17−+#endif
18−+
19−+#if __GNUC_PREREQ(4,4)
20−+ typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
21−+# define MAD_F_MLX(hi, lo, x, y) \
22−+ do { \
23−+ u64_di_t __ll = (u64_di_t) (x) * (y); \
24−+ hi = __ll >> 32; \
25−+ lo = __ll; \
26−+ } while (0)
27−+#else
28− /*
29− * This MIPS version is fast and accurate; the disposition of the least
30− * significant bit depends on OPT_ACCURACY via mad_f_scale64().
31−@@ -328,6 +345,7 @@
32− : "%r" ((x) >> 12), "r" ((y) >> 16))
33− # define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo))
34− # endif
35−+#endif /* __GNU_PREREQ(4,4) */
36−
37− # if defined(OPT_SPEED)
38− # define mad_f_scale64(hi, lo) \
39−diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h
40−--- libmad-0.15.1b-orig/mad.h 2004-02-17 13:25:44.000000000 +1030
41−+++ libmad-0.15.1b/mad.h 2009-08-05 10:42:40.000000000 +0930
42−@@ -344,6 +344,23 @@
43−
44− # elif defined(FPM_MIPS)
45−
46−+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
47−+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
48−+#define __GNUC_PREREQ(maj, min) \
49−+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
50−+#else
51−+#define __GNUC_PREREQ(maj, min) 0
52−+#endif
53−+
54−+#if __GNUC_PREREQ(4,4)
55−+ typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
56−+# define MAD_F_MLX(hi, lo, x, y) \
57−+ do { \
58−+ u64_di_t __ll = (u64_di_t) (x) * (y); \
59−+ hi = __ll >> 32; \
60−+ lo = __ll; \
61−+ } while (0)
62−+#else
63− /*
64− * This MIPS version is fast and accurate; the disposition of the least
65− * significant bit depends on OPT_ACCURACY via mad_f_scale64().
66−@@ -373,6 +390,7 @@
67− : "%r" ((x) >> 12), "r" ((y) >> 16))
68− # define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo))
69− # endif
70−+#endif /* __GNU_PREREQ(4,4) */
71−
72− # if defined(OPT_SPEED)
73− # define mad_f_scale64(hi, lo) \
pkgs/development/libraries/libmad/default.nix+43−13
@@ -1,28 +1,58 @@
1−{stdenv, fetchurl, autoconf}:
1+{ stdenv, fetchurl, fetchpatch, autoconf }:
22
33stdenv.mkDerivation rec {
4− name = "libmad-0.15.1b";
5−
4+ pname = "libmad";
5+ version = "0.15.1b";
6+
67 src = fetchurl {
7− url = "mirror://sourceforge/mad/${name}.tar.gz";
8− sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690";
8+ url = "mirror://sourceforge/mad/${pname}-${version}.tar.gz";
9+ sha256 = "14460zhacxhswnzb36qfpd1f2wbk10qvksvm6wyq5hpvdgnw7ymv";
910 };
1011
11− patches = [ ./001-mips_removal_h_constraint.patch ./pkgconfig.patch ]
12+ patches = [
13+ (fetchpatch {
14+ url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/001-mips_removal_h_constraint.patch";
15+ sha256 = "0layswr6qg6axf4vyz6xrv73jwga34mkma3ifk9w9vrk41454hr5";
16+ })
17+ (fetchpatch {
18+ url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/libmad.patch";
19+ sha256 = "0rysq0sn3dfdz6pa6bfqkmk4ymc4rzk5ym7p16dyk37sldg1pbzs";
20+ })
21+ (fetchpatch {
22+ url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/amd64-64bit.diff";
23+ sha256 = "0mx56dmkbvw3zxnqd2hjng48q0d7q7473pns4n0ksdam29b0c5ar";
24+ })
25+ (fetchpatch {
26+ name = "CVE-2017-8372-CVE-2017-8373.patch";
27+ url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch";
28+ sha256 = "0p6mkpn66h1ds8jvww28q4vlr58jwm58m9vb7pkvvyvy764agqnk";
29+ })
30+ (fetchpatch {
31+ name = "CVE-2017-8374.patch";
32+ url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/101-CVE-2017-8374-length-check.patch";
33+ sha256 = "1j1ssxwmx9nfahzl62frbzck93xrjc2v3w30c12vmk29iflf1890";
34+ })
35+ ]
1236 # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad
1337 # It is included here in order to fix a build failure in Clang
1438 # But it may be useful to fix other, currently unknown problems as well
15− ++ stdenv.lib.optional stdenv.cc.isClang [ ./optimize.diff ];
16−
17− nativeBuildInputs = [ autoconf ];
39+ ++ stdenv.lib.optionals stdenv.cc.isClang [
40+ (fetchpatch {
41+ url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff";
42+ sha256 = "0ciyaj1acg08g8hpzqx6whayq206fvf4whksz2pjgxlv207lqgjh";
43+ })
44+ ];
1845
1946 # The -fforce-mem flag has been removed in GCC 4.3.
20− preConfigure = ''
21− autoconf
22− substituteInPlace configure --replace "-fforce-mem" ""
23− substituteInPlace configure --replace "arch=\"-march=i486\"" ""
47+ postPatch = ''
48+ substituteInPlace configure.ac --replace "-fforce-mem" ""
49+ substituteInPlace configure.ac --replace "arch=\"-march=i486\"" ""
2450 '';
2551
52+ nativeBuildInputs = [ autoconf ];
53+
54+ preConfigure = "autoconf";
55+
2656 meta = with stdenv.lib; {
2757 homepage = https://sourceforge.net/projects/mad/;
2858 description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2";
pkgs/development/libraries/libmad/optimize.diffdeleted−77
@@ -1,77 +0,0 @@
1−Index: libmad-0.15.1b/configure.ac
2−===================================================================
3−--- libmad-0.15.1b.orig/configure.ac 2008-03-07 20:31:23.000000000 +0000
4−+++ libmad-0.15.1b/configure.ac 2008-03-07 20:34:26.000000000 +0000
5−@@ -124,71 +124,7 @@
6−
7− if test "$GCC" = yes
8− then
9−- if test -z "$arch"
10−- then
11−- case "$host" in
12−- i386-*) ;;
13−- i?86-*) arch="-march=i486" ;;
14−- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;;
15−- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;;
16−- powerpc-*) ;;
17−- mips*-agenda-*) arch="-mcpu=vr4100" ;;
18−- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
19−- esac
20−- fi
21−-
22−- case "$optimize" in
23−- -O|"-O "*)
24−- optimize="-O"
25−- optimize="$optimize -fforce-mem"
26−- optimize="$optimize -fforce-addr"
27−- : #x optimize="$optimize -finline-functions"
28−- : #- optimize="$optimize -fstrength-reduce"
29−- optimize="$optimize -fthread-jumps"
30−- optimize="$optimize -fcse-follow-jumps"
31−- optimize="$optimize -fcse-skip-blocks"
32−- : #x optimize="$optimize -frerun-cse-after-loop"
33−- : #x optimize="$optimize -frerun-loop-opt"
34−- : #x optimize="$optimize -fgcse"
35−- optimize="$optimize -fexpensive-optimizations"
36−- optimize="$optimize -fregmove"
37−- : #* optimize="$optimize -fdelayed-branch"
38−- : #x optimize="$optimize -fschedule-insns"
39−- optimize="$optimize -fschedule-insns2"
40−- : #? optimize="$optimize -ffunction-sections"
41−- : #? optimize="$optimize -fcaller-saves"
42−- : #> optimize="$optimize -funroll-loops"
43−- : #> optimize="$optimize -funroll-all-loops"
44−- : #x optimize="$optimize -fmove-all-movables"
45−- : #x optimize="$optimize -freduce-all-givs"
46−- : #? optimize="$optimize -fstrict-aliasing"
47−- : #* optimize="$optimize -fstructure-noalias"
48−-
49−- case "$host" in
50−- arm*-*)
51−- optimize="$optimize -fstrength-reduce"
52−- ;;
53−- mips*-*)
54−- optimize="$optimize -fstrength-reduce"
55−- optimize="$optimize -finline-functions"
56−- ;;
57−- i?86-*)
58−- optimize="$optimize -fstrength-reduce"
59−- ;;
60−- powerpc-apple-*)
61−- # this triggers an internal compiler error with gcc2
62−- : #optimize="$optimize -fstrength-reduce"
63−-
64−- # this is really only beneficial with gcc3
65−- : #optimize="$optimize -finline-functions"
66−- ;;
67−- *)
68−- # this sometimes provokes bugs in gcc 2.95.2
69−- : #optimize="$optimize -fstrength-reduce"
70−- ;;
71−- esac
72−- ;;
73−- esac
74−+ optimize="-O2"
75− fi
76−
77− case "$host" in
pkgs/development/libraries/libmad/pkgconfig.patchdeleted−117
@@ -1,117 +0,0 @@
1−diff -ruN libmad-0.15.1b.orig/Makefile.am libmad-0.15.1b/Makefile.am
2−--- libmad-0.15.1b.orig/Makefile.am 2004-02-17 02:02:03.000000000 +0000
3−+++ libmad-0.15.1b/Makefile.am 2005-08-25 12:08:04.000000000 +0000
4−@@ -33,9 +33,12 @@
5− minimad_INCLUDES =
6− minimad_LDADD = libmad.la
7−
8−-EXTRA_DIST = mad.h.sed \
9−+EXTRA_DIST = mad.h.sed mad.pc.in \
10− CHANGES COPYRIGHT CREDITS README TODO VERSION
11−
12−+pkgconfigdir = $(libdir)/pkgconfig
13−+pkgconfig_DATA= mad.pc
14−+
15− exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \
16− synth.h decoder.h
17−
18−diff -ruN libmad-0.15.1b.orig/Makefile.in libmad-0.15.1b/Makefile.in
19−--- libmad-0.15.1b.orig/Makefile.in 2004-02-17 02:33:23.000000000 +0000
20−+++ libmad-0.15.1b/Makefile.in 2005-08-25 12:09:34.000000000 +0000
21−@@ -14,6 +14,8 @@
22−
23− @SET_MAKE@
24−
25−+pkgconfigdir = $(libdir)/pkgconfig
26−+pkgconfig_DATA = mad.pc
27−
28− SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) $(minimad_SOURCES)
29−
30−@@ -43,7 +45,7 @@
31− $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
32− $(srcdir)/config.h.in $(srcdir)/libmad.list.in \
33− $(top_srcdir)/configure COPYING INSTALL TODO config.guess \
34−- config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
35−+ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs mad.pc.in
36− subdir = .
37− ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
38− am__aclocal_m4_deps = $(top_srcdir)/configure.ac
39−@@ -53,7 +55,7 @@
40− configure.lineno configure.status.lineno
41− mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
42− CONFIG_HEADER = config.h
43−-CONFIG_CLEAN_FILES = libmad.list
44−+CONFIG_CLEAN_FILES = libmad.list mad.pc
45− am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
46− libLTLIBRARIES_INSTALL = $(INSTALL)
47− LTLIBRARIES = $(lib_LTLIBRARIES)
48−@@ -218,7 +220,7 @@
49− minimad_SOURCES = minimad.c
50− minimad_INCLUDES =
51− minimad_LDADD = libmad.la
52−-EXTRA_DIST = mad.h.sed \
53−+EXTRA_DIST = mad.h.sed mad.pc.in \
54− CHANGES COPYRIGHT CREDITS README TODO VERSION
55−
56− exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \
57−@@ -298,6 +300,28 @@
58− rm -f stamp-h1
59− touch $@
60−
61−+mad.pc: $(top_builddir)/config.status mad.pc.in
62−+ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
63−+
64−+install-pkgconfigDATA: $(pkgconfig_DATA)
65−+ @$(NORMAL_INSTALL)
66−+ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
67−+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
68−+ if test -f $(srcdir)/$$p; then \
69−+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
70−+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \
71−+ else if test -f $$p; then \
72−+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
73−+ $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \
74−+ fi; fi; \
75−+ done
76−+
77−+uninstall-pkgconfigDATA:
78−+ @$(NORMAL_UNINSTALL)
79−+ list='$(pkgconfig_DATA)'; for p in $$list; do \
80−+ rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \
81−+ done
82−+
83− distclean-hdr:
84− -rm -f config.h stamp-h1
85− libmad.list: $(top_builddir)/config.status $(srcdir)/libmad.list.in
86−@@ -726,7 +750,7 @@
87−
88− info-am:
89−
90−-install-data-am: install-includeHEADERS
91−+install-data-am: install-includeHEADERS install-pkgconfigDATA
92−
93− install-exec-am: install-libLTLIBRARIES
94−
95−@@ -757,7 +781,7 @@
96− ps-am:
97−
98− uninstall-am: uninstall-includeHEADERS uninstall-info-am \
99−- uninstall-libLTLIBRARIES
100−+ uninstall-libLTLIBRARIES install-pkgconfigDATA
101−
102− uninstall-info: uninstall-info-recursive
103−
104−diff -ruN libmad-0.15.1b.orig/mad.pc.in libmad-0.15.1b/mad.pc.in
105−--- libmad-0.15.1b.orig/mad.pc.in 1970-01-01 00:00:00.000000000 +0000
106−+++ libmad-0.15.1b/mad.pc.in 2005-08-25 12:08:04.000000000 +0000
107−@@ -0,0 +1,10 @@
108−+prefix=@prefix@
109−+exec_prefix=@exec_prefix@
110−+libdir=@libdir@
111−+includedir=@includedir@
112−+
113−+Name: MAD
114−+Description: libmad - MPEG audio decoder library
115−+Version: @VERSION@
116−+Libs: -L${libdir} -lmad
117−+Cflags:
pkgs/development/libraries/libnice/default.nix+41−12
@@ -1,4 +1,19 @@
1−{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, python3, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp-igd, gst_all_1, gnutls }:
1+{ stdenv
2+, fetchurl
3+, fetchpatch
4+, meson
5+, ninja
6+, pkgconfig
7+, python3
8+, gobject-introspection
9+, gtk-doc
10+, docbook_xsl
11+, docbook_xml_dtd_412
12+, glib
13+, gupnp-igd
14+, gst_all_1
15+, gnutls
16+}:
217
318stdenv.mkDerivation rec {
419 name = "libnice-0.1.16";
@@ -21,27 +36,40 @@ stdenv.mkDerivation rec {
2136 ];
2237
2338 nativeBuildInputs = [
24− meson ninja pkgconfig python3 gobject-introspection
39+ meson
40+ ninja
41+ pkgconfig
42+ python3
43+ gobject-introspection
44+
45+ # documentation
2546 gtk-doc
26− # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install`
27− docbook_xsl docbook_xml_dtd_412
47+ docbook_xsl
48+ docbook_xml_dtd_412
49+ ];
50+
51+ buildInputs = [
52+ gst_all_1.gstreamer
53+ gst_all_1.gst-plugins-base
54+ gnutls
55+ gupnp-igd
56+ ];
57+
58+ propagatedBuildInputs = [
59+ glib
2860 ];
29− buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ];
30− propagatedBuildInputs = [ glib gupnp-igd ];
3161
3262 mesonFlags = [
33− # Enables all features, so that we know when new dependencies are necessary.
34− "-Dauto_features=enabled"
3563 "-Dgtk_doc=enabled" # Disabled by default as of libnice-0.1.15
3664 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
3765 ];
3866
39− # TODO; see #53293 etc.
40− #doCheck = true;
67+ # Tests are flaky
68+ # see https://github.com/NixOS/nixpkgs/pull/53293#issuecomment-453739295
69+ doCheck = false;
4170
4271 meta = with stdenv.lib; {
43− homepage = https://nice.freedesktop.org/wiki/;
44− description = "The GLib ICE implementation";
72+ description = "GLib ICE implementation";
4573 longDescription = ''
4674 Libnice is an implementation of the IETF's Interactice Connectivity
4775 Establishment (ICE) standard (RFC 5245) and the Session Traversal
@@ -49,6 +77,7 @@ stdenv.mkDerivation rec {
4977
5078 It provides a GLib-based library, libnice and a Glib-free library,
5179 libstun as well as GStreamer elements.'';
80+ homepage = "https://nice.freedesktop.org/wiki/";
5281 platforms = platforms.linux;
5382 license = with licenses; [ lgpl21 mpl11 ];
5483 };
pkgs/development/libraries/libpsl/default.nix+35−7
@@ -1,5 +1,16 @@
1−{ stdenv, fetchurl, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, gtk-doc, lzip
2−, libidn2, libunistring, libxslt, pkgconfig, python3, valgrind
1+{ stdenv
2+, fetchurl
3+, autoreconfHook
4+, docbook_xsl
5+, docbook_xml_dtd_43
6+, gtk-doc
7+, lzip
8+, libidn2
9+, libunistring
10+, libxslt
11+, pkgconfig
12+, python3
13+, valgrind
314, publicsuffix-list
415}:
516
@@ -12,9 +23,26 @@ stdenv.mkDerivation rec {
1223 sha256 = "183hadbira0d2zvv8272lspy31dgm9x26z35c61s5axcd5wd9g9i";
1324 };
1425
15− nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_43 gtk-doc lzip pkgconfig python3 valgrind ];
16− buildInputs = [ libidn2 libunistring libxslt ];
17− propagatedBuildInputs = [ publicsuffix-list ];
26+ nativeBuildInputs = [
27+ autoreconfHook
28+ docbook_xsl
29+ docbook_xml_dtd_43
30+ gtk-doc
31+ lzip
32+ pkgconfig
33+ python3
34+ valgrind
35+ ];
36+
37+ buildInputs = [
38+ libidn2
39+ libunistring
40+ libxslt
41+ ];
42+
43+ propagatedBuildInputs = [
44+ publicsuffix-list
45+ ];
1846
1947 postPatch = ''
2048 patchShebangs src/psl-make-dafsa
@@ -25,7 +53,7 @@ stdenv.mkDerivation rec {
2553 '';
2654
2755 configureFlags = [
28−# "--enable-gtk-doc"
56+ # "--enable-gtk-doc"
2957 "--enable-man"
3058 "--enable-valgrind-tests"
3159 "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
@@ -35,7 +63,7 @@ stdenv.mkDerivation rec {
3563
3664 enableParallelBuilding = true;
3765
38− doCheck = true;
66+ doCheck = !stdenv.isDarwin;
3967
4068 meta = with stdenv.lib; {
4169 description = "C library for the Publix Suffix List";
pkgs/development/libraries/libtiff/CVE-2019-14973.patchdeleted−384
@@ -1,384 +0,0 @@
1−diff -ru tiff-4.0.10-orig/libtiff/tif_aux.c tiff-4.0.10/libtiff/tif_aux.c
2−--- tiff-4.0.10-orig/libtiff/tif_aux.c 2017-12-02 16:21:47.305709555 +0100
3−+++ tiff-4.0.10/libtiff/tif_aux.c 2019-10-02 22:35:17.392184463 +0200
4−@@ -57,18 +57,57 @@
5− return bytes;
6− }
7−
8−+tmsize_t
9−+_TIFFMultiplySSize(TIFF* tif, tmsize_t first, tmsize_t second, const char* where)
10−+{
11−+ if( first <= 0 || second <= 0 )
12−+ {
13−+ if( tif != NULL && where != NULL )
14−+ {
15−+ TIFFErrorExt(tif->tif_clientdata, where,
16−+ "Invalid argument to _TIFFMultiplySSize() in %s", where);
17−+ }
18−+ return 0;
19−+ }
20−+
21−+ if( first > TIFF_TMSIZE_T_MAX / second )
22−+ {
23−+ if( tif != NULL && where != NULL )
24−+ {
25−+ TIFFErrorExt(tif->tif_clientdata, where,
26−+ "Integer overflow in %s", where);
27−+ }
28−+ return 0;
29−+ }
30−+ return first * second;
31−+}
32−+
33−+tmsize_t _TIFFCastUInt64ToSSize(TIFF* tif, uint64 val, const char* module)
34−+{
35−+ if( val > (uint64)TIFF_TMSIZE_T_MAX )
36−+ {
37−+ if( tif != NULL && module != NULL )
38−+ {
39−+ TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
40−+ }
41−+ return 0;
42−+ }
43−+ return (tmsize_t)val;
44−+}
45−+
46− void*
47− _TIFFCheckRealloc(TIFF* tif, void* buffer,
48− tmsize_t nmemb, tmsize_t elem_size, const char* what)
49− {
50− void* cp = NULL;
51−- tmsize_t bytes = nmemb * elem_size;
52−-
53−+ tmsize_t count = _TIFFMultiplySSize(tif, nmemb, elem_size, NULL);
54− /*
55−- * XXX: Check for integer overflow.
56−+ * Check for integer overflow.
57− */
58−- if (nmemb && elem_size && bytes / elem_size == nmemb)
59−- cp = _TIFFrealloc(buffer, bytes);
60−+ if (count != 0)
61−+ {
62−+ cp = _TIFFrealloc(buffer, count);
63−+ }
64−
65− if (cp == NULL) {
66− TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
67−diff -ru tiff-4.0.10-orig/libtiff/tiffiop.h tiff-4.0.10/libtiff/tiffiop.h
68−--- tiff-4.0.10-orig/libtiff/tiffiop.h 2018-11-03 15:28:37.748910968 +0100
69−+++ tiff-4.0.10/libtiff/tiffiop.h 2019-10-02 22:35:17.396184535 +0200
70−@@ -77,6 +77,9 @@
71− #define FALSE 0
72− #endif
73−
74−+#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
75−+#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
76−+
77− typedef struct client_info {
78− struct client_info *next;
79− void *data;
80−@@ -258,7 +261,7 @@
81− #define TIFFhowmany8_64(x) (((x)&0x07)?((uint64)(x)>>3)+1:(uint64)(x)>>3)
82− #define TIFFroundup_64(x, y) (TIFFhowmany_64(x,y)*(y))
83−
84−-/* Safe multiply which returns zero if there is an integer overflow */
85−+/* Safe multiply which returns zero if there is an *unsigned* integer overflow. This macro is not safe for *signed* integer types */
86− #define TIFFSafeMultiply(t,v,m) ((((t)(m) != (t)0) && (((t)(((v)*(m))/(m))) == (t)(v))) ? (t)((v)*(m)) : (t)0)
87−
88− #define TIFFmax(A,B) ((A)>(B)?(A):(B))
89−@@ -368,6 +371,8 @@
90−
91− extern uint32 _TIFFMultiply32(TIFF*, uint32, uint32, const char*);
92− extern uint64 _TIFFMultiply64(TIFF*, uint64, uint64, const char*);
93−+extern tmsize_t _TIFFMultiplySSize(TIFF*, tmsize_t, tmsize_t, const char*);
94−+extern tmsize_t _TIFFCastUInt64ToSSize(TIFF*, uint64, const char*);
95− extern void* _TIFFCheckMalloc(TIFF*, tmsize_t, tmsize_t, const char*);
96− extern void* _TIFFCheckRealloc(TIFF*, void*, tmsize_t, tmsize_t, const char*);
97−
98−diff -ru tiff-4.0.10-orig/libtiff/tif_getimage.c tiff-4.0.10/libtiff/tif_getimage.c
99−--- tiff-4.0.10-orig/libtiff/tif_getimage.c 2017-12-02 16:21:47.654716127 +0100
100−+++ tiff-4.0.10/libtiff/tif_getimage.c 2019-10-02 22:35:17.393184481 +0200
101−@@ -755,9 +755,8 @@
102− uint32 leftmost_tw;
103−
104− tilesize = TIFFTileSize(tif);
105−- bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,tilesize);
106−+ bufsize = _TIFFMultiplySSize(tif, alpha?4:3,tilesize, "gtTileSeparate");
107− if (bufsize == 0) {
108−- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtTileSeparate");
109− return (0);
110− }
111−
112−@@ -1019,9 +1018,8 @@
113− uint16 colorchannels;
114−
115− stripsize = TIFFStripSize(tif);
116−- bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,stripsize);
117−+ bufsize = _TIFFMultiplySSize(tif,alpha?4:3,stripsize, "gtStripSeparate");
118− if (bufsize == 0) {
119−- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtStripSeparate");
120− return (0);
121− }
122−
123−diff -ru tiff-4.0.10-orig/libtiff/tif_luv.c tiff-4.0.10/libtiff/tif_luv.c
124−--- tiff-4.0.10-orig/libtiff/tif_luv.c 2018-05-05 15:50:35.884596907 +0200
125−+++ tiff-4.0.10/libtiff/tif_luv.c 2019-10-02 22:35:17.393184481 +0200
126−@@ -1264,16 +1264,10 @@
127− return (SGILOGDATAFMT_UNKNOWN);
128− }
129−
130−-
131−-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
132−-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
133−-
134− static tmsize_t
135− multiply_ms(tmsize_t m1, tmsize_t m2)
136− {
137−- if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
138−- return 0;
139−- return m1 * m2;
140−+ return _TIFFMultiplySSize(NULL, m1, m2, NULL);
141− }
142−
143− static int
144−diff -ru tiff-4.0.10-orig/libtiff/tif_pixarlog.c tiff-4.0.10/libtiff/tif_pixarlog.c
145−--- tiff-4.0.10-orig/libtiff/tif_pixarlog.c 2017-12-02 16:21:47.841162432 +0100
146−+++ tiff-4.0.10/libtiff/tif_pixarlog.c 2019-10-02 22:36:01.223970118 +0200
147−@@ -634,15 +634,10 @@
148− return guess;
149− }
150−
151−-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
152−-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
153−-
154− static tmsize_t
155− multiply_ms(tmsize_t m1, tmsize_t m2)
156− {
157−- if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
158−- return 0;
159−- return m1 * m2;
160−+ return _TIFFMultiplySSize(NULL, m1, m2, NULL);
161− }
162−
163− static tmsize_t
164−diff -ru tiff-4.0.10-orig/libtiff/tif_read.c tiff-4.0.10/libtiff/tif_read.c
165−--- tiff-4.0.10-orig/libtiff/tif_read.c 2018-10-14 21:15:27.551093695 +0200
166−+++ tiff-4.0.10/libtiff/tif_read.c 2019-10-02 22:41:09.387290927 +0200
167−@@ -29,9 +29,6 @@
168− #include "tiffiop.h"
169− #include <stdio.h>
170−
171−-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
172−-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
173−-
174− int TIFFFillStrip(TIFF* tif, uint32 strip);
175− int TIFFFillTile(TIFF* tif, uint32 tile);
176− static int TIFFStartStrip(TIFF* tif, uint32 strip);
177−@@ -49,6 +46,8 @@
178− #define THRESHOLD_MULTIPLIER 10
179− #define MAX_THRESHOLD (THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * INITIAL_THRESHOLD)
180−
181−+#define TIFF_INT64_MAX ((((int64)0x7FFFFFFF) << 32) | 0xFFFFFFFF)
182−+
183− /* Read 'size' bytes in tif_rawdata buffer starting at offset 'rawdata_offset'
184− * Returns 1 in case of success, 0 otherwise. */
185− static int TIFFReadAndRealloc( TIFF* tif, tmsize_t size,
186−@@ -734,23 +733,8 @@
187− return ((tmsize_t)(-1));
188− }
189− bytecount = td->td_stripbytecount[strip];
190−- if ((int64)bytecount <= 0) {
191−-#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
192−- TIFFErrorExt(tif->tif_clientdata, module,
193−- "%I64u: Invalid strip byte count, strip %lu",
194−- (unsigned __int64) bytecount,
195−- (unsigned long) strip);
196−-#else
197−- TIFFErrorExt(tif->tif_clientdata, module,
198−- "%llu: Invalid strip byte count, strip %lu",
199−- (unsigned long long) bytecount,
200−- (unsigned long) strip);
201−-#endif
202−- return ((tmsize_t)(-1));
203−- }
204−- bytecountm = (tmsize_t)bytecount;
205−- if ((uint64)bytecountm!=bytecount) {
206−- TIFFErrorExt(tif->tif_clientdata, module, "Integer overflow");
207−+ bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount, module);
208−+ if (bytecountm == 0) {
209− return ((tmsize_t)(-1));
210− }
211− if (size != (tmsize_t)(-1) && size < bytecountm)
212−@@ -774,7 +758,7 @@
213− if ((tif->tif_flags&TIFF_NOREADRAW)==0)
214− {
215− uint64 bytecount = td->td_stripbytecount[strip];
216−- if ((int64)bytecount <= 0) {
217−+ if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) {
218− #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
219− TIFFErrorExt(tif->tif_clientdata, module,
220− "Invalid strip byte count %I64u, strip %lu",
221−@@ -801,7 +785,7 @@
222− (bytecount - 4096) / 10 > (uint64)stripsize )
223− {
224− uint64 newbytecount = (uint64)stripsize * 10 + 4096;
225−- if( (int64)newbytecount >= 0 )
226−+ if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX )
227− {
228− #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
229− TIFFWarningExt(tif->tif_clientdata, module,
230−@@ -1196,10 +1180,8 @@
231− bytecount64 = td->td_stripbytecount[tile];
232− if (size != (tmsize_t)(-1) && (uint64)size < bytecount64)
233− bytecount64 = (uint64)size;
234−- bytecountm = (tmsize_t)bytecount64;
235−- if ((uint64)bytecountm!=bytecount64)
236−- {
237−- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
238−+ bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount64, module);
239−+ if( bytecountm == 0 ) {
240− return ((tmsize_t)(-1));
241− }
242− return (TIFFReadRawTile1(tif, tile, buf, bytecountm, module));
243−@@ -1221,7 +1203,7 @@
244− if ((tif->tif_flags&TIFF_NOREADRAW)==0)
245− {
246− uint64 bytecount = td->td_stripbytecount[tile];
247−- if ((int64)bytecount <= 0) {
248−+ if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) {
249− #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
250− TIFFErrorExt(tif->tif_clientdata, module,
251− "%I64u: Invalid tile byte count, tile %lu",
252−@@ -1248,7 +1230,7 @@
253− (bytecount - 4096) / 10 > (uint64)stripsize )
254− {
255− uint64 newbytecount = (uint64)stripsize * 10 + 4096;
256−- if( (int64)newbytecount >= 0 )
257−+ if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX )
258− {
259− #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
260− TIFFWarningExt(tif->tif_clientdata, module,
261−diff -ru tiff-4.0.10-orig/libtiff/tif_strip.c tiff-4.0.10/libtiff/tif_strip.c
262−--- tiff-4.0.10-orig/libtiff/tif_strip.c 2017-12-02 16:21:47.947867167 +0100
263−+++ tiff-4.0.10/libtiff/tif_strip.c 2019-10-02 22:35:17.395184517 +0200
264−@@ -129,15 +129,8 @@
265− {
266− static const char module[] = "TIFFVStripSize";
267− uint64 m;
268−- tmsize_t n;
269− m=TIFFVStripSize64(tif,nrows);
270−- n=(tmsize_t)m;
271−- if ((uint64)n!=m)
272−- {
273−- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
274−- n=0;
275−- }
276−- return(n);
277−+ return _TIFFCastUInt64ToSSize(tif, m, module);
278− }
279−
280− /*
281−@@ -211,15 +204,8 @@
282− {
283− static const char module[] = "TIFFStripSize";
284− uint64 m;
285−- tmsize_t n;
286− m=TIFFStripSize64(tif);
287−- n=(tmsize_t)m;
288−- if ((uint64)n!=m)
289−- {
290−- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
291−- n=0;
292−- }
293−- return(n);
294−+ return _TIFFCastUInt64ToSSize(tif, m, module);
295− }
296−
297− /*
298−@@ -330,14 +316,8 @@
299− {
300− static const char module[] = "TIFFScanlineSize";
301− uint64 m;
302−- tmsize_t n;
303− m=TIFFScanlineSize64(tif);
304−- n=(tmsize_t)m;
305−- if ((uint64)n!=m) {
306−- TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow");
307−- n=0;
308−- }
309−- return(n);
310−+ return _TIFFCastUInt64ToSSize(tif, m, module);
311− }
312−
313− /*
314−@@ -366,15 +346,8 @@
315− {
316− static const char module[] = "TIFFRasterScanlineSize";
317− uint64 m;
318−- tmsize_t n;
319− m=TIFFRasterScanlineSize64(tif);
320−- n=(tmsize_t)m;
321−- if ((uint64)n!=m)
322−- {
323−- TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow");
324−- n=0;
325−- }
326−- return(n);
327−+ return _TIFFCastUInt64ToSSize(tif, m, module);
328− }
329−
330− /* vim: set ts=8 sts=8 sw=8 noet: */
331−diff -ru tiff-4.0.10-orig/libtiff/tif_tile.c tiff-4.0.10/libtiff/tif_tile.c
332−--- tiff-4.0.10-orig/libtiff/tif_tile.c 2017-12-02 16:21:47.993972977 +0100
333−+++ tiff-4.0.10/libtiff/tif_tile.c 2019-10-02 22:35:17.395184517 +0200
334−@@ -181,15 +181,8 @@
335− {
336− static const char module[] = "TIFFTileRowSize";
337− uint64 m;
338−- tmsize_t n;
339− m=TIFFTileRowSize64(tif);
340−- n=(tmsize_t)m;
341−- if ((uint64)n!=m)
342−- {
343−- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
344−- n=0;
345−- }
346−- return(n);
347−+ return _TIFFCastUInt64ToSSize(tif, m, module);
348− }
349−
350− /*
351−@@ -248,15 +241,8 @@
352− {
353− static const char module[] = "TIFFVTileSize";
354− uint64 m;
355−- tmsize_t n;
356− m=TIFFVTileSize64(tif,nrows);
357−- n=(tmsize_t)m;
358−- if ((uint64)n!=m)
359−- {
360−- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
361−- n=0;
362−- }
363−- return(n);
364−+ return _TIFFCastUInt64ToSSize(tif, m, module);
365− }
366−
367− /*
368−@@ -272,15 +258,8 @@
369− {
370− static const char module[] = "TIFFTileSize";
371− uint64 m;
372−- tmsize_t n;
373− m=TIFFTileSize64(tif);
374−- n=(tmsize_t)m;
375−- if ((uint64)n!=m)
376−- {
377−- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
378−- n=0;
379−- }
380−- return(n);
381−+ return _TIFFCastUInt64ToSSize(tif, m, module);
382− }
383−
384− /*
pkgs/development/libraries/libtiff/default.nix+2−12
@@ -9,24 +9,14 @@
99}:
1010
1111stdenv.mkDerivation rec {
12− version = "4.0.10";
12+ version = "4.1.0";
1313 pname = "libtiff";
1414
1515 src = fetchurl {
1616 url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
17− sha256 = "1r4np635gr6zlc0bic38dzvxia6iqzcrary4n1ylarzpr8fd2lic";
17+ sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax";
1818 };
1919
20− patches = [
21− (fetchurl {
22− url = "https://gitlab.com/libtiff/libtiff/commit/0c74a9f49b8d7a36b17b54a7428b3526d20f88a8.patch";
23− name = "CVE-2019-6128.patch";
24− sha256 = "03yvsfq6dxjd3v8ypfwz6cpz2iymqwcbawqqlmkh40dayi7fgizr";
25− })
26− # Manual backport of https://gitlab.com/libtiff/libtiff/commit/1b5e3b6a23827c33acf19ad50ce5ce78f12b3773.patch
27− ./CVE-2019-14973.patch
28− ];
29−
3020 outputs = [ "bin" "dev" "out" "man" "doc" ];
3121
3222 nativeBuildInputs = [ pkgconfig ];
pkgs/development/libraries/libtxc_dxtn/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, libGLU_combined }:
1+{ stdenv, fetchurl, autoreconfHook, libGL, libGLU }:
22
33let version = "1.0.1"; in
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 nativeBuildInputs = [ autoreconfHook ];
15− buildInputs = [ libGLU_combined ];
15+ buildInputs = [ libGL libGLU ];
1616
1717 meta = with stdenv.lib; {
1818 homepage = http://dri.freedesktop.org/wiki/S3TC;
pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, libGLU_combined }:
1+{ stdenv, fetchurl, autoreconfHook, libGL, libGLU }:
22
33let version = "1.0"; in
44
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212 };
1313
1414 nativeBuildInputs = [ autoreconfHook ];
15− buildInputs = [ libGLU_combined ];
15+ buildInputs = [ libGL libGLU ];
1616
1717 meta = {
1818 description = "A patent-free S3TC compatible implementation";
pkgs/development/libraries/libxml2/default.nix+8−2
@@ -8,11 +8,11 @@
88
99stdenv.mkDerivation rec {
1010 pname = "libxml2";
11− version = "2.9.9";
11+ version = "2.9.10";
1212
1313 src = fetchurl {
1414 url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
15− sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl";
15+ sha256 = "07xynh8hcxb2yb1fs051xrgszjvj37wnxvxgsj10rzmqzy9y3zma";
1616 };
1717 patches = [
1818 # Upstream bugs:
@@ -53,6 +53,12 @@ stdenv.mkDerivation rec {
5353
5454 enableParallelBuilding = true;
5555
56+ # disable test that's problematic with newer pythons: see
57+ # https://mail.gnome.org/archives/xml/2017-August/msg00014.html
58+ preCheck = lib.optionalString (pythonSupport && !(python?pythonOlder && python.pythonOlder "3.5")) ''
59+ echo "" > python/tests/tstLastError.py
60+ '';
61+
5662 doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin &&
5763 stdenv.hostPlatform.libc != "musl";
5864
pkgs/development/libraries/libxslt/default.nix+2−20
@@ -10,31 +10,13 @@ with stdenv.lib;
1010
1111stdenv.mkDerivation rec {
1212 pname = "libxslt";
13− version = "1.1.33";
13+ version = "1.1.34";
1414
1515 src = fetchurl {
1616 url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
17− sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf";
17+ sha256 = "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq";
1818 };
1919
20− patches = [
21− (fetchpatch {
22− name = "CVE-2019-11068.patch";
23− url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch";
24− sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8";
25− })
26− (fetchpatch {
27− url = "https://gitlab.gnome.org/GNOME/libxslt/commit/c5eb6cf3aba0af048596106ed839b4ae17ecbcb1.patch";
28− name = "CVE-2019-13117.patch";
29− sha256 = "0ynfq8y5h623cypj1426iiz7796n3mqbjqa24ndvh2am6rl5lw15";
30− })
31− (fetchpatch {
32− url = "https://gitlab.gnome.org/GNOME/libxslt/commit/6ce8de69330783977dd14f6569419489875fb71b.patch";
33− name = "CVE-2019-13118.patch";
34− sha256 = "0bglz9m9sh2vi50qxcm06iqrazw3h45ycgxnp15iankq95z283iq";
35− })
36− ];
37−
3820 outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
3921
4022 buildInputs = [ libxml2.dev ]
pkgs/development/libraries/mesa/default.nix+2−2
@@ -27,7 +27,7 @@
2727with stdenv.lib;
2828
2929let
30− version = "19.2.1";
30+ version = "19.2.4";
3131 branch = versions.major version;
3232in
3333
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
4242 "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
4343 "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
4444 ];
45− sha256 = "4cc53ca1a8d12c6ff0e5ea44a5213c05c88447ab50d7e28bb350cd29199f01e9";
45+ sha256 = "03z393jrd1cnh68k5h3mm5yap3hi1jzz3a417ccjxn5vgl7hl009";
4646 };
4747
4848 prePatch = "patchShebangs .";
pkgs/development/libraries/mesa/stubs.nix+2−2
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
5151 ln -s ${libglvnd.out}/lib $out/lib
5252
5353 mkdir -p $dev/{,lib/pkgconfig,nix-support}
54− echo "$out" > $dev/nix-support/propagated-build-inputs
54+ echo "$out ${libglvnd} ${libglvnd.dev}" > $dev/nix-support/propagated-build-inputs
5555 ln -s ${mesa.dev}/include $dev/include
5656
5757 genPkgConfig() {
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
6363 Description: $lib library
6464 Version: ${mesa.version}
6565 Libs: -L${libglvnd.out}/lib -l$lib
66− Cflags: -I${mesa.dev}/include
66+ Cflags: -I${mesa.dev}/include -I${libglvnd.dev}/include
6767 EOF
6868 }
6969
pkgs/development/libraries/ncurses/default.nix+1
@@ -141,6 +141,7 @@ stdenv.mkDerivation rec {
141141 moveToOutput "bin/tset" "$out"
142142 moveToOutput "bin/captoinfo" "$out"
143143 moveToOutput "bin/infotocap" "$out"
144+ moveToOutput "bin/infocmp" "$out"
144145 '';
145146
146147 preFixup = lib.optionalString (!stdenv.hostPlatform.isCygwin && !enableStatic) ''
pkgs/development/libraries/openscenegraph/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen,
2− libX11, libXinerama, libXrandr, libGLU_combined,
2+ libX11, libXinerama, libXrandr, libGLU, libGL,
33 glib, ilmbase, libxml2, pcre, zlib,
44 jpegSupport ? true, libjpeg,
55 jasperSupport ? true, jasper,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 nativeBuildInputs = [ pkgconfig cmake doxygen ];
4040
4141 buildInputs = [
42− libX11 libXinerama libXrandr libGLU_combined
42+ libX11 libXinerama libXrandr libGLU libGL
4343 glib ilmbase libxml2 pcre zlib
4444 ] ++ lib.optional jpegSupport libjpeg
4545 ++ lib.optional jasperSupport jasper
pkgs/development/libraries/p11-kit/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "p11-kit";
7− version = "0.23.16.1";
7+ version = "0.23.18.1";
88
99 src = fetchFromGitHub {
1010 owner = "p11-glue";
1111 repo = pname;
1212 rev = version;
13− sha256 = "0jr62qkbqxp3iawgksk1qc3gp8p6x09sg5v7xac80ghyfxil15wy";
13+ sha256 = "0l4ndipcbikblfjz729zkscvni5lzdzvbvsar2538pylw556rx73";
1414 };
1515
1616 outputs = [ "out" "dev"];
pkgs/development/libraries/phonon/default.nix+2−2
@@ -6,7 +6,7 @@
66with lib;
77
88let
9− v = "4.10.3";
9+ v = "4.11.1";
1010
1111 soname = if withQt5 then "phonon4qt5" else "phonon";
1212 buildsystemdir = "share/cmake/${soname}";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
2828
2929 src = fetchurl {
3030 url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz";
31− sha256 = "15f2vndpqfcivifzl1s07r0wkavpfrjln1p46cwfk85gd5b192rf";
31+ sha256 = "0bfy8iqmjhlg3ma3iqd3kxjc2zkzpjgashbpf5x17y0dc2i1whxl";
3232 };
3333
3434 buildInputs =
pkgs/development/libraries/qt-5/5.12/default.nix+1
@@ -54,6 +54,7 @@ let
5454 optionals stdenv.isDarwin [
5555 ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
5656 ./qtbase.patch.d/0002-qtbase-mac.patch
57+ ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
5758 ]
5859 ++ [
5960 ./qtbase.patch.d/0003-qtbase-mkspecs.patch
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patchnew file+16
@@ -0,0 +1,16 @@
1+diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
2+index a367487e..c3aeca1d 100644
3+--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
4++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
5+@@ -49,6 +49,11 @@
6+ // but was only added in the 10.14 SDK, so declare it just in case.
7+ extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space);
8+
9++// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html
10++#if !defined(kIOSurfaceSuccess)
11++#define kIOSurfaceSuccess KERN_SUCCESS
12++#endif
13++
14+ QT_BEGIN_NAMESPACE
15+
16+ Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface");
pkgs/development/libraries/qt-5/hooks/qmake-hook.sh+2−2
@@ -1,6 +1,6 @@
11. @fix_qmake_libtool@
22
3−qmakeFlags=( $qmakeFlags )
3+qmakeFlags=( ${qmakeFlags-} )
44
55qmakePrePhase() {
66 qmakeFlags=( \
@@ -31,6 +31,6 @@ qmakeConfigurePhase() {
3131 runHook postConfigure
3232}
3333
34−if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then
34+if [ -z "${dontUseQmakeConfigure-}" -a -z "${configurePhase-}" ]; then
3535 configurePhase=qmakeConfigurePhase
3636fi
pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh+2−2
@@ -61,6 +61,6 @@ postPatchMkspecs() {
6161 fixQtBuiltinPaths "$dev/mkspecs" '*.pr?'
6262 fi
6363}
64−if [ -z "$dontPatchMkspecs" ]; then
65− postPhases="${postPhases}${postPhases:+ }postPatchMkspecs"
64+if [ -z "${dontPatchMkspecs-}" ]; then
65+ postPhases="${postPhases-}${postPhases:+ }postPatchMkspecs"
6666fi
pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh+2−2
@@ -64,10 +64,10 @@ qtOwnPathsHook() {
6464
6565preFixupPhases+=" qtOwnPathsHook"
6666
67−# Note: $qtWrapperArgs still gets defined even if $dontWrapQtApps is set.
67+# Note: $qtWrapperArgs still gets defined even if ${dontWrapQtApps-} is set.
6868wrapQtAppsHook() {
6969 # skip this hook when requested
70− [ -z "$dontWrapQtApps" ] || return 0
70+ [ -z "${dontWrapQtApps-}" ] || return 0
7171
7272 # guard against running multiple times (e.g. due to propagation)
7373 [ -z "$wrapQtAppsHookHasRun" ] || return 0
pkgs/development/libraries/qt-5/modules/qtbase.nix+1−1
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
5858 # TODO: move to buildInputs, this should not be propagated.
5959 AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth
6060 CoreLocation CoreServices DiskArbitration Foundation OpenGL
61− darwin.libobjc libiconv MetalKit
61+ darwin.libobjc libiconv MetalKit IOKit
6262 ]
6363 else
6464 [
pkgs/development/libraries/vtk/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt, libtiff
1+{ stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
22, qtLib ? null
33# Darwin support
44, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 buildInputs = [ libtiff ]
2626 ++ optional (qtLib != null) qtLib
27− ++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ]
27+ ++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ]
2828 ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
2929 CFNetwork Security ApplicationServices CoreText
3030 IOSurface ImageIO OpenGL GLUT ];
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040 # built and requiring one of the shared objects.
4141 # At least, we use -fPIC for other packages to be able to use this in shared
4242 # objects.
43− cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" ]
43+ cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ]
4444 ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
4545 ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks";
4646
pkgs/development/libraries/webkitgtk/default.nix+4−2
@@ -2,7 +2,7 @@
22, pkgconfig, gettext, gobject-introspection, libnotify, gnutls, libgcrypt
33, gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core
44, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit
5−, libidn, libedit, readline, libGLU_combined, libintl, openjpeg
5+, libidn, libedit, readline, libGL, libGLU, libintl, openjpeg
66, enableGeoLocation ? true, geoclue2, sqlite
77, enableGtk2Plugins ? false, gtk2 ? null
88, gst-plugins-base, gst-plugins-bad, woff2
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
3737 src = ./fix-bubblewrap-paths.patch;
3838 inherit (builtins) storeDir;
3939 })
40+ ./libglvnd-headers.patch
4041 ];
4142
4243 postPatch = ''
@@ -74,10 +75,11 @@ stdenv.mkDerivation rec {
7475 libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2
7576 libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit openjpeg
7677 sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core
78+ libGL libGLU
7779 ] ++ optional enableGeoLocation geoclue2
7880 ++ optional enableGtk2Plugins gtk2
7981 ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ])
80− ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ]
82+ ++ optionals stdenv.isDarwin [ libedit readline ]
8183 ++ optionals stdenv.isLinux [
8284 wayland bubblewrap libseccomp xdg-dbus-proxy
8385 ];
pkgs/development/libraries/webkitgtk/libglvnd-headers.patchnew file+586
@@ -0,0 +1,586 @@
1+diff --git a/Source/ThirdParty/ANGLE/scripts/generate_loader.py b/Source/ThirdParty/ANGLE/scripts/generate_loader.py
2+index a408dac4..92ddca90 100644
3+--- a/Source/ThirdParty/ANGLE/scripts/generate_loader.py
4++++ b/Source/ThirdParty/ANGLE/scripts/generate_loader.py
5+@@ -201,6 +201,8 @@ def main():
6+
7+ libegl_preamble = """#include <EGL/egl.h>
8+ #include <EGL/eglext.h>
9++#include <EGL/eglmesaext.h>
10++#include <EGL/eglmesaext.h>
11+ """
12+
13+ util_gles_preamble = """#if defined(GL_GLES_PROTOTYPES) && GL_GLES_PROTOTYPES
14+@@ -215,6 +217,8 @@ util_egl_preamble = """#include "util/util_export.h"
15+
16+ #include <EGL/egl.h>
17+ #include <EGL/eglext.h>
18++#include <EGL/eglmesaext.h>
19++#include <EGL/eglmesaext.h>
20+ """
21+
22+ util_wgl_preamble = """
23+diff --git a/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h
24+index 68c65d8b..0dc9c8e3 100644
25+--- a/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h
26++++ b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h
27+@@ -14,6 +14,7 @@
28+
29+ #include <EGL/egl.h>
30+ #include <EGL/eglext.h>
31++#include <EGL/eglmesaext.h>
32+ #include <angle_gl.h>
33+
34+ #include <cstdint>
35+diff --git a/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h
36+index cd651150..17719bc2 100644
37+--- a/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h
38++++ b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h
39+@@ -14,6 +14,7 @@
40+
41+ #include <EGL/egl.h>
42+ #include <EGL/eglext.h>
43++#include <EGL/eglmesaext.h>
44+ #include <angle_gl.h>
45+
46+ #include <cstdint>
47+diff --git a/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py b/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py
48+index 2f77e725..5ea54f1f 100644
49+--- a/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py
50++++ b/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py
51+@@ -71,6 +71,7 @@ header_template = """// GENERATED FILE - DO NOT EDIT.
52+ #include <angle_gl.h>
53+ #include <EGL/egl.h>
54+ #include <EGL/eglext.h>
55++#include <EGL/eglmesaext.h>
56+
57+ #include <cstdint>
58+
59+diff --git a/Source/ThirdParty/ANGLE/src/common/utilities.h b/Source/ThirdParty/ANGLE/src/common/utilities.h
60+index 7a1429a4..dd20bcca 100644
61+--- a/Source/ThirdParty/ANGLE/src/common/utilities.h
62++++ b/Source/ThirdParty/ANGLE/src/common/utilities.h
63+@@ -11,6 +11,7 @@
64+
65+ #include <EGL/egl.h>
66+ #include <EGL/eglext.h>
67++#include <EGL/eglmesaext.h>
68+
69+ #include <math.h>
70+ #include <string>
71+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp
72+index 4134226d..5dd1065f 100644
73+--- a/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp
74++++ b/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp
75+@@ -15,6 +15,7 @@
76+ #include <vector>
77+
78+ #include <EGL/eglext.h>
79++#include <EGL/eglmesaext.h>
80+ #include "angle_gl.h"
81+
82+ #include "common/debug.h"
83+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp
84+index 13ae4e61..b964b755 100644
85+--- a/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp
86++++ b/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp
87+@@ -12,6 +12,7 @@
88+ #include <iterator>
89+
90+ #include <EGL/eglext.h>
91++#include <EGL/eglmesaext.h>
92+ #include <platform/Platform.h>
93+
94+ #include "common/debug.h"
95+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp
96+index 21064073..a46628bd 100644
97+--- a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp
98++++ b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp
99+@@ -17,6 +17,7 @@
100+ #include <vector>
101+
102+ #include <EGL/eglext.h>
103++#include <EGL/eglmesaext.h>
104+ #include <platform/Platform.h>
105+
106+ #include "common/debug.h"
107+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Error.h b/Source/ThirdParty/ANGLE/src/libANGLE/Error.h
108+index 37df5b0c..b2e3885b 100644
109+--- a/Source/ThirdParty/ANGLE/src/libANGLE/Error.h
110++++ b/Source/ThirdParty/ANGLE/src/libANGLE/Error.h
111+@@ -11,6 +11,7 @@
112+
113+ #include <EGL/egl.h>
114+ #include <EGL/eglext.h>
115++#include <EGL/eglmesaext.h>
116+ #include "angle_gl.h"
117+ #include "common/angleutils.h"
118+ #include "common/debug.h"
119+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp
120+index b7bc84c8..538cb3e0 100644
121+--- a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp
122++++ b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp
123+@@ -10,6 +10,7 @@
124+ #include "libANGLE/Stream.h"
125+
126+ #include <EGL/eglext.h>
127++#include <EGL/eglmesaext.h>
128+ #include <platform/Platform.h>
129+
130+ #include "common/debug.h"
131+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h
132+index 9157aa51..d8e58f2d 100644
133+--- a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h
134++++ b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h
135+@@ -14,6 +14,7 @@
136+
137+ #include <EGL/egl.h>
138+ #include <EGL/eglext.h>
139++#include <EGL/eglmesaext.h>
140+
141+ #include "common/angleutils.h"
142+ #include "libANGLE/AttributeMap.h"
143+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp
144+index 6daec4f6..941f34ca 100644
145+--- a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp
146++++ b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp
147+@@ -11,6 +11,7 @@
148+ #include "libANGLE/Surface.h"
149+
150+ #include <EGL/eglext.h>
151++#include <EGL/eglmesaext.h>
152+
153+ #include "libANGLE/Config.h"
154+ #include "libANGLE/Context.h"
155+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h
156+index ea1a0510..db7cf0c8 100644
157+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h
158++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h
159+@@ -11,6 +11,7 @@
160+
161+ #include <EGL/egl.h>
162+ #include <EGL/eglext.h>
163++#include <EGL/eglmesaext.h>
164+
165+ #include "common/angleutils.h"
166+ #include "libANGLE/Error.h"
167+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp
168+index ba5cf532..43304da5 100644
169+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp
170++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp
171+@@ -13,6 +13,7 @@
172+ #include "libANGLE/Display.h"
173+
174+ #include <EGL/eglext.h>
175++#include <EGL/eglmesaext.h>
176+
177+ namespace rx
178+ {
179+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp
180+index de60dfff..93b5bdf8 100644
181+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp
182++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp
183+@@ -9,6 +9,7 @@
184+ #include "libANGLE/renderer/d3d/DisplayD3D.h"
185+
186+ #include <EGL/eglext.h>
187++#include <EGL/eglmesaext.h>
188+
189+ #include "libANGLE/Config.h"
190+ #include "libANGLE/Context.h"
191+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp
192+index a7255d0d..a7e37777 100644
193+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp
194++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp
195+@@ -20,6 +20,7 @@
196+ #include "libANGLE/renderer/d3d/TextureStorage.h"
197+
198+ #include <EGL/eglext.h>
199++#include <EGL/eglmesaext.h>
200+
201+ namespace rx
202+ {
203+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp
204+index 61dc8ffa..87276514 100644
205+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp
206++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp
207+@@ -19,6 +19,7 @@
208+ #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
209+
210+ #include <EGL/eglext.h>
211++#include <EGL/eglmesaext.h>
212+ #include <tchar.h>
213+ #include <algorithm>
214+
215+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h
216+index 443cadd6..e64bdfc4 100644
217+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h
218++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h
219+@@ -12,6 +12,7 @@
220+
221+ #include <EGL/egl.h>
222+ #include <EGL/eglext.h>
223++#include <EGL/eglmesaext.h>
224+ #include <GLES2/gl2.h>
225+
226+ #include "common/angleutils.h"
227+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
228+index 33dfa6b0..eb3393d2 100644
229+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
230++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
231+@@ -9,6 +9,7 @@
232+ #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
233+
234+ #include <EGL/eglext.h>
235++#include <EGL/eglmesaext.h>
236+ #include <versionhelpers.h>
237+ #include <sstream>
238+
239+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
240+index fe4def6e..2550b52c 100644
241+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
242++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
243+@@ -9,6 +9,7 @@
244+ #include "libANGLE/renderer/d3d/d3d11/SwapChain11.h"
245+
246+ #include <EGL/eglext.h>
247++#include <EGL/eglmesaext.h>
248+
249+ #include "libANGLE/features.h"
250+ #include "libANGLE/renderer/d3d/DisplayD3D.h"
251+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
252+index f4a4ce43..0cad5540 100644
253+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
254++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
255+@@ -9,6 +9,7 @@
256+ #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
257+
258+ #include <EGL/eglext.h>
259++#include <EGL/eglmesaext.h>
260+ #include <sstream>
261+
262+ #include "common/utilities.h"
263+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp
264+index a89e1365..0fe4fa98 100644
265+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp
266++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp
267+@@ -18,6 +18,7 @@
268+ #include "libANGLE/renderer/gl/SurfaceGL.h"
269+
270+ #include <EGL/eglext.h>
271++#include <EGL/eglmesaext.h>
272+
273+ namespace rx
274+ {
275+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp
276+index 10b15594..7ae1ac6b 100644
277+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp
278++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp
279+@@ -9,6 +9,7 @@
280+ #include "libANGLE/renderer/gl/RendererGL.h"
281+
282+ #include <EGL/eglext.h>
283++#include <EGL/eglmesaext.h>
284+
285+ #include "common/debug.h"
286+ #include "libANGLE/AttributeMap.h"
287+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h
288+index 115a7afb..abb200e6 100644
289+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h
290++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h
291+@@ -11,6 +11,7 @@
292+
293+ #include <EGL/egl.h>
294+ #include <EGL/eglext.h>
295++#include <EGL/eglmesaext.h>
296+
297+ #include <string>
298+ #include <vector>
299+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
300+index 47ed6ce0..9d11560c 100644
301+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
302++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
303+@@ -14,6 +14,7 @@
304+ #include <unistd.h>
305+
306+ #include <EGL/eglext.h>
307++#include <EGL/eglmesaext.h>
308+
309+ #include <drm_fourcc.h>
310+ #include <gbm.h>
311+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
312+index 23b4a5c5..daeb5789 100644
313+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
314++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
315+@@ -9,6 +9,7 @@
316+ #include "libANGLE/renderer/gl/glx/DisplayGLX.h"
317+
318+ #include <EGL/eglext.h>
319++#include <EGL/eglmesaext.h>
320+ #include <algorithm>
321+ #include <cstring>
322+ #include <fstream>
323+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp
324+index 698b51e2..32e6126f 100644
325+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp
326++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp
327+@@ -27,6 +27,7 @@
328+ #include "libANGLE/renderer/gl/formatutilsgl.h"
329+
330+ #include <EGL/eglext.h>
331++#include <EGL/eglmesaext.h>
332+ #include <algorithm>
333+ #include <sstream>
334+
335+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
336+index 5b686321..16ae890f 100644
337+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
338++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
339+@@ -18,6 +18,7 @@
340+ #include "libANGLE/renderer/gl/wgl/FunctionsWGL.h"
341+
342+ #include <EGL/eglext.h>
343++#include <EGL/eglmesaext.h>
344+
345+ namespace rx
346+ {
347+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
348+index 12679ba7..93503812 100644
349+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
350++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
351+@@ -28,6 +28,7 @@
352+ #include "platform/Platform.h"
353+
354+ #include <EGL/eglext.h>
355++#include <EGL/eglmesaext.h>
356+ #include <sstream>
357+ #include <string>
358+
359+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp
360+index df900f4d..4385be88 100644
361+--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp
362++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp
363+@@ -13,6 +13,7 @@
364+ #include "libANGLE/renderer/vulkan/vk_utils.h"
365+
366+ #include <EGL/eglext.h>
367++#include <EGL/eglmesaext.h>
368+
369+ #include "common/debug.h"
370+ #include "common/platform.h"
371+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp
372+index 1c0b25f4..64e96f73 100644
373+--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp
374++++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp
375+@@ -22,6 +22,7 @@
376+ #include "libANGLE/formatutils.h"
377+
378+ #include <EGL/eglext.h>
379++#include <EGL/eglmesaext.h>
380+
381+ namespace egl
382+ {
383+diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h
384+index a671bb0d..248f0ae8 100644
385+--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h
386++++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h
387+@@ -15,6 +15,7 @@
388+
389+ #include <EGL/egl.h>
390+ #include <EGL/eglext.h>
391++#include <EGL/eglmesaext.h>
392+
393+ namespace gl
394+ {
395+diff --git a/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h
396+index ae4a427c..a802b65d 100644
397+--- a/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h
398++++ b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h
399+@@ -13,6 +13,7 @@
400+
401+ #include <EGL/egl.h>
402+ #include <EGL/eglext.h>
403++#include <EGL/eglmesaext.h>
404+
405+ extern PFNEGLCHOOSECONFIGPROC EGL_ChooseConfig;
406+ extern PFNEGLCOPYBUFFERSPROC EGL_CopyBuffers;
407+diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h
408+index 3c64b290..96201b31 100644
409+--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h
410++++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h
411+@@ -11,6 +11,7 @@
412+
413+ #include <EGL/egl.h>
414+ #include <EGL/eglext.h>
415++#include <EGL/eglmesaext.h>
416+ #include <export.h>
417+
418+ extern "C" {
419+diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp
420+index 777b09e1..dbb0bd2f 100644
421+--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp
422++++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp
423+@@ -24,6 +24,7 @@
424+
425+ #include <EGL/egl.h>
426+ #include <EGL/eglext.h>
427++#include <EGL/eglmesaext.h>
428+
429+ #include "deClock.h"
430+ #include "deMemory.h"
431+diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp
432+index 6b4a25bf..1c4ac864 100644
433+--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp
434++++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp
435+@@ -22,6 +22,7 @@
436+
437+ #include <EGL/egl.h>
438+ #include <EGL/eglext.h>
439++#include <EGL/eglmesaext.h>
440+
441+ #include "egluGLContextFactory.hpp"
442+ #include "tcuANGLENativeDisplayFactory.h"
443+diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp
444+index 90abb931..aea4e153 100644
445+--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp
446++++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp
447+@@ -10,6 +10,7 @@
448+
449+ #include <EGL/egl.h>
450+ #include <EGL/eglext.h>
451++#include <EGL/eglmesaext.h>
452+ #include <X11/Xlib.h>
453+
454+ #include "test_utils/ANGLETest.h"
455+diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h
456+index e888a239..71606b8c 100644
457+--- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h
458++++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h
459+@@ -11,6 +11,7 @@
460+
461+ #include <EGL/egl.h>
462+ #include <EGL/eglext.h>
463++#include <EGL/eglmesaext.h>
464+
465+ #include <string>
466+
467+diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp
468+index 7fdddcc6..e40b8905 100644
469+--- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp
470++++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp
471+@@ -10,6 +10,7 @@
472+
473+ #include <EGL/egl.h>
474+ #include <EGL/eglext.h>
475++#include <EGL/eglmesaext.h>
476+
477+ #include <map>
478+ #include <string>
479+diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h
480+index 7bc7a027..ebb2827b 100644
481+--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h
482++++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h
483+@@ -16,6 +16,7 @@
484+
485+ #include <EGL/egl.h>
486+ #include <EGL/eglext.h>
487++#include <EGL/eglmesaext.h>
488+
489+ #include "GLSLANG/ShaderLang.h"
490+ #include "angle_test_instantiate.h"
491+diff --git a/Source/ThirdParty/ANGLE/util/OSPixmap.h b/Source/ThirdParty/ANGLE/util/OSPixmap.h
492+index ba6ccf4a..563d2578 100644
493+--- a/Source/ThirdParty/ANGLE/util/OSPixmap.h
494++++ b/Source/ThirdParty/ANGLE/util/OSPixmap.h
495+@@ -13,6 +13,7 @@
496+
497+ #include <EGL/egl.h>
498+ #include <EGL/eglext.h>
499++#include <EGL/eglmesaext.h>
500+
501+ #include "util/Event.h"
502+ #include "util/util_export.h"
503+diff --git a/Source/ThirdParty/ANGLE/util/OSWindow.h b/Source/ThirdParty/ANGLE/util/OSWindow.h
504+index 3cdb458c..3178fa44 100644
505+--- a/Source/ThirdParty/ANGLE/util/OSWindow.h
506++++ b/Source/ThirdParty/ANGLE/util/OSWindow.h
507+@@ -15,6 +15,7 @@
508+
509+ #include <EGL/egl.h>
510+ #include <EGL/eglext.h>
511++#include <EGL/eglmesaext.h>
512+
513+ #include "util/Event.h"
514+ #include "util/util_export.h"
515+diff --git a/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h
516+index 5fbec82f..77a30330 100644
517+--- a/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h
518++++ b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h
519+@@ -15,6 +15,7 @@
520+
521+ #include <EGL/egl.h>
522+ #include <EGL/eglext.h>
523++#include <EGL/eglmesaext.h>
524+
525+ ANGLE_UTIL_EXPORT extern PFNEGLCHOOSECONFIGPROC eglChooseConfig;
526+ ANGLE_UTIL_EXPORT extern PFNEGLCOPYBUFFERSPROC eglCopyBuffers;
527+diff --git a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
528+index a8a82d70..050893a9 100644
529+--- a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
530++++ b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
531+@@ -29,6 +29,7 @@
532+ #else
533+ #include <EGL/egl.h>
534+ #include <EGL/eglext.h>
535++#include <EGL/eglmesaext.h>
536+ #endif
537+
538+ #if USE(CAIRO)
539+diff --git a/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp b/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp
540+index 05f92c22..636df34a 100644
541+--- a/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp
542++++ b/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp
543+@@ -35,6 +35,7 @@
544+ #include <wayland-egl.h>
545+ #include <EGL/egl.h>
546+ #include <EGL/eglext.h>
547++#include <EGL/eglmesaext.h>
548+ #include <wtf/Assertions.h>
549+
550+ namespace WebCore {
551+diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
552+index 8c81119b..bf9ed4bd 100644
553+--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
554++++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
555+@@ -38,6 +38,7 @@
556+ #if USE(EGL)
557+ #include <EGL/egl.h>
558+ #include <EGL/eglext.h>
559++#include <EGL/eglmesaext.h>
560+ #endif
561+
562+ namespace WebCore {
563+diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
564+index 973b3168..5586236a 100644
565+--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
566++++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
567+@@ -35,6 +35,7 @@
568+ #include <gdk/gdkwayland.h>
569+ #include <EGL/egl.h>
570+ #include <EGL/eglext.h>
571++#include <EGL/eglmesaext.h>
572+ #include <WebCore/CairoUtilities.h>
573+ #include <WebCore/GLContext.h>
574+
575+diff --git a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp b/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
576+index 8d848ce4..46d42c11 100644
577+--- a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
578++++ b/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
579+@@ -31,6 +31,7 @@
580+ #include "WebKitWaylandServerProtocol.h"
581+ #include <EGL/egl.h>
582+ #include <EGL/eglext.h>
583++#include <EGL/eglmesaext.h>
584+ #include <WebCore/GLContext.h>
585+ #include <WebCore/PlatformDisplayWayland.h>
586+ #include <WebCore/Region.h>
pkgs/development/lisp-modules/clwrapper/setup-hook.sh+1−1
@@ -27,7 +27,7 @@ setLisp () {
2727
2828collectNixLispLDLP () {
2929 if echo "$1/lib"/lib*.so* | grep . > /dev/null; then
30− export NIX_LISP_LD_LIBRARY_PATH="$NIX_LISP_LD_LIBRARY_PATH${NIX_LISP_LD_LIBRARY_PATH:+:}$1/lib"
30+ export NIX_LISP_LD_LIBRARY_PATH="${NIX_LISP_LD_LIBRARY_PATH-}${NIX_LISP_LD_LIBRARY_PATH:+:}$1/lib"
3131 fi
3232}
3333
pkgs/development/lua-modules/overrides.nix+1−1
@@ -224,7 +224,7 @@ with super;
224224 });
225225
226226 luasystem = super.luasystem.override({
227− buildInputs = [
227+ buildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [
228228 pkgs.glibc
229229 ];
230230 });
pkgs/development/node-packages/node-env.nix+1−1
@@ -363,7 +363,7 @@ let
363363
364364 npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
365365
366− if [ "$dontNpmInstall" != "1" ]
366+ if [ "''${dontNpmInstall-}" != "1" ]
367367 then
368368 # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
369369 rm -f npm-shrinkwrap.json
pkgs/development/ocaml-modules/bap/default.nix+3−3
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
2828 createFindlibDestdir = true;
2929
3030 setupHook = writeText "setupHook.sh" ''
31− export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
32− export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/"
31+ export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
32+ export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/"
3333 '';
3434
3535 nativeBuildInputs = [ which makeWrapper ];
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 installPhase = ''
4545 export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR;
4646 export PATH=$PATH:$out/bin
47− export CAML_LD_LIBRARY_PATH=$CAML_LD_LIBRARY_PATH:$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/
47+ export CAML_LD_LIBRARY_PATH=''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/
4848 mkdir -p $out/lib/bap
4949 make install
5050 rm $out/bin/baptop
pkgs/development/ocaml-modules/ocsigen-server/default.nix+1−1
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 ''
4242 rm -rf $out/var/run
4343 wrapProgram $out/bin/ocsigenserver \
44− --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH:${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}"
44+ --suffix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}"
4545 '';
4646
4747 dontPatchShebangs = true;
pkgs/development/python-modules/cfn-lint/default.nix+2
@@ -8,6 +8,7 @@
88, jsonpatch
99, jsonschema
1010, pathlib2
11+, setuptools
1112}:
1213
1314buildPythonPackage rec {
@@ -27,6 +28,7 @@ buildPythonPackage rec {
2728 jsonpatch
2829 jsonschema
2930 pathlib2
31+ setuptools
3032 ];
3133
3234 # No tests included in archive
pkgs/development/python-modules/mpi4py/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "mpi4py";
5− version = "3.0.2";
5+ version = "3.0.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1q28xl36difma1wq0acq111cqxjya32kn3lxp6fbidz3wg8jkmpq";
9+ sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f";
1010 };
1111
1212 passthru = {
pkgs/development/python-modules/mwoauth/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "mwoauth";
13− version = "0.3.5";
13+ version = "0.3.7";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "c7e4c56561a280e14ca4cc20b79ba4a9dd4ec752ff4c797cf29dad4460fb7832";
17+ sha256 = "9e0d70a1fa6f452584de1cb853ae6c11f41233549f7839cfb879f99410f6ad46";
1818 };
1919
2020 # package has no tests
pkgs/development/python-modules/myfitnesspal/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "myfitnesspal";
7− version = "1.13.3";
7+ version = "1.13.4";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "4f785341f0499bad8d3400cfcfffd99b7fcf8aac3971390f8ec3dfaed8361b20";
11+ sha256 = "552cc696e170f12f75fd12b1447be01fa2d0bfd85e14da5928afd9aab2277b98";
1212 };
1313
1414 # Remove overly restrictive version constraints on keyring and keyrings.alt
pkgs/development/python-modules/mysqlclient/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildPythonPackage rec {
44 pname = "mysqlclient";
5− version = "1.4.4";
5+ version = "1.4.5";
66
77 nativeBuildInputs = [
88 libmysqlclient
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "1379hab7spjp9v5fypqgy0b8vr8vnalxahm9hcsxvj2xbb2pqwww";
20+ sha256 = "e80109b0ae8d952b900b31b623181532e5e89376d707dcbeb63f99e69cefe559";
2121 };
2222
2323 meta = with stdenv.lib; {
pkgs/development/python-modules/nbconvert/default.nix+2−2
@@ -22,11 +22,11 @@
2222
2323buildPythonPackage rec {
2424 pname = "nbconvert";
25− version = "5.6.0";
25+ version = "5.6.1";
2626
2727 src = fetchPypi {
2828 inherit pname version;
29− sha256 = "427a468ec26e7d68a529b95f578d5cbf018cb4c1f889e897681c2b6d11897695";
29+ sha256 = "21fb48e700b43e82ba0e3142421a659d7739b65568cc832a13976a77be16b523";
3030 };
3131
3232 checkInputs = [ nose pytest glibcLocales ];
pkgs/development/python-modules/nbdime/default.nix+2−2
@@ -24,12 +24,12 @@
2424
2525buildPythonPackage rec {
2626 pname = "nbdime";
27− version = "1.0.6";
27+ version = "1.0.7";
2828 disabled = !isPy3k;
2929
3030 src = fetchPypi {
3131 inherit pname version;
32− sha256 = "00nywb69kp9i0wl5mczgwqc5db8v70ihr9cjbwqppd2jkx4vf34j";
32+ sha256 = "28615cb92d59e0511026bac4c916f16dc15981bcad4ddc3f7fdd6a289ea01242";
3333 };
3434
3535 checkInputs = [
pkgs/development/python-modules/notebook/default.nix+2−2
@@ -25,12 +25,12 @@
2525
2626buildPythonPackage rec {
2727 pname = "notebook";
28− version = "6.0.1";
28+ version = "6.0.2";
2929 disabled = !isPy3k;
3030
3131 src = fetchPypi {
3232 inherit pname version;
33− sha256 = "660976fe4fe45c7aa55e04bf4bccb9f9566749ff637e9020af3422f9921f9a5d";
33+ sha256 = "399a4411e171170173344761e7fd4491a3625659881f76ce47c50231ed714d9b";
3434 };
3535
3636 LC_ALL = "en_US.utf8";
pkgs/development/python-modules/numcodecs/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "numcodecs";
14− version = "0.6.3";
14+ version = "0.6.4";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "086qwlyi01rpgyyyy8bmhh9i7hpksyz33ldci3wdwmhiblyl362y";
18+ sha256 = "ef4843d5db4d074e607e9b85156835c10d006afc10e175bda62ff5412fca6e4d";
1919 };
2020
2121 nativeBuildInputs = [
pkgs/development/python-modules/numpy/default.nix+2−2
@@ -16,12 +16,12 @@ let
1616 };
1717in buildPythonPackage rec {
1818 pname = "numpy";
19− version = "1.17.3";
19+ version = "1.17.4";
2020
2121 src = fetchPypi {
2222 inherit pname version;
2323 extension = "zip";
24− sha256 = "a0678793096205a4d784bd99f32803ba8100f639cf3b932dc63b21621390ea7e";
24+ sha256 = "f58913e9227400f1395c7b800503ebfdb0772f1c33ff8cb4d6451c06cabdf316";
2525 };
2626
2727 nativeBuildInputs = [ gfortran pytest ];
pkgs/development/python-modules/pandas/2.nix+2−2
@@ -32,11 +32,11 @@ let
3232
3333in buildPythonPackage rec {
3434 pname = "pandas";
35− version = "0.25.2";
35+ version = "0.25.3";
3636
3737 src = fetchPypi {
3838 inherit pname version;
39− sha256 = "ca91a19d1f0a280874a24dca44aadce42da7f3a7edb7e9ab7c7baad8febee2be";
39+ sha256 = "52da74df8a9c9a103af0a72c9d5fdc8e0183a90884278db7f386b5692a2220a4";
4040 };
4141
4242 checkInputs = [ pytest glibcLocales moto hypothesis ];
pkgs/development/python-modules/pandas/default.nix+2−2
@@ -30,11 +30,11 @@ let
3030
3131in buildPythonPackage rec {
3232 pname = "pandas";
33− version = "0.25.2";
33+ version = "0.25.3";
3434
3535 src = fetchPypi {
3636 inherit pname version;
37− sha256 = "ca91a19d1f0a280874a24dca44aadce42da7f3a7edb7e9ab7c7baad8febee2be";
37+ sha256 = "52da74df8a9c9a103af0a72c9d5fdc8e0183a90884278db7f386b5692a2220a4";
3838 };
3939
4040 checkInputs = [ pytest glibcLocales moto hypothesis ];
pkgs/development/python-modules/persistent/default.nix+2−2
@@ -7,14 +7,14 @@
77
88buildPythonPackage rec {
99 pname = "persistent";
10− version = "4.5.0";
10+ version = "4.5.1";
1111
1212 nativeBuildInputs = [ sphinx manuel ];
1313 propagatedBuildInputs = [ zope_interface cffi ];
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "0slbvq1m3rilgyhj6i522rsyv592xv9pmvm61mrmgkgf40kfnz69";
17+ sha256 = "73862779577cb8637f2b68e7edee9a9b95cf33d0b83cb6e762f0f3fc12897aa6";
1818 };
1919
2020 meta = {
pkgs/development/python-modules/phonenumbers/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "phonenumbers";
5− version = "8.10.21";
5+ version = "8.10.22";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "162301aa2ce7c1a7196d7b5b084e3263a0a5f55e3129fe2429f2a115c3ef16c3";
9+ sha256 = "705dc7bbaa0d5932e9c010437c718bb3c0d7c93ab25b9710b4d9ae7370cc0121";
1010 };
1111
1212 meta = {
pkgs/development/python-modules/pipdate/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "pipdate";
11− version = "0.3.2";
11+ version = "0.3.4";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "a27f64d13269adfd8594582f5a62c9f2151b426e701afdfc3b4f4019527b4121";
15+ sha256 = "26bd12075e63ef7f8094da36c27bf5539d298f4ef2af6acba20e98b502439d6d";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/plac/default.nix+2−2
@@ -5,11 +5,11 @@
55}:
66buildPythonPackage rec {
77 pname = "plac";
8− version = "1.1.0";
8+ version = "1.1.3";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "10f0blwxn7k2qvd0vs4300jxb8n9r7jhngf9bx9bfxia8akwy5kw";
12+ sha256 = "398cb947c60c4c25e275e1f1dadf027e7096858fb260b8ece3b33bcff90d985f";
1313 };
1414
1515 checkPhase = ''
pkgs/development/python-modules/psutil/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "psutil";
9− version = "5.6.3";
9+ version = "5.6.5";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "863a85c1c0a5103a12c05a35e59d336e1d665747e531256e061213e2e90f63f3";
13+ sha256 = "d051532ac944f1be0179e0506f6889833cf96e466262523e57a871de65a15147";
1414 };
1515
1616 # No tests in archive
pkgs/development/python-modules/pyatmo/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "pyatmo";
9− version = "2.3.2";
9+ version = "2.3.3";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "2c76740e5adbf8b14d8f41d4f84ce23c0e8e738b18b926dc60858c35bf2fa8f2";
13+ sha256 = "b884402c62d589a38444e8f4b3892b18312e8f9442cd8d12e7ec01c698328f54";
1414 };
1515
1616 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/pybase64/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pybase64";
5− version = "1.0.0";
5+ version = "1.0.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "71a729b10232b38cba001e621dbaa6dbba2302dc44a93706295f1ff760f40876";
9+ sha256 = "6ced40531bffc81bafc790d5c0d2f752e281b3b00fd6ff4e79385c625e5dbab1";
1010 };
1111
1212 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/pybids/default.nix+2−2
@@ -15,12 +15,12 @@
1515}:
1616
1717buildPythonPackage rec {
18− version = "0.9.4";
18+ version = "0.9.5";
1919 pname = "pybids";
2020
2121 src = fetchPypi {
2222 inherit pname version;
23− sha256 = "08abd3573e823e536990caf54405ffef573a88ef9d019c2d94e0be995e21885f";
23+ sha256 = "0e8f8466067ff3023f53661c390c02702fcd5fe712bdd5bf167ffb0c2b920430";
2424 };
2525
2626 propagatedBuildInputs = [
pkgs/development/python-modules/pybullet/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "pybullet";
10− version = "2.5.6";
10+ version = "2.5.7";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "ffeb00f393dcddc11d195a72623e3b06767a37e4fdfa06ef88fbd74c8d326adb";
14+ sha256 = "82a235a8fe3c8dee753d765c295ff0da92bcb5096209d26a0cfc3f5c6054e374";
1515 };
1616
1717 buildInputs = [
pkgs/development/python-modules/pycairo/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildPythonPackage rec {
44 pname = "pycairo";
5− version = "1.18.1";
5+ version = "1.18.2";
66
77 format = "other";
88
@@ -12,7 +12,7 @@ buildPythonPackage rec {
1212 owner = "pygobject";
1313 repo = "pycairo";
1414 rev = "v${version}";
15− sha256 = "0f4l7d1ibkk8xdspyv5zx8fah9z3x775bd91zirnp37vlgqds7xj";
15+ sha256 = "142145a2whvlk92jijrbf3i2bqrzmspwpysj0bfypw0krzi0aa6j";
1616 };
1717
1818 nativeBuildInputs = [
pkgs/development/python-modules/pycryptodome/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchPypi, buildPythonPackage }:
22
33buildPythonPackage rec {
4− version = "3.9.0";
4+ version = "3.9.2";
55 pname = "pycryptodome";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "dbeb08ad850056747aa7d5f33273b7ce0b9a77910604a1be7b7a6f2ef076213f";
9+ sha256 = "e1e007d072d50844188c067c325af8b3ad31e4b87792381469b821e95bf14cd8";
1010 };
1111
1212 meta = {
pkgs/development/python-modules/pycryptodomex/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildPythonPackage rec {
44 pname = "pycryptodomex";
5− version = "3.9.0";
5+ version = "3.9.2";
66
77 meta = {
88 description = "A self-contained cryptographic library for Python";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "8b604f4fa1de456d6d19771b01c2823675a75a2c60e51a6b738f71fdfe865370";
15+ sha256 = "137e8e2c7438184dae0b940cdf5d0d4f639b1df564a95dadbb7c4ec188850921";
1616 };
1717}
pkgs/development/python-modules/pymupdf/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
22buildPythonPackage rec {
33 pname = "PyMuPDF";
4− version = "1.16.5";
4+ version = "1.16.7";
55
66 src = fetchPypi {
77 inherit pname version;
8− sha256 = "9909b1db81952abb09a2c17cca8ffa17f4a05a864653d6e702ce86bfa70c6a23";
8+ sha256 = "b16c85b2f89cc89e36b59fe734f14e5c939c8b24697bf33ff7a19584e8334976";
99 };
1010
1111 patchPhase = ''
pkgs/development/python-modules/pyopencl/default.nix+2−2
@@ -16,7 +16,7 @@
1616
1717buildPythonPackage rec {
1818 pname = "pyopencl";
19− version = "2019.1.1";
19+ version = "2019.1.2";
2020
2121 checkInputs = [ pytest ];
2222 buildInputs = [ opencl-headers ocl-icd pybind11 ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
2525
2626 src = fetchPypi {
2727 inherit pname version;
28− sha256 = "0g5n1c8gfqhfrfpzdypzwfj1q1nlqzcfjrx397cs6qqw67mg095k";
28+ sha256 = "7803f3128dbd28ae6f5b851a80ef586a35b9575406ea7bb068b8e1516f8043f0";
2929 };
3030
3131 # py.test is not needed during runtime, so remove it from `install_requires`
pkgs/development/python-modules/pyparsing/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPythonPackage, fetchPypi }:
22buildPythonPackage rec {
33 pname = "pyparsing";
4− version = "2.4.2";
4+ version = "2.4.5";
55
66 src = fetchPypi {
77 inherit pname version;
8− sha256 = "6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80";
8+ sha256 = "4ca62001be367f01bd3e92ecbb79070272a9d4964dce6a48a82ff0b8bc7e683a";
99 };
1010
1111 # Not everything necessary to run the tests is included in the distribution
pkgs/development/python-modules/pyrsistent/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "pyrsistent";
12− version = "0.15.4";
12+ version = "0.15.5";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "0cv5xvhfhlj88pb0ghdwivkfcmgi6503qjwxx4r6n06nd6hpzd1l";
16+ sha256 = "eb6545dbeb1aa69ab1fb4809bfbf5a8705e44d92ef8fc7c2361682a47c46c778";
1717 };
1818
1919 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/pyside/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa }:
1+{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa, libGL }:
22
33# This derivation provides a Python module and should therefore be called via `python-packages.nix`.
44buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
1515
1616 nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
1717
18− buildInputs = [ mesa ];
18+ buildInputs = [ mesa libGL ];
1919
2020 makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner";
2121
pkgs/development/python-modules/pytest-mypy/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "pytest-mypy";
10− version = "0.4.1";
10+ version = "0.4.2";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "f6348a3aa08d7b38b05c12ed0965415e1b60d402d7ceb353f5116f6eaf7dac28";
14+ sha256 = "5a5338cecff17f005b181546a13e282761754b481225df37f33d37f86ac5b304";
1515 };
1616
1717 propagatedBuildInputs = [ pytest mypy ];
pkgs/development/python-modules/pytest/default.nix+2−2
@@ -3,7 +3,7 @@
33, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy, python
44}:
55buildPythonPackage rec {
6− version = "5.2.1";
6+ version = "5.2.2";
77 pname = "pytest";
88
99 disabled = !isPy3k;
@@ -15,7 +15,7 @@ buildPythonPackage rec {
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "ca563435f4941d0cb34767301c27bc65c510cb82e90b9ecf9cb52dc2c63caaa0";
18+ sha256 = "27abc3fef618a01bebb1f0d6d303d2816a99aa87a5968ebc32fe971be91eb1e6";
1919 };
2020
2121 checkInputs = [ hypothesis mock ];
pkgs/development/python-modules/python-daemon/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "python-daemon";
5− version = "2.2.3";
5+ version = "2.2.4";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "affeca9e5adfce2666a63890af9d6aff79f670f7511899edaddca7f96593cc25";
9+ sha256 = "57c84f50a04d7825515e4dbf3a31c70cc44414394a71608dee6cfde469e81766";
1010 };
1111
1212 # A test fail within chroot builds.
pkgs/development/python-modules/pythonnet/default.nix+2−2
@@ -43,8 +43,8 @@ buildPythonPackage rec {
4343 '';
4444
4545 preConfigure = ''
46− [ -z "$dontPlacateNuget" ] && placate-nuget.sh
47− [ -z "$dontPlacatePaket" ] && placate-paket.sh
46+ [ -z "''${dontPlacateNuget-}" ] && placate-nuget.sh
47+ [ -z "''${dontPlacatePaket-}" ] && placate-paket.sh
4848 '';
4949
5050 nativeBuildInputs = [
pkgs/development/python-modules/reportlab/default.nix+2−2
@@ -11,11 +11,11 @@ let
1111 ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
1212in buildPythonPackage rec {
1313 pname = "reportlab";
14− version = "3.5.31";
14+ version = "3.5.32";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "3e2d2ea8ac3d63c918a2b40476c2745704d0364abe2b9c844c75992132a5eac7";
18+ sha256 = "83ef44936ef4e9c432d62bc2b72ec8d772b87af319d123e827a72e9b6884c851";
1919 };
2020
2121 checkInputs = [ glibcLocales ];
pkgs/development/python-modules/rethinkdb/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "rethinkdb";
8− version = "2.4.4";
8+ version = "2.4.4.post1";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "d01b39c1921498e22e3c9cae1adb39c37b68e4438ef77218abc0166fdfd2ea7a";
12+ sha256 = "e1c1f8ad93bc1c6f2aaa73afc333c57d505d8cc08c437d78a5c1eb8dc4b7e8c2";
1313 };
1414
1515 doCheck = false;
pkgs/development/python-modules/runway-python/default.nix+2−2
@@ -13,11 +13,11 @@
1313
1414buildPythonPackage rec {
1515 pname = "runway-python";
16− version = "0.5.0";
16+ version = "0.5.1";
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "d3573a003899eb33c0edbc1d59c16c8c19c092512da0c75ceb1f46063a18c7e9";
20+ sha256 = "00cf6fa9ea3b6a195e9eca96216a9d206b6884624d0214bd776f8654cd5e8fea";
2121 };
2222
2323 propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ];
pkgs/development/python-modules/scipy/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "scipy";
5− version = "1.3.1";
5+ version = "1.3.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "2643cfb46d97b7797d1dbdb6f3c23fe3402904e3c90e6facfe6a9b98d808c1b5";
9+ sha256 = "a03939b431994289f39373c57bbe452974a7da724ae7f9620a1beee575434da4";
1010 };
1111
1212 checkInputs = [ nose pytest ];
pkgs/development/python-modules/sentry-sdk/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "sentry-sdk";
5− version = "0.13.0";
5+ version = "0.13.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "ff14935cc3053de0650128f124c36f34a4be120b8cc522c149f5cba342c1fd05";
9+ sha256 = "ff1fa7fb85703ae9414c8b427ee73f8363232767c9cd19158f08f6e4f0b58fc7";
1010 };
1111
1212 checkInputs = [ django flask tornado bottle rq falcon ]
pkgs/development/python-modules/soupsieve/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "soupsieve";
12− version = "1.9.4";
12+ version = "1.9.5";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "605f89ad5fdbfefe30cdc293303665eff2d188865d4dbe4eb510bba1edfbfce3";
16+ sha256 = "e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda";
1717 };
1818
1919 checkPhase = ''
pkgs/development/python-modules/sqlmap/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "sqlmap";
8− version = "1.3.10";
8+ version = "1.3.11";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "3f045e8e9ee1293e2d0ab4396950deed71f095a7762f063f3e5f54a839b8d5b4";
12+ sha256 = "27ef900b1116776128d0d09bff21f8d2f6bb2ea887cd59fe1a32aec5563aacb0";
1313 };
1414
1515 # No tests in archive
pkgs/development/python-modules/starlette/default.nix+2−2
@@ -18,12 +18,12 @@
1818
1919buildPythonPackage rec {
2020 pname = "starlette";
21− version = "0.12.10";
21+ version = "0.12.13";
2222 disabled = isPy27;
2323
2424 src = fetchPypi {
2525 inherit pname version;
26− sha256 = "e41ef52e711a82ef95c195674e5d8d41c75c6b1d6f5a275637eedd4cc2150a7f";
26+ sha256 = "9597bc28e3c4659107c1c4a45ec32dc45e947d78fe56230222be673b2c36454a";
2727 };
2828
2929 propagatedBuildInputs = [
pkgs/development/python-modules/strictyaml/default.nix+2−2
@@ -6,12 +6,12 @@
66}:
77
88buildPythonPackage rec {
9− version = "1.0.5";
9+ version = "1.0.6";
1010 pname = "strictyaml";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "aad8d90c4d300c5bfa7678b9680ce456406319859c7279e98110548b596b5ae7";
14+ sha256 = "dd687a32577e0b832619ce0552eac86d6afad5fa7b61ab041bb765881c6a1f36";
1515 };
1616
1717 propagatedBuildInputs = [ ruamel_yaml python-dateutil ];
pkgs/development/python-modules/tables/3.5.nix+2−2
@@ -4,12 +4,12 @@
44with stdenv.lib;
55
66buildPythonPackage rec {
7− version = "3.6.0";
7+ version = "3.6.1";
88 pname = "tables";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "db3488214864fb313a611fca68bf1c9019afe4e7877be54d0e61c84416603d4d";
12+ sha256 = "49a972b8a7c27a8a173aeb05f67acb45fe608b64cd8e9fa667c0962a60b71b49";
1313 };
1414
1515 buildInputs = [ hdf5 cython bzip2 lzo c-blosc ];
pkgs/development/python-modules/tenacity/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "tenacity";
8− version = "5.1.1";
8+ version = "5.1.5";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "a4eb168dbf55ed2cae27e7c6b2bd48ab54dabaf294177d998330cf59f294c112";
12+ sha256 = "e664bd94f088b17f46da33255ae33911ca6a0fe04b156d334b601a4ef66d3c5f";
1313 };
1414
1515 nativeBuildInputs = [ pbr setuptools_scm ];
pkgs/development/python-modules/testfixtures/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "testfixtures";
6− version = "6.10.0";
6+ version = "6.10.1";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "1kiv60i0s67v34x28j6cshby7n7mbhd7a7val639yvvlh1f0q8wx";
10+ sha256 = "abbca7ed381d34a77699c6cb68be67919a1e7f5cf8728b57396145417fa34110";
1111 };
1212
1313 checkInputs = [ pytest mock sybil zope_component twisted ];
pkgs/development/python-modules/testpath/default.nix+2−2
@@ -5,12 +5,12 @@
55
66buildPythonPackage rec {
77 pname = "testpath";
8− version = "0.4.2";
8+ version = "0.4.4";
99 format = "wheel";
1010
1111 src = fetchPypi {
1212 inherit pname version format;
13− sha256 = "46c89ebb683f473ffe2aab0ed9f12581d4d078308a3cb3765d79c6b2317b0109";
13+ sha256 = "bfcf9411ef4bf3db7579063e0546938b1edda3d69f4e1fb8756991f5951f85d4";
1414 };
1515
1616 meta = with stdenv.lib; {
pkgs/development/python-modules/tld/default.nix+2−2
@@ -2,11 +2,11 @@
22
33python.pkgs.buildPythonPackage rec {
44 pname = "tld";
5− version = "0.9.6";
5+ version = "0.9.7";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0figmf80y715zv6viqan2nyzpg9aia5dyl25nskirpm5lh1s99w9";
9+ sha256 = "cef15360ec42547a583d49ef5246936b3ace424a95c00b59c09dcbe44b289961";
1010 };
1111
1212 propagatedBuildInputs = with python.pkgs; [ six ];
pkgs/development/python-modules/trustme/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "trustme";
15− version = "0.5.2";
15+ version = "0.5.3";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "103f8n0c60593r0z8hh1zvk1bagxwnhrv3203xpiiddwqxalr04b";
19+ sha256 = "f0f96a21b430cc29661644d3569a1112a397ca9cc8595b964d4ae71e5e957529";
2020 };
2121
2222 checkInputs = [
pkgs/development/python-modules/typing-extensions/default.nix+2−2
@@ -4,11 +4,11 @@ let
44
55in buildPythonPackage rec {
66 pname = "typing_extensions";
7− version = "3.7.4";
7+ version = "3.7.4.1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "15bx773a5zkk4hkwjl8nb5f8y5741vyyqb9q3jac6kxm1frk5mif";
11+ sha256 = "091ecc894d5e908ac75209f10d5b4f118fbdb2eb1ede6a63544054bb1edb41f2";
1212 };
1313
1414 checkInputs = lib.optional (pythonOlder "3.5") typing;
pkgs/development/python-modules/unittest-xml-reporting/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildPythonPackage rec {
44 pname = "unittest-xml-reporting";
5− version = "2.5.1";
5+ version = "2.5.2";
66
77 propagatedBuildInputs = [six];
88
@@ -11,7 +11,7 @@ buildPythonPackage rec {
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "0v6xcs8nx82yw037h296zk0vz5ka4idm4xdpxkcm4h4fnpj8428l";
14+ sha256 = "9d28ddf6524cf0ff9293f61bd12e792de298f8561a5c945acea63fb437789e0e";
1515 };
1616 meta = with lib; {
1717 homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/;
pkgs/development/python-modules/uproot/default.nix+2−2
@@ -15,11 +15,11 @@
1515
1616buildPythonPackage rec {
1717 pname = "uproot";
18− version = "3.10.8";
18+ version = "3.10.10";
1919
2020 src = fetchPypi {
2121 inherit pname version;
22− sha256 = "cf9b9a6824e82f2e45d44e2c9d8a230ce9f83972e74427543862fdff462fb121";
22+ sha256 = "2c780472c5c328d2e34508db1da399038653142572fc3d0b5777b2311edabd83";
2323 };
2424
2525 nativeBuildInputs = [ pytestrunner ];
pkgs/development/python-modules/vcrpy/default.nix+2−2
@@ -15,11 +15,11 @@
1515
1616buildPythonPackage rec {
1717 pname = "vcrpy";
18− version = "2.1.0";
18+ version = "2.1.1";
1919
2020 src = fetchPypi {
2121 inherit pname version;
22− sha256 = "0e79239441fb4c731da9f05aecbd062223ef1f4ab668d2400c63c347a7071414";
22+ sha256 = "27cc696df66d77703eab5cdfa041b2f9877bbf2b54bcd390de89a4be964ca536";
2323 };
2424
2525 checkInputs = [
pkgs/development/python-modules/whisper/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "whisper";
5− version = "1.1.5";
5+ version = "1.1.6";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "14013e7563102d808aae0cb5b3b2326979236d4bcd54c343ea636761629920cd";
9+ sha256 = "8dbb3b7cf4a02a080162467fff5cd38bf77940c3e2b25f7c4f78529427ca9cfe";
1010 };
1111
1212 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/wxPython/4.0.nix+2−2
@@ -28,11 +28,11 @@
2828
2929buildPythonPackage rec {
3030 pname = "wxPython";
31− version = "4.0.7";
31+ version = "4.0.7.post1";
3232
3333 src = fetchPypi {
3434 inherit pname version;
35− sha256 = "0cq2iyqm08ihazh5xzdsha5h22mba0w4a0y7iikn6c6yvszhiriv";
35+ sha256 = "da43eaa2eea32c34a52531331b0a69bd791c237803a7c5df451509624766f7ca";
3636 };
3737
3838 doCheck = false;
pkgs/development/python-modules/zstd/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "zstd";
6− version = "1.4.3.2";
6+ version = "1.4.4.0";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "1h4wvzikar4ryhawm7clh29bvhbpy0ix1rlxhg9x195fpq56vsh7";
10+ sha256 = "33f2c1fd8d3f9ac8e35fb3e199896afc54cceb68878570c6d4b72985dc6584a5";
1111 };
1212
1313 postPatch = ''
pkgs/development/ruby-modules/gem/default.nix+1−1
@@ -99,7 +99,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
9999 runHook preUnpack
100100
101101 if [[ -f $src && $src == *.gem ]]; then
102− if [[ -z "$dontBuild" ]]; then
102+ if [[ -z "''${dontBuild-}" ]]; then
103103 # we won't know the name of the directory that RubyGems creates,
104104 # so we'll just use a glob to find it and move it over.
105105 gempkg="$src"
pkgs/development/tools/build-managers/apache-ant/1.9.nix+2−2
@@ -46,14 +46,14 @@ stdenv.mkDerivation {
4646 # JRE by looking for java. The latter allows just the JRE to be
4747 # used with (say) ECJ as the compiler. Finally, allow the GNU
4848 # JVM.
49− if [ -z "\$JAVA_HOME" ]; then
49+ if [ -z "\''${JAVA_HOME-}" ]; then
5050 for i in javac java gij; do
5151 if p="\$(type -p \$i)"; then
5252 export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))"
5353 break
5454 fi
5555 done
56− if [ -z "\$JAVA_HOME" ]; then
56+ if [ -z "\''${JAVA_HOME-}" ]; then
5757 echo "\$0: cannot find the JDK or JRE" >&2
5858 exit 1
5959 fi
pkgs/development/tools/build-managers/apache-ant/default.nix+2−2
@@ -46,14 +46,14 @@ stdenv.mkDerivation {
4646 # JRE by looking for java. The latter allows just the JRE to be
4747 # used with (say) ECJ as the compiler. Finally, allow the GNU
4848 # JVM.
49− if [ -z "\$JAVA_HOME" ]; then
49+ if [ -z "\''${JAVA_HOME-}" ]; then
5050 for i in javac java gij; do
5151 if p="\$(type -p \$i)"; then
5252 export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))"
5353 break
5454 fi
5555 done
56− if [ -z "\$JAVA_HOME" ]; then
56+ if [ -z "\''${JAVA_HOME-}" ]; then
5757 echo "\$0: cannot find the JDK or JRE" >&2
5858 exit 1
5959 fi
pkgs/development/tools/build-managers/cmake/setup-hook.sh+12−12
@@ -20,17 +20,17 @@ cmakeConfigurePhase() {
2020 export CTEST_PARALLEL_LEVEL=$NIX_BUILD_CORES
2121 fi
2222
23− if [ -z "$dontFixCmake" ]; then
23+ if [ -z "${dontFixCmake-}" ]; then
2424 fixCmakeFiles .
2525 fi
2626
27− if [ -z "$dontUseCmakeBuildDir" ]; then
27+ if [ -z "${dontUseCmakeBuildDir-}" ]; then
2828 mkdir -p build
2929 cd build
3030 cmakeDir=${cmakeDir:-..}
3131 fi
3232
33− if [ -z "$dontAddPrefix" ]; then
33+ if [ -z "${dontAddPrefix-}" ]; then
3434 cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix $cmakeFlags"
3535 fi
3636
@@ -84,7 +84,7 @@ cmakeConfigurePhase() {
8484 cmakeFlags="-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale $cmakeFlags"
8585
8686 # Don’t build tests when doCheck = false
87− if [ -z "$doCheck" ]; then
87+ if [ -z "${doCheck-}" ]; then
8888 cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags"
8989 fi
9090
@@ -99,7 +99,7 @@ cmakeConfigurePhase() {
9999 cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON $cmakeFlags"
100100 cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON $cmakeFlags"
101101
102− if [ "$buildPhase" = ninjaBuildPhase ]; then
102+ if [ "${buildPhase-}" = ninjaBuildPhase ]; then
103103 cmakeFlags="-GNinja $cmakeFlags"
104104 fi
105105
@@ -115,7 +115,7 @@ cmakeConfigurePhase() {
115115 runHook postConfigure
116116}
117117
118−if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then
118+if [ -z "${dontUseCmakeConfigure-}" -a -z "${configurePhase-}" ]; then
119119 setOutputFlags=
120120 configurePhase=cmakeConfigurePhase
121121fi
@@ -125,25 +125,25 @@ addEnvHooks "$targetOffset" addCMakeParams
125125makeCmakeFindLibs(){
126126 isystem_seen=
127127 iframework_seen=
128− for flag in $NIX_CFLAGS_COMPILE $NIX_LDFLAGS; do
128+ for flag in ${NIX_CFLAGS_COMPILE-} ${NIX_LDFLAGS-}; do
129129 if test -n "$isystem_seen" && test -d "$flag"; then
130130 isystem_seen=
131− export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag}"
131+ export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH-}${CMAKE_INCLUDE_PATH:+:}${flag}"
132132 elif test -n "$iframework_seen" && test -d "$flag"; then
133133 iframework_seen=
134− export CMAKE_FRAMEWORK_PATH="$CMAKE_FRAMEWORK_PATH${CMAKE_FRAMEWORK_PATH:+:}${flag}"
134+ export CMAKE_FRAMEWORK_PATH="${CMAKE_FRAMEWORK_PATH-}${CMAKE_FRAMEWORK_PATH:+:}${flag}"
135135 else
136136 isystem_seen=
137137 iframework_seen=
138138 case $flag in
139139 -I*)
140− export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}"
140+ export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH-}${CMAKE_INCLUDE_PATH:+:}${flag:2}"
141141 ;;
142142 -L*)
143− export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}"
143+ export CMAKE_LIBRARY_PATH="${CMAKE_LIBRARY_PATH-}${CMAKE_LIBRARY_PATH:+:}${flag:2}"
144144 ;;
145145 -F*)
146− export CMAKE_FRAMEWORK_PATH="$CMAKE_FRAMEWORK_PATH${CMAKE_FRAMEWORK_PATH:+:}${flag:2}"
146+ export CMAKE_FRAMEWORK_PATH="${CMAKE_FRAMEWORK_PATH-}${CMAKE_FRAMEWORK_PATH:+:}${flag:2}"
147147 ;;
148148 -isystem)
149149 isystem_seen=1
pkgs/development/tools/build-managers/gn/setup-hook.sh+1−1
@@ -9,6 +9,6 @@ gnConfigurePhase() {
99 runHook postConfigure
1010}
1111
12−if [ -z "$dontUseGnConfigure" -a -z "$configurePhase" ]; then
12+if [ -z "${dontUseGnConfigure-}" -a -z "${configurePhase-}" ]; then
1313 configurePhase=gnConfigurePhase
1414fi
pkgs/development/tools/build-managers/meson/default.nix+25−1
@@ -1,4 +1,11 @@
1−{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:
1+{ lib
2+, python3Packages
3+, fetchpatch
4+, stdenv
5+, writeTextDir
6+, substituteAll
7+, targetPackages
8+}:
29
310let
411 # See https://mesonbuild.com/Reference-tables.html#cpu-families
@@ -54,6 +61,14 @@ python3Packages.buildPythonApplication rec {
5461 src = ./fix-rpath.patch;
5562 inherit (builtins) storeDir;
5663 })
64+
65+ # Fix detecting incorrect compiler in the store path hash.
66+ # https://github.com/NixOS/nixpkgs/issues/73417#issuecomment-554077964
67+ # https://github.com/mesonbuild/meson/pull/6185
68+ (fetchpatch {
69+ url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch";
70+ sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb";
71+ })
5772 ] ++ lib.optionals stdenv.isDarwin [
5873 # We use custom Clang, which makes Meson think *not Apple*, while still
5974 # relying on system linker. When it detects standard Clang, Meson will
@@ -62,6 +77,15 @@ python3Packages.buildPythonApplication rec {
6277 # https://github.com/mesonbuild/meson/issues/4784
6378 # Should be fixed in 0.52
6479 ./fix-objc-linking.patch
80+
81+ # Fixes error finding some frameworks
82+ # https://github.com/NixOS/nixpkgs/pull/70690#issuecomment-553704175
83+ # https://github.com/mesonbuild/meson/pull/5980
84+ # Should be fixed in 0.52
85+ (fetchpatch {
86+ url = "https://github.com/mesonbuild/meson/commit/8d3fcb3dc4d7204a4646807f8b5191d79fb291e5.patch";
87+ sha256 = "0g95gl662mribnnz5jcyn1jaaw8w7r1vgbg2jbm91dcrr5zji5ng";
88+ })
6589 ];
6690
6791 setupHook = ./setup-hook.sh;
pkgs/development/tools/build-managers/meson/setup-hook.sh+2−2
@@ -1,7 +1,7 @@
11mesonConfigurePhase() {
22 runHook preConfigure
33
4− if [ -z "$dontAddPrefix" ]; then
4+ if [ -z "${dontAddPrefix-}" ]; then
55 mesonFlags="--prefix=$prefix $mesonFlags"
66 fi
77
@@ -36,7 +36,7 @@ mesonConfigurePhase() {
3636 runHook postConfigure
3737}
3838
39−if [ -z "$dontUseMesonConfigure" -a -z "$configurePhase" ]; then
39+if [ -z "${dontUseMesonConfigure-}" -a -z "${configurePhase-}" ]; then
4040 setOutputFlags=
4141 configurePhase=mesonConfigurePhase
4242fi
pkgs/development/tools/build-managers/ninja/setup-hook.sh+3−3
@@ -19,7 +19,7 @@ ninjaBuildPhase() {
1919 runHook postBuild
2020}
2121
22−if [ -z "$dontUseNinjaBuild" -a -z "$buildPhase" ]; then
22+if [ -z "${dontUseNinjaBuild-}" -a -z "${buildPhase-}" ]; then
2323 buildPhase=ninjaBuildPhase
2424fi
2525
@@ -38,7 +38,7 @@ ninjaInstallPhase() {
3838 runHook postInstall
3939}
4040
41−if [ -z "$dontUseNinjaInstall" -a -z "$installPhase" ]; then
41+if [ -z "${dontUseNinjaInstall-}" -a -z "${installPhase-}" ]; then
4242 installPhase=ninjaInstallPhase
4343fi
4444
@@ -73,6 +73,6 @@ ninjaCheckPhase() {
7373 runHook postCheck
7474}
7575
76−if [ -z "$dontUseNinjaCheck" -a -z "$checkPhase" ]; then
76+if [ -z "${dontUseNinjaCheck-}" -a -z "${checkPhase-}" ]; then
7777 checkPhase=ninjaCheckPhase
7878fi
pkgs/development/tools/build-managers/scons/setup-hook.sh+3−3
@@ -71,14 +71,14 @@ sconsCheckPhase() {
7171 runHook postCheck
7272}
7373
74−if [ -z "$buildPhase" ]; then
74+if [ -z "${buildPhase-}" ]; then
7575 buildPhase=sconsBuildPhase
7676fi
7777
78−if [ -z "$dontUseSconsInstall" -a -z "$installPhase" ]; then
78+if [ -z "${dontUseSconsInstall-}" -a -z "${installPhase-}" ]; then
7979 installPhase=sconsInstallPhase
8080fi
8181
82−if [ -z "$checkPhase" ]; then
82+if [ -z "${checkPhase-}" ]; then
8383 checkPhase=sconsCheckPhase
8484fi
pkgs/development/tools/misc/patchelf/setup-hook.sh+1−1
@@ -2,7 +2,7 @@
22# directories from the RPATH of every library or executable in every
33# output.
44
5−fixupOutputHooks+=('if [ -z "$dontPatchELF" ]; then patchELF "$prefix"; fi')
5+fixupOutputHooks+=('if [ -z "${dontPatchELF-}" ]; then patchELF "$prefix"; fi')
66
77patchELF() {
88 local dir="$1"
pkgs/development/tools/misc/premake/setup-hook.sh+1−1
@@ -14,6 +14,6 @@ premakeConfigurePhase() {
1414 runHook postConfigure
1515}
1616
17−if [ -z "$configurePhase" ]; then
17+if [ -z "${configurePhase-}" ]; then
1818 configurePhase=premakeConfigurePhase
1919fi
pkgs/development/tools/ocaml/camlidl/default.nix+1−1
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 '';
3838
3939 setupHook = writeText "setupHook.sh" ''
40− export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
40+ export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
4141 export NIX_CFLAGS_COMPILE+=" -isystem $1/lib/ocaml/${ocaml.version}/site-lib/camlidl"
4242 export NIX_LDFLAGS+=" -L $1/lib/ocaml/${ocaml.version}/site-lib/camlidl"
4343 '';
pkgs/development/tools/ocaml/findlib/default.nix+3−3
@@ -32,13 +32,13 @@ stdenv.mkDerivation rec {
3232 setupHook = writeText "setupHook.sh" ''
3333 addOCamlPath () {
3434 if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then
35− export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/"
35+ export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/"
3636 fi
3737 if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"; then
38− export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"
38+ export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"
3939 fi
4040 export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/"
41− if test -n "$createFindlibDestdir"; then
41+ if test -n "''${createFindlibDestdir-}"; then
4242 mkdir -p $OCAMLFIND_DESTDIR
4343 fi
4444 }
pkgs/development/tools/ocaml/opam/opam-shebangs.patch+1−1
@@ -64,7 +64,7 @@ index 00000000..3ea84e2d
6464+header() { echo "$1"; }
6565+stopNest() { true; }
6666+
67−+fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi')
67++fixupOutputHooks+=('if [ -z "${dontPatchShebangs-}" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi')
6868+
6969+patchShebangs() {
7070+ local dir="$1"
pkgs/development/tools/ocaml/utop/default.nix+1
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
3939 installPhase = ''
4040 mkdir -p "$out"/${path}
4141 for e in OCAMLPATH CAML_LD_LIBRARY_PATH; do
42+ [[ -v "$e" ]] || continue
4243 printf %s "''${!e}" > "$out"/${path}/$e
4344 done
4445 '';
pkgs/development/tools/xcbuild/setup-hook.sh+1−1
@@ -20,7 +20,7 @@ xcbuildInstallPhase () {
2020}
2121
2222buildPhase=xcbuildBuildPhase
23−if [ -z "$installPhase" ]; then
23+if [ -z "${installPhase-}" ]; then
2424 installPhase=xcbuildInstallPhase
2525fi
2626
pkgs/misc/emulators/retroarch/cores.nix+16−16
@@ -1,5 +1,5 @@
11{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch
2−, alsaLib, fluidsynth, curl, hidapi, libGLU_combined, gettext, glib, gtk2, portaudio, SDL
2+, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, libGL
33, ffmpeg, pcre, libevdev, libpng, libjpeg, udev, libvorbis
44, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost }:
55
@@ -152,7 +152,7 @@ in with stdenv.lib.licenses;
152152 buildPhase = "make";
153153 name = "beetle-pce-fast-${der.version}";
154154 };
155−
155+
156156 beetle-pcfx = (mkLibRetroCore rec {
157157 core = "mednafen-pcfx";
158158 src = fetchRetro {
@@ -197,7 +197,7 @@ in with stdenv.lib.licenses;
197197 name = "beetle-saturn-${der.version}";
198198 meta.platforms = [ "x86_64-linux" "aarch64-linux" ];
199199 };
200−
200+
201201 beetle-supergrafx = (mkLibRetroCore rec {
202202 core = "mednafen-supergrafx";
203203 src = fetchRetro {
@@ -276,7 +276,7 @@ in with stdenv.lib.licenses;
276276 };
277277 description = "libretro wrapper for desmume NDS emulator";
278278 license = gpl2;
279− extraBuildInputs = [ libpcap libGLU_combined xorg.libX11 ];
279+ extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ];
280280 }).override {
281281 makefile = "desmume/src/frontend/libretro/Makefile.libretro";
282282 configurePhase = "cd desmume/src/frontend/libretro";
@@ -292,7 +292,7 @@ in with stdenv.lib.licenses;
292292 };
293293 description = "libretro wrapper for desmume NDS emulator from 2015";
294294 license = gpl2;
295− extraBuildInputs = [ libpcap libGLU_combined xorg.libX11 ];
295+ extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ];
296296 }).override {
297297 makefile = "desmume/Makefile.libretro";
298298 configurePhase = "cd desmume";
@@ -311,7 +311,7 @@ in with stdenv.lib.licenses;
311311 broken = true;
312312
313313 extraBuildInputs = [
314− cmake curl libGLU_combined pcre pkgconfig sfml
314+ cmake curl libGLU libGL pcre pkgconfig sfml
315315 gettext hidapi
316316 libevdev udev
317317 ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]);
@@ -323,7 +323,7 @@ in with stdenv.lib.licenses;
323323 "-DENABLE_QT=OFF"
324324 "-DENABLE_LTO=OFF"
325325 "-DUSE_UPNP=OFF"
326− "-DUSE_DISCORD_PRESENCE=OFF"
326+ "-DUSE_DISCORD_PRESENCE=OFF"
327327 ];
328328 dontUseCmakeBuildDir = "yes";
329329 buildPhase = "make";
@@ -380,7 +380,7 @@ in with stdenv.lib.licenses;
380380 };
381381 description = "Flycast libretro port";
382382 license = gpl2;
383− extraBuildInputs = [ libGLU_combined ];
383+ extraBuildInputs = [ libGL libGLU ];
384384 }).override {
385385 makefile = "Makefile";
386386 buildPhase = "make";
@@ -478,7 +478,7 @@ in with stdenv.lib.licenses;
478478 description = "Port of MAME to libretro";
479479 license = gpl2Plus;
480480
481− extraBuildInputs = [ alsaLib libGLU_combined portaudio python27 xorg.libX11 ];
481+ extraBuildInputs = [ alsaLib libGLU libGL portaudio python27 xorg.libX11 ];
482482 }).override {
483483 postPatch = ''
484484 # Prevent the failure during the parallel building of:
@@ -614,7 +614,7 @@ in with stdenv.lib.licenses;
614614 description = "Libretro port of Mupen64 Plus, GL only";
615615 license = gpl2;
616616
617− extraBuildInputs = [ libGLU_combined libpng nasm xorg.libX11 ];
617+ extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ];
618618 }).override {
619619 makefile = "Makefile";
620620 buildPhase = "make";
@@ -633,7 +633,7 @@ in with stdenv.lib.licenses;
633633 makefile = "libretro/Makefile";
634634 buildPhase = "cd libretro && make";
635635 };
636−
636+
637637 o2em = (mkLibRetroCore rec {
638638 core = "o2em";
639639 src = fetchRetro {
@@ -647,7 +647,7 @@ in with stdenv.lib.licenses;
647647 makefile = "Makefile";
648648 buildPhase = "make";
649649 };
650−
650+
651651 parallel-n64 = (mkLibRetroCore rec {
652652 core = "parallel-n64";
653653 src = fetchRetro {
@@ -658,7 +658,7 @@ in with stdenv.lib.licenses;
658658 description = "Parallel Mupen64plus rewrite for libretro.";
659659 license = gpl2;
660660
661− extraBuildInputs = [ libGLU_combined libpng ];
661+ extraBuildInputs = [ libGLU libGL libpng ];
662662 }).override {
663663 makefile = "Makefile";
664664 buildPhase = "make";
@@ -677,7 +677,7 @@ in with stdenv.lib.licenses;
677677 configurePhase = "rm configure";
678678 buildPhase = "make -f Makefile.libretro";
679679 };
680−
680+
681681 picodrive = (mkLibRetroCore rec {
682682 core = "picodrive";
683683 src = fetchRetro {
@@ -718,7 +718,7 @@ in with stdenv.lib.licenses;
718718 };
719719 description = "ppsspp libretro port";
720720 license = gpl2;
721− extraBuildInputs = [ cmake libGLU_combined ffmpeg python37 xorg.libX11 ];
721+ extraBuildInputs = [ cmake libGLU libGL ffmpeg python37 xorg.libX11 ];
722722 }).override {
723723 cmakeFlags = "-DLIBRETRO=ON";
724724 makefile = "Makefile";
@@ -778,7 +778,7 @@ in with stdenv.lib.licenses;
778778 };
779779 description = "Libretro port of ScummVM";
780780 license = gpl2;
781− extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU_combined SDL ];
781+ extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL SDL ];
782782 }).override {
783783 makefile = "backends/platform/libretro/build/Makefile";
784784 buildPhase = "cd backends/platform/libretro/build && make";
pkgs/misc/ghostscript/default.nix+5
@@ -47,6 +47,11 @@ stdenv.mkDerivation rec {
4747 patches = [
4848 ./urw-font-files.patch
4949 ./doc-no-ref.diff
50+ (fetchpatch {
51+ name = "CVE-2019-14869.patch";
52+ url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=485904772c5f0aa1140032746e5a0abfc40f4cef";
53+ sha256 = "0z5gnvgpp0dlzgvpw9a1yan7qyycv3mf88l93fvb1kyay893rshp";
54+ })
5055 ];
5156
5257 outputs = [ "out" "man" "doc" ];
pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh+1−1
@@ -1,5 +1,5 @@
11linkSystemCoreFoundationFramework() {
2− NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks $NIX_CFLAGS_COMPILE"
2+ NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks${NIX_CFLAGS_COMPILE:+ }${NIX_CFLAGS_COMPILE-}"
33 # gross! many symbols (such as _OBJC_CLASS_$_NSArray) are defined in system CF, but not
44 # in the opensource release
55 # if the package needs private headers, we assume they also want to link with system CF
pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh+1−1
@@ -1,6 +1,6 @@
11addPrivateFrameworks() {
22 flag="-F/System/Library/PrivateFrameworks"
3− if [[ "$NIX_CFLAGS_COMPILE" != *$flag* ]]; then
3+ if [[ "${NIX_CFLAGS_COMPILE-}" != *$flag* ]]; then
44 NIX_CFLAGS_COMPILE+=" $flag"
55 fi
66}
pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh+1−1
@@ -2,7 +2,7 @@ noDeprecatedDeclarations() {
22 # Security.framework has about 2000 deprecated constants, all of which the user will be
33 # warned about at compilation time
44 flag="-Wno-deprecated-declarations"
5− if [[ "$NIX_CFLAGS_COMPILE" != *$flag* ]]; then
5+ if [[ "${NIX_CFLAGS_COMPILE-}" != *$flag* ]]; then
66 NIX_CFLAGS_COMPILE+=" $flag"
77 fi
88}
pkgs/os-specific/linux/kernel/manual-config.nix+1−1
@@ -179,7 +179,7 @@ let
179179 '' else "") + (if isModular then ''
180180 mkdir -p $dev
181181 cp vmlinux $dev/
182− if [ -z "$dontStrip" ]; then
182+ if [ -z "''${dontStrip-}" ]; then
183183 installFlagsArray+=("INSTALL_MOD_STRIP=1")
184184 fi
185185 make modules_install $makeFlags "''${makeFlagsArray[@]}" \
pkgs/os-specific/linux/systemd/default.nix+28−5
@@ -1,5 +1,5 @@
1−{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
2−, xz, pam, acl, libuuid, m4, utillinux, libffi
1+{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap
2+, curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, utillinux, libffi
33, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
44, audit, lz4, bzip2, libmicrohttpd, pcre2
55, linuxHeaders ? stdenv.cc.libc.linuxHeaders
@@ -15,7 +15,21 @@
1515, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
1616}:
1717
18−stdenv.mkDerivation {
18+let gnupg-minimal = gnupg.override {
19+ enableMinimal = true;
20+ guiSupport = false;
21+ pcsclite = null;
22+ sqlite = null;
23+ pinentry = null;
24+ adns = null;
25+ gnutls = null;
26+ libusb = null;
27+ openldap = null;
28+ readline = null;
29+ zlib = null;
30+ bzip2 = null;
31+};
32+in stdenv.mkDerivation {
1933 version = "243";
2034 pname = "systemd";
2135
@@ -41,7 +55,7 @@ stdenv.mkDerivation {
4155 (buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]))
4256 ];
4357 buildInputs =
44− [ linuxHeaders libcap kmod xz pam acl
58+ [ linuxHeaders libcap curl.dev kmod xz pam acl
4559 /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
4660 libmicrohttpd pcre2 ] ++
4761 stdenv.lib.optional withKexectools kexectools ++
@@ -67,6 +81,7 @@ stdenv.mkDerivation {
6781 "-Ddebug-shell=${bashInteractive}/bin/bash"
6882 # while we do not run tests we should also not build them. Removes about 600 targets
6983 "-Dtests=false"
84+ "-Dimportd=true"
7085 "-Dlz4=true"
7186 "-Dhostnamed=true"
7287 "-Dnetworkd=true"
@@ -77,7 +92,7 @@ stdenv.mkDerivation {
7792 "-Dlocaled=true"
7893 "-Dresolve=true"
7994 "-Dsplit-usr=false"
80− "-Dlibcurl=false"
95+ "-Dlibcurl=true"
8196 "-Dlibidn=false"
8297 "-Dlibidn2=true"
8398 "-Dquotacheck=false"
@@ -144,6 +159,14 @@ stdenv.mkDerivation {
144159 patchShebangs $dir
145160 done
146161
162+ # absolute paths to gpg & tar
163+ substituteInPlace src/import/pull-common.c \
164+ --replace '"gpg"' '"${gnupg-minimal}/bin/gpg"'
165+ for file in src/import/{{export,import,pull}-tar,import-common}.c; do
166+ substituteInPlace $file \
167+ --replace '"tar"' '"${gnutar}/bin/tar"'
168+ done
169+
147170 substituteInPlace src/journal/catalog.c \
148171 --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
149172 '';
pkgs/servers/sql/mariadb/connector-c/3_1.nix+2−2
@@ -1,6 +1,6 @@
11{ callPackage, ... } @ args:
22
33callPackage ./. (args // {
4− version = "3.1.4";
5− sha256 = "05jkaq151a45rqpyh0vrn6xcpawayfxyzhwn1w32hk0fw3z746ks";
4+ version = "3.1.5";
5+ sha256 = "1mfrm595kfnpjladaq6m184npa3rxff9pr1vwa35r057s7nmzpm9";
66})
pkgs/servers/sql/mariadb/connector-c/default.nix+1−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, fetchpatch
1+{ stdenv, fetchurl, cmake
22, curl, openssl, zlib
33, libiconv
44, version, sha256, ...
@@ -18,13 +18,6 @@ stdenv.mkDerivation {
1818 inherit sha256;
1919 };
2020
21− patches = stdenv.lib.optionals stdenv.isDarwin [
22− (fetchpatch {
23− url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch";
24− sha256 = "05mlyv20kzn9bax4byv2ph1cf42541fcl1zcqzbfwqmynnisvdah";
25− })
26− ];
27−
2821 cmakeFlags = [
2922 "-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock"
3023 "-DWITH_CURL=ON"
pkgs/servers/x11/xorg/default.nix+1−1
@@ -2691,7 +2691,7 @@ lib.makeScope newScope (self: with self; {
26912691 meta.platforms = stdenv.lib.platforms.unix;
26922692 }) {};
26932693
2694− xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
2694+ xorgserver = callPackage ({ stdenv, fetchpatch, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
26952695 name = "xorg-server-1.20.5";
26962696 builder = ./builder.sh;
26972697 src = fetchurl {
pkgs/servers/x11/xorg/imake-setup-hook.sh+1−1
@@ -14,6 +14,6 @@ imakeConfigurePhase() {
1414 runHook postConfigure
1515}
1616
17−if [ -z "$dontUseImakeConfigure" -a -z "$configurePhase" ]; then
17+if [ -z "${dontUseImakeConfigure-}" -a -z "${configurePhase-}" ]; then
1818 configurePhase=imakeConfigurePhase
1919fi
pkgs/servers/x11/xorg/overrides.nix+11−1
@@ -592,6 +592,16 @@ self: super:
592592 propagatedBuildInputs = [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
593593 udev
594594 ];
595+ # patchPhase is not working, this is a hack but we can remove it in the next xorg-server release
596+ preConfigure = let
597+ headerFix = fetchpatch {
598+ url = "https://gitlab.freedesktop.org/xorg/xserver/commit/741bd73429e337071f49509ddcc5fb392e20b0f6.patch";
599+ sha256 = "0qjiin9pkggl3c33lfkpn9a9z8ldjpb3y47cflsjkfn868gsk8ri";
600+ excludes = [ "hw/xwayland/xwayland-glx.c" ]; # File not in release yet
601+ };
602+ in ''
603+ patch -p1 < ${headerFix}
604+ '';
595605 prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
596606 export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
597607 '';
@@ -629,8 +639,8 @@ self: super:
629639 libAppleWM xorgproto
630640 ];
631641
632− # XQuartz patchset
633642 patches = [
643+ # XQuartz patchset
634644 (fetchpatch {
635645 url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch";
636646 sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k";
pkgs/stdenv/cygwin/rebase-i686.sh+1−1
@@ -1,7 +1,7 @@
11fixupOutputHooks+=(_cygwinFixAutoImageBase)
22
33_cygwinFixAutoImageBase() {
4− if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then
4+ if [ "${dontRebase-}" == 1 ] || [ ! -d "$prefix" ]; then
55 return
66 fi
77 find "$prefix" -name "*.dll" -type f | while read DLL; do
pkgs/stdenv/cygwin/rebase-x86_64.sh+1−1
@@ -1,7 +1,7 @@
11fixupOutputHooks+=(_cygwinFixAutoImageBase)
22
33_cygwinFixAutoImageBase() {
4− if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then
4+ if [ "${dontRebase-}" == 1 ] || [ ! -d "$prefix" ]; then
55 return
66 fi
77 find "$prefix" -name "*.dll" -type f | while read DLL; do
pkgs/stdenv/generic/setup.sh+32−59
@@ -17,10 +17,6 @@ fi
1717# code). The hooks for <hookName> are the shell function or variable
1818# <hookName>, and the values of the shell array ‘<hookName>Hooks’.
1919runHook() {
20− local oldOpts="-u"
21− shopt -qo nounset || oldOpts="+u"
22− set -u # May be called from elsewhere, so do `set -u`.
23−
2420 local hookName="$1"
2521 shift
2622 local hooksSlice="${hookName%Hook}Hooks[@]"
@@ -30,10 +26,8 @@ runHook() {
3026 # undefined.
3127 for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do
3228 _eval "$hook" "$@"
33− set -u # To balance `_eval`
3429 done
3530
36− set "$oldOpts"
3731 return 0
3832}
3933
@@ -41,10 +35,6 @@ runHook() {
4135# Run all hooks with the specified name, until one succeeds (returns a
4236# zero exit code). If none succeed, return a non-zero exit code.
4337runOneHook() {
44− local oldOpts="-u"
45− shopt -qo nounset || oldOpts="+u"
46− set -u # May be called from elsewhere, so do `set -u`.
47−
4838 local hookName="$1"
4939 shift
5040 local hooksSlice="${hookName%Hook}Hooks[@]"
@@ -56,10 +46,8 @@ runOneHook() {
5646 ret=0
5747 break
5848 fi
59− set -u # To balance `_eval`
6049 done
6150
62− set "$oldOpts"
6351 return "$ret"
6452}
6553
@@ -70,17 +58,13 @@ runOneHook() {
7058# environment variables) and from shell scripts (as functions). If you
7159# want to allow multiple hooks, use runHook instead.
7260_callImplicitHook() {
73− set -u
7461 local def="$1"
7562 local hookName="$2"
7663 if declare -F "$hookName" > /dev/null; then
77− set +u
7864 "$hookName"
7965 elif type -p "$hookName" > /dev/null; then
80− set +u
8166 source "$hookName"
8267 elif [ -n "${!hookName:-}" ]; then
83− set +u
8468 eval "${!hookName}"
8569 else
8670 return "$def"
@@ -96,13 +80,10 @@ _callImplicitHook() {
9680# command can take them
9781_eval() {
9882 if declare -F "$1" > /dev/null 2>&1; then
99− set +u
10083 "$@" # including args
10184 else
102− set +u
10385 eval "$1"
10486 fi
105− # `run*Hook` reenables `set -u`
10687}
10788
10889
@@ -190,12 +171,12 @@ addToSearchPath() {
190171# so it is defined here but tried after the hook.
191172_addRpathPrefix() {
192173 if [ "${NIX_NO_SELF_RPATH:-0}" != 1 ]; then
193− export NIX_LDFLAGS="-rpath $1/lib $NIX_LDFLAGS"
174+ export NIX_LDFLAGS="-rpath $1/lib ${NIX_LDFLAGS-}"
194175 if [ -n "${NIX_LIB64_IN_SELF_RPATH:-}" ]; then
195− export NIX_LDFLAGS="-rpath $1/lib64 $NIX_LDFLAGS"
176+ export NIX_LDFLAGS="-rpath $1/lib64 ${NIX_LDFLAGS-}"
196177 fi
197178 if [ -n "${NIX_LIB32_IN_SELF_RPATH:-}" ]; then
198− export NIX_LDFLAGS="-rpath $1/lib32 $NIX_LDFLAGS"
179+ export NIX_LDFLAGS="-rpath $1/lib32 ${NIX_LDFLAGS-}"
199180 fi
200181 fi
201182}
@@ -267,6 +248,8 @@ for i in $initialPath; do
267248 fi
268249done
269250
251+unset i
252+
270253if (( "${NIX_DEBUG:-0}" >= 1 )); then
271254 echo "initial path: $PATH"
272255fi
@@ -296,11 +279,11 @@ declare -a pkgsBuildBuild pkgsBuildHost pkgsBuildTarget
296279declare -a pkgsHostHost pkgsHostTarget
297280declare -a pkgsTargetTarget
298281
299−declare -ra pkgBuildAccumVars=(pkgsBuildBuild pkgsBuildHost pkgsBuildTarget)
300−declare -ra pkgHostAccumVars=(pkgsHostHost pkgsHostTarget)
301−declare -ra pkgTargetAccumVars=(pkgsTargetTarget)
282+declare -a pkgBuildAccumVars=(pkgsBuildBuild pkgsBuildHost pkgsBuildTarget)
283+declare -a pkgHostAccumVars=(pkgsHostHost pkgsHostTarget)
284+declare -a pkgTargetAccumVars=(pkgsTargetTarget)
302285
303−declare -ra pkgAccumVarVars=(pkgBuildAccumVars pkgHostAccumVars pkgTargetAccumVars)
286+declare -a pkgAccumVarVars=(pkgBuildAccumVars pkgHostAccumVars pkgTargetAccumVars)
304287
305288
306289# Hooks
@@ -309,11 +292,11 @@ declare -a envBuildBuildHooks envBuildHostHooks envBuildTargetHooks
309292declare -a envHostHostHooks envHostTargetHooks
310293declare -a envTargetTargetHooks
311294
312−declare -ra pkgBuildHookVars=(envBuildBuildHook envBuildHostHook envBuildTargetHook)
313−declare -ra pkgHostHookVars=(envHostHostHook envHostTargetHook)
314−declare -ra pkgTargetHookVars=(envTargetTargetHook)
295+declare -a pkgBuildHookVars=(envBuildBuildHook envBuildHostHook envBuildTargetHook)
296+declare -a pkgHostHookVars=(envHostHostHook envHostTargetHook)
297+declare -a pkgTargetHookVars=(envTargetTargetHook)
315298
316−declare -ra pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars)
299+declare -a pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars)
317300
318301# Add env hooks for all sorts of deps with the specified host offset.
319302addEnvHooks() {
@@ -329,26 +312,26 @@ addEnvHooks() {
329312
330313# Propagated dep files
331314
332−declare -ra propagatedBuildDepFiles=(
315+declare -a propagatedBuildDepFiles=(
333316 propagated-build-build-deps
334317 propagated-native-build-inputs # Legacy name for back-compat
335318 propagated-build-target-deps
336319)
337−declare -ra propagatedHostDepFiles=(
320+declare -a propagatedHostDepFiles=(
338321 propagated-host-host-deps
339322 propagated-build-inputs # Legacy name for back-compat
340323)
341−declare -ra propagatedTargetDepFiles=(
324+declare -a propagatedTargetDepFiles=(
342325 propagated-target-target-deps
343326)
344−declare -ra propagatedDepFilesVars=(
327+declare -a propagatedDepFilesVars=(
345328 propagatedBuildDepFiles
346329 propagatedHostDepFiles
347330 propagatedTargetDepFiles
348331)
349332
350333# Platform offsets: build = -1, host = 0, target = 1
351−declare -ra allPlatOffsets=(-1 0 1)
334+declare -a allPlatOffsets=(-1 0 1)
352335
353336
354337# Mutually-recursively find all build inputs. See the dependency section of the
@@ -489,11 +472,7 @@ activatePackage() {
489472 (( "$hostOffset" <= "$targetOffset" )) || exit -1
490473
491474 if [ -f "$pkg" ]; then
492− local oldOpts="-u"
493− shopt -qo nounset || oldOpts="+u"
494− set +u
495475 source "$pkg"
496− set "$oldOpts"
497476 fi
498477
499478 # Only dependencies whose host platform is guaranteed to match the
@@ -512,11 +491,7 @@ activatePackage() {
512491 fi
513492
514493 if [[ -f "$pkg/nix-support/setup-hook" ]]; then
515− local oldOpts="-u"
516− shopt -qo nounset || oldOpts="+u"
517− set +u
518494 source "$pkg/nix-support/setup-hook"
519− set "$oldOpts"
520495 fi
521496}
522497
@@ -596,6 +571,13 @@ _addToEnv() {
596571_addToEnv
597572
598573
574+# Unset setup-specific declared variables
575+unset allPlatOffsets
576+unset pkgBuildAccumVars pkgHostAccumVars pkgTargetAccumVars pkgAccumVarVars
577+unset pkgBuildHookVars pkgHostHookVars pkgTargetHookVars pkgHookVarVars
578+unset propagatedDepFilesVars
579+
580+
599581_addRpathPrefix "$out"
600582
601583
@@ -805,14 +787,17 @@ dumpVars() {
805787# Utility function: echo the base name of the given path, with the
806788# prefix `HASH-' removed, if present.
807789stripHash() {
808− local strippedName
790+ local strippedName casematchOpt=0
809791 # On separate line for `set -e`
810− strippedName="$(basename "$1")"
811− if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
812− echo "$strippedName" | cut -c34-
792+ strippedName="$(basename -- "$1")"
793+ shopt -q nocasematch && casematchOpt=1
794+ shopt -u nocasematch
795+ if [[ "$strippedName" =~ ^[a-z0-9]{32}- ]]; then
796+ echo "${strippedName:33}"
813797 else
814798 echo "$strippedName"
815799 fi
800+ if (( casematchOpt )); then shopt -s nocasematch; fi
816801}
817802
818803
@@ -1264,19 +1249,11 @@ showPhaseHeader() {
12641249
12651250genericBuild() {
12661251 if [ -f "${buildCommandPath:-}" ]; then
1267− local oldOpts="-u"
1268− shopt -qo nounset || oldOpts="+u"
1269− set +u
12701252 source "$buildCommandPath"
1271− set "$oldOpts"
12721253 return
12731254 fi
12741255 if [ -n "${buildCommand:-}" ]; then
1275− local oldOpts="-u"
1276− shopt -qo nounset || oldOpts="+u"
1277− set +u
12781256 eval "$buildCommand"
1279− set "$oldOpts"
12801257 return
12811258 fi
12821259
@@ -1306,11 +1283,7 @@ genericBuild() {
13061283
13071284 # Evaluate the variable named $curPhase if it exists, otherwise the
13081285 # function named $curPhase.
1309− local oldOpts="-u"
1310− shopt -qo nounset || oldOpts="+u"
1311− set +u
13121286 eval "${!curPhase:-$curPhase}"
1313− set "$oldOpts"
13141287
13151288 if [ "$curPhase" = unpackPhase ]; then
13161289 cd "${sourceRoot:-.}"
pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patchdeleted−29
@@ -1,29 +0,0 @@
1−diff --git a/src/copyin.c b/src/copyin.c
2−index cde911e..032d35f 100644
3−--- a/src/copyin.c
4−+++ b/src/copyin.c
5−@@ -1385,6 +1385,8 @@ process_copy_in ()
6− break;
7− }
8−
9−+ if (file_hdr.c_namesize <= 1)
10−+ file_hdr.c_name = xrealloc(file_hdr.c_name, 2);
11− cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag,
12− false);
13−
14−diff --git a/src/util.c b/src/util.c
15−index 6ff6032..2763ac1 100644
16−--- a/src/util.c
17−+++ b/src/util.c
18−@@ -1411,7 +1411,10 @@ set_file_times (int fd,
19− }
20−
21− /* Do we have to ignore absolute paths, and if so, does the filename
22−- have an absolute path? */
23−+ have an absolute path?
24−+ Before calling this function make sure that the allocated NAME buffer has
25−+ capacity at least 2 bytes to allow us to store the "." string inside. */
26−+
27− void
28− cpio_safer_name_suffix (char *name, bool link_target, bool absolute_names,
29− bool strip_leading_dots)
pkgs/tools/archivers/cpio/default.nix+3−17
@@ -1,30 +1,16 @@
1−{ stdenv, fetchurl, fetchpatch }:
1+{ stdenv, fetchurl }:
22
33let
4− version = "2.12";
4+ version = "2.13";
55 name = "cpio-${version}";
66in stdenv.mkDerivation {
77 inherit name;
88
99 src = fetchurl {
1010 url = "mirror://gnu/cpio/${name}.tar.bz2";
11− sha256 = "0vi9q475h1rki53100zml75vxsykzyhrn70hidy41s5c2rc8r6bh";
11+ sha256 = "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga";
1212 };
1313
14− patches = [
15− (fetchpatch {
16− name = "CVE-2015-1197-cpio-2.12.patch";
17− url = "https://gist.github.com/nckx/70b0bfa80ddfb86c2967/"
18− + "raw/e9b40d4d4b701f584f826775b75beb10751dc884/"
19− + "CVE-2015-1197-cpio-2.12.patch";
20− sha256 = "0ph43m4lavwkc4gnl5h9p3da4kb1pnhwk5l2qsky70dqri8pcr8v";
21− })
22−
23− # Report: http://www.openwall.com/lists/oss-security/2016/01/19/4
24− # Patch from https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00005.html
25− ./CVE-2016-2037-out-of-bounds-write.patch
26− ];
27−
2814 preConfigure = if stdenv.isCygwin then ''
2915 sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
3016 '' else null;
pkgs/tools/archivers/unzip/default.nix+15
@@ -26,6 +26,21 @@ stdenv.mkDerivation {
2626 ./CVE-2016-9844.patch
2727 ./CVE-2018-18384.patch
2828 ./dont-hardcode-cc.patch
29+ (fetchurl {
30+ url = "https://github.com/madler/unzip/commit/41beb477c5744bc396fa1162ee0c14218ec12213.patch";
31+ name = "CVE-2019-13232-1.patch";
32+ sha256 = "04jzd6chg9fw4l5zadkfsrfm5llrd7vhd1dgdjjd29nrvkrjyn14";
33+ })
34+ (fetchurl {
35+ url = "https://github.com/madler/unzip/commit/47b3ceae397d21bf822bc2ac73052a4b1daf8e1c.patch";
36+ name = "CVE-2019-13232-2.patch";
37+ sha256 = "0iy2wcjyvzwrjk02iszwcpg85fkjxs1bvb9isvdiywszav4yjs32";
38+ })
39+ (fetchurl {
40+ url = "https://github.com/madler/unzip/commit/6d351831be705cc26d897db44f878a978f4138fc.patch";
41+ name = "CVE-2019-13232-3.patch";
42+ sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf";
43+ })
2944 ] ++ stdenv.lib.optional enableNLS
3045 (fetchurl {
3146 url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1";
pkgs/tools/graphics/maim/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, cmake, pkgconfig
2−, zlib, libpng, libjpeg, libGLU_combined, glm
2+, zlib, libpng, libjpeg, libGLU, libGL, glm
33, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu
44}:
55
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 nativeBuildInputs = [ cmake pkgconfig ];
1818 buildInputs =
19− [ zlib libpng libjpeg libGLU_combined glm
19+ [ zlib libpng libjpeg libGLU libGL glm
2020 libX11 libXext libXfixes libXrandr libXcomposite slop icu ];
2121
2222 doCheck = false;
pkgs/tools/misc/desktop-file-utils/setup-hook.sh+1−1
@@ -3,4 +3,4 @@ mimeinfoPreFixupPhase() {
33 rm -f $out/share/applications/mimeinfo.cache
44}
55
6−preFixupPhases="$preFixupPhases mimeinfoPreFixupPhase"
6+preFixupPhases="${preFixupPhases-} mimeinfoPreFixupPhase"
pkgs/tools/networking/curl/default.nix+2−2
@@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null;
2424assert gssSupport -> libkrb5 != null;
2525
2626stdenv.mkDerivation rec {
27− name = "curl-7.66.0";
27+ name = "curl-7.67.0";
2828
2929 src = fetchurl {
3030 urls = [
3131 "https://curl.haxx.se/download/${name}.tar.bz2"
3232 "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
3333 ];
34− sha256 = "0hd1wwplw357hn876s4n2gk7dpmd1gfw5d2c3yi21i1m09726636";
34+ sha256 = "0v2qb1c82m3qzkiyglsg1745qi791i9pl1jgnks8nm0sh9b6jpyx";
3535 };
3636
3737 outputs = [ "bin" "dev" "out" "man" "devdoc" ];
pkgs/tools/networking/network-manager/default.nix+8−1
@@ -61,6 +61,13 @@ in stdenv.mkDerivation rec {
6161 # Meson does not support using different directories during build and
6262 # for installation like Autotools did with flags passed to make install.
6363 ./fix-install-paths.patch
64+
65+ # Fixes https://github.com/NixOS/nixpkgs/issues/72330
66+ # Upstream MR: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/323
67+ (fetchpatch {
68+ url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/4c11364201c094ad19ab9980ea6051a82bd2a550.patch";
69+ sha256 = "14dgb6ijxyzcglrk67is2fn49iwrhljf2sld8w557i6zkypilmsv";
70+ })
6471 ];
6572
6673 buildInputs = [
@@ -104,7 +111,7 @@ in stdenv.mkDerivation rec {
104111 homepage = https://wiki.gnome.org/Projects/NetworkManager;
105112 description = "Network configuration and management tool";
106113 license = licenses.gpl2Plus;
107− maintainers = with maintainers; [ phreedom domenkozar obadz ];
114+ maintainers = with maintainers; [ phreedom domenkozar obadz worldofpeace ];
108115 platforms = platforms.linux;
109116 };
110117}
pkgs/tools/security/gnupg/22.nix+15−8
@@ -1,17 +1,17 @@
11{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba
2−, libgpgerror, libiconv, npth, gettext, texinfo, pcsclite, sqlite
3−, buildPackages
2+, libgpgerror, libiconv, npth, gettext, texinfo, buildPackages
43
54# Each of the dependencies below are optional.
65# Gnupg can be built without them at the cost of reduced functionality.
7−, pinentry ? null, guiSupport ? false
8−, adns ? null, gnutls ? null, libusb ? null, openldap ? null
9−, readline ? null, zlib ? null, bzip2 ? null
6+, guiSupport ? true, enableMinimal ? false
7+, adns ? null , bzip2 ? null , gnutls ? null , libusb ? null , openldap ? null
8+, pcsclite ? null , pinentry ? null , readline ? null , sqlite ? null , zlib ?
9+null
1010}:
1111
1212with stdenv.lib;
1313
14−assert guiSupport -> pinentry != null;
14+assert guiSupport -> pinentry != null && enableMinimal == false;
1515
1616stdenv.mkDerivation rec {
1717 pname = "gnupg";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 postPatch = ''
3838 sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \
3939 configure doc/dirmngr.texi doc/gnupg.info-1
40− '' + stdenv.lib.optionalString stdenv.isLinux ''
40+ '' + stdenv.lib.optionalString ( stdenv.isLinux && pcsclite != null) ''
4141 sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
4242 ''; #" fix Emacs syntax highlighting :-(
4343
@@ -50,7 +50,14 @@ stdenv.mkDerivation rec {
5050 "--with-npth-prefix=${npth}"
5151 ] ++ optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
5252
53− postInstall = ''
53+ postInstall = if enableMinimal
54+ then ''
55+ rm -r $out/{libexec,sbin,share}
56+ for f in `find $out/bin -type f -not -name gpg`
57+ do
58+ rm $f
59+ done
60+ '' else ''
5461 mkdir -p $out/lib/systemd/user
5562 for f in doc/examples/systemd-user/*.{service,socket} ; do
5663 substitute $f $out/lib/systemd/user/$(basename $f) \
pkgs/tools/security/sudo/default.nix+3−3
@@ -5,14 +5,14 @@
55}:
66
77stdenv.mkDerivation rec {
8− name = "sudo-1.8.28";
8+ name = "sudo-1.8.29";
99
1010 src = fetchurl {
1111 urls =
1212 [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
1313 "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
1414 ];
15− sha256 = "188k3w67aflbmi4b5z23pxrvzfcfndi22b84w86gzjh8b9sglaci";
15+ sha256 = "0z4wyadh9cks17gdpfgx4kvbrlnyb6nai2sd6chk7qh4jsngylyf";
1616 };
1717
1818 prePatch = ''
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
4848 #define _PATH_MV "${coreutils}/bin/mv"
4949 EOF
5050 makeFlags="install_uid=$(id -u) install_gid=$(id -g)"
51− installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy"
51+ installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy DESTDIR=/"
5252 '';
5353
5454 nativeBuildInputs = [ groff ];
pkgs/tools/text/sgml/opensp/setup-hook.sh+1−1
@@ -6,7 +6,7 @@ addSGMLCatalogs () {
66 fi
77}
88
9−if test -z "$sgmlHookDone"; then
9+if test -z "${sgmlHookDone-}"; then
1010 sgmlHookDone=1
1111
1212 # Set http_proxy and ftp_proxy to a invalid host to prevent
pkgs/tools/typesetting/asciidoctorj/default.nixnew file+36
@@ -0,0 +1,36 @@
1+{ stdenv, fetchzip, jdk, makeWrapper }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "asciidoctorj";
5+ version = "2.1.0";
6+
7+ src = fetchzip {
8+ url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
9+ sha256 = "19fl4y3xlkmmgf5vyyb3k9p6nyglck9l53r6x12zil01q49g0zba";
10+ };
11+
12+ nativeBuildInputs = [ makeWrapper ];
13+
14+ installPhase = ''
15+ rm bin/asciidoctorj.bat
16+ cp -r . $out
17+ wrapProgram $out/bin/asciidoctorj \
18+ --prefix JAVA_HOME : ${jdk}
19+ '';
20+
21+ meta = with stdenv.lib; {
22+ description = ''
23+ AsciidoctorJ is the official library for running Asciidoctor on the JVM.
24+ '';
25+ longDescription = ''
26+ AsciidoctorJ is the official library for running Asciidoctor on the JVM.
27+ Using AsciidoctorJ, you can convert AsciiDoc content or analyze the
28+ structure of a parsed AsciiDoc document from Java and other JVM
29+ languages.
30+ '';
31+ homepage = https://asciidoctor.org/docs/asciidoctorj/;
32+ license = licenses.asl20;
33+ platforms = platforms.all;
34+ maintainers = with maintainers; [ moaxcp ];
35+ };
36+}
pkgs/top-level/all-packages.nix+9−13
@@ -2126,6 +2126,8 @@ in
21262126 epubcheck = null;
21272127 };
21282128
2129+ asciidoctorj = callPackage ../tools/typesetting/asciidoctorj { };
2130+
21292131 asunder = callPackage ../applications/audio/asunder { };
21302132
21312133 autossh = callPackage ../tools/networking/autossh { };
@@ -3999,9 +4001,7 @@ in
39994001
40004002 i2p = callPackage ../tools/networking/i2p {};
40014003
4002− i2pd = callPackage ../tools/networking/i2pd {
4003− boost = boost165;
4004− };
4004+ i2pd = callPackage ../tools/networking/i2pd { };
40054005
40064006 i-score = libsForQt5.callPackage ../applications/audio/i-score { };
40074007
@@ -4612,9 +4612,7 @@ in
46124612
46134613 file-rename = callPackage ../tools/filesystems/file-rename { };
46144614
4615− kea = callPackage ../tools/networking/kea {
4616− boost = boost165;
4617− };
4615+ kea = callPackage ../tools/networking/kea { };
46184616
46194617 ispell = callPackage ../tools/text/ispell {};
46204618
@@ -10717,7 +10715,7 @@ in
1071710715 boost167 = callPackage ../development/libraries/boost/1.67.nix { };
1071810716 boost168 = callPackage ../development/libraries/boost/1.68.nix { };
1071910717 boost169 = callPackage ../development/libraries/boost/1.69.nix { };
10720− boost16x = boost167;
10718+ boost16x = boost169;
1072110719 boost170 = callPackage ../development/libraries/boost/1.70.nix { };
1072210720 boost17x = boost170;
1072310721 boost = boost16x;
@@ -13601,8 +13599,8 @@ in
1360113599 libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5);
1360213600
1360313601 # TODO bump to 5.12 on darwin once it's not broken
13604− qt5 = if stdenv.isDarwin then qt511 else qt512;
13605− libsForQt5 = if stdenv.isDarwin then libsForQt511 else libsForQt512;
13602+ qt5 = qt512;
13603+ libsForQt5 = libsForQt512;
1360613604
1360713605 qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
1360813606
@@ -15520,9 +15518,7 @@ in
1552015518 libtool = darwin.cctools;
1552115519 };
1552215520
15523− rippled = callPackage ../servers/rippled {
15524− boost = boost167;
15525− };
15521+ rippled = callPackage ../servers/rippled { };
1552615522
1552715523 rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix {
1552815524 boost = boost167.override {
@@ -19483,7 +19479,7 @@ in
1948319479 k3d = callPackage ../applications/graphics/k3d {
1948419480 inherit (pkgs.gnome2) gtkglext;
1948519481 stdenv = gcc6Stdenv;
19486− boost = boost166.override { enablePython = true; };
19482+ boost = boost.override { enablePython = true; };
1948719483 };
1948819484
1948919485 k9copy = libsForQt5.callPackage ../applications/video/k9copy {};
pkgs/top-level/lua-packages.nix+2−2
@@ -134,14 +134,14 @@ with self; {
134134
135135 pulseaudio = buildLuaPackage rec {
136136 pname = "pulseaudio";
137− version = "0.1";
137+ version = "0.2";
138138 name = "pulseaudio-${version}";
139139
140140 src = fetchFromGitHub {
141141 owner = "doronbehar";
142142 repo = "lua-pulseaudio";
143143 rev = "v${version}";
144− sha256 = "0vldm34m3ysgn8gvwfdglpw4jl5680fvfay7pzs14gzkzcvgv25b";
144+ sha256 = "140y1m6k798c4w7xfl0zb0a4ffjz6i1722bgkdcdg8g76hr5r8ys";
145145 };
146146 disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
147147 buildInputs = [ pkgs.libpulseaudio ];
pkgs/top-level/perl-packages.nix+32
@@ -10539,6 +10539,22 @@ let
1053910539 };
1054010540 };
1054110541
10542+ LWPUserAgentDNSHosts = buildPerlModule {
10543+ pname = "LWP-UserAgent-DNS-Hosts";
10544+ version = "0.13";
10545+ src = fetchurl {
10546+ url = mirror://cpan/authors/id/M/MA/MASAKI/LWP-UserAgent-DNS-Hosts-0.13.tar.gz;
10547+ sha256 = "0piwcsb0m1xpzxbakhr9zq45a9hq3rx7s55lrjg66nd4x5n7xs5y";
10548+ };
10549+ propagatedBuildInputs = [ LWP ScopeGuard ];
10550+ buildInputs = [ ModuleBuildTiny TestFakeHTTPD TestSharedFork TestTCP TestUseAllModules ];
10551+ meta = {
10552+ description = "Override LWP HTTP/HTTPS request's host like /etc/hosts";
10553+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
10554+ homepage = "https://github.com/masaki/p5-LWP-UserAgent-DNS-Hosts";
10555+ };
10556+ };
10557+
1054210558 LWPUserAgentDetermined = buildPerlPackage {
1054310559 pname = "LWP-UserAgent-Determined";
1054410560 version = "1.07";
@@ -17524,6 +17540,22 @@ let
1752417540 };
1752517541 };
1752617542
17543+ TestFakeHTTPD = buildPerlModule {
17544+ pname = "Test-Fake-HTTPD";
17545+ version = "0.08";
17546+ src = fetchurl {
17547+ url = mirror://cpan/authors/id/M/MA/MASAKI/Test-Fake-HTTPD-0.08.tar.gz;
17548+ sha256 = "1jkflkcjzrdvnlxff1xqfhfdcpsmvvjqzayl7hk3whavsxdrf9yh";
17549+ };
17550+ propagatedBuildInputs = [ HTTPDaemon Plack ];
17551+ buildInputs = [ LWP ModuleBuildTiny TestException TestSharedFork TestTCP TestUseAllModules ];
17552+ meta = {
17553+ description = "a fake HTTP server";
17554+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
17555+ homepage = "https://github.com/masaki/Test-Fake-HTTPD";
17556+ };
17557+ };
17558+
1752717559 TestFatal = buildPerlPackage {
1752817560 pname = "Test-Fatal";
1752917561 version = "0.014";