diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-09-23 09:31:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-23 09:31:28 +0200 |
commit | 56853dc6d83a861050bbc02041dbe65f7b1b6f63 (patch) | |
tree | 70fdf276f8d889018a3ec9fc573e01fa961d289c /pkgs/development/libraries | |
parent | 343ac4d2fc6029ef6a2451d31890903f6afe79f2 (diff) | |
parent | 92158a4b2cda39ab3990682aa23644462e1a5860 (diff) | |
download | nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.gz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.bz2 nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.lz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.xz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.zst nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.zip |
Merge pull request #45941 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/development/libraries')
20 files changed, 103 insertions, 68 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 617484e5a403..32899b748113 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -74,6 +74,7 @@ let ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ optional (variant == "release") "debug-symbols=off" ++ optional (toolset != null) "toolset=${toolset}" + ++ optional (!enablePython) "--without-python" ++ optional (mpi != null || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam" ++ optionals (stdenv.hostPlatform.libc == "msvcrt") [ "threadapi=win32" diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 428b9ee482ec..f03ddfc48b2e 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ./gobject_init_on_demand.patch ] ++ [ ./schema-override-variable.patch ]; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "bin" "out" "dev" "devdoc" ]; outputBin = "dev"; setupHook = ./setup-hook.sh; @@ -104,12 +104,16 @@ stdenv.mkDerivation rec { DETERMINISTIC_BUILD = 1; postInstall = '' + mkdir -p $bin/bin + for app in gapplication gdbus gio gsettings; do + mv "$dev/bin/$app" "$bin/bin" + done + moveToOutput "share/glib-2.0" "$dev" substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev" sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" - '' - # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. - + '' + + # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c ''; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 96e02c605f54..3f030b7469e1 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -17,7 +17,8 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.14.0"; + name = "gst-plugins-bad-${version}"; + version = "1.14.2"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd"; + sha256 = "1bqy3dn7q4kdkd4lqznyly8fv854d0hhncv88jk6ai4rf3dbgyil"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index dd4007bd142b..a5f8e3406423 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -9,7 +9,8 @@ , enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.14.0"; + name = "gst-plugins-base-${version}"; + version = "1.14.2"; meta = with lib; { description = "Base plugins and helper libraries"; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "0h39bcp7fcd9kgb189lxr8l0hm0almvzpzgpdh1jpq2nzxh4d43y"; + sha256 = "0z0wy0p0nxxqhsis3n517d6ykldm02g7rca9fhq9kxb9m05yidx4"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 5845c8c50db2..b4a324d68d96 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.14.0"; + name = "gstreamer-${version}"; + version = "1.14.2"; meta = with lib ;{ description = "Open source multimedia framework"; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw"; + sha256 = "029fi3v0vrravysgfwhfkrb3ndg64sjmigbb0iwr7wpkk5r15mjb"; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 895f298c8269..d2c3cbcc6ac3 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.14.0"; + name = "gstreamer-editing-services-${version}"; + version = "1.14.2"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "14cdd6y9p4k603hsnyhdjw2igg855gwpx0362jmg8k1gagmr0pwd"; + sha256 = "0d0zqvgxp51mmffz5vvscsdzqqw9mjsv6bnk6ivg2dxnkv8q1ch5"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 99d27523b1c9..45f700e158a9 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -15,7 +15,8 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.14.0"; + name = "gst-plugins-good-${version}"; + version = "1.14.2"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "1226s30cf7pqg3fj8shd20l7sp93yw9sqplgxns3m3ajgms3byka"; + sha256 = "1bfa4n6xhr4v4wga8pv1y00rm1aka498snw6kgszy2w624l5wmy0"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 564b37fab794..f78015704fce 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,7 +9,8 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.14.0"; + name = "gst-libav-${version}"; + version = "1.14.2"; meta = { homepage = https://gstreamer.freedesktop.org; @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "12gglx6rarnxbaj0h1wivlgkv467n1bz2bwjigplciq57r6ln4zv"; + sha256 = "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 9ff799b0a27b..4166f357cdaa 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -3,7 +3,8 @@ }: stdenv.mkDerivation rec { - name = "gst-rtsp-server-1.14.0"; + name = "gst-rtsp-server-${version}"; + version = "1.14.2"; meta = with stdenv.lib; { description = "Gstreamer RTSP server"; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz"; - sha256 = "0mlp9ms5hfbyzyvmc9xgi7934g4zrh1sbgky2p9zc5fqprvs0rbb"; + sha256 = "161c49hg21xpkdw5ppc7ljbg6kyslxd1y3v1shsg7ibarxapff7p"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 004bb0715f26..b5256bf4b4c7 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.14.0"; + name = "gst-plugins-ugly-${version}"; + version = "1.14.2"; meta = with lib; { description = "Gstreamer Ugly Plugins"; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "1la2nny9hfw3rf3wvqggkg8ivn52qrqqs4n4mqz4ppm2r1gymf9z"; + sha256 = "0s9xrz8knfv06fj1nbv3iq4xj7dj4cnzj3xvgb7zs89rv7crgq2m"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 7255894f3b1f..be7ee8f12787 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "1.14.0"; + version = "1.14.2"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "1whxk428badv8ibji00sn6hj17cp8l9n93rr948bz2gjbq41zqz4"; + sha256 = "12hdyfma2lnfj38dj6y891vsxnxrlbqjbd36xx13mgasgzi6843z"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index bd33d9c52807..63893bbc523e 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,7 +3,8 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-1.14.0"; + name = "gst-validate-${version}"; + version = "1.14.2"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "1pzzxqkv1spjrzpzpazdm2h4s2wk7gg5gag8nxj5v2gjfyzhiprk"; + sha256 = "17zilvmwv13l6rbj0a7dnbg4kz5bwwa1gshaibpqbvvhahz457pa"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index c0dc0753cd01..d89b00af4ced 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \ --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib substituteInPlace generated/gtkd/gobject/c/functions.d \ - --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \ - --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib + --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ + --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib substituteInPlace generated/gtkd/rsvg/c/functions.d \ --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \ --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib @@ -63,15 +63,15 @@ stdenv.mkDerivation rec { --replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \ --replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib substituteInPlace generated/gtkd/glib/c/functions.d \ - --replace libglib-2.0.so.0 ${glib}/lib/libglib-2.0.so.0 \ - --replace libgmodule-2.0.so.0 ${glib}/lib/libgmodule-2.0.so.0 \ - --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \ - --replace libglib-2.0.0.dylib ${glib}/lib/libglib-2.0.0.dylib \ - --replace libgmodule-2.0.0.dylib ${glib}/lib/libgmodule-2.0.0.dylib \ - --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib + --replace libglib-2.0.so.0 ${glib.out}/lib/libglib-2.0.so.0 \ + --replace libgmodule-2.0.so.0 ${glib.out}/lib/libgmodule-2.0.so.0 \ + --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ + --replace libglib-2.0.0.dylib ${glib.out}/lib/libglib-2.0.0.dylib \ + --replace libgmodule-2.0.0.dylib ${glib.out}/lib/libgmodule-2.0.0.dylib \ + --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib substituteInPlace generated/gtkd/gio/c/functions.d \ - --replace libgio-2.0.so.0 ${glib}/lib/libgio-2.0.so.0 \ - --replace libgio-2.0.0.dylib ${glib}/lib/libgio-2.0.0.dylib + --replace libgio-2.0.so.0 ${glib.out}/lib/libgio-2.0.so.0 \ + --replace libgio-2.0.0.dylib ${glib.out}/lib/libgio-2.0.0.dylib substituteInPlace generated/gstreamer/gstreamer/c/functions.d \ --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \ --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 9d1427f7f451..52d0f6f05cce 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -17,21 +17,13 @@ }; in stdenv.mkDerivation (rec { name = "libgpg-error-${version}"; - version = "1.28"; + version = "1.32"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry"; + sha256 = "1jj08ns4sh1hmafqp1giskvdicdz18la516va26jycy27kkwaif3"; }; - patches = [ - # Fix builds on ARM, AArch64 - (fetchpatch { - url = "https://github.com/gpg/libgpg-error/commit/791177de023574223eddf7288eb7c5a0721ac623.patch"; - sha256 = "0vqfw0ak1j37wf6sk9y9vmdyk3kxdxkldhs0bv2waa76s11cmdx0"; - }) - ]; - postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 5498a32e7091..d42bd315d22f 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk"; }; - outputs = [ "out" "dev" ]; + outputs = [ "bin" "out" "dev" ]; mesonFlags = [ (mkFlag documentationSupport "documentation") @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { (mkFlag testsSupport "tests") ]; + preConfigure = '' + mesonFlags="$mesonFlags --libexecdir=$bin/libexec" + ''; + nativeBuildInputs = [ pkgconfig meson ninja ] ++ optionals documentationSupport [ doxygen graphviz ] ++ optionals testsSupport [ check valgrind python3Packages.pyparsing ]; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 50b43c4e043d..067f8fb432d5 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: stdenv.mkDerivation rec { - version = "1.21.0"; + version = "1.23.0"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1jjg34ppnlrnb634q9mla7whl7rm9xmjgnzckrznqcycwzir074b"; + sha256 = "1yfx99f7qnq3qvcgbnih27dgwfg6c51xw6n6n2c3c1wb3mh95im0"; }; patches = [ diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 28f8a221700d..6b5a0a359715 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,37 +1,45 @@ { stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz -, libintl, gobjectIntrospection, darwin, fribidi +, libintl, gobjectIntrospection, darwin, fribidi, gnome3 +, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf }: with stdenv.lib; let - ver_maj = "1.42"; - ver_min = "1"; -in -stdenv.mkDerivation rec { - name = "pango-${ver_maj}.${ver_min}"; + pname = "pango"; + version = "1.42.4"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx"; }; outputs = [ "bin" "dev" "out" "devdoc" ]; - buildInputs = [ gobjectIntrospection ]; - nativeBuildInputs = [ pkgconfig ] - ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - Carbon - CoreGraphics - CoreText - ]); + nativeBuildInputs = [ pkgconfig gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_43 ]; + buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Carbon + CoreGraphics + CoreText + ]); propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ]; enableParallelBuilding = true; - configureFlags = optional stdenv.isDarwin "--without-x"; + # Fontconfig error: Cannot load default config file + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + + doCheck = false; # /layout/valid-1.markup: FAIL - doCheck = false; # fails 1 out of 12 tests with "Fontconfig error: Cannot load default config file" + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { description = "A library for laying out and rendering of text, with an emphasis on internationalization"; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 9a43470de3b7..bcc57f09af45 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig -, openssl, libpng, lua5, pkgconfig, libidn, expat +, openssl, libpng, lua5, pkgconfig, libidn, expat, fetchpatch , gcc5 # TODO(@Dridus) remove this at next hash break }: @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ]; + patches = [ + # https://sourceforge.net/p/podofo/tickets/24/ + (fetchpatch { + url = "https://sourceforge.net/p/podofo/tickets/24/attachment/podofo-cmake-3.12.patch"; + extraPrefix = ""; + sha256 = "087h51x60zrakzx09baan77hwz99cwb5l1j802r5g4wj7pbjz0mb"; + }) + ]; + # TODO(@Dridus) remove the ++ ghc5 at next hash break nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5; diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index 4456cd7ff285..1e86b19ad5af 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl -, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg +, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch , withData ? true, poppler_data , qt5Support ? false, qtbase ? null , introspectionSupport ? false, gobjectIntrospection ? null @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + (fetchpatch { + name = "CVE-2018-13988"; + url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee"; + sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2"; + }) + ]; + buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; # TODO: reduce propagation to necessary libs diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index fce0dae6c731..866b1232aef5 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -8,11 +8,11 @@ assert expat != null; stdenv.mkDerivation rec { name = "wayland-${version}"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1c5fnys8hi71cnzjv5k7j0r8gx80p0yyqlrpmn06mmarhnxvwgzb"; + sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf"; }; configureFlags = [ "--with-scanner" "--disable-documentation" ]; |