| Commit message (Expand) | Author | Age |
|---|
| ... | |
| | * | | | | | gnu: findutils: Update to 4.6.0.•••* gnu/packages/patches/findutils-absolute-paths.patch: Remove.
* gnu/packages/patches/findutils-test-xargs.patch: New file.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
* gnu/packages/base.scm (findutils): Update to 4.6.0. Remove
'findutils-absolute-paths.patch' and add 'findutils-test-xargs.patch'.
| Ludovic Courtès | 2016-01-01 |
| | * | | | | | gnu: commencement: Use GMP 6.0.0a for bootstrapping.•••* gnu/packages/multiprecision.scm (gmp-6.0): New variable.
* gnu/packages/commencement.scm (gcc-boot0, gcc-final): Use it.
* gnu/packages/patches/gmp-arm-asm-nothumb.patch: New file, reinstated
from before e414a7d.
* gnu-system.am (dist_patch_DATA): Add it.
| Ludovic Courtès | 2015-12-18 |
| | * | | | | | gnu: perl: Build deterministically, and make byproducts deterministic.•••With this, a --rounds=2 build passes, and timestamps in POD files can be
controlled with 'SOURCE_DATE_EPOCH'.
* gnu/packages/patches/perl-deterministic-ordering.patch,
gnu/packages/patches/perl-no-build-time.patch,
gnu/packages/patches/perl-source-date-epoch.patch: New files.
* gnu/packages/perl.scm (perl)[source]: Use them.
* gnu-system.am (dist_patch_DATA): Add them.
| Ludovic Courtès | 2015-12-13 |
| | * | | | | | gnu: perl: Update to 5.22.0.•••* gnu/packages/perl.scm (perl)[source]: Update to 5.22.0. Remove
"perl-module-pluggable-search.patch" since Module::Pluggable appears to
be gone.
[arguments] <configure-phase>: Adjust Cwd.pm file name. Replace
-std=c89 with -std=gnu89.
* gnu/packages/commencement.scm (perl-boot0): Add 'disable-pthreads'
phase.
* gnu/packages/patches/perl-no-sys-dirs.patch: Update.
* gnu/packages/patches/perl-module-pluggable-search.patch: Remove.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
| Ludovic Courtès | 2015-12-13 |
| | * | | | | | build: Add missing patches to the distribution.•••* gnu-system.am (dist_patch_DATA): Add glibc-hurd-extern-inline.patch
and plink-1.07-unclobber-i.patch.
| Ludovic Courtès | 2015-12-12 |
| | * | | | | | Merge branch 'master' into core-updates | Ludovic Courtès | 2015-12-12 |
| | |\ \ \ \ \ |
|
| | * | | | | | | gnu: libarchive: Fix test failure on SELinux systems.•••Reported by Jan Synáček <jan.synacek@gmail.com>
at <https://lists.gnu.org/archive/html/guix-devel/2015-11/msg00522.html>.
* gnu/packages/patches/libarchive-bsdtar-test.patch: New file.
* gnu/packages/backup.scm (libarchive)[source]: Use it.
* gnu-system.am (dist_patch_DATA): Add it.
| Ludovic Courtès | 2015-12-09 |
| | * | | | | | | gnu: gmp: Drop patch included in release 6.1.0.•••* gnu/packages/multiprecision.scm (gmp)[source]: Drop patch.
* gnu/packages/patches/gmp-arm-asm-nothumb.patch: Remove patch.
* gnu-system.am (dist_patch_DATA): Unregister patch.
| Andreas Enge | 2015-12-02 |
| | * | | | | | | gnu: procps: Update to 3.3.11.•••procps-ng is the new upstream.
* gnu/packages/procps.scm (procps): Update to 3.3.11.
[source]: Adjust formatting. Remove patches.
[home-page]: Update URL.
* gnu/packages/patches/procps-make-3.82.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.
| 宋文武 | 2015-11-16 |
| | * | | | | | | gnu: emacs: Honor 'SOURCE_DATE_EPOCH'.•••Suggested by Ludovic Courtès <ludo@gnu.org>.
* gnu/packages/patches/emacs-source-date-epoch.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/emacs.scm (emacs)[source]: Use it.
| Alex Kost | 2015-11-14 |
| | * | | | | | | gnu: grep: Update to 2.22.•••* gnu/packages/base.scm (grep): Upgrade to 2.22. Remove
'grep-CVE-2015-1345.patch'.
* gnu/packages/patches/grep-CVE-2015-1345.patch: Remove.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
| Ludovic Courtès | 2015-11-07 |
| | * | | | | | | gnu: unzip: Reorganize security fixes for improved clarity.•••* gnu/packages/patches/unzip-fix-overflows-and-infloop.patch: Delete
file. Its contents are now split into the following new files:
* gnu/packages/patches/unzip-CVE-2015-7696.patch,
gnu/packages/patches/unzip-CVE-2015-7697.patch,
gnu/packages/patches/unzip-overflow-on-invalid-input.patch: New files.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
* gnu/packages/zip.scm (unzip)[source]: Adjust patches accordingly.
| Mark H Weaver | 2015-10-23 |
| * | | | | | | | gnu: c-ares: Move to adns.scm.•••* gnu/packages/aria2.scm (c-ares): Move to...
* gnu/packages/adns.scm (c-ares): ... here.
* gnu/packages/aria2.scm: Remove file.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove aria2.scm.
| Efraim Flashner | 2016-01-27 |
| | |_|_|_|_|/
|/| | | | | |
|
| * | | | | | | gnu: Add TopHat.•••* gnu/packages/bioinformatics.scm (tophat): New variable.
* gnu/packages/patches/tophat-build-with-later-seqan.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
| Ricardo Wurmus | 2016-01-23 |
| * | | | | | | gnu: Add NQC.•••* gnu/packages/lego.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
| Eric Bavier | 2016-01-20 |
| * | | | | | | gnu: linux-libre: Add fix for CVE-2016-0728.•••* gnu/packages/patches/linux-libre-CVE-2016-0728.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/linux.scm (linux-libre)[source]: Add patch.
| Mark H Weaver | 2016-01-20 |
| * | | | | | | gnu: arb: Update to 2.8.1.•••* gnu/packages/algebra.scm (arb)[source]: Update to 2.8.1. Add patch.
* gnu/packages/patches/arb-ldconfig.patch: New file.
* gnu-system.am (dist_patch_DATA): Register patch.
| Andreas Enge | 2016-01-20 |
| | |_|_|_|/
|/| | | | |
|
| * | | | | | gnu: Add radicale.•••* gnu/packages/dav.scm (radicale): New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
| Leo Famulari | 2016-01-15 |
| * | | | | | gnu: Add python-docker-py.•••* gnu/packages/docker.scm: New file.
* Makefile.am (GNU_SYSTEM_MODULES): Add it.
| David Thompson | 2016-01-14 |
| * | | | | | gnu: bowtie: Update to 2.2.6.•••* gnu/packages/bioinformatics.scm (bowtie): Update to 2.2.6.
[source]: Remove patch; do not set CC and CPP variables.
[inputs]: Add "tbb".
[arguments]: Pass "prefix" and "WITH_TBB" make flags; remove custom
"install" phase.
* gnu/packages/patches/bowtie-fix-makefile.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove patch file.
| Ricardo Wurmus | 2016-01-14 |
| | |_|_|/
|/| | | |
|
| * | | | | gnu: boost: Update to 1.60.0.•••* gnu/packages/boost.scm (boost): Update to 1.60.0.
[source]: Remove patch.
* gnu/packages/patches/boost-mips-avoid-m32.patch: Delete patch
* gnu-system.am (dist_patch_DATA): Remove patch.
Also fix dependent packages:
* gnu/packages/patches/csound-header-ordering.patch: New patch.
* gnu/packages/audio.scm (csound)[source]: Use it.
[arguments]: Add 'set-flags phase.
* gnu/packages/patches/libcmis-fix-test-onedrive.patch: New patch.
* gnu/packages/libreoffice.scm (libcmis)[source]: Use it.
(libreoffice)[arguments]: Add LDFLAGS to #:configure-flags.
(librevenge)[inputs]: Move boost from here...
[propogated-inputs]: to here.
[arguments]: Add LDFLAGS to #:configure-flags.
* gnu/packages/patches/openimageio-boost-1.60.patch: New patch.
* gnu/packages/graphics.scm (openimageio): Use it.
* gnu-system.am (dist_patch_DATA): Add patches.
| Eric Bavier | 2016-01-12 |
| * | | | | gnu: sudo: Add fix for CVE-2015-5602.•••* gnu/packages/patches/sudo-CVE-2015-5602.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/admin.scm (sudo)[source]: Add patch.
| Mark H Weaver | 2016-01-12 |
| * | | | | gnu: bedtools: Update to 2.25.0.•••* gnu/packages/bioinformatics.scm (bedtools): Update to 0.25.0.
[source]: Remove patch merged upstream.
[arguments]: Use 'modify-phases'. Remove
'patch-makefile-SHELL-definition' phase.
* gnu/packages/patches/bedtools-32bit-compilation.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.
| Ben Woodcroft | 2016-01-11 |
| * | | | | gnu: w3m: Enable SSL, disable broken protocols and ciphers.•••Fixes <http://bugs.gnu.org/16791>.
* gnu/packages/patches/w3m-force-ssl_verify_server-on.patch: New file.
* gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch: New file.
* gnu/packages/patches/w3m-disable-weak-ciphers.patch: New file.
* gnu/packages/w3m.scm (w3m)[source]: Add patches.
* gnu-system.am (dist_patch_DATA): Add the new files.
| Leo Famulari | 2016-01-07 |
| * | | | | gnu: w3m: Update patch to use '-p1'.•••* gnu/packages/patches/w3m-fix-compile.patch: Rename this file...
* gnu/packages/patches/w3m-libgc.patch: ...to this, and adjust patch
prefix level to '-p1'.
* gnu-system.am (dist_patch_DATA): Update patch name.
* gnu/packages/w3m.scm (w3m)[source]: Update patch name.
[source]: Drop patch flag -p0.
| Leo Famulari | 2016-01-07 |
| * | | | | gnu: Add LDC.•••* gnu/packages/ldc.scm: New file.
* gnu/packages/patches/ldc-disable-tests.patch: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add ldc.scm.
(dist_patch_DATA): Add patch file.
| Roel Janssen | 2016-01-05 |
| * | | | | gnu: gtk+: Add patch to support GUIX_GTK3_PATH.•••* gnu/packages/patches/gtk3-respect-GUIX_GTK3_PATH: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/gtk.scm (gtk+) [source]: Add patch.
[native-search-paths]: Add search path for GUIX_GTK3_PATH.
| Ricardo Wurmus | 2016-01-04 |
| * | | | | gnu: gtk+-2: Add patch to support GUIX_GTK2_PATH.•••* gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/gtk.scm (gtk+-2) [source]: Add patch.
[native-search-paths]: Add search path for GUIX_GTK2_PATH.
| Ricardo Wurmus | 2016-01-04 |
| * | | | | gnu: julia: Update to 0.4.2.•••* gnu/packages/patches/julia-0.3.10-fix-empty-array.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.
* gnu/packages/julia.scm (julia): Update to 0.4.2.
[arguments]: Remove phase "fix-building-with-mcjit-llvm"; replace phase
"patch-include-path" with "fix-include-and-link-paths"; add phase
"hardcode-paths"; add missing make-flags.
[inputs]: Replace "pcre" with "pcre2"; replace "git" with "libgit2"; add
"coreutils"; add "libuv-julia"; add "wget"; add "which".
[native-inputs]: Remove "which".
| Ricardo Wurmus | 2016-01-04 |
| * | | | | gnu: Add Asymptote.•••* gnu/packages/bdw-gc.scm (libgc-for-c++): New variable.
* gnu/packages/plotutils.scm (asymptote): New variable.
* gnu/packages/patches/asymptote-gsl2.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
| Eric Bavier | 2016-01-02 |
| | |_|/
|/| | |
|
| * | | | gnu: Move cursynth to (gnu packages music).•••* gnu/packages/cursynth.scm: Remove.
* gnu/packages/music.scm (cursynth): New variable, from cursynth.scm.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove cursynth.scm.
| Leo Famulari | 2015-12-30 |
| * | | | gnu: fuse: Update to 2.9.4.•••* gnu/packages/patches/fuse-CVE-2015-3202.patch: Delete file.
* gnu-system.am (dist_patch_DATA): Remove it.
* gnu/packages/linux.scm (fuse): Update to 2.9.4.
[source]: Remove patch.
| Leo Famulari | 2015-12-29 |
| * | | | gnu: icecat: Update to 38.5.0-gnu1.•••* gnu/packages/patches/icecat-CVE-2015-7201-pt1.patch,
gnu/packages/patches/icecat-CVE-2015-7201-pt2.patch,
gnu/packages/patches/icecat-CVE-2015-7201-pt3.patch,
gnu/packages/patches/icecat-CVE-2015-7205.patch,
gnu/packages/patches/icecat-CVE-2015-7210.patch,
gnu/packages/patches/icecat-CVE-2015-7212.patch,
gnu/packages/patches/icecat-CVE-2015-7213-pt1.patch,
gnu/packages/patches/icecat-CVE-2015-7213-pt2.patch,
gnu/packages/patches/icecat-CVE-2015-7214.patch,
gnu/packages/patches/icecat-CVE-2015-7222-pt1.patch,
gnu/packages/patches/icecat-CVE-2015-7222-pt2.patch,
gnu/packages/patches/icecat-CVE-2015-7222-pt3.patch,
gnu/packages/patches/icecat-freetype-2.6.patch: Delete files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/gnuzilla.scm (icecat): Update to 38.5.0-gnu1.
[source]: Remove patches.
| Mark H Weaver | 2015-12-23 |
| * | | | gnu: grub: Add fix for CVE-2015-8730.•••* gnu/packages/patches/grub-CVE-2015-8370.patch: New file.
* gnu-system.am (dist_patch_DATA): Register patch.
* gnu/packages/grub.scm: Apply patch.
| Leo Famulari | 2015-12-21 |
| * | | | gnu: Add dovecot service•••* gnu/services/mail.scm: New file.
(&dovecot-configuration-error, dovecot-configuration-error?)
(dovecot-service, dovecot-configuration, dict-configuration)
(passdb-configuration, userdb-configuration)
(unix-listener-configuration, fifo-listener-configuration)
(inet-listener-configuration, service-configuration)
(protocol-configuration, plugin-configuration, mailbox-configuration)
(namespace-configuration, opaque-dovecot-configuration): New public
variables.
* gnu-system.am (GNU_SYSTEM_MODULES): Add (gnu services mail).
* doc/guix.texi (Mail Services): New node.
| Andy Wingo | 2015-12-18 |
| * | | | gnu: icecat: Add fixes for several security flaws.•••* gnu/packages/patches/icecat-CVE-2015-7201-pt1.patch,
gnu/packages/patches/icecat-CVE-2015-7201-pt2.patch,
gnu/packages/patches/icecat-CVE-2015-7201-pt3.patch,
gnu/packages/patches/icecat-CVE-2015-7205.patch,
gnu/packages/patches/icecat-CVE-2015-7210.patch,
gnu/packages/patches/icecat-CVE-2015-7212.patch,
gnu/packages/patches/icecat-CVE-2015-7213-pt1.patch,
gnu/packages/patches/icecat-CVE-2015-7213-pt2.patch,
gnu/packages/patches/icecat-CVE-2015-7214.patch,
gnu/packages/patches/icecat-CVE-2015-7222-pt1.patch,
gnu/packages/patches/icecat-CVE-2015-7222-pt2.patch,
gnu/packages/patches/icecat-CVE-2015-7222-pt3.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/gnuzilla.scm (icecat)[source]: Add patches.
| Mark H Weaver | 2015-12-17 |
| * | | | gnu: python-ipython: Patch 'ctypes' bug.•••* gnu/packages/patches/python-ipython-inputhook-ctype.patch: New patch.
* gnu/packages/python.scm (python-ipython): Use it.
* gnu-system.am (dist_patch_DATA): Add it.
| Federico Beffa | 2015-12-15 |
| * | | | gnu: bluez: Update to 5.36.•••* gnu/packages/linux.scm (bluez): Update to 5.36.
[source]: Remove patch.
* gnu/packages/patches/bluez-tests.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.
| Efraim Flashner | 2015-12-14 |
| | |/
|/| |
|
| * | | gnu: Move sparsehash to datastructures module.•••* gnu/packages/crypto.scm (sparsehash): Move variable to...
* gnu/packages/datastructures.scm: ...new file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
| Ricardo Wurmus | 2015-12-11 |
| * | | gnu: libxml2: Update to 2.9.3.•••* gnu/packages/patches/libxml2-CVE-2015-1819.patch,
gnu/packages/patches/libxml2-CVE-2015-7941-pt1.patch,
gnu/packages/patches/libxml2-CVE-2015-7941-pt2.patch,
gnu/packages/patches/libxml2-CVE-2015-7942-pt1.patch,
gnu/packages/patches/libxml2-CVE-2015-7942-pt2.patch,
gnu/packages/patches/libxml2-CVE-2015-8035.patch,
gnu/packages/patches/libxml2-bug-737840.patch,
gnu/packages/patches/libxml2-bug-738805.patch,
gnu/packages/patches/libxml2-bug-746048.patch,
gnu/packages/patches/libxml2-bug-747437.patch,
gnu/packages/patches/libxml2-bug-751603.patch,
gnu/packages/patches/libxml2-bug-751631.patch,
gnu/packages/patches/libxml2-bug-754946.patch,
gnu/packages/patches/libxml2-bug-754947.patch,
gnu/packages/patches/libxml2-bug-755857.patch,
gnu/packages/patches/libxml2-fix-catalog-corruption.patch,
gnu/packages/patches/libxml2-id-attrs-in-xmlSetTreeDoc.patch,
gnu/packages/patches/libxml2-node-sort-order-pt1.patch,
gnu/packages/patches/libxml2-node-sort-order-pt2.patch: Delete files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/xml.scm (libxml2): Update to 2.9.3. Remove patches.
| Mark H Weaver | 2015-12-07 |
| * | | gnu: Add python-configobj.•••* gnu/packages/python.scm (python-configobj, python2-configobj): New
variables.
* gnu/packages/patches/python-configobj-setuptools.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
| Leo Famulari | 2015-12-05 |
| * | | gnu: icecat: Update to 38.4.0-gnu1.•••* gnu/packages/patches/icecat-CVE-2015-4513-pt01.patch,
gnu/packages/patches/icecat-CVE-2015-4513-pt02.patch,
gnu/packages/patches/icecat-CVE-2015-4513-pt03.patch,
gnu/packages/patches/icecat-CVE-2015-4513-pt04.patch,
gnu/packages/patches/icecat-CVE-2015-4513-pt05.patch,
gnu/packages/patches/icecat-CVE-2015-4513-pt06.patch,
gnu/packages/patches/icecat-CVE-2015-4513-pt07.patch,
gnu/packages/patches/icecat-CVE-2015-4513-pt08.patch,
gnu/packages/patches/icecat-CVE-2015-4513-pt09.patch,
gnu/packages/patches/icecat-CVE-2015-4513-pt10.patch,
gnu/packages/patches/icecat-CVE-2015-4513-pt11.patch,
gnu/packages/patches/icecat-CVE-2015-7188.patch,
gnu/packages/patches/icecat-CVE-2015-7189.patch,
gnu/packages/patches/icecat-CVE-2015-7193.patch,
gnu/packages/patches/icecat-CVE-2015-7194.patch,
gnu/packages/patches/icecat-CVE-2015-7196.patch,
gnu/packages/patches/icecat-CVE-2015-7197.patch,
gnu/packages/patches/icecat-CVE-2015-7198.patch,
gnu/packages/patches/icecat-CVE-2015-7199.patch: Delete files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/gnuzilla.scm (icecat): Update to 38.4.0-gnu1. Remove the
obsolete patches.
| Mark H Weaver | 2015-12-04 |
| * | | gnu: python-matplotlib: Add 'TkAgg' backend and update to version '1.4.3'.•••* gnu/packages/python.scm (python-matplotlib, python2-matplotlib): Do it.
* gnu/packages/patches/matplotlib-setupext-tk.patch: New file.
* gnu-system.am (dist_patch_DATA): Add the new patch.
| Federico Beffa | 2015-12-02 |
| * | | gnu: Add cereal.•••* gnu/packages/serialization.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
| Ricardo Wurmus | 2015-11-30 |
| * | | gnu: python: Make 'sys.version' deterministic.•••* gnu/packages/patches/python-2-deterministic-build-info.patch,
gnu/packages/patches/python-3-deterministic-build-info.patch: New
files.
* gnu/packages/python.scm (python-2, python): Use them.
* gnu-system.am (dist_patch_DATA): Add them.
| Ludovic Courtès | 2015-11-29 |
| * | | gnu: python-2: Honor 'SOURCE_DATE_EPOCH'.•••* gnu/packages/patches/python-2.7-source-date-epoch.patch: New file.
* gnu/packages/python.scm (python-2)[source]: Use it.
[arguments]: Set SOURCE_DATE_EPOCH in 'patch-lib-shells' phase.
* guix/build/python-build-system.scm (set-SOURCE-DATE-EPOCH): New
procedure.
(%standard-phases): Add it.
* gnu-system.am (dist_patch_DATA): Add patch.
| Ludovic Courtès | 2015-11-29 |
| * | | gnu: tcl: Produce 'tclIndex' files deterministically.•••* gnu/packages/patches/tcl-mkindex-deterministic.patch: New patch.
* gnu/packages/tcl.scm (tcl)[source]: Use it.
* gnu-system.am (dist_patch_DATA): Add it.
| Ludovic Courtès | 2015-11-29 |
| * | | tk: Hardcode path to TK_LIBRARY.•••Fixes <http://bugs.gnu.org/20889>.
* gnu/packages/patches/tk-find-library.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/tcl.scm (tk)[source]: Add patch.
| 宋文武 | 2015-11-29 |
| * | | gnu: weechat: Dynamically link against libpython2.7.so.•••* gnu/packages/patches/weechat-python.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/weechat.scm (weechat)[source]: Use it.
| Ludovic Courtès | 2015-11-29 |
| * | | gnu: jasper: Patch CVE-2008-3522.•••* gnu/packages/patches/jasper-CVE-2008-3522.patch: New file.
* gnu/packages/image.scm (jasper)[source]: Use it.
* gnu-system.am (dist_patch_DATA): Add it.
| Ludovic Courtès | 2015-11-28 |