02/06: gnu: perl-xml-xpath: Update to 1.44.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit fc82538c15392759955e0f1a2dedecf454a86860
Author: Tobias Geerinckx-Rice 
Date:   Sun Oct 28 00:03:41 2018 +0200

gnu: perl-xml-xpath: Update to 1.44.

* gnu/packages/xml.scm (perl-xml-xpath): Update to 1.44.
---
 gnu/packages/xml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 9aa2800..c1f14d7 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -809,14 +809,14 @@ RSS 0.91, RSS 1.0, RSS 2.0, Atom")
 (define-public perl-xml-xpath
   (package
 (name "perl-xml-xpath")
-(version "1.42")
+(version "1.44")
 (source (origin
   (method url-fetch)
   (uri (string-append "mirror://cpan/authors/id/M/MA/MANWAR/"
   "XML-XPath-" version ".tar.gz"))
   (sha256
(base32
-"04mm91kxav598ax7nlg81dhnvanwvg6bkf30l0cgkmga5iyccsly"
+"03yxj7w5a43ibbpiqsvb3lswj2b71dydsx4rs2fw0p8n0l3i3j8w"
 (build-system perl-build-system)
 (native-inputs
  `(("perl-path-tiny" ,perl-path-tiny)))

01/06: gnu: flatbuffers: Fix typo in description.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit a8b12397a1155d9e2cb278ffbfe66d042573d129
Author: Tobias Geerinckx-Rice 
Date:   Fri Oct 26 16:11:21 2018 +0200

gnu: flatbuffers: Fix typo in description.

* gnu/packages/serialization.scm (flatbuffers)[description]: Hyphenate.
---
 gnu/packages/serialization.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index b34ea30..40b3d1b 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -455,7 +455,7 @@ to generate and parse.  The two primary functions are 
@code{cbor.loads} and
 (assoc-ref %outputs "out") "/lib"
 (home-page "https://google.github.io/flatbuffers/;)
 (synopsis "Memory-efficient serialization library")
-(description "FlatBuffers is a cross platform serialization library for 
C++,
+(description "FlatBuffers is a cross-platform serialization library for 
C++,
 C#, C, Go, Java, JavaScript, PHP, and Python.  It was originally created for
 game development and other performance-critical applications.")
 (license license:asl2.0)))

branch master updated (f3dd10d -> 2b9b4b1)

[Tobias Geerinckx-Rice]

nckx pushed a change to branch master
in repository guix.

  from  f3dd10d   gnu: libmspack: Update to 0.8 [fixes 
CVE-2018-{18584,18585,18586}].
   new  a8b1239   gnu: flatbuffers: Fix typo in description.
   new  fc82538   gnu: perl-xml-xpath: Update to 1.44.
   new  6135735   gnu: perl-www-mechanize: Update to 1.89.
   new  31b6195   gnu: fzy: Don't use unstable tarball.
   new  2792d8a   gnu: fzy: Update to 1.0.
   new  2b9b4b1   gnu: hashcat-utils: Update to 1.9.

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/password-utils.scm | 26 +++---
 gnu/packages/serialization.scm  |  2 +-
 gnu/packages/shellutils.scm | 14 --
 gnu/packages/web.scm|  4 ++--
 gnu/packages/xml.scm|  4 ++--
 5 files changed, 28 insertions(+), 22 deletions(-)

06/06: gnu: hashcat-utils: Update to 1.9.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit 2b9b4b1fe368fb1745c4150adbb8754948326c95
Author: Tobias Geerinckx-Rice 
Date:   Sun Oct 28 02:35:09 2018 +0200

gnu: hashcat-utils: Update to 1.9.

And trim lines to 80 characters.

* gnu/packages/password-utils.scm (hashcat-utils): Update to 1.9.
[source]: Parametrise.
---
 gnu/packages/password-utils.scm | 26 +++---
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index e09bbea..357ef86 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -735,15 +735,15 @@ password cracking.")
 (define-public hashcat-utils
   (package
 (name "hashcat-utils")
-(version "1.8")
+(version "1.9")
 (source
  (origin
(method url-fetch)
-   (uri (string-append 
"https://github.com/hashcat/hashcat-utils/releases/download/v;
-   version "/hashcat-utils-1.8.7z"))
+   (uri (string-append "https://github.com/hashcat/hashcat-utils/releases/;
+   "download/v" version "/"
+   "hashcat-utils-" version ".7z"))
(sha256
-(base32
- "1x80rngjz7gkhwplhw1iqr0wzb6hjkrjfld2kz9kmgp5dr9nys1p"
+(base32 "0kq555kb338691qd7zjmi8vhq4km3apnsl2w63zh0igwzcjx6lx1"
 (native-inputs
  `(("p7zip" ,p7zip)))
 (inputs
@@ -767,12 +767,16 @@ password cracking.")
(lambda* (#:key outputs #:allow-other-keys)
  (let ((out (string-append (assoc-ref outputs "out") "/bin")))
(mkdir-p out)
-   (for-each (lambda (file)
-   (copy-file file (string-append out "/" (basename 
file ".bin"
- (find-files "." "\\.bin$"))
-   (for-each (lambda (file)
-   (copy-file file (string-append out "/" (basename 
file ".pl"
- (find-files "../bin" "\\.pl$"))
+   (for-each
+(lambda (file)
+  (copy-file file (string-append out "/"
+ (basename file ".bin"
+(find-files "." "\\.bin$"))
+   (for-each
+(lambda (file)
+  (copy-file file (string-append out "/"
+ (basename file ".pl"
+(find-files "../bin" "\\.pl$"))
#t))
 (home-page "https://github.com/hashcat/hashcat-utils/;)
 (synopsis "Small utilities that are useful in advanced password cracking")

03/06: gnu: perl-www-mechanize: Update to 1.89.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit 6135735b52c7f328cdc1fe22ca5c288ef8f96165
Author: Tobias Geerinckx-Rice 
Date:   Sun Oct 28 00:46:05 2018 +0200

gnu: perl-www-mechanize: Update to 1.89.

* gnu/packages/web.scm (perl-www-mechanize): Update to 1.89.
---
 gnu/packages/web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index c3b06b0..29d03f6 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3697,7 +3697,7 @@ library.")
 (define-public perl-www-mechanize
   (package
 (name "perl-www-mechanize")
-(version "1.88")
+(version "1.89")
 (source
  (origin
(method url-fetch)
@@ -3705,7 +3705,7 @@ library.")
"WWW-Mechanize-" version ".tar.gz"))
(sha256
 (base32
- "0yd8a1zsfpbv5wr79x3iqmik9gvcd10iam9dfrdan4dri9vpxn9n"
+ "1mxx362vqiniw8vi6k3j7v9b1s7012irhfcblcz1p6jz9cjqi7mh"
 (build-system perl-build-system)
 (native-inputs  ;only for tests
  `(("perl-cgi" ,perl-cgi)

05/06: gnu: fzy: Update to 1.0.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit 2792d8a8652bbc017ee0be17cff33ee5968c9d41
Author: Tobias Geerinckx-Rice 
Date:   Sun Oct 28 00:53:42 2018 +0200

gnu: fzy: Update to 1.0.

* gnu/packages/shellutils.scm (fzy): Update to 1.0.
---
 gnu/packages/shellutils.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index d4076da..3020fdd 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -134,7 +134,7 @@ environment variables of the current shell.")
 (define-public fzy
   (package
 (name "fzy")
-(version "0.9")
+(version "1.0")
 (source
  (origin
(method git-fetch)
@@ -144,7 +144,7 @@ environment variables of the current shell.")
(file-name (git-file-name name version))
(sha256
 (base32
- "1f1sh88ivdgnqaqha5ircfd9vb0xmss976qns022n0ddb91k5ka6"
+ "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k"
 (build-system gnu-build-system)
 (arguments
  '(#:make-flags (list "CC=gcc"

04/06: gnu: fzy: Don't use unstable tarball.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit 31b619566dfb01b0deb8b127c7b24ef347de8b87
Author: Tobias Geerinckx-Rice 
Date:   Sun Oct 28 00:49:41 2018 +0200

gnu: fzy: Don't use unstable tarball.

* gnu/packages/shellutils.scm (fzy)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
---
 gnu/packages/shellutils.scm | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 425713a..d4076da 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -28,6 +28,7 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages readline)
@@ -136,13 +137,14 @@ environment variables of the current shell.")
 (version "0.9")
 (source
  (origin
-   (method url-fetch)
-   (uri (string-append "https://github.com/jhawthorn/fzy/archive/;
-   version ".tar.gz"))
-   (file-name (string-append name "-" version ".tar.gz"))
+   (method git-fetch)
+   (uri (git-reference
+ (url "https://github.com/jhawthorn/fzy.git;)
+ (commit version)))
+   (file-name (git-file-name name version))
(sha256
 (base32
- "1xfgxqbkcpi2n4381kj3fq4026qs6by7xhl5gn0fgp3dh232c63j"
+ "1f1sh88ivdgnqaqha5ircfd9vb0xmss976qns022n0ddb91k5ka6"
 (build-system gnu-build-system)
 (arguments
  '(#:make-flags (list "CC=gcc"

branch master updated (1f889ca -> f3dd10d)

[Kei Kebreau]

kkebreau pushed a change to branch master
in repository guix.

  from  1f889ca   gnu: mailutils: Add dependency on GSASL.
   new  f3dd10d   gnu: libmspack: Update to 0.8 [fixes 
CVE-2018-{18584,18585,18586}].

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/compression.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

01/01: gnu: libmspack: Update to 0.8 [fixes CVE-2018-{18584, 18585, 18586}].

[Kei Kebreau]

kkebreau pushed a commit to branch master
in repository guix.

commit f3dd10dfe7e3baf91ecaf547536ad3fefb2a4aea
Author: Kei Kebreau 
Date:   Wed Oct 24 15:44:49 2018 -0400

gnu: libmspack: Update to 0.8 [fixes CVE-2018-{18584,18585,18586}].

* gnu/packages/compression.scm (libmspack): Update to 0.8.
---
 gnu/packages/compression.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 5a151b4..464402e 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -645,13 +645,13 @@ sfArk file format to the uncompressed sf2 format.")
   (package
 (name "libmspack")
 (home-page "https://cabextract.org.uk/libmspack/;)
-(version "0.7.1")
+(version "0.8")
 (source
  (origin
   (method url-fetch)
   (uri (string-append home-page name "-" version "alpha.tar.gz"))
   (sha256
-   (base32 "0zn4vwzk5ankgd0l88cipan19pzbzv0sm3fba17lvqwka3dp1acp"
+   (base32 "1byx98jajv927f0a7np0hvs8lxzccny6pj8vrrgmldv1jlp7jcq5"
 (build-system gnu-build-system)
 (arguments
  `(#:configure-flags '("--disable-static")))

branch master updated (20a3df0 -> 1f889ca)

[Ludovic Court�]

civodul pushed a change to branch master
in repository guix.

  from  20a3df0   gnu: mailutils: Update to 3.5.
   new  ec397b3   tests: Fix typo.
   new  ac3b4b1   gnu: mailutils: Install modules to …/guile/site/2.2.
   new  1f889ca   gnu: mailutils: Add dependency on GSASL.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/mail.scm | 9 -
 tests/pack.scm| 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

02/03: gnu: mailutils: Install modules to …/guile/site/2.2.

[Ludovic Court�]

civodul pushed a commit to branch master
in repository guix.

commit ac3b4b124fa9b3c0dbbc22ac2bec157fe70ae0f9
Author: Ludovic Courtès 
Date:   Sun Oct 28 01:09:54 2018 +0200

gnu: mailutils: Install modules to …/guile/site/2.2.

* gnu/packages/mail.scm (mailutils)[arguments]: Pass
"--with-guile-site-dir".
---
 gnu/packages/mail.scm | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 7d6ea74..c533664 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -184,7 +184,13 @@
 
  #t)))
;; TODO: Add `--with-sql'.
-   #:configure-flags '("--sysconfdir=/etc")
+   #:configure-flags (list "--sysconfdir=/etc"
+
+   ;; Add "/2.2" to the installation directory.
+   (string-append "--with-guile-site-dir="
+  (assoc-ref %outputs "out")
+  "/share/guile/site/2.2"))
+
#:parallel-tests? #f))
 (native-inputs
  `(("perl" ,perl)))   ;for 'gylwrap'

01/03: tests: Fix typo.

[Ludovic Court�]

civodul pushed a commit to branch master
in repository guix.

commit ec397b312f901da59d9a2e1cffb26bf31507e61f
Author: Ludovic Courtès 
Date:   Sat Oct 27 18:10:26 2018 +0200

tests: Fix typo.

This is a followup to 19c924af4f3726688ca155a905ebf1cb9acdfca2.

* tests/pack.scm: Fix typo in 'test-skip'.
---
 tests/pack.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/pack.scm b/tests/pack.scm
index 7f86789..4eb5be9 100644
--- a/tests/pack.scm
+++ b/tests/pack.scm
@@ -55,7 +55,7 @@
 ;; quite inexpensively; see .
 
 (with-external-store store
-  (unless store (tests-skip 1))
+  (unless store (test-skip 1))
   (test-assertm "self-contained-tarball" store
 (mlet* %store-monad
 ((profile (profile-derivation (packages->manifest

03/03: gnu: mailutils: Add dependency on GSASL.

[Ludovic Court�]

civodul pushed a commit to branch master
in repository guix.

commit 1f889cac4e767bf24fabf88a8bd48d5243aa9042
Author: Ludovic Courtès 
Date:   Sun Oct 28 01:10:55 2018 +0200

gnu: mailutils: Add dependency on GSASL.

* gnu/packages/mail.scm (mailutils)[inputs]: Add GSASL.
---
 gnu/packages/mail.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index c533664..4fffc2f 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -199,6 +199,7 @@
("m4" ,m4)
("texinfo" ,texinfo)
("guile" ,guile-2.2)
+   ("gsasl" ,gsasl)
("gnutls" ,gnutls)
("ncurses" ,ncurses)
("readline" ,readline)

01/01: gnu: mailutils: Update to 3.5.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 20a3df0fd3353fe00a3cfde36317e0c8f4fc1187
Author: Efraim Flashner 
Date:   Sat Oct 27 23:53:57 2018 +0300

gnu: mailutils: Update to 3.5.

* gnu/packages/mail.scm (mailutils): Update to 3.5.
[source]: Remove patch, remove snippet.
[native-inputs]: Remove flex, bison.
[inputs]: Remove guile-2.0, add guile-2.2.
* gnu/packages/patches/mailutils-uninitialized-memory.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk   |  1 -
 gnu/packages/mail.scm  | 24 ++
 .../patches/mailutils-uninitialized-memory.patch   | 87 --
 3 files changed, 5 insertions(+), 107 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index ba86d55..56c434d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -938,7 +938,6 @@ dist_patch_DATA =   
\
   %D%/packages/patches/lvm2-static-link.patch  \
   %D%/packages/patches/lxsession-use-gapplication.patch \
   %D%/packages/patches/lyx-2.2.3-fix-test.patch\
-  %D%/packages/patches/mailutils-uninitialized-memory.patch\
   %D%/packages/patches/make-glibc-compat.patch \
   %D%/packages/patches/make-impure-dirs.patch  \
   %D%/packages/patches/mariadb-gcc-ice.patch   \
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index e7e440b..7d6ea74 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -126,24 +126,14 @@
 (define-public mailutils
   (package
 (name "mailutils")
-(version "3.4")
+(version "3.5")
 (source (origin
  (method url-fetch)
  (uri (string-append "mirror://gnu/mailutils/mailutils-"
- version ".tar.bz2"))
+ version ".tar.xz"))
  (sha256
   (base32
-   "1dn71p85wlyisnwsb485sk3q5v393k3dizsa9fmimskdwjwgk3ch"))
- (patches
-  (search-patches "mailutils-uninitialized-memory.patch"))
- (snippet
-  ;; For a rebuild of the Flex/Bison byproducts touched by the
-  ;; patch above.
-  '(begin
- (for-each delete-file
-   '("mh/mh_alias_lex.c"
- "libmailutils/cfg/parser.c"))
- #t
+   "1wx275w38fwni2abc8g7g3irbk332vr34byxd72zqfdiznsqgims"
 (build-system gnu-build-system)
 (arguments
  '(#:phases
@@ -197,16 +187,12 @@
#:configure-flags '("--sysconfdir=/etc")
#:parallel-tests? #f))
 (native-inputs
- ;; Note: Bison and Flex needed due to
- ;; 'mailutils-uninitialized-memory.patch'.
- `(("bison" ,bison)
-   ("flex" ,flex)
-   ("perl" ,perl)))   ;for 'gylwrap'
+ `(("perl" ,perl)))   ;for 'gylwrap'
 (inputs
  `(("dejagnu" ,dejagnu)
("m4" ,m4)
("texinfo" ,texinfo)
-   ("guile" ,guile-2.0)
+   ("guile" ,guile-2.2)
("gnutls" ,gnutls)
("ncurses" ,ncurses)
("readline" ,readline)
diff --git a/gnu/packages/patches/mailutils-uninitialized-memory.patch 
b/gnu/packages/patches/mailutils-uninitialized-memory.patch
deleted file mode 100644
index ef4daf9..000
--- a/gnu/packages/patches/mailutils-uninitialized-memory.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Without this patch, the MH test suite would fail when building with
-glibc 2.26, with 'ali' segfaulting like this:
-
-  Core was generated by 
`/tmp/guix-build-mailutils-3.4.drv-0/mailutils-3.4/mh/.libs/ali -a 
./Mail/mh_ali'.
-  Program terminated with signal SIGSEGV, Segmentation fault.
-  #0  0x7f8eac263a14 in hash (
-  name=0x72642e342e332d73 , hash_num=0) at assoc.c:102
-  102for (i = 0; *name; name++)
-  (gdb) bt
-  #0  0x7f8eac263a14 in hash (
-  name=0x72642e342e332d73 , hash_num=0) at assoc.c:102
-  #1  0x7f8eac263e6b in assoc_find_slot (assoc=0xaa59e0, 
-  name=0x72642e342e332d73 , install=0x0, slot=0x7ffcddcbf2b8) at assoc.c:219
-  #2  0x7f8eac264124 in mu_assoc_lookup (assoc=0xaa59e0, 
-  name=0x72642e342e332d73 , dataptr=0x7ffcddcbf2e0) at assoc.c:308
-  #3  0x7f8eac29e8ac in mu_ident_deref (
-  name=0x72642e342e332d73 ) at ident.c:98
-  #4  0x7f8eac29f8a6 in mu_locus_point_deinit (pt=0xaa5718) at locus.c:48
-  #5  0x7f8eac29fa1b in mu_locus_range_deinit (lr=0xaa5718) at locus.c:99
-  #6  0x7f8eac29f9db in mu_locus_range_copy (dest=0xaa5718, 
-  src=0x622be0 ) at locus.c:89
-  #7  0x00408a2a in push_source (name=0xaa74bc "mh_aliases2", fail=1)
-  at mh_alias_lex.l:170
-
-commit b330af9008e4c9168b379867b854f5900a539ad7
-Author: Sergey Poznyakoff 
-Date:   Sat Nov 18 10:15:48 2017 +0200
-
-Fix the use of uninitialized memory
-
-* 

branch master updated (763d449 -> 20a3df0)

[Efraim Flashner]

efraim pushed a change to branch master
in repository guix.

  from  763d449   gnu: guile-sdl2: Update to 0.3.1.
   new  20a3df0   gnu: mailutils: Update to 3.5.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/local.mk   |  1 -
 gnu/packages/mail.scm  | 24 ++
 .../patches/mailutils-uninitialized-memory.patch   | 87 --
 3 files changed, 5 insertions(+), 107 deletions(-)
 delete mode 100644 gnu/packages/patches/mailutils-uninitialized-memory.patch

branch master updated (b509df8 -> 763d449)

[Ricardo Wurmus]

rekado pushed a change to branch master
in repository guix.

  from  b509df8   gnu: Add r-abundant.
   new  763d449   gnu: guile-sdl2: Update to 0.3.1.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/sdl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

01/01: gnu: guile-sdl2: Update to 0.3.1.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit 763d44920dc1ae8a1ea2ff5aab58fdf818182880
Author: Ricardo Wurmus 
Date:   Sat Oct 27 20:08:50 2018 +0200

gnu: guile-sdl2: Update to 0.3.1.

* gnu/packages/sdl.scm (guile-sdl2): Update to 0.3.1.
---
 gnu/packages/sdl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index caa1d6d..3fa0e02 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -486,7 +486,7 @@ sound and device input (keyboards, joysticks, mice, etc.).")
 (define-public guile-sdl2
   (package
 (name "guile-sdl2")
-(version "0.3.0")
+(version "0.3.1")
 (source (origin
   (method url-fetch)
   (uri (string-append
@@ -494,7 +494,7 @@ sound and device input (keyboards, joysticks, mice, etc.).")
 version ".tar.gz"))
   (sha256
(base32
-"0iq6fw213qw292fxhrsg40al7hqyqyh4qpgl0x9rh08y949h2w97"
+"0bw7x2lx90k4banc5k7yfkn3as93y25gr1xdr225ll7lmij21k64"
 (build-system gnu-build-system)
 (arguments
  '(#:make-flags '("GUILE_AUTO_COMPILE=0")

03/03: gnu: Add r-abundant.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit b509df82de369262403acf2e74f1e80fdc02c96d
Author: Mădălin Ionel Patrașcu 
Date:   Sat Oct 27 18:49:29 2018 +0200

gnu: Add r-abundant.

* gnu/packages/cran.scm (r-abundant): New variable.

Signed-off-by: Ricardo Wurmus 
---
 gnu/packages/cran.scm | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3cf1e09..7f2123b 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6185,6 +6185,29 @@ estimation problem.")
 ;; The CRAN page only says GPL-3.
 (license license:gpl3+)))
 
+(define-public r-abundant
+  (package
+(name "r-abundant")
+(version "1.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (cran-uri "abundant" version))
+   (sha256
+(base32 "1m76qdmqvwpgm0sihazi2dna7cgsz9rljal18vgffb5wamwmg9k7"
+(build-system r-build-system)
+(propagated-inputs
+ `(("r-quic" ,r-quic)))
+(home-page "https://cran.r-project.org/web/packages/abundant/;)
+(synopsis "Abundant regression and high-dimensional principal fitted 
components")
+(description
+ "This package provides tools to fit and predict with the high-dimensional
+principal fitted components model.  This model is described by Cook, Forzani,
+and Rothman (2012) @url{doi:10.1214/11-AOS962}.")
+;; The DESCRIPTION file states GPL-2, but since it directly depends on a
+;; GPLv3+ package (QUIC) this likely means GPLv2+.
+(license license:gpl2+)))
+
 (define-public r-ac3net
   (package
 (name "r-ac3net")

02/03: gnu: Add r-quic.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit b5a310056cf942a5675bf3c862ece273c28a4ba4
Author: Mădălin Ionel Patrașcu 
Date:   Sat Oct 27 18:44:31 2018 +0200

gnu: Add r-quic.

* gnu/packages/cran.scm (r-quic): New variable.

Signed-off-by: Ricardo Wurmus 
---
 gnu/packages/cran.scm | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 1dcb0cc..3cf1e09 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6162,6 +6162,29 @@ representing one simulated time step.  Various mutation 
events are possible at
 each time step, contributing to a diverse final repertoire.")
 (license license:gpl2)))
 
+(define-public r-quic
+  (package
+(name "r-quic")
+(version "1.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (cran-uri "QUIC" version))
+   (sha256
+(base32 "021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"
+(properties `((upstream-name . "QUIC")))
+(build-system r-build-system)
+(home-page "https://www.cs.utexas.edu/users/sustik/QUIC/;)
+(synopsis "Regularized sparse inverse covariance matrix estimation")
+(description
+ "This package implements the regularized Gaussian maximum likelihood
+estimation of the inverse of a covariance matrix.  It uses Newton's method and
+coordinate descent to solve the regularized inverse covariance matrix
+estimation problem.")
+;; The project home page states that the release is under GPLv3 or later.
+;; The CRAN page only says GPL-3.
+(license license:gpl3+)))
+
 (define-public r-ac3net
   (package
 (name "r-ac3net")

branch master updated (e9a0415 -> b509df8)

[Ricardo Wurmus]

rekado pushed a change to branch master
in repository guix.

  from  e9a0415   gnu: Add telegram-purple.
   new  67e0fb8   gnu: Add xrandr-invert-colors.
   new  b5a3100   gnu: Add r-quic.
   new  b509df8   gnu: Add r-abundant.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/cran.scm| 46 ++
 gnu/packages/xdisorg.scm | 34 ++
 2 files changed, 80 insertions(+)

01/03: gnu: Add xrandr-invert-colors.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit 67e0fb8b496903ae2c43c9386a2bc3b0a7c28579
Author: Ricardo Wurmus 
Date:   Sat Oct 27 16:33:26 2018 +0200

gnu: Add xrandr-invert-colors.

* gnu/packages/xdisorg.scm (xrandr-invert-colors): New variable.
---
 gnu/packages/xdisorg.scm | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index c92dbd1..cf3e33e 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1521,3 +1521,37 @@ the X11 clipboard")
 the numlock key in X11.  It can be called from the user's initialization files
 to automatically turn it on on login.")
 (license license:expat)))
+
+(define-public xrandr-invert-colors
+  (package
+(name "xrandr-invert-colors")
+(version "0.01")
+(source (origin
+  (method git-fetch)
+  (uri (git-reference
+(url "https://github.com/zoltanp/xrandr-invert-colors.git;)
+(commit (string-append "v" version
+  (file-name (git-file-name name version))
+  (sha256
+   (base32
+"1br3x9vr6xm4ika06n8cfxx1b3wdchdqvyzjl4y1chmivrml8x9h"
+(build-system gnu-build-system)
+(arguments
+ `(#:make-flags (list "CC=gcc")
+   #:tests? #f ; there are none
+   #:phases
+   (modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'install
+   (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out  (assoc-ref outputs "out"))
+(bin  (string-append out "/bin")))
+   (install-file "xrandr-invert-colors.bin" bin)
+   #t))
+(inputs
+ `(("libxrandr" ,libxrandr)))
+(home-page "https://github.com/zoltanp/xrandr-invert-colors;)
+(synopsis "Invert display colors")
+(description "This package provides a small utility for inverting the
+colors on all monitors attached to an XRandR-capable X11 display server.")
+(license license:gpl3+)))

05/05: gnu: Add telegram-purple.

[Ludovic Court�]

civodul pushed a commit to branch master
in repository guix.

commit e9a041577a4c63d86ff9164bd0e0d46e59db6122
Author: Tomáš Čech 
Date:   Sun Oct 21 18:18:13 2018 +0200

gnu: Add telegram-purple.

* gnu/packages/messaging.scm (telegram-purple): New variable.
* gnu/packages/patches/telegram-purple-adjust-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Co-authored-by: Ludovic Courtès 
---
 gnu/local.mk   |  1 +
 gnu/packages/messaging.scm | 82 ++
 .../patches/telegram-purple-adjust-test.patch  | 14 
 3 files changed, 97 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index c46f3a8..ba86d55 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1166,6 +1166,7 @@ dist_patch_DATA = 
\
   %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch   \
   %D%/packages/patches/teensy-loader-cli-help.patch\
   %D%/packages/patches/teeworlds-use-latest-wavpack.patch  \
+  %D%/packages/patches/telegram-purple-adjust-test.patch   \
   %D%/packages/patches/texi2html-document-encoding.patch   \
   %D%/packages/patches/texi2html-i18n.patch\
   %D%/packages/patches/thefuck-test-environ.patch  \
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 42fb373..0090fe1 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1763,4 +1763,86 @@ non-interoperable protocol, which allows it to support 
features like group
 messaging that aren’t available to clients that connect over XMPP.")
 (license license:expat)))
 
+(define-public telegram-purple
+  (package
+(name "telegram-purple")
+(version "1.3.1")
+(home-page "https://github.com/majn/telegram-purple;)
+(source (origin
+  (method git-fetch)
+  (uri (git-reference
+(url home-page)
+(commit (string-append "v" version))
+(recursive? #t)))
+  (sha256
+   (base32
+"0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp"))
+  (modules '((guix build utils)))
+  (snippet
+   '(begin
+  (substitute* "Makefile.in"
+;; By default these two directories point to Pidgin's own
+;; prefix.
+(("^PLUGIN_DIR_PURPLE=.*")
+ (string-append
+  "exec_prefix := @exec_prefix@\n"
+  "PLUGIN_DIR_PURPLE := @libdir@/purple-2\n"))
+(("^DATA_ROOT_DIR_PURPLE=.*")
+ "DATA_ROOT_DIR_PURPLE := @datarootdir@\n")
+
+;; Honor sysconfdir instead of trying to write to /etc.
+(("DESTDIR\\)/etc/telegram-purple")
+ "DESTDIR)@sysconfdir@/telegram-purple"))
+  #t))
+  (patches (search-patches "telegram-purple-adjust-test.patch"))
+  (file-name (git-file-name name version
+(build-system gnu-build-system)
+(native-inputs
+ `(("pkg-config" ,pkg-config)
+   ("which" ,which)))
+(inputs
+ `(("pidgin" ,pidgin)
+   ("libgcrypt" ,libgcrypt)
+   ("libwebp" ,libwebp)
+   ("glib" ,glib)
+   ("gettext" ,gnu-gettext)
+   ("gtk+" ,gtk+-2)
+   ("zlib" ,zlib)))
+(arguments
+ `(#:phases
+   (modify-phases %standard-phases
+ ;; We're using release tag for repository checkout - let's prepare
+ ;; header defining GIT_COMMIT manually instead of running git to
+ ;; identify version which is being compiled. Git repository
+ ;; is removed anyway and only source code is kept.
+ (add-after 'unpack 'prepare-commit.h
+   (lambda _
+ (with-output-to-file "./commit.h"
+   (lambda ()
+ (display
+  (string-append "//generated by guix, use version instead of "
+ "commit\n"
+ "#ifndef GIT_COMMIT\n"
+ "#  define GIT_COMMIT \"v"
+ ,version "\"\n"
+ "#endif\n"
+ #t))
+ (add-before 'configure 'set-SHELL-variables
+   ;; Set these environment variables so that 'tgl/configure' uses the
+   ;; right shell and not /bin/sh.
+   (lambda _
+ (let ((bash (which "bash")))
+   (setenv "SHELL" bash)
+   (setenv "CONFIG_SHELL" bash)
+   #t))
+(synopsis "Telegram messaging support for Pidgin")
+(description
+ "Telegram-purple is a plugin for Libpurple, the communication library
+used by the Pidgin instant messaging client, that adds support for the
+Telegram messenger.")
+
+;; Code under tgl/ (the Telegram library) is 

03/05: pack: Hide 'zip' colliding binding.

[Ludovic Court�]

civodul pushed a commit to branch master
in repository guix.

commit 003789e837d8524edf524e25fd753dbd801b583f
Author: Ludovic Courtès 
Date:   Sat Oct 27 12:52:47 2018 +0200

pack: Hide 'zip' colliding binding.

* guix/scripts/pack.scm: Hide 'zip' from (gnu packages compression).
---
 guix/scripts/pack.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 392e4b5..83bfa4c 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -38,7 +38,7 @@
   #:use-module ((guix self) #:select (make-config.scm))
   #:use-module (gnu packages)
   #:use-module (gnu packages bootstrap)
-  #:use-module (gnu packages compression)
+  #:use-module ((gnu packages compression) #:hide (zip))
   #:use-module (gnu packages guile)
   #:use-module (gnu packages base)
   #:autoload   (gnu packages package-management) (guix)

01/05: pack: Remove unused variable.

[Ludovic Court�]

civodul pushed a commit to branch master
in repository guix.

commit 46727e3a9d47f4c525d726ee61410dcf1745ca57
Author: Ludovic Courtès 
Date:   Fri Oct 26 23:51:56 2018 +0200

pack: Remove unused variable.

* guix/scripts/pack.scm (self-contained-tarball)[libgcrypt]: Remove.
---
 guix/scripts/pack.scm | 4 
 1 file changed, 4 deletions(-)

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index b7b4e22..392e4b5 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -117,10 +117,6 @@ with a properly initialized store database.
 
 SYMLINKS must be a list of (SOURCE -> TARGET) tuples denoting symlinks to be
 added to the pack."
-  (define libgcrypt
-(module-ref (resolve-interface '(gnu packages gnupg))
-'libgcrypt))
-
   (define schema
 (and localstatedir?
  (local-file (search-path %load-path

branch master updated (1316413 -> e9a0415)

[Ludovic Court�]

civodul pushed a change to branch master
in repository guix.

  from  1316413   gnu: git: Add "subtree" output.
   new  46727e3   pack: Remove unused variable.
   new  244a0d5   gnu: libzmf: Disable '-Werror'.
   new  003789e   pack: Hide 'zip' colliding binding.
   new  932d160   gexp: 'gexp-modules' now consistently deletes duplicates.
   new  e9a0415   gnu: Add telegram-purple.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/local.mk   |  1 +
 gnu/packages/libreoffice.scm   |  3 +
 gnu/packages/messaging.scm | 82 ++
 .../patches/telegram-purple-adjust-test.patch  | 14 
 guix/gexp.scm  | 25 +--
 guix/scripts/pack.scm  |  6 +-
 tests/gexp.scm | 16 +
 7 files changed, 138 insertions(+), 9 deletions(-)
 create mode 100644 gnu/packages/patches/telegram-purple-adjust-test.patch

04/05: gexp: 'gexp-modules' now consistently deletes duplicates.

[Ludovic Court�]

civodul pushed a commit to branch master
in repository guix.

commit 932d1600564cbf359a6ccd1086b968a934bef8e5
Author: Ludovic Courtès 
Date:   Sat Oct 27 15:45:45 2018 +0200

gexp: 'gexp-modules' now consistently deletes duplicates.

Fixes .
Reported by Clément Lassieur .

* guix/gexp.scm (gexp-attribute): Add 'equal?' optional parameter; pass
it to 'delete-duplicates'.
(gexp-modules)[module=?]: New procedure.
Pass it to 'gexp-attribute'.
* tests/gexp.scm ("gexp-modules deletes duplicates"): New test.
---
 guix/gexp.scm  | 25 +
 tests/gexp.scm | 16 
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/guix/gexp.scm b/guix/gexp.scm
index ba0d642..537875b 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -506,9 +506,10 @@ whether this should be considered a \"native\" input or 
not."
 
 (set-record-type-printer!  write-gexp-output)
 
-(define (gexp-attribute gexp self-attribute)
+(define* (gexp-attribute gexp self-attribute #:optional (equal? equal?))
   "Recurse on GEXP and the expressions it refers to, summing the items
-returned by SELF-ATTRIBUTE, a procedure that takes a gexp."
+returned by SELF-ATTRIBUTE, a procedure that takes a gexp.  Use EQUAL? as the
+second argument to 'delete-duplicates'."
   (if (gexp? gexp)
   (delete-duplicates
(append (self-attribute gexp)
@@ -524,13 +525,29 @@ returned by SELF-ATTRIBUTE, a procedure that takes a 
gexp."
   lst))
  (_
   '()))
-   (gexp-references gexp
+   (gexp-references gexp)))
+   equal?)
   '()))   ;plain Scheme data type
 
 (define (gexp-modules gexp)
   "Return the list of Guile module names GEXP relies on.  If (gexp? GEXP) is
 false, meaning that GEXP is a plain Scheme object, return the empty list."
-  (gexp-attribute gexp gexp-self-modules))
+  (define (module=? m1 m2)
+;; Return #t when M1 equals M2.  Special-case '=>' specs because their
+;; right-hand side may not be comparable with 'equal?': it's typically a
+;; file-like object that embeds a gexp, which in turn embeds closure;
+;; those closures may be 'eq?' when running compiled code but are unlikely
+;; to be 'eq?' when running on 'eval'.  Ignore the right-hand side to
+;; avoid this discrepancy.
+(match m1
+  (((name1 ...) '=> _)
+   (match m2
+ (((name2 ...) '=> _) (equal? name1 name2))
+ (_ #f)))
+  (_
+   (equal? m1 m2
+
+  (gexp-attribute gexp gexp-self-modules module=?))
 
 (define (gexp-extensions gexp)
   "Return the list of Guile extensions (packages) GEXP relies on.  If (gexp?
diff --git a/tests/gexp.scm b/tests/gexp.scm
index 813ea2f..467370f 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -680,6 +680,22 @@
#~(foo #$@(list (with-imported-modules '((foo)) #~+)
(with-imported-modules '((bar)) #~-)
 
+(test-assert "gexp-modules deletes duplicates"   ;
+  (let ((make-file (lambda ()
+ ;; Use 'eval' to make sure we get an object that's not
+ ;; 'eq?' nor 'equal?' due to the closures it embeds.
+ (eval '(scheme-file "bar.scm" #~(define-module (bar)))
+   (current-module)
+(define result
+  ((@@ (guix gexp) gexp-modules)
+   (with-imported-modules `(((bar) => ,(make-file))
+((bar) => ,(make-file))
+(foo) (foo))
+ #~+)))
+
+(match result
+  'bar) '=> (? scheme-file?)) ('foo)) #t
+
 (test-equal "gexp-modules and literal Scheme object"
   '()
   (gexp-modules #t))

02/05: gnu: libzmf: Disable '-Werror'.

[Ludovic Court�]

civodul pushed a commit to branch master
in repository guix.

commit 244a0d5aade838aebf0b63885a43747518a74ed6
Author: Ludovic Courtès 
Date:   Sat Oct 27 12:50:19 2018 +0200

gnu: libzmf: Disable '-Werror'.

Fixes builds on i686-linux.

* gnu/packages/libreoffice.scm (libzmf)[arguments]: New field.
---
 gnu/packages/libreoffice.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index e5ab5c5..b6ff6dc 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -731,6 +731,9 @@ Works word processor file format.")
   (sha256 (base32
"08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"
(build-system gnu-build-system)
+   (arguments
+;; A harmless 'sign-compare' error pops up on i686 so disable '-Werror'.
+'(#:configure-flags '("--disable-werror")))
(inputs
 `(("boost" ,boost)
   ("icu4c" ,icu4c)

01/01: gnu: git: Add "subtree" output.

[Pierre Neidhardt]

ambrevar pushed a commit to branch master
in repository guix.

commit 1316413558e288c577d132bee41adcce4bc1e24a
Author: Pierre Neidhardt 
Date:   Thu Oct 25 19:31:38 2018 +0200

gnu: git: Add "subtree" output.

* gnu/packages/version-control.scm (git)[outputs]: Add "subtree".
---
 gnu/packages/version-control.scm | 35 ++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 44b9769..ccb1f5d 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -166,7 +166,11 @@ as well as the classic centralized workflow.")
 version ".tar.xz"))
   (sha256
(base32
-"1vn6pi9yvw7rnb9dvi1yjrvv39fqd1m9mwbaffqwizs3gaf91br7"))
+"1vn6pi9yvw7rnb9dvi1yjrvv39fqd1m9mwbaffqwizs3gaf91br7"
+  ;; For subtree documentation.
+  ("asciidoc" ,asciidoc)
+  ("docbook-xsl" ,docbook-xsl)
+  ("xmlto" ,xmlto)))
(inputs
 `(("curl" ,curl)
   ("expat" ,expat)
@@ -198,6 +202,7 @@ as well as the classic centralized workflow.")
   "send-email"; for git-send-email
   "svn"   ; git-svn
   "credential-netrc"  ; git-credential-netrc
+  "subtree"   ; git-subtree
   "gui")) ; gitk, git gui
(arguments
 `(#:make-flags `("V=1";more verbose compilation
@@ -256,6 +261,26 @@ as well as the classic centralized workflow.")
 ;; Add the "PM.stamp" to avoid "no rule to make target".
 (call-with-output-file "perl/PM.stamp" (const #t))
 #t))
+(add-after 'build 'build-subtree
+  (lambda* (#:key inputs #:allow-other-keys)
+(with-directory-excursion "contrib/subtree"
+  (substitute* "Makefile"
+;; Apparently `xmlto' does not bother to looks up the 
stylesheets
+;; specified in the XML, unlike the above substitution.  
Instead it
+;; uses a hard-coded URL.  Work around it here, but if this is
+;; common perhaps we should hardcode this path in xmlto itself.
+(("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\) man")
+ (string-append "$(XMLTO) -x "
+(string-append (assoc-ref inputs "docbook-xsl")
+   "/xml/xsl/docbook-xsl-"
+   ,(package-version docbook-xsl))
+"/manpages/docbook.xsl -m $(MANPAGE_XSL) 
man")))
+  (invoke "make")
+  (invoke "make" "install")
+  (invoke "make" "install-doc")
+  (substitute* "git-subtree"
+(("/bin/sh") (which "sh"
+#t))
 (add-before 'check 'patch-tests
   (lambda _
 (let ((store-directory (%store-directory)))
@@ -317,6 +342,14 @@ as well as the classic centralized workflow.")
 `("PERL5LIB" ":" prefix
   (,(string-append (assoc-ref outputs "out") "/share/perl5"
   #t)))
+(add-after 'install 'install-subtree
+  (lambda* (#:key outputs #:allow-other-keys)
+(let ((subtree (assoc-ref outputs "subtree")))
+  (install-file "contrib/subtree/git-subtree"
+(string-append subtree "/bin"))
+  (install-file "contrib/subtree/git-subtree.1"
+(string-append subtree "/share/man/man1"))
+  #t)))
 (add-after 'install 'split
   (lambda* (#:key inputs outputs #:allow-other-keys)
 ;; Split the binaries to the various outputs.

branch master updated (abc98e3 -> 1316413)

[Pierre Neidhardt]

ambrevar pushed a change to branch master
in repository guix.

  from  abc98e3   services: httpd: Allow using it with PHP.
   new  1316413   gnu: git: Add "subtree" output.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/version-control.scm | 35 ++-
 1 file changed, 34 insertions(+), 1 deletion(-)

branch master updated (cbea1e8 -> abc98e3)

[Christopher Baines]

cbaines pushed a change to branch master
in repository guix.

  from  cbea1e8   gnu: lxqt-build-tools: Define LXQT_DATA_DIR and 
LXQT_ETC_XDG_DIR.
   new  abc98e3   services: httpd: Allow using it with PHP.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/guix.texi| 31 +++
 gnu/services/web.scm |  5 +
 2 files changed, 36 insertions(+)

01/01: services: httpd: Allow using it with PHP.

[Christopher Baines]

cbaines pushed a commit to branch master
in repository guix.

commit abc98e3be5fbccf88fe69399db4d83f902b65a15
Author: Florian Pelz 
Date:   Sat Oct 20 18:44:03 2018 +0200

services: httpd: Allow using it with PHP.

* gnu/services/web.scm (httpd): Make existing httpd-module API public.
* doc/guix.texi (Apache HTTP Server): Document its usage with PHP-FPM.

Signed-off-by: Christopher Baines 
---
 doc/guix.texi| 31 +++
 gnu/services/web.scm |  5 +
 2 files changed, 36 insertions(+)

diff --git a/doc/guix.texi b/doc/guix.texi
index 12346c4..87579d4 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -50,6 +50,7 @@ Copyright @copyright{} 2018 Oleg Pykhalov@*
 Copyright @copyright{} 2018 Mike Gerwitz@*
 Copyright @copyright{} 2018 Pierre-Antoine Rouby@*
 Copyright @copyright{} 2018 Gábor Boskovits@*
+Copyright @copyright{} 2018 Florian Pelz@*
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -16612,6 +16613,10 @@ within the store, for example @code{(file-append 
mod-wsgi
 @end table
 @end deffn
 
+@defvr {Scheme Variable} %default-httpd-modules
+A default list of @code{httpd-module} objects.
+@end defvr
+
 @deffn {Data Type} httpd-config-file
 This data type represents a configuration file for the httpd service.
 
@@ -16620,6 +16625,32 @@ This data type represents a configuration file for the 
httpd service.
 The modules to load. Additional modules can be added here, or loaded by
 additional configuration.
 
+For example, in order to handle requests for PHP files, you can use Apache’s
+@code{mod_proxy_fcgi} module along with @code{php-fpm-service-type}:
+
+@example
+(service httpd-service-type
+ (httpd-configuration
+  (config
+   (httpd-config-file
+(modules (cons*
+  (httpd-module
+   (name "proxy_module")
+   (file "modules/mod_proxy.so"))
+  (httpd-module
+   (name "proxy_fcgi_module")
+   (file "modules/mod_proxy_fcgi.so"))
+  %default-httpd-modules))
+(extra-config (list "\
+
+SetHandler \"proxy:unix:/var/run/php-fpm.sock|fcgi://localhost/\"
+"))
+(service php-fpm-service-type
+ (php-fpm-configuration
+  (socket "/var/run/php-fpm.sock")
+  (socket-group "httpd")))
+@end example
+
 @item @code{server-root} (default: @code{httpd})
 The @code{ServerRoot} in the configuration file, defaults to the httpd
 package. Directives including @code{Include} and @code{LoadModule} are
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 1edb1f4..fcf453c 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -70,6 +70,11 @@
 httpd-config-file-user
 httpd-config-file-group
 
+
+httpd-module
+httpd-module?
+%default-httpd-modules
+
 httpd-service-type
 
 

branch master updated (6f00fb7 -> cbea1e8)

[???]

iyzsong pushed a change to branch master
in repository guix.

  from  6f00fb7   gnu: lxqt: Correct licenses for several packages.
   new  cbea1e8   gnu: lxqt-build-tools: Define LXQT_DATA_DIR and 
LXQT_ETC_XDG_DIR.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/lxqt.scm | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

01/01: gnu: lxqt-build-tools: Define LXQT_DATA_DIR and LXQT_ETC_XDG_DIR.

[???]

iyzsong pushed a commit to branch master
in repository guix.

commit cbea1e8dd22c01b8c228afc0b74dfe39ed356d37
Author: Meiyo Peng 
Date:   Fri Oct 19 22:16:38 2018 +0800

gnu: lxqt-build-tools: Define LXQT_DATA_DIR and LXQT_ETC_XDG_DIR.

* gnu/packages/lxqt.scm (lxqt-build-tools)[arguments]: Define LXQT_DATA_DIR
and LXQT_ETC_XDG_DIR in the configure flags.

Signed-off-by: 宋文武 
---
 gnu/packages/lxqt.scm | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 1c6bfb7..b78b8ac 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -131,7 +131,13 @@ to statistics about the system on which it's run.")
 (base32 "13b5x26p6ycnwzlgg1cgvlc88wjrjmlb3snrrmzh0xgh9h6hhvd6"
 (build-system cmake-build-system)
 (arguments
- `(#:tests? #f)); no tests
+ `(#:tests? #f  ; no tests
+   #:configure-flags
+   ;; 'startlxqt' will add LXQT_DATA_DIR to XDG_DATA_DIRS,
+   ;; LXQT_ETC_XDG_DIR to XDG_CONFIG_DIRS, and 'lxqt-about' will report
+   ;; LXQT_ETC_XDG_DIR in its "Technical Info".
+   '("-DLXQT_DATA_DIR=/run/current-system/profile/share"
+ "-DLXQT_ETC_XDG_DIR=/run/current-system/profile/etc/xdg")))
 (native-inputs
  `(("pkg-config" ,pkg-config)
("glib" ,glib)))

branch master updated (a46c00a -> 6f00fb7)

[???]

iyzsong pushed a change to branch master
in repository guix.

  from  a46c00a   gnu: lxqt: Propagate qterminal actually.
   new  6f00fb7   gnu: lxqt: Correct licenses for several packages.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/lxqt.scm | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

01/01: gnu: lxqt: Correct licenses for several packages.

[???]

iyzsong pushed a commit to branch master
in repository guix.

commit 6f00fb75ca52ae112a73f2fbc6d8f6269a8db5f6
Author: Meiyo Peng 
Date:   Sat Oct 27 15:56:47 2018 +0800

gnu: lxqt: Correct licenses for several packages.

* gnu/packages/lxqt.scm (pcmanfm-qt, lximage-qt, pavucontrol-qt, 
qtermwidget)
(qterminal, screengrab, lxqt): Correct license to GPL2+.

Signed-off-by: 宋文武 
---
 gnu/packages/lxqt.scm | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 878998d..1c6bfb7 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -903,7 +903,7 @@ components to build desktop file managers which belongs to 
LXDE.")
 (synopsis "File manager and desktop icon manager")
 (description "PCManFM-Qt is the Qt port of PCManFM, the file manager of
 LXDE.")
-(license license:lgpl2.1+)))
+(license license:gpl2+)))
 
 
 ;; Extra
@@ -977,7 +977,7 @@ manager Compton.")
 (synopsis "The image viewer and screenshot tool for lxqt")
 (description "LXImage-Qt is the Qt port of LXImage, a simple and fast
 image viewer.")
-(license license:lgpl2.1+)))
+(license license:gpl2+)))
 
 (define-public obconf-qt
   (package
@@ -1048,7 +1048,7 @@ window manager OpenBox.")
 (synopsis "Pulseaudio mixer in Qt")
 (description "@code{pavucontrol-qt} is the Qt port of volume control
 @code{pavucontrol} of sound server @code{PulseAudio}.")
-(license license:lgpl2.1+)))
+(license license:gpl2+)))
 
 (define-public qps
   (package
@@ -1101,7 +1101,7 @@ processes currently in existence, much like code{top} or 
code{ps}.")
 (home-page "https://lxqt.org/;)
 (synopsis "The terminal widget for QTerminal")
 (description "QTermWidget is a terminal emulator widget for Qt 5.")
-(license license:lgpl2.1+)))
+(license license:gpl2+)))
 
 (define-public qterminal
   (package
@@ -1131,7 +1131,7 @@ processes currently in existence, much like code{top} or 
code{ps}.")
 (synopsis "Lightweight Qt-based terminal emulator")
 (description "QTerminal is a lightweight Qt terminal emulator based on
 QTermWidget.")
-(license license:lgpl2.1+)))
+(license license:gpl2+)))
 
 (define-public screengrab
   (package
@@ -1160,7 +1160,7 @@ QTermWidget.")
 (synopsis "Crossplatform tool for fast making screenshots")
 (description "ScreenGrab is a program for fast creating screenshots, and
 easily publishing them on internet image hosting services.")
-(license license:lgpl2.1+)))
+(license license:gpl2+)))
 
 
 ;; The LXQt Desktop Environment
@@ -1211,4 +1211,4 @@ easily publishing them on internet image hosting 
services.")
 (synopsis "The Lightweight Qt Desktop Environment")
 (description "LXQt is a lightweight Qt desktop environment.")
 (home-page "https://lxde.org;)
-(license license:lgpl2.1+)))
+(license license:gpl2+)))