Re: [PATCH] update notmuch and python bindings

2016-08-07 Thread Troy Sankey
Updated patches address all comments so far except for the removal of
the emacs input.  Also updated the test numbers just for fun.

Quoting ng0 (2016-08-07 18:24:57)
> I'd also advise to upgrade git to something more recent if your distro
> allows it :)

Debian stable :)  It's a long term project of mine to switch to GuixSD.
I'm switching over one package at a time.  Next is notmuch!

> I'll try to test build tomorrow morning when my buildserver is up
> again. release notes read interesting enough. thanks for the patches.

Thanks.

Troy
From 8d0f5d8c0a8bb1205e71df2f2aa7366252961792 Mon Sep 17 00:00:00 2001
From: Troy Sankey 
Date: Sun, 7 Aug 2016 13:27:18 -0400
Subject: [PATCH 3/3] gnu: python2-notmuch: Update to 0.22.1.

---
 gnu/packages/mail.scm | 33 +
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 1634d86..7e0b096 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -560,38 +560,7 @@ and search library.")
 (license gpl3+)))
 
 (define-public python2-notmuch
-  (package
-(name "python2-notmuch")
-(version "0.15.2")
-(source (origin
-  (method url-fetch)
-  (uri (string-append
-"https://pypi.python.org/packages/source/n/notmuch/notmuch-;
-version
-".tar.gz"))
-  (sha256
-   (base32
-"18g8701ibr153ngsz258kgcd42wqnbf9ifpqig1bijy6b0zx9xn5"
-(build-system python-build-system)
-(inputs `(("notmuch" ,notmuch)))
-(arguments
- `(#:python ,python-2
-   #:phases (modify-phases %standard-phases
-  (add-before
-   'build 'set-libnotmuch-file-name
-   (lambda* (#:key inputs #:allow-other-keys)
- (let ((notmuch (assoc-ref inputs "notmuch")))
-   (substitute* "notmuch/globals.py"
- (("libnotmuch\\.so\\.[0-9]")
-  (string-append notmuch "/lib/libnotmuch.so.4")))
-   #t
-   #:tests? #f))  ;no "test" target
-(home-page "http://notmuchmail.org/;)
-(synopsis "Python bindings of the Notmuch mail indexing library")
-(description
- "This package provides Python bindings to use the Notmuch mail indexing
-and search library.")
-(license gpl3+)))
+  (package-with-python2 python-notmuch))
 
 (define-public getmail
   (package
-- 
2.1.4

From 0a134eaf40aa9dd6fa5e2e24e3d226203a03da73 Mon Sep 17 00:00:00 2001
From: Troy Sankey 
Date: Sun, 7 Aug 2016 13:26:30 -0400
Subject: [PATCH 2/3] gnu: Add python-notmuch

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

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 82e35fb..1634d86 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -517,6 +517,48 @@ ing, and tagging large collections of email messages.")
 useful for email address completion.")
 (license license:expat)))
 
+(define-public python-notmuch
+  (package
+(name "python-notmuch")
+(version "0.22.1")
+(source (origin
+  (method url-fetch)
+  ;; notmuch python bindings are now unavailable on pypi.  The
+  ;; bindings are distributed via the notmuch release tarball.
+  (uri (string-append
+"https://notmuchmail.org/releases/notmuch-;
+version
+".tar.gz"))
+  (sha256
+   (base32
+"0jwpda3q023dn3sp41n8648951i7iagfv8zzpriv7hpkjivlafg7"
+(build-system python-build-system)
+(inputs `(("notmuch" ,notmuch)))
+(arguments
+ `(#:tests? #f  ; no "test" target
+   #:phases
+   (modify-phases %standard-phases
+ ;; this python package lives in a subdirectory of the notmuch source
+ ;; tree, so chdir into it before building:
+ (add-before 'build 'chdir
+   (lambda* (#:key inputs outputs #:allow-other-keys)
+ (chdir "bindings/python")))
+ ;; make sure the correct notmuch shared library gets loaded:
+ (add-before
+   'build 'set-libnotmuch-file-name
+   (lambda* (#:key inputs #:allow-other-keys)
+ (let ((notmuch (assoc-ref inputs "notmuch")))
+   (substitute* "notmuch/globals.py"
+ (("libnotmuch\\.so\\.")
+  (string-append notmuch "/lib/libnotmuch.so.")))
+   #t))
+(home-page "http://notmuchmail.org/;)
+(synopsis "Python bindings of the Notmuch mail indexing library")
+(description
+ "This package provides Python bindings to use the Notmuch mail indexing
+and search library.")
+(license gpl3+)))
+
 (define-public python2-notmuch
   (package
 (name "python2-notmuch")
-- 
2.1.4

From 

Re: [PATCH] ui: 'package->recutils' serializes the source field.

2016-08-07 Thread Mathieu Lirzin
David Craven  writes:

> Quoting FSDG:
> A free system distribution must not steer users towards obtaining any
> nonfree information for practical use, or encourage them to do so.
>
> We are not steering or encouraging users to do any thing by displaying
> the source url of the tarball, 

That's an interpretation of it.  I think that point deserves a
discussion on  mailing list, before
including such change in Guix UI.

For some background on the 'guix build --source' issue, Please read the
full thread on
https://lists.nongnu.org/archive/html/gnu-linux-libre/2013-09/msg1.html.

>we are merely providing factual non-opinionated information.

IMO, Distributing software is always opinionated.  :)

-- 
Mathieu Lirzin



Re: [PATCH] gnu: perl-io-socket-ssl: Add IDN support.

2016-08-07 Thread ng0
John Darrington  writes:

> On Sun, Jul 24, 2016 at 12:05:35PM -0400, Leo Famulari wrote:
>  On Sun, Jul 24, 2016 at 04:08:20PM +0300, Efraim Flashner wrote:
>  > On Sun, Jul 24, 2016 at 09:08:05AM +, ng0 wrote:
>  > > Efraim Flashner  writes:
>  > > > LGTM!
>  > > 
>  > > What does this mean? LetsGetThisMerged?
>  > 
>  > Yeah
>  
>  I thought it meant Looks Good To Me, although yours works too :)
>
> I'm glad that has been explained.  I always assumed it was Lesbian Gay 
> Transgender Martian.
> J'
>

First, please don't do this.

Second, is there something left to fix or did someone push this already
and I did not notice?

thanks
-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org



Re: [PATCH] update notmuch and python bindings

2016-08-07 Thread ng0
Troy Sankey  writes:

> This patchset updates notmuch from 0.21 to 0.22.1, adds python3 bindings, and
> updates the existing python2 bindings.  The notmuch upgrade was not necessary
> for adding the python3 bindings (my primary goal) but I'm throwing it in
> because the NEWS file does not indicate any breaking change.  Also my own
> experience upgrading from 0.21 to 0.22.1 was problem-free.
>
> Troy
> From a4523503314814adea61a7fef48ea443f7d14b8c Mon Sep 17 00:00:00 2001
> From: Troy Sankey 
> Date: Sun, 7 Aug 2016 13:27:18 -0400
> Subject: [PATCH 3/3] gnu: python2-notmuch: Update to 0.22.1.
>
> ---
>  gnu/packages/mail.scm | 33 +
>  1 file changed, 1 insertion(+), 32 deletions(-)
>
> diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
> index 96537c4..57ec7c8 100644
> --- a/gnu/packages/mail.scm
> +++ b/gnu/packages/mail.scm
> @@ -560,38 +560,7 @@ and search library.")
>  (license gpl3+)))
>  
>  (define-public python2-notmuch
> -  (package
> -(name "python2-notmuch")
> -(version "0.15.2")
> -(source (origin
> -  (method url-fetch)
> -  (uri (string-append
> -
> "https://pypi.python.org/packages/source/n/notmuch/notmuch-;
> -version
> -".tar.gz"))
> -  (sha256
> -   (base32
> -"18g8701ibr153ngsz258kgcd42wqnbf9ifpqig1bijy6b0zx9xn5"
> -(build-system python-build-system)
> -(inputs `(("notmuch" ,notmuch)))
> -(arguments
> - `(#:python ,python-2
> -   #:phases (modify-phases %standard-phases
> -  (add-before
> -   'build 'set-libnotmuch-file-name
> -   (lambda* (#:key inputs #:allow-other-keys)
> - (let ((notmuch (assoc-ref inputs "notmuch")))
> -   (substitute* "notmuch/globals.py"
> - (("libnotmuch\\.so\\.[0-9]")
> -  (string-append notmuch "/lib/libnotmuch.so.4")))
> -   #t
> -   #:tests? #f))  ;no "test" target
> -(home-page "http://notmuchmail.org/;)
> -(synopsis "Python bindings of the Notmuch mail indexing library")
> -(description
> - "This package provides Python bindings to use the Notmuch mail indexing
> -and search library.")
> -(license gpl3+)))
> +  (package-with-python2 python-notmuch))
>  
>  (define-public getmail
>(package
> -- 
> 2.1.4
>
> From b3c53dec33e35d554e4a30de108477bc4fbe932f Mon Sep 17 00:00:00 2001
> From: Troy Sankey 
> Date: Sun, 7 Aug 2016 13:26:30 -0400
> Subject: [PATCH 2/3] gnu: Add python-notmuch
>
> ---
>  gnu/packages/mail.scm | 42 ++
>  1 file changed, 42 insertions(+)
>
> diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
> index c58e5f5..96537c4 100644
> --- a/gnu/packages/mail.scm
> +++ b/gnu/packages/mail.scm
> @@ -517,6 +517,48 @@ ing, and tagging large collections of email messages.")
>  useful for email address completion.")
>  (license license:expat)))
>  
> +(define-public python-notmuch
> +  (package
> +(name "python-notmuch")
> +(version "0.22.1")
> +(source (origin
> +  (method url-fetch)
> +  ; notmuch python bindings are now unavailable on pypi.  The
> +  ; bindings are distributed via the notmuch release tarball.

One line comments are preceeded by two ";", like you applied further down.

> +  (uri (string-append
> +"https://notmuchmail.org/releases/notmuch-;
> +version
> +".tar.gz"))
> +  (sha256
> +   (base32
> +"0jwpda3q023dn3sp41n8648951i7iagfv8zzpriv7hpkjivlafg7"
> +(build-system python-build-system)
> +(inputs `(("notmuch" ,notmuch)))
> +(arguments
> + `(#:tests? #f  ;; no "test" target

And this comment should be: ; no "test" target

> +   #:phases
> +   (modify-phases %standard-phases
> + ;; this python package lives in a subdirectory of the notmuch source
> + ;; tree, so chdir into it before building:
> + (add-before 'build 'chdir
> +   (lambda* (#:key inputs outputs #:allow-other-keys)
> + (chdir "bindings/python")))
> + ;; make sure the correct notmuch shared library gets loaded:
> + (add-before
> +   'build 'set-libnotmuch-file-name
> +   (lambda* (#:key inputs #:allow-other-keys)
> + (let ((notmuch (assoc-ref inputs "notmuch")))
> +   (substitute* "notmuch/globals.py"
> + (("libnotmuch\\.so\\.")
> +  (string-append notmuch "/lib/libnotmuch.so.")))
> +   #t))
> +(home-page "http://notmuchmail.org/;)
> +(synopsis "Python bindings of the Notmuch mail indexing library")
> +

Re: [PATCH] python-kivy and Adobe source-code-pro font

2016-08-07 Thread Jelle Licht

Dylan Jeffers  writes:

> Hi all,
>
Hello Dylan,

Thanks for this patch! I love the source-code-pro font :).

> First patch to guix-devel; tried my best to conform to the guidelines.

Guix (usually) has a one commit per change policy. Contributions in guix
usually follow a specific format. You might want to review the
guidelines as specified in the manual, which one can find online or by
executing
  `info -f doc/guix.info "(guix) Contributing"`
in a guix git checkout. 
> Couldn't fix some "abiguous package" issues with
> font-adobe-source-code-pro package. Let me know if someone finds a
> solution.

I am not quite sure what "ambiguous package" issues you are talking
about. Are you referring to "collision encountered" warnings?


I added your patch inline with some observations;
> From db8338214f57249f7f513d9b27b6f31ae6cea345 Mon Sep 17 00:00:00 2001
> From: Dylan Jeffers 
> Date: Fri, 5 Aug 2016 18:37:34 -0700
> Subject: [PATCH] Add python-kivy and adobe source-code-pro font

Guix follows the CHANGELOG[0] format for commit messages. You can check the
commit history for examples of how to phrase certain common changes.

> 
> ---
>  gnu/packages/fonts.scm  | 51 
> +
>  gnu/packages/python.scm | 51 
> +
>  2 files changed, 102 insertions(+)
> 
> diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
> index 9b2281a..fa8420e 100644
> --- a/gnu/packages/fonts.scm
> +++ b/gnu/packages/fonts.scm
> @@ -414,6 +414,55 @@ The Liberation Fonts are sponsored by Red Hat.")
>  for long (8 and more hours per day) work with computers.")
>  (license license:silofl1.1)))
>  
> +(define-public font-adobe-source-code-pro
> +  (package
> +(name "font-adobe-source-code-pro")
> +(version "2.030")
> +(source (origin
> +  (method url-fetch)
> +  (uri (string-append
> +"https://github.com/adobe-fonts/source-code-pro/archive/;
> +version "R-ro/1.050R-it.tar.gz"))
> +  (sha256
> +   (base32
> +"0arhhsf3i7ss39ykn73d1j8k4n8vx7115xph6jwkd970p1cxvr54"
> +(build-system trivial-build-system)
> +(arguments
> + `(#:modules ((guix build utils))
> +   #:builder
> + (begin
> +   (use-modules (guix build utils))
> +   (let ((tar  (string-append (assoc-ref %build-inputs
> + "tar")
> +  "/bin/tar"))
> + (PATH (string-append (assoc-ref %build-inputs
> + "gzip")
> +  "/bin"))
> + (font-dir (string-append
> +%output "/share/fonts/truetype")))
> + (setenv "PATH" PATH)
> + (system* tar "xvf" (assoc-ref %build-inputs "source"))
> + (mkdir-p font-dir)
> + (chdir (string-append "source-code-pro-" ,version
> +   "R-ro-1.050R-it/TTF/"))
> + (for-each (lambda (ttf)
> + (copy-file ttf
> +(string-append font-dir "/"
> +   (basename ttf
> +   (find-files "." "\\.ttf$"))
Here you install all the ttf files ...
> +(native-inputs
> + `(("gzip" ,gzip)
> +   ("tar" ,tar)))
> +(home-page "https://adobe-fonts.github.io/source-code-pro/;)
> +(synopsis "Source-Code-Pro fonts")
> +(description
> + "Source Code Pro is a set of OpenType fonts that have been designed
> +to work well in user interface (UI) environments.  In addition to a
> +functional OpenType font, this open source project provides all of the
> +source files that were used to build this OpenType font by using the
> +AFDKO makeotf tool.")
... and here you mention the source of these ttf files also being
available in the package (which you do not seem to install). Best case
scenario would be if we can generate the ttf files ourselves from these
sources. I had a brief look at AFDKO, and IMHO the build procedure seems
quite complicated. Right now, I would remove the part about the source
files and AFDKO from the description.

> +(license license:silofl1.1)))
> +
>  (define-public font-adobe-source-han-sans
>(package
>  (name "font-adobe-source-han-sans")
> @@ -865,3 +914,5 @@ powerline support.")
>  (license (license:x11-style
>"https://github.com/chrissimpkins/Hack/blob/master/LICENSE.md;
>"Hack Open Font License v2.0"
> +
> +
These added newlines seem superfluous

> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 470bad8..2cdc398 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -88,10 +88,15 @@
>#:use-module (gnu 

Re: [PATCH] update notmuch and python bindings

2016-08-07 Thread ng0
Troy Sankey  writes:

> Quoting ng0 (2016-08-07 15:29:34)
>> >  (inputs
>> > - `(("emacs" ,emacs)
>> > -   ("glib" ,glib)
>> > + `(("glib" ,glib)
>>
>> Why is emacs removed?
>
> Please see the commit message :)
>
> Of course I could be misunderstanding something, but it does build
> successfully.  I do not normally use emacs, so I was not able to test
> this particular change.
>
> Troy

Ah, sorry.
I don't want to mix up my notmuch and the review, and I'll be occupied
until tuesday night, so someone who does not rely on a functional
notmuch should review if it works correctly. I find it weird that the
input is dropped.
Maybe I should read the release notes.
-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org



Re: [PATCH] ui: 'package->recutils' serializes the source field.

2016-08-07 Thread David Craven
Quoting FSDG:
A free system distribution must not steer users towards obtaining any
nonfree information for practical use, or encourage them to do so.

We are not steering or encouraging users to do any thing by displaying
the source url of the tarball, we are merely providing factual
non-opinionated information. But I guess we aren't telling the full
story and should tell the user that we made post download
modifications to the tarball to comply with the free software
distribution guidelines.



Re: [PATCH] update notmuch and python bindings

2016-08-07 Thread Troy Sankey
Quoting ng0 (2016-08-07 15:29:34)
> >  (inputs
> > - `(("emacs" ,emacs)
> > -   ("glib" ,glib)
> > + `(("glib" ,glib)
>
> Why is emacs removed?

Please see the commit message :)

Of course I could be misunderstanding something, but it does build
successfully.  I do not normally use emacs, so I was not able to test
this particular change.

Troy



Re: [PATCH] update notmuch and python bindings

2016-08-07 Thread ng0
Hi,

Troy Sankey  writes:

> This patchset updates notmuch from 0.21 to 0.22.1, adds python3 bindings, and
> updates the existing python2 bindings.  The notmuch upgrade was not necessary
> for adding the python3 bindings (my primary goal) but I'm throwing it in
> because the NEWS file does not indicate any breaking change.  Also my own
> experience upgrading from 0.21 to 0.22.1 was problem-free.

thanks for the patches. I only have a short question, inlined below.

>
> From 1b98630890e543eae0dbfbf3dc38b4a26535a003 Mon Sep 17 00:00:00 2001
> From: Troy Sankey 
> Date: Sun, 7 Aug 2016 13:21:28 -0400
> Subject: [PATCH 1/3] gnu: notmuch: Update to 0.22.1.
>
> This also removes the emacs input.  Quote from the notmuch NEWS file:
>
>   Drop dependency on "pkg-config emacs".
> ---
>  gnu/packages/mail.scm | 7 +++
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
> index 28978a8..c58e5f5 100644
> --- a/gnu/packages/mail.scm
> +++ b/gnu/packages/mail.scm
> @@ -436,14 +436,14 @@ attachments, create new maildirs, and so on.")
>  (define-public notmuch
>(package
>  (name "notmuch")
> -(version "0.21")
> +(version "0.22.1")
>  (source (origin
>(method url-fetch)
>(uri (string-append "https://notmuchmail.org/releases/notmuch-;
>version ".tar.gz"))
>(sha256
> (base32
> -"1cr53rbpkcy3pvrmhbg2gq7sjpwb0c8xd7a4zhzxbiv8s7z8yvyh"
> +"0jwpda3q023dn3sp41n8648951i7iagfv8zzpriv7hpkjivlafg7"
>  (build-system gnu-build-system)
>  (arguments
>   '(#:tests? #f ;; FIXME: 662 tests; 168 fail and 99 are skipped
> @@ -464,8 +464,7 @@ attachments, create new maildirs, and so on.")
> ("python-sphinx" ,python2-sphinx)
> ("bash-completion" ,bash-completion)))
>  (inputs
> - `(("emacs" ,emacs)
> -   ("glib" ,glib)
> + `(("glib" ,glib)

Why is emacs removed?

> ("gmime" ,gmime)
> ("talloc" ,talloc)
> ("xapian" ,xapian)
> -- 
> 2.1.4
>

-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org



[PATCH] update notmuch and python bindings

2016-08-07 Thread Troy Sankey
This patchset updates notmuch from 0.21 to 0.22.1, adds python3 bindings, and
updates the existing python2 bindings.  The notmuch upgrade was not necessary
for adding the python3 bindings (my primary goal) but I'm throwing it in
because the NEWS file does not indicate any breaking change.  Also my own
experience upgrading from 0.21 to 0.22.1 was problem-free.

Troy
From a4523503314814adea61a7fef48ea443f7d14b8c Mon Sep 17 00:00:00 2001
From: Troy Sankey 
Date: Sun, 7 Aug 2016 13:27:18 -0400
Subject: [PATCH 3/3] gnu: python2-notmuch: Update to 0.22.1.

---
 gnu/packages/mail.scm | 33 +
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 96537c4..57ec7c8 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -560,38 +560,7 @@ and search library.")
 (license gpl3+)))
 
 (define-public python2-notmuch
-  (package
-(name "python2-notmuch")
-(version "0.15.2")
-(source (origin
-  (method url-fetch)
-  (uri (string-append
-"https://pypi.python.org/packages/source/n/notmuch/notmuch-;
-version
-".tar.gz"))
-  (sha256
-   (base32
-"18g8701ibr153ngsz258kgcd42wqnbf9ifpqig1bijy6b0zx9xn5"
-(build-system python-build-system)
-(inputs `(("notmuch" ,notmuch)))
-(arguments
- `(#:python ,python-2
-   #:phases (modify-phases %standard-phases
-  (add-before
-   'build 'set-libnotmuch-file-name
-   (lambda* (#:key inputs #:allow-other-keys)
- (let ((notmuch (assoc-ref inputs "notmuch")))
-   (substitute* "notmuch/globals.py"
- (("libnotmuch\\.so\\.[0-9]")
-  (string-append notmuch "/lib/libnotmuch.so.4")))
-   #t
-   #:tests? #f))  ;no "test" target
-(home-page "http://notmuchmail.org/;)
-(synopsis "Python bindings of the Notmuch mail indexing library")
-(description
- "This package provides Python bindings to use the Notmuch mail indexing
-and search library.")
-(license gpl3+)))
+  (package-with-python2 python-notmuch))
 
 (define-public getmail
   (package
-- 
2.1.4

From b3c53dec33e35d554e4a30de108477bc4fbe932f Mon Sep 17 00:00:00 2001
From: Troy Sankey 
Date: Sun, 7 Aug 2016 13:26:30 -0400
Subject: [PATCH 2/3] gnu: Add python-notmuch

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

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index c58e5f5..96537c4 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -517,6 +517,48 @@ ing, and tagging large collections of email messages.")
 useful for email address completion.")
 (license license:expat)))
 
+(define-public python-notmuch
+  (package
+(name "python-notmuch")
+(version "0.22.1")
+(source (origin
+  (method url-fetch)
+  ; notmuch python bindings are now unavailable on pypi.  The
+  ; bindings are distributed via the notmuch release tarball.
+  (uri (string-append
+"https://notmuchmail.org/releases/notmuch-;
+version
+".tar.gz"))
+  (sha256
+   (base32
+"0jwpda3q023dn3sp41n8648951i7iagfv8zzpriv7hpkjivlafg7"
+(build-system python-build-system)
+(inputs `(("notmuch" ,notmuch)))
+(arguments
+ `(#:tests? #f  ;; no "test" target
+   #:phases
+   (modify-phases %standard-phases
+ ;; this python package lives in a subdirectory of the notmuch source
+ ;; tree, so chdir into it before building:
+ (add-before 'build 'chdir
+   (lambda* (#:key inputs outputs #:allow-other-keys)
+ (chdir "bindings/python")))
+ ;; make sure the correct notmuch shared library gets loaded:
+ (add-before
+   'build 'set-libnotmuch-file-name
+   (lambda* (#:key inputs #:allow-other-keys)
+ (let ((notmuch (assoc-ref inputs "notmuch")))
+   (substitute* "notmuch/globals.py"
+ (("libnotmuch\\.so\\.")
+  (string-append notmuch "/lib/libnotmuch.so.")))
+   #t))
+(home-page "http://notmuchmail.org/;)
+(synopsis "Python bindings of the Notmuch mail indexing library")
+(description
+ "This package provides Python bindings to use the Notmuch mail indexing
+and search library.")
+(license gpl3+)))
+
 (define-public python2-notmuch
   (package
 (name "python2-notmuch")
-- 
2.1.4

From 1b98630890e543eae0dbfbf3dc38b4a26535a003 Mon Sep 17 00:00:00 2001
From: Troy Sankey 
Date: Sun, 7 Aug 2016 13:21:28 -0400
Subject: [PATCH 1/3] gnu: notmuch: 

[PATCH]

2016-08-07 Thread ng0
This fixes the request to honor previous copyright holders. I noticed
for at least dwm.scm -> suckless.scm this was not considered, so I have
to assume this has not been looked at more carefully.

A single commit on top of all the suckless.scm moves will be okay I
hope. Can someone review if I got a name, email or location wrong?

I think the commit message is not perfect but I don't know how to
express it otherwise.

>From c3c3bf3042215d896f3f314aa2f5674977cf8440 Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sun, 7 Aug 2016 16:05:33 +
Subject: [PATCH] gnu: Move Copyrights of contributors for st, dmenu, dwm and
 slock.

* gnu/packages/xdisorg.scm: Add slock copyrights.
* gnu/packages/terminals.scm: Add st copyrights.
* gnu/packages/wm.scm: Add dmenu, dwm copyrights.
---
 gnu/packages/suckless.scm  | 3 ---
 gnu/packages/terminals.scm | 1 +
 gnu/packages/wm.scm| 2 ++
 gnu/packages/xdisorg.scm   | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 7fe3403..ec5c7d8 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -1,8 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Cyril Roelandt 
-;;; Copyright © 2015 Amirouche Boubekki 
 ;;; Copyright © 2016 Al McElrath 
-;;; Copyright © 2016 ng0 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 02cb9fa..a832171 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 Efraim Flashner 
 ;;; Copyright © 2016 Mckinley Olsen 
 ;;; Copyright © 2016 Alex Griffin 
+;;; Coypright © 2015 amz3 
 ;;; Copyright © 2016 ng0 
 ;;;
 ;;; This file is part of GNU Guix.
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index b03133f..4ecba5c 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -10,6 +10,8 @@
 ;;; Copyright © 2016 Carlo Zancanaro 
 ;;; Copyright © 2016 Ludovic Courtès 
 ;;; Coypright © 2016 ng0 
+;;; Coypright © 2014 Sou Bunnbu 
+;;; Copyright © 2013 Cyril Roelandt 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 18b8cb8..531f419 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2016 Leo Famulari 
 ;;; Copyright © 2016 Alex Kost 
 ;;; Coypright © 2016 ng0 
+;;; Copyright © 2014 Tomáš Čech 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
-- 
2.9.2


-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org


Re: [PATCH] gnu: st: Mov to terminals.scm.

2016-08-07 Thread Mathieu Lirzin
ng0  writes:

> Mathieu Lirzin  writes:
>
>> I don't have an opinion on the move, however when moving packages across
>> modules your have to keep track of the copyrights.
>
> Oh... Okay, I forgot about that, I never moved packages. Thanks for
> pointing it out to me.
> I know that my personal copyright was limited to the st copyright in
> suckless.
> I moved other packages, should I look at the git log of suckless.scm and
> add the copyrights which apply?

Yes, I think so.

Thank you.

--
Mathieu Lirzin



Re: [PATCH] gnu: st: Mov to terminals.scm.

2016-08-07 Thread ng0
Mathieu Lirzin  writes:

> Hi,
>
> I don't have an opinion on the move, however when moving packages across
> modules your have to keep track of the copyrights.

Oh... Okay, I forgot about that, I never moved packages. Thanks for
pointing it out to me.
I know that my personal copyright was limited to the st copyright in
suckless.
I moved other packages, should I look at the git log of suckless.scm and
add the copyrights which apply?

> In this case Amirouche Boubekki  copyright should be
> moved from (gnu packages suckless) to (gnu packages terminals).
>
> ng0  writes:
>
>> From 3864654025329367b6f87ccfb12a4ff789d5155a Mon Sep 17 00:00:00 2001
>> From: ng0 
>> Date: Sun, 7 Aug 2016 12:30:06 +
>> Subject: [PATCH] gnu: st: Move to terminals.scm.
>>
>> * gnu/packages/suckless.scm (st): Move from here ...
>> * gnu/packages/terminals.scm (st): ... to here.
>
> nitpick:  
>
> --8<---cut here---start->8---
> gnu: st: Move to (gnu packages terminals).
>
> * gnu/packages/suckless.scm (st): Move to ...
> * gnu/packages/terminals.scm (st): ... here.
> --8<---cut here---end--->8---
>
>> ---
>>  gnu/packages/suckless.scm  | 50 +---
>>  gnu/packages/terminals.scm | 52 
>> +-
>>  2 files changed, 52 insertions(+), 50 deletions(-)
>>
>> diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
>> index 8732a84..16e9146 100644
>> --- a/gnu/packages/suckless.scm
>> +++ b/gnu/packages/suckless.scm
>> @@ -28,10 +28,8 @@
>>#:use-module (gnu packages)
>>#:use-module (gnu packages gnome)
>>#:use-module (gnu packages xorg)
>> -  #:use-module (gnu packages fonts)
>>#:use-module (gnu packages pkg-config)
>> -  #:use-module (gnu packages webkit)
>> -  #:use-module (gnu packages fontutils))
>> +  #:use-module (gnu packages webkit))
>>  
>>  (define-public dwm
>>(package
>> @@ -126,52 +124,6 @@ numbers of user-defined menu items efficiently.")
>>   "Simple X session lock with trivial feedback on password entry.")
>>  (license license:x11)))
>>  
>> -(define-public st
>> -  (package
>> -(name "st")
>> -(version "0.6")
>> -(source
>> - (origin
>> -   (method url-fetch)
>> -   (uri (string-append "http://dl.suckless.org/st/st-;
>> -   version ".tar.gz"))
>> -   (sha256
>> -(base32
>> - "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"
>> -(build-system gnu-build-system)
>> -(arguments
>> - '(#:tests? #f ; no tests
>> -   #:make-flags (list "CC=gcc"
>> -  (string-append "PREFIX=" %output))
>> -   #:phases
>> -   (modify-phases %standard-phases
>> - (delete 'configure)
>> - (add-after 'unpack 'inhibit-terminfo-install
>> -(lambda _
>> -  (substitute* "Makefile"
>> -(("\t@tic -s st.info") ""))
>> -  #t)
>> -(inputs
>> - `(("libx11" ,libx11)
>> -   ("libxft" ,libxft)
>> -   ("libxcomposite" ,libxcomposite)
>> -   ("compositeproto" ,compositeproto)
>> -   ("libxext" ,libxext)
>> -   ("xextproto" ,xextproto)
>> -   ("libxrender" ,libxrender)
>> -   ("fontconfig" ,fontconfig)
>> -   ("freetype" ,freetype)
>> -   ("font-liberation" ,font-liberation)))
>> -(native-inputs `(("pkg-config" ,pkg-config)))
>> -(home-page "http://st.suckless.org/;)
>> -(synopsis "Simple terminal emulator")
>> -(description
>> - "St implements a simple and lightweight terminal emulator.  It
>> -implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
>> -antialiased fonts (using fontconfig), fallback fonts, resizing, and line
>> -drawing.")
>> -(license license:x11)))
>> -
>>  (define-public surf
>>(package
>>  (name "surf")
>> diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
>> index 98f0060..02cb9fa 100644
>> --- a/gnu/packages/terminals.scm
>> +++ b/gnu/packages/terminals.scm
>> @@ -2,6 +2,7 @@
>>  ;;; Copyright © 2015 Efraim Flashner 
>>  ;;; Copyright © 2016 Mckinley Olsen 
>>  ;;; Copyright © 2016 Alex Griffin 
>> +;;; Copyright © 2016 ng0 
>>  ;;;
>>  ;;; This file is part of GNU Guix.
>>  ;;;
>> @@ -36,7 +37,10 @@
>>#:use-module (gnu packages wm)
>>#:use-module (gnu packages ncurses)
>>#:use-module (gnu packages gtk)
>> -  #:use-module (gnu packages gnome))
>> +  #:use-module (gnu packages gnome)
>> +  #:use-module (gnu packages xorg)
>> +  #:use-module (gnu packages fonts)
>> +  #:use-module (gnu packages fontutils))
>>  
>>  (define-public tilda
>>(package
>> @@ -159,3 +163,49 @@ insert mode and command mode where keybindings have 
>> 

Re: [PATCH] gnu: dwm: Shorten the description.

2016-08-07 Thread ng0
Hi,

Alex Kost  writes:

> ng0 (2016-08-07 15:02 +0300) wrote:
>
>> This description was as long as the package itself.  We should not do
>> this, this is enough. Whoever wants to read up on dwm and tiling wm in
>> general can read about it in dwm documentation and other twms.
>
> I agree, so if there are no objections, I'm going to commit it.
>
> ng0, IIUC you don't have commit access to the guix git repo, right?
> Ludovic is on vacations, but if you are willing to have it, I think the
> other project admins wouldn't mind to add you to the Guix group
> .
>
> -- 
> Alex

Thanks Alex.

I had an exchange of messages with Ludovic, where some of the people
with commit access were also CC'd and we (only Ludovic and myself) came
to agree that my work is good but some further mentoring is needed until
I can work completely on my own.

With that in mind, I'd like to have a feedback on what's there to
improve.
I can recall only recall some commit messages which were not completely
correct or otherwise not to the liking of the person who pushed them.

I'd prefer to have feedback first, and opinions of other people with
commit access as I value opinion over just giving access.

Grothoff over at GNUnet handles this differently than Ludovic it seems,
they prefer to give access to regular contributors and fix if a commit
breaks something (of course you shouldn't commit breakage in the first
place if you can avoid it), to take off the annoying task for commiting
trivial fixes in the names of other people. I guess that's why you ask
me, I start to commit so much that with still no review order/framework
in place commit access would make this easier. QA will still apply, but
commiting is also some minutes of work for the person who does it.
-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org



Re: [PATCH] gnu: dwm: Shorten the description.

2016-08-07 Thread Alex Kost
ng0 (2016-08-07 15:02 +0300) wrote:

> This description was as long as the package itself.  We should not do
> this, this is enough. Whoever wants to read up on dwm and tiling wm in
> general can read about it in dwm documentation and other twms.

I agree, so if there are no objections, I'm going to commit it.

ng0, IIUC you don't have commit access to the guix git repo, right?
Ludovic is on vacations, but if you are willing to have it, I think the
other project admins wouldn't mind to add you to the Guix group
.

-- 
Alex



Re: [PATCH] gnu: Add ii.

2016-08-07 Thread Alex Kost
ng0 (2016-08-07 14:37 +0300) wrote:

> From 76d9f586822ad0a33a12f372715de878d769268b Mon Sep 17 00:00:00 2001
> From: ng0 
> Date: Sun, 7 Aug 2016 11:35:34 +
> Subject: [PATCH] gnu: Add ii.
>
> * gnu/packages/irc.scm (ii): New variable.

Applied as 99840fbbee260354d134031ae69e6e94b0f39d48, thanks!

-- 
Alex



Re: [PATCH] Update girara to 0.2.6 (pre-requirement for zathura update)

2016-08-07 Thread Alex Kost
ng0 (2016-08-07 13:22 +0300) wrote:

> From 91c1327d89c5d746c03ec8ce004317dfd0a63c88 Mon Sep 17 00:00:00 2001
> From: ng0 
> Date: Sun, 7 Aug 2016 10:05:56 +
> Subject: [PATCH 2/6] gnu: girara: Update to 0.2.6.
>
> * gnu/packages/gtk.scm (girara): Update to 0.2.6.

I pushed this and the other updates of zathura packages, thanks!

-- 
Alex



Re: [PATCH] gnu: st: Mov to terminals.scm.

2016-08-07 Thread Mathieu Lirzin
Hi,

I don't have an opinion on the move, however when moving packages across
modules your have to keep track of the copyrights.

In this case Amirouche Boubekki  copyright should be
moved from (gnu packages suckless) to (gnu packages terminals).

ng0  writes:

> From 3864654025329367b6f87ccfb12a4ff789d5155a Mon Sep 17 00:00:00 2001
> From: ng0 
> Date: Sun, 7 Aug 2016 12:30:06 +
> Subject: [PATCH] gnu: st: Move to terminals.scm.
>
> * gnu/packages/suckless.scm (st): Move from here ...
> * gnu/packages/terminals.scm (st): ... to here.

nitpick:  

--8<---cut here---start->8---
gnu: st: Move to (gnu packages terminals).

* gnu/packages/suckless.scm (st): Move to ...
* gnu/packages/terminals.scm (st): ... here.
--8<---cut here---end--->8---

> ---
>  gnu/packages/suckless.scm  | 50 +---
>  gnu/packages/terminals.scm | 52 
> +-
>  2 files changed, 52 insertions(+), 50 deletions(-)
>
> diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
> index 8732a84..16e9146 100644
> --- a/gnu/packages/suckless.scm
> +++ b/gnu/packages/suckless.scm
> @@ -28,10 +28,8 @@
>#:use-module (gnu packages)
>#:use-module (gnu packages gnome)
>#:use-module (gnu packages xorg)
> -  #:use-module (gnu packages fonts)
>#:use-module (gnu packages pkg-config)
> -  #:use-module (gnu packages webkit)
> -  #:use-module (gnu packages fontutils))
> +  #:use-module (gnu packages webkit))
>  
>  (define-public dwm
>(package
> @@ -126,52 +124,6 @@ numbers of user-defined menu items efficiently.")
>   "Simple X session lock with trivial feedback on password entry.")
>  (license license:x11)))
>  
> -(define-public st
> -  (package
> -(name "st")
> -(version "0.6")
> -(source
> - (origin
> -   (method url-fetch)
> -   (uri (string-append "http://dl.suckless.org/st/st-;
> -   version ".tar.gz"))
> -   (sha256
> -(base32
> - "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"
> -(build-system gnu-build-system)
> -(arguments
> - '(#:tests? #f ; no tests
> -   #:make-flags (list "CC=gcc"
> -  (string-append "PREFIX=" %output))
> -   #:phases
> -   (modify-phases %standard-phases
> - (delete 'configure)
> - (add-after 'unpack 'inhibit-terminfo-install
> -(lambda _
> -  (substitute* "Makefile"
> -(("\t@tic -s st.info") ""))
> -  #t)
> -(inputs
> - `(("libx11" ,libx11)
> -   ("libxft" ,libxft)
> -   ("libxcomposite" ,libxcomposite)
> -   ("compositeproto" ,compositeproto)
> -   ("libxext" ,libxext)
> -   ("xextproto" ,xextproto)
> -   ("libxrender" ,libxrender)
> -   ("fontconfig" ,fontconfig)
> -   ("freetype" ,freetype)
> -   ("font-liberation" ,font-liberation)))
> -(native-inputs `(("pkg-config" ,pkg-config)))
> -(home-page "http://st.suckless.org/;)
> -(synopsis "Simple terminal emulator")
> -(description
> - "St implements a simple and lightweight terminal emulator.  It
> -implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
> -antialiased fonts (using fontconfig), fallback fonts, resizing, and line
> -drawing.")
> -(license license:x11)))
> -
>  (define-public surf
>(package
>  (name "surf")
> diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
> index 98f0060..02cb9fa 100644
> --- a/gnu/packages/terminals.scm
> +++ b/gnu/packages/terminals.scm
> @@ -2,6 +2,7 @@
>  ;;; Copyright © 2015 Efraim Flashner 
>  ;;; Copyright © 2016 Mckinley Olsen 
>  ;;; Copyright © 2016 Alex Griffin 
> +;;; Copyright © 2016 ng0 
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -36,7 +37,10 @@
>#:use-module (gnu packages wm)
>#:use-module (gnu packages ncurses)
>#:use-module (gnu packages gtk)
> -  #:use-module (gnu packages gnome))
> +  #:use-module (gnu packages gnome)
> +  #:use-module (gnu packages xorg)
> +  #:use-module (gnu packages fonts)
> +  #:use-module (gnu packages fontutils))
>  
>  (define-public tilda
>(package
> @@ -159,3 +163,49 @@ insert mode and command mode where keybindings have 
> different functions.")
>  Forget screen recording apps and blurry video.  Enjoy a lightweight, purely
>  text-based approach to terminal recording.")
>  (license license:gpl3)))
> +
> +(define-public st
> +  (package
> +(name "st")
> +(version "0.6")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (string-append "http://dl.suckless.org/st/st-;
> +   version ".tar.gz"))
> +   (sha256
> +  

Re: [PATCH] ui: 'package->recutils' serializes the source field.

2016-08-07 Thread Mathieu Lirzin
David Craven  writes:

> I meant the little -s flag...
>
> -s, --search=REGEXPsearch in synopsis and description using REGEXP
>
> and I meant download, build and run manually outside of guix.
>
> It still sounds like that's what you are saying... ;-)

oops my bad.  So your summary of what I was saying was indeed correct.

-- 
Mathieu Lirzin



Re: [PATCH] (3 patches): move dwm+dmenu to wm, move slock to xdisorg.

2016-08-07 Thread ng0
Iforgot to mention: A requirement is the patch which changes the dwm
description, sent before this series.
Logically moving and changing description are not one and the same
thing, so I separated them.

ng0  writes:

> With these 3 moved to more logical places, only surf remains. We keep
> web browsers in sepearate places so far, that's nothing I want to work
> on today.
> A grep for "gnu packages suckless" only showed the
> gnu/services/desktop.scm calling it, which seems to be slock, I changed
> that in patch which moves slock to xdisorg.
> Anyone got ideas for what to do with package surf?
>
> From 0260bba10303e9c24302b5d3fd4ba1e0d1e2303f Mon Sep 17 00:00:00 2001
> From: ng0 
> Date: Sun, 7 Aug 2016 12:52:18 +
> Subject: [PATCH 1/3] gnu: dwm: Move to wm.scm.
>
> * gnu/packages/suckless.scm (dwm): Move from here ...
> * gnu/packages/wm.scm (dwm): ... to here.
> ---
>  gnu/packages/suckless.scm | 38 --
>  gnu/packages/wm.scm   | 39 +++
>  2 files changed, 39 insertions(+), 38 deletions(-)
>
> diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
> index 16e9146..9ec6dcf 100644
> --- a/gnu/packages/suckless.scm
> +++ b/gnu/packages/suckless.scm
> @@ -31,44 +31,6 @@
>#:use-module (gnu packages pkg-config)
>#:use-module (gnu packages webkit))
>  
> -(define-public dwm
> -  (package
> -(name "dwm")
> -(version "6.0")
> -(source (origin
> - (method url-fetch)
> - (uri (string-append "http://dl.suckless.org/dwm/dwm-;
> - version ".tar.gz"))
> - (sha256
> -  (base32 
> "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj"
> -(build-system gnu-build-system)
> -(arguments
> - `(#:tests? #f
> -   #:phases
> -   (alist-replace
> -'configure
> -(lambda _
> - (substitute* "Makefile" (("\\$\\{CC\\}") "gcc"))
> - #t)
> -(alist-replace
> - 'install
> - (lambda* (#:key outputs #:allow-other-keys)
> -  (let ((out (assoc-ref outputs "out")))
> -   (zero?
> -(system* "make" "install"
> - (string-append "DESTDIR=" out) "PREFIX="
> - %standard-phases
> -(inputs
> - `(("libx11" ,libx11)
> -   ("libxinerama" ,libxinerama)))
> -(home-page "http://dwm.suckless.org/;)
> -(synopsis "Dynamic window manager")
> -(description
> - "dwm is a dynamic window manager for X.  It manages windows in tiled,
> -monocle and floating layouts.  All of the layouts can be applied dynamically,
> -optimising the environment for the application in use and the task 
> performed.")
> -(license license:x11)))
> -
>  (define-public dmenu
>(package
>  (name "dmenu")
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index 2cc9f44..8df4a8e 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -9,6 +9,7 @@
>  ;;; Copyright © 2016 Al McElrath 
>  ;;; Copyright © 2016 Carlo Zancanaro 
>  ;;; Copyright © 2016 Ludovic Courtès 
> +;;; Coypright © 2016 ng0 
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -465,3 +466,41 @@ Windows are grouped by tags in awesome.  Each window can 
> be tagged with one or
>  more tags.  Selecting certain tags displays all windows with these tags.")
>  (license license:gpl2+)
>  (home-page "https://awesome.naquadah.org/;)))
> +
> +(define-public dwm
> +  (package
> +(name "dwm")
> +(version "6.0")
> +(source (origin
> +  (method url-fetch)
> +  (uri (string-append "http://dl.suckless.org/dwm/dwm-;
> +  version ".tar.gz"))
> +  (sha256
> +   (base32 
> "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj"
> +(build-system gnu-build-system)
> +(arguments
> + `(#:tests? #f
> +   #:phases
> +   (alist-replace
> +'configure
> +(lambda _
> +  (substitute* "Makefile" (("\\$\\{CC\\}") "gcc"))
> +  #t)
> +(alist-replace
> + 'install
> + (lambda* (#:key outputs #:allow-other-keys)
> +   (let ((out (assoc-ref outputs "out")))
> + (zero?
> +  (system* "make" "install"
> +   (string-append "DESTDIR=" out) "PREFIX="
> + %standard-phases
> +(inputs
> + `(("libx11" ,libx11)
> +   ("libxinerama" ,libxinerama)))
> +(home-page "http://dwm.suckless.org/;)
> +(synopsis "Dynamic window manager")
> +(description
> + "dwm is a dynamic window manager for X.  It manages windows in tiled,
> +monocle and floating layouts.  All of the layouts can be applied dynamically,
> +optimising the environment for the application in use and the task 
> performed.")
> +   

[PATCH] (3 patches): move dwm+dmenu to wm, move slock to xdisorg.

2016-08-07 Thread ng0
With these 3 moved to more logical places, only surf remains. We keep
web browsers in sepearate places so far, that's nothing I want to work
on today.
A grep for "gnu packages suckless" only showed the
gnu/services/desktop.scm calling it, which seems to be slock, I changed
that in patch which moves slock to xdisorg.
Anyone got ideas for what to do with package surf?

From 0260bba10303e9c24302b5d3fd4ba1e0d1e2303f Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sun, 7 Aug 2016 12:52:18 +
Subject: [PATCH 1/3] gnu: dwm: Move to wm.scm.

* gnu/packages/suckless.scm (dwm): Move from here ...
* gnu/packages/wm.scm (dwm): ... to here.
---
 gnu/packages/suckless.scm | 38 --
 gnu/packages/wm.scm   | 39 +++
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 16e9146..9ec6dcf 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -31,44 +31,6 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages webkit))
 
-(define-public dwm
-  (package
-(name "dwm")
-(version "6.0")
-(source (origin
- (method url-fetch)
- (uri (string-append "http://dl.suckless.org/dwm/dwm-;
- version ".tar.gz"))
- (sha256
-  (base32 "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj"
-(build-system gnu-build-system)
-(arguments
- `(#:tests? #f
-   #:phases
-   (alist-replace
-'configure
-(lambda _
- (substitute* "Makefile" (("\\$\\{CC\\}") "gcc"))
- #t)
-(alist-replace
- 'install
- (lambda* (#:key outputs #:allow-other-keys)
-  (let ((out (assoc-ref outputs "out")))
-   (zero?
-(system* "make" "install"
- (string-append "DESTDIR=" out) "PREFIX="
- %standard-phases
-(inputs
- `(("libx11" ,libx11)
-   ("libxinerama" ,libxinerama)))
-(home-page "http://dwm.suckless.org/;)
-(synopsis "Dynamic window manager")
-(description
- "dwm is a dynamic window manager for X.  It manages windows in tiled,
-monocle and floating layouts.  All of the layouts can be applied dynamically,
-optimising the environment for the application in use and the task performed.")
-(license license:x11)))
-
 (define-public dmenu
   (package
 (name "dmenu")
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 2cc9f44..8df4a8e 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2016 Al McElrath 
 ;;; Copyright © 2016 Carlo Zancanaro 
 ;;; Copyright © 2016 Ludovic Courtès 
+;;; Coypright © 2016 ng0 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -465,3 +466,41 @@ Windows are grouped by tags in awesome.  Each window can be tagged with one or
 more tags.  Selecting certain tags displays all windows with these tags.")
 (license license:gpl2+)
 (home-page "https://awesome.naquadah.org/;)))
+
+(define-public dwm
+  (package
+(name "dwm")
+(version "6.0")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "http://dl.suckless.org/dwm/dwm-;
+  version ".tar.gz"))
+  (sha256
+   (base32 "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f
+   #:phases
+   (alist-replace
+'configure
+(lambda _
+  (substitute* "Makefile" (("\\$\\{CC\\}") "gcc"))
+  #t)
+(alist-replace
+ 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+   (let ((out (assoc-ref outputs "out")))
+ (zero?
+  (system* "make" "install"
+   (string-append "DESTDIR=" out) "PREFIX="
+ %standard-phases
+(inputs
+ `(("libx11" ,libx11)
+   ("libxinerama" ,libxinerama)))
+(home-page "http://dwm.suckless.org/;)
+(synopsis "Dynamic window manager")
+(description
+ "dwm is a dynamic window manager for X.  It manages windows in tiled,
+monocle and floating layouts.  All of the layouts can be applied dynamically,
+optimising the environment for the application in use and the task performed.")
+(license license:x11)))
-- 
2.9.2

From 65f9936b6a0a943259472c352f0c88fefad1a3bc Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sun, 7 Aug 2016 12:58:40 +
Subject: [PATCH 2/3] gnu: dmenu: Move to wm.scm.

* gnu/packages/suckless.scm (dmenu): Move from here ...
* gnu/packages/wm.scm (dmenu): ... to here.
---
 gnu/packages/suckless.scm | 28 
 gnu/packages/wm.scm   | 28 
 2 files changed, 28 insertions(+), 28 

Re: [PATCH v2] gnu: node: Update to 6.3.1.

2016-08-07 Thread Jelle Licht

Leo Famulari  writes:

> On Fri, Aug 05, 2016 at 01:02:45PM +0200, Jelle Licht wrote:
>>   ;; FIXME: These tests fail in the build container, but they 
>> don't
>>   ;; seem to be indicative of real problems in practice.
>>   (for-each delete-file
>> -   '("test/parallel/test-cluster-master-error.js"
>> +   
>> '("test/parallel/test-https-connect-address-family.js"
>> + "test/parallel/test-tls-connect-address-family.js"
>
> The file names suggest they require a network interface, which is
> unavailable in the build environment.
>
>> + "test/parallel/test-dgram-membership.js"
>> + "test/parallel/test-cluster-master-error.js"
>
> I assume the above comment about not being real problems in practice
> holds for these tests?
>
Yes, this was my conclusion. The tests either required access to a dns
service, or wanted to some things with sockets.

>> - (replace 'patch-shebangs
>> -   (lambda* (#:key outputs #:allow-other-keys #:rest all)
>> - ;; Work around .
>> - (let* ((patch  (assoc-ref %standard-phases 'patch-shebangs))
>> -(npm(string-append (assoc-ref outputs "out")
>> -   "/bin/npm"))
>> + (add-after 'patch-shebangs 'patch-npm-shebang
>> +   (lambda* (#:key outputs #:allow-other-keys)
>> + (let* ((bindir (string-append (assoc-ref outputs "out")
>> +   "/bin"))
>> +(npm(string-append bindir "/npm"))
>>  (target (readlink npm)))
>> -   (and (apply patch all)
>> -(with-directory-excursion (dirname npm)
>> -  ;; Turn NPM into a symlink to TARGET again, which 
>> 'npm'
>> -  ;; relies on for the resolution of relative file names
>> -  ;; in JS files.
>> -  (delete-file target)
>> -  (rename-file npm target)
>> -  (symlink target npm)
>> -  #t
>> +   (with-directory-excursion bindir
>> + (patch-shebang target (list bindir))
>> + #t)))
>
> Will you mention these changes in the commit message?
What do you mean by this exactly? The short of it is that a change to
the patch-shebangs phase was merged by way of the core-updates merge,
which no longer necessitated this workaround.

Thanks
- Jelle



Re: [PATCH] gnu: st: Mov to terminals.scm.

2016-08-07 Thread ng0
Hi,

I think it's pointless to have a suckless.scm which bundles all software
which just happens to follow suckless ideology/goals or be hosted
there.
That's why I did not commit ii to suckless but to irc.scm, no one will
look into suckless.scm when what they really are looking for is not
$suckless but application xy.
I try to unbundle and remove suckless.scm with the next patches.
-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org



[PATCH] gnu: st: Mov to terminals.scm.

2016-08-07 Thread ng0
From 3864654025329367b6f87ccfb12a4ff789d5155a Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sun, 7 Aug 2016 12:30:06 +
Subject: [PATCH] gnu: st: Move to terminals.scm.

* gnu/packages/suckless.scm (st): Move from here ...
* gnu/packages/terminals.scm (st): ... to here.
---
 gnu/packages/suckless.scm  | 50 +---
 gnu/packages/terminals.scm | 52 +-
 2 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 8732a84..16e9146 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -28,10 +28,8 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages xorg)
-  #:use-module (gnu packages fonts)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages webkit)
-  #:use-module (gnu packages fontutils))
+  #:use-module (gnu packages webkit))
 
 (define-public dwm
   (package
@@ -126,52 +124,6 @@ numbers of user-defined menu items efficiently.")
  "Simple X session lock with trivial feedback on password entry.")
 (license license:x11)))
 
-(define-public st
-  (package
-(name "st")
-(version "0.6")
-(source
- (origin
-   (method url-fetch)
-   (uri (string-append "http://dl.suckless.org/st/st-;
-   version ".tar.gz"))
-   (sha256
-(base32
- "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"
-(build-system gnu-build-system)
-(arguments
- '(#:tests? #f ; no tests
-   #:make-flags (list "CC=gcc"
-  (string-append "PREFIX=" %output))
-   #:phases
-   (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'inhibit-terminfo-install
-(lambda _
-  (substitute* "Makefile"
-(("\t@tic -s st.info") ""))
-  #t)
-(inputs
- `(("libx11" ,libx11)
-   ("libxft" ,libxft)
-   ("libxcomposite" ,libxcomposite)
-   ("compositeproto" ,compositeproto)
-   ("libxext" ,libxext)
-   ("xextproto" ,xextproto)
-   ("libxrender" ,libxrender)
-   ("fontconfig" ,fontconfig)
-   ("freetype" ,freetype)
-   ("font-liberation" ,font-liberation)))
-(native-inputs `(("pkg-config" ,pkg-config)))
-(home-page "http://st.suckless.org/;)
-(synopsis "Simple terminal emulator")
-(description
- "St implements a simple and lightweight terminal emulator.  It
-implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
-antialiased fonts (using fontconfig), fallback fonts, resizing, and line
-drawing.")
-(license license:x11)))
-
 (define-public surf
   (package
 (name "surf")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 98f0060..02cb9fa 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 Efraim Flashner 
 ;;; Copyright © 2016 Mckinley Olsen 
 ;;; Copyright © 2016 Alex Griffin 
+;;; Copyright © 2016 ng0 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,7 +37,10 @@
   #:use-module (gnu packages wm)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages gtk)
-  #:use-module (gnu packages gnome))
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages fonts)
+  #:use-module (gnu packages fontutils))
 
 (define-public tilda
   (package
@@ -159,3 +163,49 @@ insert mode and command mode where keybindings have different functions.")
 Forget screen recording apps and blurry video.  Enjoy a lightweight, purely
 text-based approach to terminal recording.")
 (license license:gpl3)))
+
+(define-public st
+  (package
+(name "st")
+(version "0.6")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append "http://dl.suckless.org/st/st-;
+   version ".tar.gz"))
+   (sha256
+(base32
+ "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"
+(build-system gnu-build-system)
+(arguments
+ '(#:tests? #f ; no tests
+   #:make-flags (list "CC=gcc"
+  (string-append "PREFIX=" %output))
+   #:phases
+   (modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'inhibit-terminfo-install
+   (lambda _
+ (substitute* "Makefile"
+   (("\t@tic -s st.info") ""))
+ #t)
+(inputs
+ `(("libx11" ,libx11)
+   ("libxft" ,libxft)
+   ("libxcomposite" ,libxcomposite)
+   ("compositeproto" ,compositeproto)
+   ("libxext" ,libxext)
+   ("xextproto" ,xextproto)
+   ("libxrender" ,libxrender)
+   ("fontconfig" ,fontconfig)
+   ("freetype" 

Re: [PATCH] ui: 'package->recutils' serializes the source field.

2016-08-07 Thread David Craven
> My point is that if we are giving a direct link to the non-patched
> source in our UI, the FSDG issue is the same.

Just because I can't understand the concern, doesn't necessarily
mean that it isn't a valid one...



[PATCH] gnu: dwm: Shorten the description.

2016-08-07 Thread ng0
This description was as long as the package itself.  We should not do
this, this is enough. Whoever wants to read up on dwm and tiling wm in
general can read about it in dwm documentation and other twms.

From 998375b857e807b76144571b4290610ca3e99b96 Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sun, 7 Aug 2016 11:59:42 +
Subject: [PATCH] gnu: dwm: Shorten the description.

* gnu/packages/suckless.scm (dwm)[description]: Shorten it.
---
 gnu/packages/suckless.scm | 25 +
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 87e5aad..8732a84 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -68,30 +68,7 @@
 (description
  "dwm is a dynamic window manager for X.  It manages windows in tiled,
 monocle and floating layouts.  All of the layouts can be applied dynamically,
-optimising the environment for the application in use and the task performed.
-
-In tiled layout windows are managed in a master and stacking area.  The master
-area contains the window which currently needs most attention, whereas the
-stacking area contains all other windows.  In monocle layout all windows are
-maximised to the screen size.  In floating layout windows can be resized and
-moved freely.  Dialog windows are always managed floating, regardless of the
-layout applied.
-
-Windows are grouped by tags.  Each window can be tagged with one or multiple
-tags.  Selecting certain tags displays all windows with these tags.
-
-Each screen contains a small status bar which displays all available tags, the
-layout, the number of visible windows, the title of the focused window, and the
-text read from the root window name property, if the screen is focused.  A
-floating window is indicated with an empty square and a maximised floating
-window is indicated with a filled square before the windows title.  The selected
-tags are indicated with a different color.  The tags of the focused window are
-indicated with a filled square in the top left corner.  The tags which are
-applied to one or more windows are indicated with an empty square in the top
-left corner.
-
-dwm draws a small customizable border around windows to indicate the focus
-state.")
+optimising the environment for the application in use and the task performed.")
 (license license:x11)))
 
 (define-public dmenu
-- 
2.9.2


-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org


signature.asc
Description: PGP signature


Re: [PACKAGE] sinit

2016-08-07 Thread ng0
Leo Famulari  writes:

> On Sat, Jul 30, 2016 at 06:19:47PM +0200, Vincent Legoll wrote:
>> On Sat, Jul 30, 2016 at 3:46 PM, Vincent Legoll
>>  wrote:
>> > Here is the accompanying patch for sinit to build properly under guix
>> >
>> > It will be submitted alongside the scm modifs.
>> >
>> > I may even try to make it upstream, as it's fairly straightforward...
>> 
>> DONE:
>> http://lists.suckless.org/hackers/1607/11719.html
>> 
>> Dunno the responsiveness, so no ETA for an upstream release fixing this...
>
> I noticed they replied with another suggestion:
>
> http://lists.suckless.org/hackers/1607/11720.html
>
> What happens if you set those variables in #:make-flags? There is an
> example in (gnu packages dvtm).
>

This should just work, Vincent. See the 'ii' package I sent today.

-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org



[PATCH] gnu: Add ii.

2016-08-07 Thread ng0
From 76d9f586822ad0a33a12f372715de878d769268b Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sun, 7 Aug 2016 11:35:34 +
Subject: [PATCH] gnu: Add ii.

* gnu/packages/irc.scm (ii): New variable.
---
 gnu/packages/irc.scm | 25 +
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 11250a3..91a4b9c 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -241,3 +241,28 @@ and extensible with plugins and scripts.")
 (description
  "ircII is a terminal based IRC and ICB client for UNIX systems.")
 (license license:bsd-3)))
+
+(define-public ii
+  (package
+(name "ii")
+(version "1.7")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "http://dl.suckless.org/tools/;
+  name "-" version ".tar.gz"))
+ (sha256
+  (base32
+   "176cqwnn6h7w4kbfd66hzqa243l26pqp2b06bii0nmnm0rkaqwis"
+(build-system gnu-build-system)
+(arguments
+ `(#:tests? #f ; no make check or tests
+   #:make-flags (list (string-append "PREFIX=" %output)
+  "CC=gcc")
+   #:phases
+   (modify-phases %standard-phases
+ (delete 'configure ; no configure
+(home-page "http://tools.suckless.org/ii/;)
+(synopsis "FIFO and filesystem-based IRC client")
+(description
+ "ii (Irc it) is a minimalist FIFO and filesystem based IRC client.")
+(license license:x11)))
-- 
2.9.2


-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org


signature.asc
Description: PGP signature


Re: [PATCH] ui: 'package->recutils' serializes the source field.

2016-08-07 Thread David Craven
I meant the little -s flag...

-s, --search=REGEXPsearch in synopsis and description using REGEXP

and I meant download, build and run manually outside of guix.

It still sounds like that's what you are saying... ;-)



Re: [PATCH] ui: 'package->recutils' serializes the source field.

2016-08-07 Thread Mathieu Lirzin
David Craven  writes:

> If I understand you correctly, you are saying the following:
>
> We shouldn't display an url to a tarball that may contain unfree
> software, because a user might run `guix package -s` download the
> tarball from the source-uris field and build and run the code, and
> accidentally run nonfree software on his computer?

No, this is not what I am saying.

'guix build -S' does already provide a patched version of the tarball
without the non-free stuff.  So the user can't install non-free code
accidentally.  IIRC This behavior was introduced to comply with FSDG in
order to make GuixSD a fully free distro.

My point is that if we are giving a direct link to the non-patched
source in our UI, the FSDG issue is the same.

Sorry if I was unclear.

-- 
Mathieu Lirzin



Re: [PATCH] ui: 'package->recutils' serializes the source field.

2016-08-07 Thread David Craven
If I understand you correctly, you are saying the following:

We shouldn't display an url to a tarball that may contain unfree
software, because a user might run `guix package -s` download the
tarball from the source-uris field and build and run the code, and
accidentally run nonfree software on his computer?



[PATCH] Update zathura-pdf-poppler to 0.2.6.

2016-08-07 Thread ng0
From ae97bfe8f8c0e0b3d6179f8bb299382313a115a4 Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sun, 7 Aug 2016 10:18:56 +
Subject: [PATCH 6/6] gnu: zathura-pdf-poppler: Update to 0.2.6.

* gnu/packages/pdf.scm (zathura-pdf-poppler): Update to 0.2.6.
---
 gnu/packages/pdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 78f2ffc..439adb9 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -344,7 +344,7 @@ using the DjVuLibre library.")
 (define-public zathura-pdf-poppler
   (package
 (name "zathura-pdf-poppler")
-(version "0.2.5")
+(version "0.2.6")
 (source (origin
   (method url-fetch)
   (uri
@@ -352,7 +352,7 @@ using the DjVuLibre library.")
   version ".tar.gz"))
   (sha256
(base32
-"1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0"
+"1maqiv7yv8d8hymlffa688c5z71v85kbzmx2j88i8z349xx0rsyi"
 (native-inputs `(("pkg-config" ,pkg-config)))
 (propagated-inputs `(("girara" ,girara)))
 (inputs
-- 
2.9.2


-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org


signature.asc
Description: PGP signature


[PATCH] Update zathura-djvu to 0.2.5.

2016-08-07 Thread ng0
From f347977252d2d2f952f921a0a4c96ddaa68ad207 Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sun, 7 Aug 2016 10:16:01 +
Subject: [PATCH 5/6] gnu: zathura-djvu: Update to 0.2.5.

* gnu/packages/pdf.scm (zathura-djvu): Update to 0.2.5.
---
 gnu/packages/pdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 4940dbb..78f2ffc 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -312,7 +312,7 @@ using libspectre.")
 (define-public zathura-djvu
   (package
 (name "zathura-djvu")
-(version "0.2.4")
+(version "0.2.5")
 (source (origin
   (method url-fetch)
   (uri
@@ -320,7 +320,7 @@ using libspectre.")
   version ".tar.gz"))
   (sha256
(base32
-"1g1lafmrjbx0xv7fljdmyqxx0k334sq4q6jy4a0q5xfrgz0bh45c"
+"03cw54d2fipvbrnbqy0xccqkx6s77dyhyymx479aj5ryy4513dq8"
 (native-inputs `(("pkg-config" ,pkg-config)))
 (propagated-inputs `(("girara" ,girara)))
 (inputs
-- 
2.9.2


-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org


signature.asc
Description: PGP signature


[PATCH] Update zathura-ps to 0.2.3.

2016-08-07 Thread ng0
From 0cc07d898d653d8ed0355479cf3f4530cbec8e95 Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sun, 7 Aug 2016 10:12:50 +
Subject: [PATCH 4/6] gnu: zathura-ps: Update to 0.2.3.

* gnu/packages/pdf.scm (zathura-ps): Update to 0.2.3.
---
 gnu/packages/pdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index c440daa..4940dbb 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -281,7 +281,7 @@ using libarchive.")
 (define-public zathura-ps
   (package
 (name "zathura-ps")
-(version "0.2.2")
+(version "0.2.3")
 (source (origin
   (method url-fetch)
   (uri
@@ -289,7 +289,7 @@ using libarchive.")
   version ".tar.gz"))
   (sha256
(base32
-"1a6ps5v1wk18qvslbkjln6w8wfzzr6fi13ls96vbdc03vdhn4m76"
+"18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9"
 (native-inputs `(("pkg-config" ,pkg-config)))
 (propagated-inputs `(("girara" ,girara)))
 (inputs `(("libspectre" ,libspectre)
-- 
2.9.2


-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org


signature.asc
Description: PGP signature


[PATCH] Update zathura-cb to 0.1.5.

2016-08-07 Thread ng0
From 13a242b2d12ae3c6ea72d6a936d094f0f7f95c21 Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sun, 7 Aug 2016 10:10:07 +
Subject: [PATCH 3/6] gnu: zathura-cb: Update to 0.1.5.

* gnu/packages/pdf.scm (zathura-cb): Update to 0.1.5.
---
 gnu/packages/pdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index f86060b..c440daa 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -250,7 +250,7 @@ reading and editing of existing PDF files.")
 (define-public zathura-cb
   (package
 (name "zathura-cb")
-(version "0.1.4")
+(version "0.1.5")
 (source (origin
   (method url-fetch)
   (uri
@@ -258,7 +258,7 @@ reading and editing of existing PDF files.")
   version ".tar.gz"))
   (sha256
(base32
-"09ln4fpjxmhcq6cw1ka7mdkmca36gyd4gzrynbw3waz0ri0b277j"
+"1zbazysdjwwnzw01qlnzyixwmsi8rqskc76mp81qcr3rpl96jprp"
 (native-inputs `(("pkg-config" ,pkg-config)))
 (propagated-inputs `(("girara" ,girara)))
 (inputs `(("libarchive" ,libarchive)
-- 
2.9.2


-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org


signature.asc
Description: PGP signature


[PATCH] Update zathura to 0.3.6.

2016-08-07 Thread ng0
From f899612384e45521ef85821583418f471619c390 Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sun, 7 Aug 2016 09:58:42 +
Subject: [PATCH 1/6] gnu: zathura: Update to 0.3.6.

* gnu/packages/pdf.scm (zathura): Update to 0.3.6.
---
 gnu/packages/pdf.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index dd7a0b0..f86060b 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2014, 2015, 2016 Ricardo Wurmus 
 ;;; Copyright © 2015 Paul van der Walt 
 ;;; Copyright © 2016 Roel Janssen 
+;;; Coypright © 2016 ng0 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -376,7 +377,7 @@ by using the poppler rendering engine.")
 (define-public zathura
   (package
 (name "zathura")
-(version "0.3.3")
+(version "0.3.6")
 (source (origin
   (method url-fetch)
   (uri
@@ -384,7 +385,7 @@ by using the poppler rendering engine.")
   version ".tar.gz"))
   (sha256
(base32
-"1rywx09qn6ap5hb1z31wxby4lzdrqdbldm51pjk1ifflr37xwirk"))
+"0fyb5hak0knqvg90rmdavwcmilhnrwgg1s5ykx9wd3skbpi8nsh8"))
   (patches (search-patches
 "zathura-plugindir-environment-variable.patch"
 (native-inputs `(("pkg-config" ,pkg-config)
-- 
2.9.2


-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org


signature.asc
Description: PGP signature


[PATCH] Update girara to 0.2.6 (pre-requirement for zathura update)

2016-08-07 Thread ng0
From 91c1327d89c5d746c03ec8ce004317dfd0a63c88 Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sun, 7 Aug 2016 10:05:56 +
Subject: [PATCH 2/6] gnu: girara: Update to 0.2.6.

* gnu/packages/gtk.scm (girara): Update to 0.2.6.
---
 gnu/packages/gtk.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 21365b9..8feac11 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2016 Fabian Harfert 
 ;;; Copyright © 2016 Kei Kebreau 
 ;;; Copyright © 2016 Patrick Hetu 
+;;; Coypright © 2016 ng0 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1153,7 +1154,7 @@ write GNOME applications.")
 (define-public girara
   (package
 (name "girara")
-(version "0.2.4")
+(version "0.2.6")
 (source (origin
   (method url-fetch)
   (uri
@@ -1161,7 +1162,7 @@ write GNOME applications.")
   version ".tar.gz"))
   (sha256
(base32
-"0pnfdsg435b5vc4x8l9pgm77aj7ram1q0bzrp9g4a3bh1r64xq1f"
+"03wsxj27hvcbs3x96nah7j3paclifwlfag8kdph4kldl48srp9pb"
 (native-inputs `(("pkg-config" ,pkg-config)
  ("gettext" ,gnu-gettext)))
 (inputs `(("gtk+" ,gtk+)
-- 
2.9.2


-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org


signature.asc
Description: PGP signature


[PATCHv2 2/2] gnu: bash-completion: Update to 2.3. Update the patch.

2016-08-07 Thread Tomáš Čech
* gnu/packages/bash.scm(bash-completion): Update to 2.3.
* gnu/packages/patches/bash-completion-directories.patch: New version of
  the patch for the same purpose.
---
 gnu/packages/bash.scm  |  8 ++---
 .../patches/bash-completion-directories.patch  | 40 +-
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index c006546..bddb830 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -275,15 +275,15 @@ without modification.")
 (define-public bash-completion
   (package
 (name "bash-completion")
-(version "2.1")
+(version "2.3")
 (source (origin
   (method url-fetch)
   (uri (string-append
-"http://bash-completion.alioth.debian.org/files/;
-"bash-completion-" version ".tar.bz2"))
+"https://github.com/scop/; name "/releases/download/"
+version "/" name "-" version ".tar.xz"))
   (sha256
(base32
-"0kxf8s5bw7y50x0ksb77d3kv0dwadixhybl818w27y6mlw26hq1b"))
+"1sg82nmsr00ig37skln2qvmi8mgbxgdvycm3ygzs8gbz66pq3q5j"))
   (patches
(search-patches "bash-completion-directories.patch"
 (build-system gnu-build-system)
diff --git a/gnu/packages/patches/bash-completion-directories.patch 
b/gnu/packages/patches/bash-completion-directories.patch
index 1a3e2f5..351a8e0 100644
--- a/gnu/packages/patches/bash-completion-directories.patch
+++ b/gnu/packages/patches/bash-completion-directories.patch
@@ -7,27 +7,21 @@ On Guix systems, we want not only to search within 
bash-completion's own
 directory, but also in the user's profile and in the system profile.
 This is what this patch does.
 
 bash-completion-2.1/bash_completion2015-03-11 09:45:45.056846446 
+0100
-+++ bash-completion-2.1/bash_completion2015-03-11 09:52:43.248159504 
+0100
-@@ -1928,9 +1928,20 @@ _completion_loader()
- local compfile=./completions
- [[ $BASH_SOURCE == */* ]] && compfile="${BASH_SOURCE%/*}/completions"
- compfile+="/${1##*/}"
-+local base="${1##*/}"
- 
-+# Look for completion files in the user and global profiles and
-+# lastly in 'bash-completion' itself.
-+for file in   
  \
-+"$HOME/.guix-profile/share/bash-completion/completions/$base" 
  \
-+"$HOME/.guix-profile/etc/bash_completion.d/$base" 
  \
-+"/run/current-system/profile/share/bash-completion/completions/$base" 
  \
-+"/run/current-system/profile/etc/bash_completion.d/$base" 
  \
-+"$compfile"
-+do
- # Avoid trying to source dirs; https://bugzilla.redhat.com/903540
--[[ -f "$compfile" ]] && . "$compfile" &>/dev/null && return 124
-+[[ -f "$file" ]] && . "$file" &>/dev/null && return 124
-+done
+
+--- a/bash_completion  2016-08-03 10:23:02.356782287 +0200
 b/bash_completion  2016-08-03 10:27:50.120140403 +0200
+@@ -1960,7 +1960,13 @@
  
- # Need to define *something*, otherwise there will be no completion at 
all.
- complete -F _minimal "$1" && return 124
+ __load_completion()
+ {
+-local -a dirs=( 
${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions
 )
++local -a dirs=(
++"$HOME/.guix-profile/share/bash-completion/completions/$base"
++"$HOME/.guix-profile/etc/bash_completion.d/$base"
++"/run/current-system/profile/share/bash-completion/completions/$base"
++"/run/current-system/profile/etc/bash_completion.d/$base"
++
${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions
 )
++
+ local OIFS=$IFS IFS=: dir cmd="$1" compfile
+ for dir in ${XDG_DATA_DIRS:-/usr/local/share:/usr/share}; do
+ dirs+=( $dir/bash-completion/completions )
-- 
2.9.2




[PATCHv2 1/2] gnu: bash-completion: Modify to modify-phases.

2016-08-07 Thread Tomáš Čech
* gnu/packages/bash.scm(bash-completion): Use modify-phases instead of
  alist-cons-after.
---
 gnu/packages/bash.scm | 46 +++---
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index ff3acfc..c006546 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -289,29 +289,29 @@ without modification.")
 (build-system gnu-build-system)
 (native-inputs `(("util-linux" ,util-linux)))
 (arguments
- `(#:phases (alist-cons-after
- 'install 'remove-redundant-completions
- (lambda* (#:key inputs outputs #:allow-other-keys)
-   ;; Util-linux comes with a bunch of completion files for
-   ;; its own commands which are more sophisticated and
-   ;; up-to-date than those of bash-completion.  Remove those
-   ;; from bash-completion.
-   (let* ((out (assoc-ref outputs "out"))
-  (util-linux  (assoc-ref inputs "util-linux"))
-  (completions (string-append out
-  "/share/bash-completion"
-  "/completions"))
-  (already (find-files
-(string-append
- util-linux
- "/etc/bash_completion.d"
- (with-directory-excursion completions
-   (for-each (lambda (file)
-   (when (file-exists? file)
- (delete-file file)))
- (map basename already)))
- #t))
- %standard-phases)))
+ `(#:phases (modify-phases %standard-phases
+  (add-after
+   'install 'remove-redundant-completions
+   (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Util-linux comes with a bunch of completion files for
+ ;; its own commands which are more sophisticated and
+ ;; up-to-date than those of bash-completion.  Remove those
+ ;; from bash-completion.
+ (let* ((out (assoc-ref outputs "out"))
+(util-linux  (assoc-ref inputs "util-linux"))
+(completions (string-append out
+
"/share/bash-completion"
+"/completions"))
+(already (find-files
+  (string-append
+   util-linux
+   "/etc/bash_completion.d"
+   (with-directory-excursion completions
+ (for-each (lambda (file)
+ (when (file-exists? file)
+   (delete-file file)))
+   (map basename already)))
+   #t))
 (synopsis "Bash completions for common commands")
 (description
  "This package provides extensions that allow Bash to provide adapted
-- 
2.9.2




Re: [PATCH] gnunet-svn, gnunet-gtk-svn

2016-08-07 Thread ng0
ng0  writes:

> The next 2.5 days will be unpleasant for me and probably difficult to
> focus, but I know how to fix the 3 failing tests for us.
> I'll have this fixed in thex next days.
>
> Appended is the failing tests output (for me as a backup) and the
> combined gnunet-svn + gnunet-gtk-svn patch. As we discussed this will
> not be in guix at the moment and is intended as a test package to get
> the next release of gnunet to build on guix when it is released.
>
> There are last things I want to transition from my Gentoo package to the
> guix packages.
>
> I'd like to have a gnunet package with --with-experimental enabled
> (features: conversation etc, at least last time I read the Makefile), so
> this will be available out of tree when all the features are too much
> for master tree (or --with-experimental is considered too unstable to
> ship).
>
> The log attachment was too big, log can be replicated with tests
> enabled.
>
> Have a nice weekend.

For whatever reason the appended patches broke, here is another try:

>From c1e673b06506ebfd476ccd248a6f00e18c4d22c1 Mon Sep 17 00:00:00 2001
From: ng0 
Date: Sat, 30 Jul 2016 14:09:31 +
Subject: [PATCH 1/3] gnu: Add gnunet-svn.

* gnu/packages/gnunet.scm (gnunet-svn): New variable.
---
 gnu/packages/gnunet.scm | 82 +
 1 file changed, 82 insertions(+)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 4d888bd..25ac073 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -54,6 +54,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix svn-download)
   #:use-module (guix build-system gnu))
 
 (define-public libextractor
@@ -330,3 +331,84 @@ services.")
  `(("pkg-config" ,pkg-config)
("libglade" ,libglade)))
 (synopsis "Graphical front-end tools for GNUnet")))
+
+;; gnunet-fs 0.9, 0.10.1 and HEAD are incompatible to each other as
+;; explained here https://gnunet.org/bot/log/gnunet/2016-06-23#T1067897
+;; We use a revision of a proven and confirmed to be usable and stable
+;; version before refactoring work towards 0.10.2 started.
+
+(define-public gnunet-svn
+  (let ((svn-revision 37273))
+(package
+  (name "gnunet-svn")
+  (version (string-append "0.10.1" "-1" ".svn"
+  (number->string svn-revision)))
+  (source
+   (origin
+ (method svn-fetch)
+ (uri (svn-reference
+   (url "https://gnunet.org/svn/gnunet/;)
+   (revision svn-revision)))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+  (base32
+   "0xn8g0mk2nl142yz4zzrj25rpnhxfvjwnfnangyx8s44xv75i2dc"
+  (build-system gnu-build-system)
+  (inputs
+   `(("glpk" ,glpk)
+ ("gnurl" ,gnurl)
+ ("gstreamer" ,gstreamer)
+ ("gst-plugins-base" ,gst-plugins-base)
+ ("gnutls" ,gnutls)
+ ("libextractor" ,libextractor)
+ ("libgcrypt" ,libgcrypt)
+ ("libidn" ,libidn)
+ ("libmicrohttpd" ,libmicrohttpd)
+ ("libltdl" ,libltdl)
+ ("libunistring" ,libunistring)
+ ("openssl" ,openssl)
+ ("opus" ,opus)
+ ("pulseaudio" ,pulseaudio)
+ ("sqlite" ,sqlite)
+ ("zlib" ,zlib)
+ ("python" ,python-2))) ; tests and gnunet-qr
+  (native-inputs
+   `(("pkg-config" ,pkg-config)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("gnu-gettext" ,gnu-gettext)
+ ("libtool" ,libtool)))
+  (arguments
+   '(#:configure-flags
+ (list (string-append "--with-nssdir=" %output "/lib"))
+ #:parallel-tests? #f ; parallel building is not functional
+ #:tests? #f ; FAIL: test_testbed_logger_api
+ #:phases
+ ;; swap check and install phases and set paths to installed bin
+ (modify-phases %standard-phases
+   (add-after 'unpack 'patch-bin-sh
+ (lambda _
+   (and
+(substitute* '("bootstrap")
+  (("contrib/pogen.sh") "sh contrib/pogen.sh"))
+(for-each (lambda (f) (chmod f #o755))
+  (find-files "po" "")
+   (add-after 'patch-bin-sh 'bootstrap
+ (lambda _
+   (zero?
+(system* "sh" "bootstrap"
+   (add-before 'check 'set-path-for-check
+ (lambda* (#:key outputs #:allow-other-keys)
+   (let ((out (assoc-ref outputs "out")))
+ (setenv "GNUNET_PREFIX" (string-append out "/lib"))
+ (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"
+  (synopsis "Secure, decentralized, peer-to-peer networking framework")
+  (description
+   "GNUnet is a framework for secure peer-to-peer networking.  The
+high-level goal is to provide a 

Re: [PATCH] gnu: bash-completion: Update to 2.3.

2016-08-07 Thread Tomáš Čech

On Sat, Aug 06, 2016 at 11:06:05PM -0400, Leo Famulari wrote:

On Fri, Aug 05, 2016 at 08:53:46PM +0200, Andreas Enge wrote:

The autoreconf phase is strange. Why is it suddenly needed? If there is no
way around it, you should at least add a comment.


I notice that when projects move to GitHub, they sometimes forget to cut
a new release. GitHub automatically generates a tarball of the source
tree for each tag, and those are not bootstrapped. That's probably what
happened here, and it's worth an upstream bug report, IMO.



Reported here:

 https://github.com/scop/bash-completion/issues/64

Thanks for review.

S_W


signature.asc
Description: Digital signature


Re: ‘core-updates’ merge is a squashed commit

2016-08-07 Thread Mike Gerwitz
On Thu, Aug 04, 2016 at 17:06:15 +0200, Andy Wingo wrote:
> What's the rationale for requiring non-HEAD commits to be signed when
> pushing?  For me a signed HEAD implicitly signs all parent comments, in
> my mental trust model anyway :)

That could be a potentially daunting/impossible task for the person
signing a commit.

Aside from asserting one's identity, GPG-signed commits also (can) help
in the event that the system of one of the Guix hackers with commit
access is compromised.  Attacking Savannah is one way to compromise the
repo, but compromising one of the many Guix hackers' systems is another.

If a commit is signed in the hacker's local repo, it cannot be
manipulated by an attacker, nor can an attacker sign a new malicious
commit.  Unless, of course, the GPG key resides on the same box, the
attacker can get a hold of it, and can use a keylogger/etc to get the
passphrase.  Smart cards help here.

I also recommend against auto-signing commmits on rebase unless you
first verify that each commit within that range has a valid signature
beforehand.

Not fool-proof, but nothing is. :)

-- 
Mike Gerwitz
Free Software Hacker+Activist | GNU Maintainer & Volunteer
https://mikegerwitz.com   | GPG Key ID: 0x8EE30EAB


signature.asc
Description: PGP signature