Re: [PATCH 2/2] gnu: bind-utils: Add new variable.

2015-03-13 Thread Mark H Weaver
Tomáš Čech  writes:

> * gnu/packages/dns.scm (bind-utils): New variable.
> ---
>  gnu/packages/dns.scm | 61 
> ++--
>  1 file changed, 59 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
> index 86f5945..7420247 100644
> --- a/gnu/packages/dns.scm
> +++ b/gnu/packages/dns.scm
> @@ -17,7 +17,13 @@
>  ;;; along with GNU Guix.  If not, see .
>  
>  (define-module (gnu packages dns)
> -  #:use-module (guix licenses)
> +  #:use-module (gnu packages databases)
> +  #:use-module (gnu packages gnutls)
> +  #:use-module (gnu packages linux)
> +  #:use-module (gnu packages openssl)
> +  #:use-module (gnu packages perl)
> +  #:use-module (gnu packages xml)
> +  #:use-module ((guix licenses) #:prefix license:)
>#:use-module (guix packages)
>#:use-module (guix download)
>#:use-module (guix build-system gnu))
> @@ -53,4 +59,55 @@ addresses to appear in the DNS with names configured 
> either in each host or in
>  a central configuration file.  Dnsmasq supports static and dynamic DHCP 
> leases
>  and BOOTP/TFTP for network booting of diskless machines.")
>  ;; Source files only say GPL2 and GPL3 are allowed.
> -(license (list gpl2 gpl3
> +(license (list license:gpl2 license:gpl3
> +
> +(define-public bind-utils
> +  (package
> +(name "bind-utils")
> +(version "9.10.1-P2")
> +(source (origin
> +  (method url-fetch)
> +  (uri (string-append "ftp://ftp.isc.org/isc/bind9/"; version
> +  "/bind-" version ".tar.gz"))
> +  (sha256
> +   (base32
> +"1svzia5vv0s4bv6r04j8bsvlf3klwyigmdz1iwb4fqds00iyvp22"
> +(build-system gnu-build-system)
> +(inputs
> + ;; it would be nice to add GeoIP and gssapi once there is package
> + `(("libcap" ,libcap)
> +   ("libxml2" ,libxml2)
> +   ("mysql" ,mysql)
> +   ("openssl" ,openssl)
> +   ("perl" ,perl)
> +   ("p11-kit" ,p11-kit)))
> +(arguments
> + `(#:tests? #f ; no test phase implemented
> +   #:configure-flags
> +   (list (string-append "--with-openssl="
> +(assoc-ref %build-inputs "openssl"))
> + (string-append "--with-dlz-mysql="
> +(assoc-ref %build-inputs "mysql"))
> + (string-append "--with-pkcs11="
> +(assoc-ref %build-inputs "p11-kit")))
> +   #:phases
> +   (alist-replace
> +'build
> +(lambda _
> +  (system* "make" "-C" "lib/dns")
> +  (system* "make" "-C" "lib/isc")
> +  (system* "make" "-C" "lib/bind9")
> +  (system* "make" "-C" "lib/isccfg")
> +  (system* "make" "-C" "lib/lwres")
> +  (system* "make" "-C" "bin/dig"))
> +(alist-replace
> + 'install
> + (lambda _ (system* "make" "-C" "bin/dig" "install"))

You should check the status codes returned by 'make', like this
(untested):

--8<---cut here---start->8---
   (alist-replace
'build
(lambda _
  (and (zero? (system* "make" "-C" "lib/dns"))
   (zero? (system* "make" "-C" "lib/isc"))
   (zero? (system* "make" "-C" "lib/bind9"))
   (zero? (system* "make" "-C" "lib/isccfg"))
   (zero? (system* "make" "-C" "lib/lwres"))
   (zero? (system* "make" "-C" "bin/dig"
(alist-replace
 'install
 (lambda _ (zero? (system* "make" "-C" "bin/dig" "install")))
--8<---cut here---end--->8---

> + %standard-phases
> +(home-page "https://www.isc.org/downloads/bind/";)
> +(synopsis "Tools for quering nameserver")

"quering" is mispelled, and "nameserver" should be plural.  How about
"Tools for querying nameservers"?

> +(description
> + "ISC referrence implementation of nameserver - Bind comes with set of 
> tools
> +for quering nameservers.  These tools are useful for analysis of DNS issues 
> or
> +verification of configuration")

How about just:

--8<---cut here---start->8---
(description
 "These tools, included with ISC BIND, are useful for analysis of DNS 
issues or
verification of configuration.")
--8<---cut here---end--->8---

 Thanks!
   Mark



Re: Libreboot error: /boot/grub/i386-coreboot files not found

2015-03-13 Thread Mark H Weaver
Mark H Weaver  writes:

> 白い熊@相撲道  writes:
>
>> I've installed and am running GuixSD on the Gluglug X200.
>
> Excellent!  I'm running GuixSD on a Gluglug X60 :)
>
>> On boot, Libreboot comes up with its GRUB-like menu, where I select
>> "Search for GRUB configuration on internal storage". It then finds the
>> GuixSD partition with /boot/grub and you can boot it usinr "Load
>> Config from (ahci0,msdosX)".
>>
>> This then however always reports:
>>
>> error: file `/boot/grub/i386-coreboot/vbe.mod' not found.
>> error: file `/boot/grub/i386-coreboot/vga.mod' not found.
>> error: file `/boot/grub/i386-coreboot/gfxterm.mod' not found.
>> Press any key to continue...
>>
>> You can then hit a key and it continues normally, loads the GRUB menu
>> and you can boot. So it's more of a nuisance than a crippling
>> error. I'd like to get rid of it however.
>>
>> Of course, there is no i386-coreboot in /boot/grub/, however
>> symlinking i386-pc to it, or copying the dir i386-pc to i386-coreboot,
>> has no effect. The error still comes up.
>>
>> How can this be fixed?
>
> The plan is to modify Guix to create a /boot/grub/libreboot_grub.cfg
> (alongside grub.cfg) that omits everything except for the menu entries
> and perhaps also the "set default=0" and "set timeout=1".

Another approach would be to build a version of GRUB that's built to run
under coreboot, and then to create a /boot/grub/libreboot_grub.cfg that
chainloads our own grub.  This approach has some advantages, most
notably that we wouldn't need to assume that the GRUB included in
Libreboot includes all of the modules we need.

   Mark



Re: Libreboot error: /boot/grub/i386-coreboot files not found

2015-03-13 Thread Mark H Weaver
白い熊@相撲道  writes:

> I've installed and am running GuixSD on the Gluglug X200.

Excellent!  I'm running GuixSD on a Gluglug X60 :)

> On boot, Libreboot comes up with its GRUB-like menu, where I select
> "Search for GRUB configuration on internal storage". It then finds the
> GuixSD partition with /boot/grub and you can boot it usinr "Load
> Config from (ahci0,msdosX)".
>
> This then however always reports:
>
> error: file `/boot/grub/i386-coreboot/vbe.mod' not found.
> error: file `/boot/grub/i386-coreboot/vga.mod' not found.
> error: file `/boot/grub/i386-coreboot/gfxterm.mod' not found.
> Press any key to continue...
>
> You can then hit a key and it continues normally, loads the GRUB menu
> and you can boot. So it's more of a nuisance than a crippling
> error. I'd like to get rid of it however.
>
> Of course, there is no i386-coreboot in /boot/grub/, however
> symlinking i386-pc to it, or copying the dir i386-pc to i386-coreboot,
> has no effect. The error still comes up.
>
> How can this be fixed?

The plan is to modify Guix to create a /boot/grub/libreboot_grub.cfg
(alongside grub.cfg) that omits everything except for the menu entries
and perhaps also the "set default=0" and "set timeout=1".

With /boot/grub/libreboot_grub.cfg in place, the default GRUB menu entry
in Libreboot will automatically boot GuixSD as long as it's located on
one of the first few partitions of the first disk.

On my own system, I simply made /boot/grub/libreboot_grub.cfg a symlink
to grub.cfg, and ignore the warnings :)

The place to fix this properly is in gnu/system/grub.scm and
gnu/system.scm.  I guess we should add a keyword argument to
'grub-configuration-file' that specifies whether or not to include
#$sugar in the output, and then modify system.scm to create both files.

For now, an easy hack for Libreboot users would be to simply remove the
line in 'grub-configuration-file' that reads "#$sugar", and to create
the /boot/grub/libreboot_grub.cfg --> grub.cfg symlink.

  Mark



Re: [PATCH v2] gnu: Add taskwarrior.

2015-03-13 Thread Tomáš Čech

Thank you for your review.

On Fri, Mar 13, 2015 at 02:16:00PM -0500, Eric Bavier wrote:

On 2015-03-12 19:57, Tomáš Čech wrote:

* gnu/packages/task.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add new file here.
---
gnu-system.am |  1 +
gnu/packages/task.scm | 68 
+++

[...]

+(inputs
+ `(("util-linux" ,util-linux)
+   ("gnutls" ,gnutls)
+   ("lua" ,lua)
+   ("coreutils" ,coreutils)))


Can coreutils be left out here, since it is an implicit input?


OK, I will omit it.



+;; Taskwarrior is licensed under MIT license, which is 
identical to

+;; Expat License
+(license license:expat)))


Is it actually the Expat license, or the X11 license, which is also
sometimes called the "MIT license"?  In either case, I would perhaps 
put quotation marks around "MIT license" to indicate the ambiguity.


I did comparison and it is Expat license as intended in
(guix licenses).

X11 license has aditional paragraph on use of trademarks.

You can have a look here to make your opinion:

https://git.tasktools.org/projects/TM/repos/task/browse/COPYING

I'm not lawyer and I don't feel like authority in this area but

1] I believe that intention of authors is obvious with the URL in the
  end of file. They choose MIT as their license, they used
  opensource.org license list to express their will. And I respect
  their choice.

2] MIT license is also recognized by spdx.org
  https://spdx.org/licenses/MIT

  In my experience openSUSE, Gentoo uses the same license name, Debian
  at least mentions Expat (https://www.debian.org/legal/licenses/mit).

So I'd rather not put quotation marks around "MIT license". I'd even like
to have MIT license as alias or separate license.

Best regards,

S_W


pgpIQmSyMFKpB.pgp
Description: PGP signature


Re: [PATCH v2] gnu: Add taskwarrior.

2015-03-13 Thread Eric Bavier

On 2015-03-12 19:57, Tomáš Čech wrote:

* gnu/packages/task.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add new file here.
---
 gnu-system.am |  1 +
 gnu/packages/task.scm | 68 
+++

[...]

+(inputs
+ `(("util-linux" ,util-linux)
+   ("gnutls" ,gnutls)
+   ("lua" ,lua)
+   ("coreutils" ,coreutils)))


Can coreutils be left out here, since it is an implicit input?

+;; Taskwarrior is licensed under MIT license, which is identical 
to

+;; Expat License
+(license license:expat)))


Is it actually the Expat license, or the X11 license, which is also 
sometimes called the "MIT license"?  In either case, I would perhaps put 
quotation marks around "MIT license" to indicate the ambiguity.


--
`~Eric



hackage importer

2015-03-13 Thread Federico Beffa
Hi,

please find attached an initial version of an importer for packages
from Hackage:
http://hackage.haskell.org/

Here a couple of features and limitations:

* The information about packages is retrieved from .cabal files.
Similarly to Haskell code these files support "layout" style grouping
and grouping with braces {}. Currently the importer only supports the
former which appears to be the most popular form.

* The code handles dependencies with conditionals and tries to comply
with the description at
https://www.haskell.org/cabal/users-guide/developing-packages.html#configurations
However, information about library versions is discarded.

* It implies the existence of a haskell-build-system which currently
doesn't exist. That's for another free week-end, or somebody
interested :-)

* Cabal files include dependencies to libraries included with the
complier (at least with GHC). For the moment I just filter those out
assuming the packages are going to be compiled with GHC.

* The generated package name is prefixed with "haskell-" in a similar
way to Perl and Python packages. However, the cabal file includes
checks for the compiler implementation and the importer handles that
and keep the test in the generated package (see eval-impl in the code
and the description in the above link). If in the future there is
interest in supporting other Haskell compilers, then maybe we should
better prefix the packages according to the used compiler ("ghc-"
...).

* The argument to the importer may include a version suffix (GUIX
style). If no version is included, then it retrieves the latest
version.

I've tested it with a hadful of packages among which "mtl",
"cabal-install" and "HTTP" and appears to be working.

Obviously the tests in part 5 were used along the way and will be
removed. Before doing that and squashing my local commits I thought I
would see the comments here :-) The attached patch is squashed with
"git diff master".

Regards,
Fede
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
new file mode 100644
index 000..35af03d
--- /dev/null
+++ b/guix/import/hackage.scm
@@ -0,0 +1,1021 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Federico Beffa 
+;;;
+;;; 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 (guix import hackage)
+  #:use-module (ice-9 match)
+  #:use-module (ice-9 regex)
+  #:use-module (ice-9 rdelim)
+  #:use-module (ice-9 receive)
+  #:use-module (ice-9 pretty-print)
+  #:use-module (srfi srfi-26)
+  #:use-module (srfi srfi-11)
+  #:use-module (srfi srfi-1)
+  #:use-module ((guix download) #:select (download-to-store))
+  #:use-module ((guix utils) #:select (package-name->name+version))
+  #:use-module (guix import utils)
+  #:use-module (guix store)
+  #:use-module (guix hash)
+  #:use-module (guix base32)
+  #:use-module ((guix utils) #:select (call-with-temporary-output-file))
+  #:export (hackage->guix-package))
+
+;; Part 1:
+;;
+;; Functions used to read a cabal file and do some pre-processing: discarding
+;; comments and empty lines.
+
+;; List of libraries distributed with ghc (7.8.4).
+(define ghc-standard-libraries
+  '("haskell98"; 2.0.0.3
+"hoopl"; 3.10.0.1
+"base"
+"transformers" ; 0.3.0.0
+"deepseq"  ; 1.3.0.2
+"array"; 0.5.0.0
+"binary"   ; 0.7.1.0
+"bytestring"   ; 0.10.4.0
+"containers"   ; 0.5.5.1
+"time" ; 1.4.2
+"Cabal"; 1.18.1.5 (but not "cabal-install")
+"bin-package-db"   ; 0.0.0.0
+"ghc-prim"
+"integer-gmp"
+"Win32"; 2.3.0.2
+"template-haskell"
+"process"  ; 1.2.0.0
+"haskeline"; 0.7.1.2
+"terminfo" ; 0.4.0.0
+"directory"; 1.2.1.0
+"filepath" ; 1.3.0.2
+"old-locale"   ; 1.0.0.6
+"unix" ; 2.7.0.1
+"old-time" ; 1.1.0.2
+"pretty"   ; 1.1.1.1
+"xhtml"; 3000.2.1
+"hpc")); 0.6.0.1
+
+;; Libraries present in the "Haskell Platform" 2014.2.0 and not included in
+;; the GHC standard libraries:
+;;
+;; "zlib" ; 0.5.4.1
+;; "async"; 2.0.1.5
+;; "stm"  ; 2.4.2
+;; "mtl"  ; 2.1.3.1
+;; "primitive"; 0.5.2.1
+;; "parallel" 

[PATCH] gnu: Add mesa-demos.

2015-03-13 Thread Taylan Ulrich Bayırlı/Kammer
>From 051341d49fae36579ce318ab0b9c245ed084cdae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 
Date: Fri, 13 Mar 2015 15:57:51 +0100
Subject: [PATCH 2/3] gnu: msea: Propagate input libxshmfence.

* gnu/packages/gl.scm (mesa): Propagate input libxshmfence.
---
 gnu/packages/gl.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index e237cb1..b5f8e07 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -174,13 +174,13 @@ texture compression to Mesa.")
 ("libdrm" ,libdrm)
 ("libx11" ,libx11)
 ("libxdamage" ,libxdamage)
+("libxshmfence" ,libxshmfence)
 ("libxxf86vm" ,libxxf86vm)))
 (inputs
   `(("udev" ,eudev)
 ("dri2proto" ,dri2proto)
 ("dri3proto" ,dri3proto)
 ("presentproto" ,presentproto)
-("libxshmfence" ,libxshmfence)
 ("expat" ,expat)
 ("libxfixes" ,libxfixes)
 ("libxml2" ,libxml2)
-- 
2.2.1

>From e1f288dee780b374fc2162eb39d96a50d64964c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 
Date: Fri, 13 Mar 2015 15:58:25 +0100
Subject: [PATCH 3/3] gnu: Add mesa-demos.

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

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index b5f8e07..ae551c2 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -259,6 +259,35 @@ emulation to complete hardware acceleration for modern GPUs.")
  (assoc-ref outputs "out")
  "/include")
 
+(define-public mesa-demos
+  (package
+(name "mesa-demos")
+(version "8.2.0")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"ftp://ftp.freedesktop.org/pub/mesa/demos/"; version
+"/mesa-demos-" version".tar.bz2"))
+  (sha256
+   (base32
+"14msj0prbl3ljwd24yaqv9pz1xzicdmqgg616xxlppbdh6syrgz4"
+(build-system gnu-build-system)
+(inputs
+ `(("mesa" ,mesa)
+   ("glut" ,freeglut)
+   ("glew" ,glew)))
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(home-page "http://mesa3d.org/";)
+(synopsis "Collection of OpenGL / Mesa demos and test programs")
+(description
+ "Mesa-demos is a collection of OpenGL / Mesa demos and test programs
+authored by the Mesa project.")
+;; The package contains many source files without a license, some
+;; instances of the expat license, and some X11 style licenses by SGI, so
+;; we consider it to be collectively under the X11 license.
+(license l:x11)))
+
 (define-public glew
   (package
 (name "glew")
-- 
2.2.1



Re: [PATCH] gnu: Add s2tc.

2015-03-13 Thread Taylan Ulrich Bayırlı/Kammer
Here's the updated patch, which adds a mesa-headers package, and fixes
the dlopening of s2tc.

>From 01539ae1ff353ac7feccdfdd05992ad295dcdd00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 
Date: Wed, 11 Mar 2015 21:49:24 +0100
Subject: [PATCH 1/3] gnu: Add s2tc.

* gnu/packages/gl.scm (s2tc): New variable.
(mesa): Add input s2tc, patch references to "libtxc_dxtn.so".
(mesa-headers): New variable.
---
 gnu/packages/gl.scm | 67 +++--
 1 file changed, 65 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 7d549d3..e237cb1 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -21,11 +21,13 @@
 
 (define-module (gnu packages gl)
   #:use-module (ice-9 match)
+  #:use-module (guix build utils)
   #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix packages)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages pkg-config)
@@ -123,6 +125,37 @@ rendering modes are: Bitmaps, Anti-aliased pixmaps, Texture maps, Outlines,
 Polygon meshes, and Extruded polygon meshes")
 (license l:x11)))
 
+(define-public s2tc
+  (package
+(name "s2tc")
+(version "1.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "https://github.com/divVerent/s2tc/archive/v"; version ".tar.gz"))
+   (sha256
+(base32 "0ibfdib277fhbqvxzan0bmglwnsl1y1rw2g8skvz82l1sfmmn752"
+(build-system gnu-build-system)
+(native-inputs
+ `(("autoconf" ,autoconf)
+   ("automake" ,automake)
+   ("libtool" ,libtool)))
+(inputs
+ `(("mesa-headers" ,mesa-headers)))
+(arguments
+ '(#:phases
+   (modify-phases %standard-phases
+ (add-after unpack autogen
+  (lambda _
+(zero? (system* "sh" "autogen.sh")))
+(home-page "https://github.com/divVerent/s2tc";)
+(synopsis "S3 Text Compression implementation")
+(description
+ "S2TC is a patent-free S3TC compatible implementation and provides
+texture compression to Mesa.")
+(license l:expat)))
+
 (define-public mesa
   (package
 (name "mesa")
@@ -153,7 +186,8 @@ Polygon meshes, and Extruded polygon meshes")
 ("libxml2" ,libxml2)
 ;; TODO: Add 'libva'
 ;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support
-("makedepend" ,makedepend)))
+("makedepend" ,makedepend)
+("s2tc" ,s2tc)))
 (native-inputs
   `(("pkg-config" ,pkg-config)
 ("gettext" ,gnu-gettext)
@@ -187,7 +221,17 @@ Polygon meshes, and Extruded polygon meshes")
   (lambda _
 (substitute* "src/glsl/tests/lower_jumps/create_test_cases.py"
   (("/usr/bin/env bash") (which "bash"
-  %standard-phases
+  (alist-cons-before
+   'build 'fix-dxtn-libname
+   (lambda* (#:key inputs #:allow-other-keys)
+ (let ((s2tc (assoc-ref inputs "s2tc")))
+   (substitute*
+   '("src/gallium/auxiliary/util/u_format_s3tc.c"
+ "src/mesa/main/texcompress_s3tc.c")
+ (("\"libtxc_dxtn\\.so\"")
+  (string-append
+   "\"" s2tc "/lib/libtxc_dxtn.so\"")
+   %standard-phases)
 (home-page "http://mesa3d.org/";)
 (synopsis "OpenGL implementation")
 (description "Mesa is a free implementation of the OpenGL specification -
@@ -196,6 +240,25 @@ allows Mesa to be used in many different environments ranging from software
 emulation to complete hardware acceleration for modern GPUs.")
 (license l:x11)))
 
+(define-public mesa-headers
+  (package
+(inherit mesa)
+(name "mesa-headers")
+(propagated-inputs '())
+(inputs '())
+(native-inputs '())
+(arguments
+ '(#:phases
+   (modify-phases %standard-phases
+ (delete configure)
+ (delete build)
+ (delete check)
+ (replace install
+  (lambda* (#:key outputs #:allow-other-keys)
+(copy-recursively "include" (string-append
+ (assoc-ref outputs "out")
+ "/include")
+
 (define-public glew
   (package
 (name "glew")
-- 
2.2.1



Re: update of openconnect

2015-03-13 Thread Tomáš Čech

On Fri, Mar 13, 2015 at 11:35:22AM +0100, Andreas Enge wrote:

On Fri, Mar 13, 2015 at 12:55:34AM +0100, Tomáš Čech wrote:

It seems that openssl version is from openconnect POV broken and as they
recommended to switch to gnutls I did the change.
Is anyone against this change?


I have just tried your patch with the new version of openconnect, and it works
for me. Have you checked the pgp signature against the downloaded tarball?
If yes, please push.


I have verified that downloaded tarball is signed by the key mentioned on the
web and that the key is signed by 341 to me unknown signatures.

I can't do better, sorry.

S_W


pgpDBJOHHhgU_.pgp
Description: PGP signature


Re: [PATCH 1/2] services: slim: Allow non-absolute path to be used as session command.

2015-03-13 Thread 宋文武
Ludovic Courtès  writes:

> 宋文武  skribis:
>
>> * gnu/services/xorg.scm (xinitrc)[builder]: Don't check the existence
>>   of COMMAND.  Only run ~/.xsession when it exists.
>
> [...]
>
>> +(let* ((home (getenv "HOME"))
>> +   (xsession-file (string-append home "/.xsession"))
>> +   (session (match (command-line)
>> +  ((_ x) x)
>> +  (_ #$fallback-session
>
> Could you align the right-hand sides of the ‘let*’?
>
>> +  (if (file-exists? xsession-file)
>> +  ;; Run ~/.xsession when it exists.
>> +  (exec-from-login-shell xsession-file)
>
> This will fail if ~/.xsession is not executable.  It could use
> ‘executable-file?’ from (guix build utils), but OTOH it may be better to
> just fail in this case since it’s most likely a user error.
I'm OK to fail here.

Pushed, thanks for review!
>
> Thoughts?
>
> Thanks,
> Ludo’.



Re: rename of dnsmasq module to dns, adding bind-utils

2015-03-13 Thread Tomáš Čech

On Fri, Mar 13, 2015 at 07:49:34AM -0400, David Thompson wrote:

Tomáš Čech  writes:


Package bind-utils is working correctly and I can't see any problem but it
makes `guix lint' cry:

$ guix lint bind-utils
;;; Failed to autoload make-session in (gnutls):..tive]...
;;; ERROR: missing interface for module (gnutls)


You're missing the Guile bindings for GnuTLS.


Thanks to David we figured out that I am missing GUILE_LOAD_PATH and
GUILE_LOAD_COMPILED_PATH correctly set in my environment.

I didn't have gnutls or guile as part of my user profile. I have guile in my
system profile but gnutls there missing.

Installing guile into my user profile and setting environment worked as
workaround in my case.

Best regards,

S_W


pgpSfzlhz4pWp.pgp
Description: PGP signature


Re: rename of dnsmasq module to dns, adding bind-utils

2015-03-13 Thread David Thompson
Tomáš Čech  writes:

> Package bind-utils is working correctly and I can't see any problem but it
> makes `guix lint' cry:
>
> $ guix lint bind-utils
> ;;; Failed to autoload make-session in (gnutls):..tive]...
> ;;; ERROR: missing interface for module (gnutls)

You're missing the Guile bindings for GnuTLS.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate



[PATCH 1/2] gnu: Rename module dnsmasq to dns.

2015-03-13 Thread Tomáš Čech
* gnu/packages/dnsmasq.scm --> gnu/packages/dns.scm
* gnu/packages/dns.scm: Change module name
* gnu-system.am (GNU_SYSTEM_MODULES): Rename dnsmasq module to dns.
---
 gnu-system.am|  2 +-
 gnu/packages/dns.scm | 56 
 gnu/packages/dnsmasq.scm | 56 
 3 files changed, 57 insertions(+), 57 deletions(-)
 create mode 100644 gnu/packages/dns.scm
 delete mode 100644 gnu/packages/dnsmasq.scm

diff --git a/gnu-system.am b/gnu-system.am
index bd3f434..8e32104 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -81,7 +81,7 @@ GNU_SYSTEM_MODULES =  \
   gnu/packages/dictionaries.scm\
   gnu/packages/disk.scm\
   gnu/packages/djvu.scm\
-  gnu/packages/dnsmasq.scm \
+  gnu/packages/dns.scm \
   gnu/packages/docbook.scm \
   gnu/packages/doxygen.scm \
   gnu/packages/dwm.scm \
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
new file mode 100644
index 000..86f5945
--- /dev/null
+++ b/gnu/packages/dns.scm
@@ -0,0 +1,56 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer 
+;;;
+;;; 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 dns)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public dnsmasq
+  (package
+(name "dnsmasq")
+(version "2.72")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"http://www.thekelleys.org.uk/dnsmasq/dnsmasq-";
+version ".tar.xz"))
+  (sha256
+   (base32
+"1c80hq09hfm8cp5pirfb8wdlc7dqkp7zzmbmdaradcvlblzx42vx"
+(build-system gnu-build-system)
+(arguments
+ `(#:phases
+   (alist-delete 'configure %standard-phases)
+   #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+  "CC=gcc")
+   ;; No 'check' target.
+   #:tests? #f))
+(home-page "http://www.thekelleys.org.uk/dnsmasq/doc.html";)
+(synopsis "Small caching DNS proxy and DHCP/TFTP server")
+(description
+ "Dnsmasq is a lightweight DNS forwarder and DHCP server.  It is designed
+to provide DNS and optionally, DHCP, to a small network.  It can serve the
+names of local machines which are not in the global DNS.  The DHCP server
+integrates with the DNS server and allows machines with DHCP-allocated
+addresses to appear in the DNS with names configured either in each host or in
+a central configuration file.  Dnsmasq supports static and dynamic DHCP leases
+and BOOTP/TFTP for network booting of diskless machines.")
+;; Source files only say GPL2 and GPL3 are allowed.
+(license (list gpl2 gpl3
diff --git a/gnu/packages/dnsmasq.scm b/gnu/packages/dnsmasq.scm
deleted file mode 100644
index f342f81..000
--- a/gnu/packages/dnsmasq.scm
+++ /dev/null
@@ -1,56 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer 
-;;;
-;;; 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 dnsmasq)
-  #:use-module (guix licenses)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu))
-
-(define-public dnsmasq
-  (package
-(name "dnsmasq")
-(version "2.72")
-(source (origin
-  (method url-

[PATCH 2/2] gnu: bind-utils: Add new variable.

2015-03-13 Thread Tomáš Čech
* gnu/packages/dns.scm (bind-utils): New variable.
---
 gnu/packages/dns.scm | 61 ++--
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 86f5945..7420247 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -17,7 +17,13 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (gnu packages dns)
-  #:use-module (guix licenses)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages gnutls)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages xml)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -53,4 +59,55 @@ addresses to appear in the DNS with names configured either 
in each host or in
 a central configuration file.  Dnsmasq supports static and dynamic DHCP leases
 and BOOTP/TFTP for network booting of diskless machines.")
 ;; Source files only say GPL2 and GPL3 are allowed.
-(license (list gpl2 gpl3
+(license (list license:gpl2 license:gpl3
+
+(define-public bind-utils
+  (package
+(name "bind-utils")
+(version "9.10.1-P2")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "ftp://ftp.isc.org/isc/bind9/"; version
+  "/bind-" version ".tar.gz"))
+  (sha256
+   (base32
+"1svzia5vv0s4bv6r04j8bsvlf3klwyigmdz1iwb4fqds00iyvp22"
+(build-system gnu-build-system)
+(inputs
+ ;; it would be nice to add GeoIP and gssapi once there is package
+ `(("libcap" ,libcap)
+   ("libxml2" ,libxml2)
+   ("mysql" ,mysql)
+   ("openssl" ,openssl)
+   ("perl" ,perl)
+   ("p11-kit" ,p11-kit)))
+(arguments
+ `(#:tests? #f ; no test phase implemented
+   #:configure-flags
+   (list (string-append "--with-openssl="
+(assoc-ref %build-inputs "openssl"))
+ (string-append "--with-dlz-mysql="
+(assoc-ref %build-inputs "mysql"))
+ (string-append "--with-pkcs11="
+(assoc-ref %build-inputs "p11-kit")))
+   #:phases
+   (alist-replace
+'build
+(lambda _
+  (system* "make" "-C" "lib/dns")
+  (system* "make" "-C" "lib/isc")
+  (system* "make" "-C" "lib/bind9")
+  (system* "make" "-C" "lib/isccfg")
+  (system* "make" "-C" "lib/lwres")
+  (system* "make" "-C" "bin/dig"))
+(alist-replace
+ 'install
+ (lambda _ (system* "make" "-C" "bin/dig" "install"))
+ %standard-phases
+(home-page "https://www.isc.org/downloads/bind/";)
+(synopsis "Tools for quering nameserver")
+(description
+ "ISC referrence implementation of nameserver - Bind comes with set of 
tools
+for quering nameservers.  These tools are useful for analysis of DNS issues or
+verification of configuration")
+(license (list license:isc
-- 
2.2.1




rename of dnsmasq module to dns, adding bind-utils

2015-03-13 Thread Tomáš Čech
Package bind-utils is working correctly and I can't see any problem but it
makes `guix lint' cry:

$ guix lint bind-utils
;;; Failed to autoload make-session in (gnutls):..tive]...
;;; ERROR: missing interface for module (gnutls)
Backtrace:
In ice-9/boot-9.scm:
 157: 12 [catch #t # ...]
In unknown file:
   ?: 11 [apply-smob/1 #]
In ice-9/boot-9.scm:
  63: 10 [call-with-prompt prompt0 ...]
In ice-9/eval.scm:
 432: 9 [eval # #]
In ice-9/boot-9.scm:
2401: 8 [save-module-excursion #]
4050: 7 [#]
1724: 6 [%start-stack load-stack #]
1729: 5 [#]
In unknown file:
   ?: 4 [primitive-load "/Devel/git/guix/scripts/guix"]
In guix/ui.scm:
 849: 3 [run-guix-command lint "bind-utils"]
In srfi/srfi-1.scm:
 619: 2 [for-each # #]
 619: 1 [for-each # #]
In guix/scripts/lint.scm:
 287: 0 [validate-uri # # home-page]

guix/scripts/lint.scm:287:16: In procedure validate-uri:
guix/scripts/lint.scm:287:16: In procedure module-lookup: Unbound variable: 
make-session


So, please review this one more carefuly than usual.

Thanks in advance.

S_W




Libreboot error: /boot/grub/i386-coreboot files not found

2015-03-13 Thread 白い熊@相撲道

I've installed and am running GuixSD on the Gluglug X200.

On boot, Libreboot comes up with its GRUB-like menu, where I select 
"Search for GRUB configuration on internal storage". It then finds the 
GuixSD partition with /boot/grub and you can boot it usinr "Load Config 
from (ahci0,msdosX)".


This then however always reports:

error: file `/boot/grub/i386-coreboot/vbe.mod' not found.
error: file `/boot/grub/i386-coreboot/vga.mod' not found.
error: file `/boot/grub/i386-coreboot/gfxterm.mod' not found.
Press any key to continue...

You can then hit a key and it continues normally, loads the GRUB menu 
and you can boot. So it's more of a nuisance than a crippling error. I'd 
like to get rid of it however.


Of course, there is no i386-coreboot in /boot/grub/, however symlinking 
i386-pc to it, or copying the dir i386-pc to i386-coreboot, has no 
effect. The error still comes up.


How can this be fixed?
--
白い熊@相撲道



Re: [ART] Updated SLiM theme with GuixSD logo

2015-03-13 Thread 白い熊@相撲道

Ludovic Courtès wrote:

Very nice as well.


The new theme is elegant, however I'd like to use the Gnu one out of 
nostalgia. Where can I set it so SLiM shows the GNU logo instead?

--
白い熊@相撲道





Re: update of openconnect

2015-03-13 Thread Andreas Enge
On Fri, Mar 13, 2015 at 12:55:34AM +0100, Tomáš Čech wrote:
> It seems that openssl version is from openconnect POV broken and as they
> recommended to switch to gnutls I did the change.
> Is anyone against this change?

I have just tried your patch with the new version of openconnect, and it works
for me. Have you checked the pgp signature against the downloaded tarball?
If yes, please push.

Andreas




[PATCH] Add MISO.

2015-03-13 Thread Ricardo Wurmus
Hi Guix,

the latest release of MISO corrected the license conflict (containing
GPLv2 code but releasing the combined work under MIT) and is now
released under the GPLv2.

Attached is a patch to add MISO.

~~ Ricardo

>From aca149cc5c6c808535894b98d2f0b9ee96fe973c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Fri, 13 Mar 2015 10:31:49 +0100
Subject: [PATCH] gnu: Add MISO.

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

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 67326aa..faa3780 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -625,6 +625,51 @@ resolution of binding sites through combining the information of both
 sequencing tag position and orientation.")
 (license license:bsd-3)))
 
+(define-public miso
+  (package
+(name "miso")
+(version "0.5.3")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"http://pypi.python.org/packages/source/m/misopy/misopy-";
+version ".tar.gz"))
+  (sha256
+   (base32
+"0x446867az8ir0z8c1vjqffkp0ma37wm4sylixnkhgawllzx8v5w"))
+  (modules '((guix build utils)))
+  ;; use "gcc" instead of "cc" for compilation
+  (snippet
+   '(substitute* "setup.py"
+  (("^defines")
+   "cc.set_executables(
+compiler='gcc',
+compiler_so='gcc',
+linker_exe='gcc',
+linker_so='gcc -shared'); defines")
+(build-system python-build-system)
+(arguments
+ `(#:python ,python-2 ; only Python 2 is supported
+   #:tests? #f)) ; no "test" target
+(inputs
+ `(("samtools" ,samtools)
+   ("python-numpy" ,python2-numpy)
+   ("python-pysam" ,python2-pysam)
+   ("python-scipy" ,python2-scipy)
+   ("python-matplotlib" ,python2-matplotlib)))
+(native-inputs
+ `(("python-setuptools" ,python2-setuptools)))
+(home-page "http://genes.mit.edu/burgelab/miso/index.html";)
+(synopsis "Mixture of Isoforms model for RNA-Seq isoform quantitation")
+(description
+ "MISO (Mixture-of-Isoforms) is a probabilistic framework that quantitates
+the expression level of alternatively spliced genes from RNA-Seq data, and
+identifies differentially regulated isoforms or exons across samples.  By
+modeling the generative process by which reads are produced from isoforms in
+RNA-Seq, the MISO model uses Bayesian inference to compute the probability
+that a read originated from a particular isoform.")
+(license license:gpl2)))
+
 (define-public rseqc
   (package
 (name "rseqc")
-- 
2.1.0



Re: [PATCH] Fix libgnomeprint

2015-03-13 Thread Andreas Enge
Good, please push!

Andreas




[PATCH] Fix libgnomeprint

2015-03-13 Thread Ricardo Wurmus
>From e3f37c56590bbb612afedc250ad9ca95d6ba26f8 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Fri, 13 Mar 2015 09:33:33 +0100
Subject: [PATCH] gnu: libgnomeprint: adapt to newer freetype.

* gnu/packages/gnome.scm (freetype): Change "freetype" to "freetype2" in
  snippet.
---
 gnu/packages/gnome.scm | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 071c29e..4374450 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1089,7 +1089,14 @@ widgets built in the loading process.")
   name "-" version ".tar.bz2"))
   (sha256
(base32
-"129ka3nn8gx9dlfry17ib79azxk45wzfv5rgqzw6dwx2b5ns8phm"
+"129ka3nn8gx9dlfry17ib79azxk45wzfv5rgqzw6dwx2b5ns8phm"))
+  (modules '((guix build utils)))
+  (snippet
+   ;; Adapt to newer freetype. As the package is deprecated, there
+   ;; is no use in creating a patch and reporting it.
+   '(substitute* '("libgnomeprint/gnome-font-face.c"
+   "libgnomeprint/gnome-rfont.c")
+  (("freetype/") "freetype2/")
 (build-system gnu-build-system)
 (inputs
  `(("popt" ,popt)
-- 
2.1.0