Re: 03/04: gnu: openjpeg: Add fixes for CVE-2016-{9850,9851}.

2016-12-10 Thread Efraim Flashner
On Sun, Dec 11, 2016 at 01:02:14AM -0500, Leo Famulari wrote:
> On Sat, Dec 10, 2016 at 08:03:24PM +, Efraim Flashner wrote:
> > efraim pushed a commit to branch master
> > in repository guix.
> > 
> > commit a304b6c362dcfadfaa2cfe2a67f5e948f247fd51
> > Author: Efraim Flashner 
> > Date:   Sat Dec 10 21:45:29 2016 +0200
> > 
> > gnu: openjpeg: Add fixes for CVE-2016-{9850,9851}.
> > 
> > * gnu/packages/image.scm (openjpeg)[replacement]: New field.
> > (openjpeg/fixed): New variable, patch against CVE-2016-9850,
> > CVE-2016-9851.
> > * gnu/packages/patches/openjpeg-CVE-2016-9850-CVE-2016-9851.patch: New 
> > file.
> > * gnu/local.mk (dist_patch_DATA): Register it.
> 
> I think this patch should have been sent to guix-devel for review. 
> 
> The patches are from a 3rd-party repository. The author does seem to
> have a relationship to the OpenJPEG project (from past commits), but
> nobody else from OpenJPEG commented on these changes yet:
> 
> https://github.com/uclouvain/openjpeg/issues/871
> https://github.com/uclouvain/openjpeg/issues/872
> https://github.com/uclouvain/openjpeg/pull/873/files

You're right, I should've been more careful with that.

> 
> While poking around, I noticed there is a newer OpenJPEG release
> (2.1.2), and a bunch of recent bugs:
> 
> https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=openjpeg
> 
> Especial CVE-2016-8332:
> 
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-8332
> 

Good catch, I noticed that there was a newer version, but for some
reason I never even thought to use the newer release as the base for the
replacement.


-- 
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: 03/04: gnu: openjpeg: Add fixes for CVE-2016-{9850,9851}.

2016-12-10 Thread Leo Famulari
On Sun, Dec 11, 2016 at 01:02:14AM -0500, Leo Famulari wrote:
> While poking around, I noticed there is a newer OpenJPEG release
> (2.1.2), and a bunch of recent bugs:
> 
> https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=openjpeg
> 
> Especial CVE-2016-8332:
> 
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-8332

I updated the replacement package to version 2.1.2 in
0e8b7b1c351a2307bfc33211b4d76dbe7dfa01ef.



Re: 03/04: gnu: openjpeg: Add fixes for CVE-2016-{9850,9851}.

2016-12-10 Thread Leo Famulari
On Sat, Dec 10, 2016 at 08:03:24PM +, Efraim Flashner wrote:
> efraim pushed a commit to branch master
> in repository guix.
> 
> commit a304b6c362dcfadfaa2cfe2a67f5e948f247fd51
> Author: Efraim Flashner 
> Date:   Sat Dec 10 21:45:29 2016 +0200
> 
> gnu: openjpeg: Add fixes for CVE-2016-{9850,9851}.
> 
> * gnu/packages/image.scm (openjpeg)[replacement]: New field.
> (openjpeg/fixed): New variable, patch against CVE-2016-9850,
> CVE-2016-9851.
> * gnu/packages/patches/openjpeg-CVE-2016-9850-CVE-2016-9851.patch: New 
> file.
> * gnu/local.mk (dist_patch_DATA): Register it.

I think this patch should have been sent to guix-devel for review. 

The patches are from a 3rd-party repository. The author does seem to
have a relationship to the OpenJPEG project (from past commits), but
nobody else from OpenJPEG commented on these changes yet:

https://github.com/uclouvain/openjpeg/issues/871
https://github.com/uclouvain/openjpeg/issues/872
https://github.com/uclouvain/openjpeg/pull/873/files

While poking around, I noticed there is a newer OpenJPEG release
(2.1.2), and a bunch of recent bugs:

https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=openjpeg

Especial CVE-2016-8332:

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-8332



gnu: Add syncthing.

2016-12-10 Thread Petter

Hi,

Syncthing is the first project to use the recently added Go build
system. It's in a minimal state to aid in developing the build system
and because it's a considerable job to add descriptions, synopsises
and homepages to all these packages (55). Licenses are probably
incorrect, unless correct by coincidence. Help with this would be most
appreciated!

Tar archives are currently unsupported.

Best,
PetterFrom f195168e04fd31bc0c72c279ff3b96a272fe8183 Mon Sep 17 00:00:00 2001
From: Petter 
Date: Sun, 11 Dec 2016 01:33:59 +0100
Subject: [PATCH] gnu: Add syncthing.

