~ruther/guix-local: d0f0de4bf69da33037d2c9316edd7a58fa8afa96

d0f0de4b — Maxim Cournoyer 3 years ago

Merge branch 'staging' into core-updates

990a4822 — Maxim Cournoyer 3 years ago

Merge branch 'staging' into core-updates

Conflicts resolved in:
	gnu/local.mk
	gnu/packages/cran.scm
	gnu/packages/gnome.scm
	gnu/packages/gtk.scm
	gnu/packages/icu4c.scm
	gnu/packages/java.scm
	gnu/packages/machine-learning.scm
	gnu/packages/tex.scm

5dc5d6fa — Maxim Cournoyer 3 years ago

Merge branch 'master' into staging

16f53571 — Maxim Cournoyer 3 years ago

Re-instate "gnu: samba: Fix corrupted man pages."

This reverts commit 968ec0a87, which was itself a revert of 62048ff9fc.

2e5d79ac — Maxim Cournoyer 3 years ago

gnu: samba/fixed: Do not inherit native-inputs.

* gnu/packages/samba.scm (samba/fixed): Add a FIXME comment.
[native-inputs]: Copy the complete native inputs from samba, to protect against
unintended changes in the inherited package.

968ec0a8 — Maxim Cournoyer 3 years ago

Revert "gnu: samba: Fix corrupted man pages."

This reverts commit 62048ff9fcfbe3fc790a7207fc5f6f3e0476a02a.  This caused a
half world rebuild (9K packages).

3c6e220d — Maxim Cournoyer 3 years ago

Merge branch 'master' into staging.

With resolved conflicts in:
	gnu/local.mk
	gnu/packages/crates-io.scm

62048ff9 — Maxim Cournoyer 3 years ago

gnu: samba: Fix corrupted man pages.

* gnu/packages/samba.scm (samba) [native-inputs]: Replace docbook-xsl with
docbook-xsl-next.

0ab4996b — Maxim Cournoyer 3 years ago

gnu: Add docbook-xsl-next.

* gnu/packages/docbook.scm (docbook-xsl-next): New variable.

459e0f9b — Nicolas Goaziou 3 years ago

gnu: emacs-plz: Update to 0.2.1.

* gnu/packages/emacs-xyz.scm (emacs-plz): Update to 0.2.1.

8b4e7892 — Nicolas Goaziou 3 years ago

gnu: emacs-tuareg: Improve package style.

* gnu/packages/ocaml.scm (emacs-tuareg)[arguments]<#:imported-modules,
<#:phases>: Use G-expressions.  Remove trailing #T at the end of phases.  Use
ELPA-DIRECTORY function.
[native-inputs]: Remove input labels.

32135b03 — Nicolas Goaziou 3 years ago

gnu: emacs-tuareg: Update to 3.0.0.

* gnu/packages/ocaml.scm (emacs-tuareg): Update to 3.0.0.

6e4f9e29 — Nicolas Goaziou 3 years ago

gnu: emacs-pyim: Update to 5.2.5.

* gnu/packages/emacs-xyz.scm (emacs-pyim): Update to 5.2.5.

052c1b06 — Maxim Cournoyer 3 years ago

gnu: colord: Update to 1.4.6.

* gnu/packages/gnome.scm (colord): Update to 1.4.6.
[source]: Override inherited field.
[configure-flags]: Use gexps.
[phases]: Likewise.
[native-inputs]: Remove labels.

1fe766fb — Maxim Cournoyer 3 years ago

gnu: docbook-xsl-ns: Rename to docbook-xsl-1.79.1 and use gexps.

* gnu/packages/docbook.scm (docbook-xsl-ns): Rename to...
(docbook-xsl-1.79.1): ... this.
[source]: Adjust URL and add a comment.
[arguments]: Use gexps and adjust phases accordingly.
* gnu/packages/gnome.scm (colord)[native-inputs]: Replace docbook-xsl-ns with
docbook-xsl-1.79.1.

fb6173b7 — Maxim Cournoyer 3 years ago

gnu: openjdk: Update to 18.

* gnu/packages/java.scm (openjdk): Update to 18.
(openjdk18): New variable.

b2aa4243 — Maxim Cournoyer 3 years ago

gnu: openjdk17: Define with make-openjdk.

* gnu/packages/java.scm (openjdk17): Define with make-openjdk.
[phases]: Use gexps.

c5fb7bb7 — Maxim Cournoyer 3 years ago

gnu: openjdk16: Define with make-openjdk.

* gnu/packages/java.scm (openjdk16): Define with make-openjdk.

216a7d81 — Maxim Cournoyer 3 years ago

gnu: openjdk15: Define with make-openjdk.

* gnu/packages/java.scm (openjdk15): Define with make-openjdk.
[source]: Clear snippet and modules fields.
[native-inputs]: Rewrite using modify-inputs.

068dfa33 — Maxim Cournoyer 3 years ago

gnu: openjdk14: Define with make-openjdk.

* gnu/packages/java.scm (openjdk14): Define with make-openjdk.
[source]: Remove trailing #t from snippet field and improve regexp.