Re: [PATCH 1/2] profiles: Add xdg-desktop-database hook.

[宋文武]

l...@gnu.org (Ludovic Courtès) writes:

> 宋文武  skribis:
>
>> * guix/profiles (xdg-desktop-database): New function.
>> (%default-profile-hooks): Add it.
>
> Nice!
>
>> +   (update-desktop-database (string-append
>> + #+desktop-file-utils
>> + "/bin/update-desktop-database")))
>
> This is a small dependency, but it still depends on GLib; my
> understanding is that building any profile would end up pulling in GLib
> because of this hook.
Yes.
>
> Should we have some heuristic as for the GTK+ and GHC hooks to avoid
> pulling it in?
>
> For instance, we could check whether GLib is already an indirect
> dependency of at least one of the packages.  WDYT?
Sure, but I think check on GLib is not sufficient and necessary,
when the hook run, it will use latest desktop-file-utils which may
use a different version of glib.  Unless I use the desktop-file-utils
package installed from profile, but not like the gtk-icon-themes hook,
where gtk+ is the runtime dependency, desktop-file-utils is only used
to validate the desktop file during build phase, I can't get it from
manifest using the same (and IMO, heavy and ugly) method.

So, I end up using a simple 'manifest-lookup', which require the
desktop-file-utils and shared-mime-info to be installed explicitly.

Updated patches:
>From 9fe7aa4f368def46ddab54bd1347d6cf2ef5832f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 
Date: Thu, 4 Feb 2016 15:33:07 +0800
Subject: [PATCH 1/2] profiles: Add xdg-desktop-database hook.