* gnu/packages/syncthing.scm: New file.
---
 gnu/packages/syncthing.scm | 1242 
 1 file changed, 1242 insertions(+)
 create mode 100644 gnu/packages/syncthing.scm

diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
new file mode 100644
index 000..74847f0
--- /dev/null
+++ b/gnu/packages/syncthing.scm
@@ -0,0 +1,1242 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Leo Famulari 
+;;; Copyright © 2016 Petter 
+;;;
+;;; 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 syncthing)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system go)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix licenses)
+  #:use-module (gnu packages golang))
+
+(define-public syncthing
+  (package
+(name "syncthing")
+(version "0.14.13")
+(source (origin
+  (method git-fetch)
+  (uri (git-reference
+(url "https://github.com/syncthing/syncthing/;)
+(commit (string-append "v" version
+  (file-name (string-append name "-" version "-checkout"))
+  (sha256
+   (base32 "0gq218f1rhzjrqh2gjyvqksa7a1agwhm8rfqf5jw58pncblrn6v4"
+(build-system go-build-system)
+(inputs
+ `(("github.com/AudriusButkevicius/go-nat-pmp"
+,github-com-audriusbutkevicius-go-nat-pmp)
+   ("github.com/vitrun/qart/coding" ,github-com-vitrun-qart-coding)
+   ("github.com/vitrun/qart/gf256" ,github-com-vitrun-qart-gf256)
+   ("github.com/vitrun/qart/qr" ,github-com-vitrun-qart-qr)
+   ("github.com/thejerf/suture" ,github-com-thejerf-suture)
+   ("github.com/syndtr/goleveldb" ,github-com-syndtr-goleveldb)
+   ("github.com/sasha-s/go-deadlock" ,github-com-sasha-s-go-deadlock)
+   ("github.com/rcrowley/go-metrics" ,github-com-rcrowley-go-metrics)
+   ("github.com/minio/sha256-simd" ,github-com-minio-sha256-simd)
+   ("github.com/kardianos/osext" ,github-com-kardianos-osext)
+   ("github.com/juju/ratelimit" ,github-com-juju-ratelimit)
+   ("github.com/jackpal/gateway" ,github-com-jackpal-gateway)
+   ("github.com/gogo/protobuf" ,github-com-gogo-protobuf)
+   ("github.com/gobwas/glob" ,github-com-gobwas-glob)
+   ("github.com/calmh/xdr" ,github-com-calmh-xdr)
+   ("github.com/calmh/luhn" ,github-com-calmh-luhn)
+   ("github.com/calmh/du" ,github-com-calmh-du)
+   ("github.com/bkaradzic/go-lz4" ,github-com-bkaradzic-go-lz4)
+   ("github.com/golang/snappy" ,github-com-golang-snappy)
+   ("golang.org/x/crypto/bcrypt" ,golang-org-x-crypto-bcrypt)
+   ("golang.org/x/crypto/blowfish" ,golang-org-x-crypto-blowfish)
+   ("golang.org/x/text/transform" ,golang-org-x-text-transform)
+   ("golang.org/x/text/unicode/norm" ,golang-org-x-text-unicode-norm)
+   ("golang.org/x/net/proxy" ,golang-org-x-net-proxy)
+   ("golang.org/x/net/bpf" ,golang-org-x-net-bpf)
+   ("golang.org/x/net/ipv6" ,golang-org-x-net-ipv6)
+   ("golang.org/x/net/internal/iana" ,golang-org-x-net-internal-iana)
+   ("golang.org/x/net/internal/netreflect"
+,golang-org-x-net-internal-netreflect)))
+
+(arguments
+ `(#:import-path "github.com/syncthing/syncthing"
+   #:phases
+   (modify-phases %standard-phases
+ (replace 'delete-files
+   (lambda _
+ (delete-file-recursively "src/github.com/syncthing/syncthing/vendor")))
+
+ (replace 'build
+   (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion 

gnu: Add Go build system.

2016-12-10 Thread Petter

Hi,

I've made an attempt at making a build system for Go. It seems to
work, but it's not pretty. My Guix/Guile skills are bad, so keep your
expectations to a minimum. Consider it something where there was
nothing.

I started with a copy of the GNU build system, removed code I felt
wasn't necessary, then adapted to Go's needs. Note, comments and those
first text string after a (define) have not been updated. Unnecessary
#:use-modules have not been removed. In short, it's bad and there's a
lot to do make it ok-ish. That's where you come in :)

I'll add Syncthing, a sizeable Go project, and its dependencies in a
later e-mail. These recipes uses this Go build system, and my primary
goal has been to make these nice, while functional. Now we can
hopefully work on the build system with a minimum of modifications to
the recipes.


Happy hacking!
PetterFrom 4c0597a95ae3cd111ef12d675edf501c559458ba Mon Sep 17 00:00:00 2001
From: Petter 
Date: Sun, 11 Dec 2016 01:10:09 +0100
Subject: [PATCH] gnu: Add Go build system.

* guix/build-system/go.scm: New file
* guix/build/go-build-system.scm: New file.
---
 guix/build-system/go.scm   | 193 +
 guix/build/go-build-system.scm | 186 +++
 2 files changed, 379 insertions(+)
 create mode 100644 guix/build-system/go.scm
 create mode 100644 guix/build/go-build-system.scm

diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm
new file mode 100644
index 000..f336f20
--- /dev/null
+++ b/guix/build-system/go.scm
@@ -0,0 +1,193 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Petter 
+;;;
+;;; 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 build-system go)
+  #:use-module (guix store)
+  #:use-module (guix utils)
+  #:use-module (guix combinators)
+  #:use-module (guix derivations)
+  #:use-module (guix search-paths)
+  #:use-module (guix build-system)
+  #:use-module (guix packages)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages golang)
+  #:use-module (srfi srfi-1)
+  #:use-module (ice-9 match)
+  #:export (%go-build-system-modules
+go-build
+go-build-system
+sourcestuff
+standard-packages))
+
+;; Commentary:
+;;
+;; Standard build procedure for packages using the GNU Build System or
+;; something compatible ("./configure && make && make install").
+;;
+;; Code:
+
+(define %go-build-system-modules
+  ;; Build-side modules imported and used by default.
+  '((guix build go-build-system)
+(guix build utils)
+(guix build gremlin)
+(guix elf)))
+
+(define %default-modules
+  ;; Modules in scope in the build-side environment.
+  '((guix build go-build-system)
+(guix build utils)))
+
+(define* (lower name
+#:key source inputs native-inputs outputs target
+(implicit-inputs? #t) (implicit-cross-inputs? #t)
+(strip-binaries? #t) system
+#:allow-other-keys
+#:rest arguments)
+  "Return a bag for NAME from the given arguments."
+  (define private-keywords
+`(#:source #:inputs #:native-inputs #:outputs
+  #:implicit-inputs? #:implicit-cross-inputs?
+  ,@(if target '() '(#:target
+
+  (bag
+(name name)
+(system system) (target target)
+(build-inputs `(,@(if source
+  `(("source" ,source)))
+("go" ,go)
+,@native-inputs))
+(host-inputs inputs)
+
+(build (if target gnu-cross-build go-build))
+(arguments (strip-keyword-arguments private-keywords arguments
+
+(define* (go-build store name input-drvs
+#:key (guile #f)
+(outputs '("out"))
+(search-paths '())
+(configure-flags ''())
+(make-flags ''())
+(out-of-source? #f)
+(tests? #t)
+(import-path "")
+(unpack-path "")
+(test-target "check")
+(parallel-build? #t)
+(parallel-tests? #t)
+(phases '%standard-phases)
+(locale "en_US.utf8")
+(system (%current-system))
+

Re: [PATCH] gnu: Add denemo.

2016-12-10 Thread Ludovic Courtès
Kei Kebreau  skribis:

> From 656a59ee358362a9c3ec9b98f8e1a8cd1dc28b7f Mon Sep 17 00:00:00 2001
> From: Kei Kebreau 
> Date: Fri, 9 Dec 2016 21:58:08 -0500
> Subject: [PATCH] gnu: Add denemo.
>
> * gnu/packages/music.scm (denemo): New variable.

Perfect, thank you!

Ludo’.



[PATCH 2/2] gnu: python-html5lib: Add dependency on python-webencodings.

2016-12-10 Thread Marius Bakke
* gnu/packages/python.scm (python-html5lib,
python2-html5lib)[propagated-inputs]: Add python-webencodings.
---
 gnu/packages/python.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 690e0ae37..101d8bc25 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4861,7 +4861,8 @@ ISO 8601 dates, time and duration.")
 "1yd068a5c00wd0ajq0hqimv7fd82lhrw0w3s01vbhy9bbd6xapqd"
 (build-system python-build-system)
 (propagated-inputs
-  `(("python-six" ,python-six))) ; required to "import html5lib"
+ `(("python-six" ,python-six)
+   ("python-webencodings" ,python-webencodings)))
 (arguments
  `(#:test-target "check"))
 (home-page
-- 
2.11.0




[PATCH 0/2] Fix python-html5lib import.

2016-12-10 Thread Marius Bakke
I'm not sure if this is a recent dependency, but without this patch
"import html5lib" complains about not finding webencodings module.

Marius Bakke (2):
  gnu: Add python-webencodings.
  gnu: python-html5lib: Add dependency on python-webencodings.

 gnu/packages/python.scm | 43 ++-
 1 file changed, 42 insertions(+), 1 deletion(-)

-- 
2.11.0




[PATCH 1/2] gnu: Add python-webencodings.

2016-12-10 Thread Marius Bakke
* gnu/packages/python.scm (python-webencodings, python2-webencodings): New
variables.
---
 gnu/packages/python.scm | 40 
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index b0e23b5c1..690e0ae37 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4892,6 +4892,46 @@ and written in Python.")
 (define-public python2-html5lib-0.9
   (package-with-python2 python-html5lib-0.9))
 
+(define-public python-webencodings
+  (package
+(name "python-webencodings")
+(version "0.5")
+(source (origin
+  (method url-fetch)
+  (uri (pypi-uri "webencodings" version))
+  (sha256
+   (base32
+"015rw7662lkpb9aqiqah2hbizk6w531badqwjpz41rr47glmxid5"
+(build-system python-build-system)
+(arguments
+ '(#:phases
+   (modify-phases %standard-phases
+ (replace 'check
+   (lambda _
+ (zero? (system* "py.test" "-v" "webencodings/tests.py")))
+(native-inputs
+ `(("python-pytest" ,python-pytest)))
+(home-page "https://github.com/SimonSapin/python-webencodings;)
+(synopsis "Character encoding aliases for legacy web content")
+(description
+ "In order to be compatible with legacy web content when interpreting
+something like @code{Content-Type: text/html; charset=latin1}, tools need
+to use a particular set of aliases for encoding labels as well as some
+overriding rules.  For example, @code{US-ASCII} and @code{iso-8859-1} on
+the web are actually aliases for @code{windows-1252}, and an @code{UTF-8}
+or @code{UTF-16} BOM takes precedence over any other encoding declaration.
+The WHATWG @url{https://encoding.spec.whatwg.org/,Encoding} standard
+defines all such details so that implementations do not have to
+reverse-engineer each other.
+
+This module implements the Encoding standard and has encoding labels and
+BOM detection, but the actual implementation for encoders and decoders
+is Python’s.")
+(license license:bsd-3)))
+
+(define-public python2-webencodings
+  (package-with-python2 python-webencodings))
+
 (define-public python-urwid
   (package
 (name "python-urwid")
-- 
2.11.0




Re: [PATCH 2/2] gnu: password-store: Don't run tests in parallel

2016-12-10 Thread Marius Bakke
Christopher Baines  writes:

> * gnu/packages/password-utils.scm (password-store): Don't run tests in
>   parallel, as it causes them to hang and the build to timeout.
> ---
>  gnu/packages/password-utils.scm | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
> index bdb3acf..98669a6 100644
> --- a/gnu/packages/password-utils.scm
> +++ b/gnu/packages/password-utils.scm
> @@ -291,6 +291,7 @@ any X11 window.")
> (wrap-program (string-append out "/bin/pass")
>   `("PATH" ":" prefix (,(string-join path ":"
> #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output))
> +   #:parallel-tests? #f
> #:test-target "test"))
>  (inputs
>   `(("getopt" ,util-linux)
> -- 
> 2.10.2

Thanks for these patches! I added a code comment to the later one.

Pushed as a77f03608498de5e93560da8aac0cb8bf7cec7a7.


signature.asc
Description: PGP signature


Re: Guix gathering in Berlin, Dec. 12th

2016-12-10 Thread ng0
ng0  writes:

> Ludovic Courtès  writes:
>
>> Hello Guix!
>>
>> Ricardo Wurmus  skribis:
>>
>>> Ludovic Courtès  writes:
>>>
 Hi!

 Ricardo Wurmus  skribis:

> @Ludo: at what time would you like this to start and for how long do we
> want the room?

 I haven’t booked my plane tickets yet, so I don’t know exactly, and it
 also depends on what everyone else wants.  :-)  I think we’d have no
 shortage of things to talk about, though.

 Would it be possible to tentatively book the room for the whole day,
 like 9AM to 6PM, and adjust later as we see fit?
>>>
>>> I’ve talked to the administration of the youth club “e-Lok” and they say
>>> we could use their media room from 10AM to 6PM.  The “e-Lok” is where
>>> the FSFE Berlin group usually meets once a month.  It’s within 5 minutes
>>> walking distance to the S-Bahn train station “S Ostkreuz”.
>>>
>>> Here’s their website:
>>>
>>> http://zope2.in-berlin.de:8100/wsb/elok/jc-e-lok
>>>
>>> And here’s how to get there:
>>>
>>>http://zope2.in-berlin.de:8100/wsb/elok/jc-e-lok/kontakte
>>
>> It’s happening very soon!  :-)
>>
>> So far I think we’re just 4 or 5 people who said they would come.
>> Please bring your own topics!
>>
>> Mine include: ‘guix pull’, Guix in HPC, the new build farm,
>> organizational issues.
>>
>> Cheers,
>> Ludo’.
>>
>
> I have no specific topics in mind, but I have a long term and
> short term roadmap of my live-system based on and integrated into
> GuixSD I'd like to try to talk about a bit and maybe get some
> input. Try, because currently there's nothing but what I
> contribute and work towards, and ideas and issues on our
> (currently still non-public) issue tracker. It's just nothing
> long to talk about and no slides or anything at all, just
> content, phases separation, potential issues etc.

Additionally I'll have (not very much) questions on the server
side usage of Guix, I'm sure some of the people present will be
able to answer.

> I'm not very often in Berlin, is there some food option for
> vegans somewhere around the e-Lok?
> -- 
> ♥Ⓐ  ng0  | ng0.chaosnet.org

Until monday,
-- 
♥Ⓐ  ng0  | ng0.chaosnet.org



[PATCH] gnu: services: Activate system prior to services

2016-12-10 Thread Christopher Baines
This patch fixes some issues I've had with the postgresql service and database
locales. If system activation takes place before service activation, the
locales are present and PostgreSQL can use them, but otherwise the PostgreSQL
service is limited in the locales that can be used.



[PATCH] gnu: services: Activate system prior to services

2016-12-10 Thread Christopher Baines
* gnu/services.scm: Activate the current system prior to the services,
  as this allows the services to use the files from the system, for
  example locales, in the service activation process.
---
 gnu/services.scm | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/services.scm b/gnu/services.scm
index 693a7f8..5d2789c 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -338,12 +338,12 @@ ACTIVATION-SCRIPT-TYPE."
   (activate-/bin/sh
(string-append #$(canonical-package bash) "/bin/sh"))
 
+  ;; Set up /run/current-system.
+  (activate-current-system)
+
   ;; Run the services' activation snippets.
   ;; TODO: Use 'load-compiled'.
-  (for-each primitive-load '#$actions)
-
-  ;; Set up /run/current-system.
-  (activate-current-system))
+  (for-each primitive-load '#$actions))
 
 (define (gexps->activation-gexp gexps)
   "Return a gexp that runs the activation script containing GEXPS."
-- 
2.10.2




Re: [PATCH 4/9] gnu: Add ghc-ieee754.

2016-12-10 Thread David Craven
Hi Leo!

> Same issue about the GitHub page appearing out of date, since it doesn't
> seem to have a 0.7.8 release tag.

So I checked the github pages and the version string was updated, so
the url's are still up to date. I opened an issue regarding release
tagging https://github.com/patperry/hs-ieee754/issues/18

> I also noticed a 'LICENSE.Tango' file. Can you check if we need to
> mention that license as well?

The files in the cbits subfolder are dual licensed, but bsd-3 is the
superset that applies to all files in the package. I'm not sure it's
worth bothering. WDYT?

Thank you for your feedback.
David



[PATCH 2/2] gnu: password-store: Don't run tests in parallel

2016-12-10 Thread Christopher Baines
* gnu/packages/password-utils.scm (password-store): Don't run tests in
  parallel, as it causes them to hang and the build to timeout.
---
 gnu/packages/password-utils.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index bdb3acf..98669a6 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -291,6 +291,7 @@ any X11 window.")
(wrap-program (string-append out "/bin/pass")
  `("PATH" ":" prefix (,(string-join path ":"
#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output))
+   #:parallel-tests? #f
#:test-target "test"))
 (inputs
  `(("getopt" ,util-linux)
-- 
2.10.2




[PATCH 1/2] gnu: password-store: Delete build phase

2016-12-10 Thread Christopher Baines
* gnu/packages/password-utils.scm (password-store): Remove the build
  phase, as it is unused.
---
 gnu/packages/password-utils.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index cf030ec..bdb3acf 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -280,6 +280,7 @@ any X11 window.")
  '(#:phases
(modify-phases %standard-phases
  (delete 'configure)
+ (delete 'build)
  (add-after 'install 'wrap-path
(lambda* (#:key inputs outputs #:allow-other-keys)
  (let ((out (assoc-ref outputs "out"))
-- 
2.10.2