* gnu/packages/guile.scm (guile-bash): New variable.

* guix/grafts.scm (with-cache): New macro.
(cumulative-grafts)[return/cache]: Remove.
Use 'with-cache' instead.

* gnu/packages/ocaml.scm (ocaml-zarith): New variable.

Signed-off-by: David Craven <david@craven.ch>

* gnu/packages/ocaml.scm (ocamlmod): New variable.

Signed-off-by: David Craven <david@craven.ch>

* gnu/packages/ocaml.scm (camlzip): New variable.

Signed-off-by: David Craven <david@craven.ch>

* gnu/packages/ocaml.scm (ocaml-ounit): New variable.

Signed-off-by: David Craven <david@craven.ch>

* gnu/packages/ocaml.scm (camlp4)[arguments]: Install in OCAMLPATH and
  META file.
  (ocaml-findlib)[arguments]: Delete camlp4 META file.

Signed-off-by: David Craven <david@craven.ch>

* gnu/packages/ocaml.scm (ocaml-forge-origin): New procedure.
  (lablgtk)[origin]: Use it.

Signed-off-by: David Craven <david@craven.ch>

* guix/build/ocaml-build-system.scm: New file.
* guix/build-system/ocaml.scm: New file.
* Makefile.am (MODULES): Add them.
* gnu/packages/ocaml.scm (ocaml)[native-search-paths]: Adjuste OCAMLPATH.

Signed-off-by: David Craven <david@craven.ch>

* gnu/packages/ocaml.scm (camlp4)[arguments]: Disable parallel-build.
  Change default target to "all" to compile native and byte version.

Signed-off-by: David Craven <david@craven.ch>

* gnu/packages/ocaml.scm (ocaml): Fix indentation.

* gnu/packages/ocaml.scm (ocaml)[native-search-paths]: Add
  CAML_LD_LIBRARY_PATH.

Signed-off-by: David Craven <david@craven.ch>

* gnu/packages/ocaml.scm (ocaml)[origin]: Add patch.
* gnu/packages/patches/ocaml-Add-a-.file-directive.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add patch.

Signed-off-by: David Craven <david@craven.ch>

* gnu/packages/ocaml.scm: Reorder imports alphabetically.

* gnu/packages/ocaml.scm (ocaml, opam, camlp4, camlp5, hevea, coq,
  proof-general, ocaml-menhir, lablgtk, unison, ocaml-findlib)[license]:
  Add prefix.

* gnu/packages/idris.scm (idris-lens): New variable.

* gnu/packages/idris.scm (idris-bifunctors): New variable.

* gnu/packages/idris.scm (idris-wl-pprint): New variable.

* gnu/packages/idris.scm (idris-lightyear, idris-default-arguments):
  New variables.

* gnu/packages/haskell.scm: Move 'idris' to...
* gnu/packages/idris.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add idris.scm.

* gnu/packages/haskell.scm (idris): Update to 0.99.

* gnu/packages/haskell.scm: Order module imports alphabetically.

* guix/git-download.scm (git-version, git-file-name): New variables.

* doc/guix.texi (Package Transformation Options): Change wording for
"--with-graft" documentation.

* gnu/packages/haskell.scm (ghc-language-c): Fix up indentation and
description.

* gnu/packages/rust.scm (cargo-bootstrap): Make private.
* guix/build-system/cargo.scm (default-cargo): Use cargo.

* gnu/packages/rust.scm (cargo): New variable.

* gnu/packages/haskell.scm (ghc-language-c): New variable.

This fixes CVE-2012-{4409,4527}.

This is a followup to commit fd146187.

* gnu/packages/patches/mcrypt-CVE-2012-4409.patch,
gnu/packages/patches/mcrypt-CVE-2012-4527.patch: Apply the patches to the mcrypt
source code.

* gnu/packages/ebook.scm (calibre): Update to 2.76.0.

Signed-off-by: Leo Famulari <leo@famulari.name>

* gnu/packages/image-viewers.scm (feh): Update to 2.18.

Signed-off-by: Leo Famulari <leo@famulari.name>

* gnu/packages/audio.scm (bs1770gain): Update to 0.4.12.

Signed-off-by: Leo Famulari <leo@famulari.name>

* gnu/packages/suckless.scm (dwm): Update to 6.1.
[inputs]: Add libxft and freetype.
[arguments]: Set FREETYPEINC in #:make-flags.

Signed-off-by: Leo Famulari <leo@famulari.name>

* gnu/packages/suckless.scm (dmenu): Update to 4.6.
[inputs]: Add libxft and freetype.
[arguments]: Set FREETYPEINC in #:make-flags.

Signed-off-by: Leo Famulari <leo@famulari.name>

* gnu/packages/suckless.scm (slock): Update to 1.4.
[source] Remove CVE-2016-6866 patch (no longer needed).
* gnu/packages/patches/slock-CVE-2016-6866.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.

Signed-off-by: Leo Famulari <leo@famulari.name>

* gnu/packages/shellutils.scm (trash-cli): Update to 0.17.1.1.

Signed-off-by: Leo Famulari <leo@famulari.name>

* gnu/packages/backup.scm (wimlib): New variable.

* gnu/packages/parallel.scm (parallel): Update to 20161222.

* gnu/packages/code.scm (global): Update to 6.5.6.

* gnu/packages/nano.scm (nano): Update to 2.7.3.