Age | Commit message (Expand) | Author |
2020-09-23 | Merge branch 'staging' into wip-lisp | Guillaume Le Vaillant |
2020-09-23 | gnu: evisum: Build translations....* gnu/packages/enlightenment.scm (evisum)[native-inputs]: Add
gettext-minimal.
| Efraim Flashner |
2020-09-23 | gnu: evisum: Update to 0.5.6....* gnu/packages/enlightenment.scm (evisum): Update to 0.5.6.
| Efraim Flashner |
2020-09-23 | gnu: efl: Update to 1.25.0....* gnu/packages/enlightenment.scm (efl): Update to 1.25.0.
[propagated-inputs]: Remove avahi.
[arguments]: Remove configure-flags to disable systemd, enable elogind,
list evas-loaders to disable and enable avahi. Add substitution to
hardcode location of elogind's library.
| Efraim Flashner |
2020-09-09 | gnu: enlightenment: Fix inputs....* gnu/packages/enlightenment.scm (enlightenment)[inputs]: Move efl,
wayland-protocols ...
[propagated-inputs]: ... to here. Add libxkbcommon.
| Efraim Flashner |
2020-09-05 | Merge remote-tracking branch 'origin/master' into staging | Efraim Flashner |
2020-09-01 | gnu: enlightenment-wayland: Deprecate package....* gnu/packages/enlightenment.scm (enlightenment-wayland): Deprecate
package in favor of enlightenment.
| Efraim Flashner |
2020-09-01 | gnu: enlightenment: Build with wayland support....* gnu/packages/enlightenment.scm (enlightenment)[arguments]: Add
configure-flag to build with wayland support.
[inputs]: Add wayland-protocols, xorg-server-xwayland.
| Efraim Flashner |
2020-09-01 | gnu: python-efl: Use regex to delete cythonized files....* gnu/packages/enlightenment.scm (python-efl)[source]: Adjust snippet to
delete cythonized files based on a regex pattern.
| Efraim Flashner |
2020-09-01 | gnu: enlightenment: Use system eject....* gnu/packages/enlightenment.scm (enlightenment)[arguments]: Adjust
'set-system-actions phase to refer to eject in /run/current-system.
[native-inputs]: Remove util-linux.
| Efraim Flashner |
2020-09-01 | gnu: enlightenment.scm: Remove unneeded module import....* gnu/packages/enlightenment.scm: Remove unneeded module import.
| Efraim Flashner |
2020-08-28 | gnu: evisum: Update to 0.5.4....* gnu/packages/enlightenment.scm (evisum): Update to 0.5.4.
| Tobias Geerinckx-Rice |
2020-08-24 | gnu: evisum: Update to 0.5.3....* gnu/packages/enlightenment.scm (evisum): Update to 0.5.3.
| Tobias Geerinckx-Rice |
2020-08-12 | gnu: terminology: Update to 1.8.1....* gnu/packages/enlightenment.scm (terminology): UPdate to 1.8.1.
| Efraim Flashner |
2020-08-10 | gnu: evisum: Update to 0.5.2....* gnu/packages/enlightenment.scm (evisum): Update to 0.5.2.
| Efraim Flashner |
2020-07-28 | gnu: evisum: Update to 0.5.1....* gnu/packages/enlightenment.scm (evisum): Update to 0.5.1.
| Efraim Flashner |
2020-07-28 | gnu: terminology: Update to 1.8.0....* gnu/packages/enlightenment.scm (terminology): Update to 1.8.0.
| Efraim Flashner |
2020-07-26 | gnu: enlightenment: Update to 0.24.2....* gnu/packages/enlightenment.scm (enlightenment): Update to 0.24.2.
| Efraim Flashner |
2020-07-25 | gnu: check: Update to 0.15.1....* gnu/packages/check.scm (check): Update to 0.15.1.
(check-0.14): New public variable.
* gnu/packages/backup.scm (burp)[native-inputs]: Change from CHECK to
CHECK-0.14.
* gnu/packages/bioinformatics.scm (libsbml)[native-inputs]: Likewise.
* gnu/packages/databases.scm (recutils)[native-inputs]: Likewise.
* gnu/packages/electronics.scm (libsigrokdecode)[native-inputs]: Likewise.
* gnu/packages/enlightenment.scm (efl, edi)[native-inputs]: Likewise.
* gnu/packages/gnome.scm (gdm)[inputs]: Likewise.
* gnu/packages/gtk.scm (girara)[native-inputs]: Likewise.
* gnu/packages/messaging.scm (pidgin)[native-inputs]: Likewise.
* gnu/packages/networking.scm (iodine)[native-inputs]: Likewise.
* gnu/packages/pulseaudio.scm (pulseaudio)[native-inputs]: Likewise.
* gnu/packages/sssd.scm (sssd)[native-inputs]: Likewise.
* gnu/packages/web.scm (libwapcaplet)[native-inputs]: Likewise.
| Marius Bakke |
2020-06-17 | gnu: efl: Update to 1.24.3....* gnu/packages/enlightenment.scm (efl): Update to 1.24.3.
[arguments]: Remove opengl flags from configure-flags.
| Efraim Flashner |
2020-06-07 | gnu: Add epour....* gnu/packages/enlightenment.scm (epour): New variable.
| Efraim Flashner |
2020-06-01 | gnu: enlightenment: Update to 0.24.1....* gnu/packages/enlightenment.scm (enlightenment): Update to 0.24.1.
| Efraim Flashner |
2020-05-25 | gnu: efl: Update to 1.24.2....* gnu/packages/enlightenment.scm (efl): Update to 1.24.2.
| Efraim Flashner |
2020-05-24 | gnu: enlightenment: Update to 0.24.0....* gnu/packages/enlightenment.scm (enlightenment): Update to 0.24.0.
[arguments]: Change configure-flags to hardcode efl binary locations.
Remove custom 'fix-dot-desktop-creation phase. Update 'set-system-actions
phase.
* gnu/packages/patches/enlightenment-fix-setuid-path.patch: Update for
new upstream version.
* gnu/services/desktop.scm (enlightenment-setuid-programs): Same.
| Efraim Flashner |
2020-05-24 | gnu: python-efl: Update to 1.24.0....* gnu/packages/enlightenment.scm (python-efl): Update to 1.24.0.
| Efraim Flashner |
2020-05-24 | gnu: efl: Update to 1.24.1....* gnu/packages/enlightenment.scm (efl): Update to 1.24.1.
[propagated-inputs]: Remove bullet. Add libpng. Move libtiff, libwebp,
util-linux:lib ...
[inputs]: ... to here. Add openjpeg. Remove libxp.
[arguments]: In configure-flags disable scim, enable avahi, glib. Use
setuid mount/umount binaries. Rename hardcode-libcurl-location to
hardcode-dynamic-libraries and add pulseaudio, libsndfile.
squash! efl-1.24.1
| Efraim Flashner |
2020-05-13 | mailmap: Update entries for Nikita....* .mailmap: change email and name for Nikita.
* Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish,
gnu/packages/accessibility.scm, gnu/packages/admin.scm,
gnu/packages/audio.scm, gnu/packages/autotools.scm, gnu/packages/cdrom.scm,
gnu/packages/check.scm, gnu/packages/cinnamon.scm,
gnu/packages/compression.scm, gnu/packages/crypto.scm,
gnu/packages/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm,
gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm,
gnu/packages/enlightenment.scm, gnu/packages/erlang.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm,
gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile-xyz.scm,
gnu/packages/haskell-apps.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm, gnu/packages/haskell-xyz.scm,
gnu/packages/haskell.scm, gnu/packages/image-viewers.scm,
gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm,
gnu/packages/libcanberra.scm, gnu/packages/linux.scm,
gnu/packages/lisp-xyz.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm,
gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm,
gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm,
gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm,
gnu/packages/ncurses.scm, gnu/packages/networking.scm,
gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm,
gnu/packages/perl-check.scm, gnu/packages/perl.scm,
gnu/packages/python-compression.scm, gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm, gnu/packages/python-xyz.scm,
gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm,
gnu/packages/rust.scm, gnu/packages/scheme.scm,
gnu/packages/serialization.scm, gnu/packages/shells.scm,
gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm,
gnu/packages/telephony.scm, gnu/packages/text-editors.scm,
gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm,
gnu/packages/tor.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm,
gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm,
gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm,
gnu/services/desktop.scm, gnu/services/version-control.scm,
gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Likewise.
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
| nikita |
2020-05-12 | gnu: terminology: Update to 1.7.0....* gnu/packages/enlightenment.scm (terminology): Update to 1.7.0.
| Efraim Flashner |
2020-05-12 | gnu: evisum: Update to 0.4.1....* gnu/packages/enlightenment.scm (evisum): Update to 0.4.1.
| Efraim Flashner |
2020-05-10 | Revert "gnu: efl: Update to 1.24.0."...There is a bug where with efl-1.24 no user input is accepted with any
efl-based pop-up dialogs. Revert until we can find a fix.
This reverts commit b34793c14372fbda2246d68ef6270f1207e53e98.
| Efraim Flashner |
2020-05-10 | Revert "gnu: python-efl: Update to 1.24.0."...This reverts commit 67c8f879c5117732e58213d55a6b51ecc7f4bd54.
| Efraim Flashner |
2020-05-05 | Merge branch 'master' into core-updates | Marius Bakke |
2020-05-03 | gnu: edi: Update to 0.8.0....* gnu/packages/enlightenment.scm (edi): Update to 0.8.0.
[source]: Download from new uri.
[arguments]: Add custom phase to fix clang headers discovery.
[native-inputs]: Add check, gettext-minimal.
[license]: Add gpl3.
| Efraim Flashner |
2020-05-03 | gnu: evisum: Update to 0.4.0....* gnu/packages/enlighenment.scm (evisum): Update to 0.4.0.
[build-system]: Switch to meson-build-system.
[arguments]: Remove make-flags, custom phases.
[inputs]: Remove alsa-lib, perl.
| Efraim Flashner |
2020-05-03 | gnu: python-efl: Update to 1.24.0....* gnu/packages/enlightenment.scm (python-efl): Update to 1.24.0.
| Efraim Flashner |
2020-05-03 | gnu: enlightenment: Change mount/umount binaries....* gnu/packages/enlightenment.scm (enlightenment)[arugments]: Use the
setuid binaries for mount/umount.
| Efraim Flashner |
2020-05-03 | gnu: efl: Update to 1.24.0....* gnu/packages/enlightenment.scm (efl): Update to 1.24.0.
[propagated-inputs]: Remove bullet. Add libpng. Move libtiff, libwebp ...
[inputs]: ... to here. Add openjpeg. Remove libxp.
[arguments]: In configure-flags disable scim, enable avahi, glib. Use
setuid mount/umount binaries.
| Efraim Flashner |
2020-03-14 | Merge branch 'master' into core-updates | Marius Bakke |
2020-03-12 | gnu: ephoto: Update source and home page URIs....* gnu/packages/enlightenment.scm (ephoto)[source]: Remove dead URI.
[home-page]: Follow (HTTPS) redirection.
| Tobias Geerinckx-Rice |
2020-01-22 | gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo'....* gnu/packages/abiword.scm (abiword)[inputs]: Change from LIBJPEG to
LIBJPEG-TURBO.
* gnu/packages/admin.scm (testdisk)[inputs]: Likewise.
* gnu/packages/algebra.scm (giac)[inputs]: Likewise.
* gnu/packages/animation.scm (synfig)[inputs]: Likewise.
* gnu/packages/astronomy.scm (gnuastro, celestia)[inputs]: Likewise.
* gnu/packages/cdrom.scm (dvdstyler)[inputs]: Likewise.
* gnu/packages/cran.scm (r-jpeg, r-tiff, r-readbitmap)[inputs]: Likewise.
* gnu/packages/cups.scm (cups-filters, hplip)[inputs]: Likewise.
* gnu/packages/display-managers.scm (slim)[inputs]: Likewise.
* gnu/packages/ebook.scm (fbreader)[inputs]: Likewise.
* gnu/packages/emacs.scm (emacs)[inputs]: Likewise.
* gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise.
* gnu/packages/fltk.scm (fltk, ntk)[inputs]: Likewise.
* gnu/packages/fontutils.scm (fontforge)[inputs]: Likewise.
* gnu/packages/freedesktop.scm (weston)[inputs]: Likewise.
* gnu/packages/game-development.scm (sfml, allegro, aseprite, python-pygame,
eureka, ioquake3)[inputs]: Likewise.
* gnu/packages/games.scm (adanaxisgpl, freedroidrpg, irrlicht, minetest,
fizmo, supertuxkart, gzdoom, xmoto, xonotic)[inputs]: Likewise.
* gnu/packages/gd.scm (gd, perl-gd)[inputs]: Likewise.
* gnu/packages/ghostscript.scm (lcms)[inputs]: Likewise.
(ghostscript)[inputs, native-inputs]: Likewise.
* gnu/packages/gimp.scm (gegl, gimp)[inputs]: Likewise.
* gnu/packages/gnome.scm (libgnomeui, eog, tracker-miners, gthumb)[inputs]: Likewise.
* gnu/packages/gnunet.scm (libextractor)[inputs]: Likewise.
* gnu/packages/gnustep.scm (windowmaker)[inputs]: Likewise.
* gnu/packages/graphics.scm (blender, blender-2.79, openimageio,
openscenegraph, openscenegraph-3.4, povray, fgallery)[inputs]: Likewise.
* gnu/packages/graphviz.scm (graphviz)[inputs]: Likewise.
* gnu/packages/gstreamer.scm (gst-plugins-good)[inputs]: Likewise.
* gnu/packages/gtk.scm (gdk-pixbuf)[inputs]: Likewise.
* gnu/packages/image-processing.scm (dcmtk, mia, vtk, opencv, vips, nip2, vxl,
insight-toolkit)[inputs]: Likewise.
* gnu/packages/image-viewers.scm (gpicview, luminance-hdr)[inputs]: Likewise.
* gnu/packages/image.scm (jpegoptim, libtiff, leptonica, imlib2, freeimage,
vigra, libwebp, libmng, jasper, steghide, jp2a)[inputs]: Likewise.
* gnu/packages/imagemagick.scm (imagemagick, graphicsmagick)[inputs]: Likewise.
* gnu/packages/java.scm (icedtea-6, icedtea-7, openjdk9, openjdk11,
openjdk12)[inputs]: Likewise.
* gnu/packages/kde-frameworks.scm (khtml)[inputs]: Likewise.
* gnu/packages/kodi.scm (kodi)[inputs]: Likewise.
* gnu/packages/machine-learning.scm (dlib, tensorflow)[inputs]: Likewise.
* gnu/packages/mate.scm (atril, eom)[inputs]: Likewise.
* gnu/packages/maths.scm (hdf4, hdf-java, hdf-eos2, netcdf)[inputs]: Likewise.
* gnu/packages/netpbm.scm (netpbm)[inputs]: Likewise.
* gnu/packages/pdf.scm (zathura-pdf-mupdf, podofo, mupdf, fbida)[inputs]: Likewise.
* gnu/packages/photo.scm (libraw, libpano13, enblend-enfuse, darktable, hugin,
rawtherapee)[inputs]: Likewise.
* gnu/packages/prolog.scm (swi-prolog)[native-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-hdf4, python-pillow)[inputs]: Likewise.
* gnu/packages/qt.scm (qtbase, qtwebkit)[inputs]: Likewise.
* gnu/packages/rdesktop.scm (freerdp)[inputs]: Likewise.
* gnu/packages/scanner.scm (sane-backends, xsane)[inputs]: Likewise.
* gnu/packages/scheme.scm (racket)[inputs]: Likewise.
* gnu/packages/scribus.scm (scribus)[inputs]: Likewise.
* gnu/packages/sdl.scm (sdl-image)[propagated-inputs]: Likewise.
(guile-sdl)[native-inputs]: Likewise.
* gnu/packages/spice.scm (spice-gtk)[inputs]: Likewise.
* gnu/packages/statistics.scm (r-with-tests)[inputs]: Likewise.
* gnu/packages/tcl.scm (perl-tk)[inputs]: Likewise.
* gnu/packages/upnp.scm (readymedia)[inputs]: Likewise.
* gnu/packages/video.scm (mplayer, mpv, v4l-utils, motion)[inputs]: Likewise.
* gnu/packages/web-browsers.scm (dillo, links)[inputs]: Likewise.
* gnu/packages/web.scm (netsurf)[inputs]: Likewise.
* gnu/packages/webkit.scm (webkitgtk)[inputs]: Likewise.
* gnu/packages/wine.scm (wine)[inputs]: Likewise.
* gnu/packages/wv.scm (wv)[inputs]: Likewise.
* gnu/packages/wxwidgets.scm (wxwidgets, wxwidgets-2)[inputs]: Likewise.
* gnu/packages/xdisorg.scm (xscreensaver)[inputs]: Likewise.
* gnu/packages/xfce.scm (tumbler)[inputs]: Likewise.
* gnu/packages/xfig.scm (xfig, transfig)[inputs]: Likewise.
* gnu/packages/xorg.scm (xpra)[inputs]: Likewise.
| Marius Bakke |
2020-01-15 | gnu: util-linux: Move libraries to separate output....Fixes <https://bugs.gnu.org/37732>.
Reported by Diego Nicola Barbato <dnbarbato@posteo.de>.
* gnu/packages/linux.scm (util-linux)[outputs]: Add "lib".
[arguments]: Update #:configure-flags and the "move-static-libraries" phase
accordingly. Add phases "patch-build-scripts" and "adjust-pkg-config-files".
(e2fsprogs, psm, mtd-utils, f2fs-tools, f2fs-tools-1.7, eudev,
xfsprogs)[inputs]: Change to the "lib" output of UTIL-LINUX.
(btrfs-progs)[inputs]: Remove duplicate UTIL-LINUX inputs and change to use
the "lib" output.
* gnu/packages/admin.scm (pam-mount)[inputs]: Add UTIL-LINUX:LIB.
(testdisk)[inputs]: Change to the "lib" output of UTIL-LINUX.
* gnu/packages/android.scm (abootimg)[inputs]: Likewise.
* gnu/packages/audio.scm (jack-1)[propagated-inputs]: Likewise.
* gnu/packages/bootloaders.scm (syslinux, vboot-utils)[inputs]: Likewise.
* gnu/packages/chez.scm (chez-scheme)[inputs]: Likewise.
* gnu/packages/cryptsetup.scm (cryptsetup, cryptsetup-static)[inputs]: Likewise.
* gnu/packages/databases.scm (postgresql, 4store)[inputs]: Likewise.
* gnu/packages/disk.scm (ndctl, gptfdisk, fdisk, gparted, rmlint,
volume-key)[inputs]: Likewise.
(parted)[inputs]: Likewise.
[native-inputs]: Add UTIL-LINUX.
* gnu/packages/efi.scm (sbsigntools)[inputs]: Add UTIL-LINUX:LIB.
* gnu/packages/engineering.scm (lib3mf)[inputs]: Change to the "lib" output of
UTIL-LINUX.
* gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise.
* gnu/packages/file-systems.scm (glusterfs, jfsutils, zfs)[inputs]: Likewise.
* gnu/packages/firmware.scm (ovmf)[inputs]: Likewise.
* gnu/packages/fontutils.scm (fontconfig)[propagated-inputs]: Likewise.
* gnu/packages/freedesktop.scm (localed)[inputs]: Likewise.
* gnu/packages/glib.scm (glib, appstream-glib)[propagated-inputs]: Likewise.
* gnu/packages/gnome.scm (tracker, gnome-terminal)[inputs]: Likewise.
* gnu/packages/jupyter.scm (xeus)[inputs]: Likewise.
* gnu/packages/kde.scm (kpmcore)[inputs]: Likewise.
* gnu/packages/kodi.scm (crossguid)[inputs]: Likewise.
* gnu/packages/lighting.scm (ola)[inputs]: Likewise.
* gnu/packages/music.scm (libgig)[inputs]: Likewise.
* gnu/packages/nfs.scm (nfs-utils)[inputs]: Likewise.
* gnu/packages/opencog.scm (opencog)[inputs]: Likewise.
* gnu/packages/package-management.scm (msitools)[inputs]: Change to the "lib"
output of UTIL-LINUX.
* gnu/packages/password-utils.scm (pwsafe)[inputs]: Likewise.
* gnu/packages/telephony.scm (pjproject)[propagated-inputs]: Likewise.
* gnu/packages/rdf.scm (rasqal)[inputs]: Likewise.
* gnu/packages/search.scm (xapian)[inputs]: Likewise.
* gnu/packages/sssd.scm (sssd)[native-inputs]: Likewise.
* gnu/packages/storage.scm (ceph)[inputs]: Add UTIL-LINUX:LIB.
* gnu/packages/task-management.scm (taskwarrior)[inputs]: Change to the "lib"
output of UTIL-LINUX.
* gnu/packages/virtualization.scm (libvirt, xen)[inputs]: Likewise.
* gnu/packages/xorg.scm (libsm)[inputs]: Likewise.
| Marius Bakke |
2019-12-10 | gnu: terminology: Update to 1.6.0....* gnu/packages/enlightenment.scm (terminology): Update to 1.6.0.
| Efraim Flashner |
2019-12-10 | gnu: efl: Update to 1.23.3....* gnu/packages/enlightenment.scm (efl): Update to 1.23.3.
| Efraim Flashner |
2019-11-13 | gnu: efl: Update to 1.23.2....* gnu/packages/enlightenment.scm (efl): Update to 1.23.2.
| Efraim Flashner |
2019-10-23 | gnu: enlightenment: Hardcode 'bc' location....* gnu/packages/enlightenment.scm (enlightenment)[arguments]: In custom
'set-system-actions phase hardcode location of 'bc' binary.
[inputs]: Add bc.
| Efraim Flashner |
2019-10-21 | gnu: enlightenment: Fix desktop session file creation....* gnu/packages/enlightenment.scm (enlightenment)[arguments]: Create
wayland session file only when building with wayland support.
| Efraim Flashner |
2019-10-14 | gnu: Add enlightenment-wayland....* gnu/packages/enlightenment.scm (enlightenment-wayland): New variable.
| Efraim Flashner |
2019-10-12 | gnu: efl: Update to 1.23.1....* gnu/packages/enlightenment.scm (efl): Update to 1.23.1.
| Efraim Flashner |
2019-10-10 | gnu: python-efl: Update to 1.23.0....* gnu/packages/enlightenment.scm (python-efl): Update to 1.23.0.
| Efraim Flashner |
2019-10-02 | gnu: efl: Build with elogind support....* gnu/packages/enlightenment.scm (efl)[arguments]: Add configure flag to
enable support for elogind.
[propagated-inputs]: Add elogind.
| Efraim Flashner |