01/03: gnu: libmygpo-qt: Fix Qt 5.11 build.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 01c4869003884fc28b8993077474399b67d7be1c
Author: Pierre Langlois 
Date:   Sun May 27 13:15:41 2018 +0100

gnu: libmygpo-qt: Fix Qt 5.11 build.

The update to Qt 5.11.0 broke libmygpo-qt. It turned it was using a 
deprecated
CMake function (qt5_use_moduldes).  Let's pick up two upstream patches that
fix the issue: https://github.com/gpodder/libmygpo-qt/pull/15

As mentioned in the the pull request, there is now a test failure but it 
looks
harmless.

* gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch,
gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/music.scm (libmygpo-qt)[source]: Add patches.
[arguments]: Build tests but do not run them.

Signed-off-by: Efraim Flashner 
---
 gnu/local.mk   |  2 +
 gnu/packages/music.scm |  9 ++-
 gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch | 78 ++
 .../patches/libmygpo-qt-missing-qt5-modules.patch  | 51 ++
 4 files changed, 139 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 4cdbaec..4d9edc3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -861,6 +861,8 @@ dist_patch_DATA =   
\
   %D%/packages/patches/libmad-armv7-thumb-pt2.patch\
   %D%/packages/patches/libmad-frame-length.patch   \
   %D%/packages/patches/libmad-mips-newgcc.patch\
+  %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch   \
+  %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch   \
   %D%/packages/patches/libsndfile-armhf-type-checks.patch  \
   %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch\
   %D%/packages/patches/libsndfile-CVE-2017-8362.patch  \
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 7e98fa7..cc7926f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3846,12 +3846,19 @@ by The Echo Nest.")
   "libmygpo-qt/libmygpo-qt." version 
