guix-patches - Patches for guix

	Commit message (Collapse)	Author	Age
...
* \| \| \| \| \| \| \|	gnu: imagemagick: Upgrade to 6.8.8-8.	Ludovic Courtès	2014-03-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/imagemagick.scm (imagemagick): Upgrade to 6.8.8-8.
* \| \| \| \| \| \| \|	gnu: Add Window Maker.	Ludovic Courtès	2014-03-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/gnustep.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* \| \| \| \| \| \| \|	tests: Test recovery from 'valid-path?' RPCs with an invalid parameter.	Ludovic Courtès	2014-03-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* tests/store.scm ("valid-path? live", "valid-path? false", "valid-path? error", "valid-path? recovery"): New tests.
* \| \| \| \| \| \| \|	Update 'nix-upstream' sub-module.	Ludovic Courtès	2014-03-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* nix-upstream: Update.
* \| \| \| \| \| \| \|	gnu: libxft: Propagate Freetype and Fontconfig.	Ludovic Courtès	2014-03-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xorg.scm (libxft): Move Freetype and Fontconfig from 'inputs' to 'propagated-inputs'.
* \| \| \| \| \| \| \|	guix archive: Generate curve Ed25519 keys by default.	Ludovic Courtès	2014-03-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/archive.scm (%options) <generate-key>: Default to curve Ed25519. Suggested by Christian Grothoff <grothoff@in.tum.de>.
* \| \| \| \| \| \| \|	guix archive: Improve '--generate-key' error reporting.	Ludovic Courtès	2014-03-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/archive.scm (%options) <generate-key>: Report the error source and string when 'string->canonical-sexp' fails.
* \| \| \| \| \| \| \|	build: Fix test failures due to the nix -> guix directory name change.	Ludovic Courtès	2014-03-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reported by Nikita Karetnikov <nikita@karetnikov.org> and Pierre-Antoine Rault <par@rigelk.eu>. * test-env.in: Change 'NIX_LOG_DIR' in accordance with f5768af. * tests/guix-register.sh: Likewise for 'NIX_LOG_DIR' and 'NIX_DB_DIR'.
* \| \| \| \| \| \| \|	gnu: luajit: Update to 2.0.3.	Raimon Grau	2014-03-17
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/lua.scm (luajit): Update to 2.0.3.
* \| \| \| \| \| \|	gnu: python: Change URL to https.	Ludovic Courtès	2014-03-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/python.scm (python-2, python)[source]: Change URL to https. This makes sure GnuTLS is available in the derivation that downloads the source, which is required since http URLs get redirected to https anyway. Reported by Manolis Ragkousis <manolis837@gmail.com>.
* \| \| \| \| \| \|	gnu: pulseaudio: Upgrade to 5.0.	Ludovic Courtès	2014-03-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/pulseaudio.scm (pulseaudio): Upgrade to 5.0. Remove patches. * gnu/packages/patches/pulseaudio-test-timeouts.patch, gnu/packages/patches/pulseaudio-volume-test.patch: Remove. * gnu-system.am (dist_patch_DATA): Adjust accordingly.
* \| \| \| \| \| \|	gnu: fuse: Refer to the right 'mount' and 'umount' commands.	Ludovic Courtès	2014-03-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/linux.scm (fuse)[inputs]: Change to... [native-inputs]: ... this. [arguments]: Add #:phases argument.
* \| \| \| \| \| \|	store: Add 'hash-part->path'.	Ludovic Courtès	2014-03-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/store.scm (hash-part->path): New procedure. * tests/store.scm ("hash-part->path"): New test.
* \| \| \| \| \| \|	offload: Fix 'choose-build-machine' for several machines.	Ludovic Courtès	2014-03-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/offload.scm (choose-build-machine)[undecorate]: Turn into a two-argument procedure.
* \| \| \| \| \| \|	offload: Convert the port number to a string when invoking lsh.	Ludovic Courtès	2014-03-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/offload.scm (remote-pipe, send-files): Pass the result of 'build-machine-port' to 'number->string'.
* \| \| \| \| \| \|	offload: Allow build machines to specify a port number.	Ludovic Courtès	2014-03-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/offload.scm (<build-machine>): Add 'port' field. (remote-pipe, send-files): Use lsh's '-p' option when invoking it.
* \| \| \| \| \| \|	guix build: Support '--with-source' along with '-e'.	Ludovic Courtès	2014-03-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/build.scm (derivation-from-expression): Remove. (options->derivations): Handle pairs of the form "('argument . (? derivation?))". (options/resolve-packages): Add 'store' parameter; update caller. Add 'system' variable. Add case for 'expression pairs. * guix/scripts/archive.scm (derivation-from-expression): New procedure.
* \| \| \| \| \| \|	gnu: guile-xcb: Upgrade to 1.3.	Ludovic Courtès	2014-03-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/guile-wm.scm (guile-xcb): Upgrade to 1.3. [arguments] Pass --with-guile-site-dir= instead of --datadir=, and pass --with-guile-site-ccache-dir=. Remove #:phases.
* \| \| \| \| \| \|	gnu: linux-libre: Build the FUSE module.	Ludovic Courtès	2014-03-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/linux.scm (linux-libre): Set CONFIG_FUSE_FS=m.
* \| \| \| \| \| \|	gnu: unionfs-fuse: Add statically-linked variant.	Ludovic Courtès	2014-03-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/linux.scm (unionfs-fuse/static): New variable.
* \| \| \| \| \| \|	guix build: Add '--with-source'.	Ludovic Courtès	2014-03-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/build.scm (package-with-source): New procedure. (show-help): Add '--with-source'. (%options): Likewise. (options->derivations): Call 'options/with-source' and 'options/resolve-packages'. (options/resolve-packages, options/with-source): New procedures. * doc/guix.texi (Invoking guix build): Document '--with-source'.
* \| \| \| \| \| \|	download: 'download-to-store' accepts plain file names.	Ludovic Courtès	2014-03-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/download.scm (download-to-store): When URI is #f, assume that URL is a file name, and handle it.
* \| \| \| \| \| \|	More /gnu/store replacements.	Ludovic Courtès	2014-03-10
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/gcc.scm (gcc-4.7): Change /nix/store in comment. * gnu/system/vm.scm (operating-system-default-contents): Use (%store-prefix) instead of "/nix/store". * guix/derivations.scm (derivation-path->output-path, derivation-path->output-paths): Change to /gnu/store in docstring.
* \| \| \| \| \|	gnu: linux-initrd: Make the pseudo-tty device nodes.	Ludovic Courtès	2014-03-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/build/linux-initrd.scm (make-essential-device-nodes): Create /dev/ptmx and /dev/pts. * gnu/system/vm.scm (qemu-image): Umount /fs/dev/pts before /fs.
* \| \| \| \| \|	tests: 'topologically-sorted' test handles different references orders.	Ludovic Courtès	2014-03-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* tests/store.scm ("topologically-sorted, more difficult"): Arrange to handle a different ordering of (references %store y).
* \| \| \| \| \|	gnu: Add UnionFS-FUSE.	Ludovic Courtès	2014-03-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/linux.scm (unionfs-fuse): New variable.
* \| \| \| \| \|	doc: Update packaging guidelines.	Pierre-Antoine Rault	2014-03-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* HACKING (Submitting Patches): Mention 'git send-mail'. * doc/guix.texi (Packaging Guidelines): More details on how to prepare a package module. (Contributing): Add reference to #guix channel on Freenode. Co-authored-by: Ludovic Courtès <ludo@gnu.org>
* \| \| \| \| \|	gnu: pretty-print: Fix boost reference	Eric Bavier	2014-03-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/pretty-print.scm (source-highlight): Change "boost-1.54" input to "boost"
* \| \| \| \| \|	offload: Honor absolute build timeouts.	Ludovic Courtès	2014-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/offload.scm (offload): Remove default value for 'build-timeout'. Pass '--timeout' to the remote 'guix build' process. (transfer-and-offload, process-request): Remove default value for 'build-timeout'.
* \| \| \| \| \|	guix build: Add '--timeout' to the common build options.	Ludovic Courtès	2014-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/build.scm (show-build-options-help): Document '--timeout'. (set-build-options-from-command-line): Pass #:timeout to 'set-build-options'. (%standard-build-options): Add '--timeout'. * doc/guix.texi (Invoking guix build): Document it.
* \| \| \| \| \|	store: Add #:timeout build option.	Ludovic Courtès	2014-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/serialization.scm (write-string-pairs): New procedure. * guix/store.scm (write-arg): Add 'string-pairs' case. (set-build-options): Add 'timeout' keyword parameter. Honor it. * tests/derivations.scm ("build-expression->derivation and timeout"): New test.
* \| \| \| \| \|	gnu: Add libpcap and jnettop.	Ludovic Courtès	2014-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/admin.scm (libpcap, jnettop): New variables.
* \| \| \| \| \|	build: Change state and log directories to $localstatedir/.../guix.	Ludovic Courtès	2014-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* daemon.am (libstore_a_CPPFLAGS): Change /nix to /guix. * guix/config.scm.in (%state-directory): Likewise. * guix/store.scm (log-file): Likewise.
* \| \| \| \| \|	Change the default store file name to /gnu/store.	Ludovic Courtès	2014-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* configure.ac: Change the default 'storedir' to /gnu/store. Print $storedir. * doc/guix.texi: Replace "/nix/store" by "/gnu/store", except where describing Nix compatibility. * Makefile.am: Likewise.
* \| \| \| \| \|	offload: Move macro definitions before use.	Ludovic Courtès	2014-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/offload.scm (lock-file, unlock-file, with-file-lock, with-machine-lock, machine-slot-file, acquire-build-slot, release-build-slot): Move definitions above their first use.
* \| \| \| \| \|	gnu: soprano: Add input raptor2.	Andreas Enge	2014-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/rdf.scm (soprano): Add input raptor2.
* \| \| \| \| \|	offload: Distinguish between 'decline' and 'postpone'.	Ludovic Courtès	2014-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/offload.scm (transfer-and-offload): New procedure, with core formerly in 'process-request'. (choose-build-machine): Remove 'requirements' parameter. (process-request): Reply 'decline' when none of MACHINES matches the requirements, and 'postpone' when MACHINES are busy.
* \| \| \| \| \|	gnu: raptor2: Disable parallel tests.	Andreas Enge	2014-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/rdf.scm (raptor2): Disable parallel tests since it makes tests fail.
* \| \| \| \| \|	offload: Prevent locked files from being GC'd.	Ludovic Courtès	2014-03-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/offload.scm (%slots): New variable. (choose-build-machine): Add SLOT to '%slots'.
* \| \| \| \| \|	offload: Fix thinko.	Ludovic Courtès	2014-03-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/offload.scm (choose-build-machine)[machine+slots]: Use 'filter-map', not 'filter'.
* \| \| \| \| \|	offload: Make 'parallel-builds' a hard limit.	Ludovic Courtès	2014-03-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/offload.scm (machine-choice-lock-file, machine-slot-file, acquire-build-slot, release-build-slot): New procedures. (choose-build-machine): Operate with (machine-choice-lock-file) taken. Acquire a build slot for each of MACHINES. Release those not used.
* \| \| \| \| \|	offload: Further generalize lock files.	Ludovic Courtès	2014-03-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/offload.scm (lock-machine, unlock-machine): Remove. (lock-file, unlock-file): New procedures. (with-file-lock): New macro. (with-machine-lock): Rewrite in terms of 'with-file-lock'.
* \| \| \| \| \|	offload: Generalize the machine lock mechanism.	Ludovic Courtès	2014-03-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/offload.scm (lock-machine): Add 'hint' parameter. (unlock-machine): Remove 'machine' parameter. (with-machine-lock): Add 'hint' parameter, and pass it down. (process-request): Adjust uses of 'with-machine-lock' to pass the 'bandwidth hint.
* \| \| \| \| \|	utils: Add a non-blocking option for 'fcntl-flock'.	Ludovic Courtès	2014-03-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/utils.scm (F_SETLK): New variable. (fcntl-flock): Add 'wait?' keyword parameter; honor it. * tests/utils.scm ("fcntl-flock non-blocking"): New test.
* \| \| \| \| \|	doc: Explain what's special about the (gnu packages ...) name space.	Ludovic Courtès	2014-03-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* doc/guix.texi (Invoking guix package): Explain where packages are searched for and link to "Package Modules". (Defining Packages) <example>: Use 'define-module' clause instead of 'use-modules'. Explain why and link to "Package Modules". (Invoking guix build): Explain where packages aer searched for and link to "Package Modules". (Package Modules): Explain that (gnu packages ...) is scanned.
* \| \| \| \| \|	gnu: Add a2ps, trueprint, enscript, and source-highlight	Eric Bavier	2014-03-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/pretty-print.scm: New file * gnu/packages/patches/source-highlight-regexrange-test.patch: New file * gnu-system.am (dist_patch_DATA): Add patch. (GNU_SYSTEM_MODULES): Add pretty-print.scm
* \| \| \| \| \|	store: 'export-paths' doesn't export references of the given files.	Ludovic Courtès	2014-03-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a regression introduced in 99fbddf9a623757e39d88bfb431f8f7d6f24b75b ("store: Change 'export-paths' to always export in topological order.") * guix/store.scm (export-paths): Define 'ordered' variable. Iterate over it. * tests/store.scm ("export/import paths, ensure topological order"): Add 'file0'. Adjust accordingly.
* \| \| \| \| \|	gnu: Add ncmpc.	David Thompson	2014-03-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/mpd.scm (ncmpc): New variable.
* \| \| \| \| \|	utils: 'fcntl-flock' passes an errno when throwing an exception.	Ludovic Courtès	2014-03-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/utils.scm (%libc-errno-pointer, errno): New procedures. (fcntl-flock): Use it as the exception's argument.
* \| \| \| \| \|	offload: Serialize file transfers to build machines.	Ludovic Courtès	2014-03-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* guix/scripts/offload.scm (machine-lock-file, lock-machine, unlock-machine): New procedures. (with-machine-lock): New macro. (process-request): Wrap 'send-files' and 'retrieve-files' calls in 'with-machine-lock'.