03/07: gnu: zathura-cb: Update to 0.1.8.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch staging
in repository guix.

commit 02fcc6f240946cfd51bfe548e260b2f3150f0ab4
Author: Tobias Geerinckx-Rice 
Date:   Mon Mar 19 20:29:46 2018 +0100

gnu: zathura-cb: Update to 0.1.8.

* gnu/packages/pdf.scm (zathura-cb): Update to 0.1.8.
[build-system]: Switch to the Meson build system.
[arguments]: Trim accordingly.  Add a new ‘patch-plugin-directory’
phase.
---
 gnu/packages/pdf.scm | 24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 633a344..1054bc2 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -314,26 +314,32 @@ reading and editing of existing PDF files.")
 (define-public zathura-cb
   (package
 (name "zathura-cb")
-(version "0.1.7")
+(version "0.1.8")
 (source (origin
   (method url-fetch)
   (uri
(string-append 
"https://pwmt.org/projects/zathura-cb/download/zathura-cb-;
-  version ".tar.gz"))
+  version ".tar.xz"))
   (sha256
(base32
-"0r4viisycj39kaz4281cmkr7n9w5q96dmlf7nf45n8zq8qy2npw3"
+"1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"
 (native-inputs `(("pkg-config" ,pkg-config)))
 (inputs `(("libarchive" ,libarchive)
   ("zathura" ,zathura)))
-(build-system gnu-build-system)
+(build-system meson-build-system)
 (arguments
- `(#:make-flags (list (string-append "PREFIX=" %output)
-  (string-append "PLUGINDIR=" %output "/lib/zathura")
-  "CC=gcc")
-   #:tests? #f ; Package does not contain tests.
+ `(#:tests? #f  ; package does not contain tests
#:phases
-   (modify-phases %standard-phases (delete 'configure
+   (modify-phases %standard-phases
+ (add-after 'unpack 'patch-plugin-directory
+   ;; Something of a regression in 0.1.8: the new Meson build system
+   ;; now hard-codes an incorrect plugin directory.  Fix it.
+   (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "meson.build"
+   (("(install_dir:).*" _ key)
+(string-append key
+   "'" (assoc-ref outputs "out") 
"/lib/zathura'\n")))
+ #t)
 (home-page "https://pwmt.org/projects/zathura-cb/;)
 (synopsis "Comic book support for zathura (libarchive backend)")
 (description "The zathura-cb plugin adds comic book support to zathura



06/07: gnu: zathura-pdf-mupdf: Update to 0.3.3.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch staging
in repository guix.

commit aac2006d8276ac7ed3876b879f1816e57379aa25
Author: Tobias Geerinckx-Rice 
Date:   Mon Mar 19 20:41:47 2018 +0100

gnu: zathura-pdf-mupdf: Update to 0.3.3.

* gnu/packages/pdf.scm (zathura-pdf-mupdf): Update to 0.3.3.
[build-system]: Switch to the Meson build system.
[arguments]: Trim accordingly.  Add a new ‘patch-plugin-directory’
phase.
---
 gnu/packages/pdf.scm | 25 -
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 151143a..6ca1895 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -420,15 +420,15 @@ using the DjVuLibre library.")
 (define-public zathura-pdf-mupdf
   (package
 (name "zathura-pdf-mupdf")
-(version "0.3.2")
+(version "0.3.3")
 (source (origin
   (method url-fetch)
   (uri
(string-append "https://pwmt.org/projects/zathura-pdf-mupdf;
-  "/download/zathura-pdf-mupdf-" version 
".tar.gz"))
+  "/download/zathura-pdf-mupdf-" version 
".tar.xz"))
   (sha256
(base32
-"0xkajc3is7ncmb2fmymbzfgrran2bz12i7zsm1vvxhxds728h7ck"
+"1zbdqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j"
 (native-inputs `(("pkg-config" ,pkg-config)))
 (inputs
  `(("jbig2dec" ,jbig2dec)
@@ -437,13 +437,20 @@ using the DjVuLibre library.")
("openjpeg" ,openjpeg)
("openssl" ,openssl)
("zathura" ,zathura)))
-(build-system gnu-build-system)
+(build-system meson-build-system)
 (arguments
- `(#:make-flags (list (string-append "PREFIX=" %output)
-  (string-append "PLUGINDIR=" %output "/lib/zathura")
-  "CC=gcc")
-   #:tests? #f ;No tests.
-   #:phases (modify-phases %standard-phases (delete 'configure
+ `(#:tests? #f  ; package does not contain tests
+   #:phases
+   (modify-phases %standard-phases
+ (add-after 'unpack 'patch-plugin-directory
+   ;; Something of a regression in 0.3.3: the new Meson build system
+   ;; now hard-codes an incorrect plugin directory.  Fix it.
+   (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "meson.build"
+   (("(install_dir:).*" _ key)
+(string-append key
+   "'" (assoc-ref outputs "out") 
"/lib/zathura'\n")))
+ #t)
 (home-page "https://pwmt.org/projects/zathura-pdf-mupdf/;)
 (synopsis "PDF support for zathura (mupdf backend)")
 (description "The zathura-pdf-mupdf plugin adds PDF support to zathura



07/07: gnu: zathura-pdf-poppler: Update to 0.2.9.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch staging
in repository guix.

commit 0ed990530f08ceb1545a44b523661888f82a29a0
Author: Tobias Geerinckx-Rice 
Date:   Mon Mar 19 20:45:22 2018 +0100

gnu: zathura-pdf-poppler: Update to 0.2.9.

* gnu/packages/pdf.scm (zathura-pdf-poppler): Update to 0.2.9.
[build-system]: Switch to the Meson build system.
[arguments]: Trim accordingly.  Add a new ‘patch-plugin-directory’
phase.
---
 gnu/packages/pdf.scm | 24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 6ca1895..048225a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -460,27 +460,33 @@ by using the @code{mupdf} rendering library.")
 (define-public zathura-pdf-poppler
   (package
 (name "zathura-pdf-poppler")
-(version "0.2.8")
+(version "0.2.9")
 (source (origin
   (method url-fetch)
   (uri
(string-append 
"https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-;
-  version ".tar.gz"))
+  version ".tar.xz"))
   (sha256
(base32
-"1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2"
+"1p4jcny0jniygns78mcf0nlm298dszh49qpmjmackrm6dq8hc25y"
 (native-inputs `(("pkg-config" ,pkg-config)))
 (inputs
  `(("poppler" ,poppler)
("zathura" ,zathura)))
-(build-system gnu-build-system)
+(build-system meson-build-system)
 (arguments
- `(#:make-flags (list (string-append "PREFIX=" %output)
-  (string-append "PLUGINDIR=" %output "/lib/zathura")
-  "CC=gcc")
-   #:tests? #f ; Package does not include tests.
+ `(#:tests? #f  ; package does not include tests
#:phases
-   (modify-phases %standard-phases (delete 'configure
+   (modify-phases %standard-phases
+ (add-after 'unpack 'patch-plugin-directory
+   ;; Something of a regression in 0.2.9: the new Meson build system
+   ;; now hard-codes an incorrect plugin directory.  Fix it.
+   (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "meson.build"
+   (("(install_dir:).*" _ key)
+(string-append key
+   "'" (assoc-ref outputs "out") 
"/lib/zathura'\n")))
+ #t)
 (home-page "https://pwmt.org/projects/zathura-pdf-poppler/;)
 (synopsis "PDF support for zathura (poppler backend)")
 (description "The zathura-pdf-poppler plugin adds PDF support to zathura



04/07: gnu: zathura-ps: Update to 0.2.6.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch staging
in repository guix.

commit 06dbfb5d197db7502ed65c1019e96f3f02c34b7a
Author: Tobias Geerinckx-Rice 
Date:   Mon Mar 19 20:33:34 2018 +0100

gnu: zathura-ps: Update to 0.2.6.

* gnu/packages/pdf.scm (zathura-ps): Update to 0.2.6.
[build-system]: Switch to the Meson build system.
[arguments]: Trim accordingly.  Add a new ‘patch-plugin-directory’
phase.
---
 gnu/packages/pdf.scm | 24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 1054bc2..77d78bb 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -349,26 +349,32 @@ using libarchive.")
 (define-public zathura-ps
   (package
 (name "zathura-ps")
-(version "0.2.5")
+(version "0.2.6")
 (source (origin
   (method url-fetch)
   (uri
(string-append 
"https://pwmt.org/projects/zathura-ps/download/zathura-ps-;
-  version ".tar.gz"))
+  version ".tar.xz"))
   (sha256
(base32
-"1x4knqja8pw2a5cb3y2209nr3iddj1z8nwasy48v5nprj61fdxqj"
+"0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"
 (native-inputs `(("pkg-config" ,pkg-config)))
 (inputs `(("libspectre" ,libspectre)
   ("zathura" ,zathura)))
-(build-system gnu-build-system)
+(build-system meson-build-system)
 (arguments
- `(#:make-flags (list (string-append "PREFIX=" %output)
-  (string-append "PLUGINDIR=" %output "/lib/zathura")
-  "CC=gcc")
-   #:tests? #f ; Package does not contain tests.
+ `(#:tests? #f  ; package does not contain tests
#:phases
-   (modify-phases %standard-phases (delete 'configure
+   (modify-phases %standard-phases
+ (add-after 'unpack 'patch-plugin-directory
+   ;; Something of a regression in 0.2.6: the new Meson build system
+   ;; now hard-codes an incorrect plugin directory.  Fix it.
+   (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "meson.build"
+   (("(install_dir:).*" _ key)
+(string-append key
+   "'" (assoc-ref outputs "out") 
"/lib/zathura'\n")))
+ #t)
 (home-page "https://pwmt.org/projects/zathura-ps/;)
 (synopsis "PS support for zathura (libspectre backend)")
 (description "The zathura-ps plugin adds PS support to zathura



05/07: gnu: zathura-djvu: Update to 0.2.8.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch staging
in repository guix.

commit 7d475dd4ece966faae71323f309b65314b27a5a3
Author: Tobias Geerinckx-Rice 
Date:   Mon Mar 19 20:37:01 2018 +0100

gnu: zathura-djvu: Update to 0.2.8.

* gnu/packages/pdf.scm (zathura-djvu): Update to 0.2.8.
[build-system]: Switch to the Meson build system.
[arguments]: Trim accordingly.  Add a new ‘patch-plugin-directory’
phase.
---
 gnu/packages/pdf.scm | 24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 77d78bb..151143a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -384,27 +384,33 @@ using libspectre.")
 (define-public zathura-djvu
   (package
 (name "zathura-djvu")
-(version "0.2.7")
+(version "0.2.8")
 (source (origin
   (method url-fetch)
   (uri
(string-append 
"https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-;
-  version ".tar.gz"))
+  version ".tar.xz"))
   (sha256
(base32
-"1sbfdsyp50qc85xc4458sn4w1rv1qbygdwmcr5kjlfpsmdq98vhd"
+"0axkv1crdxn0z44whaqp2ibkdqcykhjnxk7qzms0dp1b67an9rnh"
 (native-inputs `(("pkg-config" ,pkg-config)))
 (inputs
  `(("djvulibre" ,djvulibre)
("zathura" ,zathura)))
-(build-system gnu-build-system)
+(build-system meson-build-system)
 (arguments
- `(#:make-flags (list (string-append "PREFIX=" %output)
-  (string-append "PLUGINDIR=" %output "/lib/zathura")
-  "CC=gcc")
-   #:tests? #f ; Package does not contain tests.
+ `(#:tests? #f  ; package does not contain tests
#:phases
-   (modify-phases %standard-phases (delete 'configure
+   (modify-phases %standard-phases
+ (add-after 'unpack 'patch-plugin-directory
+   ;; Something of a regression in 0.2.8: the new Meson build system
+   ;; now hard-codes an incorrect plugin directory.  Fix it.
+   (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "meson.build"
+   (("(install_dir:).*" _ key)
+(string-append key
+   "'" (assoc-ref outputs "out") 
"/lib/zathura'\n")))
+ #t)
 (home-page "https://pwmt.org/projects/zathura-djvu/;)
 (synopsis "DjVu support for zathura (DjVuLibre backend)")
 (description "The zathura-djvu plugin adds DjVu support to zathura



branch staging updated (cf0d6d8 -> 0ed9905)

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a change to branch staging
in repository guix.

  from  cf0d6d8   gnu: meson: Update to 0.46.0.
   new  bba29e1   gnu: girara: Update to 0.2.9.
   new  eb6a5da   gnu: zathura: Update to 0.3.9.
   new  02fcc6f   gnu: zathura-cb: Update to 0.1.8.
   new  06dbfb5   gnu: zathura-ps: Update to 0.2.6.
   new  7d475dd   gnu: zathura-djvu: Update to 0.2.8.
   new  aac2006   gnu: zathura-pdf-mupdf: Update to 0.3.3.
   new  0ed9905   gnu: zathura-pdf-poppler: Update to 0.2.9.

The 7 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/gtk.scm |  17 +++---
 gnu/packages/pdf.scm | 143 +++
 2 files changed, 92 insertions(+), 68 deletions(-)



01/07: gnu: girara: Update to 0.2.9.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch staging
in repository guix.

commit bba29e106b55152f70f7cec745e24bc077e9a797
Author: Tobias Geerinckx-Rice 
Date:   Mon Mar 19 18:48:27 2018 +0100

gnu: girara: Update to 0.2.9.

* gnu/packages/gtk.scm (girara): Update to 0.2.9.
[build-system]: Switch to Meson build system.
[arguments]: Trim accordingly.
---
 gnu/packages/gtk.scm | 17 ++---
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index d2b0993..de0f314 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -41,6 +41,7 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
   #:use-module (guix build-system waf)
@@ -1368,15 +1369,15 @@ and routines to assist in editing internationalized 
text.")
 (define-public girara
   (package
 (name "girara")
-(version "0.2.8")
+(version "0.2.9")
 (source (origin
   (method url-fetch)
   (uri
(string-append 
"https://pwmt.org/projects/girara/download/girara-;
-  version ".tar.gz"))
+  version ".tar.xz"))
   (sha256
(base32
-"18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98"
+"0lkxrfna818wkkr2f6mdzf15y5z8xl1b9592ylmzjbqsqya3w7x8"
 (native-inputs `(("pkg-config" ,pkg-config)
  ("check" ,check)
  ("gettext" ,gettext-minimal)
@@ -1385,13 +1386,7 @@ and routines to assist in editing internationalized 
text.")
 ;; Listed in 'Requires.private' of 'girara.pc'.
 (propagated-inputs `(("gtk+" ,gtk+)))
 (arguments
- `(#:make-flags
-   `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
- "COLOR=0" "CC=gcc")
-   #:test-target "test"
-   #:disallowed-references (,xorg-server-1.19.3)
-   #:phases (modify-phases %standard-phases
-  (delete 'configure)
+ `(#:phases (modify-phases %standard-phases
   (add-before 'check 'start-xserver
 ;; Tests require a running X server.
 (lambda* (#:key inputs #:allow-other-keys)
@@ -1407,7 +1402,7 @@ and routines to assist in editing internationalized 
text.")
 (setenv "DBUS_FATAL_WARNINGS" "0")
 (zero? (system (string-append xorg-server "/bin/Xvfb "
   display " &")
-(build-system gnu-build-system)
+(build-system meson-build-system)
 (home-page "https://pwmt.org/projects/girara/;)
 (synopsis "Library for minimalistic gtk+3 user interfaces")
 (description "Girara is a library that implements a user interface that



branch master updated (9eecf9b -> a2cfe19)

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a change to branch master
in repository guix.

  from  9eecf9b   gnu: gimp: Update to 2.10.0.
   new  a2cfe19   gnu: Use HTTPS for www.boost.org.

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/bioinformatics.scm | 2 +-
 gnu/packages/boost.scm  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)



01/01: gnu: Use HTTPS for www.boost.org.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit a2cfe190411724eaf0c38777018367724c9007a5
Author: Tobias Geerinckx-Rice 
Date:   Tue May 1 06:50:34 2018 +0200

gnu: Use HTTPS for www.boost.org.

* gnu/packages/bioinformatics.scm (libgff)[license]: Use HTTPS.
* gnu/packages/boost.scm (boost-sync)[license]: Likewise.
(boost)[license]: Likewise.
[home-page]: Likewise, and use canonical ‘www’ subdomain.
---
 gnu/packages/bioinformatics.scm | 2 +-
 gnu/packages/boost.scm  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 019c46a..98149f2 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -11738,7 +11738,7 @@ accurate as existing quantification tools.")
 code that is used in the Cufflinks codebase.  The goal of this library is to
 provide this functionality without the necessity of drawing in a heavy-weight
 dependency like SeqAn.")
-(license (license:x11-style "http://www.boost.org/LICENSE_1_0.txt;
+(license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt;
 
 (define-public libdivsufsort
   (package
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index d347674..cdfbda6 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -106,12 +106,12 @@
(lambda* (#:key outputs make-flags #:allow-other-keys)
  (zero? (apply system* "./b2" "install" make-flags)))
 
-(home-page "http://boost.org;)
+(home-page "https://www.boost.org;)
 (synopsis "Peer-reviewed portable C++ source libraries")
 (description
  "A collection of libraries intended to be widely useful, and usable
 across a broad spectrum of applications.")
-(license (license:x11-style "http://www.boost.org/LICENSE_1_0.txt;
+(license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt;
 "Some components have other similar 
licences."
 
 (define-public boost-1.66
@@ -158,7 +158,7 @@ across a broad spectrum of applications.")
   (description "The Boost.Sync library provides mutexes, semaphores, locks
 and events and other thread related facilities.  Boost.Sync originated from
 Boost.Thread.")
-  (license (license:x11-style "http://www.boost.org/LICENSE_1_0.txt;)
+  (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt;)
 
 (define-public mdds
   (package



branch core-updates-next updated (4eef81d -> ca2c342)

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a change to branch core-updates-next
in repository guix.

  from  4eef81d   gnu: cups-filters: Update to 1.20.3.
   new  ca2c342   gnu: boost: Update to 1.67.0.

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/boost.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



01/01: gnu: boost: Update to 1.67.0.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch core-updates-next
in repository guix.

commit ca2c342181771b83d46a94aec9786f8dd0e0a0b8
Author: Tobias Geerinckx-Rice 
Date:   Tue May 1 06:39:40 2018 +0200

gnu: boost: Update to 1.67.0.

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

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 6b17e30..6f96e55 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -43,7 +43,7 @@
 (define-public boost
   (package
 (name "boost")
-(version "1.66.0")
+(version "1.67.0")
 (source (origin
   (method url-fetch)
   (uri (string-append
@@ -52,7 +52,7 @@
 ".tar.bz2"))
   (sha256
(base32
-"1aaw48cmimsskzgiclwn0iifp62a5iw9cbqrhfari876af1828ap"))
+"1fmdlmkzsrd46wwk834jsi2ypxj68w2by0rfcg2pzrafk5rck116"))
   (patches (search-patches "boost-fix-icu-build.patch"
 (build-system gnu-build-system)
 (inputs `(("icu4c" ,icu4c)



01/01: gnu: cups-filters: Update to 1.20.3.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch core-updates-next
in repository guix.

commit 4eef81d9ae5216829e74a803db1ab1a156a2aee0
Author: Tobias Geerinckx-Rice 
Date:   Tue May 1 06:27:32 2018 +0200

gnu: cups-filters: Update to 1.20.3.

* gnu/packages/cups.scm (cups-filters): Update to 1.20.3.
---
 gnu/packages/cups.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 4ff79bd..501cadd 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -50,7 +50,7 @@
 (define-public cups-filters
   (package
 (name "cups-filters")
-(version "1.20.1")
+(version "1.20.3")
 (source(origin
   (method url-fetch)
   (uri
@@ -58,7 +58,7 @@
   "cups-filters-" version ".tar.xz"))
   (sha256
(base32
-"0qix1whz5n4ijnl6d44f1v8nzkpv99wqjyrby8vx6xnpskw5hsxk"))
+"1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv"))
   (modules '((guix build utils)))
   (snippet
;; install backends, banners and filters to cups-filters output



01/01: gnu: cups-minimal, cups: Update to 2.2.7.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch core-updates-next
in repository guix.

commit b745e216e4e17272d2ccd8f92acd6a9065db9112
Author: Tobias Geerinckx-Rice 
Date:   Tue May 1 06:12:59 2018 +0200

gnu: cups-minimal, cups: Update to 2.2.7.

* gnu/packages/cups.scm (cups-minimal): Update to 2.2.7.
[source]: Add patch to build without LINUX-PAM.
* gnu/packages/patches/cups-fix-builds-without-PAM.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk   |   1 +
 gnu/packages/cups.scm  |   7 +-
 .../patches/cups-fix-builds-without-PAM.patch  | 201 +
 3 files changed, 207 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 74e86d9..4fa88e3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -616,6 +616,7 @@ dist_patch_DATA =   
\
   %D%/packages/patches/crossmap-allow-system-pysam.patch   \
   %D%/packages/patches/clucene-contribs-lib.patch   \
   %D%/packages/patches/cube-nocheck.patch  \
+  %D%/packages/patches/cups-fix-builds-without-PAM.patch   \
   %D%/packages/patches/cursynth-wave-rand.patch\
   %D%/packages/patches/cvs-2017-12836.patch\
   %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch  \
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index a9cc3ac..4ff79bd 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -173,7 +173,7 @@ filters for the PDF-centric printing workflow introduced by 
OpenPrinting.")
 (define-public cups-minimal
   (package
 (name "cups-minimal")
-(version "2.2.6")
+(version "2.2.7")
 (source
  (origin
(method url-fetch)
@@ -181,7 +181,10 @@ filters for the PDF-centric printing workflow introduced 
by OpenPrinting.")
version "/cups-" version "-source.tar.gz"))
(sha256
 (base32
- "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"
+ "0spaqv943bzzq31gqdp73934jgyhhlbzdmgvrmf5cxvhfdxn6jrw"))
+   ;; “PAM will soon [in 2.3.x] be required for authentication, period.”
+   ;; 
+   (patches (search-patches "cups-fix-builds-without-PAM.patch"
 (build-system gnu-build-system)
 (arguments
  `(#:configure-flags
diff --git a/gnu/packages/patches/cups-fix-builds-without-PAM.patch 
b/gnu/packages/patches/cups-fix-builds-without-PAM.patch
new file mode 100644
index 000..cf51bfb
--- /dev/null
+++ b/gnu/packages/patches/cups-fix-builds-without-PAM.patch
@@ -0,0 +1,201 @@
+From 570933a6a3597371bae1beeb754ee8711d6305ab Mon Sep 17 00:00:00 2001
+From: Michael R Sweet 
+Date: Mon, 2 Apr 2018 20:05:13 -0400
+Subject: [PATCH] Fix builds without PAM (Issue #5283)
+
+---
+ CHANGES.md   |   8 +++-
+ scheduler/auth.c | 134 ++-
+ 2 files changed, 11 insertions(+), 131 deletions(-)
+
+diff --git a/CHANGES.md b/CHANGES.md
+index f568f35af..e8fc1fbdd 100644
+--- a/CHANGES.md
 b/CHANGES.md
+@@ -1,7 +1,13 @@
+-CHANGES - 2.2.7 - 2018-03-22
++CHANGES - 2.2.8 - 2018-04-02
+ 
+ 
+ 
++Changes in CUPS v2.2.8
++--
++
++- Fixed builds without PAM (Issue #5283)
++
++
+ Changes in CUPS v2.2.7
+ --
+ 
+diff --git a/scheduler/auth.c b/scheduler/auth.c
+index 8b134b5d7..fa4e2715d 100644
+--- a/scheduler/auth.c
 b/scheduler/auth.c
+@@ -1,8 +1,8 @@
+ /*
+  * Authorization routines for the CUPS scheduler.
+  *
+- * Copyright 2007-2016 by Apple Inc.
+- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
++ * Copyright © 2007-2018 by Apple Inc.
++ * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
+  *
+  * This file contains Kerberos support code, copyright 2006 by
+  * Jelmer Vernooij.
+@@ -71,9 +71,6 @@ static int   check_authref(cupsd_client_t *con, 
const char *right);
+ static intcompare_locations(cupsd_location_t *a,
+ cupsd_location_t *b);
+ static cupsd_authmask_t   *copy_authmask(cupsd_authmask_t *am, void 
*data);
+-#if !HAVE_LIBPAM
+-static char   *cups_crypt(const char *pw, const char *salt);
+-#endif /* !HAVE_LIBPAM */
+ static void   free_authmask(cupsd_authmask_t *am, void *data);
+ #if HAVE_LIBPAM
+ static intpam_func(int, const struct pam_message **,
+@@ -694,14 +691,14 @@ cupsdAuthorize(cupsd_client_t *con)  /* I - Client 
connection */
+   * client...
+   */
+ 
+-  pass = cups_crypt(password, pw->pw_passwd);
++  pass = crypt(password, pw->pw_passwd);
+ 
+   if (!pass || strcmp(pw->pw_passwd, pass))
+   {
+ #  ifdef HAVE_SHADOW_H
+ if (spw)
+ {
+-  

branch core-updates-next updated (5ecd5fe -> b745e21)

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a change to branch core-updates-next
in repository guix.

  from  5ecd5fe   gnu: libgpg-error: Update to 1.29.
   new  b745e21   gnu: cups-minimal, cups: Update to 2.2.7.

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/cups.scm  |   7 +-
 .../patches/cups-fix-builds-without-PAM.patch  | 201 +
 3 files changed, 207 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/cups-fix-builds-without-PAM.patch



03/05: gnu: file: Update to 5.33.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch core-updates-next
in repository guix.

commit 32c18fcb3c3cb10303aa4ef07571867e8ce3fe8d
Author: Tobias Geerinckx-Rice 
Date:   Wed Apr 18 03:34:17 2018 +0200

gnu: file: Update to 5.33.

* gnu/packages/file.scm (file): Update to 5.33.
---
 gnu/packages/file.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm
index 0473c51..78f0360 100644
--- a/gnu/packages/file.scm
+++ b/gnu/packages/file.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013 Andreas Enge 
 ;;; Copyright © 2014, 2015 Mark H Weaver 
 ;;; Copyright © 2016, 2017 Efraim Flashner 
+;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,14 +29,14 @@
 (define-public file
   (package
 (name "file")
-(version "5.32")
+(version "5.33")
 (source (origin
   (method url-fetch)
   (uri (string-append "ftp://ftp.astron.com/pub/file/file-;
   version ".tar.gz"))
   (sha256
(base32
-"0l1bfa0icng9vdwya00ff48fhvjazi5610ylbhl35qi13d6xqfc6"
+"1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw"
(build-system gnu-build-system)
 
;; When cross-compiling, this package depends upon a native install of



02/05: gnu: poppler: Update to 0.64.0.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch core-updates-next
in repository guix.

commit 48869860bed868708c3b830da0fd94886fab3af0
Author: Tobias Geerinckx-Rice 
Date:   Tue May 1 03:28:48 2018 +0200

gnu: poppler: Update to 0.64.0.

* gnu/packages/pdf.scm (poppler): Update to 0.64.0.
---
 gnu/packages/pdf.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index c9a5369..ca3a601 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2017 Leo Famulari 
 ;;; Copyright © 2017 Alex Vong 
 ;;; Copyright © 2017 Rene Saavedra 
-;;; Copyright © 2017 Tobias Geerinckx-Rice 
+;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -79,14 +79,14 @@
 (define-public poppler
   (package
(name "poppler")
-   (version "0.63.0")
+   (version "0.64.0")
(source (origin
 (method url-fetch)
 (uri (string-append "https://poppler.freedesktop.org/poppler-;
 version ".tar.xz"))
 (sha256
  (base32
-  "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17"
+  "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj"
(build-system cmake-build-system)
;; FIXME:
;;  use libcurl:no



01/05: gnu: xz: Update to 5.2.4.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch core-updates-next
in repository guix.

commit 957aac763bc7fcad5fec362938be04cdd9b2f055
Author: Tobias Geerinckx-Rice 
Date:   Mon Apr 30 21:19:04 2018 +0200

gnu: xz: Update to 5.2.4.

* gnu/packages/compression.scm (xz): Update to 5.2.4.
---
 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 6f44c4f..4a34e89 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -373,7 +373,7 @@ compressed with pbzip2 can be decompressed with bzip2).")
 (define-public xz
   (package
(name "xz")
-   (version "5.2.3")
+   (version "5.2.4")
(source (origin
 (method url-fetch)
 (uri (list (string-append "http://tukaani.org/xz/xz-; version
@@ -382,7 +382,7 @@ compressed with pbzip2 can be decompressed with bzip2).")
   version ".tar.gz")))
 (sha256
  (base32
-  "1jr8pxnz55ifc8cvp3ivgl79ph9iik5aypsc9cma228aglsqp4ki"
+  "0ibi2zsfaz6l756spjwc5rayf4ckgc9hwmy8qinppcyk4svz64mm"
(build-system gnu-build-system)
(synopsis "General-purpose data compression")
(description



branch core-updates-next updated (c98fe1d -> 5ecd5fe)

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a change to branch core-updates-next
in repository guix.

  from  c98fe1d   gnu: cmake: Update to 3.11.1.
   new  957aac7   gnu: xz: Update to 5.2.4.
   new  4886986   gnu: poppler: Update to 0.64.0.
   new  32c18fc   gnu: file: Update to 5.33.
   new  38e4d59   gnu: libjpeg: Update to 9c.
   new  5ecd5fe   gnu: libgpg-error: Update to 1.29.

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/compression.scm   |  4 +-
 gnu/packages/file.scm  |  5 +-
 gnu/packages/gnupg.scm |  5 +-
 gnu/packages/image.scm |  4 +-
 .../patches/libgpg-error-aarch64-logging-fix.patch | 58 --
 gnu/packages/pdf.scm   |  6 +--
 7 files changed, 12 insertions(+), 71 deletions(-)
 delete mode 100644 gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch



05/05: gnu: libgpg-error: Update to 1.29.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch core-updates-next
in repository guix.

commit 5ecd5fefd0e9fb0965662f2094c16363325ba614
Author: Tobias Geerinckx-Rice 
Date:   Tue May 1 03:45:03 2018 +0200

gnu: libgpg-error: Update to 1.29.

* gnu/packages/gnupg.scm (libgpg-error): Update to 1.29.
[source]: Remove upstreamed patch.
* gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk   |  1 -
 gnu/packages/gnupg.scm |  5 +-
 .../patches/libgpg-error-aarch64-logging-fix.patch | 58 --
 3 files changed, 2 insertions(+), 62 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index e2dc64b..74e86d9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -850,7 +850,6 @@ dist_patch_DATA =   
\
   %D%/packages/patches/libgdata-glib-duplicate-tests.patch \
   %D%/packages/patches/libgnome-encoding.patch \
   %D%/packages/patches/libgnomeui-utf8.patch   \
-  %D%/packages/patches/libgpg-error-aarch64-logging-fix.patch  \
   %D%/packages/patches/libgxps-CVE-2017-11590.patch\
   %D%/packages/patches/libffi-3.2.1-complex-alpha.patch\
   %D%/packages/patches/libjxr-fix-function-signature.patch \
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 17207e2..df86ee2 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -69,7 +69,7 @@
 (define-public libgpg-error
   (package
 (name "libgpg-error")
-(version "1.28")
+(version "1.29")
 (source
  (origin
   (method url-fetch)
@@ -77,8 +77,7 @@
   version ".tar.bz2"))
   (sha256
(base32
-"0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry"))
-  (patches (search-patches "libgpg-error-aarch64-logging-fix.patch"
+"1smihcrhkfy58kazjaigmfbagy52rw98fqfsv1x7ml8razx2dsgc"
 (build-system gnu-build-system)
 (home-page "https://gnupg.org;)
 (synopsis "Library of error values for GnuPG components")
diff --git a/gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch 
b/gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch
deleted file mode 100644
index d848d63..000
--- a/gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=patch;h=791177de023574223eddf7288eb7c5a0721ac623
-
-From 791177de023574223eddf7288eb7c5a0721ac623 Mon Sep 17 00:00:00 2001
-From: Werner Koch 
-Date: Sun, 18 Mar 2018 17:39:43 +0100
-Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list.
-
-* src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of
-NULL.
---
-
-Fix
-Suggested-by: Jakub Wilk 
-
-Signed-off-by: Werner Koch 

- src/logging.c | 18 ++
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/src/logging.c b/src/logging.c
-index 1a4f620..d01f974 100644
 a/src/logging.c
-+++ b/src/logging.c
-@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void)
- 
- 
- /* Print a hexdump of (BUFFER,LENGTH).  With FMT passed as NULL print
-- * just the raw dump, with FMT being an empty string, print a trailing
-- * linefeed, otherwise print an entire debug line with the expanded
-- * FMT followed by a possible wrapped hexdump and a final LF.  */
-+ * just the raw dump (in this case ARG_PTR is not used), with FMT
-+ * being an empty string, print a trailing linefeed, otherwise print
-+ * an entire debug line with the expanded FMT followed by a possible
-+ * wrapped hexdump and a final LF.  */
- void
- _gpgrt_logv_printhex (const void *buffer, size_t length,
-   const char *fmt, va_list arg_ptr)
-@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length,
-   va_end (arg_ptr);
- }
-   else
--_gpgrt_logv_printhex (buffer, length, NULL, NULL);
-+{
-+  /* va_list is not necessary a pointer and thus we can't use NULL
-+   * because that would conflict with platforms using a straight
-+   * struct for it (e.g. arm64).  We use a dummy variable instead;
-+   * the static is a simple way zero it out so to not get
-+   * complains about uninitialized use.  */
-+  static va_list dummy_argptr;
-+
-+  _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr);
-+}
- }
- 
- 
--- 
-2.8.0.rc3
-



04/05: gnu: libjpeg: Update to 9c.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch core-updates-next
in repository guix.

commit 38e4d5956f8d585b1c0263a1a6c79e749d7e7c90
Author: Tobias Geerinckx-Rice 
Date:   Tue May 1 03:34:47 2018 +0200

gnu: libjpeg: Update to 9c.

* gnu/packages/image.scm (libjpeg): Update to 9c.
---
 gnu/packages/image.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index a6d8b32..5a3542b 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -251,13 +251,13 @@ files.  It can compress them as much as 40% losslessly.")
 (define-public libjpeg
   (package
(name "libjpeg")
-   (version "9b")
+   (version "9c")
(source (origin
 (method url-fetch)
 (uri (string-append "http://www.ijg.org/files/jpegsrc.v;
version ".tar.gz"))
 (sha256 (base32
- "0lnhpahgdwlrkd41lx6cr90r199f8mc6ydlh7jznj5klvacd63r4"
+ "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5"
(build-system gnu-build-system)
(synopsis "Library for handling JPEG files")
(description



01/06: gnu: Add libmypaint.

2018-04-30 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 657687d33827ed971b9a84bdda5494ccd0cf1388
Author: Leo Famulari 
Date:   Fri Apr 27 19:14:04 2018 -0400

gnu: Add libmypaint.

* gnu/packages/gimp.scm (libmypaint): New variable.
---
 gnu/packages/gimp.scm | 29 +
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 2483885..6027821 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -39,6 +39,7 @@
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xorg))
 
 (define-public babl
@@ -243,3 +244,31 @@ an image, allowing you to work with the transformed image 
inside GIMP.  You
 can draw or apply filters in fourier space and get the modified image with an
 inverse fourier transform.")
 (license license:gpl3+)))
+
+(define-public libmypaint
+  (package
+(name "libmypaint")
+(version "1.3.0")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "https://github.com/mypaint/libmypaint/;
+  "releases/download/v" version "/libmypaint-"
+  version ".tar.xz"))
+  (sha256
+   (base32
+"0wd6jk69vmhsq1mdw96v0fh7b28n3glkr5ca466zcq7agzaxj1va"
+(build-system gnu-build-system)
+(native-inputs
+ `(("intltool" ,intltool)
+   ("pkg-config" ,pkg-config)))
+;; As needed by 'libmypaint.pc'.
+(propagated-inputs
+ `(("json-c" ,json-c)
+   ("gobject-introspection" ,gobject-introspection)))
+(inputs
+ `(("glib" ,glib)))
+(synopsis "Artistic brushes library")
+(description "Libmypaint, also called \"brushlib\", is a library for making
+brushstrokes which is used by MyPaint and GIMP.")
+(home-page "http://mypaint.org;)
+(license license:isc)))



03/06: gnu: Add poppler-data.

2018-04-30 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 6d161406659fd9166da81162db8b2f42de1cd50b
Author: Leo Famulari 
Date:   Fri Apr 27 22:03:03 2018 -0400

gnu: Add poppler-data.

* gnu/packages/pdf.scm (poppler-data): New variable.
---
 gnu/packages/pdf.scm | 32 +++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 7762b06..9e5af5f 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2016, 2017 Ludovic Courtès 
 ;;; Copyright © 2016 Julien Lepiller 
 ;;; Copyright © 2016 Arun Isaac 
-;;; Copyright © 2017 Leo Famulari 
+;;; Copyright © 2017, 2018 Leo Famulari 
 ;;; Copyright © 2017 Alex Vong 
 ;;; Copyright © 2017 Rene Saavedra 
 ;;; Copyright © 2017 Tobias Geerinckx-Rice 
@@ -124,6 +124,36 @@
(license license:gpl2+)
(home-page "https://poppler.freedesktop.org/;)))
 
+(define-public poppler-data
+  (package
+(name "poppler-data")
+(version "0.4.9")
+(source (origin
+  (method url-fetch)
+  (uri (string-append 
"https://poppler.freedesktop.org/poppler-data;
+  "-" version ".tar.gz"))
+  (sha256
+   (base32
+"04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z"
+(build-system gnu-build-system)
+(arguments
+ '(#:tests? #f ; no test suite
+   #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")))
+   #:phases
+   (modify-phases %standard-phases
+ ;; The package only provides some data files, so there is nothing to
+ ;; build.
+ (delete 'configure)
+ (delete 'build
+(synopsis "Poppler encoding files for rendering of CJK and Cyrillic text")
+(description "This package provides optional encoding files for Poppler.
+When present, Poppler is able to correctly render CJK and Cyrillic text.")
+(home-page (package-home-page poppler))
+;; See COPYING in the source distribution for more information about
+;; the licensing.
+(license (list license:bsd-3
+   license:gpl2
+
 (define-public poppler-qt4
   (package (inherit poppler)
(name "poppler-qt4")



06/06: gnu: gimp: Update to 2.10.0.

2018-04-30 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 9eecf9bc13bd3746ce5a073c59920110c6cf3dd7
Author: Leo Famulari 
Date:   Mon Apr 30 16:29:36 2018 -0400

gnu: gimp: Update to 2.10.0.

* gnu/packages/gimp.scm (gimp): Update to 2.10.0.
[inputs]: Add glib-networking, gexiv2, libmypaint, mypaint-brushes and
poppler-data.
[native-inputs]: Add glib:bin.
[source]: Remove obsolete patches and use HTTPS URL.
[home-page]: Use HTTPS URL.
* gnu/packages/patches/gimp-CVE-2017-17784.patch,
gnu/packages/patches/gimp-CVE-2017-17785.patch,
gnu/packages/patches/gimp-CVE-2017-17786.patch,
gnu/packages/patches/gimp-CVE-2017-17787.patch,
gnu/packages/patches/gimp-CVE-2017-17789.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
---
 gnu/local.mk   |   5 -
 gnu/packages/gimp.scm  |  24 ++--
 gnu/packages/patches/gimp-CVE-2017-17784.patch |  41 --
 gnu/packages/patches/gimp-CVE-2017-17785.patch | 171 -
 gnu/packages/patches/gimp-CVE-2017-17786.patch |  94 --
 gnu/packages/patches/gimp-CVE-2017-17787.patch |  42 --
 gnu/packages/patches/gimp-CVE-2017-17789.patch |  48 ---
 7 files changed, 13 insertions(+), 412 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index c7faab4..e78e4c8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -706,11 +706,6 @@ dist_patch_DATA =  
\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/ghostscript-runpath.patch   \
   %D%/packages/patches/giflib-make-reallocarray-private.patch  \
-  %D%/packages/patches/gimp-CVE-2017-17784.patch   \
-  %D%/packages/patches/gimp-CVE-2017-17785.patch   \
-  %D%/packages/patches/gimp-CVE-2017-17786.patch   \
-  %D%/packages/patches/gimp-CVE-2017-17787.patch   \
-  %D%/packages/patches/gimp-CVE-2017-17789.patch   \
   %D%/packages/patches/glib-networking-ssl-cert-file.patch \
   %D%/packages/patches/glib-respect-datadir.patch  \
   %D%/packages/patches/glib-tests-timer.patch  \
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 38343f2..f2e020b 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016 Ricardo Wurmus 
 ;;; Copyright © 2016, 2017 Efraim Flashner 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2018 Leo Famulari 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -115,23 +116,18 @@ buffers.")
 (define-public gimp
   (package
 (name "gimp")
-(version "2.8.22")
+(version "2.10.0")
 (source (origin
   (method url-fetch)
-  (uri (string-append "http://download.gimp.org/pub/gimp/v;
+  (uri (string-append "https://download.gimp.org/pub/gimp/v;
   (version-major+minor version)
   "/gimp-" version ".tar.bz2"))
-  (patches (search-patches "gimp-CVE-2017-17784.patch"
-   "gimp-CVE-2017-17785.patch"
-   "gimp-CVE-2017-17786.patch"
-   "gimp-CVE-2017-17787.patch"
-   "gimp-CVE-2017-17789.patch"))
   (sha256
(base32
-"12k3lp938qdc9cqj29scg55f3bb8iav2fysd29w0s49bqmfa71wi"
+"1qkxaigbfkx26xym5nzrgfrmn97cbnhn63v1saaha2nbi3xrdk3z"
 (build-system gnu-build-system)
 (outputs '("out"
-   "doc"));5 MiB of gtk-doc HTML
+   "doc"));9 MiB of gtk-doc HTML
 (arguments
  '(#:configure-flags (list (string-append "--with-html-dir="
   (assoc-ref %outputs "doc")
@@ -155,21 +151,27 @@ buffers.")
 (inputs
  `(("babl" ,babl)
("glib" ,glib)
+   ("glib-networking" ,glib-networking)
("libtiff" ,libtiff)
("libjpeg" ,libjpeg-8)
("atk" ,atk)
+   ("gexiv2" ,gexiv2)
("gtk+" ,gtk+-2)
+   ("libmypaint" ,libmypaint)
+   ("mypaint-brushes" ,mypaint-brushes)
("exif" ,libexif); optional, EXIF + XMP support
("lcms" ,lcms)   ; optional, color management
("librsvg" ,librsvg) ; optional, SVG support
("poppler" ,poppler) ; optional, PDF support
+   ("poppler-data" ,poppler-data)
("python" ,python-2) ; optional, Python support
("python2-pygtk" ,python2-pygtk) ; optional, Python support
("gegl" ,gegl)))
 (native-inputs
- `(("pkg-config" ,pkg-config)
+ `(("glib:bin" ,glib "bin") ; for 

04/06: gnu: gegl: Update to 0.4.

2018-04-30 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit f62633ca2d4c6b3f3e54b56797dd07135571f372
Author: Leo Famulari 
Date:   Fri Apr 27 22:37:00 2018 -0400

gnu: gegl: Update to 0.4.

* gnu/packages/gimp.scm (gegl): Update to 0.4.
[inputs]: Move babl and glib to propagated-inputs.
[propagated-inputs]: Add json-glib.
[arguments]: Re-enable the tests and remove the obsolete 'pre-build'
phase.
[source]: Use HTTPS URL.
* gnu/packages/patches/gegl-CVE-2012-4433.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk  |   1 -
 gnu/packages/gimp.scm |  36 ++--
 gnu/packages/patches/gegl-CVE-2012-4433.patch | 117 --
 3 files changed, 9 insertions(+), 145 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index a9a7e69..c7faab4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -697,7 +697,6 @@ dist_patch_DATA =   
\
   %D%/packages/patches/gd-CVE-2018-5711.patch  \
   %D%/packages/patches/gd-fix-tests-on-i686.patch  \
   %D%/packages/patches/gd-freetype-test-failure.patch  \
-  %D%/packages/patches/gegl-CVE-2012-4433.patch\
   %D%/packages/patches/gemma-intel-compat.patch\
   %D%/packages/patches/geoclue-config.patch\
   %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 0f27ceb..64fe04b 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -77,43 +77,25 @@ provided, as well as a framework to add new color models 
and data types.")
 (define-public gegl
   (package
 (name "gegl")
-(version "0.2.0")
+(version "0.4.0")
 (source (origin
   (method url-fetch)
-  (uri (list (string-append "http://download.gimp.org/pub/gegl/;
+  (uri (list (string-append "https://download.gimp.org/pub/gegl/;
 (string-take version 3)
 "/" name "-" version ".tar.bz2")))
   (sha256
(base32
-"09nlv06li9nrn74ifpm7223mxpg0s7cii702z72cpbwrjh6nlbnz"))
-  (patches (search-patches "gegl-CVE-2012-4433.patch"
+"1ighk4z8nlqrzyj8w97s140hzj59564l3xv6fpzbr97m1zx2nkfh"
 (build-system gnu-build-system)
 (arguments
- '(;; More than just the one test disabled below now fails; disable them
-   ;; all according to the rationale given below.
-   #:tests? #f
-   #:configure-flags '("LDFLAGS=-lm")
-   #:phases
-   (modify-phases %standard-phases
- (add-before 'build 'pre-build
-   (lambda _
- ;; This test program seems to crash on exit. Specifically, whilst
- ;; g_object_unreffing bufferA and bufferB - This seems to be a bug
- ;; in the destructor.  This is just a test program so will not 
have
- ;; any wider effect, although might be hiding another problem.
- ;; According to advice received on irc.gimp.org#gegl although 
0.2.0
- ;; is the latest released version, any bug reports against it will
- ;; be ignored.  So we are on our own.
- (substitute* "tools/img_cmp.c"
-   (("g_object_unref \\(buffer.\\);") ""))
-
- (substitute* "tests/compositions/Makefile"
-   (("/bin/sh") (which "sh")))
- #t)
-(inputs
+ '(#:configure-flags '("LDFLAGS=-lm")))
+;; These are propagated to satisfy 'gegl-0.4.pc'.
+(propagated-inputs
  `(("babl" ,babl)
("glib" ,glib)
-   ("cairo" ,cairo)
+   ("json-glib" ,json-glib)))
+(inputs
+ `(("cairo" ,cairo)
("pango" ,pango)
("libpng" ,libpng)
("libjpeg" ,libjpeg-8)))
diff --git a/gnu/packages/patches/gegl-CVE-2012-4433.patch 
b/gnu/packages/patches/gegl-CVE-2012-4433.patch
deleted file mode 100644
index 7352b78..000
--- a/gnu/packages/patches/gegl-CVE-2012-4433.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From: Michael Gilbert 
-Date: Mon, 9 Sep 2013 17:34:32 +0200
-Subject: Fix_CVE-2012-4433
-
-Multiple buffer overflow issues.
-
-Closes: #692435

- operations/external/ppm-load.c | 62 --
- 1 file changed, 53 insertions(+), 9 deletions(-)
-
-diff --git a/operations/external/ppm-load.c b/operations/external/ppm-load.c
-index efe6d56..465096d 100644
 a/operations/external/ppm-load.c
-+++ b/operations/external/ppm-load.c
-@@ -36,6 +36,7 @@ gegl_chant_file_path (path, _("File"), "", _("Path of file 
to load."))
- #include "gegl-chant.h"
- #include 
- #include 
-+#include 
- 
- typedef enum {
-   PIXMAP_ASCII  = 51,
-@@ -44,8 +45,8 @@ typedef enum {
- 
- typedef struct {
-   map_type   type;
--  

branch master updated (cb7c80f -> 9eecf9b)

2018-04-30 Thread Leo Famulari
lfam pushed a change to branch master
in repository guix.

  from  cb7c80f   services: prosody: Add a default value to the 
prosody-service-type.
   new  657687d   gnu: Add libmypaint.
   new  4b5c056   gnu: Add mypaint-brushes.
   new  6d16140   gnu: Add poppler-data.
   new  f62633c   gnu: gegl: Update to 0.4.
   new  08a7525   gnu: babl: Update to 0.1.46.
   new  9eecf9b   gnu: gimp: Update to 2.10.0.

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/local.mk   |   6 -
 gnu/packages/gimp.scm  | 121 +++--
 gnu/packages/patches/gegl-CVE-2012-4433.patch  | 117 -
 gnu/packages/patches/gimp-CVE-2017-17784.patch |  41 --
 gnu/packages/patches/gimp-CVE-2017-17785.patch | 171 -
 gnu/packages/patches/gimp-CVE-2017-17786.patch |  94 --
 gnu/packages/patches/gimp-CVE-2017-17787.patch |  42 --
 gnu/packages/patches/gimp-CVE-2017-17789.patch |  48 ---
 gnu/packages/pdf.scm   |  32 -
 9 files changed, 112 insertions(+), 560 deletions(-)
 delete mode 100644 gnu/packages/patches/gegl-CVE-2012-4433.patch
 delete mode 100644 gnu/packages/patches/gimp-CVE-2017-17784.patch
 delete mode 100644 gnu/packages/patches/gimp-CVE-2017-17785.patch
 delete mode 100644 gnu/packages/patches/gimp-CVE-2017-17786.patch
 delete mode 100644 gnu/packages/patches/gimp-CVE-2017-17787.patch
 delete mode 100644 gnu/packages/patches/gimp-CVE-2017-17789.patch



05/06: gnu: babl: Update to 0.1.46.

2018-04-30 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 08a752526df91de3a1779ccaa0946833618d775d
Author: Leo Famulari 
Date:   Sat Apr 28 16:32:48 2018 -0400

gnu: babl: Update to 0.1.46.

* gnu/packages/gimp.scm (babl): Update to 0.1.46.
---
 gnu/packages/gimp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 64fe04b..38343f2 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -46,7 +46,7 @@
 (define-public babl
   (package
 (name "babl")
-(version "0.1.40")
+(version "0.1.46")
 (source (origin
   (method url-fetch)
   (uri (list (string-append "https://download.gimp.org/pub/babl/;
@@ -60,7 +60,7 @@
 "/babl-" version ".tar.bz2")))
   (sha256
(base32
-"08cdl6rcfvkhqsnhb214xzr0wbrv0956xzlrzqxcb1k1madgjanh"
+"0nwyhvfca6m35wjcccvwca7fcihzgdfyc012qi703y5d3cxl1hmv"
 (build-system gnu-build-system)
 (home-page "http://gegl.org/babl/;)
 (synopsis "Image pixel format conversion library")



02/06: gnu: Add mypaint-brushes.

2018-04-30 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 4b5c056aeef246f331939f0093ff1a8fde268296
Author: Leo Famulari 
Date:   Fri Apr 27 19:56:13 2018 -0400

gnu: Add mypaint-brushes.

* gnu/packages/gimp.scm (mypaint-brushes): New variable.
---
 gnu/packages/gimp.scm | 28 
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 6027821..0f27ceb 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -28,6 +28,7 @@
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
@@ -272,3 +273,30 @@ inverse fourier transform.")
 brushstrokes which is used by MyPaint and GIMP.")
 (home-page "http://mypaint.org;)
 (license license:isc)))
+
+(define-public mypaint-brushes
+  (package
+(name "mypaint-brushes")
+(version "1.3.0")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "https://github.com/Jehan/mypaint-brushes/;
+  "archive/v" version ".tar.gz"))
+  (file-name (string-append name "-" version ".tar.gz"))
+  (sha256
+   (base32
+"055j2rgkav2024zl6y5hxb2ra0vbx58607d6sz7ml2351r1bcjvh"
+(build-system gnu-build-system)
+(arguments
+ '(#:phases
+   (modify-phases %standard-phases
+ (add-after 'unpack 'bootstrap
+   (lambda _ (invoke "sh" "./autogen.sh"))
+(native-inputs
+ `(("autoconf" ,autoconf)
+   ("automake" ,automake)))
+(synopsis "Default brushes for MyPaint")
+(description "This package provides the default set of brushes for
+MyPaint.")
+(home-page "https://github.com/Jehan/mypaint-brushes;)
+(license license:cc0)))



01/02: services: prosody: Add a description to the prosody-service-type.

2018-04-30 Thread Cl�ment Lassieur
snape pushed a commit to branch master
in repository guix.

commit 9c6a461cf0512b8f43f83837907f35cf2255077e
Author: Clément Lassieur 
Date:   Tue May 1 00:05:16 2018 +0200

services: prosody: Add a description to the prosody-service-type.

* gnu/services/messaging.scm (prosody-service-type)[description]: New field.
---
 gnu/services/messaging.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index 80ffed0..8ab1481 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -691,7 +691,9 @@ See also @url{https://prosody.im/doc/modules/mod_muc}.;
(service-extension account-service-type
   (const %prosody-accounts))
(service-extension activation-service-type
-  prosody-activation)
+  prosody-activation)))
+(description
+ "Run Prosody, a modern XMPP communication server.")))
 
 ;; A little helper to make it easier to document all those fields.
 (define (generate-documentation)



branch master updated (1697048 -> cb7c80f)

2018-04-30 Thread Cl�ment Lassieur
snape pushed a change to branch master
in repository guix.

  from  1697048   gnu: roguebox-adventures: Update to 2.2.1.
   new  9c6a461   services: prosody: Add a description to the 
prosody-service-type.
   new  cb7c80f   services: prosody: Add a default value to the 
prosody-service-type.

The 2 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/services/messaging.scm | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)



02/02: services: prosody: Add a default value to the prosody-service-type.

2018-04-30 Thread Cl�ment Lassieur
snape pushed a commit to branch master
in repository guix.

commit cb7c80f67de656025dee60785fb4b45ce2d7dacd
Author: Clément Lassieur 
Date:   Tue May 1 00:14:31 2018 +0200

services: prosody: Add a default value to the prosody-service-type.

* gnu/services/messaging.scm (prosody-service-type)[default-value]: New 
field.
---
 gnu/services/messaging.scm | 5 +
 1 file changed, 5 insertions(+)

diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index 8ab1481..273ba2c 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -692,6 +692,11 @@ See also @url{https://prosody.im/doc/modules/mod_muc}.;
   (const %prosody-accounts))
(service-extension activation-service-type
   prosody-activation)))
+(default-value (prosody-configuration
+(virtualhosts
+ (list
+  (virtualhost-configuration
+   (domain "localhost"))
 (description
  "Run Prosody, a modern XMPP communication server.")))
 



branch master updated (05c62b1 -> 1697048)

2018-04-30 Thread Kei Kebreau
kkebreau pushed a change to branch master
in repository guix.

  from  05c62b1   gnu: guix-register: Reduce the set of dependencies.
   new  1697048   gnu: roguebox-adventures: Update to 2.2.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/games.scm | 182 +++--
 1 file changed, 101 insertions(+), 81 deletions(-)



01/01: gnu: roguebox-adventures: Update to 2.2.1.

2018-04-30 Thread Kei Kebreau
kkebreau pushed a commit to branch master
in repository guix.

commit 1697048ff268bfe135214e75c7ebb5dd856ddcfc
Author: Kei Kebreau 
Date:   Mon Apr 30 11:20:15 2018 -0400

gnu: roguebox-adventures: Update to 2.2.1.

* gnu/packages/games.scm (roguebox-adventures): Update to 2.2.1.
[source]: Use url-fetch instead of git-fetch.
[arguments]: Rewrite install phase for update.
---
 gnu/packages/games.scm | 182 +++--
 1 file changed, 101 insertions(+), 81 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e5f8350..e4f87a6 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -773,90 +773,110 @@ utilizing the art assets from the @code{SuperTux} 
project.")
license:gpl3+
 
 (define-public roguebox-adventures
-  (let ((commit "19a2c340b34d5b4e7cc89118c7aedc058babbd93")
-(revision "1"))
-  (package
-(name "roguebox-adventures")
-(version (git-version "2.1.2" revision commit))
-(source
- (origin
-   (method git-fetch)
-   (uri
-(git-reference
- (url 
"https://git.postactiv.com/themightyglider/RogueBoxAdventures.git;)
- (commit commit)))
-   (file-name (git-file-name name version))
-   (sha256
-(base32
- "0afmg8fjdcs3sqdp5rc7irgr7riil8jwysfjn1imfxslf1wcx5ah"
-(build-system python-build-system)
-(arguments
- '(#:tests? #f ; no check target
-   #:phases
-   (modify-phases %standard-phases
- ;; no setup.py script
- (replace 'build
-   (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
-(data (string-append
-   out "/share/games/roguebox-adventures")))
-   ;; Use the correct data directory.
-   (substitute* '("main.py" "LIB/getch.py" "LIB/getch_gcwz.py")
- (("basic_path + os\\.sep + 'DATA'")
-  (string-append "'" data "'"))
- (("^basic_path.*$")
-  (string-append "basic_path ='" data "'\n")))
-   (substitute* "LIB/gra_files.py"
- (("basic_path = b_path\\.replace\\('/LIB',''\\)")
-  (string-append "basic_path ='" data "'\n")))
-
-   ;; The game must save in the user's home directory because
-   ;; the store is read-only.
-   (substitute* "main.py"
- (("home_save = False") "home_save = True")
- (("'icon_small.png'")
-  (string-append "'" data "/icon_small.png'"
- #t))
- (replace 'install
-   (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
-(bin (string-append out "/bin"))
-(data (string-append
-   out "/share/games/roguebox-adventures"))
-(doc (string-append
-  out "/share/doc/roguebox-adventures")))
-   (mkdir-p bin)
-   (mkdir-p doc)
-   (copy-file "main.py"
-  (string-append bin "/roguebox-adventures"))
-   (chmod (string-append bin "/roguebox-adventures") #o555)
-
-   (for-each (lambda (file)
-   (copy-recursively file
- (string-append data "/" 
file)))
- '("AUDIO" "FONT" "GRAPHIC" "LIB" "LICENSE"
-   "icon_big.png" "icon_small.png"))
-
-   (copy-recursively "DOC" doc)
-
-   (wrap-program (string-append bin "/roguebox-adventures")
- `("PYTHONPATH" ":" prefix (,(string-append data 
"/LIB")
- #t)
-(inputs
- `(("python-pygame" ,python-pygame)
-   ("python-tmx" ,python-tmx)))
-(home-page "https://rogueboxadventures.tuxfamily.org;)
-(synopsis "A classical roguelike/sandbox game")
-(description
- "RogueBox Adventures is a graphical roguelike with strong influences
+  (package
+(name "roguebox-adventures")
+(version "2.2.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "http://download.tuxfamily.org/rba/RogueBoxAdventures_v;
+ (string-join (string-split version #\.) "_") "_Source.zip"))
+   (file-name (string-append name "-" version ".zip"))
+   (sha256
+(base32
+ "0kmzdgnik8fsf3bg55546l77p3mfxn2awkzfzzdn20n82rd2babw"
+(build-system python-build-system)
+(arguments
+ `(#:tests? #f ; no check 

01/01: gnu: guix-register: Reduce the set of dependencies.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 05c62b1e1d34ec8e68de3f1d3d7a7218ef8993d7
Author: Ludovic Courtès 
Date:   Tue May 1 00:05:40 2018 +0200

gnu: guix-register: Reduce the set of dependencies.

* gnu/packages/package-management.scm (guix-register)[native-inputs]
[propagated-inputs]: New field.
---
 gnu/packages/package-management.scm | 9 +
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index e834f64..fe53e67 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -295,6 +295,15 @@ the Nix package manager.")
 (inherit guix)
 (properties `((hidden? . #t)))
 (name "guix-register")
+
+;; Use a minimum set of dependencies.
+(native-inputs
+ (fold alist-delete (package-native-inputs guix)
+   '("po4a" "graphviz" "help2man")))
+(propagated-inputs
+ `(("gnutls" ,gnutls)
+   ("guile-git" ,guile-git)))
+
 (arguments
  (substitute-keyword-arguments (package-arguments guix)
((#:tests? #f #f)



branch master updated (1170198 -> 05c62b1)

2018-04-30 Thread Ludovic Court�s
civodul pushed a change to branch master
in repository guix.

  from  1170198   gnu: Add amule.
   new  05c62b1   gnu: guix-register: Reduce the set of dependencies.

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/package-management.scm | 9 +
 1 file changed, 9 insertions(+)



12/12: gnu: Add amule.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 1170198d65181ef23bc6a5d130a2b47630cfbb62
Author: fis 
Date:   Sat Apr 7 03:44:36 2018 +0800

gnu: Add amule.

* gnu/packages/networking.scm (amule): New public variable.
* gnu/packages/patches/amule_crypto-6.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Signed-off-by: Ludovic Courtès 
---
 gnu/local.mk  |  1 +
 gnu/packages/networking.scm   | 63 +++
 gnu/packages/patches/amule-crypto-6.patch | 45 ++
 3 files changed, 109 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 5be445f..a9a7e69 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -557,6 +557,7 @@ dist_patch_DATA =   
\
   %D%/packages/patches/aegis-test-fixup-1.patch\
   %D%/packages/patches/aegis-test-fixup-2.patch\
   %D%/packages/patches/agg-am_c_prototype.patch\
+  %D%/packages/patches/amule-crypto-6.patch\
   %D%/packages/patches/ansible-wrap-program-hack.patch \
   %D%/packages/patches/antiword-CVE-2014-8123.patch\
   %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch  \
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index b9fb016..f7e5d23 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2017 Gábor Boskovits 
 ;;; Copyright © 2017 Thomas Danckaert 
 ;;; Copyright © 2018 Adam Van Ymeren 
+;;; Copyright © 2018 Fis Trivial 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -56,6 +57,7 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages dejagnu)
@@ -66,6 +68,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
@@ -84,6 +87,7 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages valgrind)
   #:use-module (gnu packages wm)
+  #:use-module (gnu packages wxwidgets)
   #:use-module (gnu packages xml)
   #:use-module (ice-9 match))
 
@@ -1702,3 +1706,62 @@ file for more details.")
;; src/libstrongswan/plugins/blowfish/blowfish_crypter.c
;; src/libstrongswan/plugins/des/des_crypter.c
license:bsd-4
+
+(define-public amule
+  (package
+(name "amule")
+(version "2.3.2")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"https://github.com/amule-project/amule/archive/;
+version ".tar.gz"))
+  (file-name (string-append name "-" version ".tar.gz"))
+  (sha256
+   (base32
+"1wvcj0n9xz03xz5c2xwp6dwfp7sqjhhwbki3m0lwikskpn9lkzk2"))
+  ;; Patch for adopting crypto++ >= 6.0.
+  (patches (search-patches "amule-crypto-6.patch"
+(build-system gnu-build-system)
+(arguments
+ `(#:phases
+   (modify-phases %standard-phases
+ (add-after 'patch-source-shebangs 'autogen
+   (lambda _
+ (invoke "sh" "autogen.sh")
+ #t)))
+   #:configure-flags
+   '("--disable-rpath"
+ "--enable-wxcas"
+ "--enable-cas"
+ "--enable-alc"
+ "--enable-alcc"
+ "--enable-xas"
+ "--enable-amulecmd"
+ "--enable-geoip"
+ "--enable-ccache"
+ "--enable-nls"
+ "--enable-optimize"
+ "--enable-amule-gui"
+ "--enable-amule-daemon"
+ "--enable-webserver"
+ "--with-denoise-level=0")))
+(native-inputs
+ `(("autoconf" ,autoconf)
+   ("automake" ,automake)
+   ("gettext-minimal" ,gettext-minimal)
+   ("perl" ,perl)))
+(inputs
+ `(("zlib" ,zlib)
+   ("crypto++" ,crypto++)
+   ("libpng" ,libpng)
+   ("wxwidgets-gtk2", wxwidgets-gtk2)))
+(home-page "http://amule.org/;)
+(synopsis "Peer-to-peer client for the eD2K and Kademlia networks")
+(description
+ "aMule is an eMule-like client for the eD2k and Kademlia peer-to-peer
+file sharing networks.  It includes a graphical user interface (GUI), a daemon
+allowing you to run a client with no graphical interface, and a Web GUI for
+remote access.  The @command{amulecmd} command allows you to control aMule
+remotely.")
+(license license:gpl2+)))
diff --git a/gnu/packages/patches/amule-crypto-6.patch 
b/gnu/packages/patches/amule-crypto-6.patch
new file 

06/12: gnu: guile-ics: Update to 0.2.0.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 291c2d57e8fd15e09ba8c753718efe48b3077389
Author: Ludovic Courtès 
Date:   Mon Apr 30 19:31:52 2018 +0200

gnu: guile-ics: Update to 0.2.0.

* gnu/packages/guile.scm (guile-ics): Update to 0.2.0.
---
 gnu/packages/guile.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 2af6f87..dd21a88 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -720,16 +720,16 @@ format is also supported.")
 (define-public guile-ics
   (package
 (name "guile-ics")
-(version "0.1.1")
+(version "0.2.0")
 (source (origin
   (method git-fetch)
   (uri (git-reference
 (url "https://github.com/artyom-poptsov/guile-ics;)
-(commit "v0.1.1")))
+(commit (string-append "v" version
   (file-name (string-append name "-" version "-checkout"))
   (sha256
(base32
-"1pvg6j48inpbq47hq00yh5hhl2qd2srvrx5yjl7w7ky1jsjadp86"
+"0qjjvadr7gibdq9jvwkmlkb4afsw9n2shfj9phpiadinxk3p4m2g"
 (build-system gnu-build-system)
 (arguments
  '(#:phases (modify-phases %standard-phases



09/12: gnu: guile-irregex: Switch to Guile 2.2.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 2863860b6ccee4761342eb15fe826938239b942c
Author: Ludovic Courtès 
Date:   Mon Apr 30 21:52:31 2018 +0200

gnu: guile-irregex: Switch to Guile 2.2.

* gnu/packages/guile.scm (guile-irregex)[inputs]: Switch to
GUILE-2.2.
(guile2.0-irregex): New variable.
(guile2.2-irregex): Define in terms of 'deprecated-package'.
---
 gnu/packages/guile.scm | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index a0d131b..770f7b6 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1078,7 +1078,7 @@ understand, extend, and port to host languages other than 
Scheme.")
(install-file "irregex.html" doc)
#t))
 (inputs
- `(("guile" ,guile-2.0)))
+ `(("guile" ,guile-2.2)))
 (home-page "http://synthcode.com/scheme/irregex;)
 (synopsis "S-expression based regular expressions")
 (description
@@ -1087,8 +1087,11 @@ string-based regular expressions.  It implements SRFI 
115 and is deeply
 inspired by the SCSH regular expression system.")
 (license license:bsd-3)))
 
+(define-public guile2.0-irregex
+  (package-for-guile-2.0 guile-irregex))
+
 (define-public guile2.2-irregex
-  (package-for-guile-2.2 guile-irregex))
+  (deprecated-package "guile2.2-irregex" guile-irregex))
 
 ;; There are two guile-gdbm packages, one using the FFI and one with
 ;; direct C bindings, hence the verbose name.



07/12: gnu: guile-ics: Switch to Guile 2.2.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit d573d8926def81df5a42e232099534cda4a39739
Author: Ludovic Courtès 
Date:   Mon Apr 30 19:32:13 2018 +0200

gnu: guile-ics: Switch to Guile 2.2.

* gnu/packages/guile.scm (guile-ics)[inputs]: Switch to GUILE-2.2.
[propagated-inputs]: Switch to GUILE-LIB.
---
 gnu/packages/guile.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index dd21a88..fd6dd60 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -746,8 +746,8 @@ format is also supported.")
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
-(inputs `(("guile" ,guile-2.0) ("which" ,which)))
-(propagated-inputs `(("guile-lib" ,guile2.0-lib)))
+(inputs `(("guile" ,guile-2.2) ("which" ,which)))
+(propagated-inputs `(("guile-lib" ,guile-lib)))
 (home-page "https://github.com/artyom-poptsov/guile-ics;)
 (synopsis "Guile parser library for the iCalendar format")
 (description



05/12: gnu: geiser: Switch to Guile 2.2.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit bc96a8b57bfe9fd0afc4305f8ee34884566a3d62
Author: Ludovic Courtès 
Date:   Mon Apr 30 19:14:05 2018 +0200

gnu: geiser: Switch to Guile 2.2.

* gnu/packages/emacs.scm (geiser)[inputs]: Switch to GUILE-2.2.
---
 gnu/packages/emacs.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 4738310..963fc37 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -338,7 +338,7 @@ editor (without an X toolkit)" )
  "/share/emacs/site-lisp/"
  "geiser-autoloads.el"))
  #t)
-(inputs `(("guile" ,guile-2.0)))
+(inputs `(("guile" ,guile-2.2)))
 (native-inputs `(("emacs" ,emacs-minimal)))
 (home-page "https://nongnu.org/geiser/;)
 (synopsis "Collection of Emacs modes for Guile and Racket hacking")



02/12: gnu: tcc-wrapper: Use Guile 2.2.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 350f50cbd35b6d1544734a4c6b2d7d43df4ac03c
Author: Ludovic Courtès 
Date:   Mon Apr 30 19:12:06 2018 +0200

gnu: tcc-wrapper: Use Guile 2.2.

* gnu/packages/c.scm (tcc-wrapper)[inputs]: Switch to GUILE-2.2.
---
 gnu/packages/c.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index b4e17cb..bc60428 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Ludovic Courtès 
+;;; Copyright © 2016, 2018 Ludovic Courtès 
 ;;; Copyright © 2016, 2017 Ricardo Wurmus 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;;
@@ -83,7 +83,7 @@ standard.")
 (build-system trivial-build-system)
 (native-inputs '())
 (inputs `(("tcc" ,tcc)
-  ("guile" ,guile-2.0)))
+  ("guile" ,guile-2.2)))
 
 ;; By default TCC does not honor any search path environment variable.
 ;; This wrapper adds them.



08/12: gnu: guile-minikanren: Switch to Guile 2.2.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit d58ee08dffe99b8fb0523cf2eeec1f337cccfb88
Author: Ludovic Courtès 
Date:   Mon Apr 30 19:34:04 2018 +0200

gnu: guile-minikanren: Switch to Guile 2.2.

* gnu/packages/guile.scm (guile-minikanren)[inputs]: Switch to
GUILE-2.2.
(guile2.0-minikanren): New variable.
(guile2.2-minikanren): Define in terms of 'deprecated-package'.
---
 gnu/packages/guile.scm | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index fd6dd60..a0d131b 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -916,7 +916,7 @@ specification.  These are the main features:
(install-file "README.org" doc)
#t
 (inputs
- `(("guile" ,guile-2.0)))
+ `(("guile" ,guile-2.2)))
 (home-page "https://github.com/ijp/minikanren;)
 (synopsis "MiniKanren declarative logic system, packaged for Guile")
 (description
@@ -931,8 +931,11 @@ slightly from miniKanren mainline.
 See http://minikanren.org/ for more on miniKanren generally.")
 (license license:expat)))
 
+(define-public guile2.0-minikanren
+  (package-for-guile-2.0 guile-minikanren))
+
 (define-public guile2.2-minikanren
-  (package-for-guile-2.2 guile-minikanren))
+  (deprecated-package "guile2.2-minikanren" guile-minikanren))
 
 (define-public guile-miniadapton
   (let ((commit "1b5749422304567c96ac5367f2221dda9eff5880")



03/12: gnu: gzochi: Build without '-Werror'.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 1798e9ee97016ec58dc17ae95a73814e9ebc2ebe
Author: Ludovic Courtès 
Date:   Mon Apr 30 19:12:34 2018 +0200

gnu: gzochi: Build without '-Werror'.

Previously it would fail to build due to GLib deprecation warnings.

* gnu/packages/game-development.scm (gzochi)[arguments]: New field.
---
 gnu/packages/game-development.scm | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/game-development.scm 
b/gnu/packages/game-development.scm
index 86abf9f..1374676 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Tomáš Čech 
 ;;; Copyright © 2015 Mark H Weaver 
-;;; Copyright © 2015 Ludovic Courtès 
+;;; Copyright © 2015, 2018 Ludovic Courtès 
 ;;; Copyright © 2015 Alex Kost 
 ;;; Copyright © 2015, 2016, 2017 David Thompson 
 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner 
@@ -233,6 +233,15 @@ PCM data.")
(base32
 "13j1m92zhxwkaaja3lg5x0h0b28mrrawdzk9d3hd19031akfxwb3"
 (build-system gnu-build-system)
+(arguments
+ '(#:phases (modify-phases %standard-phases
+  (add-before 'build 'no-Werror
+(lambda _
+  ;; Don't abort builds due to things like GLib
+  ;; deprecation warnings.
+  (substitute* (find-files "." "^Makefile\\.in$")
+(("-Werror") ""))
+  #t)
 (native-inputs `(("pkgconfig" ,pkg-config)))
 (inputs `(("bdb" ,bdb)
   ("glib" ,glib)



branch master updated (e64a3b4 -> 1170198)

2018-04-30 Thread Ludovic Court�s
civodul pushed a change to branch master
in repository guix.

  from  e64a3b4   gnu: sudo: Update to 1.8.23.
   new  7c8b7e3   weather: Fix type error when reporting CI stats.
   new  350f50c   gnu: tcc-wrapper: Use Guile 2.2.
   new  1798e9e   gnu: gzochi: Build without '-Werror'.
   new  0e4885a   gnu: gzochi: Switch to Guile 2.2.
   new  bc96a8b   gnu: geiser: Switch to Guile 2.2.
   new  291c2d5   gnu: guile-ics: Update to 0.2.0.
   new  d573d89   gnu: guile-ics: Switch to Guile 2.2.
   new  d58ee08   gnu: guile-minikanren: Switch to Guile 2.2.
   new  2863860   gnu: guile-irregex: Switch to Guile 2.2.
   new  d5eacec   gnu: guile-redis: Switch to Guile 2.2.
   new  b989c3e   gnu: guile-dbi: Switch to Guile 2.2.
   new  1170198   gnu: Add amule.

The 12 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/c.scm|  4 +-
 gnu/packages/emacs.scm|  2 +-
 gnu/packages/game-development.scm | 13 ++-
 gnu/packages/guile.scm| 37 +++---
 gnu/packages/networking.scm   | 63 +++
 gnu/packages/patches/amule-crypto-6.patch | 45 ++
 guix/scripts/weather.scm  |  8 ++--
 8 files changed, 150 insertions(+), 23 deletions(-)
 create mode 100644 gnu/packages/patches/amule-crypto-6.patch



04/12: gnu: gzochi: Switch to Guile 2.2.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 0e4885af027e1036143d302150b48211942a2a67
Author: Ludovic Courtès 
Date:   Mon Apr 30 19:13:38 2018 +0200

gnu: gzochi: Switch to Guile 2.2.

* gnu/packages/game-development.scm (gzochi)[inputs]: Switch to GUILE-2.2.
---
 gnu/packages/game-development.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/game-development.scm 
b/gnu/packages/game-development.scm
index 1374676..1b92bde 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -245,7 +245,7 @@ PCM data.")
 (native-inputs `(("pkgconfig" ,pkg-config)))
 (inputs `(("bdb" ,bdb)
   ("glib" ,glib)
-  ("guile" ,guile-2.0)
+  ("guile" ,guile-2.2)
   ("libmicrohttpd" ,libmicrohttpd)
   ("ncurses" ,ncurses)
   ("sdl" ,sdl)



01/12: weather: Fix type error when reporting CI stats.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 7c8b7e35d020197cffadec2702438e9900192fc0
Author: Ludovic Courtès 
Date:   Mon Apr 30 15:19:41 2018 +0200

weather: Fix type error when reporting CI stats.

* guix/scripts/weather.scm (report-server-coverage): Remove 'missing'
binding above 'queued-subset' call.  Before that 'queued-subset' would
be called with a number instead of a list.
---
 guix/scripts/weather.scm | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm
index 5c934ab..d7c2fbe 100644
--- a/guix/scripts/weather.scm
+++ b/guix/scripts/weather.scm
@@ -208,10 +208,10 @@ unavailable)~%"))
   0 queue)))
   (newline)
   (unless (null? missing)
-(let ((missing (length missing)))
-  (match (queued-subset queue missing)
-(#f #f)
-((= length queued)
+(match (queued-subset queue missing)
+  (#f #f)
+  ((= length queued)
+   (let ((missing (length missing)))
  (format #t (G_ "  ~,1f% (~h out of ~h) of the missing items \
 are queued~%")
  (* 100. (/ queued missing))



10/12: gnu: guile-redis: Switch to Guile 2.2.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit d5eacecc9f39be1f9082ccfef0bf140aa73b0ee4
Author: Ludovic Courtès 
Date:   Mon Apr 30 21:54:22 2018 +0200

gnu: guile-redis: Switch to Guile 2.2.

* gnu/packages/guile.scm (guile-redis)[inputs]: Switch to
GUILE-2.2.
(guile2.0-redis): New variable.
(guile2.2-redis): Define in terms of 'deprecated-package'.
---
 gnu/packages/guile.scm | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 770f7b6..181060c 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1355,15 +1355,18 @@ above command-line parameters.")
  (string-append all "/@GUILE_EFFECTIVE_VERSION@")))
 (build-system gnu-build-system)
 (native-inputs
- `(("guile" ,guile-2.0)))
+ `(("guile" ,guile-2.2)))
 (home-page "https://savannah.nongnu.org/projects/guile-redis/;)
 (synopsis "Redis client library for Guile")
 (description "Guile-redis provides a Scheme interface to the Redis
 key-value cache and store.")
 (license license:lgpl3+)))
 
+(define-public guile2.0-redis
+  (package-for-guile-2.0 guile-redis))
+
 (define-public guile2.2-redis
-  (package-for-guile-2.2 guile-redis))
+  (deprecated-package "guile2.2-redis" guile-redis))
 
 (define-public guile-wisp
   (package



11/12: gnu: guile-dbi: Switch to Guile 2.2.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit b989c3e3760793bf9cb79461b3d03f566e0facc9
Author: Ludovic Courtès 
Date:   Mon Apr 30 21:59:53 2018 +0200

gnu: guile-dbi: Switch to Guile 2.2.

* gnu/packages/guile.scm (guile-dbi)[inputs]: Switch to GUILE-2.2.
[arguments]: Adjust to use "/2.2".
---
 gnu/packages/guile.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 181060c..3807608 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1548,19 +1548,19 @@ provides access to that interface and its types from 
the Scheme level.")
 (arguments
  '(#:configure-flags
(list (string-append
-  "--with-guile-site-dir=" %output "/share/guile/site/2.0"))
+  "--with-guile-site-dir=" %output "/share/guile/site/2.2"))
#:phases
(modify-phases %standard-phases
  (add-after 'install 'patch-extension-path
(lambda* (#:key outputs #:allow-other-keys)
  (let* ((out (assoc-ref outputs "out"))
 (dbi.scm (string-append
-  out "/share/guile/site/2.0/dbi/dbi.scm"))
+  out "/share/guile/site/2.2/dbi/dbi.scm"))
 (ext (string-append out "/lib/libguile-dbi")))
(substitute* dbi.scm (("libguile-dbi") ext))
#t))
 (propagated-inputs
- `(("guile" ,guile-2.0)))
+ `(("guile" ,guile-2.2)))
 (synopsis "Guile database abstraction layer")
 (home-page "http://home.gna.org/guile-dbi/guile-dbi.html;)
 (description



branch master updated (59bc15c -> e64a3b4)

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a change to branch master
in repository guix.

  from  59bc15c   gnu: icecat: Add more fixes from upstream mozilla-esr52.
   new  e64a3b4   gnu: sudo: Update to 1.8.23.

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/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



01/01: gnu: sudo: Update to 1.8.23.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit e64a3b436aabe4a510f81184fd34e04265b63bc7
Author: Tobias Geerinckx-Rice 
Date:   Mon Apr 30 23:02:59 2018 +0200

gnu: sudo: Update to 1.8.23.

* gnu/packages/admin.scm (sudo): Update to 1.8.23.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index b0fb431..9abf1ea 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -955,7 +955,7 @@ system administrator.")
 (define-public sudo
   (package
 (name "sudo")
-(version "1.8.22")
+(version "1.8.23")
 (source (origin
   (method url-fetch)
   (uri
@@ -965,7 +965,7 @@ system administrator.")
 version ".tar.gz")))
   (sha256
(base32
-"00pxp74xkwdcmrjwy55j0k8p684jk1zx3nzdc11v30q8q8kwnmkj"))
+"0yg62wq8rcrbr7qvh3wgfg2g4bwanbi50cr2lf2cfyy8dydx4qyq"))
   (modules '((guix build utils)))
   (snippet
'(delete-file-recursively "lib/zlib"



branch core-updates updated (3d5ad15 -> f0ae90c)

2018-04-30 Thread Mark H. Weaver
mhw pushed a change to branch core-updates
in repository guix.

  from  3d5ad15   Merge branch 'master' into core-updates
  adds  6e9e598   gnu: wine-staging-patchset-data: Update to 3.7.
  adds  fc6dace   gnu: wine-staging: Update to 3.7.
  adds  d95e486   gnu: wine: Add Kerberos support.
  adds  70ab130   services: Re-export static-networking-service, 
static-networking-service-type.
  adds  3edbe53   gnu: skribilo: Update to 0.9.4 and switch to Guile 2.2.
  adds  f675d8b   gnu: Remove a couple of old deprecated package aliases.
  adds  6ac8b73   guix system: search: Display default Shepherd service 
names.
  adds  5986e94   services: gpm: Provide a default value and document 
'gpm-service-type'.
  adds  8b2597d   gnu: Add python-parso.
  adds  fb8966a   gnu: python-jedi: Update to 0.12.0, enable tests.
  adds  e7a5d40   gnu: gtk+: Update to 3.22.29.
  adds  457f6f2   gnu: libxkbcommon: Update to 0.8.0.
  adds  12c7713   gnu: mesa: Update to 17.3.7.
  adds  bbdf276   gnu: meson: Update to 0.45.1.
  adds  a53f431   gnu: gstreamer: Update to 1.14.0.
  adds  3a7597e   build-system/meson: Use 'target-arm32?' for armhf-linux 
case.
  adds  9190340   Revert "build-system/meson: Use 'target-arm32?' for 
armhf-linux case."
  adds  c5154b3   gnu: nss, nss-certs: Update to 3.36.1.
  adds  ed471e6   gnu: mesa: Update to 17.3.8.
  adds  45c053a   gnu: alsa-lib: Update to 1.1.6.
  adds  7ff0577   gnu: alsa-utils: Update to 1.1.6.
  adds  6c69d24   gnu: alsa-plugins: Update to 1.1.6.
  adds  f6a6a05   gnu: atk: Update to 2.28.1.
  adds  538d6d0   build-system/meson: Don't override LDFLAGS if already set.
  adds  73a118b   gnu: gdk-pixbuf: Update to 2.36.12.
  adds  a430b1e   gnu: wayland: Update to 1.15.0.
  adds  16ff8d6   gnu: wayland-protocols: Update to 1.13.
  adds  55e76e4   gnu: libinput: Update to 1.10.3.
  adds  bab5f3a   gnu: eudev: Update to 3.2.5.
  adds  5d904d6   Merge branch 'master' into staging
  adds  a9fda57   gnu: texlive-bin: Use ghostscript executable "gs" in 
ps2eps.
  adds  b02b6f3   gnu: texlive-bin: Patch texlua shebangs.
  adds  68c4759   gnu: gstreamer: Downgrade to 1.12.5.
  adds  a9fe388   Merge branch 'master' into staging
  adds  a668538   Merge branch 'staging'
  adds  d0e888c   gnu: xournal: Update to 0.4.8.2016.
  adds  4b6e2a1   gnu: python-nbxmpp: Update to 0.6.5.
  adds  539a8d2   gnu: gajim: Update to 1.0.2.
  adds  53bed20   gnu: rhash: Update to 1.3.6.
  adds  443c432   gnu: reposurgeon: End all phases in truth.
  adds  e56feff   gnu: acpica: Update to 20180427.
  adds  435897c   gnu: perl-dbix-class: Update to 0.082841.
  adds  1672e7e   gnu: perl-dbix-class-schema-loader: Update to 0.07049.
  adds  59bc15c   gnu: icecat: Add more fixes from upstream mozilla-esr52.
   new  f0ae90c   Merge branch 'master' into core-updates

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 |  34 +-
 gnu/local.mk  |   1 +
 gnu/packages/admin.scm|   8 +-
 gnu/packages/build-tools.scm  |   4 +-
 gnu/packages/certs.scm|   4 +-
 gnu/packages/crypto.scm   |  33 +-
 gnu/packages/databases.scm|   8 +-
 gnu/packages/emacs.scm|   7 -
 gnu/packages/freedesktop.scm  |  12 +-
 gnu/packages/gl.scm   |   4 +-
 gnu/packages/gnuzilla.scm |  13 +-
 gnu/packages/gstreamer.scm|  34 +-
 gnu/packages/gtk.scm  |  12 +-
 gnu/packages/linux.scm|  18 +-
 gnu/packages/messaging.scm|   8 +-
 gnu/packages/patches/icecat-bug-1452075.patch | 441 ++
 gnu/packages/pdf.scm  |   4 +-
 gnu/packages/python.scm   |  53 +++-
 gnu/packages/skribilo.scm |  22 +-
 gnu/packages/tex.scm  |  18 +-
 gnu/packages/version-control.scm  |   3 +-
 gnu/packages/wine.scm |   8 +-
 gnu/packages/xdisorg.scm  |   4 +-
 gnu/services/base.scm |  15 +-
 gnu/services/networking.scm   |   2 +
 guix/scripts/system/search.scm|  37 ++-
 tests/guix-system.sh  |   3 +-
 27 files changed, 676 insertions(+), 134 deletions(-)
 create mode 100644 gnu/packages/patches/icecat-bug-1452075.patch



01/01: Merge branch 'master' into core-updates

2018-04-30 Thread Mark H. Weaver
mhw pushed a commit to branch core-updates
in repository guix.

commit f0ae90cbbb275cb5585bee2374df24dc2d499151
Merge: 3d5ad15 59bc15c
Author: Mark H Weaver 
Date:   Mon Apr 30 16:48:15 2018 -0400

Merge branch 'master' into core-updates

 doc/guix.texi |  34 +-
 gnu/local.mk  |   1 +
 gnu/packages/admin.scm|   8 +-
 gnu/packages/build-tools.scm  |   4 +-
 gnu/packages/certs.scm|   4 +-
 gnu/packages/crypto.scm   |  33 +-
 gnu/packages/databases.scm|   8 +-
 gnu/packages/emacs.scm|   7 -
 gnu/packages/freedesktop.scm  |  12 +-
 gnu/packages/gl.scm   |   4 +-
 gnu/packages/gnuzilla.scm |  13 +-
 gnu/packages/gstreamer.scm|  34 +-
 gnu/packages/gtk.scm  |  12 +-
 gnu/packages/linux.scm|  18 +-
 gnu/packages/messaging.scm|   8 +-
 gnu/packages/patches/icecat-bug-1452075.patch | 441 ++
 gnu/packages/pdf.scm  |   4 +-
 gnu/packages/python.scm   |  53 +++-
 gnu/packages/skribilo.scm |  22 +-
 gnu/packages/tex.scm  |  18 +-
 gnu/packages/version-control.scm  |   3 +-
 gnu/packages/wine.scm |   8 +-
 gnu/packages/xdisorg.scm  |   4 +-
 gnu/services/base.scm |  15 +-
 gnu/services/networking.scm   |   2 +
 guix/scripts/system/search.scm|  37 ++-
 tests/guix-system.sh  |   3 +-
 27 files changed, 676 insertions(+), 134 deletions(-)




01/01: gnu: icecat: Add more fixes from upstream mozilla-esr52.

2018-04-30 Thread Mark H. Weaver
mhw pushed a commit to branch master
in repository guix.

commit 59bc15cf88cfe50ed14363d81dd63693109c8cf2
Author: Mark H Weaver 
Date:   Mon Apr 30 12:53:22 2018 -0400

gnu: icecat: Add more fixes from upstream mozilla-esr52.

* gnu/packages/gnuzilla.scm (icecat)[source]: Add selected fixes
from the upstream mozilla-esr52 repository.
* gnu/packages/patches/icecat-bug-1452075.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk  |   1 +
 gnu/packages/gnuzilla.scm |   9 +-
 gnu/packages/patches/icecat-bug-1452075.patch | 441 ++
 3 files changed, 450 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index ec11b26..5be445f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -785,6 +785,7 @@ dist_patch_DATA =   
\
   %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch\
   %D%/packages/patches/hydra-disable-darcs-test.patch  \
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch\
+  %D%/packages/patches/icecat-bug-1452075.patch\
   %D%/packages/patches/icecat-use-system-graphite2.patch   \
   %D%/packages/patches/icecat-use-system-harfbuzz.patch\
   %D%/packages/patches/id3lib-CVE-2007-4460.patch  \
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 1d05315..d7f8001 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -467,7 +467,14 @@ security standards.")
 (mozilla-patch "icecat-bug-1388020.patch""ad9a885b0df4" 
"1hrk1q9mk59jww55g4lqmaflznk87x3vvjn2mxfgfbbjs8l1cyz4")
 (mozilla-patch "icecat-bug-1452416.patch""f89ab96a2532" 
"1dqchxdyznhgyxhfq0hm0vg1p597hjqflfzigc7j3s5vxf9rg2nv")
 (mozilla-patch "icecat-bug-1451376.patch""af885a1bd293" 
"1wfpqhm2dp4fsx6zbrncngsqz7g2x09b625zcighixrbpvybyww3")
-(mozilla-patch "icecat-bug-1444668.patch""666fc84ec72d" 
"0lml2wqd4yqidhi364x8r90f78397k2y0kq5z5bv8l8j4bhcnb9v")))
+(mozilla-patch "icecat-bug-1444668.patch""666fc84ec72d" 
"0lml2wqd4yqidhi364x8r90f78397k2y0kq5z5bv8l8j4bhcnb9v")
+(search-patch  "icecat-bug-1452075.patch")
+(mozilla-patch "icecat-bug-1393367.patch""1ab40761a856" 
"1kgwypy7k5b33jwkni4025za4kcnv5m6klsx4wsswlixmljmkbc7")
+(mozilla-patch "icecat-bug-1453339.patch""0edb8dca7087" 
"0b30pipqryh311sc97rcmwnx9n8qdlbbz90b2hkybjnprmbhfxrm")
+(mozilla-patch "icecat-bug-1452202.patch""134c728799c1" 
"16hbwx6fx1hrddsyjjbd3z954ql3pg348xs13h9riyblq8crzmam")
+(mozilla-patch "icecat-bug-1411415.patch""14eab155eaa8" 
"0wr4xgblxzk4c2gvlnpl7ic1196mrhry1hgwdl1jivq0ji5cbvbd")
+(mozilla-patch "icecat-bug-1452619.patch""2b75d55ccf0e" 
"1g87aybw6ggv6hyk385bplv0lx63n020gwyq0d6d4pqld48hsm1i")
+(mozilla-patch "icecat-bug-1453127.patch""89857f35df29" 
"0gzi47svrw5ajdlm3i12193psm702zx70x5h1rwp4gb7gxh4m4d9")))
   (modules '((guix build utils)))
   (snippet
'(begin
diff --git a/gnu/packages/patches/icecat-bug-1452075.patch 
b/gnu/packages/patches/icecat-bug-1452075.patch
new file mode 100644
index 000..b776640
--- /dev/null
+++ b/gnu/packages/patches/icecat-bug-1452075.patch
@@ -0,0 +1,441 @@
+Based on 
+Adapted to apply cleanly to GNU IceCat.
+
+# HG changeset patch
+# User Ryan VanderMeulen 
+# Date 1523630807 14400
+# Node ID 608e76ec5ba25cec2271d2b400c7bce2d4c5ef79
+# Parent  10b7f43b536f93151201d44d304c991aa9af5d0c
+Bug 1452075 - Backport some upstream pdf.js fixes to ESR52. r=bdahl, r=yury, 
a=RyanVM
+
+diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm 
b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm
+--- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm
 b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm
+@@ -24,17 +24,18 @@ const Cc = Components.classes;
+ const Ci = Components.interfaces;
+ const Cr = Components.results;
+ const Cu = Components.utils;
+ // True only if this is the version of pdf.js that is included with icecat.
+ const MOZ_CENTRAL = JSON.parse('true');
+ const PDFJS_EVENT_ID = 'pdf.js.message';
+ const PDF_CONTENT_TYPE = 'application/pdf';
+ const PREF_PREFIX = 'pdfjs';
+-const PDF_VIEWER_WEB_PAGE = 'resource://pdf.js/web/viewer.html';
++const PDF_VIEWER_ORIGIN = "resource://pdf.js";
++const PDF_VIEWER_WEB_PAGE = "resource://pdf.js/web/viewer.html";
+ const MAX_NUMBER_OF_PREFS = 50;
+ const MAX_STRING_PREF_LENGTH = 128;
+ 
+ Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+ Cu.import('resource://gre/modules/Services.jsm');
+ Cu.import('resource://gre/modules/NetUtil.jsm');
+ 
+ XPCOMUtils.defineLazyModuleGetter(this, 'NetworkManager',
+@@ -105,21 +106,25 @@ function log(aMsg) {
+   if 

branch master updated (1672e7e -> 59bc15c)

2018-04-30 Thread Mark H. Weaver
mhw pushed a change to branch master
in repository guix.

  from  1672e7e   gnu: perl-dbix-class-schema-loader: Update to 0.07049.
   new  59bc15c   gnu: icecat: Add more fixes from upstream mozilla-esr52.

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/gnuzilla.scm |   9 +-
 gnu/packages/patches/icecat-bug-1452075.patch | 441 ++
 3 files changed, 450 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/icecat-bug-1452075.patch



04/05: gnu: perl-dbix-class: Update to 0.082841.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 435897c0f2bf459ecd5a25e3d32847ff47b299d2
Author: Tobias Geerinckx-Rice 
Date:   Mon Apr 30 20:32:25 2018 +0200

gnu: perl-dbix-class: Update to 0.082841.

* gnu/packages/databases.scm (perl-dbix-class): Update to 0.082841.
---
 gnu/packages/databases.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f54fec6..f036b51 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1124,7 +1124,7 @@ extremely small.")
 (define-public perl-dbix-class
   (package
 (name "perl-dbix-class")
-(version "0.082840")
+(version "0.082841")
 (source
  (origin
(method url-fetch)
@@ -1132,7 +1132,7 @@ extremely small.")
"DBIx-Class-" version ".tar.gz"))
(sha256
 (base32
- "1vw1f756g8m5hq11nqf5dk2cw2y4mqq91ca5p75fn5g3fp8syja0"
+ "1gf3hgv8f9rnr8bl4ljgsqk4aliphmvljhsk4282kvdc4mcgh1fp"
 (build-system perl-build-system)
 (native-inputs
  `(("perl-dbd-sqlite" ,perl-dbd-sqlite)



01/05: gnu: rhash: Update to 1.3.6.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 53bed20918db76e021d39d6b82ac95a095893298
Author: Tobias Geerinckx-Rice 
Date:   Mon Apr 30 21:09:59 2018 +0200

gnu: rhash: Update to 1.3.6.

* gnu/packages/crypto.scm (rhash): Update to 1.3.6.
[arguments]: Adjust to extensive build system changes.
---
 gnu/packages/crypto.scm | 33 ++---
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 9a786de..f96fe04 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -671,7 +671,7 @@ BLAKE.")
 (define-public rhash
   (package
 (name "rhash")
-(version "1.3.5")
+(version "1.3.6")
 (source
  (origin
(method url-fetch)
@@ -680,32 +680,27 @@ BLAKE.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
 (base32
- "0bhz3xdl6r06k1bqigdjz42l31iqz2qdpg7zk316i7p2ra56iq4q"
+ "14ngzfgmd1lfp7m78sn49x8ymf2s37nrr67c6p5vas85nrrgjkcn"
 (build-system gnu-build-system)
 (arguments
- `(#:make-flags (list "CC=gcc"
-  (string-append "PREFIX=" %output))
-   #:test-target "test"
+ `(#:make-flags
+   ;; The binaries in /bin need some help finding librhash.so.0.
+   (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
+   #:test-target "test" ; ‘make check’ just checks the sources
#:phases
(modify-phases %standard-phases
  (replace 'configure
+   ;; ./configure is not GNU autotools' and doesn't gracefully handle
+   ;; unrecognized options, so we must call it manually.
(lambda* (#:key outputs #:allow-other-keys)
- (substitute* "Makefile"
-   (("\\$\\(DESTDIR\\)/etc")
-(string-append (assoc-ref outputs "out") "/etc")))
- #t))
- (add-after 'build 'build-library
+ (invoke "./configure"
+ (string-append "--prefix=" (assoc-ref outputs "out")
+ (add-after 'install 'install-library-extras
(lambda* (#:key make-flags #:allow-other-keys)
- (apply invoke "make" "lib-shared" make-flags)))
- (add-after 'install 'install-library
-   (lambda* (#:key make-flags #:allow-other-keys)
- (apply invoke "make" "install-lib-shared" make-flags)
  (apply invoke
-"make" "-C" "librhash" "install-headers"
-"install-so-link" make-flags)))
- (add-after 'check 'check-library
-   (lambda* (#:key make-flags #:allow-other-keys)
- (apply invoke "make" "test-shared-lib" make-flags))
+"make" "-C" "librhash"
+"install-headers" "install-so-link"
+make-flags))
 (home-page "https://sourceforge.net/projects/rhash/;)
 (synopsis "Utility for computing hash sums")
 (description "RHash is a console utility for calculation and verification



05/05: gnu: perl-dbix-class-schema-loader: Update to 0.07049.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 1672e7e71482b68192f3a4625cff27fb7c25bd52
Author: Tobias Geerinckx-Rice 
Date:   Mon Apr 30 20:36:47 2018 +0200

gnu: perl-dbix-class-schema-loader: Update to 0.07049.

* gnu/packages/databases.scm (perl-dbix-class-schema-loader): Update to 
0.07049.
---
 gnu/packages/databases.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f036b51..51b0d7e 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1232,7 +1232,7 @@ introspected and examined.")
 (define-public perl-dbix-class-schema-loader
   (package
 (name "perl-dbix-class-schema-loader")
-(version "0.07047")
+(version "0.07049")
 (source
  (origin
(method url-fetch)
@@ -1240,7 +1240,7 @@ introspected and examined.")
"DBIx-Class-Schema-Loader-" version ".tar.gz"))
(sha256
 (base32
- "06s2q6xj95600sdlfph57spjk2z1gjs4zwq5b7mz7d5izcxgnwb6"
+ "0r57fv71ypxafb85cpxph1hdqii7ipjwvc19yb6fpkvq2ggcssg8"
 (build-system perl-build-system)
 (native-inputs
  `(("perl-config-any" ,perl-config-any)



branch master updated (539a8d2 -> 1672e7e)

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a change to branch master
in repository guix.

  from  539a8d2   gnu: gajim: Update to 1.0.2.
   new  53bed20   gnu: rhash: Update to 1.3.6.
   new  443c432   gnu: reposurgeon: End all phases in truth.
   new  e56feff   gnu: acpica: Update to 20180427.
   new  435897c   gnu: perl-dbix-class: Update to 0.082841.
   new  1672e7e   gnu: perl-dbix-class-schema-loader: Update to 0.07049.

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/packages/admin.scm   |  8 
 gnu/packages/crypto.scm  | 33 ++---
 gnu/packages/databases.scm   |  8 
 gnu/packages/version-control.scm |  3 ++-
 4 files changed, 24 insertions(+), 28 deletions(-)



02/05: gnu: reposurgeon: End all phases in truth.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 443c432e90691f0a81bca6feb70322dc92706627
Author: Tobias Geerinckx-Rice 
Date:   Mon Apr 30 16:03:39 2018 +0200

gnu: reposurgeon: End all phases in truth.

* gnu/packages/version-control.scm (reposurgeon)[arguments]: Return #t
from the ‘install-emacs-data’ phase, instead of COPY-FILE's undefined
result.
---
 gnu/packages/version-control.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index b82abaf..848660b 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1468,7 +1468,8 @@ any project with more than one developer, is one of 
Aegis's major functions.")
(lambda* (#:key outputs #:allow-other-keys)
  (install-file "reposurgeon-mode.el"
(string-append (assoc-ref outputs "out")
-  "/share/emacs/site-lisp")))
+  "/share/emacs/site-lisp"))
+ #t)
 (inputs
  `(("python" ,python-wrapper)
("tzdata" ,tzdata)))



03/05: gnu: acpica: Update to 20180427.

2018-04-30 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit e56feffec0cc1b585aca40a2a9f81571c0374d9d
Author: Tobias Geerinckx-Rice 
Date:   Mon Apr 30 20:09:28 2018 +0200

gnu: acpica: Update to 20180427.

* gnu/packages/admin.scm (acpica): Update to 20180427.
---
 gnu/packages/admin.scm | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2b9b43b..b0fb431 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1255,7 +1255,7 @@ module slots, and the list of I/O ports (e.g. serial, 
parallel, USB).")
 (define-public acpica
   (package
 (name "acpica")
-(version "20180313")
+(version "20180427")
 (source (origin
   (method url-fetch)
   (uri (string-append
@@ -1263,7 +1263,7 @@ module slots, and the list of I/O ports (e.g. serial, 
parallel, USB).")
 version ".tar.gz"))
   (sha256
(base32
-"16galaadmr37q2pvk2gyxrm8d1xldzk31djfxfq9v1c9yq4i425h"
+"1hfdzyzzznh9h8yjlz54p02zwwxyp5k7fgzxlb9phhj3kalp60md"
 (build-system gnu-build-system)
 (native-inputs `(("flex" ,flex)
  ("bison" ,bison)))
@@ -1272,7 +1272,7 @@ module slots, and the list of I/O ports (e.g. serial, 
parallel, USB).")
   "CC=gcc"
   "HOST=_LINUX"
   "OPT_CFLAGS=-Wall -fno-strict-aliasing")
-   #:tests? #f  ; no 'check' target.
+   #:tests? #f  ; no 'check' target
#:phases (modify-phases %standard-phases (delete 'configure
 (home-page "https://acpica.org/;)
 (synopsis "Tools for the development and debug of ACPI tables")
@@ -1284,7 +1284,7 @@ of ACPI meant to be directly integrated into the host OS 
as a kernel-resident
 subsystem, and a small set of tools to assist in developing and debugging ACPI
 tables.  This package contains only the user-space tools needed for ACPI table
 development, not the kernel implementation of ACPI.")
-(license license:gpl2)))  ; Dual GPLv2/ACPICA Licence
+(license license:gpl2))); dual GPLv2/ACPICA Licence
 
 (define-public stress
   (package



02/02: gnu: gajim: Update to 1.0.2.

2018-04-30 Thread Cl�ment Lassieur
snape pushed a commit to branch master
in repository guix.

commit 539a8d29319de87b85eb8919346063e5d0bb0f5c
Author: Clément Lassieur 
Date:   Mon Apr 30 21:20:54 2018 +0200

gnu: gajim: Update to 1.0.2.

* gnu/packages/messaging.scm (gajim): Update to 1.0.2.
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index a3192a9..e2b4b5b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -510,7 +510,7 @@ was initially a fork of xmpppy, but uses non-blocking 
sockets.")
 (define-public gajim
   (package
 (name "gajim")
-(version "1.0.1")
+(version "1.0.2")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://gajim.org/downloads/;
@@ -518,7 +518,7 @@ was initially a fork of xmpppy, but uses non-blocking 
sockets.")
   "/gajim-" version ".tar.bz2"))
   (sha256
(base32
-"16ynws10vhx6rhjjjmzw6iyb3hc19823xhx4gsb14hrc7l8vzd1c"
+"0wyyy3wrk7ka5xrsbafnajzf7iacg8vg3hi16pl4c5p104hdhjdw"
 (build-system python-build-system)
 (arguments
  `(#:phases



branch master updated (d0e888c -> 539a8d2)

2018-04-30 Thread Cl�ment Lassieur
snape pushed a change to branch master
in repository guix.

  from  d0e888c   gnu: xournal: Update to 0.4.8.2016.
   new  4b6e2a1   gnu: python-nbxmpp: Update to 0.6.5.
   new  539a8d2   gnu: gajim: Update to 1.0.2.

The 2 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/messaging.scm | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)



01/02: gnu: python-nbxmpp: Update to 0.6.5.

2018-04-30 Thread Cl�ment Lassieur
snape pushed a commit to branch master
in repository guix.

commit 4b6e2a19afb1280bc6c8840008eac57d8e33e237
Author: Clément Lassieur 
Date:   Mon Apr 30 21:20:17 2018 +0200

gnu: python-nbxmpp: Update to 0.6.5.

* gnu/packages/messaging.scm (python-nbxmpp): Update to 0.6.5.
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index fd1c330..a3192a9 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -485,14 +485,14 @@ simultaneously and therefore appear under the same 
nickname on IRC.")
 (define-public python-nbxmpp
   (package
 (name "python-nbxmpp")
-(version "0.6.4")
+(version "0.6.5")
 (source
  (origin
(method url-fetch)
(uri (pypi-uri "nbxmpp" version))
(sha256
 (base32
- "12rfmp613alh3mi8f94008sx7x1a8c1izs3icrvw7bf4gnf2pi31"
+ "162dk6q4g61riam1p78bxwddwy4y2x1si34g5j9jv3rlc9xmhdcv"
 (build-system python-build-system)
 (arguments
  `(#:tests? #f)); no tests



06/07: gnu: libuv: Update to 1.20.2.

2018-04-30 Thread Marius Bakke
mbakke pushed a commit to branch core-updates-next
in repository guix.

commit 1f172d8003e23f4d0679ef99ca0566f2b8777a4e
Author: Marius Bakke 
Date:   Mon Apr 30 20:01:06 2018 +0200

gnu: libuv: Update to 1.20.2.

* gnu/packages/libevent.scm (libuv): Update to 1.20.2.
---
 gnu/packages/libevent.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index 983c862..f80b205 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -121,14 +121,14 @@ limited support for fork events.")
 (define-public libuv
   (package
 (name "libuv")
-(version "1.19.2")
+(version "1.20.2")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://dist.libuv.org/dist/v; version
   "/libuv-v" version ".tar.gz"))
   (sha256
(base32
-"1msk9ac1z69whww88ibrwjqkd1apdla6l77cm2fwy5kigq0z5g3w"
+"08h39zhg75lmfmk4lx17hpxqrr5yjgnc9b5rpchcankc3lcsqxbb"
 (build-system gnu-build-system)
 (arguments
  '(#:phases (modify-phases %standard-phases



01/07: gnu: glib: Update to 2.56.1.

2018-04-30 Thread Marius Bakke
mbakke pushed a commit to branch core-updates-next
in repository guix.

commit 614ca05ab04509f12a3bcff71db0068a6ac8af48
Author: Marius Bakke 
Date:   Sun Apr 15 14:58:40 2018 +0200

gnu: glib: Update to 2.56.1.

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

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 6ea73ac..3f61fb0 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -149,7 +149,7 @@ shared NFS home directories.")
 (define glib
   (package
(name "glib")
-   (version "2.56.0")
+   (version "2.56.1")
(source (origin
 (method url-fetch)
 (uri (string-append "mirror://gnome/sources/"
@@ -157,7 +157,7 @@ shared NFS home directories.")
 name "-" version ".tar.xz"))
 (sha256
  (base32
-  "1iqgi90fmpl3l23jm2iv44qp7hqsxvnv7978s18933bvx4bnxvzc"))
+  "138b3hi7glfpbia49gi07lyz1dh9k0jl9vpd3aiwflf6y923zvs0"))
 (patches (search-patches "glib-tests-timer.patch"
(build-system gnu-build-system)
(outputs '("out"   ; everything



04/07: gnu: cairo: Update to 1.14.12.

2018-04-30 Thread Marius Bakke
mbakke pushed a commit to branch core-updates-next
in repository guix.

commit d12dff4526def2bc8c3681c2e6af6641647734a8
Author: Marius Bakke 
Date:   Sun Apr 15 15:14:00 2018 +0200

gnu: cairo: Update to 1.14.12.

* gnu/packages/gtk.scm (cairo): Update to 1.14.12.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index dda1a50..79d0646 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -111,14 +111,14 @@ tools have full access to view and control running 
applications.")
 (define-public cairo
   (package
(name "cairo")
-   (version "1.14.10")
+   (version "1.14.12")
(source (origin
 (method url-fetch)
 (uri (string-append "https://cairographics.org/releases/cairo-;
 version ".tar.xz"))
 (sha256
  (base32
-  "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy"))
+  "05mzyxkvsfc1annjw2dja8vka01ampp9pp93lg09j8hba06g144c"))
 (patches (search-patches "cairo-CVE-2016-9082.patch"
(build-system gnu-build-system)
(propagated-inputs



branch core-updates-next created (now c98fe1d)

2018-04-30 Thread Marius Bakke
mbakke pushed a change to branch core-updates-next
in repository guix.

at  c98fe1d   gnu: cmake: Update to 3.11.1.

This branch includes the following new commits:

   new  614ca05   gnu: glib: Update to 2.56.1.
   new  e85f7ac   gnu: gobject-introspection: Update to 1.56.1.
   new  41db051   gnu: pango: Update to 1.42.1.
   new  d12dff4   gnu: cairo: Update to 1.14.12.
   new  30d900d   gnu: sqlite: Update to 3.23.1.
   new  1f172d8   gnu: libuv: Update to 1.20.2.
   new  c98fe1d   gnu: cmake: Update to 3.11.1.

The 7 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.




07/07: gnu: cmake: Update to 3.11.1.

2018-04-30 Thread Marius Bakke
mbakke pushed a commit to branch core-updates-next
in repository guix.

commit c98fe1d0648ba5d94f2954e9e5c3b2a22ef18fb6
Author: Marius Bakke 
Date:   Mon Apr 30 20:02:56 2018 +0200

gnu: cmake: Update to 3.11.1.

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

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index e9fa866..4239115 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -42,7 +42,7 @@
 (define-public cmake
   (package
 (name "cmake")
-(version "3.11.0")
+(version "3.11.1")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://www.cmake.org/files/v;
@@ -50,7 +50,7 @@
   "/cmake-" version ".tar.gz"))
   (sha256
(base32
-"0sv5k9q6braa8hhw0y3w19avqn0xn5czv5jf5fz5blnlf7ivw4y3"))
+"033x45q0lyaqr32pv92pv87pw20nja6i9794hmijrm6ilinbrgjp"))
   (modules '((guix build utils)))
   (snippet
'(begin



05/07: gnu: sqlite: Update to 3.23.1.

2018-04-30 Thread Marius Bakke
mbakke pushed a commit to branch core-updates-next
in repository guix.

commit 30d900d4eeb203ab6766bb7dabfeba62263d1617
Author: Marius Bakke 
Date:   Sun Apr 15 21:36:44 2018 +0200

gnu: sqlite: Update to 3.23.1.

* gnu/packages/databases.scm (sqlite): Update to 3.23.1.
---
 gnu/packages/databases.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 441a697..bd12f4c 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1008,7 +1008,7 @@ for example from a shell script.")
 (define-public sqlite
   (package
(name "sqlite")
-   (version "3.23.0")
+   (version "3.23.1")
(source (origin
 (method url-fetch)
 (uri (let ((numeric-version
@@ -1024,7 +1024,7 @@ for example from a shell script.")
   numeric-version ".tar.gz")))
 (sha256
  (base32
-  "0jbf78g3cm5wq77k7sfg8fb6rz44hnp9hs7p5d66fwd000c1lwdp"
+  "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j"
(build-system gnu-build-system)
(inputs `(("readline" ,readline)))
(arguments



02/07: gnu: gobject-introspection: Update to 1.56.1.

2018-04-30 Thread Marius Bakke
mbakke pushed a commit to branch core-updates-next
in repository guix.

commit e85f7ac21ce6ce6d0bbe035d30d5a9ec59d5d88c
Author: Marius Bakke 
Date:   Sun Apr 15 15:00:28 2018 +0200

gnu: gobject-introspection: Update to 1.56.1.

* gnu/packages/glib.scm (gobject-introspection): Update to 1.56.1.
---
 gnu/packages/glib.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 3f61fb0..e68df12 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -302,14 +302,14 @@ dynamic loading, and an object system.")
 (define gobject-introspection
   (package
 (name "gobject-introspection")
-(version "1.56.0")
+(version "1.56.1")
 (source (origin
  (method url-fetch)
  (uri (string-append "mirror://gnome/sources/"
"gobject-introspection/" (version-major+minor version)
"/gobject-introspection-" version ".tar.xz"))
  (sha256
-  (base32 "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d"))
+  (base32 "0jx2kryjd7l0vl5gb3qp1qjfy3cjiizvcd1snsm7pzwrzz67aa2v"))
  (modules '((guix build utils)))
  (snippet
   '(begin



03/07: gnu: pango: Update to 1.42.1.

2018-04-30 Thread Marius Bakke
mbakke pushed a commit to branch core-updates-next
in repository guix.

commit 41db0517cea14688306593ff5f50a1f60dc00e89
Author: Marius Bakke 
Date:   Sun Apr 15 15:02:46 2018 +0200

gnu: pango: Update to 1.42.1.

* gnu/packages/gtk.scm (pango): Update to 1.42.1.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b55af15..dda1a50 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -216,7 +216,7 @@ affine transformation (scale, rotation, shear, etc.).")
 (define-public pango
   (package
(name "pango")
-   (version "1.42.0")
+   (version "1.42.1")
(source (origin
 (method url-fetch)
 (uri (string-append "mirror://gnome/sources/pango/"
@@ -224,7 +224,7 @@ affine transformation (scale, rotation, shear, etc.).")
 name "-" version ".tar.xz"))
 (sha256
  (base32
-  "0illn78nfwpa8y5knh9ir74wa1skc2hi8f3ny19zgpyf7n5dh94r"
+  "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli"
(build-system gnu-build-system)
(propagated-inputs
 ;; These are all in Requires or Requires.private of the '.pc' files.



branch master updated (a668538 -> d0e888c)

2018-04-30 Thread Leo Famulari
lfam pushed a change to branch master
in repository guix.

  from  a668538   Merge branch 'staging'
   new  d0e888c   gnu: xournal: Update to 0.4.8.2016.

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/pdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



01/01: gnu: xournal: Update to 0.4.8.2016.

2018-04-30 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit d0e888c39dde9459434dbfe9461faca0dcfb9f24
Author: Leo Famulari 
Date:   Mon Apr 30 14:12:14 2018 -0400

gnu: xournal: Update to 0.4.8.2016.

* gnu/packages/pdf.scm (xournal): Update to 0.4.8.2016.
---
 gnu/packages/pdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 84b53b0..7762b06 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -673,7 +673,7 @@ program capable of converting PDF into other formats.")
 (define-public xournal
   (package
 (name "xournal")
-(version "0.4.8")
+(version "0.4.8.2016")
 (source
  (origin
(method url-fetch)
@@ -681,7 +681,7 @@ program capable of converting PDF into other formats.")
"/xournal-" version ".tar.gz"))
(sha256
 (base32
- "0c7gjcqhygiyp0ypaipdaxgkbivg6q45vhsj8v5jsi9nh6iqff13"
+ "09i88v3wacmx7f96dmq0l3afpyv95lh6jrx16xzm0jd1szdrhn5j"
 (build-system gnu-build-system)
 (inputs
  `(("gtk" ,gtk+-2)



02/03: gnu: gtk+: Update to 3.22.30.

2018-04-30 Thread Marius Bakke
mbakke pushed a commit to branch staging
in repository guix.

commit d54303215e93bb3c89a94daaa56324c703d717a1
Author: Marius Bakke 
Date:   Mon Apr 30 19:37:53 2018 +0200

gnu: gtk+: Update to 3.22.30.

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 97fccdc..d2b0993 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -659,7 +659,7 @@ application suites.")
(name "gtk+")
;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in
;;   mate.scm will also need to be updated.
-   (version "3.22.29")
+   (version "3.22.30")
(source (origin
 (method url-fetch)
 (uri (string-append "mirror://gnome/sources/" name "/"
@@ -667,7 +667,7 @@ application suites.")
 name "-" version ".tar.xz"))
 (sha256
  (base32
-  "1y5vzdbgww9l7xcrg13azff2rs94kggkywmpcsh39h7w76wn8zd0"))
+  "0rv5k8fyi2i19k4zncai6vf429s6zy3kncr8vb6f3m034z0sb951"))
 (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
  
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"
(outputs '("out" "bin" "doc"))



branch staging created (now cf0d6d8)

2018-04-30 Thread Marius Bakke
mbakke pushed a change to branch staging
in repository guix.

at  cf0d6d8   gnu: meson: Update to 0.46.0.

This branch includes the following new commits:

   new  5318b10   gnu: libepoxy: Update to 1.5.1.
   new  d543032   gnu: gtk+: Update to 3.22.30.
   new  cf0d6d8   gnu: meson: Update to 0.46.0.

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.




01/03: gnu: libepoxy: Update to 1.5.1.

2018-04-30 Thread Marius Bakke
mbakke pushed a commit to branch staging
in repository guix.

commit 5318b103ff277efbac248a066d162589a9083baa
Author: Marius Bakke 
Date:   Mon Apr 30 19:33:03 2018 +0200

gnu: libepoxy: Update to 1.5.1.

* gnu/packages/gl.scm (libepoxy): Update to 1.5.1.
---
 gnu/packages/gl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index db02d79..1b03994 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -556,7 +556,7 @@ OpenGL graphics API.")
 (define-public libepoxy
   (package
 (name "libepoxy")
-(version "1.5.0")
+(version "1.5.1")
 (source (origin
   (method url-fetch)
   (uri (string-append
@@ -564,7 +564,7 @@ OpenGL graphics API.")
 version "/libepoxy-" version ".tar.xz"))
   (sha256
(base32
-"1md58amxyp34yjnw4xa185hw5jm0hnb2xnhdc28zdsx6k19rk52c"
+"08674swkihsl2zll3fg91c96zarx0wlvskbby08zl4nx3cjzj9ds"
 (arguments
  `(#:phases
(modify-phases %standard-phases



03/03: gnu: meson: Update to 0.46.0.

2018-04-30 Thread Marius Bakke
mbakke pushed a commit to branch staging
in repository guix.

commit cf0d6d836730f7bdc714ecfa4287f72e029b9970
Author: Marius Bakke 
Date:   Mon Apr 30 19:47:38 2018 +0200

gnu: meson: Update to 0.46.0.

* gnu/packages/build-tools.scm (meson): Update to 0.46.0.
* gnu/packages/patches/meson-for-build-rpath.patch: Adapt.
---
 gnu/packages/build-tools.scm | 4 ++--
 gnu/packages/patches/meson-for-build-rpath.patch | 7 +++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 4b078e7..65d1bc3 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -98,7 +98,7 @@ generate such a compilation database.")
 (define-public meson
   (package
 (name "meson")
-(version "0.45.1")
+(version "0.46.0")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://github.com/mesonbuild/meson/;
@@ -106,7 +106,7 @@ generate such a compilation database.")
   version ".tar.gz"))
   (sha256
(base32
-"1yqa4337nb8w92bvr91rsxmn0xkf7pmdybq9ljvnqmdvn7dv02sd"
+"1w6bm43gy2swk3hmbarm0iv8m8yd8xm5jczsvfn8z2im3aq93pxp"
 (build-system python-build-system)
 (arguments
  `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH
diff --git a/gnu/packages/patches/meson-for-build-rpath.patch 
b/gnu/packages/patches/meson-for-build-rpath.patch
index 4e20c9a..2151d53 100644
--- a/gnu/packages/patches/meson-for-build-rpath.patch
+++ b/gnu/packages/patches/meson-for-build-rpath.patch
@@ -6,14 +6,13 @@ Patch by Peter Mikkelsen 
 
 --- meson-0.42.0/mesonbuild/scripts/meson_install.py.orig  2017-09-09 
01:49:39.147374148 +0200
 +++ meson-0.42.0/mesonbuild/scripts/meson_install.py   2017-09-09 
01:51:01.209134717 +0200
-@@ -345,15 +345,6 @@
+@@ -391,14 +391,6 @@
  print("Symlink creation does not work on this platform. "
"Skipping all symlinking.")
  printed_symlink_error = True
--if is_elf_platform() and os.path.isfile(outname):
+-if os.path.isfile(outname):
 -try:
--e = depfixer.Elf(outname, False)
--e.fix_rpath(install_rpath)
+-depfixer.fix_rpath(outname, install_rpath, False)
 -except SystemExit as e:
 -if isinstance(e.code, int) and e.code == 0:
 -pass



01/01: Merge branch 'staging'

2018-04-30 Thread Marius Bakke
mbakke pushed a commit to branch master
in repository guix.

commit a66853810e75055091e9ab5c2fc341fa1811cda4
Merge: fb8966a a9fe388
Author: Marius Bakke 
Date:   Mon Apr 30 19:26:03 2018 +0200

Merge branch 'staging'

 gnu/packages/build-tools.scm  |  4 ++--
 gnu/packages/certs.scm|  4 ++--
 gnu/packages/freedesktop.scm  | 12 ++--
 gnu/packages/gl.scm   |  4 ++--
 gnu/packages/gnuzilla.scm |  4 ++--
 gnu/packages/gstreamer.scm| 34 +-
 gnu/packages/gtk.scm  | 12 ++--
 gnu/packages/linux.scm| 20 ++--
 gnu/packages/tex.scm  | 18 +-
 gnu/packages/xdisorg.scm  |  4 ++--
 guix/build/meson-build-system.scm |  3 ++-
 11 files changed, 68 insertions(+), 51 deletions(-)




branch master updated (fb8966a -> a668538)

2018-04-30 Thread Marius Bakke
mbakke pushed a change to branch master
in repository guix.

  from  fb8966a   gnu: python-jedi: Update to 0.12.0, enable tests.
  adds  e7a5d40   gnu: gtk+: Update to 3.22.29.
  adds  457f6f2   gnu: libxkbcommon: Update to 0.8.0.
  adds  12c7713   gnu: mesa: Update to 17.3.7.
  adds  bbdf276   gnu: meson: Update to 0.45.1.
  adds  a53f431   gnu: gstreamer: Update to 1.14.0.
  adds  3a7597e   build-system/meson: Use 'target-arm32?' for armhf-linux 
case.
  adds  9190340   Revert "build-system/meson: Use 'target-arm32?' for 
armhf-linux case."
  adds  c5154b3   gnu: nss, nss-certs: Update to 3.36.1.
  adds  ed471e6   gnu: mesa: Update to 17.3.8.
  adds  45c053a   gnu: alsa-lib: Update to 1.1.6.
  adds  7ff0577   gnu: alsa-utils: Update to 1.1.6.
  adds  6c69d24   gnu: alsa-plugins: Update to 1.1.6.
  adds  f6a6a05   gnu: atk: Update to 2.28.1.
  adds  538d6d0   build-system/meson: Don't override LDFLAGS if already set.
  adds  73a118b   gnu: gdk-pixbuf: Update to 2.36.12.
  adds  a430b1e   gnu: wayland: Update to 1.15.0.
  adds  16ff8d6   gnu: wayland-protocols: Update to 1.13.
  adds  55e76e4   gnu: libinput: Update to 1.10.3.
  adds  bab5f3a   gnu: eudev: Update to 3.2.5.
  adds  5d904d6   Merge branch 'master' into staging
  adds  a9fda57   gnu: texlive-bin: Use ghostscript executable "gs" in 
ps2eps.
  adds  b02b6f3   gnu: texlive-bin: Patch texlua shebangs.
  adds  68c4759   gnu: gstreamer: Downgrade to 1.12.5.
  adds  a9fe388   Merge branch 'master' into staging
   new  a668538   Merge branch 'staging'

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/build-tools.scm  |  4 ++--
 gnu/packages/certs.scm|  4 ++--
 gnu/packages/freedesktop.scm  | 12 ++--
 gnu/packages/gl.scm   |  4 ++--
 gnu/packages/gnuzilla.scm |  4 ++--
 gnu/packages/gstreamer.scm| 34 +-
 gnu/packages/gtk.scm  | 12 ++--
 gnu/packages/linux.scm| 20 ++--
 gnu/packages/tex.scm  | 18 +-
 gnu/packages/xdisorg.scm  |  4 ++--
 guix/build/meson-build-system.scm |  3 ++-
 11 files changed, 68 insertions(+), 51 deletions(-)



branch staging deleted (was a9fe388)

2018-04-30 Thread Marius Bakke
mbakke pushed a change to branch staging
in repository guix.

   was  a9fe388   Merge branch 'master' into staging

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



03/13: gnu: mes-boot: Update to 0.12.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 8d7814d9f13a4a137a9644aaf806b1d8edbe014f
Author: Jan Nieuwenhuizen 
Date:   Sun Apr 8 16:20:55 2018 +0200

gnu: mes-boot: Update to 0.12.

* gnu/packages/mes.scm (mes-boot): Update to 0.12.
---
 gnu/packages/mes.scm | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 2451718..6f02d99 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -221,9 +221,9 @@ hex2 linker.")
(license gpl3+)
 
 (define-public mes-boot
-  (let ((version "0.11")
+  (let ((version "0.12")
 (revision "0")
-(commit "24d3726ae112bfb2e28650286139822785ab2a0a"))
+(commit "96f02cd608a5669081cafd52beaef70b02f5e248"))
 (package-with-bootstrap-guile
  (package
(name "mes-boot")
@@ -237,7 +237,7 @@ hex2 linker.")
  (file-name (string-append name "-" version ".tar.xz"))
  (sha256
   (base32
-   "0j4700cmf1lvqlbrx707r6kns1rd43ixdzlms8h0y2xd8hqpy80z"
+   "0b7q9inlwizssiz9wfqjqs7pb4xqfnsgfw4cz6anj6gm6xr28fqb"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
@@ -287,15 +287,19 @@ hex2 linker.")
   (setenv "GUILE_LOAD_COMPILED_PATH"
   (string-append guile "/lib/guile/2.0/ccache"))
   (setenv "GUILE_LOAD_PATH"
-  (string-append dir
- ":" guile "/share/guile/2.0/"
- ":" dir "/nyacc-source/module"))
+  (string-append "../nyacc-source/module"
+ ":" dir
+ ":" guile "/share/guile/2.0/"))
   ;; give auto-compile a home -- massive speed-up
   (mkdir-p "/tmp/home")
   (setenv "HOME" "/tmp/home")
   (and
(zero? (system* "sh" "build.sh"))
-   (zero? (system* "sh" "check.sh"))
+   (begin
+ (setenv "MES" "src/mes")
+ (setenv "MES_MODULEDIR" "module")
+ (setenv "MESCC" "scripts/mescc.mes")
+ (zero? (system* "sh" "check.sh")))
(zero? (system* "sh" "install.sh")))
(description
  "Mes [Maxwell Equations of Software] aims to create full source



10/13: gnu: %mes-seed: Update for mes 0.13.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit c53e73d607b43f21eaf363e068685dc9dd301f09
Author: Jan Nieuwenhuizen 
Date:   Fri Apr 27 20:36:20 2018 +0200

gnu: %mes-seed: Update for mes 0.13.

* gnu/packages/mes.scm (%mes-seed): Update for mes 0.13.  Use new gitlab url
  scheme.
---
 gnu/packages/mes.scm | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 855cc4e..483f943 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -46,15 +46,15 @@
 "1mc4vdf2m6airq8rhy3w14rq9qq00ihf21lcvpvqjaifhj8856y1")
 
 (define %mes-seed
-  (origin
-(method url-fetch)
-(uri (string-append "https://gitlab.com/janneke/mes-seed;
-"/repository/archive.tar.gz?ref="
-"2c7b60da48f1cede61a43096dcb0e9e52d93e1c2"))
-(file-name (string-append "mes-seed-0.12" ".tar.xz"))
-(sha256
- (base32
-  "03glsc0brnvwilm4nfbvzf4jr1g1asmxkkcr14azb5wmkfasky39"
+  (let ((commit "d24ab2f8bd57579afebf59e5b672680642c470bd"))
+(origin
+  (method url-fetch)
+  (uri (string-append "https://gitlab.com/janneke/mes-seed;
+  "/-/archive/" commit
+  "/mes-seed-" commit ".tar.gz"))
+  (sha256
+   (base32
+"0yjw2pp87dgmgk6qz04r0f72jfs67c356a4isc9v7v9zzgni6ihw")
 
 (define %tinycc-seed
   (origin



06/13: gnu: %mescc-tools-seed: Update to new gitlab url scheme.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 878a1de205206c654544f4e99c24911dfdc1930b
Author: Jan Nieuwenhuizen 
Date:   Sat Apr 21 23:04:43 2018 +0200

gnu: %mescc-tools-seed: Update to new gitlab url scheme.

* gnu/packages/mes.scm (%mescc-tools-seed): Update to new gitlab url scheme.
---
 gnu/packages/mes.scm | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 16524ab..8c60d52 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -35,15 +35,15 @@
   #:use-module (guix packages))
 
 (define %mescc-tools-seed
-  (origin
-(method url-fetch)
-(uri (string-append "https://gitlab.com/janneke/mescc-tools-seed;
-"/repository/archive.tar.gz?ref="
-"dfea9989357b6f207cf3ec9bed8d4b3a8aaee69a"))
-(file-name (string-append "mescc-tools-seed" "-" "0.3" ".tar.xz"))
-(sha256
- (base32
-  "13d8ig24k4c1mb9p6y43xg7c3syw4spvgpra0nxvkbwgv2izk4is"
+  (let ((commit"dfea9989357b6f207cf3ec9bed8d4b3a8aaee69a"))
+(origin
+  (method url-fetch)
+  (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed;
+  "/-/archive/" commit
+  "/mescc-tools-seed-" commit ".tar.gz"))
+  (sha256
+   (base32
+"1mc4vdf2m6airq8rhy3w14rq9qq00ihf21lcvpvqjaifhj8856y1")
 
 (define %mes-seed
   (origin



08/13: gnu: stage0-boot: Update to new gitlab url scheme.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 5273343c3f67fa5b53caae0f4eed69e5e21a330e
Author: Jan Nieuwenhuizen 
Date:   Sat Apr 21 23:07:25 2018 +0200

gnu: stage0-boot: Update to new gitlab url scheme.

* gnu/packages/mes.scm (stage0-boot): Update to new gitlab url scheme.
---
 gnu/packages/mes.scm | 132 +--
 1 file changed, 65 insertions(+), 67 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index fcd9054..05e44b4 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -77,77 +77,75 @@
   "0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb"
 
 (define-public stage0-boot
- (let ((version "0.0.8")
+  (let ((version "0.0.8")
 (revision "0")
 (commit "14843efa5ed13372b1ec32a76d19f27b3febab91"))
-  (package
-(name "stage0-boot")
-(version (string-append version "-" revision "." (string-take commit 7)))
-(synopsis "Manually created initial hex programs for full source 
bootstrapping")
-(source (origin
-  (method url-fetch)
-  (uri (string-append "https://gitlab.com/janneke/stage0;
-  "/repository/archive.tar.gz?ref="
-  commit))
-  (file-name (string-append name "-" version ".tar.xz"))
-  (sha256
-   (base32
-"0ws5g4r1rnyfaxrnyqzh4qr3w2a3i3wljcc095rk897wi1xz23jz"
-(native-inputs
- `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
-   ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
-   ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
-   ("xz"  ,(search-bootstrap-binary "xz" (%current-system)))
-   ("stage0-seed"
-,(origin
-   (method url-fetch)
-   (uri (string-append "https://gitlab.com/janneke/stage0-seed;
-   "/repository/archive.tar.gz?ref="
-   "87039121e9ab4d48e9bade513c6f328cc9968583"))
-   (file-name (string-append "stage0-seed" "-" version ".tar.xz"))
-   (sha256
-(base32
- "0m18mv825nykj738gg9il60xb8xxc4015ypxgimhygdqxx0n66bp"))
-(supported-systems '("i686-linux" "x86_64-linux"))
-(build-system trivial-build-system)
-(arguments
- `(#:modules ((guix build utils))
-   #:builder
-   (begin
- (use-modules (guix build utils))
- (let* ((bash (assoc-ref %build-inputs "static-bash"))
-(tar (assoc-ref %build-inputs "tar"))
-(xz (assoc-ref %build-inputs "xz"))
-(source (assoc-ref %build-inputs "source"))
-(stage0-seed (assoc-ref %build-inputs "stage0-seed"))
-(out (assoc-ref %outputs "out"))
-(out/bin (string-append out "/bin")))
-   (setenv "PATH" (string-append bash "/bin:"
- "../stage0-seed:"
- tar "/bin:"
- xz "/bin"))
-   (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
-   (mkdir-p "source")
-   (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
-   (mkdir-p "stage0-seed")
-   (system* "tar" "--strip=1" "-C" "stage0-seed" "-xvf" stage0-seed)
-   (chdir "source")
-   (zero? (system (string-append
-"set -ex;"
-"mkdir -p " out/bin ";"
-"hex Linux\\ Bootstrap/hex.hex > " out/bin "/hex;"
-;; FIXME: exec-enable?
-;;"hex Linux\\ Bootstrap/exec_enable.hex > " out/bin "/exec_enable;"
-;;"exec_enable " out/bin "/hex"
-;;"exec_enable " out/bin "/exec_enable"
-"chmod +x " out/bin "/hex"
-)))
-(description
- "Stage0 is the initial stage of a full source bootstrapping process.  It
+(package
+  (name "stage0-boot")
+  (version (string-append version "-" revision "." (string-take commit 7)))
+  (synopsis "Manually created initial hex programs for full source 
bootstrapping")
+  (source (origin
+(method url-fetch)
+(uri (string-append "https://gitlab.com/janneke/stage0;
+"/-/archive/" commit
+"/stage0-" commit ".tar.gz"))
+(sha256
+ (base32
+  "0svmdz4ayv1lcqm49n4wn6wcfa7msvrjqg2h50hpx1kywg0rwqdr"
+  (native-inputs
+   `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
+ ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
+ ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
+ ("xz"  ,(search-bootstrap-binary "xz" (%current-system)))
+ ("stage0-seed"
+  ,(let ((commit "87039121e9ab4d48e9bade513c6f328cc9968583"))
+ (origin
+   (method url-fetch)
+   (uri (string-append "https://gitlab.com/janneke/stage0-seed;
+ 

12/13: gnu: %tinycc-seed: Update for mes 0.13.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit e1ac9df9c1016f6bf94173c4e6a909664e1a7023
Author: Jan Nieuwenhuizen 
Date:   Fri Apr 27 20:36:45 2018 +0200

gnu: %tinycc-seed: Update for mes 0.13.

* gnu/packages/mes.scm (%tinycc-seed): Update for mes 0.13.  Use new gitlab
  url scheme.
---
 gnu/packages/mes.scm | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 0ef4011..e4ac2e3 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -57,15 +57,15 @@
 "0yjw2pp87dgmgk6qz04r0f72jfs67c356a4isc9v7v9zzgni6ihw")
 
 (define %tinycc-seed
-  (origin
-(method url-fetch)
-(uri (string-append "https://gitlab.com/janneke/tinycc-seed;
-"/repository/archive.tar.gz?ref="
-"f23975bc49704d56539b3707d8afc17eaa955356"))
-(file-name (string-append "tinycc-seed" "-" "0.9.26" ".tar.xz"))
-(sha256
- (base32
-  "0b7jpzwrf4adn1wwffll5hi775f7a2d8jimcm48agkj1sd9j6r20"
+  (let ((commit "c6c2dd26cc0743fb4877996ce340bf99a3e3714e"))
+(origin
+  (method url-fetch)
+  (uri (string-append "https://gitlab.com/janneke/tinycc-seed;
+  "/-/archive/" commit
+  "/tinycc-seed-" commit ".tar.gz"))
+  (sha256
+   (base32
+"1igny96r4wqwq6scp6ayd4bzmsvch7p32n6g580373gryznnzm6z")
 
 (define %srfi-43
   (origin



02/13: gnu: %mes-seed: Update for mes-0.12.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit dbdb7703c946ea0cfa5aa9eaca9eb0d2ef8ad33a
Author: Jan Nieuwenhuizen 
Date:   Sun Apr 8 16:19:29 2018 +0200

gnu: %mes-seed: Update for mes-0.12.

* gnu/packages/mes.scm (%mes-seed): Update for mes-0.12.
---
 gnu/packages/mes.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 12be952..2451718 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -50,11 +50,11 @@
 (method url-fetch)
 (uri (string-append "https://gitlab.com/janneke/mes-seed;
 "/repository/archive.tar.gz?ref="
-"01439d7052e3b959f25d4b8ab550744e52acb214"))
-(file-name (string-append "mes-seed-0.11" ".tar.xz"))
+"2c7b60da48f1cede61a43096dcb0e9e52d93e1c2"))
+(file-name (string-append "mes-seed-0.12" ".tar.xz"))
 (sha256
  (base32
-  "1rysi6i2phvpb4jl5639lbiprpcla22pr8hng0d5s7hjqfslg48y"
+  "03glsc0brnvwilm4nfbvzf4jr1g1asmxkkcr14azb5wmkfasky39"
 
 (define %tinycc-seed
   (origin



13/13: gnu: tcc-boot: Build with mes-boot.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 8d7c74026c74e9b67fe5433dce32d42dd763ada7
Author: Jan Nieuwenhuizen 
Date:   Fri Apr 27 20:36:54 2018 +0200

gnu: tcc-boot: Build with mes-boot.

* gnu/packages/mes.scm (tcc-boot): Build with mes-boot.  Update for mes 
0.13.
  Use new gitlab url scheme.
---
 gnu/packages/mes.scm | 68 
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index e4ac2e3..ba513d3 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -344,7 +344,7 @@ extensive examples, including parsers for the Javascript 
and C99 languages.")
 (define-public tcc-boot
   (let ((version "0.9.26")
 (revision "0")
-(commit "83293537ac710ecfa8b117d2363f6f9de5c04c0d"))
+(commit "ddea739c89e145004526b5f66f3b47b20ae30cf2"))
 (package-with-bootstrap-guile
  (package
(name "tcc-boot")
@@ -353,18 +353,18 @@ extensive examples, including parsers for the Javascript 
and C99 languages.")
(source (origin
  (method url-fetch)
  (uri (string-append "https://gitlab.com/janneke/tinycc;
- "/repository/archive.tar.gz?ref="
- commit))
- (file-name (string-append name "-" version ".tar.xz"))
+ "/-/archive/" commit
+ "/tinycc-" commit ".tar.gz"))
  (sha256
   (base32
-   "0s4fzr3ax61a196152knkajq2jj50fpx9pg8li14121j6zjrmmwh"
+   "0w17a2qjh6rcfmd8phw6zxdgwh6yfwdxy6i9awzi8fckfjcwkywh"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
 `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
   ("libc" ,@(assoc-ref %bootstrap-inputs "libc"))
-  ("guile" ,%bootstrap-guile)
+  ;; For testing with Guile
+  ;; ("guile" ,%bootstrap-guile)
   ;; guile-2.0.9 does not have srfi-43; cherry-pick
   ("srfi-43" ,%srfi-43)
   ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
@@ -391,16 +391,17 @@ extensive examples, including parsers for the Javascript 
and C99 languages.")
(mes-seed (assoc-ref %build-inputs "mes-seed"))
(tinycc-seed (assoc-ref %build-inputs "tinycc-seed"))
(out (assoc-ref %outputs "out"))
-   ;;(libc ,(with-store store (package-output store 
%bootstrap-glibc)))
(libc (assoc-ref %build-inputs "libc"))
(interpreter (string-append libc ,(glibc-dynamic-linker)))
(dir (getcwd)))
-  (setenv "PATH" (string-append bash "/bin:"
-mes "/bin:"
-guile "/bin:"
-mescc-tools "/bin:"
-tar "/bin:"
-xz "/bin"))
+  (setenv "PATH" (string-append
+  bash "/bin:"
+  mes "/bin:"
+  (if guile (string-append guile "/bin:")
+  "")
+  mescc-tools "/bin:"
+  tar "/bin:"
+  xz "/bin"))
   (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
   (mkdir-p "source")
   (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
@@ -414,26 +415,31 @@ extensive examples, including parsers for the Javascript 
and C99 languages.")
   (system* "cp" srfi-43 "srfi/srfi-43.scm")
   (chdir "source")
   (setenv "PREFIX" out)
-  (setenv "MESCC" (string-append mes "/bin/mescc.scm"))
-  (setenv "MES_PREFIX" (string-append mes "/share/mes"))
+  (setenv "MESCC" (string-append mes "/bin/mescc"))
+  (symlink (string-append mes "/share/mes") "mes")
+  (setenv "MES_PREFIX" "mes")
   (setenv "OBJDUMP" "true")
-  (setenv "interpreter" interpreter)
+  (setenv "ONE_SOURCE" "1")
+  (setenv "PREPROCESS" "1")
+  (setenv "MES_DEBUG" "1")
 
-  ;; for mescc.scm -- Guile+Nyacc+MesCC, ~30 times faster
-  ;; (setenv "GUILE_AUTO_COMPILE" "1")
-  ;; (setenv "GUILE_LOAD_COMPILED_PATH"
-  ;; (string-append guile "/lib/guile/2.0/ccache"))
-  ;; (setenv "GUILE_LOAD_PATH"
-  ;; (string-append dir
-  ;;":" guile "/share/guile/2.0/"
-  ;;":" dir 

11/13: gnu: mes-boot: Update to 0.13.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit f8515667692da7156ab87f51bbf6b4b864f18183
Author: Jan Nieuwenhuizen 
Date:   Fri Apr 27 20:36:20 2018 +0200

gnu: mes-boot: Update to 0.13.

* gnu/packages/mes.scm (mes-boot): Update to 0.13.  Use new gitlab url 
scheme.
---
 gnu/packages/mes.scm | 54 +++-
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 483f943..0ef4011 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -217,9 +217,9 @@ hex2 linker.")
(license gpl3+)
 
 (define-public mes-boot
-  (let ((version "0.12")
+  (let ((version "0.13")
 (revision "0")
-(commit "96f02cd608a5669081cafd52beaef70b02f5e248"))
+(commit "9aa04a854940aec2683c1cc62205cea6da6f02a2"))
 (package-with-bootstrap-guile
  (package
(name "mes-boot")
@@ -228,18 +228,18 @@ hex2 linker.")
(source (origin
  (method url-fetch)
  (uri (string-append "https://gitlab.com/janneke/mes;
- "/repository/archive.tar.gz?ref="
- commit))
- (file-name (string-append name "-" version ".tar.xz"))
+ "/-/archive/" commit
+ "/mes-" commit ".tar.gz"))
  (sha256
   (base32
-   "0b7q9inlwizssiz9wfqjqs7pb4xqfnsgfw4cz6anj6gm6xr28fqb"
+   "065vlpjpwnzv7h7my39zb0f7bk2zrsh08g4m7si6p7m0330n3x2z"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
 `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
   ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
-  ("guile" ,%bootstrap-guile)
+  ;; For testing with Guile
+  ;; ("guile" ,%bootstrap-guile)
   ;; guile-2.0.9 does not have srfi-43; cherry-pick
   ("srfi-43" ,%srfi-43)
   ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
@@ -263,11 +263,12 @@ hex2 linker.")
(mes-seed (assoc-ref %build-inputs "mes-seed"))
(out (assoc-ref %outputs "out"))
(dir (getcwd)))
-  (setenv "PATH" (string-append bash "/bin:"
-guile "/bin:"
-mescc-tools "/bin:"
-tar "/bin:"
-xz "/bin"))
+  (setenv "PATH" (string-append
+  bash "/bin:"
+  (if guile (string-append guile "/bin:") "")
+  mescc-tools "/bin:"
+  tar "/bin:"
+  xz "/bin"))
   (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
   (mkdir-p "source")
   (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
@@ -279,26 +280,35 @@ hex2 linker.")
   (system* "cp" srfi-43 "srfi/srfi-43.scm")
   (chdir "source")
   (setenv "PREFIX" out)
-  (setenv "GUILE_AUTO_COMPILE" "1")
-  (setenv "GUILE_LOAD_COMPILED_PATH"
-  (string-append guile "/lib/guile/2.0/ccache"))
-  (setenv "GUILE_LOAD_PATH"
-  (string-append "../nyacc-source/module"
- ":" dir
- ":" guile "/share/guile/2.0/"))
+  (when guile
+(setenv "GUILE_AUTO_COMPILE" "1")
+(setenv "GUILE_LOAD_COMPILED_PATH"
+(string-append guile "/lib/guile/2.0/ccache"))
+(setenv "GUILE_LOAD_PATH"
+(string-append "../nyacc-source/module"
+   ":" dir
+   ":" guile "/share/guile/2.0/")))
   ;; give auto-compile a home -- massive speed-up
   (mkdir-p "/tmp/home")
   (setenv "HOME" "/tmp/home")
   (and
(zero? (system* "sh" "build.sh"))
-   (begin
+   (and
+ (symlink (string-append "../nyacc-source/module") "nyacc")
+ ;; guile-2.0 fails
+ (delete-file "tests/srfi-43.test-guile")
+ (when (not guile)
+   (setenv "GUILE" "true"))
+ (setenv "GUILE_LOAD_PATH" "nyacc")
  (setenv "MES" "src/mes")
  (setenv "MES_MODULEDIR" "module")
- (setenv "MESCC" "scripts/mescc.mes")
+ (setenv "MESCC" "scripts/mescc")
+ (zero? (system* "sh" "-x" "test.sh"))
+   

04/13: gnu: %tinycc-seed: Update for mes-0.12.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 50ab8d1323957f5e11195ab3093dc56af8fbafce
Author: Jan Nieuwenhuizen 
Date:   Sun Apr 8 18:09:49 2018 +0200

gnu: %tinycc-seed: Update for mes-0.12.

* gnu/packages/mes.scm (%tinycc-seed): Update for mes-0.12.
---
 gnu/packages/mes.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 6f02d99..d00c5f9 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -61,11 +61,11 @@
 (method url-fetch)
 (uri (string-append "https://gitlab.com/janneke/tinycc-seed;
 "/repository/archive.tar.gz?ref="
-"f3637ca76c2a8f27a2d925c821946803bff1a5d2"))
+"f23975bc49704d56539b3707d8afc17eaa955356"))
 (file-name (string-append "tinycc-seed" "-" "0.9.26" ".tar.xz"))
 (sha256
  (base32
-  "1xfn2hh497ck2syw380x3a7as03yf7r0z561qr50sav8gibv7vj1"
+  "0b7jpzwrf4adn1wwffll5hi775f7a2d8jimcm48agkj1sd9j6r20"
 
 (define %srfi-43
   (origin
@@ -339,7 +339,7 @@ extensive examples, including parsers for the Javascript 
and C99 languages.")
 (define-public tcc-boot
   (let ((version "0.9.26")
 (revision "0")
-(commit "4dc14198a84576ffd36ba7c4b3d4ebb743f2e96f"))
+(commit "83293537ac710ecfa8b117d2363f6f9de5c04c0d"))
 (package-with-bootstrap-guile
  (package
(name "tcc-boot")



05/13: gnu: tinycc-boot: Update for mes-0.12.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 3caa3e6d21df3c1b060a548a0f14421a2f0c5605
Author: Jan Nieuwenhuizen 
Date:   Sun Apr 8 18:10:34 2018 +0200

gnu: tinycc-boot: Update for mes-0.12.

* gnu/packages/mes.scm (tinycc-boot): Update for mes-0.12.  Build using
  Mes+MesCC only, do not use Guile.
---
 gnu/packages/mes.scm | 33 -
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index d00c5f9..16524ab 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -353,11 +353,12 @@ extensive examples, including parsers for the Javascript 
and C99 languages.")
  (file-name (string-append name "-" version ".tar.xz"))
  (sha256
   (base32
-   "1q6la34dch8bihw470zpdxdp5j08k2mijfiz77qm28aig79y0l1h"
+   "0s4fzr3ax61a196152knkajq2jj50fpx9pg8li14121j6zjrmmwh"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
 `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
+  ("libc" ,@(assoc-ref %bootstrap-inputs "libc"))
   ("guile" ,%bootstrap-guile)
   ;; guile-2.0.9 does not have srfi-43; cherry-pick
   ("srfi-43" ,%srfi-43)
@@ -385,6 +386,9 @@ extensive examples, including parsers for the Javascript 
and C99 languages.")
(mes-seed (assoc-ref %build-inputs "mes-seed"))
(tinycc-seed (assoc-ref %build-inputs "tinycc-seed"))
(out (assoc-ref %outputs "out"))
+   ;;(libc ,(with-store store (package-output store 
%bootstrap-glibc)))
+   (libc (assoc-ref %build-inputs "libc"))
+   (interpreter (string-append libc ,(glibc-dynamic-linker)))
(dir (getcwd)))
   (setenv "PATH" (string-append bash "/bin:"
 mes "/bin:"
@@ -406,20 +410,31 @@ extensive examples, including parsers for the Javascript 
and C99 languages.")
   (chdir "source")
   (setenv "PREFIX" out)
   (setenv "MESCC" (string-append mes "/bin/mescc.scm"))
+  (setenv "MES_PREFIX" (string-append mes "/share/mes"))
   (setenv "OBJDUMP" "true")
-  (setenv "GUILE_AUTO_COMPILE" "1")
-  (setenv "GUILE_LOAD_COMPILED_PATH"
-  (string-append guile "/lib/guile/2.0/ccache"))
+  (setenv "interpreter" interpreter)
+
+  ;; for mescc.scm -- Guile+Nyacc+MesCC, ~30 times faster
+  ;; (setenv "GUILE_AUTO_COMPILE" "1")
+  ;; (setenv "GUILE_LOAD_COMPILED_PATH"
+  ;; (string-append guile "/lib/guile/2.0/ccache"))
+  ;; (setenv "GUILE_LOAD_PATH"
+  ;; (string-append dir
+  ;;":" guile "/share/guile/2.0/"
+  ;;":" dir "/nyacc-source/module"
+  ;;":" mes "/share/mes/guile"))
+
+  ;; for mescc.mes -- Mes+Nyacc+MesCC
+  (setenv "MES_ARENA" "8000")
+  (setenv "MESCC" (string-append mes "/bin/mescc.mes"))
   (setenv "GUILE_LOAD_PATH"
-  (string-append dir
- ":" guile "/share/guile/2.0/"
- ":" dir "/nyacc-source/module"
- ":" mes "/share/mes/guile"))
+  (string-append "../nyacc-source/module"))
+
   (and
;; configure
(zero? (system* "sh" "configure"
"--prefix=$PREFIX"
-   "--elfinterp=interpreter"
+   (string-append "--elfinterp=" interpreter)
"--crtprefix=."
"--tccdir=."))
 



branch wip-bootstrap updated (17af12b -> 8d7c740)

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a change to branch wip-bootstrap
in repository guix.

  from  17af12b   gnu: Update mes-boot: M4 support: robustify headers.
   new  066300d   gnu: nyacc-boot: Update to 0.80.42.
   new  dbdb770   gnu: %mes-seed: Update for mes-0.12.
   new  8d7814d   gnu: mes-boot: Update to 0.12.
   new  50ab8d1   gnu: %tinycc-seed: Update for mes-0.12.
   new  3caa3e6   gnu: tinycc-boot: Update for mes-0.12.
   new  878a1de   gnu: %mescc-tools-seed: Update to new gitlab url scheme.
   new  dca94e2   gnu: mescc-tools-boot: Remove stage0 dependency.
   new  5273343   gnu: stage0-boot: Update to new gitlab url scheme.
   new  3c5cebf   gnu: nyacc-boot: Update to new gitlab url scheme.
   new  c53e73d   gnu: %mes-seed: Update for mes 0.13.
   new  f851566   gnu: mes-boot: Update to 0.13.
   new  e1ac9df   gnu: %tinycc-seed: Update for mes 0.13.
   new  8d7c740   gnu: tcc-boot: Build with mes-boot.

The 13 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/mes.scm | 330 ---
 1 file changed, 180 insertions(+), 150 deletions(-)



01/13: gnu: nyacc-boot: Update to 0.80.42.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 066300d8d389e2bd0f2b0e8a6bc8a5257b88cb4c
Author: Jan Nieuwenhuizen 
Date:   Sun Apr 8 16:21:44 2018 +0200

gnu: nyacc-boot: Update to 0.80.42.

* gnu/packages/mes.scm (nyacc-boot): Update to 0.80.42.
---
 gnu/packages/mes.scm | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 556beab..12be952 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017 Jan Nieuwenhuizen 
+;;; Copyright © 2017,2018 Jan Nieuwenhuizen 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -306,9 +306,9 @@ Guile-] Scheme interpreter prototype in C and a Nyacc-based 
C compiler in
   (license gpl3+)
 
 (define-public nyacc-boot
-  (let ((version "0.82.4")
+  (let ((version "0.80.42")
 (revision "0")
-(commit "44241a79da8e5fd85e197dbc7a6e666e7303427c"))
+(commit "2839661e344c1c709579e690063bc6a74adfb914"))
 (package
   (name "nyacc")
   (version (string-append version "-" revision "." (string-take commit 7)))
@@ -320,7 +320,7 @@ Guile-] Scheme interpreter prototype in C and a Nyacc-based 
C compiler in
 (file-name (string-append name "-" version ".tar.xz"))
 (sha256
  (base32
-  "05accf30kq0g6hpr5568n2yifshrxvq97hq0z004zlrffcw85g7j"
+  "046bf0935fa0zfwncd5sr3dm103ijsrvzbanq22a4gps30ck7hmc"
   (build-system gnu-build-system)
   (native-inputs
`(("guile" ,guile-2.2)))



09/13: gnu: nyacc-boot: Update to new gitlab url scheme.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 3c5cebf54c81f29feb4f990f5c52a89badaf5b43
Author: Jan Nieuwenhuizen 
Date:   Sat Apr 21 23:09:41 2018 +0200

gnu: nyacc-boot: Update to new gitlab url scheme.

* gnu/packages/mes.scm (nyacc-boot): Update to new gitlab url scheme.
---
 gnu/packages/mes.scm | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 05e44b4..855cc4e 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -315,12 +315,11 @@ Guile-] Scheme interpreter prototype in C and a 
Nyacc-based C compiler in
   (source (origin
 (method url-fetch)
 (uri (string-append "https://gitlab.com/janneke/nyacc;
-"/repository/archive.tar.gz?ref="
-commit))
-(file-name (string-append name "-" version ".tar.xz"))
+"/-/archive/" commit
+"/nyacc-" commit ".tar.gz"))
 (sha256
  (base32
-  "046bf0935fa0zfwncd5sr3dm103ijsrvzbanq22a4gps30ck7hmc"
+  "0dlcqmchhl57nh7f0v6qb1kkbi7zbs3b185hcqv57fhb60b7rgcq"
   (build-system gnu-build-system)
   (native-inputs
`(("guile" ,guile-2.2)))



07/13: gnu: mescc-tools-boot: Remove stage0 dependency.

2018-04-30 Thread Jan Nieuwenhuizen
janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit dca94e22bfadc6dc845d41e6d1c8a451e9f2fc42
Author: Jan Nieuwenhuizen 
Date:   Sat Apr 21 23:08:20 2018 +0200

gnu: mescc-tools-boot: Remove stage0 dependency.

* gnu/packages/mes.scm (mescc-tools-boot): Remove stage0 dependency.  Use 
new
  gitlab url scheme.
---
 gnu/packages/mes.scm | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 8c60d52..fcd9054 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -161,18 +161,16 @@ with a Knight VM that runs Forth and Lisp.")
(source (origin
  (method url-fetch)
  (uri (string-append "https://gitlab.com/janneke/mescc-tools;
- "/repository/archive.tar.gz?ref="
- commit))
- (file-name (string-append name "-" version ".tar.xz"))
+ "/-/archive/" commit
+ "/mescc-tools-" commit ".tar.gz"))
  (sha256
   (base32
-   "1kqs8z43c286hqyiwk6vs5rywhjzrys84fzh535vwpv4qky61yy4"
+   "0i693znfc9lmjw9pp5appyhxnjdxsx11q7znqm6yzn98cr0zhnam"
(native-inputs
 `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
   ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
   ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
   ("xz"  ,(search-bootstrap-binary "xz" (%current-system)))
-  ("stage0" ,stage0-boot)
   ("mescc-tools-seed" ,%mescc-tools-seed)
   ("mes-source" ,(package-source mes-boot))
   ("mes-seed" ,%mes-seed)))



04/06: services: gpm: Provide a default value and document 'gpm-service-type'.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 5986e94118b114319feadbd2431d6efbf870a5e5
Author: Ludovic Courtès 
Date:   Mon Apr 30 14:07:34 2018 +0200

services: gpm: Provide a default value and document 'gpm-service-type'.

* gnu/services/base.scm (%default-gpm-options): New variable.
()[gpm, options]: Add default values.
(gpm-service-type)[default-value]: New field.
(gpm-service): Use %DEFAULT-GPM-OPTIONS and mark as deprecated.
* doc/guix.texi (Base Services): Document 'gpm-service-type' and
'gpm-configuration'.  Remove 'gpm-service'.
---
 doc/guix.texi | 34 +-
 gnu/services/base.scm | 15 +++
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 58c3688..87892fc 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10383,15 +10383,31 @@ See @code{man loadkeys} for details.
 
 @cindex mouse
 @cindex gpm
-@deffn {Scheme Procedure} gpm-service [#:gpm @var{gpm}] @
-  [#:options]
-Run @var{gpm}, the general-purpose mouse daemon, with the given
-command-line @var{options}.  GPM allows users to use the mouse in the console,
-notably to select, copy, and paste text.  The default value of @var{options}
-uses the @code{ps2} protocol, which works for both USB and PS/2 mice.
-
-This service is not part of @var{%base-services}.
-@end deffn
+@defvr {Scheme Variable} gpm-service-type
+This is the type of the service that runs GPM, the @dfn{general-purpose
+mouse daemon}, which provides mouse support to the Linux console.  GPM
+allows users to use the mouse in the console, notably to select, copy,
+and paste text.
+
+The value for services of this type must be a @code{gpm-configuration}
+(see below).  This service is not part of @var{%base-services}.
+@end defvr
+
+@deftp {Data Type} gpm-configuration
+Data type representing the configuration of GPM.
+
+@table @asis
+@item @code{options} (default: @code{%default-gpm-options})
+Command-line options passed to @command{gpm}.  The default set of
+options instruct @command{gpm} to listen to mouse events on
+@file{/dev/input/mice}.  @xref{Command Line,,, gpm, gpm manual}, for
+more information.
+
+@item @code{gpm} (default: @code{gpm})
+The GPM package to use.
+
+@end table
+@end deftp
 
 @anchor{guix-publish-service-type}
 @deffn {Scheme Variable} guix-publish-service-type
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 694aab8..eb82b2d 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1962,10 +1962,16 @@ extra rules from the packages listed in @var{rules}."
   "Return a service that uses @var{device} as a swap device."
   (service swap-service-type device))
 
+(define %default-gpm-options
+  ;; Default options for GPM.
+  '("-m" "/dev/input/mice" "-t" "ps2"))
+
 (define-record-type* 
   gpm-configuration make-gpm-configuration gpm-configuration?
-  (gpm  gpm-configuration-gpm);package
-  (options  gpm-configuration-options))   ;list of strings
+  (gpm  gpm-configuration-gpm ;package
+(default gpm))
+  (options  gpm-configuration-options ;list of strings
+(default %default-gpm-options)))
 
 (define gpm-shepherd-service
   (match-lambda
@@ -2000,14 +2006,15 @@ extra rules from the packages listed in @var{rules}."
 (extensions
  (list (service-extension shepherd-root-service-type
   gpm-shepherd-service)))
+(default-value (gpm-configuration))
 (description
  "Run GPM, the general-purpose mouse daemon, with the given
 command-line options.  GPM allows users to use the mouse in the console,
 notably to select, copy, and paste text.  The default options use the
 @code{ps2} protocol, which works for both USB and PS/2 mice.")))
 
-(define* (gpm-service #:key (gpm gpm)
-  (options '("-m" "/dev/input/mice" "-t" "ps2")))
+(define* (gpm-service #:key (gpm gpm) ;deprecated
+  (options %default-gpm-options))
   "Run @var{gpm}, the general-purpose mouse daemon, with the given
 command-line @var{options}.  GPM allows users to use the mouse in the console,
 notably to select, copy, and paste text.  The default value of @var{options}



05/06: gnu: Add python-parso.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 8b2597d54286ccf140592ea352fd19c7323f7746
Author: Fis Trivial 
Date:   Fri Apr 27 06:58:04 2018 +

gnu: Add python-parso.

* gnu/packages/python.scm (python-parso, python2-parso): New variables.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/python.scm | 24 
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 04ab52e..f23deb5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -13145,3 +13145,27 @@ in Python.  You can simply type pybtex instead of 
bibtex.")
 (description "Python one-time password library for HMAC-based (HOTP) and
 time-based (TOTP) passwords.")
 (license license:expat)))
+
+(define-public python-parso
+  (package
+(name "python-parso")
+(version "0.2.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "parso" version))
+   (sha256
+(base32
+ "0lamywk6dm5xshlkdvxxf5j6fa2k2zpi7xagf0bwidaay3vnpgb2"
+(native-inputs
+ `(("python-pytest" ,python-pytest)))
+(build-system python-build-system)
+(home-page "https://github.com/davidhalter/parso;)
+(synopsis "Python Parser")
+(description "Parso is a Python parser that supports error recovery and
+round-trip parsing for different Python versions (in multiple Python versions).
+Parso is also able to list multiple syntax errors in your Python file.")
+(license license:expat)))
+
+(define-public python2-parso
+  (package-with-python2 python-parso))



03/06: guix system: search: Display default Shepherd service names.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 6ac8b7359a1ac80e558f41dd37004ffa727dd3c6
Author: Ludovic Courtès 
Date:   Mon Apr 30 12:57:23 2018 +0200

guix system: search: Display default Shepherd service names.

Fixes .
Reported by Clément Lassieur .

* guix/scripts/system/search.scm (service-type-default-shepherd-services)
(service-type-shepherd-names): New procedures.
(service-type->recutils): Use it.
* tests/guix-system.sh: Add test.
---
 guix/scripts/system/search.scm | 37 -
 tests/guix-system.sh   |  3 ++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/system/search.scm b/guix/scripts/system/search.scm
index b4f790c..7229c60 100644
--- a/guix/scripts/system/search.scm
+++ b/guix/scripts/system/search.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017 Ludovic Courtès 
+;;; Copyright © 2017, 2018 Ludovic Courtès 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,9 +20,11 @@
   #:use-module (guix ui)
   #:use-module (guix utils)
   #:use-module (gnu services)
+  #:use-module (gnu services shepherd)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-26)
+  #:use-module (srfi srfi-34)
   #:use-module (ice-9 regex)
   #:use-module (ice-9 match)
   #:export (service-type->recutils
@@ -39,6 +41,29 @@
 (define service-type-name*
   (compose symbol->string service-type-name))
 
+(define (service-type-default-shepherd-services type)
+  "Return the list of Shepherd services created by default instances of TYPE,
+provided TYPE has a default value."
+  (match (guard (c ((service-error? c) #f))
+   (service type))
+(#f '())
+((? service? service)
+ (let* ((extension (find (lambda (extension)
+   (eq? (service-extension-target extension)
+shepherd-root-service-type))
+ (service-type-extensions type)))
+(compute   (and extension (service-extension-compute extension
+   (if compute
+   (compute (service-value service))
+   '())
+
+(define (service-type-shepherd-names type)
+  "Return the default names of Shepherd services created for TYPE."
+  (match (map shepherd-service-provision
+  (service-type-default-shepherd-services type))
+(((names . _) ...)
+ names)))
+
 (define* (service-type->recutils type port
  #:optional (width (%text-width))
  #:key (extra-fields '()))
@@ -66,6 +91,16 @@ columns."
   (format port "extends: ~a~%"
   (extensions->recutils (service-type-extensions type)))
 
+  ;; If possible, display the list of *default* Shepherd service names.  Note
+  ;; that we may not always be able to do this (e.g., if the service type
+  ;; lacks a default value); furthermore, it could be that the service
+  ;; generates Shepherd services with different names if we give it different
+  ;; parameters (this is the case, for instance, for
+  ;; 'console-font-service-type'.)
+  (match (service-type-shepherd-names type)
+(()#f)
+(names (format port "shepherdnames:~{ ~a~}~%" names)))
+
   (when (service-type-description type)
 (format port "~a~%"
 (string->recutils
diff --git a/tests/guix-system.sh b/tests/guix-system.sh
index 211c26f..ff9114a 100644
--- a/tests/guix-system.sh
+++ b/tests/guix-system.sh
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès 
+# Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 
 # Copyright © 2017 Tobias Geerinckx-Rice 
 # Copyright © 2018 Chris Marusich 
 #
@@ -267,6 +267,7 @@ guix system build "$tmpdir/config.scm" -n
 
 # Searching.
 guix system search tor | grep "^name: tor"
+guix system search tor | grep "^shepherdnames: tor"
 guix system search anonym network | grep "^name: tor"
 
 # Below, use -n (--dry-run) for the tests because if we actually tried to



branch master updated (70ab130 -> fb8966a)

2018-04-30 Thread Ludovic Court�s
civodul pushed a change to branch master
in repository guix.

  from  70ab130   services: Re-export static-networking-service, 
static-networking-service-type.
   new  3edbe53   gnu: skribilo: Update to 0.9.4 and switch to Guile 2.2.
   new  f675d8b   gnu: Remove a couple of old deprecated package aliases.
   new  6ac8b73   guix system: search: Display default Shepherd service 
names.
   new  5986e94   services: gpm: Provide a default value and document 
'gpm-service-type'.
   new  8b2597d   gnu: Add python-parso.
   new  fb8966a   gnu: python-jedi: Update to 0.12.0, enable tests.

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:
 doc/guix.texi  | 34 ---
 gnu/packages/emacs.scm |  7 --
 gnu/packages/python.scm| 53 --
 gnu/packages/skribilo.scm  | 22 +++---
 gnu/services/base.scm  | 15 
 guix/scripts/system/search.scm | 37 -
 tests/guix-system.sh   |  3 ++-
 7 files changed, 124 insertions(+), 47 deletions(-)



01/06: gnu: skribilo: Update to 0.9.4 and switch to Guile 2.2.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 3edbe539240ad508e35ac1add3b44e8d849b2c5a
Author: Ludovic Courtès 
Date:   Mon Apr 30 11:56:14 2018 +0200

gnu: skribilo: Update to 0.9.4 and switch to Guile 2.2.

* gnu/packages/skribilo.scm (skribilo): Update to 0.9.4.
[arguments]: Remove #:configure-flags.  Adjust -C flag added to
'skribilo.in' in 'pre-configure' phase.
[inputs]: Switch to GUILE-2.2.
[native-inputs]: Switch to GUILE-LIB and GUILE-READER.
---
 gnu/packages/skribilo.scm | 22 +-
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm
index f10acae..12bdd1a 100644
--- a/gnu/packages/skribilo.scm
+++ b/gnu/packages/skribilo.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 

 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,22 +31,18 @@
 (define-public skribilo
   (package
 (name "skribilo")
-(version "0.9.3")
+(version "0.9.4")
 (source (origin
  (method url-fetch)
  (uri (string-append "mirror://savannah/skribilo/skribilo-"
  version ".tar.gz"))
  (sha256
   (base32
-   "04d8xa76jvlz25jnc6p1gzsplwcwcqrmi3f7ixdhddhl1chyz66y"
+   "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf"
 (build-system gnu-build-system)
 (arguments
  ;; Make the modules available under the usual location.
- '(#:configure-flags (list (string-append "--with-guilemoduledir="
-  (assoc-ref %outputs "out")
-  "/share/guile/site/2.0"))
-
-   #:phases
+ '(#:phases
(modify-phases %standard-phases
  (add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
@@ -57,8 +53,8 @@
(substitute* "src/skribilo.in"
  (("^exec (.*) -c" _ things)
   (string-append "exec " things
- " -L " reader "/share/guile/site/2.0"
- " -C " reader "/share/guile/site/2.0"
+ " -L " reader "/share/guile/site/2.2"
+ " -C " reader "/lib/guile/2.2/site-ccache"
  " -c"
  #t)))
 
@@ -66,7 +62,7 @@
 
 (native-inputs `(("pkg-config" ,pkg-config)))
 
-(inputs `(("guile" ,guile-2.0)
+(inputs `(("guile" ,guile-2.2)
   ("imagemagick" ,imagemagick)
   ("ghostscript" ,ghostscript); for 'convert'
   ("ploticus" ,ploticus)
@@ -74,8 +70,8 @@
 
 ;; The 'skribilo' command needs them, and for people using Skribilo as a
 ;; library, these inputs are needed as well.
-(propagated-inputs `(("guile-reader" ,guile2.0-reader)
- ("guile-lib" ,guile2.0-lib)))
+(propagated-inputs `(("guile-reader" ,guile-reader)
+ ("guile-lib" ,guile-lib)))
 
 (home-page "https://www.nongnu.org/skribilo/;)
 (synopsis "Document production tool written in Guile Scheme")



06/06: gnu: python-jedi: Update to 0.12.0, enable tests.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit fb8966abc43415ca6d1f141c44ebf0c563cea4d2
Author: Fis Trivial 
Date:   Fri Apr 27 07:03:24 2018 +

gnu: python-jedi: Update to 0.12.0, enable tests.

* gnu/packages/python.scm (jedi): Update to 0.12.0, enable tests.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/python.scm | 29 +
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f23deb5..a359eeb 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9357,25 +9357,30 @@ characters, mouse support, and auto suggestions.")
 (define-public python-jedi
   (package
 (name "python-jedi")
-(version "0.9.0")
+(version "0.12.0")
 (source
-  (origin
-(method url-fetch)
-(uri (pypi-uri "jedi" version))
-(sha256
-  (base32
-"0c8x962ynpx001fdvp07m2q5jk4igkxbj3rmnydavphvlgxijk1v"
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "jedi" version))
+   (sha256
+(base32
+ "1bcr7csx4xil1iwmk03d79jis0bkmgi9k0kir3xa4rmwqsagcwhr"
 (build-system python-build-system)
 (arguments
- ;; FIXME: One test fails (use "py.test" instead of 'setup.py test').
- '(#:tests? #f))
+ `(#:phases
+   (modify-phases %standard-phases
+ (replace 'check (lambda _
+   (invoke "py.test" "-vv"))
 (native-inputs
- `(("python-pytest" ,python-pytest)))
+ `(("python-pytest" ,python-pytest)
+   ("python-parso" ,python-parso)
+   ("python-docopt" ,python-docopt)))
 (home-page "https://github.com/davidhalter/jedi;)
 (synopsis
-  "Autocompletion for Python that can be used for text editors")
+ "Autocompletion for Python that can be used for text editors")
 (description
-  "Jedi is an autocompletion tool for Python that can be used for text 
editors.")
+ "Jedi is an autocompletion tool for Python that can be used for text
+ editors.")
 (license license:expat)))
 
 (define-public python2-jedi



02/06: gnu: Remove a couple of old deprecated package aliases.

2018-04-30 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit f675d8b97d2f2acd5277088940601cf5f2eb43db
Author: Ludovic Courtès 
Date:   Mon Apr 30 12:00:21 2018 +0200

gnu: Remove a couple of old deprecated package aliases.

* gnu/packages/emacs.scm (geiser-next, paredit/old-name): Remove.
---
 gnu/packages/emacs.scm | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 8112ec9..4738310 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -351,10 +351,6 @@ implementation, Emacs and, ultimately, the schemer, giving 
them access to live
 metadata.")
 (license license:bsd-3)))
 
-(define-public geiser-next
-  ;; This has become "geiser".
-  (deprecated-package "geiser-next" geiser))
-
 (define-public paredit
   (package
 (name "emacs-paredit")
@@ -380,9 +376,6 @@ for those who may want transient periods of unbalanced 
parentheses, such as
 when typing parentheses directly or commenting out code line by line.")
 (license license:gpl3+)))
 
-(define-public paredit/old-name
-  (deprecated-package "paredit" paredit))
-
 (define-public git-modes
   (package
 (name "emacs-git-modes")



  1   2   >