".tar.gz"))
   (sha256
(base32
-"1kg18qrq2rsswgzhl65r3mlyx7kpqg4wwnbp4yiv6svvmadmlxl2"
+"1kg18qrq2rsswgzhl65r3mlyx7kpqg4wwnbp4yiv6svvmadmlxl2"))
+  (patches (search-patches "libmygpo-qt-fix-qt-5.11.patch"
+   
"libmygpo-qt-missing-qt5-modules.patch"
 (build-system cmake-build-system)
 (native-inputs
  `(("pkg-config" ,pkg-config)))
 (inputs
  `(("qt" ,qtbase)))
+(arguments
+ `(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON")
+   ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446
+   ;; is fixed.
+   #:tests? #f))
 (home-page "http://wiki.gpodder.org/wiki/Libmygpo-qt;)
 (synopsis "Qt/C++ library wrapping the gpodder web service")
 (description "@code{libmygpo-qt} is a Qt/C++ library wrapping the
diff --git a/gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch 
b/gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch
new file mode 100644
index 000..69673c9
--- /dev/null
+++ b/gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch
@@ -0,0 +1,78 @@
+From 1b53767b988b339aac8b353327a1542b2a0c0610 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 15 Apr 2018 22:29:33 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ CMakeLists.txt   |  3 ---
+ src/CMakeLists.txt   |  8 ++--
+ tests/CMakeLists.txt | 12 +---
+ 3 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eb006d9..fa4b0cb 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -34,9 +34,6 @@ else()
+ set( QT_DONT_USE_QTGUI TRUE )
+ include( ${QT_USE_FILE} )
+ 
+-macro(qt5_use_modules)
+-endmacro()
+-
+ macro(qt_wrap_cpp)
+ qt4_wrap_cpp(${ARGN})
+ endmacro()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 802125b..253e81e 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -79,9 +79,13 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} )
+ 
+ add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} 
${LIBMYGPO_QT_MOC_SRC} )
+ 
+-target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} 
${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY}  )
+ set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION 
${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL)
+-qt5_use_modules( ${MYGPO_QT_TARGET_NAME} Core Network )
++
++if( NOT BUILD_WITH_QT4 )
++target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt5::Core Qt5::Network)
++else()
++target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QT_QTCORE_LIBRARY} 

02/03: gnu: libechonest: Remove package.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 1222a64c02582baf852abd1822342697ff6d1c60
Author: Pierre Langlois 
Date:   Sun May 27 15:58:30 2018 +0100

gnu: libechonest: Remove package.

It appears the "EchoNest" service isn't available anymore which makes this
package obsolete.

* gnu/packages/music.scm (libechonest): Remove variable.
(clementine)[inputs]: Remove libechonest.

Signed-off-by: Efraim Flashner 
---
 gnu/packages/music.scm | 28 
 1 file changed, 28 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index cc7926f..8f68a29 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -262,7 +262,6 @@ score, keyboard, guitar, drum and controller views.")
  ("gst-plugins-base" ,gst-plugins-base)
  ("libcdio" ,libcdio)
  ("libmygpo-qt" ,libmygpo-qt)
- ("libechonest" ,libechonest)
  ;; TODO: Package libgpod.
  ("libmtp" ,libmtp)
  ("libxml2" ,libxml2)
@@ -3809,33 +3808,6 @@ OSC connections.")
 the electronic or dubstep genre.")
 (license license:gpl3+)))
 
-(define-public libechonest
-  (package
-(name "libechonest")
-(version "2.3.1")
-(source (origin
-  (method git-fetch)
-  (uri (git-reference
-(url "git://anongit.kde.org/libechonest.git")
-(commit version)))
-  (file-name (string-append name "-" version "-checkout"))
-  (sha256
-   (base32
-"0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq"
-(build-system cmake-build-system)
-(arguments
- '(#:tests? #f  ; Tests require Internet access
-   #:configure-flags '("-DBUILD_WITH_QT4=OFF")))
-(inputs
- `(("qtbase" ,qtbase)
-   ("qjson" ,qjson)))
-(home-page "https://projects.kde.org/projects/playground/libs/libechonest;)
-(synopsis "C++/Qt classes to interface with The Echo Nest API")
-(description "@code{libechonest} is a collection of C++/Qt classes
-designed to make a developer's life easy when trying to use the APIs provided
-by The Echo Nest.")
-(license license:gpl2+)))
-
 (define-public libmygpo-qt
   (package
 (name "libmygpo-qt")

03/03: gnu: clementine: Update snapshot.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 8a6d16b897f3771c412e10c1a17d17462cbd39a5
Author: Pierre Langlois 
Date:   Sat Apr 21 15:11:04 2018 +0100

gnu: clementine: Update snapshot.

* gnu/package/music.scm (clementine): Update snapshot to 4619a4c1.

Signed-off-by: Efraim Flashner 
---
 gnu/packages/music.scm | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 8f68a29..7ae0d9a 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -187,20 +187,20 @@ score, keyboard, guitar, drum and controller views.")
 ;; We don't use the latest release because it depends on Qt4.  Instead we
 ;; download the sources from the tip of the "qt5" branch.
 (define-public clementine
-  (let ((commit "0a59257dc334b8df60a4d7d90b04f1766747efcf")
-(revision "1"))
+  (let ((commit "4619a4c1ab3b17b13d4b2327ad477912917eaf36")
+(revision "2"))
 (package
   (name "clementine")
-  (version (string-append "1.3.1-" revision "." (string-take commit 7)))
+  (version (git-version "1.3.1" revision commit))
   (source (origin
 (method git-fetch)
 (uri (git-reference
   (url 
"https://github.com/clementine-player/Clementine.git;)
   (commit commit)))
-(file-name (string-append name "-" version "-checkout"))
+(file-name (git-file-name name version))
 (sha256
  (base32
-   "0cdcj7di7j9jgzc1ihjna1a5df64f9hnmx7b9kh8rlg76hc0l0hi"))
+  "1hximk3q0p8nw8is5w7215xgkb7k4flnfyr0pdz9svfwvcm05w1i"))
 (modules '((guix build utils)))
 (snippet
   '(for-each

branch master updated (8a6d16b -> 25816c4)

[Mark H. Weaver]

mhw pushed a change to branch master
in repository guix.

  from  8a6d16b   gnu: clementine: Update snapshot.
   new  25816c4   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/packages/gnuzilla.scm | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

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

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit 25816c4306ff7d4cec21a3f0e7ce917aea75385f
Author: Mark H Weaver 
Date:   Sun May 27 03:43:37 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/gnuzilla.scm | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 68d122c..84b535d 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -476,7 +476,15 @@ security standards.")
 (mozilla-patch "icecat-bug-1452619.patch""2b75d55ccf0e" 
"1g87aybw6ggv6hyk385bplv0lx63n020gwyq0d6d4pqld48hsm1i")
 (mozilla-patch "icecat-bug-1453127.patch""89857f35df29" 
"0gzi47svrw5ajdlm3i12193psm702zx70x5h1rwp4gb7gxh4m4d9")
 (mozilla-patch "icecat-CVE-2018-5150-pt10.patch" "3f2ec03c0405" 
"0w02952dlxd2gmwghck2nm4rjjmc5ylg62bw6m1rvi35kcr134lr")
-(mozilla-patch "icecat-CVE-2018-5183.patch"  "f729bf78fb3a" 
"0xkj6jwxwdqkvb5c7wi16b8cm8qrnlrd3s9jnd46jg03iykrx56f")))
+(mozilla-patch "icecat-CVE-2018-5183.patch"  "f729bf78fb3a" 
"0xkj6jwxwdqkvb5c7wi16b8cm8qrnlrd3s9jnd46jg03iykrx56f")
+(mozilla-patch "icecat-bug-1437842.patch""eb896089db47" 
"10lppk4x2d3pim71a36ky1dmg08rs5ckfiljwvfnr1cw6934qxl4")
+(mozilla-patch "icecat-bug-1458270.patch""2374dca97bde" 
"0y1g55wvj44nzb1qfkl271jcf8s1ik8lcl1785z0zim4qzn7qkpa")
+(mozilla-patch "icecat-bug-1452576.patch""70b6298e0c9e" 
"0n5jfy6c421dkybk8m18vd61y95zz0r64g1p1zlya3fps5knfaqi")
+(mozilla-patch "icecat-bug-1459206-pt1.patch""4ef79fe9b3b7" 
"1c32z1ki1i6xj1nbb0xlxwqnmz48ikmy8dmp37rkjz8ssn04wgfg")
+(mozilla-patch "icecat-bug-1459206-pt2.patch""9ad16112044a" 
"0ayya67sx7avcb8bplfdxb92l9g4mjrb1s3hby283llhqv0ikg9b")
+(mozilla-patch "icecat-bug-1459162.patch""11d8a87fb6d6" 
"1rkmdk18llw0x1jakix75hlhy0hpsmlminnflagbzrzjli81gwm1")
+(mozilla-patch "icecat-bug-1451297.patch""407b10ad1273" 
"16qzsfirw045xag96f1qvpdlibm8lwdj9l1mlli4n1vz0db91v9q")
+(mozilla-patch "icecat-bug-1462682.patch""e76e2e481b17" 
"0hnx13msjy28n3bpa2c24kpzalam4bdk5gnp0f9k671l48rs9yb3")))
   (modules '((guix build utils)))
   (snippet
'(begin

web-interface updated (a4fe6dd -> 501d15b)

[Tatiana]

tsholokhova pushed a change to branch web-interface.

  from  a4fe6dd   basic html templates
   new  501d15b   Add specification builds page.


Summary of changes:
 src/cuirass/http.scm  |  72 ++
 src/cuirass/templates.scm | 104 +---
 src/static/style.css  | 150 ++
 3 files changed, 295 insertions(+), 31 deletions(-)
 create mode 100644 src/static/style.css

[no subject]

[Tatiana]

branch: web-interface
commit 501d15b27d16f0ef0c1f808bf97e1340a62ac5f5
Author: TSholokhova 
Date:   Mon May 28 00:25:22 2018 +0300

Add specification builds page.

* src/cuirass/http.scm: Add handler for "/status/" query. Static 
files serving. Fix codestyle.
* src/cuirass/templates.scm: Add builds tables (latest and queue). Add 
hyperref from the main page to the builds pages.
* src/static/style.css: New file. Example style file.
---
 src/cuirass/http.scm  |  72 ++
 src/cuirass/templates.scm | 104 +---
 src/static/style.css  | 150 ++
 3 files changed, 295 insertions(+), 31 deletions(-)

diff --git a/src/cuirass/http.scm b/src/cuirass/http.scm
index f5e3ac1..3d4f4c2 100644
--- a/src/cuirass/http.scm
+++ b/src/cuirass/http.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016 Mathieu Lirzin 
 ;;; Copyright © 2017 Mathieu Othacehe 
 ;;; Copyright © 2018 Ludovic Courtès 
+;;; Copyright © 2018 Tatiana Sholokhova 
 ;;;
 ;;; This file is part of Cuirass.
 ;;;
@@ -23,8 +24,10 @@
   #:use-module (cuirass database)
   #:use-module (cuirass utils)
   #:use-module (cuirass logging)
+  #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-26)
+  #:use-module (ice-9 binary-ports)
   #:use-module (ice-9 match)
   #:use-module (json)
   #:use-module (web request)
@@ -37,6 +40,25 @@
   #:use-module (cuirass templates)
   #:export (run-cuirass-server))
 
+(define %static-directory
+  ;; Define to the static file directory.
+  (string-append (or (getenv "CUIRASS_DATADIR")
+ (string-append %datadir "/" %package))
+ "/static/"))
+
+(define file-mime-types
+  '(("css" . (text/css))
+("js"  . (text/javascript))
+("png" . (image/png))
+("gif" . (image/gif))
+("html" . (text/html
+
+(define (file-extension file-name)
+  (last (string-split file-name #\.)))
+
+(define (directory? filename)
+  (string=? filename (dirname filename)))
+
 (define (build->hydra-build build)
   "Convert BUILD to an assoc list matching hydra API format."
   (define (bool->int bool)
@@ -143,8 +165,18 @@ Hydra format."
   (define (respond-html body)
 (respond '((content-type . (text/html)))
  #:body (lambda (port)
-  (sxml->xml body port)
-  )))
+  (sxml->xml body port
+  
+  (define (respond-static-file path)
+;; PATH is a list of path components
+(let ((file-name (string-join (cons* %static-directory path) "/")))
+  (if (and (not (any (cut string-contains <> "..") path))
+   (file-exists? file-name)
+   (not (directory? file-name)))
+  (respond 
+`((content-type . ,(assoc-ref file-mime-types (file-extension 
file-name
+#:body (call-with-input-file file-name get-bytevector-all))
+  (respond-not-found file-name
 
   (define (respond-build-not-found build-id)
 (respond-json-with-error
@@ -157,6 +189,11 @@ Hydra format."
404
(format #f "The build log of derivation ~a is not available." drv
 
+  (define (respond-not-found resource_name)
+(respond (build-response #:code 404)
+ #:body (string-append "Resource not found: "
+   resource_name)))
+
   (log-message "~a ~a" (request-method request)
(uri-path (request-uri request)))
 
@@ -233,18 +270,33 @@ Hydra format."
   ,@params
   (order status+submission-time)
(respond-json-with-error 500 "Parameter not defined!"
-(("status")
- (respond-html (templatize 
-   "Status" 
-   (specifications-table 
-(with-critical-section db-channel (db) 
(db-get-specifications db))
+(("status") 
+ (respond-html (html-page
+ "Status" 
+ (specifications-table 
+  (with-critical-section db-channel (db) 
(db-get-specifications db))
+(("status" name)
+  (respond-html (html-page
+  name 
+  (build-table 
+(handle-builds-request db-channel
+  `((status done)
+  (project ,name)
+  (nr 10)
+  (order finish-time)))
+(handle-builds-request db-channel
+  `((status pending)
+  (project ,name)
+  (nr 10)
+  (order status+submission-time)))
+(("static" path ...)
+ ;(display (request-uri request))
+ (respond-static-file path))
 ('method-not-allowed
  ;; 405 "Method Not Allowed"
  

branch master updated (3a69f5f -> 8a6d16b)

[Efraim Flashner]

efraim pushed a change to branch master
in repository guix.

  from  3a69f5f   gnu: Add java-logback-classic.
   new  01c4869   gnu: libmygpo-qt: Fix Qt 5.11 build.
   new  1222a64   gnu: libechonest: Remove package.
   new  8a6d16b   gnu: clementine: Update snapshot.

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


Summary of changes:
 gnu/local.mk   |  2 +
 gnu/packages/music.scm | 47 -
 gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch | 78 ++
 .../patches/libmygpo-qt-missing-qt5-modules.patch  | 51 ++
 4 files changed, 144 insertions(+), 34 deletions(-)
 create mode 100644 gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch
 create mode 100644 gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch

01/01: gnu: gnu: Make alsa find its plugins by setting ALSA_PLUGIN_DIR.

[julien lepiller]

roptat pushed a commit to branch core-updates
in repository guix.

commit 2101cc3fb691f443b830fdf5f846ded5fa018739
Author: Julien Lepiller 
Date:   Fri May 25 19:33:31 2018 +0200

gnu: gnu: Make alsa find its plugins by setting ALSA_PLUGIN_DIR.

* gnu/packages/patches/alsa-lib-add-environment-variable.patch: New
file.
* gnu/packages/linux.scm (alsa-lib)[source]: Use it.
[native-search-paths]: Add ALSA_PLUGIN_DIR.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk   |   3 +-
 gnu/packages/linux.scm |   9 +-
 .../alsa-lib-add-environment-variable.patch| 110 +
 3 files changed, 120 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index aef0b52..3859b8b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1,4 +1,4 @@
-# GNU Guix --- Functional package management for GNU
+ GNU Guix --- Functional package management for GNU
 # Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 

 # Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Andreas Enge 
 # Copyright © 2016 Mathieu Lirzin 
@@ -560,6 +560,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/alsa-lib-add-environment-variable.patch \
   %D%/packages/patches/amule-crypto-6.patch\
   %D%/packages/patches/ansible-wrap-program-hack.patch \
   %D%/packages/patches/antiword-CVE-2014-8123.patch\
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 7ba011b..466daeb 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -974,8 +974,15 @@ intercept and print the system calls executed by the 
program.")
version ".tar.bz2"))
  (sha256
   (base32
-   "096pwrnhj36yndldvs2pj4r871zhcgisks0is78f1jkjn9sd4b2z"
+   "096pwrnhj36yndldvs2pj4r871zhcgisks0is78f1jkjn9sd4b2z"))
+ (patches (search-patches 
"alsa-lib-add-environment-variable.patch"
 (build-system gnu-build-system)
+(native-search-paths
+ (list (search-path-specification
+ (variable "ALSA_PLUGIN_DIR")
+ (file-type 'regular)
+ (separator #f) ;single entry
+ (files '("lib/alsa-lib")
 (home-page "https://www.alsa-project.org/;)
 (synopsis "The Advanced Linux Sound Architecture libraries")
 (description
diff --git a/gnu/packages/patches/alsa-lib-add-environment-variable.patch 
b/gnu/packages/patches/alsa-lib-add-environment-variable.patch
new file mode 100644
index 000..a468a7f
--- /dev/null
+++ b/gnu/packages/patches/alsa-lib-add-environment-variable.patch
@@ -0,0 +1,110 @@
+From 1822fb453128a1b5de93b4c590cd272d6488a077 Mon Sep 17 00:00:00 2001
+From: Julien Lepiller 
+Date: Fri, 25 May 2018 19:26:58 +0200
+Subject: [PATCH] Add support for a ALSA_PLUGIN_DIR environment variable.
+
+If it is not set, default to previous behavior.
+---
+ src/control/control.c |  6 +-
+ src/dlmisc.c  |  9 +++--
+ src/pcm/pcm.c |  9 +++--
+ src/pcm/pcm_rate.c| 13 +
+ 4 files changed, 28 insertions(+), 9 deletions(-)
+
+diff --git a/src/control/control.c b/src/control/control.c
+index 11f7815..9dba7dd 100644
+--- a/src/control/control.c
 b/src/control/control.c
+@@ -1331,7 +1331,11 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const 
char *name,
+   build_in++;
+   }
+   if (*build_in == NULL) {
+-  buf1 = malloc(strlen(str) + sizeof(ALSA_PLUGIN_DIR) + 
32);
++  char* plugdir = ALSA_PLUGIN_DIR;
++  char* envplugdir = getenv("ALSA_PLUGIN_DIR");
++  if(envplugdir != NULL)
++  plugdir = envplugdir;
++  buf1 = malloc(strlen(str) + strlen(plugdir) + 32);
+   if (buf1 == NULL) {
+   err = -ENOMEM;
+   goto _err;
+diff --git a/src/dlmisc.c b/src/dlmisc.c
+index 3757d33..92aa864 100644
+--- a/src/dlmisc.c
 b/src/dlmisc.c
+@@ -82,9 +82,14 @@ void *snd_dlopen(const char *name, int mode, char *errbuf, 
size_t errbuflen)
+   char *filename = NULL;
+ 
+   if (name && name[0] != '/') {
+-  filename = alloca(sizeof(ALSA_PLUGIN_DIR) + 1 + strlen(name) + 
1);
++  char* plugdir = ALSA_PLUGIN_DIR;
++  char* envplugdir = getenv("ALSA_PLUGIN_DIR");
++  if(envplugdir != NULL)
++  plugdir = envplugdir;
++
++  filename = 

branch core-updates updated (1640f16 -> 2101cc3)

[julien lepiller]

roptat pushed a change to branch core-updates
in repository guix.

  from  1640f16   Merge branch 'master' into core-updates
   new  2101cc3   gnu: gnu: Make alsa find its plugins by setting 
ALSA_PLUGIN_DIR.

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


Summary of changes:
 gnu/local.mk   |   3 +-
 gnu/packages/linux.scm |   9 +-
 .../alsa-lib-add-environment-variable.patch| 110 +
 3 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/alsa-lib-add-environment-variable.patch

07/08: gnu: Add java-logback-core.

[julien lepiller]

roptat pushed a commit to branch master
in repository guix.

commit 7d8207a4c177732f87817b4a9a8e04c352e61284
Author: Julien Lepiller 
Date:   Sat May 26 11:58:21 2018 +0200

gnu: Add java-logback-core.

* gnu/packages/java.scm (java-logback-core): New variable.
---
 gnu/packages/java.scm | 55 +++
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a810a53..edfa7db 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -10040,3 +10040,58 @@ source files to a set of class files like 
@code{javac}, but also compile a
 Java expression, block, class body or source file in memory, load the bytecode
 and execute it directly in the same JVM.  @code{janino} can also be used for
 static code analysis or code manipulation.")))
+
+(define-public java-logback-core
+  (package
+(name "java-logback-core")
+(version "1.2.3")
+(source (origin
+  (method url-fetch)
+  (uri (string-append 
"https://github.com/qos-ch/logback/archive/v_;
+  version ".tar.gz"))
+  (sha256
+   (base32
+"1x6ga74yfgm94cfx98gybakbrlilx8i2gn6dx13l40kasmys06mi"))
+  (modules '((guix build utils)))
+  (snippet
+   '(delete-file-recursively "logback-access/lib"
+(build-system ant-build-system)
+(arguments
+ `(#:jar-name "logback.jar"
+   #:source-dir "src/main/java"
+   #:test-dir "src/test"
+   #:test-exclude
+   ;; These tests fail with Unable to set MockitoNamingPolicy on cglib 
generator
+   ;; which creates FastClasses
+   (list "**/AllCoreTest.*"
+ "**/AutoFlushingObjectWriterTest.*"
+ "**/PackageTest.*"
+ "**/ResilientOutputStreamTest.*"
+ ;; And we still don't want to run abstract classes
+ "**/Abstract*.*")
+   #:phases
+   (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+   (lambda _
+ (chdir "logback-core")
+ #t)
+(inputs
+ `(("java-javax-mail" ,java-javax-mail)
+   ("java-tomcat" ,java-tomcat)
+   ("java-commons-compiler" ,java-commons-compiler)
+   ("java-janino" ,java-janino)))
+(native-inputs
+ `(("java-junit" ,java-junit)
+   ("java-hamcrest-core" ,java-hamcrest-core)
+   ("java-mockito-1" ,java-mockito-1)
+   ("java-cglib" ,java-cglib)
+   ("java-asm" ,java-asm)
+   ("java-objenesis" ,java-objenesis)
+   ("java-joda-time" ,java-joda-time)))
+(home-page "https://logback.qos.ch;)
+(synopsis "Logging for java")
+(description "Logback is intended as a successor to the popular log4j 
project.
+This module lays the groundwork for the other two modules.")
+;; Either epl1.0 or lgpl2.1
+(license (list license:epl1.0
+   license:lgpl2.1

05/08: gnu: Add java-commons-compiler.

[julien lepiller]

roptat pushed a commit to branch master
in repository guix.

commit 3fa18fe796e02f65ef55ea070cbec35593e19625
Author: Julien Lepiller 
Date:   Fri May 25 23:35:18 2018 +0200

gnu: Add java-commons-compiler.

* gnu/packages/java.scm (java-commons-compiler): New variable.
---
 gnu/packages/java.scm | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index e205ccc..cfd8f81 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9986,3 +9986,34 @@ OSGi Service Registry is a goal of this project.")
 classpath scanning, auto-binding, and dynamic auto-wiring.  This package
 adds Plexus support to the Sisu-Inject container.")
 (license license:epl1.0)))
+
+(define-public java-commons-compiler
+  (package
+(name "java-commons-compiler")
+(version "3.0.8")
+(source (origin
+  (method git-fetch)
+  (uri (git-reference
+ (url "https://github.com/janino-compiler/janino;)
+ (commit "91aa95686d1e4ca3b16a984a03a38686572331b2")))
+  (file-name (string-append name "-" version))
+  (sha256
+   (base32
+"04hfdl59sgh20qkxzgnibvs8f9hy6n7znxwpk611y5d89977y62r"))
+  (modules '((guix build utils)))
+  (snippet
+   '(begin
+  (for-each delete-file
+(find-files "." "\\.jar$"))
+  #t
+(build-system ant-build-system)
+(arguments
+ `(#:jar-name "commons-compiler.jar"
+   #:source-dir "commons-compiler/src/main"
+   #:tests? #f)); no tests
+(home-page "https://github.com/janino-compiler/janino;)
+(synopsis "Java compiler")
+(description "Commons-compiler contains an API for janino, including the
+@code{IExpressionEvaluator}, @code{IScriptEvaluator}, 
@code{IClassBodyEvaluator}
+and @code{ISimpleCompiler} interfaces.")
+(license license:bsd-3)))

06/08: gnu: Add java-janino.

[julien lepiller]

roptat pushed a commit to branch master
in repository guix.

commit 3402e651c87190299b0d1cab18ace4ea29e65b1f
Author: Julien Lepiller 
Date:   Sat May 26 00:00:37 2018 +0200

gnu: Add java-janino.

* gnu/packages/java.scm (java-janino): New variable.
---
 gnu/packages/java.scm | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index cfd8f81..a810a53 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -10017,3 +10017,26 @@ adds Plexus support to the Sisu-Inject container.")
 @code{IExpressionEvaluator}, @code{IScriptEvaluator}, 
@code{IClassBodyEvaluator}
 and @code{ISimpleCompiler} interfaces.")
 (license license:bsd-3)))
+
+(define-public java-janino
+  (package
+(inherit java-commons-compiler)
+(name "java-janino")
+(arguments
+ `(#:jar-name "janino.jar"
+   #:source-dir "src/main/java"
+   #:phases
+   (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+   (lambda _
+ (chdir "janino"))
+(inputs
+ `(("java-commons-compiler" ,java-commons-compiler)))
+(native-inputs
+ `(("java-junit" ,java-junit)
+   ("java-hamcrest-core" ,java-hamcrest-core)))
+(description "Janino is a Java compiler.  Janino can compile a set of
+source files to a set of class files like @code{javac}, but also compile a
+Java expression, block, class body or source file in memory, load the bytecode
+and execute it directly in the same JVM.  @code{janino} can also be used for
+static code analysis or code manipulation.")))

01/08: gnu: Add java-jsr250.

[julien lepiller]

roptat pushed a commit to branch master
in repository guix.

commit a1a5ef2094a99bf97dd3e260c6b74bee4d4c861e
Author: Julien Lepiller 
Date:   Fri May 25 21:36:45 2018 +0200

gnu: Add java-jsr250.

* gnu/packages/java.scm (java-jsr250): New variable.
---
 gnu/packages/java.scm | 29 -
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 90fd07c..d109c3f 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2016 Leo Famulari 
 ;;; Copyright © 2016, 2017 Roel Janssen 
 ;;; Copyright © 2017 Carlo Zancanaro 
-;;; Copyright © 2017 Julien Lepiller 
+;;; Copyright © 2017, 2018 Julien Lepiller 
 ;;; Copyright © 2017 Thomas Danckaert 
 ;;; Copyright © 2016, 2017, 2018 Alex Vong 
 ;;; Copyright © 2017 Tobias Geerinckx-Rice 
@@ -4263,6 +4263,33 @@ from within Java, as well as an object registry that 
exposes Java objects to
 these scripting language engines.")
 (license license:asl2.0)))
 
+(define-public java-jsr250
+  (package
+(name "java-jsr250")
+(version "1.3")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "https://repo1.maven.org/maven2/;
+  "javax/annotation/javax.annotation-api/"
+  version "/javax.annotation-api-"
+  version "-sources.jar"))
+  (sha256
+   (base32
+"08clh8n4n9wfglf75qsqfjs6yf79f7x6hqx38cn856pksszv50kz"
+(build-system ant-build-system)
+(arguments
+ `(#:tests? #f ; no tests included
+   #:jdk ,icedtea-8
+   #:jar-name "jsr250.jar"))
+(home-page "https://jcp.org/en/jsr/detail?id=250;)
+(synopsis "Security-related annotations")
+(description "This package provides annotations for security.  It provides
+packages in the @code{javax.annotation} and @code{javax.annotation.security}
+namespaces.")
+;; either cddl or gpl2 only, with classpath exception
+(license (list license:cddl1.0
+   license:gpl2
+
 (define-public java-jsr305
   (package
 (name "java-jsr305")

08/08: gnu: Add java-logback-classic.

[julien lepiller]

roptat pushed a commit to branch master
in repository guix.

commit 3a69f5f2d348be38026c56ce3e9f04302e6d198e
Author: Julien Lepiller 
Date:   Sat May 26 13:32:34 2018 +0200

gnu: Add java-logback-classic.

* gnu/packages/java.scm (java-logback-classic): New variable.
---
 gnu/packages/java.scm | 45 +
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index edfa7db..1efa657 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -53,6 +53,7 @@
   #:use-module (gnu packages gnuzilla) ;nss
   #:use-module (gnu packages ghostscript) ;lcms
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages groovy)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages icu4c)
@@ -10095,3 +10096,47 @@ This module lays the groundwork for the other two 
modules.")
 ;; Either epl1.0 or lgpl2.1
 (license (list license:epl1.0
license:lgpl2.1
+
+(define-public java-logback-classic
+  (package
+(inherit java-logback-core)
+(name "java-logback-classic")
+(arguments
+ `(#:jar-name "logback-classic.jar"
+   #:source-dir "src/main/java"
+   #:test-dir "src/test"
+   #:tests? #f; tests require more packages: h2, greenmail, hsql, 
subethamail, slf4j, log4j, felix
+   #:jdk ,icedtea-8
+   #:phases
+   (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+   (lambda _
+ (chdir "logback-classic")
+ #t))
+ (replace 'build
+   (lambda* (#:key inputs #:allow-other-keys)
+ (mkdir-p "build/classes")
+ (setenv "CLASSPATH"
+ (string-join
+   (apply append (map (lambda (input)
+(find-files (assoc-ref inputs 
input)
+".*.jar"))
+  '("java-logback-core" 
"java-slf4j-api"
+"java-commons-compiler" 
"java-tomcat"
+"groovy")))
+   ":"))
+ (apply invoke "groovyc" "-d" "build/classes" "-j"
+(find-files "src/main/" ".*\\.(groovy|java)$"))
+ (invoke "ant" "jar")
+ #t)
+(inputs
+ `(("java-logback-core" ,java-logback-core)
+   ("java-slf4j-api" ,java-slf4j-api)
+   ,@(package-inputs java-logback-core)))
+(native-inputs
+ `(("groovy" ,groovy)))
+(description "Logback is intended as a successor to the popular log4j 
project.
+This module can be assimilated to a significantly improved version of log4j.
+Moreover, @code{logback-classic} natively implements the slf4j API so that you
+can readily switch back and forth between logback and other logging frameworks
+such as log4j or @code{java.util.logging} (JUL).")))

02/08: gnu: Add java-eclipse-sisu-inject.

[julien lepiller]

roptat pushed a commit to branch master
in repository guix.

commit 1a1810f534b8a296a90ab3da2b27cbe238fd28e8
Author: Julien Lepiller 
Date:   Fri May 25 21:43:18 2018 +0200

gnu: Add java-eclipse-sisu-inject.

* gnu/packages/java.scm (java-eclipse-sisu-inject): New variable.
---
 gnu/packages/java.scm | 40 
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d109c3f..66d6981 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9833,3 +9833,43 @@ and reporting) project dependencies.  It is 
characterized by the following:
   reporting and publication.
 @end itemize")
 (license license:asl2.0)))
+
+(define-public java-eclipse-sisu-inject
+  (package
+(name "java-eclipse-sisu-inject")
+(version "0.3.3")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "https://github.com/eclipse/sisu.inject/;
+  "archive/releases/" version ".tar.gz"))
+  (sha256
+   (base32
+"11rg6yw5nl13i65xsp4jxxgr341qcnnaan48p767h28kb07s0ajn"
+(build-system ant-build-system)
+(arguments
+ `(#:jar-name "eclipse-sisu-inject.jar"
+   #:source-dir "org.eclipse.sisu.inject/src"
+   #:jdk ,icedtea-8
+   #:tests? #f)); no tests
+(inputs
+ `(("java-guice" ,java-guice)
+   ("java-guice-servlet" ,java-guice-servlet)
+   ("java-javax-inject" ,java-javax-inject)
+   ("java-tomcat" ,java-tomcat)
+   ("java-junit" ,java-junit)
+   ("java-slf4j-api" ,java-slf4j-api)
+   ("java-jsr305" ,java-jsr305)
+   ("java-jsr250" ,java-jsr250)
+   ("java-cdi-api" ,java-cdi-api)
+   ("java-osgi-framework" ,java-osgi-framework)
+   ("java-osgi-util-tracker" ,java-osgi-util-tracker)
+   ("java-testng" ,java-testng)))
+(home-page "https://www.eclipse.org/sisu/;)
+(synopsis "Classpath scanning, auto-binding, and dynamic auto-wiring")
+(description "Sisu is a modular JSR330-based container that supports
+classpath scanning, auto-binding, and dynamic auto-wiring.  Sisu uses
+Google-Guice to perform dependency injection and provide the core JSR330
+support, but removes the need to write explicit bindings in Guice modules.
+Integration with other containers via the Eclipse Extension Registry and the
+OSGi Service Registry is a goal of this project.")
+(license license:epl1.0)))

04/08: gnu: Add java-commons-jxpath.

[julien lepiller]

roptat pushed a commit to branch master
in repository guix.

commit 66006fe5264769ee6705271b41ae29cfd534c9a7
Author: Julien Lepiller 
Date:   Fri May 25 23:25:07 2018 +0200

gnu: Add java-commons-jxpath.

* gnu/packages/java.scm (java-commons-jxpath): New variable.
---
 gnu/packages/java.scm | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 4aef4be..e205ccc 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -4263,6 +4263,37 @@ from within Java, as well as an object registry that 
exposes Java objects to
 these scripting language engines.")
 (license license:asl2.0)))
 
+(define-public java-commons-jxpath
+  (package
+(name "java-commons-jxpath")
+(version "1.3")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "mirror://apache/commons/jxpath/source/"
+  "commons-jxpath-" version "-src.tar.gz"))
+  (sha256
+   (base32
+"1rpgg31ayn9fwr4bfi2i1ij0npcg79ad2fv0w9hacvawsyc42cfs"
+(build-system ant-build-system)
+(arguments
+ `(#:jar-name "commons-jxpath.jar"
+   ;; tests require more dependencies, including mockrunner which depends 
on old software
+   #:tests? #f
+   #:source-dir "src/java"))
+(inputs
+ `(("java-tomcat" ,java-tomcat)
+   ("java-jdom" ,java-jdom)
+   ("java-commons-beanutils" ,java-commons-beanutils)))
+(native-inputs
+ `(("java-junit" ,java-junit)))
+(home-page "http://commons.apache.org/jxpath/;)
+(synopsis "Simple interpreter of an expression language called XPath.")
+(description "The org.apache.commons.jxpath package defines a simple
+interpreter of an expression language called XPath.  JXPath applies XPath
+expressions to graphs of objects of all kinds: JavaBeans, Maps, Servlet
+contexts, DOM etc, including mixtures thereof.")
+(license license:asl2.0)))
+
 (define-public java-jsr250
   (package
 (name "java-jsr250")

branch master updated (9b9db6c -> 3a69f5f)

[julien lepiller]

roptat pushed a change to branch master
in repository guix.

  from  9b9db6c   gnu: xonotic: Correct licenses.
   new  a1a5ef2   gnu: Add java-jsr250.
   new  1a1810f   gnu: Add java-eclipse-sisu-inject.
   new  7049dea   gnu: Add java-eclipse-sisu-plexus.
   new  66006fe   gnu: Add java-commons-jxpath.
   new  3fa18fe   gnu: Add java-commons-compiler.
   new  3402e65   gnu: Add java-janino.
   new  7d8207a   gnu: Add java-logback-core.
   new  3a69f5f   gnu: Add java-logback-classic.

The 8 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/java.scm | 336 +-
 1 file changed, 335 insertions(+), 1 deletion(-)

03/08: gnu: Add java-eclipse-sisu-plexus.

[julien lepiller]

roptat pushed a commit to branch master
in repository guix.

commit 7049dea1854f5f09ae744578e5666af80246804e
Author: Julien Lepiller 
Date:   Fri May 25 21:46:21 2018 +0200

gnu: Add java-eclipse-sisu-plexus.

* gnu/packages/java.scm (java-eclipse-sisu-plexus): New variable.
---
 gnu/packages/java.scm | 82 +++
 1 file changed, 82 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 66d6981..4aef4be 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9873,3 +9873,85 @@ support, but removes the need to write explicit bindings 
in Guice modules.
 Integration with other containers via the Eclipse Extension Registry and the
 OSGi Service Registry is a goal of this project.")
 (license license:epl1.0)))
+
+(define-public java-eclipse-sisu-plexus
+  (package
+(name "java-eclipse-sisu-plexus")
+(version "0.3.3")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "https://github.com/eclipse/sisu.plexus/;
+  "archive/releases/" version ".tar.gz"))
+  (sha256
+   (base32
+"0lbj7nxy5j0z71k407zbb82icfqh7midrfk0fb3fa3jzdjz0d9d9"))
+  (modules '((guix build utils)))
+  (snippet
+   '(begin
+  (for-each delete-file (find-files "." ".*.jar"))
+  (rename-file "org.eclipse.sisu.plexus.tests/src"
+   "org.eclipse.sisu.plexus.tests/java")
+  #t
+(build-system ant-build-system)
+(arguments
+ `(#:jar-name "eclipse-sisu-plexus.jar"
+   #:source-dir "org.eclipse.sisu.plexus/src"
+   #:test-dir "org.eclipse.sisu.plexus.tests"
+   #:test-exclude
+   (list
+ ;; This test fails probably because we can't generate the necessary
+ ;; meta-inf files.
+ "**/PlexusLoggingTest.*"
+ ;; FIXME: This test fails because of some injection error
+ "**/PlexusRequirementTest.*")
+   #:jdk ,icedtea-8
+   #:phases
+   (modify-phases %standard-phases
+ (add-before 'build 'copy-resources
+   (lambda _
+ (install-file 
"org.eclipse.sisu.plexus/META-INF/plexus/components.xml"
+   "build/classes/META-INF/plexus")
+ #t))
+ (add-before 'check 'build-test-jar
+   (lambda _
+ (with-directory-excursion 
"org.eclipse.sisu.plexus.tests/resources/component-jar/src/main/"
+   (mkdir "build")
+   (with-directory-excursion "java"
+ (apply invoke "javac" "-cp"
+(string-append (getenv "CLASSPATH")
+   ":../../../../../build/classes")
+(find-files "." ".*.java"))
+ (for-each (lambda (file) (install-file file (string-append 
"../build/" file)))
+   (find-files "." ".*.jar")))
+   (mkdir-p "build/META-INF/plexus")
+   (copy-file "resources/META-INF/plexus/components.xml"
+  "build/META-INF/plexus/components.xml")
+   (with-directory-excursion "build"
+ (invoke "jar" "cf" "../../../component-jar-0.1.jar" ".")))
+ (with-directory-excursion "org.eclipse.sisu.plexus.tests/"
+   (copy-recursively "META-INF" "../build/test-classes/META-INF")
+   (substitute* 
"java/org/eclipse/sisu/plexus/DefaultPlexusContainerTest.java"
+ (("resources/component-jar")
+  "org.eclipse.sisu.plexus.tests/resources/component-jar")))
+ #t)
+(inputs
+ `(("java-plexus-classworlds" ,java-plexus-classworlds)
+   ("java-plexus-util" ,java-plexus-utils)
+   ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+   ("java-osgi-framework" ,java-osgi-framework)
+   ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
+   ("java-guice" ,java-guice)
+   ("java-javax-inject" ,java-javax-inject)
+   ("java-slf4j-api" ,java-slf4j-api)
+   ("java-junit" ,java-junit)))
+(native-inputs
+ `(("java-guava" ,java-guava)
+   ("java-aopalliance" ,java-aopalliance)
+   ("java-cglib" ,java-cglib)
+   ("java-asm" ,java-asm)))
+(home-page "https://www.eclipse.org/sisu/;)
+(synopsis "Plexus support for the sisu container")
+(description "Sisu is a modular JSR330-based container that supports
+classpath scanning, auto-binding, and dynamic auto-wiring.  This package
+adds Plexus support to the Sisu-Inject container.")
+(license license:epl1.0)))

01/01: website: ssh-agent: Fix some minor typos.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix-artwork.

commit 4300a9e88b2387ded7e7298a143bc1ce5923759d
Author: Chris Marusich 
Date:   Sat May 26 12:05:01 2018 -0700

website: ssh-agent: Fix some minor typos.

* website/posts/use-stock-ssh-agent-everywhere.md: Fix some minor
typos.

Signed-off-by: Ludovic Courtès 
---
 website/posts/use-stock-ssh-agent-everywhere.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/posts/use-stock-ssh-agent-everywhere.md 
b/website/posts/use-stock-ssh-agent-everywhere.md
index b6cdf72..436ea64 100644
--- a/website/posts/use-stock-ssh-agent-everywhere.md
+++ b/website/posts/use-stock-ssh-agent-everywhere.md
@@ -136,7 +136,7 @@ feature of GNOME Keyring will override the environment 
variables set
 by OpenSSH's `ssh-agent`, so commands like `ssh-add` will wind up
 communicating with the GNOME Keyring instead of the `ssh-agent` you
 launched in your `~/.xsession`.  This is bad because, as previously
-mentioned, GNOME Keyring version 3.27 and earlier don't support as
+mentioned, GNOME Keyring version 3.27 or earlier doesn't support as
 many uses cases as OpenSSH's `ssh-agent`.
 
 How can we work around this problem?
@@ -253,7 +253,7 @@ refer to the [the Guile
 
manual](https://www.gnu.org/software/guile/manual/html_node/List-Constructors.html#index-cons_002a).
 
 Now the question is: what should `my-gnome-desktop-configuration` be?
-Well, if we examine [the docstring for this record type in the Guix
+Well, if we examine [the definition of this record type in the Guix
 
source](https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/services/desktop.scm?id=263c9941a1e523b360ca9f42d1ed6b11e6e6e285#n799),
 we see the following:
 

branch master updated (f0cd736 -> 4300a9e)

[Ludovic Court�s]

civodul pushed a change to branch master
in repository guix-artwork.

  from  f0cd736   website: ssh-agent: Adjust tags and date, add footer.
   new  4300a9e   website: ssh-agent: Fix some minor typos.

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:
 website/posts/use-stock-ssh-agent-everywhere.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

branch master updated (8650034 -> 9b9db6c)

[Rutger Helling]

rhelling pushed a change to branch master
in repository guix.

  from  8650034   gnu: qtconnectivity: Enable previously failing test.
   new  9b9db6c   gnu: xonotic: Correct licenses.

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

01/01: gnu: xonotic: Correct licenses.

[Rutger Helling]

rhelling pushed a commit to branch master
in repository guix.

commit 9b9db6c482a203ff8526a53460ab7308c2f4da81
Author: Rutger Helling 
Date:   Sun May 27 10:21:03 2018 +0200

gnu: xonotic: Correct licenses.

* gnu/packages/games.scm (xonotic-data)[license]: Refer to correct file.
* gnu/packages/games.scm (xonotic)[license]: Refer to correct file.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8d84a36..3e84836 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4953,7 +4953,7 @@ quotation from a collection of quotes.")
 (description
  "Xonotic-data provides the data files required by the game Xonotic.")
 (license (list license:gpl2+
-   license:x11 ; server/rcon.pl
+   (license:x11-style "file://server/rcon.pl")
 
 (define-public xonotic
   (package
@@ -5152,4 +5152,4 @@ development between them, and it aims to become the best 
possible
 open-source FPS of its kind.")
 (license (list license:gpl2+
license:bsd-3 ; /source/d0_blind_id folder and others
-   license:x11-style
+   (license:x11-style "" "See file rcon.pl.")

branch master updated (1f52eb7 -> 8650034)

[Efraim Flashner]

efraim pushed a change to branch master
in repository guix.

  from  1f52eb7   gnu: qt: Update to 5.11.0.
   new  8650034   gnu: qtconnectivity: Enable previously failing test.

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/qt.scm | 11 ---
 1 file changed, 11 deletions(-)

01/01: gnu: qtconnectivity: Enable previously failing test.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 865003433fc6601718976113f5eaa2958cf4e8dc
Author: Efraim Flashner 
Date:   Sun May 27 10:12:07 2018 +0300

gnu: qtconnectivity: Enable previously failing test.

* gnu/packages/qt.scm (qtconnectivity)[arguments]: Remove custom
'disable-failing-tests phase.
---
 gnu/packages/qt.scm | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index aa89f91..c3d0bff 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -804,17 +804,6 @@ with JavaScript and C++.")))
  (sha256
   (base32
"0wqq5q5saf007aphvpn5pvj6l0qp0z7wxvfba6v9iq5ylyqm6bnd"
-(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
-   ((#:phases phases)
-`(modify-phases ,phases
-   (add-after 'unpack 'disable-failing-tests
- ;; this test fails on armhf and aarch64
- (lambda _
-   (substitute* 
"tests/auto/qndefnfcsmartposterrecord/tst_qndefnfcsmartposterrecord.cpp"
- (("QCOMPARE\\(record.action\\(\\), 
QNdefNfcSmartPosterRecord::UnspecifiedAction")
- "//QCOMPARE(record.action(), 
QNdefNfcSmartPosterRecord::UnspecifiedAction"))
-   #t))
 (native-inputs
  `(("perl" ,perl)
("pkg-config" ,pkg-config)

01/01: gnu: qt: Update to 5.11.0.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 1f52eb7be7e166b477b7635ff71936fc05425a6e
Author: Efraim Flashner 
Date:   Sat May 26 21:23:10 2018 +0300

gnu: qt: Update to 5.11.0.

* gnu/packages/qt.scm (qtbase, qtsvg, qtimageformats, qtx11extras,
qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors,
qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel,
qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2,
qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcanvas3d,
qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech):
Update to 5.11.0.
[source]: Update source uri.
(qtbase)[source]: Don't remove bundled sqlite.
[inputs]: Remove sqlite.
[arguments]: Use 'invoke'. Use bundled sqlite.
(qtsvg, qtmultimedia, qtcanvas3d)[arguments]: Use 'invoke'.
(qtremoteobjects)[arguments]: Skip new integration test.
---
 gnu/packages/qt.scm | 299 
 1 file changed, 161 insertions(+), 138 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index aa61d6d..aa89f91 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -370,16 +370,16 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
 (define-public qtbase
   (package
 (name "qtbase")
-(version "5.9.4")
+(version "5.11.0")
 (source (origin
  (method url-fetch)
  (uri (string-append "https://download.qt.io/official_releases/qt/;
  (version-major+minor version) "/" version
- "/submodules/" name "-opensource-src-"
+ "/submodules/" name "-everywhere-src-"
  version ".tar.xz"))
  (sha256
   (base32
-   "1kq422vb2zaic099pgzwk7c0qzgc3xap6qahw5vklrq0mgivvrk9"))
+   "0rny87ypnkkvyp9p76nim77v6np0cdf1dbjfmcilklzphkdlcvpd"))
  ;; Use TZDIR to avoid depending on package "tzdata".
  (patches (search-patches "qtbase-use-TZDIR.patch"))
  (modules '((guix build utils)))
@@ -390,7 +390,7 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
   (lambda (dir)
 (delete-file-recursively (string-append "src/3rdparty/" 
dir)))
   (list "double-conversion" "freetype" "harfbuzz-ng"
-"libpng" "libjpeg" "pcre2" "sqlite" "xcb"
+"libpng" "libjpeg" "pcre2" "xcb"
 "xkbcommon" "zlib"))
 #t
 (build-system gnu-build-system)
@@ -432,7 +432,7 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
("pcre2" ,pcre2)
("postgresql" ,postgresql)
("pulseaudio" ,pulseaudio)
-   ("sqlite" ,sqlite)
+   ;("sqlite" ,sqlite)
("unixodbc" ,unixodbc)
("xcb-util" ,xcb-util)
("xcb-util-image" ,xcb-util-image)
@@ -475,42 +475,45 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  (("NO_DEFAULT_PATH") ""))
;; do not pass "--enable-fast-install", which makes the
;; configure process fail
-   (zero? (system*
-   "./configure"
-   "-verbose"
-   "-prefix" out
-   "-docdir" (string-append out "/share/doc/qt5")
-   "-headerdir" (string-append out "/include/qt5")
-   "-archdatadir" (string-append out "/lib/qt5")
-   "-datadir" (string-append out "/share/qt5")
-   "-examplesdir" (string-append
-   out "/share/doc/qt5/examples")
-   "-opensource"
-   "-confirm-license"
-   ;; Do not build examples; if desired, these could go
-   ;; into a separate output, but for the time being, we
-   ;; prefer to save the space and build time.
-   "-no-compile-examples"
-   ;; Most "-system-..." are automatic, but some use
-   ;; the bundled copy by default.
-   "-system-sqlite"
-   "-system-harfbuzz"
-   "-system-pcre"
-   ;; explicitly link with openssl instead of dlopening it
-   "-openssl-linked"
-   ;; explicitly link with dbus instead of dlopening it
-   "-dbus-linked"
-   ;; don't use the precompiled headers
-   "-no-pch"
-   ;; drop special machine instructions that do not have
-   ;; runtime detection
-   ,@(if (string-prefix? "x86_64"
-

branch master updated (a4e45ac -> 1f52eb7)

[Efraim Flashner]

efraim pushed a change to branch master
in repository guix.

  from  a4e45ac   gnu: linux-libre: Update to 4.16.12.
   new  1f52eb7   gnu: qt: Update to 5.11.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/qt.scm | 299 
 1 file changed, 161 insertions(+), 138 deletions(-)