* guix/profiles.scm (xdg-desktop-database): New function.
(%default-profile-hooks): Add it.
---
 guix/profiles.scm | 38 +-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index ce86ff8..a9375e6 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -684,13 +684,49 @@ creates the GTK+ 'icon-theme.cache' file for each theme."
   #:substitutable? #f)
 (return #f
 
+(define (xdg-desktop-database manifest)
+  "Return a derivation that builds the @file{mimeinfo.cache} database from
+desktop files.  It's used to query what applications can handle a given
+MIME type."
+  (define desktop-file-utils
+(module-ref (resolve-interface '(gnu packages gnome))
+'desktop-file-utils))
+
+  (define build
+#~(begin
+(use-modules (srfi srfi-26)
+ (guix build utils)
+ (guix build union))
+(let* ((destdir (string-append #$output "/share/applications"))
+   (appdirs (filter file-exists?
+(map (cut string-append <>
+  "/share/applications")
+ '#$(manifest-inputs manifest
+   (update-desktop-database (string-append
+ #+desktop-file-utils
+ "/bin/update-desktop-database")))
+  (mkdir-p (string-append #$output "/share"))
+  (union-build destdir appdirs
+   #:log-port (%make-void-port "w"))
+  (zero? (system* update-desktop-database destdir)
+
+  ;; Don't run the hook when 'desktop-file-utils' is not installed.
+  (if (manifest-lookup manifest (manifest-pattern (name "desktop-file-utils")))
+  (gexp->derivation "xdg-desktop-database" build
+#:modules '((guix build utils)
+(guix build union))
+#:local-build? #t
+#:substitutable? #f)
+  (with-monad %store-monad (return #f
+
 (define %default-profile-hooks
   ;; This is the list of derivation-returning procedures that are called by
   ;; default when making a non-empty profile.
   (list info-dir-file
 ghc-package-cache-file
 ca-certificate-bundle
-gtk-icon-themes))
+gtk-icon-themes
+xdg-desktop-database))
 
 (define* (profile-derivation manifest
  #:key
-- 
2.5.0

>From 5e39f976de2ee6854b530a011e036b6ec2018810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 
Date: Thu, 4 Feb 2016 15:35:03 +0800
Subject: [PATCH 2/2] profiles: Add xdg-mime-database hook.

* guix/profiles.scm (xdg-mime-database): New function.
(%default-profile-hooks): Add it.
---
 guix/profiles.scm | 39 ++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index a9375e6..8f9d617 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -719,6 +719,42 @@ MIME type."
 #:substitutable? #f)
   (with-monad %store-monad (return #f
 
+(define (xdg-mime-database manifest)
+  "Return a derivation that builds the @file{mime.cache} database from manifest
+entries.  It's used to query the MI

[PATCH] gnu: gdk-pixbuf: Disable pixbuf-scale test.

[Jookia]

On systems with little ram (2G in my case) the pixbuf-scale test will either
freeze the system of cause excessive swapping without the test every completing.

* gnu/packages/gtk.scm (gdk-pixbuf): Don't run 'pixbuf-scale' test.
---
 gnu/packages/gtk.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 916873b..021ee00 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2015 Sou Bunnbu 
 ;;; Copyright © 2015 Andy Wingo 
 ;;; Copyright © 2015 David Hashe 
+;;; Copyright © 2016 Jookia <166...@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -407,6 +408,8 @@ highlighting and other features typical of a source code 
editor.")
  ;; SKIP Not enough memory to load bitmap image
  ;; ERROR: cve-2015-4491 - too few tests run (expected 4, got 2)
  (("cve-2015-4491\\$\\(EXEEXT\\) ") "")
+ ;; XXX FIXME: This test can crash systems with little RAM.
+ (("pixbuf-scale\\$\\(EXEEXT\\) ") "")
  ;; XXX FIXME: This test fails with:
  ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag:
  ;; assertion failed (error == NULL): Data differ
-- 
2.7.0

[PATCH] gnu: net-tools: Use a different source mirror.

[Jookia]

The current mirror for the source code now points to a domain parking website,
so instead use this mirror I found online.

* gnu/packages/linux.scm (net-tools): Use a different uri for the origin.
---
 gnu/packages/linux.scm | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 9d359e3..f6373a8 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer 
 ;;; Copyright © 2015, 2016 Efraim Flashner 
 ;;; Copyright © 2016 Christopher Allan Webber 
+;;; Copyright © 2016 Jookia <166...@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -951,8 +952,9 @@ manpages.")
 (home-page "http://www.tazenda.demon.co.uk/phil/net-tools/";)
 (source (origin
  (method url-fetch)
- (uri (string-append home-page "/" name "-"
- version ".tar.bz2"))
+ (uri (string-append "http://distro.ibiblio.org/";
+  "rootlinux/rootlinux-ports/base/"
+  "net-tools/net-tools-1.60.tar.bz2"))
  (sha256
   (base32
"0yvxrzk0mzmspr7sa34hm1anw6sif39gyn85w4c5ywfn8inxvr3s"))
-- 
2.7.0

Re: The new Hydra

[Christopher Allan Webber]

Ludovic Courtès writes:

> Hi!
>
> As you know the fundraiser has given us $8,000+ thanks to everyone here.
> (8,266 to be precise, see
> .)
>
> We intend to buy a server with hardware from Minifree¹, which can run
> Libreboot.  Mark has already written a draft spec of the machine
> (Minifree doesn’t sell ready-to-use boxes yet), and we’re at the stage
> where we need to double-check that everything will work out correctly.
> This should be less than $4,000.
>
> The plan is to host the machine at Aquilenet², a French non-profit
> (“association loi 1901”) registered as an ISP in the region of Bordeaux.
> Andreas, Cyril, Mathieu, and myself are members of this organization;
> Samuel Thibault, whom you may know from his work on the Hurd and Debian,
> is one of the talented hackers leading it.  Hosting will cost on the
> order of 600€ a year.
>
> We’ll send updates as we make progress on this front.
>
> Ludo’.
>
> ¹ http://minifree.org/product/libreboot-d16/
> ² https://www.aquilenet.fr

Horray!  Glad to see that funding -> action has worked out nicely :)

Re: FOSDEM 2016 slides

[Arne Babenhauserheide]

Alex Sassmannshausen writes:

>>
>> These are great — and I hope I can use guile-config.
>
> Thank you! And great you want to use it — I'll try to get a proper
> release ASAP then :-)

Cool, thank you!

> I'd definitely be really keen in getting a config file writer/reader
> working using wisp too.  The more I think about it, the more I like the
> idea!

If it works with scheme code, it should directly work with Wisp, too —
thanks to the language integration in Guile.

That said, I’d like to see how it looks when written in Wisp. Looking
forward to a release!

Best wishes,
Arne
-- 
Unpolitisch sein
heißt politisch sein
ohne es zu merken


signature.asc
Description: PGP signature

Heads-up: rebooting after the switch to the Shepherd

[Ludovic Courtès]

If you run ‘guix system reconfigure’ for the first time since the
dmd → shepherd transition last week, you may find the ‘reboot’ command
is non-functional right after ‘reconfigure’ has completed:

  # reboot
  error: connect: /var/run/shepherd/socket: No such file or directory

The solution is to instead run:

  # /run/booted-system/profile/sbin/reboot

This one is able to talk to the running dmd, whereas after
reconfiguration, ‘reboot’ is the new Shepherd client, which cannot talk
to the old dmd.

Ludo’.

Heads-up: ‘guix system reconfigure’ reloads services

[Ludovic Courtès]

Hi!

If you haven’t been following , ‘guix system
reconfigure’ is now able to dynamically load/start new system services,
unless they are already running.

This works by talking to shepherd in a way similar to what ‘herd’ does,
querying the list of current services and then dynamically loading new
services in there (the interesting part ;-)).

This is very conservative, so it shouldn’t bring your system down.  :-)
Errors in service definitions are caught when they are loaded.

Anyway, if you notice something fishy, please report it, including info
on the initial and target state of system services.

Ludo’.

Re: [PATCH] gnu: aspell: Wrap binary to find dictionaries.

[Ludovic Courtès]

Federico Beffa  skribis:

> On Wed, Feb 3, 2016 at 9:21 AM, Ludovic Courtès  wrote:
>> Federico Beffa  skribis:
>>
>>> From e183f8e473b97406968ecbda9fb13ebdf60963ec Mon Sep 17 00:00:00 2001
>>> From: Federico Beffa 
>>> Date: Fri, 8 Jan 2016 14:23:12 +0100
>>> Subject: [PATCH 11/11] gnu: aspell: Wrap binary to find dictionaries.
>>>
>>> * gnu/packages/aspell.scm (aspell): Add 'wrap-aspell phase.
>>
>> I pushed this patch along with the corresponding (gnu system) change as
>> 81fc64d.
>
> I wanted to push the last batch of patches that I proposed all
> together (including the aspell gnu system you suggested).  I've now
> received a reply from Dominik and will do so in the next few days.
>
> Please don't push other ones from the set. They are coming.

OK, noted.

Apologies if I stepped on your toes.  I was looking at GuixSD’s
/etc/profile, which reminded me of this Aspell patch, and I thought it
had been lost.

Thanks,
Ludo’.

Re: [PATCH 4/6] gnu: Add emacs-constants.

[Ludovic Courtès]

Federico Beffa  skribis:

> On Sun, Jan 10, 2016 at 9:45 PM, Ludovic Courtès  wrote:
>> Could get in touch with Carsten Dominik, for instance, and propose the
>> patch?
>
> Dominik was kind enough to accept the patch. So, I've now pushed it.
> Once the new release will be out, we can drop it.

Excellent, thank you!

Ludo’.

The new Hydra

[Ludovic Courtès]

Hi!

As you know the fundraiser has given us $8,000+ thanks to everyone here.
(8,266 to be precise, see
.)

We intend to buy a server with hardware from Minifree¹, which can run
Libreboot.  Mark has already written a draft spec of the machine
(Minifree doesn’t sell ready-to-use boxes yet), and we’re at the stage
where we need to double-check that everything will work out correctly.
This should be less than $4,000.

The plan is to host the machine at Aquilenet², a French non-profit
(“association loi 1901”) registered as an ISP in the region of Bordeaux.
Andreas, Cyril, Mathieu, and myself are members of this organization;
Samuel Thibault, whom you may know from his work on the Hurd and Debian,
is one of the talented hackers leading it.  Hosting will cost on the
order of 600€ a year.

We’ll send updates as we make progress on this front.

Ludo’.

¹ http://minifree.org/product/libreboot-d16/
² https://www.aquilenet.fr


signature.asc
Description: PGP signature

Re: [PATCH] licenses: Add the fdl1.1+.

[Efraim Flashner]

On Wed, 3 Feb 2016 21:11:22 +0100
Fabian Harfert  wrote:

> Am Wed, 3 Feb 2016 21:54:15 +0200
> schrieb Efraim Flashner :
> 
>  [...]  
>  [...]  
>  [...]  
> 
> Could you please push that for me? I haven't got access to the git
> repository(, yet).
> 

Unfortunately something with the patch isn't letting me apply it against git
so I'm going to have to ask someone else to do it since I'm about to head off
to bed. Also, I realized you were missing `license: Add fdl1.1+` at the top
line of your commit message.

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


pgp9kVeNoYFkO.pgp
Description: OpenPGP digital signature

Re: [PATCH] licenses: Add the fdl1.1+.

[Fabian Harfert]

Am Wed, 3 Feb 2016 21:54:15 +0200
schrieb Efraim Flashner :

> On Wed,  3 Feb 2016 17:38:45 +0100
> Fabian Harfert  wrote:
> 
> > * guix/licenses.scm (fdl1.1+): New variable.
> > ---
> >  guix/licenses.scm | 7 ++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> > 
> > diff --git a/guix/licenses.scm b/guix/licenses.scm
> > index d33b19f..29dd1ed 100644
> > --- a/guix/licenses.scm
> > +++ b/guix/licenses.scm
> > @@ -44,7 +44,7 @@
> >  giftware
> >  gpl1 gpl1+ gpl2 gpl2+ gpl3 gpl3+
> >  gfl1.0
> > -fdl1.3+
> > +fdl1.1+ fdl1.3+
> >  opl1.0+
> >  isc
> >  ijg
> > @@ -246,6 +246,11 @@ at URI, which may be a file:// URI pointing
> > the package's tree."
> > "http://www.gust.org.pl/projects/e-foundry/licenses/GUST-FONT-LICENSE.txt";
> > "https://www.gnu.org/licenses/license-list#LPPL-1.3a";)) 
> > +(define fdl1.1+
> > +  (license "FDL 1.1+"
> > +   "https://www.gnu.org/licenses/fdl-1.1";
> > +   "https://www.gnu.org/licenses/license-list#FDL";))
> > +
> >  (define fdl1.3+
> >(license "FDL 1.3+"
> > "https://www.gnu.org/licenses/fdl.html";  
> 
> looks good to me!
> 

Could you please push that for me? I haven't got access to the git
repository(, yet).

Re: [PATCH] licenses: Add the fdl1.1+.

[Efraim Flashner]

On Wed,  3 Feb 2016 17:38:45 +0100
Fabian Harfert  wrote:

> * guix/licenses.scm (fdl1.1+): New variable.
> ---
>  guix/licenses.scm | 7 ++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/guix/licenses.scm b/guix/licenses.scm
> index d33b19f..29dd1ed 100644
> --- a/guix/licenses.scm
> +++ b/guix/licenses.scm
> @@ -44,7 +44,7 @@
>  giftware
>  gpl1 gpl1+ gpl2 gpl2+ gpl3 gpl3+
>  gfl1.0
> -fdl1.3+
> +fdl1.1+ fdl1.3+
>  opl1.0+
>  isc
>  ijg
> @@ -246,6 +246,11 @@ at URI, which may be a file:// URI pointing the 
> package's tree."
> 
> "http://www.gust.org.pl/projects/e-foundry/licenses/GUST-FONT-LICENSE.txt";
> "https://www.gnu.org/licenses/license-list#LPPL-1.3a";))
>  
> +(define fdl1.1+
> +  (license "FDL 1.1+"
> +   "https://www.gnu.org/licenses/fdl-1.1";
> +   "https://www.gnu.org/licenses/license-list#FDL";))
> +
>  (define fdl1.3+
>(license "FDL 1.3+"
> "https://www.gnu.org/licenses/fdl.html";

looks good to me!

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


pgpFpBm2YeQ6H.pgp
Description: OpenPGP digital signature

Re: GStreamer, PulseAudio and libvpx update

[Efraim Flashner]

On Wed, 3 Feb 2016 18:43:09 +0100
Andreas Enge  wrote:

> Hello,
> 
> On Wed, Feb 03, 2016 at 07:15:11PM +0800, 宋文武 wrote:
>  [...]  
> 
> thanks for getting back to this! I actually had forgotten to mention that
> I would be willing to work on this, sorry.
> 
> So far, I tried the following: On x86_64, gst-plugins-good builds without
> problem with the new version of ao that Efraim already pushed to master
> and the new pulseaudio version. One test fails if I also apply the libvpx
> update.
> 
> So it looks like we could also update pulseaudio in master; according to
> "guix refresh -l" there are 168 dependent packages. Is this too much?
> 
> In any case, we should now wait for security-updates to be applied to
> master, and probably keep the old version of libvpx until after the
> gstreamer update.
> 
> Andreas
> 

I tested the ao update which was obviously fine, but libvpx broke
gst-plugins-good. Its nice to know that pulseaudio doesn't break anything, I
assumed I was looking at a 2+ hour build session to really test it so I'm
glad I didn't have to be the one to do it in the end :) Debian managed to
upgrade libvpx to 1.5.0 with gstreamer at 1.6.3 so I'm a bit curious about
how they managed that.

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


pgpO91Zk73k9a.pgp
Description: OpenPGP digital signature

Re: torsocks 2.0 bug

[Andreas Enge]

On Wed, Feb 03, 2016 at 07:08:32PM +0100, swedebu...@riseup.net wrote:
>   '(#:phases (modify-phases %standard-phases
> +  ; FIXME. this phase is still needed but fails. I dont
> +  ; understand why. It works fine when done manually in an
> +  ; environment.
>(add-before 'configure 'bootstrap
>  (lambda _
> -  (system* "autoreconf" "-vfi"))
> +  (system* "autoreconf" "-i")

The problem is here. First of all, there was no need to drop the options "v"
and "f". But the real problem comes from dropping the parentheses.
So now what follows is part of the "lambda" function:

> +   ; FIXME. test_fd_passing fail.
> +   #:tests? #f)

And it ends with "#f", so the return value of the function is false, and the
phase fails.

I tried closing more parentheses, and then the build passes, but the tests
still fail. This would need to be investigated more.

Andreas

Re: torsocks 2.0 bug

[swedebugia]

On 2016-02-03 10:40, l...@gnu.org wrote:

swedebu...@riseup.net skribis:


I propose: we update to 2.1 first and see if this fixes the problem
with only icecat.


Sounds good.  Would you like to send a patch?


I tried my best and... failed. Ha!

Attached an almost working patch with details of what fails.

Cheers
sdbFrom de72a36bbe3559c345e41359c91d80820d858127 Mon Sep 17 00:00:00 2001
From: swedebugia 
Date: Wed, 3 Feb 2016 18:58:47 +0100
Subject: [PATCH] gnu: torsocks: Update to 2.1.0.

---
 gnu/packages/tor.scm | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 5fb8f95..329e282 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -70,7 +70,7 @@ applications based on the TCP protocol.")
 (define-public torsocks
   (package
 (name "torsocks")
-(version "2.0.0")
+(version "2.1.0")
 (source (origin
   (method git-fetch)
   (uri (git-reference
@@ -78,15 +78,20 @@ applications based on the TCP protocol.")
 (commit (string-append "v" version
   (sha256
(base32
-"0an2q5ail9z414riyjbkjkm29504hy778j914baz2gn5hlv2cfak"))
+"1l890pg0h2hqpkabsnwc6pq2qi8mfv58qzaaicc9y62rq5nmrrws"))
   (file-name (string-append name "-" version "-checkout"))
   (patches (list (search-patch "torsocks-dns-test.patch")
 (build-system gnu-build-system)
 (arguments
  '(#:phases (modify-phases %standard-phases
+  ; FIXME. this phase is still needed but fails. I dont
+  ; understand why. It works fine when done manually in an
+  ; environment.
   (add-before 'configure 'bootstrap
 (lambda _
-  (system* "autoreconf" "-vfi"))
+  (system* "autoreconf" "-i")
+   ; FIXME. test_fd_passing fail.
+   #:tests? #f)
 (native-inputs `(("autoconf" ,(autoconf-wrapper))
  ("automake" ,automake)
  ("libtool" ,libtool)
-- 
2.6.3

Re: GStreamer, PulseAudio and libvpx update

[Andreas Enge]

Hello,

On Wed, Feb 03, 2016 at 07:15:11PM +0800, 宋文武 wrote:
> Yes, they're independent.  I update gstreamer and add gst-plugins-bad,
> the other are from Efraim Flashner's work.  Due to gst-plugins-good
> failed to pass some tests with the update of libvpx and pulseaudio,
> I think put them together may bring some luck.
> well, it seem the test failure of gst-plugins-good is unreleated to
> the update...

thanks for getting back to this! I actually had forgotten to mention that
I would be willing to work on this, sorry.

So far, I tried the following: On x86_64, gst-plugins-good builds without
problem with the new version of ao that Efraim already pushed to master
and the new pulseaudio version. One test fails if I also apply the libvpx
update.

So it looks like we could also update pulseaudio in master; according to
"guix refresh -l" there are 168 dependent packages. Is this too much?

In any case, we should now wait for security-updates to be applied to
master, and probably keep the old version of libvpx until after the
gstreamer update.

Andreas

[PATCH] licenses: Add the fdl1.1+.

[Fabian Harfert]

* guix/licenses.scm (fdl1.1+): New variable.
---
 guix/licenses.scm | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/guix/licenses.scm b/guix/licenses.scm
index d33b19f..29dd1ed 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -44,7 +44,7 @@
 giftware
 gpl1 gpl1+ gpl2 gpl2+ gpl3 gpl3+
 gfl1.0
-fdl1.3+
+fdl1.1+ fdl1.3+
 opl1.0+
 isc
 ijg
@@ -246,6 +246,11 @@ at URI, which may be a file:// URI pointing the package's 
tree."

"http://www.gust.org.pl/projects/e-foundry/licenses/GUST-FONT-LICENSE.txt";
"https://www.gnu.org/licenses/license-list#LPPL-1.3a";))
 
+(define fdl1.1+
+  (license "FDL 1.1+"
+   "https://www.gnu.org/licenses/fdl-1.1";
+   "https://www.gnu.org/licenses/license-list#FDL";))
+
 (define fdl1.3+
   (license "FDL 1.3+"
"https://www.gnu.org/licenses/fdl.html";
-- 
2.7.0

Re: GStreamer, PulseAudio and libvpx update

[宋文武]

Andreas Enge  writes:

> Hello,
>
> On Wed, Feb 03, 2016 at 12:23:24PM +0800, 宋文武 wrote:
>> In the 'gstreamer-update' branch we have following updates:
>>   libvpx -> 1.5.0
>>   pulseaudio -> 8.0
>>   ao -> 1.2.0
>>   gstreamer (and plugins) -> 1.6.3
>
> I noticed you merged master into the branch. My opinion is that merging
> instead of rebasing messes up the history and makes it rather unclear
> what the differences in this branch are. So I would suggest the following:
> Delete the branch, create a branch "wip-gstreamer" from security-updates
> (not master!), try to build a few packages; after security-updates has been
> applied to master, rebase wip-gstreamer and have it built by hydra.
Sure, merge does look weird.  Done as you said, thanks for the guide :)
>
> Right now, the priority clearly is to finish security-updates, and we
> cannot afford to build a second branch in parallel.
OK.
>
> Are these four updates independent? Should they all be built together,
> or should we do them one by one? Only 19 packages depend on ao, only 29 on
> libvpx, so these could be done separately. Could they even go to master,
> or do they depend on gstreamer (or pulseaudio) being updated first? 
> pulseaudio has 162 dependent packages, so even these could maybe be built
> separately (where by "separately" I mean in a different evaluation).
>
> What do you think?
Yes, they're independent.  I update gstreamer and add gst-plugins-bad,
the other are from Efraim Flashner's work.  Due to gst-plugins-good
failed to pass some tests with the update of libvpx and pulseaudio,
I think put them together may bring some luck.
well, it seem the test failure of gst-plugins-good is unreleated to
the update...

Re: [PATCH] gnu: aspell: Wrap binary to find dictionaries.

[Federico Beffa]

On Wed, Feb 3, 2016 at 9:21 AM, Ludovic Courtès  wrote:
> Federico Beffa  skribis:
>
>> From e183f8e473b97406968ecbda9fb13ebdf60963ec Mon Sep 17 00:00:00 2001
>> From: Federico Beffa 
>> Date: Fri, 8 Jan 2016 14:23:12 +0100
>> Subject: [PATCH 11/11] gnu: aspell: Wrap binary to find dictionaries.
>>
>> * gnu/packages/aspell.scm (aspell): Add 'wrap-aspell phase.
>
> I pushed this patch along with the corresponding (gnu system) change as
> 81fc64d.

I wanted to push the last batch of patches that I proposed all
together (including the aspell gnu system you suggested).  I've now
received a reply from Dominik and will do so in the next few days.

Please don't push other ones from the set. They are coming.

Thanks,
Fede

Re: GStreamer, PulseAudio and libvpx update

[Efraim Flashner]

On Wed, 3 Feb 2016 11:25:22 +0100
Andreas Enge  wrote:

> Hello,
> 
> On Wed, Feb 03, 2016 at 12:23:24PM +0800, 宋文武 wrote:
>  [...]  
> 
> I noticed you merged master into the branch. My opinion is that merging
> instead of rebasing messes up the history and makes it rather unclear
> what the differences in this branch are. So I would suggest the following:
> Delete the branch, create a branch "wip-gstreamer" from security-updates
> (not master!), try to build a few packages; after security-updates has been
> applied to master, rebase wip-gstreamer and have it built by hydra.
> 
> Right now, the priority clearly is to finish security-updates, and we
> cannot afford to build a second branch in parallel.
> 
> Are these four updates independent? Should they all be built together,
> or should we do them one by one? Only 19 packages depend on ao, only 29 on
> libvpx, so these could be done separately. Could they even go to master,
> or do they depend on gstreamer (or pulseaudio) being updated first? 
> pulseaudio has 162 dependent packages, so even these could maybe be built
> separately (where by "separately" I mean in a different evaluation).
> 
> What do you think?
> 
> Andreas
> 

They should all be independant, and AFAIK even the gstreamer updates can be
independant of each other. The problem I ran into before was that
gst-plugins-good didn't compile correctly after updating some of the others.

That said, I think it would be worth it to try to pick off some of the
updates and see if they can be applied without breakage, so I'll see about
again while security-updates get built.

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


pgp0fx0FFZfow.pgp
Description: OpenPGP digital signature

Re: Fixing package-with-python2

[Ludovic Courtès]

l...@gnu.org (Ludovic Courtès) skribis:

> An idea I haven’t taken the time to test yet would be to use
> ‘properties’:
>
>   (define python-foobar   ;with Python 3
> (package
>   (name "foobar")
>   ;; Specify which Python 2 variant to use.
>   (properties `((python2-variant . ,(delay python2-foobar))
>
>   (define python2-foobar
> (package (inherit python-foobar)
>   ;; … stuff beyond the mechanical python 2→3 switch…
>   ))
>
> ‘package-with-python2’ would honor this ‘python2-variant’ property.

Here’s a first stab at this.

As an example, I modified ‘python-matplotlib’ to use that feature, so we
can test that ‘python2-scipy’ is using the right ‘python2-matplotlib’:

--8<---cut here---start->8---
$ ./pre-inst-env guix build python2-matplotlib -d 2>/dev/null
/gnu/store/07zr2pqg61b742czb2aqyisml2i90r4a-python2-matplotlib-1.4.3.drv
$ ./pre-inst-env guix build python2-scipy -d 2>/dev/null
/gnu/store/8yhxdbyjvx2xwynpqqcrj9ilksd2pb01-python2-scipy-0.16.0.drv
$ guix gc --references 
/gnu/store/8yhxdbyjvx2xwynpqqcrj9ilksd2pb01-python2-scipy-0.16.0.drv | grep 
python2-matplotlib
/gnu/store/07zr2pqg61b742czb2aqyisml2i90r4a-python2-matplotlib-1.4.3.drv
--8<---cut here---end--->8---

This will trigger rebuilds (but with an identical result) because in
manually-written variants we would use “python2-foo” as the label of
inputs, whereas the automatic transformations keeps the original
“python-foo” label.

What do people think?

I can apply this patch of the approach sounds good to you.  I think we
should probably do one commit per rewrite for clarity.

We should probably start with the lowest level, like python2-pycairo and
python2-pygobject and even python itself, because if we fix them then
some of the higher-level stuff won’t even need their own
‘python2-variant’ property.  For instance, if python, pycairo, and
pygobject have their ‘python2-variant’ set, then we no longer need this:

--8<---cut here---start->8---
(define-public python2-matplotlib
  (let ((matplotlib (package-with-python2 %python-matplotlib)))
(package (inherit matplotlib)
  ;; Make sure to use special packages for Python 2 instead
  ;; of those automatically rewritten by package-with-python2.
  (propagated-inputs
   `(("python2-pycairo" ,python2-pycairo)
 ("python2-pygobject-2" ,python2-pygobject-2)
 ("python2-tkinter" ,python-2 "tk")
 ,@(fold alist-delete (package-propagated-inputs matplotlib)
 '("python-pycairo" "python-pygobject" "python-tkinter")))
--8<---cut here---end--->8---

… and as a consequence, we don’t need a ‘python2-variant’ in
‘python-matplotlib’.

Does that make sense?  Any takers?  (This can be done incrementally.)

Thanks,
Ludo’.

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 48f65b5..b43f539 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2913,7 +2913,7 @@ is designed to have a low barrier to entry.")
 (define-public python2-rq
   (package-with-python2 python-rq))
 
-(define-public python-cython
+(define %python-cython
   (package
 (name "python-cython")
 (version "0.23.4")
@@ -2946,8 +2946,13 @@ programming language and the extended Cython programming language.  It makes
 writing C extensions for Python as easy as Python itself.")
 (license asl2.0)))
 
+(define-public python-cython
+  (package
+(inherit %python-cython)
+(properties `((python2-variant . ,(delay python2-cython))
+
 (define-public python2-cython
-  (package (inherit (package-with-python2 python-cython))
+  (package (inherit (package-with-python2 %python-cython))
 (name "python2-cython")
 (inputs
  `(("python-2" ,python-2) ; this is not automatically changed
@@ -3117,13 +3122,7 @@ association studies (GWAS) on extremely large data sets.")
   ,phases)))
 
 (define-public python2-numpy
-  (let ((numpy (package-with-python2 python-numpy)))
-(package (inherit numpy)
-  ;; Make sure we use exactly PYTHON2-MATPLOTLIB, which is customized for
-  ;; Python 2.
-  (inputs `(("python2-matplotlib" ,python2-matplotlib)
-,@(alist-delete "python-matplotlib"
-(package-inputs numpy)))
+  (package-with-python2 python-numpy))
 
 (define-public python-pyparsing
   (package
@@ -3247,7 +3246,7 @@ transcendental functions).")
  ,@(alist-delete "python-numpy"
  (package-propagated-inputs numexpr)))
 
-(define-public python-matplotlib
+(define %python-matplotlib
   (package
 (name "python-matplotlib")
 (version "1.4.3")
@@ -3323,7 +3322,7 @@ transcendental functions).")
   (lambda (port)
 (format port "[directories]~%
 basedirlist = ~a,~a~%
-[rc_options]~%
+ [rc_options]~%
 backend = TkAgg~%"
   

Re: Adding build status to the package list table

[Roel Janssen]

Ricardo Wurmus writes:

> Ludovic Courtès  writes:
>
>> Roel Janssen  skribis:
>>
>>> We need to add the following line to the response header at
>>> hydra.gnu.org:
>>>
>>>   Access-Control-Allow-Origin: "http://www.gnu.org";
>>>
>>> Here's how to do it:
>>>   http://enable-cors.org/server_nginx.html
>>>
>>> Which boils down to adding this line to the nginx config:
>>>   add_header 'Access-Control-Allow-Origin' 'http://www.gnu.org';
>>
>> OK, I’ve done that for /api requests (with the full URI, that is
>>  and variants thereof).
>> Now, when clicking on “Expand”, IceCat no longer complains about CORS,
>> but it fails to expands and reports this:
>>
>>   Blocked loading mixed active content
>>   
>> "http://hydra.gnu.org/api/latestbuilds?nr=1&project=gnu&jobset=master&job=adwaita-icon-theme-3.18.0.x86_64-linux";
>>
>> with a link to:
>>
>>   https://developer.mozilla.org/en-US/docs/Security/MixedContent
>
> This is because the current page is encrypted but the content from hydra
> is not.  Can we serve hydra.gnu.org/api over HTTPS?

I think that would fix this problem.

However, if I browse explicitly to:
http://gnu.org/software/guix/packages  (the insecure version), I get the 
following error message:

Cross-Origin Request Blocked: The Same Origin Policy disallows reading the 
remote resource at 
http://hydra.gnu.org/api/latestbuilds?nr=1&project=gnu&jobset=master&job=acme-0.2.0.i686-linux.
 (Reason: CORS header 'Access-Control-Allow-Origin' does not match 
'https://www.gnu.org/software/guix/packages, 
https://www.gnu.org/software/guix/packages/, 
https://www.gnu.org/software/guix/packages/index.html, 
https://gnu.org/software/guix/packages/, 
http://www.gnu.org/software/guix/packages, 
http://www.gnu.org/software/guix/packages/, 
http://www.gnu.org/software/guix/packages/index.html, 
http://gnu.org/software/guix/packages/').

This is because (at least in my browser), the origin is set to
"http://www.gnu.org"; instead of the full path.  So could you include
"http://www.gnu.org"; in the list as well?

Thanks,
Roel

Re: GStreamer, PulseAudio and libvpx update

[Andreas Enge]

Hello,

On Wed, Feb 03, 2016 at 12:23:24PM +0800, 宋文武 wrote:
> In the 'gstreamer-update' branch we have following updates:
>   libvpx -> 1.5.0
>   pulseaudio -> 8.0
>   ao -> 1.2.0
>   gstreamer (and plugins) -> 1.6.3

I noticed you merged master into the branch. My opinion is that merging
instead of rebasing messes up the history and makes it rather unclear
what the differences in this branch are. So I would suggest the following:
Delete the branch, create a branch "wip-gstreamer" from security-updates
(not master!), try to build a few packages; after security-updates has been
applied to master, rebase wip-gstreamer and have it built by hydra.

Right now, the priority clearly is to finish security-updates, and we
cannot afford to build a second branch in parallel.

Are these four updates independent? Should they all be built together,
or should we do them one by one? Only 19 packages depend on ao, only 29 on
libvpx, so these could be done separately. Could they even go to master,
or do they depend on gstreamer (or pulseaudio) being updated first? 
pulseaudio has 162 dependent packages, so even these could maybe be built
separately (where by "separately" I mean in a different evaluation).

What do you think?

Andreas

Re: [PATCH] syscalls: Allow non-alphanumeric interface names.

[Ludovic Courtès]

Jookia <166...@gmail.com> skribis:

> This fixes interfaces with a dash or other characters being ignored.
>
> * guix/build/syscalls.scm (%interface-line): Replace "[[:alnum:]]" with ".+".

I applied it but using [[:graph:]] instead of ‘.’.  Thanks!

Ludo’.

Re: [PATCH 4/6] gnu: Add emacs-constants.

[Federico Beffa]

On Sun, Jan 10, 2016 at 9:45 PM, Ludovic Courtès  wrote:
> Could get in touch with Carsten Dominik, for instance, and propose the
> patch?

Dominik was kind enough to accept the patch. So, I've now pushed it.
Once the new release will be out, we can drop it.

Regards,
Fede

Re: Adding build status to the package list table

[Ricardo Wurmus]

Ludovic Courtès  writes:

> Roel Janssen  skribis:
>
>> We need to add the following line to the response header at
>> hydra.gnu.org:
>>
>>   Access-Control-Allow-Origin: "http://www.gnu.org";
>>
>> Here's how to do it:
>>   http://enable-cors.org/server_nginx.html
>>
>> Which boils down to adding this line to the nginx config:
>>   add_header 'Access-Control-Allow-Origin' 'http://www.gnu.org';
>
> OK, I’ve done that for /api requests (with the full URI, that is
>  and variants thereof).
> Now, when clicking on “Expand”, IceCat no longer complains about CORS,
> but it fails to expands and reports this:
>
>   Blocked loading mixed active content
>   
> "http://hydra.gnu.org/api/latestbuilds?nr=1&project=gnu&jobset=master&job=adwaita-icon-theme-3.18.0.x86_64-linux";
>
> with a link to:
>
>   https://developer.mozilla.org/en-US/docs/Security/MixedContent

This is because the current page is encrypted but the content from hydra
is not.  Can we serve hydra.gnu.org/api over HTTPS?

~~ Ricardo

Re: torsocks 2.0 bug

[Ludovic Courtès]

swedebu...@riseup.net skribis:

> I propose: we update to 2.1 first and see if this fixes the problem
> with only icecat.

Sounds good.  Would you like to send a patch?

Thanks,
Ludo’.

Re: [PATCH] gnu: Add Augeas.

[Ludovic Courtès]

Ricardo Wurmus  skribis:

> Leo Famulari  writes:
>
>>> +(build-system gnu-build-system)
>>> +;; Marked as "required" in augeas.pc
>>> +(propagated-inputs
>>> + `(("libxml2" ,libxml2)))

I find it clearer to put the comment right below ‘propagated-inputs’.

>> Is there really no way to avoid this?
>
> I don’t know.

The problem is that I don’t think it works to put an absolute file name
in the ‘Requires’ field of a ‘.pc’ file, so I don’t think we can avoid
it unfortunately.

However, since Augeas is a library, the propagated input is acceptable:
in practice, people probably won’t have it in their main environment,
but rather in a ‘guix environment’ thing, or in a dedicated development
profile.

Ludo’.

Re: Adding build status to the package list table

[Ludovic Courtès]

Roel Janssen  skribis:

> We need to add the following line to the response header at
> hydra.gnu.org:
>
>   Access-Control-Allow-Origin: "http://www.gnu.org";
>
> Here's how to do it:
>   http://enable-cors.org/server_nginx.html
>
> Which boils down to adding this line to the nginx config:
>   add_header 'Access-Control-Allow-Origin' 'http://www.gnu.org';

OK, I’ve done that for /api requests (with the full URI, that is
 and variants thereof).
Now, when clicking on “Expand”, IceCat no longer complains about CORS,
but it fails to expands and reports this:

  Blocked loading mixed active content
  
"http://hydra.gnu.org/api/latestbuilds?nr=1&project=gnu&jobset=master&job=adwaita-icon-theme-3.18.0.x86_64-linux";

with a link to:

  https://developer.mozilla.org/en-US/docs/Security/MixedContent

Ideas?

Ludo’.

Re: GStreamer, PulseAudio and libvpx update

[Efraim Flashner]

On Wed, 03 Feb 2016 12:23:24 +0800
iyzs...@member.fsf.org (宋文武) wrote:

> In the 'gstreamer-update' branch we have following updates:
>   libvpx -> 1.5.0
>   pulseaudio -> 8.0
>   ao -> 1.2.0
>   gstreamer (and plugins) -> 1.6.3
> 
> This will lead to mess rebuilds.
> I have build gst-plugins-good, ffmpeg, mpv and pavucontrol,
> tested with pulseaudio-8.0, so I think it's safe to merge.
> Or should we start a job for the branch on hydra?
 
Depending on the number of packages to rebuild, giving hydra a head start of
a day or three is probably a good idea.
 
> Efraim Flashner  writes:
> 
>  [...]  
>  [...]  
>  [...]  
> With the gstreamer-update branch merged with current master, I don't
> meet any failure for my local x86_64 build of gst-plugins-good-1.6.3.
> 
> Do the failure still occur to you?

I just checked out origin/gstreamer-update again and gst-plugins-good failed
to build for me again.
FAIL: elements/splitmux
FAIL: elements/rtprtx

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


pgpWCwRlb3xpW.pgp
Description: OpenPGP digital signature

Re: [PATCH] gnu: aspell: Wrap binary to find dictionaries.

[Ludovic Courtès]

Federico Beffa  skribis:

> From e183f8e473b97406968ecbda9fb13ebdf60963ec Mon Sep 17 00:00:00 2001
> From: Federico Beffa 
> Date: Fri, 8 Jan 2016 14:23:12 +0100
> Subject: [PATCH 11/11] gnu: aspell: Wrap binary to find dictionaries.
>
> * gnu/packages/aspell.scm (aspell): Add 'wrap-aspell phase.

I pushed this patch along with the corresponding (gnu system) change as
81fc64d.

Thanks,
Ludo’.