01/02: hydra: guix-modular: Build the full Guix.

2018-06-10 Thread Ludovic Court�
civodul pushed a commit to branch master
in repository guix.

commit e740e8b27d8ac255ccc3737a1f66f0951578d845
Author: Ludovic Courtès 
Date:   Sun Jun 10 22:20:35 2018 +0200

hydra: guix-modular: Build the full Guix.

* build-aux/hydra/guix-modular.scm (build-job): Pass #:pull-version to
BUILD.
---
 build-aux/hydra/guix-modular.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm
index 58e09e1..9ff9e09 100644
--- a/build-aux/hydra/guix-modular.scm
+++ b/build-aux/hydra/guix-modular.scm
@@ -46,6 +46,7 @@ for SYSTEM.  Use VERSION as the version identifier."
 `((derivation . ,(derivation-file-name
   (run-with-store store
 (build source #:version version #:system system
+   #:pull-version 1
#:guile-version "2.2" ;the latest 2.2.x
   (description . "Modular Guix")
   (long-description



branch master updated (3edf0d5 -> 8b3aea9)

2018-06-10 Thread Ludovic Court�
civodul pushed a change to branch master
in repository guix.

  from  3edf0d5   import: json: Consolidate duplicate json-fetch 
functionality.
   new  e740e8b   hydra: guix-modular: Build the full Guix.
   new  8b3aea9   gnu: guix: Update to 77a1aac.

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:
 build-aux/hydra/guix-modular.scm| 1 +
 gnu/packages/package-management.scm | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)



02/02: gnu: guix: Update to 77a1aac.

2018-06-10 Thread Ludovic Court�
civodul pushed a commit to branch master
in repository guix.

commit 8b3aea9d9e022b20137cec93f668df8fa051abd9
Author: Ludovic Courtès 
Date:   Sun Jun 10 23:31:01 2018 +0200

gnu: guix: Update to 77a1aac.

* gnu/packages/package-management.scm (guix): Update to 77a1aac.
---
 gnu/packages/package-management.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 39c7dcf..18a848e 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -95,8 +95,8 @@
   ;; Note: the 'update-guix-package.scm' script expects this definition to
   ;; start precisely like this.
   (let ((version "0.14.0")
-(commit "ab85cf7185da366da56314c53d8e43276e14")
-(revision 11))
+(commit "77a1aac679d7c8085762f610e22e6ebfb43b")
+(revision 12))
 (package
   (name "guix")
 
@@ -112,7 +112,7 @@
   (commit commit)))
 (sha256
  (base32
-  "1c00yr2vgsdl3kmlbjppyws47ssahamdx88y0wg26x73px71rd19"))
+  "0f0agvw3fizy0aaf51vc2d1rbsvxhg6vnzgjb1n1hbyym79f17j6"))
 (file-name (string-append "guix-" version "-checkout"
   (build-system gnu-build-system)
   (arguments



01/01: import: json: Consolidate duplicate json-fetch functionality.

2018-06-10 Thread Jelle Licht
jlicht pushed a commit to branch master
in repository guix.

commit 3edf0d53a4043c30f3ff87b3b4b7b47d1bac1397
Author: Jelle Licht 
Date:   Sun Jun 10 20:35:39 2018 +0200

import: json: Consolidate duplicate json-fetch functionality.

* guix/import/json.scm (json-fetch): Return a list or hash table.
  (json-fetch-alist): New procedure.
* guix/import/github.scm (json-fetch*): Remove.
  (latest-released-version): Use json-fetch.
* guix/import/cpan.scm (module->dist-name): Use json-fetch-alist.
  (cpan-fetch): Likewise.
* guix/import/crate.scm (crate-fetch): Likewise.
* guix/import/gem.scm (rubygems-fetch): Likewise.
* guix/import/pypi.scm (pypi-fetch): Likewise.
* guix/import/stackage.scm (stackage-lts-info-fetch): Likewise.
---
 guix/import/cpan.scm |  9 +
 guix/import/crate.scm|  4 ++--
 guix/import/gem.scm  |  2 +-
 guix/import/github.scm   | 19 ++-
 guix/import/json.scm | 24 +---
 guix/import/pypi.scm |  4 ++--
 guix/import/stackage.scm |  2 +-
 7 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm
index 58c051e..08bed87 100644
--- a/guix/import/cpan.scm
+++ b/guix/import/cpan.scm
@@ -88,9 +88,10 @@
   "Return the base distribution module for a given module.  E.g. the 'ok'
 module is distributed with 'Test::Simple', so (module->dist-name \"ok\") would
 return \"Test-Simple\""
-  (assoc-ref (json-fetch (string-append 
"https://fastapi.metacpan.org/v1/module/;
-module
-"?fields=distribution"))
+  (assoc-ref (json-fetch-alist (string-append
+"https://fastapi.metacpan.org/v1/module/;
+module
+"?fields=distribution"))
  "distribution"))
 
 (define (package->upstream-name package)
@@ -113,7 +114,7 @@ return \"Test-Simple\""
   "Return an alist representation of the CPAN metadata for the perl module 
MODULE,
 or #f on failure.  MODULE should be e.g. \"Test::Script\""
   ;; This API always returns the latest release of the module.
-  (json-fetch (string-append "https://fastapi.metacpan.org/v1/release/; name)))
+  (json-fetch-alist (string-append "https://fastapi.metacpan.org/v1/release/; 
name)))
 
 (define (cpan-home name)
   (string-append "http://search.cpan.org/dist/; name "/"))
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index a7485bb..3724a45 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -51,7 +51,7 @@
   (define (crate-kind-predicate kind)
 (lambda (dep) (string=? (assoc-ref dep "kind") kind)))
 
-  (and-let* ((crate-json (json-fetch (string-append crate-url crate-name)))
+  (and-let* ((crate-json (json-fetch-alist (string-append crate-url 
crate-name)))
  (crate (assoc-ref crate-json "crate"))
  (name (assoc-ref crate "name"))
  (version (assoc-ref crate "max_version"))
@@ -63,7 +63,7 @@
  string->license)
   '()))   ;missing license info
  (path (string-append "/" version "/dependencies"))
- (deps-json (json-fetch (string-append crate-url name path)))
+ (deps-json (json-fetch-alist (string-append crate-url name path)))
  (deps (assoc-ref deps-json "dependencies"))
  (input-crates (filter (crate-kind-predicate "normal") deps))
  (native-input-crates
diff --git a/guix/import/gem.scm b/guix/import/gem.scm
index 6e914d6..646163f 100644
--- a/guix/import/gem.scm
+++ b/guix/import/gem.scm
@@ -38,7 +38,7 @@
 (define (rubygems-fetch name)
   "Return an alist representation of the RubyGems metadata for the package 
NAME,
 or #f on failure."
-  (json-fetch
+  (json-fetch-alist
(string-append "https://rubygems.org/api/v1/gems/; name ".json")))
 
 (define (ruby-package-name name)
diff --git a/guix/import/github.scm b/guix/import/github.scm
index 4b7d53c..ef22691 100644
--- a/guix/import/github.scm
+++ b/guix/import/github.scm
@@ -22,31 +22,16 @@
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-34)
-  #:use-module (json)
   #:use-module (guix utils)
   #:use-module ((guix download) #:prefix download:)
   #:use-module (guix import utils)
+  #:use-module (guix import json)
   #:use-module (guix packages)
   #:use-module (guix upstream)
   #:use-module (guix http-client)
   #:use-module (web uri)
   #:export (%github-updater))
 
-(define (json-fetch* url)
-  "Return a representation of the JSON resource URL (a list or hash table), or
-#f if URL returns 403 or 404."
-  (guard (c ((and (http-get-error? c)
-  (let ((error (http-get-error-code c)))
-(or (= 403 error)
-(= 404 error
- #f)) ;; "expected" if there is an authentification error 

branch master updated (670a5e5 -> 3edf0d5)

2018-06-10 Thread Jelle Licht
jlicht pushed a change to branch master
in repository guix.

  from  670a5e5   gnu: keepalived: Install info documentation.
   new  3edf0d5   import: json: Consolidate duplicate json-fetch 
functionality.

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:
 guix/import/cpan.scm |  9 +
 guix/import/crate.scm|  4 ++--
 guix/import/gem.scm  |  2 +-
 guix/import/github.scm   | 19 ++-
 guix/import/json.scm | 24 +---
 guix/import/pypi.scm |  4 ++--
 guix/import/stackage.scm |  2 +-
 7 files changed, 30 insertions(+), 34 deletions(-)



01/01: gnu: keepalived: Install info documentation.

2018-06-10 Thread ???
iyzsong pushed a commit to branch master
in repository guix.

commit 670a5e543033022a66d930d62a7dbff510f095db
Author: 宋文武 
Date:   Sun Jun 10 23:42:14 2018 +0800

gnu: keepalived: Install info documentation.

* gnu/packages/cluster.scm (keepalived)[arguments]: Add phases 'build-info'
and 'install-info'.
[native-inputs]: Add texinfo.
---
 gnu/packages/cluster.scm | 24 ++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm
index 429b088..7cfd04f 100644
--- a/gnu/packages/cluster.scm
+++ b/gnu/packages/cluster.scm
@@ -24,6 +24,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls))
 
 (define-public keepalived
@@ -48,10 +49,29 @@
  ;; output of 'pkg-config'.
  (substitute* "configure"
(("PKG_CONFIG --libs") "PKG_CONFIG --libs-only-l"))
- #t)
+ #t))
+ (add-after 'build 'build-info
+   (lambda _
+ (invoke "make" "-C" "doc" "texinfo")
+ ;; Put images in a subdirectory as recommended by 'texinfo'.
+ (install-file "doc/build/texinfo/software_design.png"
+   "doc/build/texinfo/keepalived-figures")
+ (substitute* "doc/build/texinfo/keepalived.texi"
+   (("@image\\{software_design,")
+"@image{keepalived-figures/software_design,"))
+ (invoke "make" "-C" "doc/build/texinfo")))
+ (add-after 'install 'install-info
+   (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+(infodir (string-append out "/share/info")))
+   (install-file "doc/build/texinfo/keepalived.info" infodir)
+   (install-file "doc/build/texinfo/software_design.png"
+ (string-append infodir "/keepalived-figures"))
+   #t))
 (native-inputs
  `(("pkg-config" ,pkg-config)
-   ("python-sphinx" ,python-sphinx)))
+   ("python-sphinx" ,python-sphinx)
+   ("texinfo" ,texinfo)))
 (inputs
  `(("openssl" ,openssl)
("libnfnetlink" ,libnfnetlink)



branch master updated (af09dab -> 670a5e5)

2018-06-10 Thread ???
iyzsong pushed a change to branch master
in repository guix.

  from  af09dab   gnu: Add keepalived.
   new  670a5e5   gnu: keepalived: Install info documentation.

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



01/02: gnu: Add libnfnetlink.

2018-06-10 Thread ???
iyzsong pushed a commit to branch master
in repository guix.

commit 4dd1fb79f7a3247f92989df6d14ccc71737cd172
Author: 宋文武 
Date:   Thu Jun 7 22:01:39 2018 +0800

gnu: Add libnfnetlink.

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

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4180132..e52c27c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4827,3 +4827,26 @@ libpfm4 provides support for the @code{perf_events} 
interface, which was
 introduced in Linux 2.6.31.")
 (home-page "http://perfmon2.sourceforge.net/;)
 (license license:expat)))
+
+(define-public libnfnetlink
+  (package
+(name "libnfnetlink")
+(version "1.0.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"https://www.netfilter.org/projects/libnfnetlink/files/;
+"libnfnetlink-" version ".tar.bz2"))
+  (sha256
+   (base32
+"06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j"
+(build-system gnu-build-system)
+(home-page "https://www.netfilter.org/projects/libnfnetlink/;)
+(synopsis "Low-level netfilter netlink communication library")
+(description
+ "@code{libnfnetlink} is the low-level library for netfilter related
+kernel/userspace communication.  It provides a generic messaging
+infrastructure for in-kernel netfilter subsystems (such as nfnetlink_log,
+nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or
+management tools in userspace.")
+(license license:gpl2)))



branch master updated (fc51c11 -> af09dab)

2018-06-10 Thread ???
iyzsong pushed a change to branch master
in repository guix.

  from  fc51c11   gnu: mumble: Fix build with Boost 1.66.
   new  4dd1fb7   gnu: Add libnfnetlink.
   new  af09dab   gnu: Add keepalived.

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/local.mk |  1 +
 gnu/packages/cluster.scm | 67 
 gnu/packages/linux.scm   | 23 +
 3 files changed, 91 insertions(+)
 create mode 100644 gnu/packages/cluster.scm



02/02: gnu: Add keepalived.

2018-06-10 Thread ???
iyzsong pushed a commit to branch master
in repository guix.

commit af09dabf70659a891bc1cb392aeff1ff5b8aeded
Author: 宋文武 
Date:   Thu Jun 7 22:07:30 2018 +0800

gnu: Add keepalived.

* gnu/packages/cluster.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
 gnu/local.mk |  1 +
 gnu/packages/cluster.scm | 67 
 2 files changed, 68 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6aba643..7fa7e7d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -96,6 +96,7 @@ GNU_SYSTEM_MODULES =  \
   %D%/packages/chez.scm\
   %D%/packages/ci.scm  \
   %D%/packages/cinnamon.scm\
+  %D%/packages/cluster.scm \
   %D%/packages/cmake.scm   \
   %D%/packages/cobol.scm   \
   %D%/packages/code.scm\
diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm
new file mode 100644
index 000..429b088
--- /dev/null
+++ b/gnu/packages/cluster.scm
@@ -0,0 +1,67 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Sou Bunnbu 
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see .
+
+(define-module (gnu packages cluster)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix packages)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages tls))
+
+(define-public keepalived
+  (package
+(name "keepalived")
+(version "2.0.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"http://www.keepalived.org/software/keepalived-;
+version ".tar.gz"))
+  (sha256
+   (base32
+"0hp8i56zkf0398bmpi32a85f05cv2fy9wizkdfbxk7gav4z6yx18"
+(build-system gnu-build-system)
+(arguments
+ '(#:phases
+   (modify-phases %standard-phases
+ (add-before 'configure 'patch-configure
+   (lambda _
+ ;; XXX: The 'configure' script doesn't handle '-L' flags in the
+ ;; output of 'pkg-config'.
+ (substitute* "configure"
+   (("PKG_CONFIG --libs") "PKG_CONFIG --libs-only-l"))
+ #t)
+(native-inputs
+ `(("pkg-config" ,pkg-config)
+   ("python-sphinx" ,python-sphinx)))
+(inputs
+ `(("openssl" ,openssl)
+   ("libnfnetlink" ,libnfnetlink)
+   ("libnl" ,libnl)))
+(home-page "http://www.keepalived.org/;)
+(synopsis "Loadbalancing and high-availability frameworks")
+(description
+ "Keepalived provides frameworks for both load balancing and high
+availability.  The load balancing framework relies on the Linux Virtual
+Server (IPVS) kernel module.  High availability is achieved by the Virtual
+Redundancy Routing Protocol (VRRP).  Each Keepalived framework can be used
+independently or together to provide resilient infrastructures.")
+(license license:gpl2+)))



branch master updated (e6c8199 -> fc51c11)

2018-06-10 Thread Danny Milosavljevic
dannym pushed a change to branch master
in repository guix.

  from  e6c8199   gnu: nix: Update to 2.0.4.
   new  fc51c11   gnu: mumble: Fix build with Boost 1.66.

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/patches/mumble-1.2.19-abs.patch | 31 
 gnu/packages/telephony.scm   |  1 +
 3 files changed, 33 insertions(+)
 create mode 100644 gnu/packages/patches/mumble-1.2.19-abs.patch



01/01: gnu: mumble: Fix build with Boost 1.66.

2018-06-10 Thread Danny Milosavljevic
dannym pushed a commit to branch master
in repository guix.

commit fc51c11b9d2534050ee32ea4598dc1ccef911913
Author: Danny Milosavljevic 
Date:   Sun Jun 10 15:49:10 2018 +0200

gnu: mumble: Fix build with Boost 1.66.

Fixes .

* gnu/packages/patches/mumble-1.2.19-abs.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/telephony.scm (mumble)[source]: Add it.
---
 gnu/local.mk |  1 +
 gnu/packages/patches/mumble-1.2.19-abs.patch | 31 
 gnu/packages/telephony.scm   |  1 +
 3 files changed, 33 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index e014d59..6aba643 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -938,6 +938,7 @@ dist_patch_DATA =   
\
   %D%/packages/patches/mozjs38-shell-version.patch \
   %D%/packages/patches/mozjs38-tracelogger.patch   \
   %D%/packages/patches/mozjs38-version-detection.patch \
+  %D%/packages/patches/mumble-1.2.19-abs.patch \
   %D%/packages/patches/mumps-build-parallelism.patch   \
   %D%/packages/patches/mupen64plus-ui-console-notice.patch \
   %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch\
diff --git a/gnu/packages/patches/mumble-1.2.19-abs.patch 
b/gnu/packages/patches/mumble-1.2.19-abs.patch
new file mode 100644
index 000..683325f
--- /dev/null
+++ b/gnu/packages/patches/mumble-1.2.19-abs.patch
@@ -0,0 +1,31 @@
+From ea861fe86743c8402bbad77d8d1dd9de8dce447e Mon Sep 17 00:00:00 2001
+From: Mikkel Krautz 
+Date: Fri, 29 Dec 2017 14:47:25 +0100
+Subject: [PATCH] AudioOutput: do not use non-existant template version of
+ std::abs.
+
+This change fixes AudioOutput to use the float overload of std::abs:
+
+float std::abs(float);
+
+instead of a non-existant template version (for newer Boost 1.66).
+
+Fixes mumble-voip/mumble#3281
+
+---
+ src/mumble/AudioOutput.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp
+index cbe0c0e2b..7a0a5e2ab 100644
+--- a/src/mumble/AudioOutput.cpp
 b/src/mumble/AudioOutput.cpp
+@@ -437,7 +437,7 @@ bool AudioOutput::mix(void *outbuff, unsigned int nsamp) {
+   top[2] = 0.0f;
+   }
+ 
+-  if (std::abs(front[0] * top[0] + 
front[1] * top[1] + front[2] * top[2]) > 0.01f) {
++  if (std::abs(front[0] * top[0] + front[1] * 
top[1] + front[2] * top[2]) > 0.01f) {
+   // Not perpendicular. Assume Y up and 
rotate 90 degrees.
+ 
+   float azimuth = 0.0f;
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 6b625b5..201cd80 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -387,6 +387,7 @@ address of one of the participants.")
   (sha256
(base32
 "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh"))
+  (patches (search-patches "mumble-1.2.19-abs.patch"))
   (modules '((guix build utils)))
   (snippet
`(begin



web-interface updated (8e31e6f -> 7091f46)

2018-06-10 Thread Tatiana
tsholokhova pushed a change to branch web-interface.

  from  8e31e6f   Add basic HTML templates, main and specification builds 
pages.
   new  7091f46   Implement first feature. Add bootstrap style.


Summary of changes:
 src/cuirass/database.scm |   39 +-
 src/cuirass/http.scm |   66 +-
 src/cuirass/templates.scm|  163 +-
 src/static/css/bootstrap.css | 8981 ++
 src/static/css/open-iconic-bootstrap.css |  952 
 src/static/fonts/open-iconic.eot |  Bin 0 -> 28196 bytes
 src/static/fonts/open-iconic.otf |  Bin 0 -> 20996 bytes
 src/static/fonts/open-iconic.svg |  543 ++
 src/static/fonts/open-iconic.ttf |  Bin 0 -> 28028 bytes
 src/static/fonts/open-iconic.woff|  Bin 0 -> 14984 bytes
 src/static/images/logo.png   |  Bin 0 -> 9494 bytes
 src/static/style.css |  150 -
 12 files changed, 10692 insertions(+), 202 deletions(-)
 create mode 100644 src/static/css/bootstrap.css
 create mode 100644 src/static/css/open-iconic-bootstrap.css
 create mode 100644 src/static/fonts/open-iconic.eot
 create mode 100644 src/static/fonts/open-iconic.otf
 create mode 100644 src/static/fonts/open-iconic.svg
 create mode 100644 src/static/fonts/open-iconic.ttf
 create mode 100644 src/static/fonts/open-iconic.woff
 create mode 100644 src/static/images/logo.png
 delete mode 100644 src/static/style.css



branch master updated (1bfde76 -> e6c8199)

2018-06-10 Thread ???
iyzsong pushed a change to branch master
in repository guix.

  from  1bfde76   gnu: musescore: Fix build against Qt 5.11.
   new  e6c8199   gnu: nix: Update to 2.0.4.

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 | 34 +-
 1 file changed, 9 insertions(+), 25 deletions(-)



01/01: gnu: nix: Update to 2.0.4.

2018-06-10 Thread ???
iyzsong pushed a commit to branch master
in repository guix.

commit e6c8199b66e8309a329c8693dbb5ddbfa44ec20e
Author: 宋文武 
Date:   Sun Jun 10 21:29:04 2018 +0800

gnu: nix: Update to 2.0.4.

* gnu/packages/package-management.scm (nix): Update to 2.0.4.
---
 gnu/packages/package-management.scm | 34 +-
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index e8e17ee..39c7dcf 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -33,6 +33,7 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpio)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages file)
@@ -376,41 +377,24 @@ out) and returning a package that uses that as its 
'source'."
 (define-public nix
   (package
 (name "nix")
-(version "1.11.9")
+(version "2.0.4")
 (source (origin
  (method url-fetch)
  (uri (string-append "http://nixos.org/releases/nix/nix-;
  version "/nix-" version ".tar.xz"))
  (sha256
   (base32
-   "1qg7qrfr60dysmyfg3ijgani71l23p1kqadhjs8kz11pgwkkx50f"
+   "0ss9svxlh1pvrdmnqjvjyqjmbqmrdbyfarvbb14i9d4bggzl0r8n"
 (build-system gnu-build-system)
-;; XXX: Should we pass '--with-store-dir=/gnu/store'?  But then we'd also
-;; need '--localstatedir=/var'.  But then!  The thing would use /var/nix
-;; instead of /var/guix.  So in the end, we do nothing special.
-(arguments
- '(#:configure-flags
-   ;; Set the prefixes of Perl libraries to avoid propagation.
-   (let ((perl-libdir (lambda (p)
-(string-append
- (assoc-ref %build-inputs p)
- "/lib/perl5/site_perl"
- (list (string-append "--with-dbi="
-  (perl-libdir "perl-dbi"))
-   (string-append "--with-dbd-sqlite="
-  (perl-libdir "perl-dbd-sqlite"))
-   (string-append "--with-www-curl="
-  (perl-libdir "perl-www-curl"))
-(native-inputs `(("perl" ,perl)
- ("pkg-config" ,pkg-config)))
+(native-inputs `(("pkg-config" ,pkg-config)))
 (inputs `(("curl" ,curl)
-  ("openssl" ,openssl)
+  ("bzip2" ,bzip2)
   ("libgc" ,libgc)
+  ("libseccomp" ,libseccomp)
+  ("libsodium" ,libsodium)
+  ("openssl" ,openssl)
   ("sqlite" ,sqlite)
-  ("bzip2" ,bzip2)
-  ("perl-www-curl" ,perl-www-curl)
-  ("perl-dbi" ,perl-dbi)
-  ("perl-dbd-sqlite" ,perl-dbd-sqlite)))
+  ("xz" ,xz)))
 (home-page "https://nixos.org/nix/;)
 (synopsis "The Nix package manager")
 (description



branch master updated (09b21b7 -> 1bfde76)

2018-06-10 Thread Nicolas Goaziou
ngz pushed a change to branch master
in repository guix.

  from  09b21b7   gnu: heimdal: Update to 7.5.0.
   new  1bfde76   gnu: musescore: Fix build against Qt 5.11.

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



01/01: gnu: musescore: Fix build against Qt 5.11.

2018-06-10 Thread Nicolas Goaziou
ngz pushed a commit to branch master
in repository guix.

commit 1bfde769f6c6aed2623a34047d8dfed82722731c
Author: Nicolas Goaziou 
Date:   Sun Jun 10 13:47:25 2018 +0200

gnu: musescore: Fix build against Qt 5.11.

* gnu/packages/music.scm (musescore)[arguments]: Remove Webkit support, 
since
  it is replaced with Qt WebEngine in Qt 5.11.  Add missing include line.
[inputs]: Remove "qtwekbit".
---
 gnu/packages/music.scm | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 56f4339..f06885d 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3536,7 +3536,10 @@ audio samples and various soft sythesizers.  It can 
receive input from a MIDI ke
  `(#:make-flags
`(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
  "USE_SYSTEM_FREETYPE=ON"
- "DOWNLOAD_SOUNDFONT=OFF")
+ "DOWNLOAD_SOUNDFONT=OFF"
+ ;; The following is not supported since Qt 5.11.  Can be
+ ;; removed in Musescore 2.2.2+.
+ "BUILD_WEBKIT=OFF")
;; There are tests, but no simple target to run.  The command
;; used to run them is:
;;
@@ -3548,6 +3551,14 @@ audio samples and various soft sythesizers.  It can 
receive input from a MIDI ke
#:tests? #f
#:phases
(modify-phases %standard-phases
+ ;; Fix Qt 5.11 upgrade.  Should be fixed in 2.2.2+, see:
+ ;; 

+ (add-after 'unpack 'patch-sources
+   (lambda _
+ (substitute* "all.h"
+   (("#include ") "#include 
+#include "))
+ #t))
  (delete 'configure
 (inputs
  `(("alsa-lib" ,alsa-lib)
@@ -3565,7 +3576,6 @@ audio samples and various soft sythesizers.  It can 
receive input from a MIDI ke
("qtdeclarative" ,qtdeclarative)
("qtscript" ,qtscript)
("qtsvg" ,qtsvg)
-   ("qtwebkit" ,qtwebkit)
("qtxmlpatterns" ,qtxmlpatterns)))
 (native-inputs
  `(("cmake" ,cmake)



branch master updated (b7e2fcf -> 09b21b7)

2018-06-10 Thread ???
iyzsong pushed a change to branch master
in repository guix.

  from  b7e2fcf   gnu: milkytracker: Update to 1.02.00.
   new  09b21b7   gnu: heimdal: Update to 7.5.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/local.mk  |  2 -
 gnu/packages/kerberos.scm | 56 +--
 gnu/packages/patches/heimdal-CVE-2017-11103.patch | 45 
 gnu/packages/patches/heimdal-CVE-2017-6594.patch  | 85 ---
 4 files changed, 36 insertions(+), 152 deletions(-)
 delete mode 100644 gnu/packages/patches/heimdal-CVE-2017-11103.patch
 delete mode 100644 gnu/packages/patches/heimdal-CVE-2017-6594.patch



01/01: gnu: heimdal: Update to 7.5.0.

2018-06-10 Thread ???
iyzsong pushed a commit to branch master
in repository guix.

commit 09b21b77ccff2603a8145a2eace1e2162db2adc6
Author: Alex Vong 
Date:   Tue Jul 18 06:36:48 2017 +0800

gnu: heimdal: Update to 7.5.0.

* gnu/packages/kerberos.scm (heimdal): Update to 7.5.0.
[source]: Update source uri.  Remove patches.
[arguments]: Adjust #:configure-flags and build phases accordingly.
[inputs]: Add sqlite.
[native-inputs]: Add texinfo and unzip.
* gnu/packages/patches/heimdal-CVE-2017-6594.patch,
  gnu/packages/patches/heimdal-CVE-2017-11103.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.

Co-authored-by: 宋文武 
---
 gnu/local.mk  |  2 -
 gnu/packages/kerberos.scm | 56 +--
 gnu/packages/patches/heimdal-CVE-2017-11103.patch | 45 
 gnu/packages/patches/heimdal-CVE-2017-6594.patch  | 85 ---
 4 files changed, 36 insertions(+), 152 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 07ca5e2..e014d59 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -785,8 +785,6 @@ dist_patch_DATA =   
\
   %D%/packages/patches/hdf-eos5-remove-gctp.patch  \
   %D%/packages/patches/hdf-eos5-fix-szip.patch \
   %D%/packages/patches/hdf-eos5-fortrantests.patch \
-  %D%/packages/patches/heimdal-CVE-2017-6594.patch \
-  %D%/packages/patches/heimdal-CVE-2017-11103.patch\
   %D%/packages/patches/hmmer-remove-cpu-specificity.patch  \
   %D%/packages/patches/higan-remove-march-native-flag.patch\
   %D%/packages/patches/hubbub-sort-entities.patch  \
diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index 6877f5b..22d74d3 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2012, 2013 Nikita Karetnikov 
 ;;; Copyright © 2012, 2017 Ludovic Courtès 
 ;;; Copyright © 2017 Ricardo Wurmus 
+;;; Copyright © 2017 Alex Vong 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -135,29 +136,26 @@ secure manner through client-server mutual authentication 
via tickets.")
 (define-public heimdal
   (package
 (name "heimdal")
-(version "1.5.3")
+(version "7.5.0")
 (source (origin
   (method url-fetch)
-  (uri (string-append "http://www.h5l.org/dist/src/heimdal-;
-  version ".tar.gz"))
+  (uri (string-append
+"https://github.com/heimdal/heimdal/releases/download/;
+"heimdal-" version "/" "heimdal-" version ".tar.gz"))
   (sha256
(base32
-"19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma"))
-  (patches (search-patches "heimdal-CVE-2017-6594.patch"
-   "heimdal-CVE-2017-11103.patch"))
+"1bdc682in55ygrxmhncs7cf4s239apcblci3z8i80wnc1w1s18n5"))
   (modules '((guix build utils)))
   (snippet
'(begin
   (substitute* "configure"
 (("User=.*$") "User=Guix\n")
+(("Host=.*$") "Host=GNU")
 (("Date=.*$") "Date=2017\n"))
   #t
 (build-system gnu-build-system)
 (arguments
  '(#:configure-flags (list
-  ;; Work around a linker error.
-  "CFLAGS=-pthread"
-
   ;; Avoid 7 MiB of .a files.
   "--disable-static"
 
@@ -167,22 +165,40 @@ secure manner through client-server mutual authentication 
via tickets.")
(assoc-ref %build-inputs "readline") "/lib")
   (string-append
"--with-readline-include="
-   (assoc-ref %build-inputs "readline") "/include"))
+   (assoc-ref %build-inputs "readline") "/include")
+
+  ;; Do not build sqlite.
+  (string-append
+   "--with-sqlite3="
+   (assoc-ref %build-inputs "sqlite")))
 
#:phases (modify-phases %standard-phases
-  (add-before 'check 'skip-tests
+  (add-before 'configure 'pre-configure
 (lambda _
-  ;; The test simply runs 'ftp --version && ftp --help'
-  ;; but that fails in the chroot because 'ftp' tries to
-  ;; do a service lookup before printing the help/version.
-  (substitute* "appl/ftp/ftp/Makefile.in"
-(("^CHECK_LOCAL =.*")
- "CHECK_LOCAL = no-check-local\n"))
-  #t)
-(native-inputs `(("e2fsprogs" ,e2fsprogs)))   ;for 'compile_et'
+  (substitute*