Re: [PATCH] gnu: ruby: Replace with 2.3.2 [fixes CVE-2015-3900].

2016-11-19 Thread Ben Woodcroft 

On 20/11/16 01:28, Leo Famulari wrote:

On Sat, Nov 19, 2016 at 09:32:09AM +1000, Ben Woodcroft wrote:

* gnu/packages/ruby.scm (ruby)[replacement]: New field.
(ruby-2.3.2): New variable.
---
  gnu/packages/ruby.scm | 20 
  1 file changed, 20 insertions(+)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index e4c1ef0..f2b5de9 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -47,6 +47,7 @@
  (define-public ruby
(package
  (name "ruby")
+(replacement ruby-2.3.2)

Remember that grafted replacements should have a compatible ABI.

This is the first result I found when searching for "Ruby ABI compatible"

https://www.ruby-lang.org/en/news/2013/12/21/ruby-version-policy-changes-with-2-1-0/

So, if they've kept that policy, this should be fine.
I can't see any evidence to the contrary. I also ran a compatibility 
checker and it seemed to work out (while 2.3.2 vs 2.2.6 did not, as a 
negative control).

https://lvc.github.io/abi-compliance-checker/

I'm not quite finished packaging it yet up to standard just yet, but I 
pushed what I have here, in case it is useful in the meantime.

https://github.com/wwood/guix_mine/blob/master/ben/packages/local.scm

I pushed the graft to master and updated it directly on staging.

ben

[PATCH] website: Enhance instructions on how to test the website locally.

2016-11-19 Thread sirgazil 
* website/README: Indicate usage of GUIX_WEB_SITE_LOCAL.
---
 website/README | 44 ++--
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/website/README b/website/README
index 5438a5d..f8dee4a 100644
--- a/website/README
+++ b/website/README
@@ -2,26 +2,42 @@
 
 #+TITLE: GuixSD website
 
-The files in this directory are intended to be used as assets for the 
[[https://www.gnu.org/software/guix][GuixSD
-website]] which is implemented in 
[[https://www.gnu.org/software/guile][Guile]] Scheme.
+This directory contains the source files for the GuixSD website,
+available at https://www.gnu.org/software/guix/.
 
-  - =www.scm= and =www= provides ‘(www)’ guile module which offers services for
-building the website locally.
+  - =www.scm= and =www= provide the =(www)= guile module which
+offers services for building the website locally.
   - =static= contains images and css for the website.
-  - =mockup.svg= illustrates a homepage aimed at average users.  This is for 
use
-when GuixSD is getting closer to a production-ready system.
-  - =mockup-techie.svg= illustrates a homepage aimed at skilled devs and
-sysadmins.  This is for use during the alpha phase of development.
+  - =mockup.svg= illustrates a homepage aimed at average users.
+This is for use when GuixSD is getting closer to a
+production-ready system.
+  - =mockup-techie.svg= illustrates a homepage aimed at
+skilled devs and sysadmins.  This is for use during the
+alpha phase of development.
 
-* Building
+* Dependencies
 
-Building the website depends on the static site generator:
+To be able to work on the website, you need the following software:
 
-  - [[http://haunt.dthompson.us/][Haunt]]
+  - [[https://www.gnu.org/software/guile/][GNU Guile]] (programming language)
+  - [[http://haunt.dthompson.us/][Haunt]] (static site generator)
 
-To build the site, run ‘haunt build’ to compile all of the HTML pages.
-To view the results, run ‘haunt serve’ and visit 
-in a web browser.
+* Building and running
+
+To try out the website locally while you work on it, run the following
+commands:
+
+#+BEGIN_EXAMPLE
+$ cd path/to/guix-artwork/website
+$ GUIX_WEB_SITE_LOCAL=yes haunt build
+$ haunt serve
+#+END_EXAMPLE
+
+Then, visit http://localhost:8080/ in a web browser.
+
+* Deploying
+
+Pending...
 
 * Copying
 
-- 
2.1.4

Re: [PATCH 1/1] gnu: gnupg: Update to 2.1.16.

2016-11-19 Thread Mathieu Lirzin 
Hi,

Leo Famulari  writes:

> On Sun, Nov 20, 2016 at 12:41:31AM +0200, Efraim Flashner wrote:
>> Looks like they forgot to bootstrap it then.
>
> Because I altered two Makefile.am files in the 'patch-paths' phase, I
> had to re-do the bootstrap in order for the Makefiles to be regenerated.
>
> I'm not an expert on Autotools. Does anyone know if there is a better
> way?

I have not tried but unless some weird issue, I think you can safely
replace "/bin/pwd" directly in the generated Makefile(s) instead of the
Makefile.am sources.

This should fix the Autotools dependency and the warning.

-- 
Mathieu Lirzin

Re: [PATCH 1/1] gnu: gnupg: Update to 2.1.16.

2016-11-19 Thread Leo Famulari 
On Sun, Nov 20, 2016 at 12:41:31AM +0200, Efraim Flashner wrote:
> Looks like they forgot to bootstrap it then.
> 
> Built fine for me :).

This GPG prints the following warning when I use it:

gpg: NOTE: THIS IS A DEVELOPMENT VERSION!
gpg: It is only intended for test purposes and should NOT be
gpg: used in a production environment or with production keys!

So, I think it needs some more work. I'll look into it later tonight.


signature.asc
Description: PGP signature

Re: [PATCH 1/1] gnu: gnupg: Update to 2.1.16.

2016-11-19 Thread Leo Famulari 
On Sun, Nov 20, 2016 at 12:41:31AM +0200, Efraim Flashner wrote:
> Looks like they forgot to bootstrap it then.

Because I altered two Makefile.am files in the 'patch-paths' phase, I
had to re-do the bootstrap in order for the Makefiles to be regenerated.

I'm not an expert on Autotools. Does anyone know if there is a better
way?

> Built fine for me :).

Okay, thanks for checking!


signature.asc
Description: PGP signature

Re: [PATCH 1/1] gnu: gnupg: Update to 2.1.16.

2016-11-19 Thread Efraim Flashner 
Looks like they forgot to bootstrap it then.

Built fine for me :).

-- 
Efraim Flashner      אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted


signature.asc
Description: PGP signature

Re: [PATCH] git-service

2016-11-19 Thread ng0 
ng0  writes:

> [PATCH] gnu: services: Add git-service.
>
> Right now, this service does not work (vm does not build) when I try to build 
> the vm
> with "./pre-inst-env guix system vm ../testvm-git.scm", where ../testvm-git 
> is a file I will append in the 2nd follow-up message.
>
>

Appended testvm-git.scm.


testvm-git.scm
Description: Binary data

[PATCH] git-service

2016-11-19 Thread ng0 
[PATCH] gnu: services: Add git-service.

Right now, this service does not work (vm does not build) when I try to build 
the vm
with "./pre-inst-env guix system vm ../testvm-git.scm", where ../testvm-git is 
a file I will append in the 2nd follow-up message.

[PATCH] gnu: services: Add git-service.

2016-11-19 Thread ng0 
* gnu/services/version-control.scm: New file, create it.
(git-service): New Procedures.
(git-service-type): New variable.
* doc/guix.texi (Services)(Version Control): New section.
---
 doc/guix.texi|  38 -
 gnu/local.mk |   1 +
 gnu/services/version-control.scm | 162 +++
 3 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 gnu/services/version-control.scm

diff --git a/doc/guix.texi b/doc/guix.texi
index 7352ea9..fe53d08 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -7795,6 +7795,7 @@ declaration.
 * Web Services::Web servers.
 * Network File System:: NFS related services.
 * Miscellaneous Services::  Other services.
+* Version Control:: Git and others.
 @end menu
 
 @node Base Services
@@ -11586,7 +11587,6 @@ If it is @code{#f} then the daemon will use the host's 
fully qualified domain na
 @node Miscellaneous Services
 @subsubsection Miscellaneous Services
 
-
 @cindex lirc
 @subsubheading Lirc Service
 
@@ -11673,6 +11673,42 @@ A @code{} object serving the GNU 
Collaborative International
 Dictonary of English using the @code{gcide} package.
 @end defvr
 
+@node Version Control
+@subsubsection Version Control
+
+The @code{(gnu services version-control)} module provides the following 
services:
+
+@deffn {Scheme Procedure} git-service [#:git @var{git}] @
+   [#:base-directory "/var/git/repositories"] @
+   [#:user-directory? #f ""] [#:port 9418] @
+   [#:directory? #f ""] [#:max-connections 32] @
+   [#:pid-file? #t "/var/run/git-daemon.pid"]
+
+Return a service to run the @uref{https://git-scm.com, Git} daemon, a really 
simple
+TCP Git service which exposes local repositories for anonymous remote access.
+
+The git daemon runs as the @code{git} unprivileged user.  It is started with
+the fixed parameters @code{--syslog}, @code{--reuseaddr} and
+@code{"--no-informative-errors"}.
+You can pass the parameter @var{base-directory}, which remaps all the directory
+requests as relative to the given directory.  If you run git-service with
+@var{base-directory "/var/git/repositories"} on example.com, then if you later 
try
+to pull @code{git://example.com/hello.git}, git-service will interpret the 
directory
+as @code{/var/git/repositories/hello.git}.
+@var{max-connections} sets the maximum number of concurrent clients, it 
defaults to 32.
+Set it to 0 for no limit.
+@var{user-directory} allows allows ~user notation to be used in requests. When
+specified with no parameter, requests to @code{git://host/~alice/foo} is taken 
as a
+request to access @code{foo} repository in the home directory of user 
@code{alice}.
+If @var{user-directory "path"} is specified, the same request is taken as a 
request
+to access @code{path/foo} repository in the home directory of user 
@code{alice}.
+The parameter @var{directory "foo"} adds the directory "foo" and its 
subdirectories
+to the whitelist of allowed directories.
+Furthermore git-service takes the parameter @var{port}, which defaults to 9418.
+Run @command{man git daemon} for information about the options.
+
+@end deffn
+
 @node Setuid Programs
 @subsection Setuid Programs
 
diff --git a/gnu/local.mk b/gnu/local.mk
index 7112451..8769671 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -415,6 +415,7 @@ GNU_SYSTEM_MODULES =\
   %D%/services/sddm.scm\
   %D%/services/spice.scm   \
   %D%/services/ssh.scm \
+  %D%/services/version-control.scm  \
   %D%/services/web.scm \
   %D%/services/xorg.scm\
\
diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm
new file mode 100644
index 000..8fa22a1
--- /dev/null
+++ b/gnu/services/version-control.scm
@@ -0,0 +1,162 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 ng0 
+;;;
+;;; 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 services version-control)
+  #:use-module (gnu services)
+  #:use-module (gnu services base)
+  #:use-module (gnu services shepherd)
+  #:use-module (gnu system shadow)
+

Re: [PATCH] Added package xcalib

2016-11-19 Thread Leo Famulari 
On Sat, Nov 19, 2016 at 06:14:32PM +0100, Petter wrote:
> On 2016-11-18 21:10, Leo Famulari wrote:
> > (install-file) does (mkdir-p) itself, so I removed the redundant
> > (mkdir-p). It's defined in (guix build utils) if you are interested to
> > see.
> 
> Ok. I looked it up in another package, and copied the approach. (I see this
> redundancy occurs in several other places.)

Feel free to submit patches fixing those redundancies!

> Thanks for doing the final touches! And I really appreciate your detailed
> explanations! The next patch should hopefully be less of a burden on you
> reviewers :)

That's my plan :)

[PATCH 1/1] gnu: gnupg: Update to 2.1.16.

2016-11-19 Thread Leo Famulari 
* gnu/packages/gnupg.scm (gnupg): Update to 2.1.16.
[native-inputs]: Add autoconf, automake, and gettext-minimal.
[arguments]: Patch more files in 'patch-paths' phase, and run it after
'patch-source-shebangs'. Add 'bootstrap' phase. Remove 'set-home' phase.
---
 gnu/packages/gnupg.scm | 31 ++-
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index fccaa97..ea9a646 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -30,6 +30,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages adns)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages perl)
@@ -39,6 +40,7 @@
   #:use-module (gnu packages readline)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
@@ -213,17 +215,21 @@ compatible to GNU Pth.")
 (define-public gnupg
   (package
 (name "gnupg")
-(version "2.1.15")
+(version "2.1.16")
 (source (origin
   (method url-fetch)
   (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
   ".tar.bz2"))
   (sha256
(base32
-"1pgz02gd84ab94w4xdg67p9z8kvkyr9d523bvcxxd2hviwh1m362"
+"0i483m9q032a0s50f1izb213g4h5i7pcgn395m6hvl3sg2kadfa9"
 (build-system gnu-build-system)
 (native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)
+   ;; For bootstrapping
+   ("autoconf" ,autoconf)
+   ("automake" ,automake)
+   ("gettext" ,gettext-minimal)))
 (inputs
  `(("adns" ,adns)
("bzip2" ,bzip2)
@@ -243,27 +249,26 @@ compatible to GNU Pth.")
 `(#:configure-flags '("--enable-gpg2-is-gpg")
   #:phases
   (modify-phases %standard-phases
-(add-before 'configure 'patch-paths
+(add-after 'patch-source-shebangs 'patch-paths
   (lambda* (#:key inputs #:allow-other-keys)
-(substitute* "tests/openpgp/defs.inc"
+(substitute* '("tests/inittests"
+   "tests/pkits/inittests"
+   "tests/pkits/Makefile.am"
+   "tests/pkits/common.sh"
+   "tests/Makefile.am")
   (("/bin/pwd") (which "pwd")))
 (substitute* "scd/scdaemon.c"
   (("\"(libpcsclite\\.so[^\"]*)\"" _ name)
(string-append "\"" (assoc-ref inputs "pcsc-lite")
   "/lib/" name "\"")))
 #t))
+(add-before 'configure 'bootstrap
+  (lambda _ (zero? (system* "autoreconf" "-vfi"
 (add-after 'build 'patch-scheme-tests
   (lambda _
 (substitute* (find-files "tests" ".\\.scm$")
   (("/usr/bin/env gpgscm")
-   (string-append (getcwd) "/tests/gpgscm/gpgscm")
-(add-before 'check 'set-home
-  ;; Some tests require write access to $HOME, otherwise leading to
-  ;; 'failed to create directory /homeless-shelter/.asy' error.
-  ;; TODO Try removing this phase for GnuPG 2.1.16.
-  (lambda _
-(setenv "HOME" "/tmp")
-#t)
+   (string-append (getcwd) "/tests/gpgscm/gpgscm"
 (home-page "https://gnupg.org/;)
 (synopsis "GNU Privacy Guard")
 (description
-- 
2.10.2

Re: [PATCH] Added package xcalib

2016-11-19 Thread Petter 



On 2016-11-18 21:10, Leo Famulari wrote:

On Wed, Nov 16, 2016 at 01:37:04AM +0100, Petter wrote:
I have worked through the issues you brought up, and it should at 
least be

better now. Maybe even good.


It was already good, now it's very good :)


There is no indication of GPL v2 or later in the project though.


Okay.

Pushed as 01278f16a9b with the following two changes:


+  (replace 'install
+(lambda* (#:key outputs #:allow-other-keys)
+  (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin")))
+(mkdir-p bin)
+(install-file "xcalib" bin


(install-file) does (mkdir-p) itself, so I removed the redundant
(mkdir-p). It's defined in (guix build utils) if you are interested to
see.


Ok. I looked it up in another package, and copied the approach. (I see 
this redundancy occurs in several other places.)





+  (add-after 'install 'install-doc
+(lambda* (#:key outputs #:allow-other-keys)
+  (let ((doc (string-append(assoc-ref outputs 
"out")

+   "/share/doc/")))

  ^
I added "xcalib" to the end of the path here -|

So, when a user installs xcalib into their profile, the README will be
at ~/.guix-profile/share/doc/xcalib/README, instead of
~/.guix-profile/share/doc/README.


Aha. So that's how it will be used :)

Thanks for doing the final touches! And I really appreciate your 
detailed explanations! The next patch should hopefully be less of a 
burden on you reviewers :)

Re: [PATCH 1/2] gnu: Add drumkv1.

2016-11-19 Thread Ricardo Wurmus 

宋文武  writes:

> Ricardo Wurmus  writes:
>
>> * gnu/packages/music.scm (drumkv1): New variable.
>> ---
>>  gnu/packages/music.scm | 34 ++
>>  1 file changed, 34 insertions(+)
>>
>> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
>> index 12233bf..5e882b2 100644
>> --- a/gnu/packages/music.scm
>> +++ b/gnu/packages/music.scm
>> @@ -909,6 +909,40 @@ users to select LV2 plugins and run them with jalv.")
>>  oscillators and stereo effects.")
>>  (license license:gpl2+)))
>>  
>> +(define-public drumkv1
>> +  (package
>> +(name "drumkv1")
>> +(version "0.8.0")
>> +(source (origin
>> +  (method url-fetch)
>> +  (uri
>> +   (string-append "mirror://sourceforge/drumkv1/drumkv1/" 
>> version
>> +  "/drumkv1-" version ".tar.gz"))
>> +  (sha256
>> +   (base32
>> +"1n2kd468kn71yp2asmamprvblmdlvh0zd8lsh3598dwi4b7aa3ga"
>> +(build-system gnu-build-system)
>> +(arguments
>> + `(#:tests? #f ; There are no tests.
>> +   #:configure-flags
>> +   '("CXXFLAGS=-std=gnu++11")))
>> +(inputs
>> + `(("jack" ,jack-1)
>> +   ("lv2" ,lv2)
>> +   ("libsndfile" ,libsndfile)
>> +   ("alsa-lib" ,alsa-lib)
>> +   ("liblo" ,liblo)
>> +   ("qtbase" ,qtbase)
>> +   ("qttools" ,qttools)))
>> +(native-inputs
>> + `(("pkg-config" ,pkg-config)))
>
> Does qttools end up in the closure?  I think it's used mainly for
> building locale files or documentation.  Otherwise all look good!

You’re right.  I’ll move qttools to native-inputs.  Thanks for the hint.

~~

Re: [PATCH] gnu: gnome-control-center: Add gdk-pixbuf input.

2016-11-19 Thread Leo Famulari 
On Fri, Nov 18, 2016 at 09:10:11PM -0600, ren...@openmailbox.org wrote:
> Hello Leo, Danny.
> 
> On 2016-11-18 14:19, Leo Famulari wrote:
> > 
> > I'm not a GNOME user. The issue is that the control center has missing
> > icons / logos because they are SVG files? I'm just trying to understand
> > the reason for the change.
> 
> To find the issue with some pictures in control center, I debugging:
> 
> $ gnome-control-center -v
> (gnome-control-center:4956): Gtk-WARNING **: Could not load a pixbuf from
> /org/gtk/libgtk/theme/Adwaita/assets/bullet-symbolic.svg.
> This may indicate that pixbuf loaders or the mime database could not be
> found.
> 
> After adding gdk-pixbuf to input, the pictures are displayed.
> I attach pictures.

Thanks for explaining! Pushed as 3446ffb57c229

Re: [PATCH] gnu: ruby: Replace with 2.3.2 [fixes CVE-2015-3900].

2016-11-19 Thread Leo Famulari 
On Sat, Nov 19, 2016 at 09:32:09AM +1000, Ben Woodcroft wrote:
> * gnu/packages/ruby.scm (ruby)[replacement]: New field.
> (ruby-2.3.2): New variable.
> ---
>  gnu/packages/ruby.scm | 20 
>  1 file changed, 20 insertions(+)
> 
> diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
> index e4c1ef0..f2b5de9 100644
> --- a/gnu/packages/ruby.scm
> +++ b/gnu/packages/ruby.scm
> @@ -47,6 +47,7 @@
>  (define-public ruby
>(package
>  (name "ruby")
> +(replacement ruby-2.3.2)

Remember that grafted replacements should have a compatible ABI.

This is the first result I found when searching for "Ruby ABI compatible"

https://www.ruby-lang.org/en/news/2013/12/21/ruby-version-policy-changes-with-2-1-0/

So, if they've kept that policy, this should be fine.

Thanks for taking care of this!

Re: [PATCH] Update emacs-org to 20161118

2016-11-19 Thread 宋文武 
Nicolas Goaziou  writes:

> Hello,
>
> Here is a patch updating Org to its latest revision.
>

Pushed, thanks!

Re: [PATCH 1/2] gnu: Add drumkv1.

2016-11-19 Thread 宋文武 
Ricardo Wurmus  writes:

> * gnu/packages/music.scm (drumkv1): New variable.
> ---
>  gnu/packages/music.scm | 34 ++
>  1 file changed, 34 insertions(+)
>
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index 12233bf..5e882b2 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -909,6 +909,40 @@ users to select LV2 plugins and run them with jalv.")
>  oscillators and stereo effects.")
>  (license license:gpl2+)))
>  
> +(define-public drumkv1
> +  (package
> +(name "drumkv1")
> +(version "0.8.0")
> +(source (origin
> +  (method url-fetch)
> +  (uri
> +   (string-append "mirror://sourceforge/drumkv1/drumkv1/" version
> +  "/drumkv1-" version ".tar.gz"))
> +  (sha256
> +   (base32
> +"1n2kd468kn71yp2asmamprvblmdlvh0zd8lsh3598dwi4b7aa3ga"
> +(build-system gnu-build-system)
> +(arguments
> + `(#:tests? #f ; There are no tests.
> +   #:configure-flags
> +   '("CXXFLAGS=-std=gnu++11")))
> +(inputs
> + `(("jack" ,jack-1)
> +   ("lv2" ,lv2)
> +   ("libsndfile" ,libsndfile)
> +   ("alsa-lib" ,alsa-lib)
> +   ("liblo" ,liblo)
> +   ("qtbase" ,qtbase)
> +   ("qttools" ,qttools)))
> +(native-inputs
> + `(("pkg-config" ,pkg-config)))

Does qttools end up in the closure?  I think it's used mainly for
building locale files or documentation.  Otherwise all look good!

Re: [PATCH] Update wireshark to 2.2.2.

2016-11-19 Thread 宋文武 
Nicolas Goaziou  writes:

> Hello,
>
> The following patch updates wireshark to 2.2.2.
>

Applied, thanks!

Re: [PATCH] Update giac-xcas to 1.2.2-103

2016-11-19 Thread 宋文武 
Nicolas Goaziou  writes:

> Hello,
>
> The following patch updates giac-xcas to 1.2.2-103.

Pushed, thanks!

[PATCH 2/2] gnu: Add samplv1.

2016-11-19 Thread Ricardo Wurmus 
* gnu/packages/music.scm (samplv1): New variable.
---
 gnu/packages/music.scm | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 5e882b2..c81d9a0 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -943,6 +943,40 @@ oscillators and stereo effects.")
 effects.")
 (license license:gpl2+)))
 
+(define-public samplv1
+  (package
+(name "samplv1")
+(version "0.8.0")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append "mirror://sourceforge/samplv1/samplv1/" version
+  "/samplv1-" version ".tar.gz"))
+  (sha256
+   (base32
+"0j3hkmd9q0bw9b7nk9cssqywlrishkd1n790a9vq6gh3pdc5sf3r"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; There are no tests.
+   #:configure-flags
+   '("CXXFLAGS=-std=gnu++11")))
+(inputs
+ `(("jack" ,jack-1)
+   ("lv2" ,lv2)
+   ("libsndfile" ,libsndfile)
+   ("alsa-lib" ,alsa-lib)
+   ("liblo" ,liblo)
+   ("qtbase" ,qtbase)
+   ("qttools" ,qttools)))
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(home-page "http://samplv1.sourceforge.net;)
+(synopsis "Polyphonic sampler synthesizer with stereo effects")
+(description
+ "Samplv1 is an old-school polyphonic sampler synthesizer with stereo
+effects.")
+(license license:gpl2+)))
+
 (define-public amsynth
   (package
 (name "amsynth")
-- 
2.10.1

[PATCH 1/2] gnu: Add drumkv1.

2016-11-19 Thread Ricardo Wurmus 
* gnu/packages/music.scm (drumkv1): New variable.
---
 gnu/packages/music.scm | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 12233bf..5e882b2 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -909,6 +909,40 @@ users to select LV2 plugins and run them with jalv.")
 oscillators and stereo effects.")
 (license license:gpl2+)))
 
+(define-public drumkv1
+  (package
+(name "drumkv1")
+(version "0.8.0")
+(source (origin
+  (method url-fetch)
+  (uri
+   (string-append "mirror://sourceforge/drumkv1/drumkv1/" version
+  "/drumkv1-" version ".tar.gz"))
+  (sha256
+   (base32
+"1n2kd468kn71yp2asmamprvblmdlvh0zd8lsh3598dwi4b7aa3ga"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; There are no tests.
+   #:configure-flags
+   '("CXXFLAGS=-std=gnu++11")))
+(inputs
+ `(("jack" ,jack-1)
+   ("lv2" ,lv2)
+   ("libsndfile" ,libsndfile)
+   ("alsa-lib" ,alsa-lib)
+   ("liblo" ,liblo)
+   ("qtbase" ,qtbase)
+   ("qttools" ,qttools)))
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(home-page "http://drumkv1.sourceforge.net;)
+(synopsis "Drum-kit sampler synthesizer with stereo effects")
+(description
+ "Drumkv1 is an old-school drum-kit sampler synthesizer with stereo
+effects.")
+(license license:gpl2+)))
+
 (define-public amsynth
   (package
 (name "amsynth")
-- 
2.10.1