diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-19 18:24:24 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-19 18:24:24 +0200 |
commit | 8213ff161c461655aaff7d43984384dbca64b312 (patch) | |
tree | 3b7c3138ff2222b9b6b8d247c3b1a0c8ea3305e3 /pkgs/applications/networking | |
parent | 9f208b5d8aa10518eb92ed5b7d77e4a588b5154c (diff) | |
parent | e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133 (diff) | |
download | nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.gz nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.bz2 nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.lz nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.xz nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.zst nixlib-8213ff161c461655aaff7d43984384dbca64b312.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking')
18 files changed, 133 insertions, 38 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6a5c9d67470c..570180d4c4df 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -5,7 +5,7 @@ , curl , cups , dbus-glib -, dbus_libs +, dbus , fontconfig , freetype , gconf @@ -93,7 +93,7 @@ stdenv.mkDerivation { curl cups dbus-glib - dbus_libs + dbus fontconfig freetype gconf diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 62fd4f533ea0..584dca63297c 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,7 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration -, libudev +, udev , kerberos }: @@ -66,7 +66,7 @@ let ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration ++ extraNativeMessagingHosts ); - libs = [ libudev ] + libs = lib.optional stdenv.isLinux udev ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index d2d26190ce05..2df2043517ae 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk +, dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk , kerberos # command line arguments which are always set e.g "--disable-gpu" @@ -52,7 +52,7 @@ let glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb alsaLib libXdamage libXtst libXrandr expat cups - dbus_libs gdk_pixbuf gcc-unwrapped.lib + dbus gdk_pixbuf gcc-unwrapped.lib systemd libexif liberation_ttf curl utillinux xdg_utils wget diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 14a8bfd048b4..c9486d9a7271 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd +, alsaLib, dbus, cups, libexif, ffmpeg, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst-plugins-base, libxml2 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd + atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; diff --git a/pkgs/applications/networking/cluster/ksonnet/default.nix b/pkgs/applications/networking/cluster/ksonnet/default.nix new file mode 100644 index 000000000000..b8bce9315237 --- /dev/null +++ b/pkgs/applications/networking/cluster/ksonnet/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoPackage, fetchFromGitHub, ... }: + +buildGoPackage rec { + version = "0.11.0"; + name = "ksonnet-${version}"; + + src = fetchFromGitHub { + owner = "ksonnet"; + repo = "ksonnet"; + rev = "v${version}"; + sha256 = "0z7gkgcsiclm72bznmzv5jcgx5rblndcsiqc0r2mwhxhmv19bs04"; + }; + + goPackagePath = "github.com/ksonnet/ksonnet"; + + meta = { + description = "A CLI-supported framework that streamlines writing and deployment of Kubernetes configurations to multiple clusters"; + homepage = https://github.com/ksonnet/ksonnet; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ flokli ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index f10a88ec9614..bee4c3bea20b 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses -, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }: +, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, makeWrapper }: stdenv.mkDerivation rec { name = "newsboat-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { --replace "ncurses5.4" "ncurses" ''; - nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ] + nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ] ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ]; buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 681a8119ac03..820a742245ed 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk # Optional, Jitsi still runs without, but you may pass null: -, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg +, alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg }: stdenv.mkDerivation rec { @@ -25,13 +25,11 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath ([ stdenv.cc.cc # For libstdc++. - ] ++ lib.filter (x: x != null) [ alsaLib - dbus_libs + dbus gtk2 libpulseaudio openssl - ] ++ lib.optionals (xorg != null) [ xorg.libX11 xorg.libXext xorg.libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index e41aea497a85..af58aaa0a769 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }: +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { name = "purple-discord-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json_glib ]; + buildInputs = [ pidgin json-glib ]; makeFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index f8514dad36e1..a8e1618222b8 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1f54azqdfqa2yrzlp9b7pz7nswl5n3pgln38yxcvb3y5k6x0ljqp"; + sha256 = "0szc7ynl26hqvvwk3sx02ym4abyz78akx0sp6cvif3bb4m8brz1c"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 3e0e60594f82..9354ae728218 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,11 +4,11 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.3.7"; - sha256Hash = "1rwnqgla061icvyvw8gxqd7qki1jnq0f46hvyffp74ng5r1b6wjg"; + version = "1.3.10"; + sha256Hash = "0i1lzks8pf627658w6p7dz87d6cl4g98031qm166npkc40f89bpr"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "310557"; - archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk"; + archPatchesRevision = "359861"; + archPatchesHash = "15xybfs9k6dww747if8z6m9sh7anvqi76zsx2gxyna2j1z36i0r0"; }; in { stable = mkTelegram stableVersion; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch new file mode 100644 index 000000000000..1c79840d6260 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch @@ -0,0 +1,68 @@ +Date: Tue, 17 Jul 2018 20:29:49 +0200 + +--- + Telegram/SourceFiles/export/data/export_data_types.cpp | 9 ++++++--- + Telegram/SourceFiles/export/export_api_wrap.cpp | 6 ++++-- + 2 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp +index f835dc2f9..e811c27e8 100644 +--- a/Telegram/SourceFiles/export/data/export_data_types.cpp ++++ b/Telegram/SourceFiles/export/data/export_data_types.cpp +@@ -221,7 +221,8 @@ Image ParseMaxImage( + result.width = data.vw.v; + result.height = data.vh.v; + result.file.location = ParseLocation(data.vlocation); +- if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) { ++ constexpr bool condition = MTPDphotoCachedSize::Is<decltype(data)>(); ++ if constexpr (condition) { + result.file.content = data.vbytes.v; + result.file.size = result.file.content.size(); + } else { +@@ -409,7 +410,8 @@ Document ParseDocument( + result.width = data.vw.v; + result.height = data.vh.v; + result.file.location = ParseLocation(data.vlocation); +- if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) { ++ constexpr bool condition = MTPDphotoCachedSize::Is<decltype(data)>(); ++ if constexpr (condition) { + result.file.content = data.vbytes.v; + result.file.size = result.file.content.size(); + } else { +@@ -1017,7 +1019,8 @@ Message ParseMessage( + auto result = Message(); + data.match([&](const auto &data) { + result.id = data.vid.v; +- if constexpr (!MTPDmessageEmpty::Is<decltype(data)>()) { ++ constexpr bool condition = !MTPDmessageEmpty::Is<decltype(data)>(); ++ if constexpr (condition) { + result.toId = ParsePeerId(data.vto_id); + const auto peerId = (!data.is_out() + && data.has_from_id() +diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp +index b618937f6..bb98647dd 100644 +--- a/Telegram/SourceFiles/export/export_api_wrap.cpp ++++ b/Telegram/SourceFiles/export/export_api_wrap.cpp +@@ -709,7 +709,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { + Expects(_userpicsProcess != nullptr); + + result.match([&](const auto &data) { +- if constexpr (MTPDphotos_photos::Is<decltype(data)>()) { ++ constexpr bool condition = MTPDphotos_photos::Is<decltype(data)>(); ++ if constexpr (condition) { + _userpicsProcess->lastSlice = true; + } + loadUserpicsFiles(Data::ParseUserpicsSlice( +@@ -1141,7 +1142,8 @@ void ApiWrap::requestMessagesSlice() { + result.match([&](const MTPDmessages_messagesNotModified &data) { + error("Unexpected messagesNotModified received."); + }, [&](const auto &data) { +- if constexpr (MTPDmessages_messages::Is<decltype(data)>()) { ++ constexpr bool condition = MTPDmessages_messages::Is<decltype(data)>(); ++ if constexpr (condition) { + _chatProcess->lastSlice = true; + } + loadMessagesFiles(Data::ParseMessagesSlice( +-- +2.16.3 + diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 732ea95dd07c..2d9a9d10aed9 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -28,7 +28,10 @@ mkDerivation rec { }; # TODO: libtgvoip.patch no-gtk2.patch - patches = [ "${archPatches}/tdesktop.patch" ]; + patches = [ "${archPatches}/tdesktop.patch" ] + # TODO: Only required to work around a compiler bug. + # This should be fixed in GCC 7.3.1 (or later?) + ++ [ ./fix-internal-compiler-error.patch ]; postPatch = '' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 1ff67d02ff67..525a8a313f44 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon +{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig libxslt ]; - buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ] - ++ stdenv.lib.optional doCheck dbus_daemon; + buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]; + + checkInputs = [ dbus.daemon ]; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 3f22aa28f36f..82ad57ae9272 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig -, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }: +, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus }: stdenv.mkDerivation rec { project = "telepathy-logger"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib - dbus_libs telepathy-glib.python + dbus telepathy-glib.python ]; configureFlags = "--enable-call"; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 4bd0f2e73e6f..0139a3f3a93d 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt6 }: +{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt }: stdenv.mkDerivation rec { name = "linssid-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig qmake ]; - buildInputs = [ qtbase qtsvg boost qwt6 ]; + buildInputs = [ qtbase qtsvg boost qwt ]; patches = [ ./0001-unbundled-qwt.patch ]; diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index c0f015944b0a..390f68bd105f 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, binutils, patchelf, makeWrapper, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, libudev }: +{ stdenv, fetchurl, binutils, patchelf, makeWrapper +, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype +, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }: stdenv.mkDerivation rec { name = "inboxer-${version}"; @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { expat stdenv.cc.cc.lib libpulseaudio - libudev + udev ]; in '' patchelf \ @@ -62,7 +64,7 @@ stdenv.mkDerivation rec { patchelf \ --set-rpath "$out/opt/Inboxer:${lpath}" \ $out/opt/Inboxer/libffmpeg.so - + patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/opt/Inboxer:${lpath}" \ @@ -70,7 +72,7 @@ stdenv.mkDerivation rec { wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}" ''; - + installPhase = '' mkdir -p $out/bin cp -R usr/share opt $out/ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index bea713c9e6bd..b9b553f94472 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -7,7 +7,7 @@ , cups , curl , dbus-glib -, dbus_libs +, dbus , fontconfig , freetype , gdk_pixbuf @@ -86,7 +86,7 @@ stdenv.mkDerivation { cups curl dbus-glib - dbus_libs + dbus fontconfig freetype gdk_pixbuf diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index e4bdec668a02..74ffb14f4ade 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, lua, pkgconfig, rsync, - asciidoc, libxml2, docbook_xml_dtd_45, docbook_xml_xslt, libxslt }: + asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: stdenv.mkDerivation rec { name = "lsyncd-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ rsync cmake lua pkgconfig - asciidoc libxml2 docbook_xml_dtd_45 docbook_xml_xslt libxslt + asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt ]; meta = with stdenv.lib; { |